Update e2e suite

Author: codenem

packages/cli-v3/e2e/compile.ts

@@ -214,6 +214,7 @@ export async function compile(options: CompileOptions) {
   await writeFile(join(tempDir, "index.js"), entryPointOutputFile.text);
 
   return {
+    directDependenciesMeta,
     workerMetaOutput: metaOutput,
     workerOutputFile,
     entryPointMetaOutput,

packages/cli-v3/e2e/handleDependencies.ts

@@ -16,8 +16,10 @@ import { PackageManager } from "../src/utilities/getUserPackageManager.js";
 import { logger } from "../src/utilities/logger.js";
 import { cliLink } from "../src/utilities/cliOutput.js";
 import { E2EJavascriptProject } from "./javascriptProject.js";
+import { DependencyMeta } from "../src/utilities/javascriptProject.js";
 
 type HandleDependenciesOptions = {
+  directDependenciesMeta: Record<string, DependencyMeta>;
   entryPointMetaOutput: Metafile["outputs"]["out/stdin.js"];
   metaOutput: Metafile["outputs"]["out/stdin.js"];
   packageManager: PackageManager;
@@ -30,24 +32,22 @@ export async function handleDependencies(options: HandleDependenciesOptions) {
     throw new Error("cannot resolve config");
   }
   const {
+    directDependenciesMeta,
     entryPointMetaOutput,
     metaOutput,
     packageManager,
     resolvedConfig: { config },
     tempDir,
   } = options;
 
-  logger.debug("Getting the imports for the worker and entryPoint builds", {
+  logger.debug("Imports for the worker and entryPoint builds", {
     workerImports: metaOutput.imports,
     entryPointImports: entryPointMetaOutput.imports,
   });
 
-  // 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 E2EJavascriptProject(config.projectDir, packageManager);
 
-  const dependencies = await resolveRequiredDependencies(allImports, config, javascriptProject);
+  const dependencies = await resolveRequiredDependencies(directDependenciesMeta, config);
 
   logger.debug("gatherRequiredDependencies()", { dependencies });
 

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

@@ -20,6 +20,7 @@ import { E2EOptions, E2EOptionsSchema } from "./schemas";
 import { fixturesConfig, TestCase } from "./fixtures.config";
 import { Metafile, OutputFile } from "esbuild";
 import { findUpMultiple } from "find-up";
+import { DependencyMeta } from "../src/utilities/javascriptProject";
 
 interface E2EFixtureTest extends TestCase {
   fixtureDir: string;
@@ -163,6 +164,7 @@ if (testCases.length > 0) {
             ).resolves.not.toThrowError();
           }
 
+          let directDependenciesMeta: Record<string, DependencyMeta>;
           let entryPointMetaOutput: Metafile["outputs"]["out/stdin.js"];
           let entryPointOutputFile: OutputFile;
           let workerMetaOutput: Metafile["outputs"]["out/stdin.js"];
@@ -175,6 +177,7 @@ if (testCases.length > 0) {
                 resolvedConfig: resolvedConfig!,
                 tempDir,
               });
+              directDependenciesMeta = compilationResult.directDependenciesMeta;
               entryPointMetaOutput = compilationResult.entryPointMetaOutput;
               entryPointOutputFile = compilationResult.entryPointOutputFile;
               workerMetaOutput = compilationResult.workerMetaOutput;
@@ -201,6 +204,7 @@ if (testCases.length > 0) {
           const depsExpectation = expect(
             (async () => {
               dependencies = await handleDependencies({
+                directDependenciesMeta: directDependenciesMeta!,
                 entryPointMetaOutput: entryPointMetaOutput!,
                 metaOutput: workerMetaOutput!,
                 resolvedConfig: resolvedConfig!,