Log extracted direct dependencies info instead of unused build metaoutputs

Author: codenem

packages/cli-v3/e2e/compile.ts

@@ -2,7 +2,7 @@ import { esbuildDecorators } from "@anatine/esbuild-decorators";
 import { build } from "esbuild";
 import { readFileSync } from "node:fs";
 import { writeFile } from "node:fs/promises";
-import { basename, join, posix, relative, resolve, sep } from "node:path";
+import { join, resolve } from "node:path";
 import invariant from "tiny-invariant";
 
 import {
@@ -68,6 +68,8 @@ export async function compile(options: CompileOptions) {
   const e2eJsProject = new E2EJavascriptProject(config.projectDir, packageManager);
   const directDependenciesMeta = await e2eJsProject.extractDirectDependenciesMeta();
 
+  logger.debug("Direct dependencies metadata", directDependenciesMeta);
+
   const result = await build({
     stdin: {
       contents: workerContents,
@@ -161,27 +163,6 @@ export async function compile(options: CompileOptions) {
 
   logger.debug(`Writing compiled files to ${tempDir}`);
 
-  // Get the metaOutput for the result build
-  const pathsToProjectDir = relative(
-    join(process.cwd(), "e2e", "fixtures"),
-    config.projectDir
-  ).split(sep);
-
-  const metaOutput =
-    result.metafile!.outputs[
-      posix.join("e2e", "fixtures", ...pathsToProjectDir, "out", "stdin.js")
-    ];
-
-  invariant(metaOutput, "Meta output for the result build is missing");
-
-  // Get the metaOutput for the entryPoint build
-  const entryPointMetaOutput =
-    entryPointResult.metafile!.outputs[
-      posix.join("e2e", "fixtures", ...pathsToProjectDir, "out", "stdin.js")
-    ];
-
-  invariant(entryPointMetaOutput, "Meta output for the entryPoint build is missing");
-
   // Get the outputFile and the sourceMapFile for the result build
   const workerOutputFile = result.outputFiles.find(
     (file) => file.path === join(config.projectDir, "out", "stdin.js")
@@ -215,9 +196,7 @@ export async function compile(options: CompileOptions) {
 
   return {
     directDependenciesMeta,
-    workerMetaOutput: metaOutput,
     workerOutputFile,
-    entryPointMetaOutput,
     entryPointOutputFile,
   };
 }

packages/cli-v3/e2e/handleDependencies.ts

@@ -1,7 +1,6 @@
 #!/usr/bin/env node
 
 import { log } from "@clack/prompts";
-import { Metafile } from "esbuild";
 import { join } from "node:path";
 
 import { SkipLoggingError } from "../src/cli/common.js";
@@ -20,8 +19,6 @@ 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;
   resolvedConfig: ReadConfigResult;
   tempDir: string;
@@ -33,18 +30,11 @@ export async function handleDependencies(options: HandleDependenciesOptions) {
   }
   const {
     directDependenciesMeta,
-    entryPointMetaOutput,
-    metaOutput,
     packageManager,
     resolvedConfig: { config },
     tempDir,
   } = options;
 
-  logger.debug("Imports for the worker and entryPoint builds", {
-    workerImports: metaOutput.imports,
-    entryPointImports: entryPointMetaOutput.imports,
-  });
-
   const javascriptProject = new E2EJavascriptProject(config.projectDir, packageManager);
 
   const dependencies = await resolveRequiredDependencies(directDependenciesMeta, config);

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

@@ -18,7 +18,7 @@ import { createDeployHash } from "./createDeployHash";
 import { handleDependencies } from "./handleDependencies";
 import { E2EOptions, E2EOptionsSchema } from "./schemas";
 import { fixturesConfig, TestCase } from "./fixtures.config";
-import { Metafile, OutputFile } from "esbuild";
+import { OutputFile } from "esbuild";
 import { findUpMultiple } from "find-up";
 import { DependencyMeta } from "../src/utilities/javascriptProject";
 
@@ -165,9 +165,7 @@ if (testCases.length > 0) {
           }
 
           let directDependenciesMeta: Record<string, DependencyMeta>;
-          let entryPointMetaOutput: Metafile["outputs"]["out/stdin.js"];
           let entryPointOutputFile: OutputFile;
-          let workerMetaOutput: Metafile["outputs"]["out/stdin.js"];
           let workerOutputFile: OutputFile;
 
           const compileExpect = expect(
@@ -178,9 +176,7 @@ if (testCases.length > 0) {
                 tempDir,
               });
               directDependenciesMeta = compilationResult.directDependenciesMeta;
-              entryPointMetaOutput = compilationResult.entryPointMetaOutput;
               entryPointOutputFile = compilationResult.entryPointOutputFile;
-              workerMetaOutput = compilationResult.workerMetaOutput;
               workerOutputFile = compilationResult.workerOutputFile;
             })(),
             wantCompilationError ? "does not compile" : "compiles"
@@ -205,8 +201,6 @@ if (testCases.length > 0) {
             (async () => {
               dependencies = await handleDependencies({
                 directDependenciesMeta: directDependenciesMeta!,
-                entryPointMetaOutput: entryPointMetaOutput!,
-                metaOutput: workerMetaOutput!,
                 resolvedConfig: resolvedConfig!,
                 tempDir,
                 packageManager,

packages/cli-v3/src/commands/deploy.ts

@@ -1169,6 +1169,8 @@ async function compileProject(
       const javascriptProject = new JavascriptProject(config.projectDir);
       const directDependenciesMeta = await javascriptProject.extractDirectDependenciesMeta();
 
+      logger.debug("Direct dependencies metadata", directDependenciesMeta);
+
       const result = await build({
         stdin: {
           contents: workerContents,
@@ -1284,17 +1286,6 @@ async function compileProject(
 
       logger.debug(`Writing compiled files to ${tempDir}`);
 
-      // Get the metaOutput for the result build
-      const metaOutput = result.metafile!.outputs[posix.join("out", "stdin.js")];
-
-      invariant(metaOutput, "Meta output for the result build is missing");
-
-      // Get the metaOutput for the entryPoint build
-      const entryPointMetaOutput =
-        entryPointResult.metafile!.outputs[posix.join("out", "stdin.js")];
-
-      invariant(entryPointMetaOutput, "Meta output for the entryPoint build is missing");
-
       // Get the outputFile and the sourceMapFile for the result build
       const workerOutputFile = result.outputFiles.find(
         (file) => file.path === join(config.projectDir, "out", "stdin.js")
@@ -1326,11 +1317,6 @@ async function compileProject(
       // Save the entryPoint outputFile to /tmp/dir/index.js
       await writeFile(join(tempDir, "index.js"), entryPointOutputFile.text);
 
-      logger.debug("Imports for the worker and entryPoint builds", {
-        workerImports: metaOutput.imports,
-        entryPointImports: entryPointMetaOutput.imports,
-      });
-
       const dependencies = await resolveRequiredDependencies(directDependenciesMeta, config);
 
       logger.debug("gatherRequiredDependencies()", { dependencies });