chore: Merge branch 'main' into fix/dynamic-import-inline

.eslintrc.cjs

@@ -109,7 +109,7 @@ module.exports = defineConfig({
       }
     },
     {
-      files: ['packages/playground/**'],
+      files: ['playground/**'],
       rules: {
         'node/no-extraneous-import': 'off',
         'node/no-extraneous-require': 'off'

.gitignore

@@ -1,14 +1,15 @@
-.DS_Store
-node_modules
 !**/glob-import/dir/node_modules
-dist
-dist-ssr
-TODOs.md
-*.log
-temp
-explorations
+.DS_Store
 .idea
-*.local
-/packages/vite/LICENSE
 *.cpuprofile
+*.local
+*.log
 /.vscode/
+/packages/vite/LICENSE
+dist
+dist-ssr
+explorations
+node_modules
+playground-temp
+temp
+TODOs.md

.prettierignore

@@ -8,6 +8,6 @@ LICENSE.md
 .prettierignore
 pnpm-lock.yaml
 pnpm-workspace.yaml
-packages/playground/tsconfig-json-load-error/has-error/tsconfig.json
-packages/playground/html/invalid.html
-packages/playground/worker/classic-worker.js
+playground/tsconfig-json-load-error/has-error/tsconfig.json
+playground/html/invalid.html
+playground/worker/classic-worker.js

CONTRIBUTING.md

@@ -26,7 +26,7 @@ If you want to use break point and explore code execution you can use the ["Run
 
 3. Click on the "JavaScript Debug Terminal" button.
 
-4. It will open a terminal, then go to `packages/playground/xxx` and run `pnpm run dev`.
+4. It will open a terminal, then go to `playground/xxx` and run `pnpm run dev`.
 
 5. The execution will stop and you'll use the [Debug toolbar](https://code.visualstudio.com/docs/editor/debugging#_debug-actions) to continue, step over, restart the process...
 
@@ -69,7 +69,7 @@ And re-run `pnpm install` to link the package.
 
 ### Integration Tests
 
-Each package under `packages/playground/` contains a `__tests__` directory. The tests are run using [Jest](https://jestjs.io/) + [Playwright](https://playwright.dev/) with custom integrations to make writing tests simple. The detailed setup is inside `jest.config.js` and `scripts/jest*` files.
+Each package under `playground/` contains a `__tests__` directory. The tests are run using [Jest](https://jestjs.io/) + [Playwright](https://playwright.dev/) with custom integrations to make writing tests simple. The detailed setup is inside `jest.config.js` and `scripts/jest*` files.
 
 Before running the tests, make sure that [Vite has been built](#repo-setup). On Windows, you may want to [activate Developer Mode](https://docs.microsoft.com/en-us/windows/apps/get-started/enable-your-device-for-development) to solve [issues with symlink creation for non-admins](https://github.com/vitejs/vite/issues/7390). Also you may want to [set git `core.symlinks` to `true` to solve issues with symlinks in git](https://github.com/vitejs/vite/issues/5242).
 
@@ -87,7 +87,7 @@ Each integration test can be run under either dev server mode or build mode.
 
 ### Unit Tests
 
-Other than tests under `packages/playground/` for integration tests, packages might contains unit tests under their `__tests__` directory. Unit tests are powered by [Vitest](https://vitest.dev/). The detailed config is inside `vitest.config.ts` files.
+Other than tests under `playground/` for integration tests, packages might contains unit tests under their `__tests__` directory. Unit tests are powered by [Vitest](https://vitest.dev/). The detailed config is inside `vitest.config.ts` files.
 
 - `pnpm run test-unit` runs unit tests under each package.
 
@@ -103,20 +103,20 @@ test('should work', async () => {
 })
 ```
 
-Some common test helpers, e.g. `testDir`, `isBuild` or `editFile` are available in `packages/playground/testUtils.ts`.
+Some common test helpers, e.g. `testDir`, `isBuild` or `editFile` are available in `playground/testUtils.ts`.
 
 Note: The test build environment uses a [different default set of Vite config](https://github.com/vitejs/vite/blob/9c6501d9c363eaa3c1e7708d531fb2a92b633db6/scripts/jestPerTestSetup.ts#L102-L122) to skip transpilation during tests to make it faster. This may produce a different result compared to the default production build.
 
 ### Extending the Test Suite
 
-To add new tests, you should find a related playground to the fix or feature (or create a new one). As an example, static assets loading are tested in the [assets playground](https://github.com/vitejs/vite/tree/main/packages/playground/assets). In this Vite App, there is a test for `?raw` imports, with [a section is defined in the `index.html` for it](https://github.com/vitejs/vite/blob/71215533ac60e8ff566dc3467feabfc2c71a01e2/packages/playground/assets/index.html#L121):
+To add new tests, you should find a related playground to the fix or feature (or create a new one). As an example, static assets loading are tested in the [assets playground](https://github.com/vitejs/vite/tree/main/playground/assets). In this Vite App, there is a test for `?raw` imports, with [a section is defined in the `index.html` for it](https://github.com/vitejs/vite/blob/71215533ac60e8ff566dc3467feabfc2c71a01e2/playground/assets/index.html#L121):
 
 ```html
 <h2>?raw import</h2>
 <code class="raw"></code>
 ```
 
-This will be modified [with the result of a file import](https://github.com/vitejs/vite/blob/71215533ac60e8ff566dc3467feabfc2c71a01e2/packages/playground/assets/index.html#L151):
+This will be modified [with the result of a file import](https://github.com/vitejs/vite/blob/main/playground/assets/index.html#L151):
 
 ```js
 import rawSvg from './nested/fragment.svg?raw'
@@ -131,7 +131,7 @@ function text(el, text) {
 }
 ```
 
-In the [spec tests](https://github.com/vitejs/vite/blob/71215533ac60e8ff566dc3467feabfc2c71a01e2/packages/playground/assets/__tests__/assets.spec.ts#L180), the modifications to the DOM listed above are used to test this feature:
+In the [spec tests](https://github.com/vitejs/vite/blob/main/playground/assets/__tests__/assets.spec.ts#L180), the modifications to the DOM listed above are used to test this feature:
 
 ```js
 test('?raw import', async () => {
@@ -148,7 +148,7 @@ To work around this, playground packages that uses the `file:` protocol should a
 ```jsonc
 "scripts": {
   //...
-  "postinstall": "ts-node ../../../scripts/patchFileDeps.ts"
+  "postinstall": "ts-node ../../scripts/patchFileDeps.ts"
 }
 ```
 

docs/guide/ssr.md

@@ -22,8 +22,8 @@ If you have questions, the community is usually helpful at [Vite Discord's #ssr
 
 Vite provides built-in support for server-side rendering (SSR). The Vite playground contains example SSR setups for Vue 3 and React, which can be used as references for this guide:
 
-- [Vue 3](https://github.com/vitejs/vite/tree/main/packages/playground/ssr-vue)
-- [React](https://github.com/vitejs/vite/tree/main/packages/playground/ssr-react)
+- [Vue 3](https://github.com/vitejs/vite/tree/main/playground/ssr-vue)
+- [React](https://github.com/vitejs/vite/tree/main/playground/ssr-react)
 
 ## Source Structure
 
@@ -177,7 +177,7 @@ Then, in `server.js` we need to add some production specific logic by checking `
 
 - Move the creation and all usage of the `vite` dev server behind dev-only conditional branches, then add static file serving middlewares to serve files from `dist/client`.
 
-Refer to the [Vue](https://github.com/vitejs/vite/tree/main/packages/playground/ssr-vue) and [React](https://github.com/vitejs/vite/tree/main/packages/playground/ssr-react) demos for working setup.
+Refer to the [Vue](https://github.com/vitejs/vite/tree/main/playground/ssr-vue) and [React](https://github.com/vitejs/vite/tree/main/playground/ssr-react) demos for working setup.
 
 ## Generating Preload Directives
 
@@ -201,11 +201,11 @@ const html = await vueServerRenderer.renderToString(app, ctx)
 // ctx.modules is now a Set of module IDs that were used during the render
 ```
 
-In the production branch of `server.js` we need to read and pass the manifest to the `render` function exported by `src/entry-server.js`. This would provide us with enough information to render preload directives for files used by async routes! See [demo source](https://github.com/vitejs/vite/blob/main/packages/playground/ssr-vue/src/entry-server.js) for full example.
+In the production branch of `server.js` we need to read and pass the manifest to the `render` function exported by `src/entry-server.js`. This would provide us with enough information to render preload directives for files used by async routes! See [demo source](https://github.com/vitejs/vite/blob/main/playground/ssr-vue/src/entry-server.js) for full example.
 
 ## Pre-Rendering / SSG
 
-If the routes and the data needed for certain routes are known ahead of time, we can pre-render these routes into static HTML using the same logic as production SSR. This can also be considered a form of Static-Site Generation (SSG). See [demo pre-render script](https://github.com/vitejs/vite/blob/main/packages/playground/ssr-vue/prerender.js) for working example.
+If the routes and the data needed for certain routes are known ahead of time, we can pre-render these routes into static HTML using the same logic as production SSR. This can also be considered a form of Static-Site Generation (SSG). See [demo pre-render script](https://github.com/vitejs/vite/blob/main/playground/ssr-vue/prerender.js) for working example.
 
 ## SSR Externals
 

jest.config.ts

@@ -9,14 +9,14 @@ const config: Config.InitialOptions = {
   globalTeardown: './scripts/jestGlobalTeardown.cjs',
   testEnvironment: './scripts/jestEnv.cjs',
   setupFilesAfterEnv: ['./scripts/jestPerTestSetup.ts'],
-  watchPathIgnorePatterns: ['<rootDir>/packages/temp'],
-  modulePathIgnorePatterns: ['<rootDir>/packages/temp'],
+  watchPathIgnorePatterns: ['<rootDir>/playground-temp'],
+  modulePathIgnorePatterns: ['<rootDir>/playground-temp'],
   moduleNameMapper: {
-    testUtils: '<rootDir>/packages/playground/testUtils.ts'
+    testUtils: '<rootDir>/playground/testUtils.ts'
   },
   globals: {
     'ts-jest': {
-      tsconfig: './packages/playground/tsconfig.json'
+      tsconfig: './playground/tsconfig.json'
     }
   }
 }

packages/vite/src/node/__tests__/plugins/importGlob/__snapshots__/fixture.test.ts.snap

@@ -38,6 +38,10 @@ export const eagerAs = {
 \\"./modules/a.ts\\": __vite_glob_5_0,
 \\"./modules/b.ts\\": __vite_glob_5_1
 };
+export const rawImportModule = {
+\\"./modules/a.ts\\": () => import(\\"./modules/a.ts?raw\\"),
+\\"./modules/b.ts\\": () => import(\\"./modules/b.ts?raw\\")
+};
 export const excludeSelf = {
 \\"./sibling.ts\\": () => import(\\"./sibling.ts\\")
 };
@@ -108,6 +112,10 @@ export const eagerAs = {
 \\"./modules/a.ts\\": __vite_glob_5_0,
 \\"./modules/b.ts\\": __vite_glob_5_1
 };
+export const rawImportModule = {
+\\"./modules/a.ts\\": () => import(\\"./modules/a.ts?raw\\"),
+\\"./modules/b.ts\\": () => import(\\"./modules/b.ts?raw\\")
+};
 export const excludeSelf = {
 \\"./sibling.ts\\": () => import(\\"./sibling.ts\\")
 };

packages/vite/src/node/__tests__/plugins/importGlob/fixture-a/index.ts

@@ -27,6 +27,11 @@ export const eagerAs = import.meta.glob<ModuleType>(
   { eager: true, as: 'raw' }
 )
 
+export const rawImportModule = import.meta.glob(
+  ['./modules/*.ts', '!**/index.ts'],
+  { as: 'raw', import: '*' }
+)
+
 export const excludeSelf = import.meta.glob(
   './*.ts'
   // for test: annotation contain ")"

packages/vite/src/node/plugins/html.ts

@@ -64,7 +64,7 @@ export const htmlProxyMap = new WeakMap<
 
 // HTML Proxy Transform result are stored by config
 // `${hash(importer)}_${query.index}` -> transformed css code
-// PS: key like `hash(/vite/packages/playground/assets/index.html)_1`)
+// PS: key like `hash(/vite/playground/assets/index.html)_1`)
 export const htmlProxyResult = new Map<string, string>()
 
 export function htmlInlineProxyPlugin(config: ResolvedConfig): Plugin {

packages/vite/src/node/plugins/importMetaGlob.ts

@@ -217,11 +217,15 @@ export async function parseImportGlob(
     }
 
     if (options.as && forceDefaultAs.includes(options.as)) {
-      if (options.import && options.import !== 'default')
+      if (
+        options.import &&
+        options.import !== 'default' &&
+        options.import !== '*'
+      )
         throw err(
-          `Option "export" can only be "default" when "as" is "${options.as}", but got "${options.import}"`
+          `Option "import" can only be "default" or "*" when "as" is "${options.as}", but got "${options.import}"`
         )
-      options.import = 'default'
+      options.import = options.import || 'default'
     }
 
     if (options.as && options.query)
@@ -358,21 +362,24 @@ export async function transformGlobImport(
 
             importPath = `${importPath}${importQuery}`
 
+            const importKey =
+              options.import && options.import !== '*'
+                ? options.import
+                : undefined
+
             if (options.eager) {
               const variableName = `${importPrefix}${index}_${i}`
-              const expression = options.import
-                ? `{ ${options.import} as ${variableName} }`
+              const expression = importKey
+                ? `{ ${importKey} as ${variableName} }`
                 : `* as ${variableName}`
               staticImports.push(
                 `import ${expression} from ${JSON.stringify(importPath)}`
               )
               objectProps.push(`${JSON.stringify(filePath)}: ${variableName}`)
             } else {
               let importStatement = `import(${JSON.stringify(importPath)})`
-              if (options.import)
-                importStatement += `.then(m => m[${JSON.stringify(
-                  options.import
-                )}])`
+              if (importKey)
+                importStatement += `.then(m => m[${JSON.stringify(importKey)}])`
               objectProps.push(
                 `${JSON.stringify(filePath)}: () => ${importStatement}`
               )

packages/playground/alias/package.json → playground/alias/package.json

@@ -5,9 +5,9 @@
   "scripts": {
     "dev": "vite",
     "build": "vite build",
-    "debug": "node --inspect-brk ../../vite/bin/vite",
+    "debug": "node --inspect-brk ../../packages/vite/bin/vite",
     "preview": "vite preview",
-    "postinstall": "ts-node ../../../scripts/patchFileDeps.ts"
+    "postinstall": "ts-node ../../scripts/patchFileDeps.ts"
   },
   "dependencies": {
     "aliased-module": "file:./dir/module",

packages/playground/assets/package.json → playground/assets/package.json

@@ -5,7 +5,7 @@
   "scripts": {
     "dev": "vite",
     "build": "vite build",
-    "debug": "node --inspect-brk ../../vite/bin/vite",
+    "debug": "node --inspect-brk ../../packages/vite/bin/vite",
     "preview": "vite preview"
   }
 }

packages/playground/backend-integration/package.json → playground/backend-integration/package.json

@@ -5,7 +5,7 @@
   "scripts": {
     "dev": "vite",
     "build": "vite build",
-    "debug": "node --inspect-brk ../../vite/bin/vite",
+    "debug": "node --inspect-brk ../../packages/vite/bin/vite",
     "preview": "vite preview"
   },
   "dependencies": {

packages/playground/cli-module/package.json → playground/cli-module/package.json

@@ -6,7 +6,7 @@
   "scripts": {
     "dev": "vite",
     "build": "vite build",
-    "debug": "node --inspect-brk ../../vite/bin/vite",
+    "debug": "node --inspect-brk ../../packages/vite/bin/vite",
     "serve": "vite preview"
   }
 }

packages/playground/cli/package.json → playground/cli/package.json

@@ -5,7 +5,7 @@
   "scripts": {
     "dev": "vite",
     "build": "vite build",
-    "debug": "node --inspect-brk ../../vite/bin/vite",
+    "debug": "node --inspect-brk ../../packages/vite/bin/vite",
     "preview": "vite preview"
   }
 }

packages/playground/css-codesplit-cjs/package.json → playground/css-codesplit-cjs/package.json

@@ -5,7 +5,7 @@
   "scripts": {
     "dev": "vite",
     "build": "vite build",
-    "debug": "node --inspect-brk ../../vite/bin/vite",
+    "debug": "node --inspect-brk ../../packages/vite/bin/vite",
     "preview": "vite preview"
   }
 }

packages/playground/css-codesplit/package.json → playground/css-codesplit/package.json

@@ -5,7 +5,7 @@
   "scripts": {
     "dev": "vite",
     "build": "vite build",
-    "debug": "node --inspect-brk ../../vite/bin/vite",
+    "debug": "node --inspect-brk ../../packages/vite/bin/vite",
     "preview": "vite preview"
   }
 }

packages/playground/css-sourcemap/package.json → playground/css-sourcemap/package.json

@@ -5,7 +5,7 @@
   "scripts": {
     "dev": "vite",
     "build": "vite build",
-    "debug": "node --inspect-brk ../../vite/bin/vite",
+    "debug": "node --inspect-brk ../../packages/vite/bin/vite",
     "preview": "vite preview"
   },
   "devDependencies": {

packages/playground/css/package.json → playground/css/package.json

@@ -5,7 +5,7 @@
   "scripts": {
     "dev": "vite",
     "build": "vite build",
-    "debug": "node --inspect-brk ../../vite/bin/vite",
+    "debug": "node --inspect-brk ../../packages/vite/bin/vite",
     "preview": "vite preview"
   },
   "devDependencies": {

packages/playground/css/postcss-caching/blue-app/package.json → playground/css/postcss-caching/blue-app/package.json

@@ -5,7 +5,7 @@
   "scripts": {
     "dev": "vite",
     "build": "vite build",
-    "debug": "node --inspect-brk ../../vite/bin/vite",
+    "debug": "node --inspect-brk ../../packages/vite/bin/vite",
     "preview": "vite preview"
   }
 }

packages/playground/css/postcss-caching/green-app/package.json → playground/css/postcss-caching/green-app/package.json

@@ -5,7 +5,7 @@
   "scripts": {
     "dev": "vite",
     "build": "vite build",
-    "debug": "node --inspect-brk ../../vite/bin/vite",
+    "debug": "node --inspect-brk ../../packages/vite/bin/vite",
     "preview": "vite preview"
   }
 }

packages/playground/data-uri/package.json → playground/data-uri/package.json

@@ -5,7 +5,7 @@
   "scripts": {
     "dev": "vite",
     "build": "vite build",
-    "debug": "node --inspect-brk ../../vite/bin/vite",
+    "debug": "node --inspect-brk ../../packages/vite/bin/vite",
     "preview": "vite preview"
   }
 }

packages/playground/define/package.json → playground/define/package.json

@@ -5,7 +5,7 @@
   "scripts": {
     "dev": "vite",
     "build": "vite build",
-    "debug": "node --inspect-brk ../../vite/bin/vite",
+    "debug": "node --inspect-brk ../../packages/vite/bin/vite",
     "preview": "vite preview"
   }
 }

packages/playground/dynamic-import/package.json → playground/dynamic-import/package.json

@@ -5,9 +5,9 @@
   "scripts": {
     "dev": "vite",
     "build": "vite build",
-    "debug": "node --inspect-brk ../../vite/bin/vite",
+    "debug": "node --inspect-brk ../../packages/vite/bin/vite",
     "preview": "vite preview",
-    "postinstall": "ts-node ../../../scripts/patchFileDeps.ts"
+    "postinstall": "ts-node ../../scripts/patchFileDeps.ts"
   },
   "dependencies": {
     "pkg": "file:./pkg"