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

package/dist/src/index.mjs

@@ -2354,14 +2354,6 @@ const truncateString = (str, maxLength = 60, placeholder = "[...]") => {
   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;
-};
 
 var balancedMatch = balanced$1;
 function balanced$1(a, b, str) {
@@ -19061,17 +19053,15 @@ const getInjectionPlugins = (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) {
@@ -19082,11 +19072,11 @@ const getInjectionPlugins = (opts, context, toInject) => {
     }
   };
   return [
-    // Resolve the injected file.
+    // Resolve the injected file for all bundlers.
     {
       name: RESOLUTION_PLUGIN_NAME,
       enforce: "pre",
-      resolveId(id) {
+      async resolveId(id) {
         if (isInjection(id)) {
           return { id, moduleSideEffects: true };
         }
@@ -19102,7 +19092,7 @@ const getInjectionPlugins = (opts, context, toInject) => {
         }
       }
     },
-    // Prepare and fetch the content to inject.
+    // Prepare and fetch the content to inject for all bundlers.
     {
       name: PREPARATION_PLUGIN_NAME,
       enforce: "pre",
@@ -19113,25 +19103,53 @@ const getInjectionPlugins = (opts, context, toInject) => {
       }
     },
     // Inject the virtual 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 || [];
-          initialOptions.inject = initialOptions.inject || [];
-          initialOptions.inject.push(INJECTED_FILE);
-          for (const plugin of plugins) {
-            const oldSetup = plugin.setup;
-            if (isInternalPlugin(plugin.name, context)) {
-              continue;
+          build.onResolve({ filter: /.*/ }, async (args) => {
+            if (args.kind !== "entry-point") {
+              return null;
+            }
+            if (initialOptions.inject?.includes(args.path)) {
+              return null;
+            }
+            return {
+              pluginName: PLUGIN_NAME$4,
+              path: require$$1.isAbsolute(args.path) ? args.path : require$$1.join(args.resolveDir, args.path),
+              pluginData: {
+                isInjectionResolver: true,
+                originalPath: args.path,
+                originalResolveDir: args.resolveDir
+              },
+              // Adding a suffix prevents esbuild from marking the entrypoint as resolved,
+              // avoiding a dependency loop with the proxy module.
+              // This ensures esbuild continues to traverse the module tree
+              // and re-resolves the entrypoint when imported from the proxy module.
+              suffix: "?datadogInjected=true"
+            };
+          });
+          build.onLoad({ filter: /.*/ }, async (args) => {
+            if (!args.pluginData?.isInjectionResolver) {
+              return null;
             }
-            plugin.setup = async (esbuild) => {
-              esbuild.initialOptions.inject = initialInject;
-              await oldSetup(esbuild);
+            const originalPath = args.pluginData.originalPath;
+            const originalResolveDir = args.pluginData.originalResolveDir;
+            const contents = `
+import ${JSON.stringify(INJECTED_FILE)};
+import * as OriginalModule from ${JSON.stringify(originalPath)};
+export default OriginalModule['default'.toString()];
+export * from ${JSON.stringify(originalPath)};
+`;
+            return {
+              loader: "js",
+              pluginName: PLUGIN_NAME$4,
+              contents,
+              resolveDir: originalResolveDir
             };
-          }
+          });
         }
       },
       webpack: (compiler) => {
@@ -36470,7 +36488,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-9";
 var license = "MIT";
 var author = "Datadog";
 var description = "Datadog ESBuild Plugin";