vitejs · sapphi-red · Oct 24, 2025 · Sep 30, 2025 · Oct 21, 2025 · Oct 22, 2025
diff --git a/packages/vite/src/node/__tests__/plugins/completeAmdWrap.spec.ts b/packages/vite/src/node/__tests__/plugins/completeAmdWrap.spec.ts
@@ -0,0 +1,46 @@
+import { describe, expect, test } from 'vitest'
+import { completeAmdWrapPlugin } from '../../plugins/completeAmdWrap'
+
+async function createCompleteAmdWrapPluginRenderChunk() {
+  const instance = completeAmdWrapPlugin()
+
+  return async (code: string) => {
+    // @ts-expect-error transform.handler should exist
+    const result = await instance.renderChunk.call(instance, code, 'foo.ts', {
+      format: 'amd',
+    })
+    return result?.code || result
+  }
+}
+
+describe('completeAmdWrapPlugin', async () => {
+  const renderChunk = await createCompleteAmdWrapPluginRenderChunk()
+
+  describe('adds require parameter', async () => {
+    test('without other dependencies', async () => {
+      expect(
+        await renderChunk('define((function() { } ))'),
+      ).toMatchInlineSnapshot(`"define(["require"], (function(require) { } ))"`)
+    })
+
+    test('with other dependencies', async () => {
+      expect(
+        await renderChunk(
+          'define(["vue", "vue-router"], function(vue, vueRouter) { } ))',
+        ),
+      ).toMatchInlineSnapshot(
+        `"define(["require", "vue", "vue-router"], (function(require, vue, vueRouter) { } ))"`,
+      )
+    })
+
+    test("only if require isn't injected already", async () => {
+      expect(
+        await renderChunk('define(["require"], function(require) { } ))'),
+      ).toMatchInlineSnapshot(`"define(["require"], (function(require) { } ))"`)
+
+      expect(
+        await renderChunk(`define(['require'], function(require) { } ))`),
+      ).toMatchInlineSnapshot(`"define(['require'], (function(require) { } ))"`)
+    })
+  })
+})
diff --git a/packages/vite/src/node/build.ts b/packages/vite/src/node/build.ts
@@ -65,6 +65,7 @@ import {
   resolveChokidarOptions,
   resolveEmptyOutDir,
 } from './watch'
+import { completeAmdWrapPlugin } from './plugins/completeAmdWrap'
 import { completeSystemWrapPlugin } from './plugins/completeSystemWrap'
 import { webWorkerPostPlugin } from './plugins/worker'
 import { getHookHandler } from './plugins'
@@ -466,6 +467,7 @@ export async function resolveBuildPlugins(config: ResolvedConfig): Promise<{
 }> {
   return {
     pre: [
+      completeAmdWrapPlugin(),
       completeSystemWrapPlugin(),
       ...(!config.isWorker ? [prepareOutDirPlugin()] : []),
       perEnvironmentPlugin('commonjs', (environment) => {

diff --git a/packages/vite/src/node/plugins/completeAmdWrap.ts b/packages/vite/src/node/plugins/completeAmdWrap.ts
@@ -0,0 +1,30 @@
+import type { Plugin } from '../plugin'
+
+/**
+ * ensure amd bundles request `require` to be injected
+ */
+export function completeAmdWrapPlugin(): Plugin {
+  const AmdWrapRE =
+    /\bdefine\((?:\s*\[([^\]]*)\],)?\s*(?:\(\s*)?function\s*\(([^)]*)\)\s*\{/g
+
+  return {
+    name: 'vite:force-amd-wrap-require',
+    renderChunk(code, _chunk, opts) {
+      if (opts.format !== 'amd') return
+
+      return {
+        code: code.replace(AmdWrapRE, (_, deps, params) => {
+          if (deps?.includes(`"require"`) || deps?.includes(`'require'`)) {
+            return `define([${deps}], (function(${params}) {`
+          }
+
+          const newDeps = deps ? `"require", ${deps}` : '"require"'
+          const newParams = params.trim() ? `require, ${params}` : 'require'
+
+          return `define([${newDeps}], (function(${newParams}) {`
+        }),
+        map: null, // no need to generate sourcemap as no mapping exists for the wrapper
+      }
+    },
+  }
+}
diff --git a/playground/amd/README.md b/playground/amd/README.md
@@ -0,0 +1 @@
+# amd
diff --git a/playground/amd/index.html b/playground/amd/index.html
@@ -0,0 +1,21 @@
+<!doctype html>
+<html lang="en">
+  <head>
+    <meta charset="UTF-8" />
+    <title>amd</title>
+  </head>
+  <body>
+    <script src="node_modules/requirejs/require.js"></script>
+    <script type="text/javascript">
+      requirejs(
+        ['plugin/dist/js/plugin.js'],
+        (plugin) => {
+          console.log('Plugin loaded', plugin())
+        },
+        (err) => {
+          console.error('Error loading plugin', err)
+        },
+      )
+    </script>
+  </body>
+</html>
diff --git a/playground/amd/package.json b/playground/amd/package.json
@@ -0,0 +1,5 @@
+{
+  "dependencies": {
+    "requirejs": "^2.3.7"
+  }
+}
diff --git a/playground/amd/plugin/index.html b/playground/amd/plugin/index.html
@@ -0,0 +1 @@
+<html />
diff --git a/playground/amd/plugin/index.ts b/playground/amd/plugin/index.ts
@@ -0,0 +1,6 @@
+import workerUrl from './worker?url&no-inline'
+
+export default function pluginMain() {
+  console.log('workerUrl', workerUrl)
+  return 'OK'
+}
diff --git a/playground/amd/plugin/package.json b/playground/amd/plugin/package.json
@@ -0,0 +1,5 @@
+{
+  "scripts": {
+    "build": "vite build"
+  }
+}
diff --git a/playground/amd/plugin/vite.config.ts b/playground/amd/plugin/vite.config.ts
@@ -0,0 +1,35 @@
+import { join } from 'node:path'
+import { defineConfig } from 'vite'
+
+export default defineConfig((config) => {
+  const isProduction = false // config.mode === 'production'
+  return {
+    base: './',
+    build: {
+      outDir: './dist',
+      minify: isProduction,
+      rollupOptions: {
+        preserveEntrySignatures: 'strict',
+        input: {
+          plugin: './index.ts',
+        },
+        output: {
+          format: 'amd',
+          assetFileNames: join(
+            'assets',
+            `[name]${isProduction ? '-[hash]' : ''}[extname]`,
+          ),
+          chunkFileNames: join(
+            'js',
+            'chunks',
+            `[name]${isProduction ? '-[hash]' : ''}.mjs`,
+          ),
+          entryFileNames: join(
+            'js',
+            `[name]${isProduction ? '-[hash]' : ''}.js`,
+          ),
+        },
+      },
+    },
+  }
+})
diff --git a/playground/amd/plugin/worker.js b/playground/amd/plugin/worker.js
@@ -0,0 +1 @@
+console.log("I'm a worker")