@datadog/esbuild-plugin 2.3.1-dev-8 → 2.3.1-dev-10

package/dist/src/index.mjs

@@ -7,9 +7,9 @@ import { lstat, readdir as readdir$1, readlink, realpath } from 'node:fs/promise
 import { EventEmitter as EventEmitter$1 } from 'node:events';
 import Stream$1 from 'node:stream';
 import { StringDecoder } from 'node:string_decoder';
-import require$$1, { resolve as resolve$1, extname, isAbsolute, normalize as normalize$1 } from 'path';
+import path$i, { resolve as resolve$1, extname, isAbsolute, normalize as normalize$1 } from 'path';
 import require$$0$1 from 'tty';
-import require$$1$1 from 'util';
+import require$$1 from 'util';
 import { spawn } from 'child_process';
 import { URL as URL$1, fileURLToPath as fileURLToPath$1 } from 'url';
 import { readFile as readFile$1 } from 'fs/promises';
@@ -21,6 +21,7 @@ import require$$5 from 'assert';
 import { performance as performance$1 } from 'perf_hooks';
 import * as querystring from 'querystring';
 import process2 from 'process';
+import esbuild from 'esbuild';
 
 var commonjsGlobal = typeof globalThis !== 'undefined' ? globalThis : typeof window !== 'undefined' ? window : typeof global !== 'undefined' ? global : typeof self !== 'undefined' ? self : {};
 
@@ -2271,8 +2272,8 @@ var retry$2 = /*@__PURE__*/getDefaultExportFromCjs(lib$3);
 
 const PREPARATION_PLUGIN_NAME = "datadog-injection-preparation-plugin";
 const PLUGIN_NAME$4 = "datadog-injection-plugin";
-const RESOLUTION_PLUGIN_NAME = "datadog-injection-resolution-plugin";
-const INJECTED_FILE = "__DATADOG_INJECTION_STUB";
+const INJECTED_FILE = "__datadog-helper-file";
+const INJECTED_FILE_PATH = `${INJECTED_FILE}.js`;
 const DISTANT_FILE_RX = /^https?:\/\//;
 
 const formatDuration = (duration) => {
@@ -2283,7 +2284,7 @@ const formatDuration = (duration) => {
   const minutes = d.getUTCMinutes();
   const seconds = d.getUTCSeconds();
   const milliseconds = d.getUTCMilliseconds();
-  return `${days ? `${days}d ` : ""}${hours ? `${hours}h ` : ""}${minutes ? `${minutes}m ` : ""}${seconds ? `${seconds}s ` : ""}${milliseconds}ms`.trim();
+  return `${days ? `${days}d ` : ""}${hours ? `${hours}h ` : ""}${minutes ? `${minutes}m ` : ""}${seconds ? `${seconds}s ` : ""}${milliseconds ? `${milliseconds}ms` : ""}`.trim();
 };
 const getResolvedPath = (filepath) => {
   try {
@@ -2353,15 +2354,7 @@ const truncateString = (str, maxLength = 60, placeholder = "[...]") => {
   const rightStop = stringLength - leftStop;
   return `${str.slice(0, leftStop)}${placeholder}${str.slice(-rightStop)}`;
 };
-const isInjection = (filename) => filename.includes(INJECTED_FILE);
-const isInternalPlugin = (pluginName, context) => {
-  for (const internalPluginName of context.pluginNames) {
-    if (pluginName.includes(internalPluginName)) {
-      return true;
-    }
-  }
-  return false;
-};
+const isInjectionFile = (filename) => filename.includes(INJECTED_FILE);
 
 var balancedMatch = balanced$1;
 function balanced$1(a, b, str) {
@@ -11317,18 +11310,13 @@ const cleanReport = (report, filepath, filter) => {
     const cleanedPath = cleanPath(reportFilepath);
     if (
       // Don't add injections.
-      isInjection(reportFilepath) || // Don't add itself into it.
+      isInjectionFile(reportFilepath) || // Don't add itself into it.
       cleanedPath === filepath || // Remove common specific files injected by bundlers.
       BUNDLER_SPECIFICS.includes(cleanedPath)
     ) {
       continue;
     }
-    if (filter) {
-      const filteredValue = filter(cleanedPath);
-      if (filteredValue) {
-        cleanedReport.add(filteredValue);
-      }
-    } else {
+    {
       cleanedReport.add(cleanedPath);
     }
   }
@@ -11338,16 +11326,16 @@ const cleanPath = (filepath) => {
   return filepath.split("!").pop().split(QUERY_RX).shift().replace(/^[^\w\s.,!@#$%^&*()=+~`\-/]+/, "");
 };
 const getAbsolutePath = (cwd, filepath) => {
-  if (isInjection(filepath)) {
+  if (isInjectionFile(filepath)) {
     return INJECTED_FILE;
   }
   if (filepath.startsWith(cwd)) {
     return filepath;
   }
-  return require$$1.resolve(cwd, filepath);
+  return path$i.resolve(cwd, filepath);
 };
 const cleanName = (context, filepath) => {
-  if (isInjection(filepath)) {
+  if (isInjectionFile(filepath)) {
     return INJECTED_FILE;
   }
   if (filepath === "unknown") {
@@ -11421,8 +11409,24 @@ const getEsbuildPlugin$2 = (context, log) => {
         const reportOutputsIndexed = {};
         const metaInputsIndexed = reIndexMeta(result.metafile.inputs, cwd);
         const metaOutputsIndexed = reIndexMeta(result.metafile.outputs, cwd);
+        const getRealPathFromInjectionProxy = (entryPoint) => {
+          if (!isInjectionFile(entryPoint)) {
+            return entryPoint;
+          }
+          const metaInput = metaInputsIndexed[getAbsolutePath(cwd, entryPoint)];
+          if (!metaInput) {
+            return entryPoint;
+          }
+          const actualImport = metaInput.imports.find(
+            (imp) => !isInjectionFile(imp.path)
+          );
+          if (!actualImport) {
+            return entryPoint;
+          }
+          return actualImport.path;
+        };
         for (const [filename, input] of Object.entries(result.metafile.inputs)) {
-          if (isInjection(filename)) {
+          if (isInjectionFile(filename)) {
             continue;
           }
           const filepath = getAbsolutePath(cwd, filename);
@@ -11443,7 +11447,7 @@ const getEsbuildPlugin$2 = (context, log) => {
           const cleanedName = cleanName(context, fullPath);
           const inputFiles = [];
           for (const inputName of Object.keys(output.inputs)) {
-            if (isInjection(inputName)) {
+            if (isInjectionFile(inputName)) {
               continue;
             }
             const inputFound = reportInputsIndexed[getAbsolutePath(cwd, inputName)];
@@ -11476,7 +11480,7 @@ const getEsbuildPlugin$2 = (context, log) => {
           if (!output.entryPoint) {
             continue;
           }
-          const inputFile = reportInputsIndexed[getAbsolutePath(cwd, output.entryPoint)];
+          const inputFile = reportInputsIndexed[getAbsolutePath(cwd, getRealPathFromInjectionProxy(output.entryPoint))];
           if (inputFile) {
             if (!entryNames.get(inputFile.name)) {
               continue;
@@ -11511,7 +11515,7 @@ const getEsbuildPlugin$2 = (context, log) => {
         };
         const FILE_EXCEPTIONS_RX = /(<runtime>|https:|file:|data:|#)/g;
         const isFileSupported = (filePath) => {
-          if (isInjection(filePath) || filePath.match(FILE_EXCEPTIONS_RX)) {
+          if (isInjectionFile(filePath) || filePath.match(FILE_EXCEPTIONS_RX)) {
             return false;
           }
           return true;
@@ -11788,239 +11792,177 @@ const getRollupPlugin$1 = (context, log) => {
 };
 
 const getWebpackPlugin$2 = (context, PLUGIN_NAME, log) => (compiler) => {
-  compiler.hooks.afterEmit.tap(PLUGIN_NAME, (compilation) => {
-    const inputs = [];
-    const outputs = [];
-    const entries = [];
-    context.build.errors = compilation.errors.map((err) => err.message) || [];
-    context.build.warnings = compilation.warnings.map((err) => err.message) || [];
-    const warn = (warning) => {
-      context.build.warnings.push(warning);
-      log(warning, "warn");
-    };
-    const stats = compilation.getStats().toJson({
-      all: false,
-      assets: true,
-      children: true,
-      chunks: true,
-      chunkGroupAuxiliary: true,
-      chunkGroupChildren: true,
-      chunkGroups: true,
-      chunkModules: true,
-      chunkRelations: true,
-      entrypoints: true,
-      errors: true,
-      ids: true,
-      modules: true,
-      nestedModules: true,
-      reasons: true,
-      relatedAssets: true,
-      warnings: true
-    });
-    const chunks = stats.chunks || [];
-    const assets = compilation.getAssets();
-    const modules = [];
-    const entrypoints = stats.entrypoints || [];
-    const tempSourcemaps = [];
-    const tempDeps = {};
-    const reportInputsIndexed = {};
-    const reportOutputsIndexed = {};
-    const modulePerId = /* @__PURE__ */ new Map();
-    const modulePerIdentifier = /* @__PURE__ */ new Map();
-    const concatModulesPerId = /* @__PURE__ */ new Map();
-    const concatModulesPerIdentifier = /* @__PURE__ */ new Map();
-    for (const module of stats.modules || []) {
-      if (module.modules) {
-        if (module.id) {
-          concatModulesPerId.set(module.id, module.modules);
-        }
-        if (module.identifier) {
-          concatModulesPerIdentifier.set(module.identifier, module.modules);
-        }
-        for (const subModule of module.modules) {
-          modules.push(subModule);
-          if (subModule.id) {
-            modulePerId.set(subModule.id, subModule);
-          }
-          if (subModule.identifier) {
-            modulePerIdentifier.set(subModule.identifier, subModule);
+  const inputs = [];
+  const outputs = [];
+  const entries = [];
+  const warnings = [];
+  const reportInputsIndexed = /* @__PURE__ */ new Map();
+  const reportOutputsIndexed = /* @__PURE__ */ new Map();
+  const modulesPerFile = /* @__PURE__ */ new Map();
+  const tempSourcemaps = [];
+  const tempDeps = /* @__PURE__ */ new Map();
+  const isModuleSupported = (moduleIdentifier) => {
+    return (
+      // Ignore unidentified modules and runtimes.
+      !!moduleIdentifier && !moduleIdentifier.startsWith("webpack/runtime") && !moduleIdentifier.includes("/webpack4/buildin/")
+    );
+  };
+  const warn = (warning) => {
+    warnings.push(warning);
+    log(warning, "warn");
+  };
+  compiler.hooks.thisCompilation.tap(PLUGIN_NAME, (compilation) => {
+    compilation.hooks.finishModules.tap(PLUGIN_NAME, (finishedModules) => {
+      const getModuleFromDep = (dep) => {
+        return compilation.moduleGraph ? compilation.moduleGraph.getModule(dep) : dep.module;
+      };
+      for (const module of finishedModules) {
+        const moduleIdentifier = module.identifier();
+        const dependencies = new Set(
+          [...module.dependencies, ...module.blocks.flatMap((b) => b.dependencies)].filter(
+            (dep) => (
+              // Ignore side effects.
+              dep.type !== "harmony side effect evaluation" && // Ignore those we can't identify.
+              getModuleFromDep(dep)?.identifier() && // Only what we support.
+              isModuleSupported(getModuleFromDep(dep)?.identifier()) && // Don't add itself as a dependency.
+              getModuleFromDep(dep)?.identifier() !== moduleIdentifier
+            )
+          ).map((dep) => {
+            return getModuleFromDep(dep)?.identifier();
+          }).filter(Boolean)
+        );
+        for (const depIdentifier of dependencies) {
+          const depDeps = tempDeps.get(depIdentifier) || {
+            dependencies: /* @__PURE__ */ new Set(),
+            dependents: /* @__PURE__ */ new Set()
+          };
+          depDeps.dependents.add(moduleIdentifier);
+          tempDeps.set(depIdentifier, depDeps);
+        }
+        if (!isModuleSupported(moduleIdentifier)) {
+          continue;
+        }
+        const moduleDeps = tempDeps.get(moduleIdentifier) || {
+          dependents: /* @__PURE__ */ new Set(),
+          dependencies: /* @__PURE__ */ new Set()
+        };
+        for (const moduleDep of dependencies) {
+          moduleDeps.dependencies.add(moduleDep);
+        }
+        tempDeps.set(moduleIdentifier, moduleDeps);
+        const file = {
+          size: module.size() || 0,
+          name: cleanName(context, moduleIdentifier),
+          dependencies: /* @__PURE__ */ new Set(),
+          dependents: /* @__PURE__ */ new Set(),
+          filepath: moduleIdentifier,
+          type: getType(moduleIdentifier)
+        };
+        inputs.push(file);
+        reportInputsIndexed.set(moduleIdentifier, file);
+      }
+      for (const input of inputs) {
+        const depsReport = tempDeps.get(input.filepath);
+        if (!depsReport) {
+          warn(`Could not find dependency report for ${input.name}`);
+          continue;
+        }
+        for (const dependency of depsReport.dependencies) {
+          const depInput = reportInputsIndexed.get(dependency);
+          if (!depInput) {
+            warn(`Could not find input of dependency ${dependency}`);
+            continue;
           }
+          input.dependencies.add(depInput);
         }
-      } else {
-        modules.push(module);
-        if (module.id) {
-          modulePerId.set(module.id, module);
+        for (const dependent of depsReport.dependents) {
+          const depInput = reportInputsIndexed.get(dependent);
+          if (!depInput) {
+            warn(`Could not find input of dependent ${dependent}`);
+            continue;
+          }
+          input.dependents.add(depInput);
         }
-        if (module.identifier) {
-          modulePerIdentifier.set(module.identifier, module);
+      }
+    });
+  });
+  compiler.hooks.afterEmit.tap(PLUGIN_NAME, (result) => {
+    const chunks = result.chunks;
+    const assets = result.getAssets();
+    const getChunkFiles = (chunk) => {
+      return [...chunk.files || [], ...chunk.auxiliaryFiles || []].map(
+        (f) => getAbsolutePath(context.bundler.outDir, f)
+      );
+    };
+    for (const chunk of chunks) {
+      const files = getChunkFiles(chunk);
+      const chunkModules = chunk.getModules().flatMap((m) => {
+        return "modules" in m && Array.isArray(m.modules) ? m.modules.map((m2) => m2.identifier()) : m.identifier();
+      }).filter(isModuleSupported);
+      for (const file of files) {
+        if (getType(file) === "map") {
+          continue;
         }
+        const fileModules = modulesPerFile.get(file) || [];
+        modulesPerFile.set(file, [...fileModules, ...chunkModules]);
       }
     }
     for (const asset of assets) {
       const file = {
-        size: asset.info.size || 0,
+        size: asset.source.size() || 0,
         name: asset.name,
         inputs: [],
         filepath: getAbsolutePath(context.bundler.outDir, asset.name),
         type: getType(asset.name)
       };
-      reportOutputsIndexed[file.filepath] = file;
+      reportOutputsIndexed.set(file.filepath, file);
       outputs.push(file);
       if (file.type === "map") {
         tempSourcemaps.push(file);
-      }
-    }
-    for (const sourcemap of tempSourcemaps) {
-      const outputFound = reportOutputsIndexed[sourcemap.filepath.replace(/\.map$/, "")];
-      if (!outputFound) {
-        warn(`Output not found for sourcemap ${sourcemap.name}`);
         continue;
       }
-      sourcemap.inputs.push(outputFound);
-    }
-    const getModulePath = (module) => {
-      return module.nameForCondition ? module.nameForCondition : module.name ? getAbsolutePath(context.cwd, module.name) : module.identifier ? module.identifier : "unknown";
-    };
-    const isModuleSupported = (module) => {
-      if (isInjection(getModulePath(module)) || // Do not report runtime modules as they are very specific to webpack.
-      module.moduleType === "runtime" || module.name?.startsWith("(webpack)") || // Also ignore orphan modules
-      module.type === "orphan modules") {
-        return false;
-      }
-      return true;
-    };
-    const getModules = (reason) => {
-      const { moduleIdentifier, moduleId } = reason;
-      if (!moduleIdentifier && !moduleId) {
-        return [];
-      }
-      const modulesFound = [];
-      if (moduleId) {
-        const module = modulePerId.get(moduleId);
-        if (module) {
-          modulesFound.push(module);
-        }
-        const concatModules = concatModulesPerId.get(moduleId);
-        if (concatModules) {
-          modulesFound.push(...concatModules);
-        }
-      }
-      if (moduleIdentifier) {
-        const module = modulePerIdentifier.get(moduleIdentifier);
-        if (module) {
-          modulesFound.push(module);
-        }
-        const concatModules = concatModulesPerIdentifier.get(moduleIdentifier);
-        if (concatModules) {
-          modulesFound.push(...concatModules);
-        }
-      }
-      return Array.from(new Set(modulesFound.map(getModulePath)));
-    };
-    const modulesDone = /* @__PURE__ */ new Set();
-    for (const module of modules) {
-      if (!isModuleSupported(module)) {
+      const fileModules = modulesPerFile.get(file.filepath);
+      if (!fileModules) {
+        warn(`Could not find modules for ${file.name}`);
         continue;
       }
-      const modulePath = getModulePath(module);
-      if (modulesDone.has(modulePath)) {
-        continue;
-      }
-      modulesDone.add(modulePath);
-      if (modulePath === "unknown") {
-        warn(`Unknown module: ${JSON.stringify(module)}`);
-      }
-      if (module.reasons) {
-        const moduleDeps = tempDeps[modulePath] || {
-          dependencies: /* @__PURE__ */ new Set(),
-          dependents: /* @__PURE__ */ new Set()
-        };
-        const dependents = module.reasons.flatMap(getModules);
-        for (const dependent of dependents) {
-          const reasonDeps = tempDeps[dependent] || {
-            dependencies: /* @__PURE__ */ new Set(),
-            dependents: /* @__PURE__ */ new Set()
-          };
-          reasonDeps.dependencies.add(modulePath);
-          tempDeps[dependent] = reasonDeps;
-          moduleDeps.dependents.add(dependent);
-        }
-        tempDeps[modulePath] = moduleDeps;
-      }
-      const file = {
-        size: module.size || 0,
-        name: cleanName(context, modulePath),
-        dependencies: /* @__PURE__ */ new Set(),
-        dependents: /* @__PURE__ */ new Set(),
-        filepath: modulePath,
-        type: getType(modulePath)
-      };
-      for (const chunkId of module.chunks || []) {
-        const chunkFound = chunks.find((chunk) => chunk.id === chunkId);
-        if (!chunkFound) {
+      for (const moduleIdentifier of fileModules) {
+        const inputFound = reportInputsIndexed.get(moduleIdentifier);
+        if (!inputFound) {
+          warn(`Could not find input of ${moduleIdentifier}`);
           continue;
         }
-        const chunkFiles = chunkFound.files || [];
-        if (chunkFound.auxiliaryFiles) {
-          chunkFiles.push(...chunkFound.auxiliaryFiles);
-        }
-        const outputFound = outputs.find((output) => chunkFiles.includes(output.name));
-        if (!outputFound) {
-          warn(`Output not found for ${file.name}`);
-          continue;
-        }
-        if (!outputFound.inputs.includes(file)) {
-          outputFound.inputs.push(file);
-        }
+        file.inputs.push(inputFound);
       }
-      reportInputsIndexed[modulePath] = file;
-      inputs.push(file);
     }
-    const getInput = (filepath) => {
-      const inputFound = reportInputsIndexed[filepath];
-      if (!inputFound) {
-        warn(`Could not find input of ${filepath}`);
-      }
-      return inputFound;
-    };
-    for (const input of inputs) {
-      const depsReport = tempDeps[input.filepath];
-      if (!depsReport) {
-        warn(`Could not find dependency report for ${input.name}`);
+    for (const sourcemap of tempSourcemaps) {
+      const outputFound = reportOutputsIndexed.get(
+        sourcemap.filepath.replace(/\.map$/, "")
+      );
+      if (!outputFound) {
+        warn(`Output not found for sourcemap ${sourcemap.name}`);
         continue;
       }
-      input.dependencies = cleanReport(depsReport.dependencies, input.filepath, getInput);
-      input.dependents = cleanReport(depsReport.dependents, input.filepath, getInput);
+      sourcemap.inputs.push(outputFound);
     }
-    for (const [name, entry] of Object.entries(entrypoints)) {
+    for (const [name, entrypoint] of result.entrypoints) {
       const entryOutputs = [];
       const entryInputs = [];
       let size = 0;
-      const entryAssets = entry.assets || [];
-      if (entry.auxiliaryAssets) {
-        entryAssets.push(...entry.auxiliaryAssets);
-      }
-      for (const asset of entryAssets) {
-        let assetPath;
-        if (typeof asset === "string") {
-          assetPath = getAbsolutePath(context.bundler.outDir, asset);
-        } else if (typeof asset.name === "string") {
-          assetPath = getAbsolutePath(context.bundler.outDir, asset.name);
-        }
-        if (!assetPath || !reportOutputsIndexed[assetPath]) {
-          warn(`Could not find output of ${JSON.stringify(asset)}`);
+      const entryFiles = entrypoint.chunks.flatMap(getChunkFiles);
+      const entryFilename = entrypoint.chunks.filter((c) => c.entryModule).flatMap((c) => Array.from(c.files))[0];
+      for (const file2 of entryFiles) {
+        const outputFound = reportOutputsIndexed.get(file2);
+        if (!file2 || !outputFound) {
+          warn(`Could not find output of ${JSON.stringify(file2)}`);
           continue;
         }
-        const outputFound = reportOutputsIndexed[assetPath];
-        if (outputFound) {
-          if (outputFound.type !== "map" && !entryOutputs.includes(outputFound)) {
-            entryOutputs.push(outputFound);
-            entryInputs.push(...outputFound.inputs);
-            size += outputFound.size;
-          }
+        if (outputFound.type !== "map" && !entryOutputs.includes(outputFound)) {
+          entryOutputs.push(outputFound);
+          entryInputs.push(...outputFound.inputs);
+          size += outputFound.size;
         }
       }
-      const entryFilename = stats.assetsByChunkName?.[name]?.[0];
       const file = {
         name,
         filepath: entryFilename ? getAbsolutePath(context.bundler.outDir, entryFilename) : "unknown",
@@ -12031,6 +11973,8 @@ const getWebpackPlugin$2 = (context, PLUGIN_NAME, log) => (compiler) => {
       };
       entries.push(file);
     }
+    context.build.errors = result.errors.map((err) => err.message);
+    context.build.warnings = [...warnings, ...result.warnings.map((err) => err.message)];
     context.build.inputs = inputs;
     context.build.outputs = outputs;
     context.build.entries = entries;
@@ -12077,7 +12021,7 @@ const getBundlerReportPlugin = (opts, globalContext) => {
           globalContext.bundler.outDir = build.initialOptions.outdir;
         }
         if (build.initialOptions.outfile) {
-          globalContext.bundler.outDir = require$$1.dirname(build.initialOptions.outfile);
+          globalContext.bundler.outDir = path$i.dirname(build.initialOptions.outfile);
         }
         build.initialOptions.metafile = true;
       }
@@ -12998,7 +12942,7 @@ function requireNode$1 () {
 	hasRequiredNode$1 = 1;
 	(function (module, exports) {
 		const tty = require$$0$1;
-		const util = require$$1$1;
+		const util = require$$1;
 
 		/**
 		 * This is the Node.js implementation of `debug()`.
@@ -13911,7 +13855,7 @@ function requireNode () {
 	hasRequiredNode = 1;
 	(function (module, exports) {
 		const tty = require$$0$1;
-		const util = require$$1$1;
+		const util = require$$1;
 
 		/**
 		 * This is the Node.js implementation of `debug()`.
@@ -19057,21 +19001,19 @@ const processInjections = async (toInject, log) => {
   return results.filter(Boolean);
 };
 
-const getInjectionPlugins = (opts, context, toInject) => {
+const getInjectionPlugins = (bundler, opts, context, toInject) => {
   const log = getLogger(opts.logLevel, PLUGIN_NAME$4);
   const contentToInject = [];
   const getContentToInject = () => {
-    contentToInject.unshift(
-      // Needs at least one element otherwise ESBuild will throw 'Do not know how to load path'.
-      // Most likely because it tries to generate an empty file.
-      `
+    const before = `
 /********************************************/
-/* BEGIN INJECTION BY DATADOG BUILD PLUGINS */`
-    );
-    contentToInject.push(`
+/* BEGIN INJECTION BY DATADOG BUILD PLUGINS */`;
+    const after = `
 /*  END INJECTION BY DATADOG BUILD PLUGINS  */
-/********************************************/`);
-    return contentToInject.join("\n\n");
+/********************************************/`;
+    return `${before}
+${contentToInject.join("\n\n")}
+${after}`;
   };
   const rollupInjectionPlugin = {
     banner(chunk) {
@@ -19081,28 +19023,8 @@ const getInjectionPlugins = (opts, context, toInject) => {
       return "";
     }
   };
-  return [
-    // Resolve the injected file.
-    {
-      name: RESOLUTION_PLUGIN_NAME,
-      enforce: "pre",
-      resolveId(id) {
-        if (isInjection(id)) {
-          return { id, moduleSideEffects: true };
-        }
-      },
-      loadInclude(id) {
-        if (isInjection(id)) {
-          return true;
-        }
-      },
-      load(id) {
-        if (isInjection(id)) {
-          return getContentToInject();
-        }
-      }
-    },
-    // Prepare and fetch the content to inject.
+  const plugins = [
+    // Prepare and fetch the content to inject for all bundlers.
     {
       name: PREPARATION_PLUGIN_NAME,
       enforce: "pre",
@@ -19110,75 +19032,79 @@ const getInjectionPlugins = (opts, context, toInject) => {
       async buildStart() {
         const results = await processInjections(toInject, log);
         contentToInject.push(...results);
+        if (context.bundler.name !== "esbuild") {
+          return;
+        }
+        const absolutePathInjectFile = path$i.resolve(
+          context.bundler.outDir,
+          INJECTED_FILE_PATH
+        );
+        try {
+          await fs$j.promises.mkdir(path$i.dirname(absolutePathInjectFile), {
+            recursive: true
+          });
+          await fs$j.promises.writeFile(absolutePathInjectFile, getContentToInject());
+        } catch (e) {
+          log(`Could not create the file: ${e.message}`, "error");
+        }
+      },
+      async buildEnd() {
+        if (context.bundler.name !== "esbuild") {
+          return;
+        }
+        const absolutePathInjectFile = path$i.resolve(
+          context.bundler.outDir,
+          INJECTED_FILE_PATH
+        );
+        await fs$j.promises.rm(absolutePathInjectFile, {
+          force: true,
+          maxRetries: 3,
+          recursive: true
+        });
       }
     },
-    // Inject the virtual file that will be home of all injected content.
+    // Inject the file that will be home of all injected content.
+    // Each bundler has its own way to inject a file.
     {
       name: PLUGIN_NAME$4,
       esbuild: {
         setup(build) {
           const { initialOptions } = build;
-          const initialInject = initialOptions.inject ? [...initialOptions.inject] : [];
-          const plugins = initialOptions.plugins || [];
+          const absolutePathInjectFile = path$i.resolve(
+            context.bundler.outDir,
+            INJECTED_FILE_PATH
+          );
           initialOptions.inject = initialOptions.inject || [];
-          initialOptions.inject.push(INJECTED_FILE);
-          for (const plugin of plugins) {
-            const oldSetup = plugin.setup;
-            if (isInternalPlugin(plugin.name, context)) {
-              continue;
-            }
-            plugin.setup = async (esbuild) => {
-              esbuild.initialOptions.inject = initialInject;
-              await oldSetup(esbuild);
-            };
-          }
+          initialOptions.inject.push(absolutePathInjectFile);
         }
       },
       webpack: (compiler) => {
-        const injectEntry = (originalEntry) => {
-          if (!originalEntry) {
-            return [INJECTED_FILE];
-          }
-          if (Array.isArray(originalEntry)) {
-            return [INJECTED_FILE, ...originalEntry];
-          }
-          if (typeof originalEntry === "function") {
-            return async () => {
-              const originEntry = await originalEntry();
-              return [INJECTED_FILE, originEntry];
-            };
-          }
-          if (typeof originalEntry === "string") {
-            return [INJECTED_FILE, originalEntry];
-          }
-          if (typeof originalEntry === "object") {
-            const newEntry = {};
-            if (Object.keys(originalEntry).length === 0) {
-              newEntry[INJECTED_FILE] = // Webpack 4 and 5 have different entry formats.
-              context.bundler.variant === "5" ? { import: [INJECTED_FILE] } : INJECTED_FILE;
-              return newEntry;
-            }
-            for (const entryName in originalEntry) {
-              if (!Object.hasOwn(originalEntry, entryName)) {
-                continue;
+        const BannerPlugin = compiler?.webpack?.BannerPlugin || bundler?.BannerPlugin || bundler?.default?.BannerPlugin;
+        if (!BannerPlugin) {
+          log("Missing BannerPlugin", "error");
+        }
+        compiler.options.plugins = compiler.options.plugins || [];
+        compiler.options.plugins.push(
+          new BannerPlugin({
+            // Not wrapped in comments.
+            raw: true,
+            // Not sure this is actually working, but it's supposed to only add
+            // the banner to entry modules.
+            entryOnly: true,
+            banner({ chunk }) {
+              if (!chunk?.entryModule) {
+                return "";
               }
-              const entry = originalEntry[entryName];
-              newEntry[entryName] = // Webpack 4 and 5 have different entry formats.
-              typeof entry === "string" ? [INJECTED_FILE, entry] : {
-                ...entry,
-                import: [INJECTED_FILE, ...entry.import]
-              };
+              return getContentToInject();
             }
-            return newEntry;
-          }
-          return [INJECTED_FILE, originalEntry];
-        };
-        compiler.options.entry = injectEntry(compiler.options.entry);
+          })
+        );
       },
       rollup: rollupInjectionPlugin,
       vite: rollupInjectionPlugin
     }
   ];
+  return plugins;
 };
 
 const getInternalPlugins = (options, meta) => {
@@ -19192,7 +19118,8 @@ const getInternalPlugins = (options, meta) => {
       name: meta.framework,
       fullName: `${meta.framework}${variant}`,
       variant,
-      outDir: cwd
+      outDir: cwd,
+      version: meta.bundler.version || meta.bundler.VERSION
     },
     build: {
       errors: [],
@@ -19208,7 +19135,7 @@ const getInternalPlugins = (options, meta) => {
   const bundlerReportPlugin = getBundlerReportPlugin(options, globalContext);
   const buildReportPlugin = getBuildReportPlugin(options, globalContext);
   const gitPlugin = getGitPlugin(options, globalContext);
-  const injectionPlugins = getInjectionPlugins(options, globalContext, toInject);
+  const injectionPlugins = getInjectionPlugins(meta.bundler, options, globalContext, toInject);
   return {
     globalContext,
     internalPlugins: [bundlerReportPlugin, buildReportPlugin, gitPlugin, ...injectionPlugins]
@@ -19382,12 +19309,12 @@ if (typeof module !== "undefined") {
 }
 
 const decomposePath = (options, context, sourcemapFilePath) => {
-  if (require$$1.extname(sourcemapFilePath) !== ".map") {
+  if (path$i.extname(sourcemapFilePath) !== ".map") {
     throw new Error(`The file ${chalk.green.bold(sourcemapFilePath)} is not a sourcemap.`);
   }
   const minifiedFilePath = sourcemapFilePath.replace(/\.map$/, "");
   const relativePath = minifiedFilePath.replace(context.bundler.outDir, "");
-  const minifiedUrl = options.minifiedPathPrefix ? require$$1.join(options.minifiedPathPrefix, relativePath) : relativePath;
+  const minifiedUrl = options.minifiedPathPrefix ? path$i.join(options.minifiedPathPrefix, relativePath) : relativePath;
   return {
     minifiedFilePath,
     minifiedUrl,
@@ -20260,7 +20187,7 @@ const getPayload = async (sourcemap, metadata, prefix, git) => {
                 sourcemap.sourcemapFilePath,
                 (reason) => {
                   warnings.push(
-                    `${require$$1.basename(sourcemap.sourcemapFilePath)}: "${reason}"`
+                    `${path$i.basename(sourcemap.sourcemapFilePath)}: "${reason}"`
                   );
                 }
               ),
@@ -21081,7 +21008,7 @@ var polyfills = polyfills$1;
 var legacy = legacyStreams;
 var clone = clone_1;
 
-var util = require$$1$1;
+var util = require$$1;
 
 /* istanbul ignore next - node 0.x polyfill */
 var gracefulQueue;
@@ -21631,7 +21558,7 @@ function retry () {
 	}; 
 } (fs$i));
 
-const path$g = require$$1;
+const path$g = path$i;
 
 // get drive on windows
 function getRootPath (p) {
@@ -21656,7 +21583,7 @@ var win32 = {
 };
 
 const fs$g = gracefulFs;
-const path$f = require$$1;
+const path$f = path$i;
 const invalidWin32Path$1 = win32.invalidWin32Path;
 
 const o777$1 = parseInt('0777', 8);
@@ -21718,7 +21645,7 @@ function mkdirs$2 (p, opts, callback, made) {
 var mkdirs_1$1 = mkdirs$2;
 
 const fs$f = gracefulFs;
-const path$e = require$$1;
+const path$e = path$i;
 const invalidWin32Path = win32.invalidWin32Path;
 
 const o777 = parseInt('0777', 8);
@@ -21786,7 +21713,7 @@ var mkdirs_1 = {
 
 const fs$e = gracefulFs;
 const os = require$$0;
-const path$d = require$$1;
+const path$d = path$i;
 
 // HFS, ext{2,3}, FAT do not, Node.js v0.10 does not
 function hasMillisResSync () {
@@ -21875,7 +21802,7 @@ var buffer$1 = function (size) {
 };
 
 const fs$d = gracefulFs;
-const path$c = require$$1;
+const path$c = path$i;
 const mkdirpSync$1 = mkdirs_1.mkdirsSync;
 const utimesSync = utimes$1.utimesMillisSync;
 
@@ -22083,7 +22010,7 @@ var pathExists_1 = {
 };
 
 const fs$b = gracefulFs;
-const path$b = require$$1;
+const path$b = path$i;
 const mkdirp$1 = mkdirs_1.mkdirs;
 const pathExists$7 = pathExists_1.pathExists;
 const utimes = utimes$1.utimesMillis;
@@ -22333,7 +22260,7 @@ var copy$1 = {
 };
 
 const fs$a = gracefulFs;
-const path$a = require$$1;
+const path$a = path$i;
 const assert = require$$5;
 
 const isWindows = (process.platform === 'win32');
@@ -22655,7 +22582,7 @@ var remove$3 = {
 
 const u$7 = universalify.fromCallback;
 const fs$9 = fs$j;
-const path$9 = require$$1;
+const path$9 = path$i;
 const mkdir$5 = mkdirs_1;
 const remove$2 = remove$3;
 
@@ -22701,7 +22628,7 @@ var empty$2 = {
 };
 
 const u$6 = universalify.fromCallback;
-const path$8 = require$$1;
+const path$8 = path$i;
 const fs$8 = gracefulFs;
 const mkdir$4 = mkdirs_1;
 const pathExists$6 = pathExists_1.pathExists;
@@ -22749,7 +22676,7 @@ var file$1 = {
 };
 
 const u$5 = universalify.fromCallback;
-const path$7 = require$$1;
+const path$7 = path$i;
 const fs$7 = gracefulFs;
 const mkdir$3 = mkdirs_1;
 const pathExists$5 = pathExists_1.pathExists;
@@ -22808,7 +22735,7 @@ var link$1 = {
   createLinkSync
 };
 
-const path$6 = require$$1;
+const path$6 = path$i;
 const fs$6 = gracefulFs;
 const pathExists$4 = pathExists_1.pathExists;
 
@@ -22937,7 +22864,7 @@ var symlinkType_1 = {
 };
 
 const u$4 = universalify.fromCallback;
-const path$5 = require$$1;
+const path$5 = path$i;
 const fs$4 = gracefulFs;
 const _mkdirs = mkdirs_1;
 const mkdirs = _mkdirs.mkdirs;
@@ -23166,7 +23093,7 @@ var jsonfile = {
   writeJsonSync: jsonFile$3.writeFileSync
 };
 
-const path$4 = require$$1;
+const path$4 = path$i;
 const mkdir$2 = mkdirs_1;
 const pathExists$2 = pathExists_1.pathExists;
 const jsonFile$2 = jsonfile;
@@ -23193,7 +23120,7 @@ function outputJson (file, data, options, callback) {
 var outputJson_1 = outputJson;
 
 const fs$3 = gracefulFs;
-const path$3 = require$$1;
+const path$3 = path$i;
 const mkdir$1 = mkdirs_1;
 const jsonFile$1 = jsonfile;
 
@@ -23225,7 +23152,7 @@ jsonFile.readJSONSync = jsonFile.readJsonSync;
 var json = jsonFile;
 
 const fs$2 = gracefulFs;
-const path$2 = require$$1;
+const path$2 = path$i;
 const copySync = copySync$1.copySync;
 const removeSync = remove$3.removeSync;
 const mkdirpSync = mkdirs_1.mkdirsSync;
@@ -23342,7 +23269,7 @@ var moveSync_1 = {
 
 const u$1 = universalify.fromCallback;
 const fs$1 = gracefulFs;
-const path$1 = require$$1;
+const path$1 = path$i;
 const copy = copy$1.copy;
 const remove$1 = remove$3.remove;
 const mkdirp = mkdirs_1.mkdirp;
@@ -23423,7 +23350,7 @@ var move_1 = {
 
 const u = universalify.fromCallback;
 const fs = gracefulFs;
-const path = require$$1;
+const path = path$i;
 const mkdir = mkdirs_1;
 const pathExists = pathExists_1.pathExists;
 
@@ -23893,7 +23820,7 @@ const outputFiles = async (data, outputOptions, log, cwd) => {
   } else if (typeof outputOptions === "string") {
     destination = outputOptions;
   }
-  const outputPath = require$$1.resolve(cwd, destination);
+  const outputPath = path$i.resolve(cwd, destination);
   try {
     const errors = {};
     const filesToWrite = {};
@@ -23912,7 +23839,7 @@ const outputFiles = async (data, outputOptions, log, cwd) => {
     const proms = Object.keys(filesToWrite).map((file) => {
       const start = Date.now();
       log(`Start writing ${file}.json.`);
-      return writeFile(require$$1.join(outputPath, `${file}.json`), filesToWrite[file].content).then(() => {
+      return writeFile(path$i.join(outputPath, `${file}.json`), filesToWrite[file].content).then(() => {
         log(`Wrote ${file}.json in ${formatDuration(Date.now() - start)}`);
       }).catch((e) => {
         log(
@@ -34284,7 +34211,7 @@ virtualStats.VirtualStats = VirtualStats;
 var __importDefault = (commonjsGlobal && commonjsGlobal.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
-const path_1 = __importDefault(require$$1);
+const path_1 = __importDefault(path$i);
 const virtual_stats_1 = virtualStats;
 let inode = 45000000;
 const ALL = 'all';
@@ -34568,7 +34495,7 @@ var VirtualModulesPlugin$1 = /*@__PURE__*/getDefaultExportFromCjs(lib);
 
 // node_modules/.pnpm/tsup@8.0.2_typescript@5.4.5/node_modules/tsup/assets/esm_shims.js
 var getFilename = () => fileURLToPath$1(import.meta.url);
-var getDirname = () => require$$1.dirname(getFilename());
+var getDirname = () => path$i.dirname(getFilename());
 var __dirname = /* @__PURE__ */ getDirname();
 
 // node_modules/.pnpm/@jridgewell+sourcemap-codec@1.4.15/node_modules/@jridgewell/sourcemap-codec/dist/sourcemap-codec.mjs
@@ -35369,7 +35296,7 @@ var ExtToLoader = {
   ".txt": "text"
 };
 function guessLoader(code, id) {
-  return ExtToLoader[require$$1.extname(id).toLowerCase()] || "js";
+  return ExtToLoader[path$i.extname(id).toLowerCase()] || "js";
 }
 function unwrapLoader(loader, code, id) {
   if (typeof loader === "function")
@@ -35443,8 +35370,8 @@ function createBuildContext(initialOptions) {
     emitFile(emittedFile) {
       const outFileName = emittedFile.fileName || emittedFile.name;
       if (initialOptions.outdir && emittedFile.source && outFileName) {
-        const outPath = require$$1.resolve(initialOptions.outdir, outFileName);
-        const outDir = require$$1.dirname(outPath);
+        const outPath = path$i.resolve(initialOptions.outdir, outFileName);
+        const outDir = path$i.dirname(outPath);
         if (!fs$j.existsSync(outDir))
           fs$j.mkdirSync(outDir, { recursive: true });
         fs$j.writeFileSync(outPath, emittedFile.source);
@@ -35645,7 +35572,7 @@ function buildSetup(meta) {
         onLoad({ filter: onLoadFilter }, async (args) => {
           const id = args.path + args.suffix;
           const { errors, warnings, mixedContext } = createPluginContext(context);
-          const resolveDir = require$$1.dirname(args.path);
+          const resolveDir = path$i.dirname(args.path);
           let code, map;
           if (plugin.load && (!plugin.loadInclude || plugin.loadInclude(id))) {
             const result = await plugin.load.call(mixedContext, id);
@@ -35676,7 +35603,7 @@ function buildSetup(meta) {
           if (plugin.transformInclude && !plugin.transformInclude(id))
             return;
           const { mixedContext, errors, warnings } = createPluginContext(context);
-          const resolveDir = require$$1.dirname(args.path);
+          const resolveDir = path$i.dirname(args.path);
           let code = await args.getContents();
           let map;
           const result = await plugin.transform.call(mixedContext, code, id);
@@ -35768,7 +35695,7 @@ var ExtToLoader2 = {
   ".node": "napi"
 };
 function guessIdLoader(id) {
-  return ExtToLoader2[require$$1.extname(id).toLowerCase()] || "js";
+  return ExtToLoader2[path$i.extname(id).toLowerCase()] || "js";
 }
 function transformQuery(context) {
   const queryParamsObject = {};
@@ -35858,7 +35785,7 @@ function toFarmPlugin(plugin, options) {
     farmPlugin.resolve = {
       filters: { sources: [".*", ...filters], importers: [".*"] },
       async executor(params, context) {
-        const resolvedIdPath = require$$1.resolve(
+        const resolvedIdPath = path$i.resolve(
           process.cwd(),
           params.importer ?? ""
         );
@@ -36440,6 +36367,7 @@ const validateOptions = (options = {}) => {
 };
 const HOST_NAME = "datadog-build-plugins";
 const buildPluginFactory = ({
+  bundler,
   version
 }) => {
   return createUnplugin((opts, unpluginMetaContext) => {
@@ -36448,6 +36376,7 @@ const buildPluginFactory = ({
       unpluginMetaContext.esbuildHostName = HOST_NAME;
     }
     const { globalContext, internalPlugins } = getInternalPlugins(options, {
+      bundler,
       version,
       ...unpluginMetaContext
     });
@@ -36470,7 +36399,7 @@ const buildPluginFactory = ({
 
 var name = "@datadog/esbuild-plugin";
 var packageManager = "yarn@4.0.2";
-var version$1 = "2.3.1-dev-8";
+var version$1 = "2.3.1-dev-10";
 var license = "MIT";
 var author = "Datadog";
 var description = "Datadog ESBuild Plugin";
@@ -36558,6 +36487,7 @@ var pkg = {
 };
 
 const datadogEsbuildPlugin = buildPluginFactory({
+  bundler: esbuild,
   version: pkg.version
 }).esbuild;
 const version = pkg.version;