Use packageManager passed as option to resolve required deps

Author: codenem

packages/cli-v3/e2e/compile.ts

@@ -3,7 +3,7 @@
 import { esbuildDecorators } from "@anatine/esbuild-decorators";
 import { build } from "esbuild";
 import { readFileSync } from "node:fs";
-import { mkdir, writeFile } from "node:fs/promises";
+import { writeFile } from "node:fs/promises";
 import { basename, join, posix, resolve } from "node:path";
 import invariant from "tiny-invariant";
 

packages/cli-v3/e2e/handleDependencies.ts

@@ -1,35 +1,51 @@
 #!/usr/bin/env node
 
+import { log } from "@clack/prompts";
+import { Metafile } from "esbuild";
 import { join } from "node:path";
+import terminalLink from "terminal-link";
 
-import { ReadConfigResult } from "../src/utilities/configFiles.js";
-import { writeJSONFile } from "../src/utilities/fileSystem.js";
-import { logger } from "../src/utilities/logger.js";
-import { JavascriptProject } from "../src/utilities/javascriptProject.js";
+import { SkipLoggingError } from "../src/cli/common.js";
 import {
   copyAdditionalFiles,
   resolveDependencies,
   resolveRequiredDependencies,
 } from "../src/commands/deploy.js";
-import terminalLink from "terminal-link";
-import { SkipLoggingError } from "../src/cli/common.js";
-import { log } from "@clack/prompts";
-import { Metafile } from "esbuild";
+import { ReadConfigResult } from "../src/utilities/configFiles.js";
+import { writeJSONFile } from "../src/utilities/fileSystem.js";
+import { PackageManager } from "../src/utilities/getUserPackageManager.js";
+import { JavascriptProject } from "../src/utilities/javascriptProject.js";
+import { logger } from "../src/utilities/logger.js";
 
 type HandleDependenciesOptions = {
   entryPointMetaOutput: Metafile["outputs"]["out/stdin.js"];
   metaOutput: Metafile["outputs"]["out/stdin.js"];
+  packageManager: PackageManager;
   resolvedConfig: ReadConfigResult;
   tempDir: string;
 };
 
+class JavascriptProjectLocal extends JavascriptProject {
+  constructor(
+    projectPath: string,
+    private overridenPackageManager: PackageManager
+  ) {
+    super(projectPath);
+  }
+
+  async getPackageManager(): Promise<PackageManager> {
+    return Promise.resolve(this.overridenPackageManager);
+  }
+}
+
 export async function handleDependencies(options: HandleDependenciesOptions) {
   if (options.resolvedConfig.status === "error") {
     throw new Error("cannot resolve config");
   }
   const {
     entryPointMetaOutput,
     metaOutput,
+    packageManager,
     resolvedConfig: { config },
     tempDir,
   } = options;
@@ -43,7 +59,8 @@ export async function handleDependencies(options: HandleDependenciesOptions) {
   // Get all the required dependencies from the metaOutputs and save them to /tmp/dir/package.json
   const allImports = [...metaOutput.imports, ...entryPointMetaOutput.imports];
 
-  const javascriptProject = new JavascriptProject(config.projectDir);
+  // const javascriptProject = new JavascriptProject(config.projectDir);
+  const javascriptProject = new JavascriptProjectLocal(config.projectDir, packageManager);
 
   const dependencies = await resolveRequiredDependencies(allImports, config, javascriptProject);
 

packages/cli-v3/e2e/index.test.ts

@@ -3,11 +3,12 @@ import { readFileSync } from "node:fs";
 import { mkdir, rename, rm } from "node:fs/promises";
 import { join, resolve } from "node:path";
 
+import { Loglevel, LogLevelSchema, PackageManagerSchema } from "./schemas";
 import { typecheckProject } from "../src/commands/deploy";
 import { readConfig, ReadConfigFileResult } from "../src/utilities/configFiles";
-import { compile } from "./compile";
-import { Loglevel, LogLevelSchema, PackageManager, PackageManagerSchema } from ".";
+import { PackageManager } from "../src/utilities/getUserPackageManager";
 import { logger } from "../src/utilities/logger";
+import { compile } from "./compile";
 import { handleDependencies } from "./handleDependencies";
 
 type TestCase = {
@@ -212,6 +213,7 @@ if (testCases.length > 0) {
                     metaOutput: global.metaOutput!,
                     resolvedConfig: global.resolvedConfig!,
                     tempDir: global.tempDir!,
+                    packageManager,
                   });
                 })()
               );

packages/cli-v3/e2e/index.ts renamed to packages/cli-v3/e2e/schemas.ts

@@ -4,5 +4,4 @@ export const LogLevelSchema = z
   .enum(["debug", "info", "log", "warn", "error", "none"])
   .default("log");
 export type Loglevel = z.infer<typeof LogLevelSchema>;
-export const PackageManagerSchema = z.enum(["bun", "npm", "pnpm", "yarn"]).default("npm");
-export type PackageManager = z.infer<typeof PackageManagerSchema>;
+export const PackageManagerSchema = z.enum(["npm", "pnpm", "yarn"]).default("npm");