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

Author: sapphi-red

.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

@@ -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'
     }
   }
 }

docs/guide/ssr.md

@@ -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\\")
 };

jest.config.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/__tests__/plugins/importGlob/__snapshots__/fixture.test.ts.snap

@@ -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/__tests__/plugins/importGlob/fixture-a/index.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}`
               )