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

package/dist/src/index.js

@@ -2296,7 +2296,6 @@ var retry$2 = /*@__PURE__*/getDefaultExportFromCjs(lib$3);
 const PREPARATION_PLUGIN_NAME = "datadog-injection-preparation-plugin";
 const PLUGIN_NAME$4 = "datadog-injection-plugin";
 const INJECTED_FILE = "__datadog-helper-file";
-const INJECTED_FILE_PATH = `${INJECTED_FILE}.js`;
 const DISTANT_FILE_RX = /^https?:\/\//;
 
 const formatDuration = (duration) => {
@@ -11827,7 +11826,7 @@ const getWebpackPlugin$2 = (context, PLUGIN_NAME, log) => (compiler) => {
   const isModuleSupported = (moduleIdentifier) => {
     return (
       // Ignore unidentified modules and runtimes.
-      !!moduleIdentifier && !moduleIdentifier.startsWith("webpack/runtime") && !moduleIdentifier.includes("/webpack4/buildin/")
+      !!moduleIdentifier && !moduleIdentifier.startsWith("webpack/runtime") && !moduleIdentifier.includes("/webpack4/buildin/") && !moduleIdentifier.startsWith("multi ")
     );
   };
   const warn = (warning) => {
@@ -11854,6 +11853,9 @@ const getWebpackPlugin$2 = (context, PLUGIN_NAME, log) => (compiler) => {
             return getModuleFromDep(dep)?.identifier();
           }).filter(Boolean)
         );
+        if (!isModuleSupported(moduleIdentifier)) {
+          continue;
+        }
         for (const depIdentifier of dependencies) {
           const depDeps = tempDeps.get(depIdentifier) || {
             dependencies: /* @__PURE__ */ new Set(),
@@ -11862,9 +11864,6 @@ const getWebpackPlugin$2 = (context, PLUGIN_NAME, log) => (compiler) => {
           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()
@@ -11917,9 +11916,10 @@ const getWebpackPlugin$2 = (context, PLUGIN_NAME, log) => (compiler) => {
         (f) => getAbsolutePath(context.bundler.outDir, f)
       );
     };
+    const chunkGraph = result.chunkGraph;
     for (const chunk of chunks) {
       const files = getChunkFiles(chunk);
-      const chunkModules = chunk.getModules().flatMap((m) => {
+      const chunkModules = (chunkGraph ? chunkGraph?.getChunkModules(chunk) : 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) {
@@ -11973,7 +11973,12 @@ const getWebpackPlugin$2 = (context, PLUGIN_NAME, log) => (compiler) => {
       const entryInputs = [];
       let size = 0;
       const entryFiles = entrypoint.chunks.flatMap(getChunkFiles);
-      const entryFilename = entrypoint.chunks.filter((c) => c.entryModule).flatMap((c) => Array.from(c.files))[0];
+      const entryFilename = entrypoint.chunks.filter(
+        (c) => (
+          // Webpack5 forces you to use the chunkGraph to get the modules.
+          chunkGraph ? chunkGraph.getNumberOfEntryModules(c) > 0 : c.hasEntryModule()
+        )
+      ).flatMap((c) => Array.from(c.files))[0];
       for (const file2 of entryFiles) {
         const outputFound = reportOutputsIndexed.get(file2);
         if (!file2 || !outputFound) {
@@ -19046,6 +19051,7 @@ ${after}`;
       return "";
     }
   };
+  const INJECTED_FILE_PATH = `${Math.random().toString().replace("0.", "")}_${INJECTED_FILE}.js`;
   const plugins = [
     // Prepare and fetch the content to inject for all bundlers.
     {
@@ -19103,22 +19109,36 @@ ${after}`;
       },
       webpack: (compiler) => {
         const BannerPlugin = compiler?.webpack?.BannerPlugin || bundler?.BannerPlugin || bundler?.default?.BannerPlugin;
+        compiler?.webpack?.ChunkGraph || bundler?.ChunkGraph || bundler?.default?.ChunkGraph;
         if (!BannerPlugin) {
           log("Missing BannerPlugin", "error");
         }
+        let chunkGraph;
+        compiler.hooks.thisCompilation.tap(PLUGIN_NAME$4, (compilation) => {
+          compilation.hooks.afterChunks.tap(PLUGIN_NAME$4, () => {
+            chunkGraph = compilation.chunkGraph;
+          });
+        });
         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
+            // Doesn't seem to work, but it's supposed to only add
             // the banner to entry modules.
             entryOnly: true,
-            banner({ chunk }) {
-              if (!chunk?.entryModule) {
-                return "";
+            banner(data) {
+              if (context.bundler.variant === "5") {
+                if (!chunkGraph || chunkGraph.getNumberOfEntryModules(data.chunk) === 0) {
+                  return "";
+                }
+                return getContentToInject();
+              } else {
+                if (!data.chunk?.hasEntryModule()) {
+                  return "";
+                }
+                return getContentToInject();
               }
-              return getContentToInject();
             }
           })
         );
@@ -36422,7 +36442,7 @@ const buildPluginFactory = ({
 
 var name = "@datadog/esbuild-plugin";
 var packageManager = "yarn@4.0.2";
-var version$1 = "2.3.1-dev-10";
+var version$1 = "2.3.1-dev-13";
 var license = "MIT";
 var author = "Datadog";
 var description = "Datadog ESBuild Plugin";