@lwrjs/module-bundler 0.12.0-alpha.2 → 0.12.0-alpha.3

package/build/cjs/esm-bundle-provider.cjs

@@ -27,6 +27,7 @@ __export(exports, {
   default: () => esm_bundle_provider_default
 });
 var import_rollup = __toModule(require("rollup"));
+var import_instrumentation = __toModule(require("@lwrjs/instrumentation"));
 var import_rollup_esm_bundler_plugin = __toModule(require("./utils/rollup-esm-bundler-plugin.cjs"));
 var import_esbuild_utils = __toModule(require("./utils/esbuild-utils.cjs"));
 var import_bundle_common = __toModule(require("./utils/bundle-common.cjs"));
@@ -50,27 +51,35 @@ async function esmBundler(moduleId, moduleRegistry, runtimeEnvironment, runtimeP
   const requiredImports = new Map();
   const dynamicImports = new Map();
   const rootModuleDef = await moduleRegistry.getLinkedModule(moduleId, runtimeEnvironment, runtimeParams);
-  const bundle = await (0, import_rollup.rollup)({
-    input: moduleId.specifier,
-    plugins: [
-      (0, import_rollup_esm_bundler_plugin.bundleDefinitions)({
-        rootModuleDef,
-        runtimeEnvironment,
-        moduleRegistry,
-        exclude,
-        alias,
-        runtimeParams,
-        requiredImports,
-        dynamicImports
-      })
-    ],
-    makeAbsoluteExternalsRelative: "ifRelativeSource"
-  });
-  const result = await bundle.generate({
-    paths: (id2) => {
-      return external[id2] || id2;
-    },
-    sourcemap: true
+  const result = await (0, import_instrumentation.getTracer)().trace({
+    name: import_instrumentation.BundleSpan.Rollup,
+    attributes: {
+      specifier: moduleId.specifier,
+      format: "esm"
+    }
+  }, async () => {
+    const bundle = await (0, import_rollup.rollup)({
+      input: moduleId.specifier,
+      plugins: [
+        (0, import_rollup_esm_bundler_plugin.bundleDefinitions)({
+          rootModuleDef,
+          runtimeEnvironment,
+          moduleRegistry,
+          exclude,
+          alias,
+          runtimeParams,
+          requiredImports,
+          dynamicImports
+        })
+      ],
+      makeAbsoluteExternalsRelative: "ifRelativeSource"
+    });
+    return bundle.generate({
+      paths: (id2) => {
+        return external[id2] || id2;
+      },
+      sourcemap: true
+    });
   });
   const bundleCode = result.output[0].code;
   const bundleMap = result.output[0].map;

package/build/cjs/index.cjs

@@ -26,9 +26,10 @@ __markAsModule(exports);
 __export(exports, {
   LwrModuleBundler: () => LwrModuleBundler
 });
+var import_path = __toModule(require("path"));
 var import_diagnostics = __toModule(require("@lwrjs/diagnostics"));
 var import_shared_utils = __toModule(require("@lwrjs/shared-utils"));
-var import_path = __toModule(require("path"));
+var import_instrumentation = __toModule(require("@lwrjs/instrumentation"));
 var TASK_POOL = new import_shared_utils.TaskPool();
 var LwrModuleBundler = class {
   constructor(config, globalConfig) {
@@ -65,21 +66,28 @@ var LwrModuleBundler = class {
         return bundleDef;
       }
     }
-    return this.inflightBundleDefinitions.execute(cacheKey, () => {
-      return TASK_POOL.execute(async () => {
-        for (const bundler of this.providers) {
-          const bundleDef = await bundler.bundle(moduleId, runtimeEnvironment, runtimeParams, bundleConfigOverrides);
-          if (bundleDef) {
-            if (!cacheDisabled) {
-              this.cache.set(cacheKey, bundleDef);
+    return (0, import_instrumentation.getTracer)().trace({
+      name: import_instrumentation.BundleSpan.GetBundle,
+      attributes: {
+        specifier: moduleId.specifier
+      }
+    }, () => {
+      return this.inflightBundleDefinitions.execute(cacheKey, () => {
+        return TASK_POOL.execute(async () => {
+          for (const bundler of this.providers) {
+            const bundleDef = await bundler.bundle(moduleId, runtimeEnvironment, runtimeParams, bundleConfigOverrides);
+            if (bundleDef) {
+              if (!cacheDisabled) {
+                this.cache.set(cacheKey, bundleDef);
+              }
+              return bundleDef;
             }
-            return bundleDef;
           }
-        }
-        throw (0, import_diagnostics.createSingleDiagnosticError)({
-          description: import_diagnostics.descriptions.UNRESOLVABLE.BUNDLE(moduleId.specifier)
-        }, import_diagnostics.LwrUnresolvableError);
-      }, this);
+          throw (0, import_diagnostics.createSingleDiagnosticError)({
+            description: import_diagnostics.descriptions.UNRESOLVABLE.BUNDLE(moduleId.specifier)
+          }, import_diagnostics.LwrUnresolvableError);
+        }, this);
+      });
     });
   }
   async resolveModuleUri(moduleId, runtimeEnvironment, runtimeParams, signature) {

package/build/cjs/utils/amd-common.cjs

@@ -29,6 +29,7 @@ __export(exports, {
 var import_shared_utils = __toModule(require("@lwrjs/shared-utils"));
 var import_rollup = __toModule(require("rollup"));
 var import_plugin_replace = __toModule(require("@rollup/plugin-replace"));
+var import_instrumentation = __toModule(require("@lwrjs/instrumentation"));
 var import_rollup_amd_bundler_plugin = __toModule(require("./rollup-amd-bundler-plugin.cjs"));
 var import_bundle_common = __toModule(require("./bundle-common.cjs"));
 var AMD_DEFINE = "LWR.define";
@@ -61,11 +62,19 @@ async function bundle(id, moduleGraphs, minify = false, unVersionedAliases = fal
     "process.env.NODE_ENV": JSON.stringify("production"),
     preventAssignment: false
   }));
-  const bundler = await (0, import_rollup.rollup)({input: id, plugins});
-  const {output} = await bundler.generate({
-    amd: {id, define: AMD_DEFINE},
-    exports: "named",
-    format: "amd"
+  const {output} = await (0, import_instrumentation.getTracer)().trace({
+    name: import_instrumentation.BundleSpan.Rollup,
+    attributes: {
+      specifier: id,
+      format: "amd"
+    }
+  }, async () => {
+    const bundler = await (0, import_rollup.rollup)({input: id, plugins});
+    return bundler.generate({
+      amd: {id, define: AMD_DEFINE},
+      exports: "named",
+      format: "amd"
+    });
   });
   let code = output[0].code;
   if (unVersionedAliases) {

package/build/es/esm-bundle-provider.js

@@ -1,4 +1,5 @@
 import { rollup } from 'rollup';
+import { BundleSpan, getTracer } from '@lwrjs/instrumentation';
 import { bundleDefinitions } from './utils/rollup-esm-bundler-plugin.js';
 import { minifyJavascript } from './utils/esbuild-utils.js';
 import { overrideBundleConfig } from './utils/bundle-common.js';
@@ -21,29 +22,37 @@ async function esmBundler(moduleId, moduleRegistry, runtimeEnvironment, runtimeP
     const requiredImports = new Map();
     const dynamicImports = new Map();
     const rootModuleDef = await moduleRegistry.getLinkedModule(moduleId, runtimeEnvironment, runtimeParams);
-    const bundle = await rollup({
-        input: moduleId.specifier,
-        plugins: [
-            bundleDefinitions({
-                rootModuleDef,
-                runtimeEnvironment,
-                moduleRegistry,
-                exclude,
-                alias,
-                runtimeParams,
-                requiredImports,
-                dynamicImports,
-            }),
-        ],
-        makeAbsoluteExternalsRelative: 'ifRelativeSource', // Fix for breaking changes in https://github.com/rollup/rollup/pull/4021
-    });
-    const result = await bundle.generate({
-        paths: (id) => {
-            // The fallback on id is important due to a rollup semantic issue:
-            // https://github.com/rollup/rollup/issues/3831
-            return external[id] || id;
+    const result = await getTracer().trace({
+        name: BundleSpan.Rollup,
+        attributes: {
+            specifier: moduleId.specifier,
+            format: 'esm',
         },
-        sourcemap: true,
+    }, async () => {
+        const bundle = await rollup({
+            input: moduleId.specifier,
+            plugins: [
+                bundleDefinitions({
+                    rootModuleDef,
+                    runtimeEnvironment,
+                    moduleRegistry,
+                    exclude,
+                    alias,
+                    runtimeParams,
+                    requiredImports,
+                    dynamicImports,
+                }),
+            ],
+            makeAbsoluteExternalsRelative: 'ifRelativeSource', // Fix for breaking changes in https://github.com/rollup/rollup/pull/4021
+        });
+        return bundle.generate({
+            paths: (id) => {
+                // The fallback on id is important due to a rollup semantic issue:
+                // https://github.com/rollup/rollup/issues/3831
+                return external[id] || id;
+            },
+            sourcemap: true,
+        });
     });
     const bundleCode = result.output[0].code;
     const bundleMap = result.output[0].map;

package/build/es/index.js

@@ -1,6 +1,7 @@
+import { join } from 'path';
 import { LwrUnresolvableError, createSingleDiagnosticError, descriptions } from '@lwrjs/diagnostics';
 import { getCacheKeyFromJson, InflightTasks, TaskPool } from '@lwrjs/shared-utils';
-import { join } from 'path';
+import { getTracer, BundleSpan } from '@lwrjs/instrumentation';
 const TASK_POOL = new TaskPool();
 export class LwrModuleBundler {
     constructor(config, globalConfig) {
@@ -46,25 +47,30 @@ export class LwrModuleBundler {
                 return bundleDef;
             }
         }
-        return this.inflightBundleDefinitions.execute(cacheKey, () => {
-            // TODO add to profiling
-            // console.log('[INFO] Create Bundle: ', cacheKey);
-            // Run theses tasks in a task pool to throttle parallel requests.
-            return TASK_POOL.execute(async () => {
-                for (const bundler of this.providers) {
-                    // eslint-disable-next-line no-await-in-loop
-                    const bundleDef = await bundler.bundle(moduleId, runtimeEnvironment, runtimeParams, bundleConfigOverrides);
-                    if (bundleDef) {
-                        if (!cacheDisabled) {
-                            this.cache.set(cacheKey, bundleDef);
+        return getTracer().trace({
+            name: BundleSpan.GetBundle,
+            attributes: {
+                specifier: moduleId.specifier,
+            },
+        }, () => {
+            return this.inflightBundleDefinitions.execute(cacheKey, () => {
+                // Run theses tasks in a task pool to throttle parallel requests.
+                return TASK_POOL.execute(async () => {
+                    for (const bundler of this.providers) {
+                        // eslint-disable-next-line no-await-in-loop
+                        const bundleDef = await bundler.bundle(moduleId, runtimeEnvironment, runtimeParams, bundleConfigOverrides);
+                        if (bundleDef) {
+                            if (!cacheDisabled) {
+                                this.cache.set(cacheKey, bundleDef);
+                            }
+                            return bundleDef;
                         }
-                        return bundleDef;
                     }
-                }
-                throw createSingleDiagnosticError({
-                    description: descriptions.UNRESOLVABLE.BUNDLE(moduleId.specifier),
-                }, LwrUnresolvableError);
-            }, this);
+                    throw createSingleDiagnosticError({
+                        description: descriptions.UNRESOLVABLE.BUNDLE(moduleId.specifier),
+                    }, LwrUnresolvableError);
+                }, this);
+            });
         });
     }
     /**

package/build/es/utils/amd-common.js

@@ -1,6 +1,7 @@
 import { GraphDepth, createAmdAlias, explodeSpecifier, getModuleGraphs, getSpecifier, getGroupName, isGroupie, getCacheKeyFromJson, } from '@lwrjs/shared-utils';
 import { rollup } from 'rollup';
 import replace from '@rollup/plugin-replace';
+import { BundleSpan, getTracer } from '@lwrjs/instrumentation';
 import { bundleDefinitions } from './rollup-amd-bundler-plugin.js';
 import { overrideBundleConfig } from './bundle-common.js';
 const AMD_DEFINE = 'LWR.define';
@@ -45,11 +46,19 @@ async function bundle(id, moduleGraphs, minify = false, unVersionedAliases = fal
             'process.env.NODE_ENV': JSON.stringify('production'),
             preventAssignment: false,
         }));
-    const bundler = await rollup({ input: id, plugins });
-    const { output } = await bundler.generate({
-        amd: { id, define: AMD_DEFINE },
-        exports: 'named',
-        format: 'amd',
+    const { output } = await getTracer().trace({
+        name: BundleSpan.Rollup,
+        attributes: {
+            specifier: id,
+            format: 'amd',
+        },
+    }, async () => {
+        const bundler = await rollup({ input: id, plugins });
+        return bundler.generate({
+            amd: { id, define: AMD_DEFINE },
+            exports: 'named',
+            format: 'amd',
+        });
     });
     let code = output[0].code;
     if (unVersionedAliases) {

package/package.json

@@ -4,7 +4,7 @@
     "publishConfig": {
         "access": "public"
     },
-    "version": "0.12.0-alpha.2",
+    "version": "0.12.0-alpha.3",
     "homepage": "https://developer.salesforce.com/docs/platform/lwr/overview",
     "repository": {
         "type": "git",
@@ -47,13 +47,14 @@
         "build/**/*.d.ts"
     ],
     "dependencies": {
-        "@lwrjs/diagnostics": "0.12.0-alpha.2",
-        "@lwrjs/shared-utils": "0.12.0-alpha.2",
+        "@lwrjs/diagnostics": "0.12.0-alpha.3",
+        "@lwrjs/instrumentation": "0.12.0-alpha.3",
+        "@lwrjs/shared-utils": "0.12.0-alpha.3",
         "@rollup/plugin-replace": "^2.4.2",
         "rollup": "^2.78.0"
     },
     "devDependencies": {
-        "@lwrjs/types": "0.12.0-alpha.2",
+        "@lwrjs/types": "0.12.0-alpha.3",
         "jest": "^26.6.3",
         "ts-jest": "^26.5.6"
     },
@@ -69,5 +70,5 @@
     "volta": {
         "extends": "../../../package.json"
     },
-    "gitHead": "586a2aa659882483af9249dc3db7fe07bc842a25"
+    "gitHead": "48f97b40cbacce6cd6a6faee9206a465832c6774"
 }