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

package/dist/src/index.d.ts

@@ -96,6 +96,7 @@ type GlobalContext = {
     build: BuildReport;
     cwd: string;
     git?: RepositoryData;
+    pluginNames: string[];
     start: number;
     version: string;
 };

package/dist/src/index.js

@@ -12066,7 +12066,7 @@ const getBuildReportPlugin = (opts, context) => {
   };
 };
 
-const PLUGIN_NAME$2 = "datadog-context-plugin";
+const PLUGIN_NAME$2 = "datadog-bundler-report-plugin";
 const rollupPlugin = (context) => ({
   options(options) {
     context.bundler.rawConfig = options;
@@ -19076,17 +19076,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) {
@@ -19097,11 +19095,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 };
         }
@@ -19117,7 +19115,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",
@@ -19128,13 +19126,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;
-          initialOptions.inject = initialOptions.inject || [];
-          initialOptions.inject.push(INJECTED_FILE);
+          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;
+            }
+            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) => {
@@ -19190,6 +19228,7 @@ const getInternalPlugins = (options, meta) => {
   const toInject = [];
   const globalContext = {
     auth: options.auth,
+    pluginNames: [],
     bundler: {
       name: meta.framework,
       fullName: `${meta.framework}${variant}`,
@@ -36440,18 +36479,20 @@ const validateOptions = (options = {}) => {
     ...options
   };
 };
+const HOST_NAME = "datadog-build-plugins";
 const buildPluginFactory = ({
   version
 }) => {
   return createUnplugin((opts, unpluginMetaContext) => {
     const options = validateOptions(opts);
-    if ("esbuildHostName" in unpluginMetaContext) {
-      unpluginMetaContext.esbuildHostName = "datadog-plugins";
+    if (unpluginMetaContext.framework === "esbuild") {
+      unpluginMetaContext.esbuildHostName = HOST_NAME;
     }
     const { globalContext, internalPlugins } = getInternalPlugins(options, {
       version,
       ...unpluginMetaContext
     });
+    globalContext.pluginNames.push(HOST_NAME);
     const plugins = [...internalPlugins];
     if (options.customPlugins) {
       const customPlugins = options.customPlugins(options, globalContext);
@@ -36463,13 +36504,14 @@ const buildPluginFactory = ({
     if (options[CONFIG_KEY] && options[CONFIG_KEY].disabled !== true) {
       plugins.push(...getPlugins(options, globalContext));
     }
+    globalContext.pluginNames.push(...plugins.map((plugin) => plugin.name));
     return plugins;
   });
 };
 
 var name = "@datadog/esbuild-plugin";
 var packageManager = "yarn@4.0.2";
-var version$1 = "2.3.1-dev-7";
+var version$1 = "2.3.1-dev-9";
 var license = "MIT";
 var author = "Datadog";
 var description = "Datadog ESBuild Plugin";