Merge branch 'main' into dave/bundler-require-ref

src/bundler/bundle_v2.zig

@@ -5451,11 +5451,10 @@ pub const LinkerContext = struct {
 
                                     continue;
                                 } else {
-
                                     // We should use "__require" instead of "require" if we're not
                                     // generating a CommonJS output file, since it won't exist otherwise.
                                     // Disabled for target bun because `import.meta.require` will be inlined.
-                                    if (shouldCallRuntimeRequire(output_format) and !this.resolver.opts.target.isBun()) {
+                                    if (kind != .dynamic or shouldCallRuntimeRequire(output_format) and !this.resolver.opts.target.isBun()) {
                                         record.calls_runtime_require = true;
                                         runtime_require_uses += 1;
                                     }

test/bundler/bundler_edgecase.test.ts

@@ -857,6 +857,19 @@ describe("bundler", () => {
       stdout: `0.6.0`,
     },
   });
+  itBundled("edgecase/ExternalDynamicImportDoesNotIncludeRuntime", {
+    files: {
+      "/entry.js": /* js */ `
+        import('something');
+      `,
+    },
+    external: ["something"],
+    onAfterBundle(api) {
+      api.expectFile("/out.js").not.toContain("__require");
+      // throw Error('Dynamic require of "' + x + '" is not supported')
+      api.expectFile("/out.js").not.toContain("Dynamic require");
+    },
+  });
   itBundled("edgecase/OverwriteInputWithOutdir", {
     todo: true,
     files: {