@datadog/esbuild-plugin 2.2.0 → 2.2.1

package/dist/src/index.d.ts

@@ -27,6 +27,27 @@ type types$1 = {
 
 declare const CONFIG_KEY: "telemetry";
 
+type types = {
+    Filter: Filter;
+    Metric: Metric;
+    TelemetryOptions: TelemetryOptions;
+};
+
+type LogLevel = 'debug' | 'info' | 'warn' | 'error' | 'none';
+type AuthOptions = {
+    apiKey?: string;
+    endPoint?: string;
+};
+interface GetPluginsOptions {
+    auth?: AuthOptions;
+    disableGit?: boolean;
+    logLevel?: LogLevel;
+}
+interface Options extends GetPluginsOptions {
+    [CONFIG_KEY$1]?: RumOptions;
+    [CONFIG_KEY]?: TelemetryOptions;
+}
+
 interface Metric {
     metric: string;
     type: 'count' | 'size' | 'duration';
@@ -51,26 +72,7 @@ type TelemetryOptions = {
     filters?: Filter[];
 };
 
-type types = {
-    Filter: Filter;
-    Metric: Metric;
-    TelemetryOptions: TelemetryOptions;
-};
-
-type LogLevel = 'debug' | 'info' | 'warn' | 'error' | 'none';
-type AuthOptions = {
-    apiKey?: string;
-    endPoint?: string;
-};
-interface GetPluginsOptions {
-    auth?: AuthOptions;
-    disableGit?: boolean;
-    logLevel?: LogLevel;
-}
-interface Options extends GetPluginsOptions {
-    [CONFIG_KEY$1]?: RumOptions;
-    [CONFIG_KEY]?: TelemetryOptions;
-}
+declare const datadogEsbuildPlugin: (options: Options) => esbuild.Plugin;
 
 declare const helpers: {
     telemetry: {
@@ -78,7 +80,16 @@ declare const helpers: {
     };
 };
 
-declare const datadogEsbuildPlugin: (options: Options) => esbuild.Plugin;
-
 export { type Options as EsbuildPluginOptions, type types$1 as RumTypes, type types as TelemetryTypes, datadogEsbuildPlugin, helpers };
+
+
+if (typeof module !== 'undefined') {
+    module.exports = {
+        EsbuildPluginOptions,
+        RumTypes,
+        TelemetryTypes,
+        datadogEsbuildPlugin,
+        helpers
+    };
+}
 //# sourceMappingURL=index.d.ts.map

package/dist/src/index.js

@@ -15,7 +15,6 @@ var require$$0$3 = require('constants');
 var require$$5 = require('assert');
 var https = require('https');
 var perf_hooks = require('perf_hooks');
-var webpack = require('webpack');
 var querystring = require('querystring');
 var process2 = require('process');
 
@@ -10596,7 +10595,7 @@ const uploadSourcemaps = async (options, context, log) => {
 };
 
 const defaultIntakeUrl = `https://sourcemap-intake.${process.env.DATADOG_SITE || "datadoghq.com"}/api/v2/srcmap`;
-const validateOptions$1 = (config, log) => {
+const validateOptions$2 = (config, log) => {
   const errors = [];
   const sourcemapsResults = validateSourcemapsOptions(config);
   errors.push(...sourcemapsResults.errors);
@@ -10663,7 +10662,7 @@ const validateSourcemapsOptions = (config) => {
 
 const getPlugins$2 = (opts, context) => {
   const log = getLogger(opts.logLevel, PLUGIN_NAME$1);
-  const rumOptions = validateOptions$1(opts, log);
+  const rumOptions = validateOptions$2(opts, log);
   return [
     {
       name: PLUGIN_NAME$1,
@@ -13668,7 +13667,7 @@ var output$1 = {
 
 var libExports = lib$2.exports;
 
-const validateOptions = (options) => {
+const validateOptions$1 = (options) => {
   const validatedOptions = options[CONFIG_KEY] || { disabled: false };
   return validatedOptions;
 };
@@ -14905,7 +14904,7 @@ const getEsbuildPlugin$1 = (opt, ctx) => {
     setup: (build) => {
       const startBuild = Date.now();
       const logger = getLogger(opt.logLevel, "telemetry");
-      const telemetryOptions = validateOptions(opt);
+      const telemetryOptions = validateOptions$1(opt);
       build.initialOptions.metafile = true;
       wrapPlugins(build, ctx.cwd);
       build.onEnd(async (result) => {
@@ -15216,14 +15215,24 @@ class Tapables {
     hook.tapAsync = this.newTap("async", hookName, hook.tapAsync, hook);
     hook.tapPromise = this.newTap("promise", hookName, hook.tapPromise, hook);
   }
+  patchHook(tapableName, hookName, hook) {
+    if (hook._fakeHook) {
+      return;
+    }
+    if (!this.hooks[tapableName]) {
+      this.hooks[tapableName] = [];
+    }
+    if (this.hooks[tapableName].includes(hookName)) {
+      return;
+    }
+    this.hooks[tapableName].push(hookName);
+    this.replaceTaps(hookName, hook);
+  }
   checkHooks() {
     for (const tapable of this.tapables) {
       const name = tapable.constructor.name;
       for (const hookName of Object.keys(tapable.hooks)) {
-        if (!this.hooks[name].includes(hookName)) {
-          this.hooks[name].push(hookName);
-          this.replaceTaps(hookName, tapable.hooks[hookName]);
-        }
+        this.patchHook(name, hookName, tapable.hooks[hookName]);
       }
     }
   }
@@ -15233,24 +15242,8 @@ class Tapables {
     if (!this.tapables.includes(tapable)) {
       this.tapables.push(tapable);
     }
-    if (!this.hooks[name]) {
-      this.hooks[name] = [];
-    }
     for (const hookName of Object.keys(tapable.hooks)) {
-      this.hooks[name].push(hookName);
-      try {
-        if (hookName === "normalModuleLoader" && typeof webpack.NormalModule.getCompilationHooks === "function") {
-          const NormalModule = webpack.NormalModule;
-          const compil = tapable;
-          this.replaceTaps(
-            hookName,
-            NormalModule.getCompilationHooks(compil).loader
-          );
-        } else {
-          this.replaceTaps(hookName, tapable.hooks[hookName]);
-        }
-      } catch (e) {
-      }
+      this.patchHook(name, hookName, tapable.hooks[hookName]);
     }
   }
 }
@@ -15258,7 +15251,7 @@ class Tapables {
 const getWebpackPlugin$1 = (opt, ctx) => {
   return async (compiler) => {
     const HOOK_OPTIONS = { name: PLUGIN_NAME };
-    const options = validateOptions(opt);
+    const options = validateOptions$1(opt);
     const logger = getLogger(opt.logLevel, "telemetry");
     const modules = new Modules(ctx.cwd, options);
     const tapables = new Tapables(ctx.cwd, options);
@@ -15300,7 +15293,7 @@ const getWebpackPlugin$1 = (opt, ctx) => {
   };
 };
 
-const helpers$1 = {
+const helpers$2 = {
   filters: defaultFilters
 };
 const getPlugins = (options, context) => {
@@ -26927,16 +26920,25 @@ function createUnplugin(factory) {
   };
 }
 
-const helpers = {
+const helpers$1 = {
   // Each product should have a unique entry.
   // #helpers-injection-marker
-  [CONFIG_KEY]: helpers$1
+  [CONFIG_KEY]: helpers$2
   // #helpers-injection-marker
 };
+const validateOptions = (options = {}) => {
+  return {
+    auth: {},
+    disableGit: false,
+    logLevel: "warn",
+    ...options
+  };
+};
 const buildPluginFactory = ({
   version
 }) => {
-  return createUnplugin((options, unpluginMetaContext) => {
+  return createUnplugin((opts, unpluginMetaContext) => {
+    const options = validateOptions(opts);
     if ("esbuildHostName" in unpluginMetaContext) {
       unpluginMetaContext.esbuildHostName = "datadog-plugins";
     }
@@ -26957,7 +26959,7 @@ const buildPluginFactory = ({
 
 var name = "@datadog/esbuild-plugin";
 var packageManager = "yarn@4.0.2";
-var version = "2.2.0";
+var version = "2.2.1";
 var license = "MIT";
 var author = "Datadog";
 var description = "Datadog ESBuild Plugin";
@@ -27045,11 +27047,16 @@ var pkg = {
 const datadogEsbuildPlugin = buildPluginFactory({
   version: pkg.version
 }).esbuild;
-module.exports = {
-  helpers,
-  datadogEsbuildPlugin
-};
+const helpers = helpers$1;
 
 exports.datadogEsbuildPlugin = datadogEsbuildPlugin;
 exports.helpers = helpers;
+
+
+if (typeof module !== 'undefined') {
+    module.exports = {
+        datadogEsbuildPlugin,
+        helpers
+    };
+}
 //# sourceMappingURL=index.js.map