@datadog/esbuild-plugin 0.0.13-8 → 2.0.0

package/dist/src/index.d.ts

@@ -1,5 +1,4 @@
 import * as esbuild from 'esbuild';
-import * as src from 'src';
 
 type LogLevel = 'debug' | 'warn' | 'error' | 'none';
 interface GetPluginsOptions {
@@ -28,6 +27,7 @@ type OutputOptions = boolean | string | {
     dependencies?: boolean;
     bundler?: boolean;
     metrics?: boolean;
+    logs?: boolean;
 };
 type TelemetryOptions = {
     disabled?: boolean;
@@ -59,7 +59,7 @@ declare const helpers: {
     };
 };
 
-declare const datadogEsbuildPlugin: (options: src.EsbuildPluginOptions) => esbuild.Plugin;
+declare const datadogEsbuildPlugin: (options: Options) => esbuild.Plugin;
 
 export { type Options as EsbuildPluginOptions, type types as TelemetryTypes, datadogEsbuildPlugin, helpers };
 //# sourceMappingURL=index.d.ts.map

package/dist/src/index.js

@@ -36,7 +36,7 @@ function _interopNamespaceDefault(e) {
 var querystring__namespace = /*#__PURE__*/_interopNamespaceDefault(querystring);
 
 const CONFIG_KEY = "telemetry";
-const PLUGIN_NAME = `${CONFIG_KEY}-plugin`;
+const PLUGIN_NAME = `datadog-${CONFIG_KEY}-plugin`;
 
 const filterTreeMetrics = (metric) => (
   // Remove tree metrics because way too verbose
@@ -6011,11 +6011,22 @@ const outputModulesTimings = (timings) => {
   output += getOutput(times, (module) => module.increment);
   return output;
 };
+const shouldShowOutput = (output) => {
+  if (typeof output === "boolean") {
+    return output;
+  }
+  if (typeof output === "string") {
+    return true;
+  }
+  if (!output) {
+    return true;
+  }
+  return output.logs !== false;
+};
 const outputTexts = (context, options) => {
   const { output } = options[CONFIG_KEY];
   const { report, bundler } = context;
-  const log = getLogFn(options.logLevel, PLUGIN_NAME);
-  if (output === false) {
+  if (!shouldShowOutput(output)) {
     return;
   }
   let outputString = "";
@@ -6031,7 +6042,7 @@ const outputTexts = (context, options) => {
   if (bundler.esbuild) {
     outputString += outputEsbuild(bundler.esbuild);
   }
-  log(outputString);
+  console.log(outputString);
 };
 
 const output = async (context, options) => {
@@ -6102,10 +6113,13 @@ const wrapPlugins = (build, context) => {
       };
     });
     for (const plugin of plugins) {
-      const newBuildObject = getNewBuildObject(build, plugin.name, context);
+      if (plugin.name === PLUGIN_NAME) {
+        continue;
+      }
       const oldSetup = plugin.setup;
-      plugin.setup = () => {
-        oldSetup({
+      plugin.setup = async (esbuild) => {
+        const newBuildObject = getNewBuildObject(esbuild, plugin.name, context);
+        await oldSetup({
           ...newBuildObject,
           // Use non-modified plugins for other plugins
           initialOptions: { ...newBuildObject.initialOptions, plugins: initialPlugins }
@@ -6571,7 +6585,6 @@ const getPlugins = (opt) => {
   return [
     {
       name: PLUGIN_NAME,
-      enforce: "pre",
       esbuild: getEsbuildPlugin$1(opt),
       webpack: getWebpackPlugin$1(opt)
     }