fix: repair no-op resolution timestamps (#4822)

Author: aikins01

lib/src/command/dependency_services.dart

@@ -575,7 +575,11 @@ class DependencyServicesApplyCommand extends PubCommand {
           overriddenDependencies: entrypoint.lockFile.overriddenDependencies,
         );
 
-        newLockFile.writeToFile(entrypoint.lockFilePath, cache);
+        newLockFile.writeToFile(
+          entrypoint.lockFilePath,
+          cache,
+          dependencies: const [],
+        );
       }
     });
     // Dummy message.

lib/src/entrypoint.dart

@@ -435,6 +435,7 @@ See $workspacesDocUrl for more information.''',
                 .sdkConstraints[sdk.identifier]
                 ?.effectiveConstraint,
       ),
+      dependencies: [lockFilePath],
     );
     writeTextFileIfDifferent(packageGraphPath, await _packageGraphFile(cache));
 
@@ -458,6 +459,13 @@ See $workspacesDocUrl for more information.''',
     }
   }
 
+  Iterable<String> _resolutionFileDependencies() sync* {
+    for (final package in workspaceRoot.transitiveWorkspace) {
+      yield package.pubspecPath;
+      yield package.pubspecOverridesPath;
+    }
+  }
+
   Future<String> _packageGraphFile(SystemCache cache) async {
     return const JsonEncoder.withIndent('  ').convert({
       'roots':
@@ -649,18 +657,23 @@ To update `$lockFilePath` run `$topLevelProgram pub get`$suffix without
 `--enforce-lockfile`.''');
     }
 
+    _lockFile = newLockFile;
+    late final packageGraph = PackageGraph.fromSolveResult(this, result);
+
     if (!(dryRun || enforceLockfile)) {
-      newLockFile.writeToFile(lockFilePath, cache);
+      newLockFile.writeToFile(
+        lockFilePath,
+        cache,
+        dependencies: _resolutionFileDependencies(),
+      );
     }
 
-    _lockFile = newLockFile;
-
     if (!dryRun) {
       _removeStrayLockAndConfigFiles();
 
       /// Build a package graph from the version solver results so we don't
       /// have to reload and reparse all the pubspecs.
-      _packageGraph = Future.value(PackageGraph.fromSolveResult(this, result));
+      _packageGraph = Future.value(packageGraph);
 
       await writePackageConfigFiles();
 

lib/src/global_packages.dart

@@ -233,10 +233,11 @@ Follow progress in https://github.com/dart-lang/sdk/issues/60889.
     final tempDir = cache.createTempDir();
     // TODO(rnystrom): Look in "bin" and display list of binaries that
     // user can run.
-    LockFile(
-      [id],
-      mainDependencies: {id.name},
-    ).writeToFile(p.join(tempDir, 'pubspec.lock'), cache);
+    LockFile([id], mainDependencies: {id.name}).writeToFile(
+      p.join(tempDir, 'pubspec.lock'),
+      cache,
+      dependencies: const [],
+    );
 
     tryDeleteEntry(_packageDir(name));
     tryRenameDir(tempDir, _packageDir(name));
@@ -333,7 +334,11 @@ To recompile executables, first run `$topLevelProgram pub global deactivate $nam
         ).show(summary: false);
       }
 
-      lockFile.writeToFile(p.join(tempDir, 'pubspec.lock'), cache);
+      lockFile.writeToFile(
+        p.join(tempDir, 'pubspec.lock'),
+        cache,
+        dependencies: const [],
+      );
 
       final packageDir = _packageDir(name);
       tryDeleteEntry(packageDir);

lib/src/io.dart

@@ -265,16 +265,35 @@ void writeTextFile(
 }
 
 /// Reads the file at [path] and writes [newContent] to it, if it is different
-/// from [newContent].
+/// from the existing content.
 ///
 /// If the file doesn't exist it is always written.
-void writeTextFileIfDifferent(String path, String newContent) {
-  // Compare to the present package_config.json
-  // For purposes of equality we don't care about the `generated` timestamp.
+///
+/// If the content is unchanged but any [dependencies] are newer than [path],
+/// [path] is touched.
+void writeTextFileIfDifferent(
+  String path,
+  String newContent, {
+  Iterable<String> dependencies = const [],
+}) {
   final originalText = tryReadTextFile(path);
   if (originalText != newContent) {
     writeTextFile(path, newContent);
   } else {
+    final modified = tryStatFile(path)?.modified;
+    if (modified != null) {
+      for (final dependency in dependencies) {
+        final dependencyModified = tryStatFile(dependency)?.modified;
+        if (dependencyModified != null &&
+            dependencyModified.isAfter(modified)) {
+          log.fine(
+            '`$path` is unchanged. Touching because `$dependency` is newer.',
+          );
+          touch(path);
+          return;
+        }
+      }
+    }
     log.fine('`$path` is unchanged. Not rewriting.');
   }
 }

lib/src/lock_file.dart

@@ -389,7 +389,14 @@ ${yamlToString(data)}
   /// uses that.
   ///
   /// Relative paths will be resolved relative to [lockFilePath]
-  void writeToFile(String lockFilePath, SystemCache cache) {
+  ///
+  /// If the serialized lockfile is unchanged, but any [dependencies] are newer
+  /// than [lockFilePath], the lockfile is touched.
+  void writeToFile(
+    String lockFilePath,
+    SystemCache cache, {
+    required Iterable<String> dependencies,
+  }) {
     final windowsLineEndings =
         fileExists(lockFilePath) &&
         detectWindowsLineEndings(readTextFile(lockFilePath));
@@ -398,6 +405,7 @@ ${yamlToString(data)}
     writeTextFileIfDifferent(
       lockFilePath,
       windowsLineEndings ? serialized.replaceAll('\n', '\r\n') : serialized,
+      dependencies: dependencies,
     );
   }
 

test/package_config_file_test.dart

@@ -379,4 +379,69 @@ void main() {
     expect(lockFile.lastModifiedSync(), lockfileTimestamp);
     expect(workspaceRefFile.lastModifiedSync(), workspaceRefTimestamp);
   });
+
+  test(
+    'pub get touches unchanged resolution files after pubspec edits',
+    () async {
+      final server = await servePackages();
+      server.serve('foo', '1.0.0');
+
+      await d.dir(appPath, [
+        d.appPubspec(
+          dependencies: {'foo': 'any'},
+          extras: {
+            'workspace': ['foo'],
+            'environment': {'sdk': '^3.5.0'},
+          },
+        ),
+        d.dir('foo', [d.libPubspec('foo', '1.0.0', resolutionWorkspace: true)]),
+      ]).create();
+
+      await pubGet(environment: {'_PUB_TEST_SDK_VERSION': '3.5.0'});
+      final rootPubspec = File(p.join(sandbox, appPath, 'pubspec.yaml'));
+      final workspacePubspec = File(
+        p.join(sandbox, appPath, 'foo', 'pubspec.yaml'),
+      );
+      final lockFile = File(p.join(sandbox, appPath, 'pubspec.lock'));
+      final packageConfigFile = File(
+        p.join(sandbox, appPath, '.dart_tool', 'package_config.json'),
+      );
+      final lockfileContents = lockFile.readAsStringSync();
+      final packageConfig = jsonDecode(packageConfigFile.readAsStringSync());
+
+      // timestamp resolution is rather poor especially on windows.
+      await Future<void>.delayed(const Duration(seconds: 1));
+      rootPubspec.writeAsStringSync(
+        '${rootPubspec.readAsStringSync()}\n# hi\n',
+      );
+      workspacePubspec.writeAsStringSync(
+        '${workspacePubspec.readAsStringSync()}\n# hi\n',
+      );
+
+      expect(
+        rootPubspec.lastModifiedSync().isAfter(lockFile.lastModifiedSync()),
+        isTrue,
+      );
+      expect(
+        workspacePubspec.lastModifiedSync().isAfter(
+          lockFile.lastModifiedSync(),
+        ),
+        isTrue,
+      );
+
+      await pubGet(environment: {'_PUB_TEST_SDK_VERSION': '3.5.0'});
+
+      expect(lockFile.readAsStringSync(), lockfileContents);
+      expect(jsonDecode(packageConfigFile.readAsStringSync()), packageConfig);
+
+      final lockFileModified = lockFile.lastModifiedSync();
+      final packageConfigModified = packageConfigFile.lastModifiedSync();
+      expect(rootPubspec.lastModifiedSync().isAfter(lockFileModified), isFalse);
+      expect(
+        workspacePubspec.lastModifiedSync().isAfter(lockFileModified),
+        isFalse,
+      );
+      expect(lockFileModified.isAfter(packageConfigModified), isFalse);
+    },
+  );
 }