refactor: simplify approach

Author: felangel

bricks/dart_frog_prod_server/hooks/lib/dart_frog_prod_server_hooks.dart

@@ -1,5 +1,3 @@
-export 'src/adjust_relative_pubspec_imports.dart';
-export 'src/copy_workspace_pubspec_lock.dart';
 export 'src/create_bundle.dart';
 export 'src/create_external_packages_folder.dart';
 export 'src/dart_pub_get.dart';

bricks/dart_frog_prod_server/hooks/lib/src/adjust_relative_pubspec_imports.dart

@@ -14,7 +14,7 @@ Future<List<String>> createExternalPackagesFolder({
 }) async {
   final pathResolver = path.context;
   final pubspecLock = await getPubspecLock(
-    buildDirectory.path,
+    projectDirectory.path,
     pathContext: path.context,
   );
 
@@ -29,7 +29,7 @@ Future<List<String>> createExternalPackagesFolder({
 
           return _ExternalPathDependency(
             name: dependency.name,
-            path: path.join(buildDirectory.path, pathDescription.path),
+            path: path.join(projectDirectory.path, pathDescription.path),
           );
         },
       )

bricks/dart_frog_prod_server/hooks/lib/src/copy_workspace_pubspec_lock.dart

@@ -6,20 +6,20 @@ import 'package:path/path.dart' as path;
 /// https://github.com/dart-lang/pub/issues/4594
 void disableWorkspaceResolution(
   HookContext context, {
-  required String buildDirectory,
+  required String projectDirectory,
   required void Function(int exitCode) exit,
 }) {
   try {
-    overrideResolutionInPubspecOverrides(buildDirectory);
+    overrideResolutionInPubspecOverrides(projectDirectory);
   } on Exception catch (e) {
     context.logger.err('$e');
     exit(1);
   }
 }
 
-void overrideResolutionInPubspecOverrides(String directory) {
+void overrideResolutionInPubspecOverrides(String projectDirectory) {
   final pubspecOverrides = File(
-    path.join(directory, 'pubspec_overrides.yaml'),
+    path.join(projectDirectory, 'pubspec_overrides.yaml'),
   );
 
   if (pubspecOverrides.existsSync()) {

bricks/dart_frog_prod_server/hooks/lib/src/create_external_packages_folder.dart

@@ -1,6 +1,7 @@
 import 'dart:async';
 import 'dart:io' as io;
 
+import 'package:dart_frog_prod_server_hooks/dart_frog_prod_server_hooks.dart';
 import 'package:mason/mason.dart' show HookContext, lightCyan;
 import 'package:path/path.dart' as path;
 
@@ -9,9 +10,19 @@ Future<void> run(HookContext context) => postGen(context);
 Future<void> postGen(
   HookContext context, {
   io.Directory? directory,
+  ProcessRunner runProcess = io.Process.run,
+  void Function(int exitCode) exit = defaultExit,
 }) async {
   final projectDirectory = directory ?? io.Directory.current;
   final buildDirectoryPath = path.join(projectDirectory.path, 'build');
+
+  await dartPubGet(
+    context,
+    workingDirectory: buildDirectoryPath,
+    runProcess: runProcess,
+    exit: exit,
+  );
+
   final relativeBuildPath = path.relative(buildDirectoryPath);
   context.logger
     ..info('')

bricks/dart_frog_prod_server/hooks/lib/src/disable_workspace_resolution.dart

@@ -29,6 +29,16 @@ Future<void> preGen(
     exit: exit,
   );
 
+  if (usesWorkspaces) {
+    // Disable workspace resolution until we can generate per-package lockfiles.
+    // https://github.com/dart-lang/pub/issues/4594
+    disableWorkspaceResolution(
+      context,
+      projectDirectory: projectDirectory.path,
+      exit: exit,
+    );
+  }
+
   // We need to make sure that the pubspec.lock file is up to date
   await dartPubGet(
     context,
@@ -48,38 +58,6 @@ Future<void> preGen(
     exit: exit,
   );
 
-  if (usesWorkspaces) {
-    // Disable workspace resolution until we can generate per-package lockfiles.
-    // https://github.com/dart-lang/pub/issues/4594
-    disableWorkspaceResolution(
-      context,
-      buildDirectory: buildDirectory.path,
-      exit: exit,
-    );
-    // Copy the pubspec.lock from the workspace root to ensure the same versions
-    // of dependencies are used in the production build.
-    copyWorkspacePubspecLock(
-      context,
-      buildDirectory: buildDirectory.path,
-      workingDirectory: projectDirectory.path,
-      exit: exit,
-    );
-    // Adjust all relative pubspec.yaml imports.
-    adjustRelativePubspecImports(
-      context,
-      buildDirectory: buildDirectory.path,
-      exit: exit,
-    );
-  }
-
-  // We need to make sure that the pubspec.lock file is up to date
-  await dartPubGet(
-    context,
-    workingDirectory: buildDirectory.path,
-    runProcess: runProcess,
-    exit: exit,
-  );
-
   final RouteConfiguration configuration;
   try {
     configuration = buildConfiguration(projectDirectory);
@@ -112,8 +90,12 @@ Future<void> preGen(
     onViolationEnd: () => exit(1),
   );
 
+  final customDockerFile = io.File(
+    path.join(projectDirectory.path, 'Dockerfile'),
+  );
+
   final internalPathDependencies = await getInternalPathDependencies(
-    buildDirectory,
+    projectDirectory,
   );
 
   final externalDependencies = await createExternalPackagesFolder(
@@ -122,9 +104,6 @@ Future<void> preGen(
     copyPath: copyPath,
   );
 
-  final customDockerFile = io.File(
-    path.join(buildDirectory.path, 'Dockerfile'),
-  );
   final addDockerfile = !customDockerFile.existsSync();
 
   context.vars = {

bricks/dart_frog_prod_server/hooks/post_gen.dart

@@ -1,6 +1,10 @@
+import 'dart:io';
+
 import 'package:dart_frog_prod_server_hooks/dart_frog_prod_server_hooks.dart';
-import 'package:mason/mason.dart' show HookContext, Logger, Progress, lightCyan;
+import 'package:mason/mason.dart'
+    show ExitCode, HookContext, Logger, Progress, lightCyan;
 import 'package:mocktail/mocktail.dart';
+import 'package:path/path.dart' as path;
 import 'package:test/test.dart';
 
 import '../post_gen.dart' as post_gen;
@@ -31,6 +35,14 @@ void main() {
     late HookContext context;
     late Logger logger;
 
+    const processId = 42;
+    final processResult = ProcessResult(
+      processId,
+      ExitCode.success.code,
+      '',
+      '',
+    );
+
     setUp(() {
       logger = _MockLogger();
       context = _FakeHookContext(logger: logger);
@@ -47,8 +59,32 @@ void main() {
       );
     });
 
-    test('outputs next steps', () async {
-      await post_gen.postGen(context);
+    test('runs dart pub get and outputs next steps', () async {
+      var processRunnerCallCount = 0;
+      final exitCalls = <int>[];
+
+      await post_gen.postGen(
+        context,
+        runProcess: (
+          executable,
+          args, {
+          String? workingDirectory,
+          bool? runInShell,
+        }) async {
+          processRunnerCallCount++;
+          expect(executable, equals('dart'));
+          expect(args, equals(['pub', 'get']));
+          expect(
+            workingDirectory,
+            equals(path.join(Directory.current.path, 'build')),
+          );
+          expect(runInShell, isTrue);
+          return processResult;
+        },
+        exit: exitCalls.add,
+      );
+      expect(processRunnerCallCount, equals(1));
+      expect(exitCalls, isEmpty);
       verify(() => logger.success('Created a production build!')).called(1);
       verify(
         () => logger.info('Start the production server by running:'),