feat: add globalThis.__import

Author: joshunrau

packages/instrument-bundler/src/bundle.ts

@@ -6,7 +6,14 @@ import * as esbuild from './vendor/esbuild.js';
 import type { BundleOptions } from './schemas.js';
 import type { BuildOutput } from './types.js';
 
-const GLOBAL_PROXY_SHIM = `
+const GLOBALS = `
+  globalThis.__import = async (moduleName) => {
+    try {
+      return import(moduleName);
+    } catch (err) {
+      throw new Error('Failed to import module: ' + moduleName, { cause: err });
+    }
+  };
   const __createProxy = (name) => {
     const formatErrorMessage = (method, propertyName, targetName) => {
       const contextName = globalThis.__ODC_BUNDLER_ERROR_CONTEXT ?? 'UNKNOWN'
@@ -39,7 +46,7 @@ export async function createBundle(output: BuildOutput, options: { minify: boole
     inject = `Object.defineProperty(__exports.content, '__injectHead', { value: Object.freeze({ style: "${btoa(output.css)}" }), writable: false });`;
   }
   const bundle = `(async () => {
-    ${GLOBAL_PROXY_SHIM}
+    ${GLOBALS}
     ${output.js}
     ${inject}
     return __exports;

packages/instrument-bundler/src/transform.ts

@@ -33,7 +33,7 @@ export function transformImports(code: string) {
     const endIndex = _endIndex + indexDiff;
     const startIndex = _startIndex + indexDiff;
     const source = code.slice(startIndex, endIndex);
-    const replacement = `const ${transformImportClause(importClause!)} = await import(${moduleSpecifier.code})`;
+    const replacement = `const ${transformImportClause(importClause!)} = await __import(${moduleSpecifier.code})`;
     indexDiff += replacement.length - source.length;
     code = code.slice(0, startIndex) + replacement + code.slice(endIndex, code.length);
   }