chore: merge main

sapphi-red · sapphi-red · commit 56a900e5f942 · 2025-07-08T16:53:55.000+09:00
diff --git a/docs/guide/dep-pre-bundling.md b/docs/guide/dep-pre-bundling.md
@@ -70,7 +70,7 @@ You can further customize esbuild too with the [`optimizeDeps.esbuildOptions` op
 
 Vite caches the pre-bundled dependencies in `node_modules/.vite`. It determines whether it needs to re-run the pre-bundling step based on a few sources:
 
-- Package manager lockfile content, e.g. `package-lock.json`, `yarn.lock`, `pnpm-lock.yaml` or `bun.lockb`.
+- Package manager lockfile content, e.g. `package-lock.json`, `yarn.lock`, `pnpm-lock.yaml` or `bun.lock`.
 - Patches folder modification time.
 - Relevant fields in your `vite.config.js`, if present.
 - `NODE_ENV` value.
diff --git a/docs/package.json b/docs/package.json
@@ -15,7 +15,7 @@
     "oxc-minify": "^0.74.0",
     "vitepress": "^2.0.0-alpha.7",
     "vitepress-plugin-group-icons": "^1.6.1",
-    "vitepress-plugin-llms": "^1.6.0",
+    "vitepress-plugin-llms": "^1.7.0",
     "vue": "^3.5.17"
   }
 }
diff --git a/eslint.config.js b/eslint.config.js
@@ -1,5 +1,5 @@
 // @ts-check
-import { builtinModules, createRequire } from 'node:module'
+import { createRequire } from 'node:module'
 import eslint from '@eslint/js'
 import pluginN from 'eslint-plugin-n'
 import pluginImportX from 'eslint-plugin-import-x'
@@ -115,6 +115,7 @@ export default tseslint.config(
           allowModules: ['vite'],
         },
       ],
+      'n/prefer-node-protocol': 'error',
 
       '@typescript-eslint/ban-ts-comment': 'error',
       '@typescript-eslint/no-unsafe-function-type': 'off',
@@ -159,10 +160,6 @@ export default tseslint.config(
       '@typescript-eslint/prefer-for-of': 'off',
       '@typescript-eslint/prefer-function-type': 'off',
 
-      'import-x/no-nodejs-modules': [
-        'error',
-        { allow: builtinModules.map((mod) => `node:${mod}`) },
-      ],
       'import-x/no-duplicates': 'error',
       'import-x/order': [
         'error',
diff --git a/package.json b/package.json
@@ -40,7 +40,7 @@
     "ci-docs": "pnpm build && pnpm docs-build"
   },
   "devDependencies": {
-    "@eslint/js": "^9.30.0",
+    "@eslint/js": "^9.30.1",
     "@type-challenges/utils": "^0.1.1",
     "@types/babel__core": "^7.20.5",
     "@types/babel__preset-env": "^7.10.0",
@@ -50,26 +50,26 @@
     "@types/estree": "^1.0.8",
     "@types/etag": "^1.8.4",
     "@types/less": "^3.0.8",
-    "@types/node": "^22.15.34",
+    "@types/node": "^22.16.0",
     "@types/picomatch": "^4.0.0",
     "@types/stylus": "^0.48.43",
     "@types/ws": "^8.18.1",
     "@vitejs/release-scripts": "^1.6.0",
-    "eslint": "^9.30.0",
+    "eslint": "^9.30.1",
     "eslint-plugin-import-x": "^4.16.1",
-    "eslint-plugin-n": "^17.20.0",
+    "eslint-plugin-n": "^17.21.0",
     "eslint-plugin-regexp": "^2.9.0",
     "execa": "^9.6.0",
-    "globals": "^16.2.0",
+    "globals": "^16.3.0",
     "lint-staged": "^16.1.2",
     "picocolors": "^1.1.1",
-    "playwright-chromium": "^1.53.1",
+    "playwright-chromium": "^1.53.2",
     "prettier": "3.6.2",
     "rollup": "^4.40.0",
     "simple-git-hooks": "^2.13.0",
     "tsx": "^4.20.3",
     "typescript": "~5.7.2",
-    "typescript-eslint": "^8.35.0",
+    "typescript-eslint": "^8.35.1",
     "vite": "workspace:*",
     "vitest": "^3.2.4"
   },
diff --git a/packages/create-vite/CHANGELOG.md b/packages/create-vite/CHANGELOG.md
@@ -1,3 +1,18 @@
+## <small>[7.0.1](https://github.com/vitejs/vite/compare/create-vite@7.0.0...create-vite@7.0.1) (2025-07-08)</small>
+### Features
+
+* **create-vite:** update rsc template to use `@vitejs/plugin-rsc` ([#20351](https://github.com/vitejs/vite/issues/20351)) ([b9ebc96](https://github.com/vitejs/vite/commit/b9ebc967bb9e8137dedb7d1304e4f693a52f1c03))
+
+### Bug Fixes
+
+* **deps:** update all non-major dependencies ([#20324](https://github.com/vitejs/vite/issues/20324)) ([3e81af3](https://github.com/vitejs/vite/commit/3e81af38a80c7617aba6bf3300d8b4267570f9cf))
+* **deps:** update all non-major dependencies ([#20366](https://github.com/vitejs/vite/issues/20366)) ([43ac73d](https://github.com/vitejs/vite/commit/43ac73da27b3907c701e95e6a7d28fde659729ec))
+
+### Miscellaneous Chores
+
+* **deps:** update rolldown-related dependencies ([#20323](https://github.com/vitejs/vite/issues/20323)) ([30d2f1b](https://github.com/vitejs/vite/commit/30d2f1b38c72387ffdca3ee4746730959a020b59))
+* group commits by category in changelog ([#20310](https://github.com/vitejs/vite/issues/20310)) ([41e83f6](https://github.com/vitejs/vite/commit/41e83f62b1adb65f5af4c1ec006de1c845437edc))
+
 ## [7.0.0](https://github.com/vitejs/vite/compare/create-vite@6.5.0...create-vite@7.0.0) (2025-06-24)
 ### ⚠ BREAKING CHANGES
 
diff --git a/packages/create-vite/package.json b/packages/create-vite/package.json
@@ -1,6 +1,6 @@
 {
   "name": "create-vite",
-  "version": "7.0.0",
+  "version": "7.0.1",
   "type": "module",
   "license": "MIT",
   "author": "Evan You",
diff --git a/packages/create-vite/src/index.ts b/packages/create-vite/src/index.ts
@@ -158,11 +158,11 @@ const FRAMEWORKS: Framework[] = [
           'npm exec degit redwoodjs/sdk/starters/standard TARGET_DIR',
       },
       {
-        name: '@hiogawa/vite-rsc',
-        display: '@hiogawa/vite-rsc ↗',
+        name: 'rsc',
+        display: 'RSC ↗',
         color: magenta,
         customCommand:
-          'npm exec degit hi-ogawa/vite-plugins/packages/rsc/examples/starter TARGET_DIR',
+          'npm exec degit vitejs/plugin-react/packages/plugin-rsc/examples/starter TARGET_DIR',
       },
     ],
   },
diff --git a/packages/create-vite/template-react-ts/package.json b/packages/create-vite/template-react-ts/package.json
@@ -14,16 +14,16 @@
     "react-dom": "^19.1.0"
   },
   "devDependencies": {
-    "@eslint/js": "^9.30.0",
+    "@eslint/js": "^9.30.1",
     "@types/react": "^19.1.8",
     "@types/react-dom": "^19.1.6",
     "@vitejs/plugin-react": "^4.6.0",
-    "eslint": "^9.30.0",
+    "eslint": "^9.30.1",
     "eslint-plugin-react-hooks": "^5.2.0",
     "eslint-plugin-react-refresh": "^0.4.20",
-    "globals": "^16.2.0",
+    "globals": "^16.3.0",
     "typescript": "~5.8.3",
-    "typescript-eslint": "^8.35.0",
+    "typescript-eslint": "^8.35.1",
     "vite": "npm:rolldown-vite@^7.0.5"
   }
 }
diff --git a/packages/create-vite/template-react/package.json b/packages/create-vite/template-react/package.json
@@ -14,14 +14,14 @@
     "react-dom": "^19.1.0"
   },
   "devDependencies": {
-    "@eslint/js": "^9.30.0",
+    "@eslint/js": "^9.30.1",
     "@types/react": "^19.1.8",
     "@types/react-dom": "^19.1.6",
     "@vitejs/plugin-react": "^4.6.0",
-    "eslint": "^9.30.0",
+    "eslint": "^9.30.1",
     "eslint-plugin-react-hooks": "^5.2.0",
     "eslint-plugin-react-refresh": "^0.4.20",
-    "globals": "^16.2.0",
+    "globals": "^16.3.0",
     "vite": "npm:rolldown-vite@^7.0.5"
   }
 }
diff --git a/packages/create-vite/template-svelte-ts/package.json b/packages/create-vite/template-svelte-ts/package.json
@@ -12,7 +12,7 @@
   "devDependencies": {
     "@sveltejs/vite-plugin-svelte": "^5.1.0",
     "@tsconfig/svelte": "^5.0.4",
-    "svelte": "^5.34.9",
+    "svelte": "^5.35.2",
     "svelte-check": "^4.2.2",
     "typescript": "~5.8.3",
     "vite": "npm:rolldown-vite@^7.0.5"
diff --git a/packages/create-vite/template-svelte/package.json b/packages/create-vite/template-svelte/package.json
@@ -10,7 +10,7 @@
   },
   "devDependencies": {
     "@sveltejs/vite-plugin-svelte": "^5.1.0",
-    "svelte": "^5.34.9",
+    "svelte": "^5.35.2",
     "vite": "npm:rolldown-vite@^7.0.5"
   }
 }
diff --git a/packages/create-vite/template-vue-ts/package.json b/packages/create-vite/template-vue-ts/package.json
@@ -16,6 +16,6 @@
     "@vue/tsconfig": "^0.7.0",
     "typescript": "~5.8.3",
     "vite": "npm:rolldown-vite@^7.0.5",
-    "vue-tsc": "^2.2.10"
+    "vue-tsc": "^2.2.12"
   }
 }
diff --git a/packages/plugin-legacy/package.json b/packages/plugin-legacy/package.json
@@ -33,10 +33,10 @@
   "homepage": "https://github.com/vitejs/vite/tree/main/packages/plugin-legacy#readme",
   "funding": "https://github.com/vitejs/vite?sponsor=1",
   "dependencies": {
-    "@babel/core": "^7.27.7",
+    "@babel/core": "^7.28.0",
     "@babel/plugin-transform-dynamic-import": "^7.27.1",
     "@babel/plugin-transform-modules-systemjs": "^7.27.1",
-    "@babel/preset-env": "^7.27.2",
+    "@babel/preset-env": "^7.28.0",
     "browserslist": "^4.25.1",
     "browserslist-to-esbuild": "^2.1.1",
     "core-js": "^3.43.0",
diff --git a/packages/vite/package.json b/packages/vite/package.json
@@ -94,10 +94,10 @@
   },
   "devDependencies": {
     "@ampproject/remapping": "^2.3.0",
-    "@babel/parser": "^7.27.7",
-    "@jridgewell/trace-mapping": "^0.3.26",
-    "@oxc-project/runtime": "^0.75.0",
-    "@oxc-project/types": "^0.75.0",
+    "@babel/parser": "^7.28.0",
+    "@jridgewell/trace-mapping": "^0.3.29",
+    "@oxc-project/runtime": "0.75.1",
+    "@oxc-project/types": "0.75.1",
     "@polka/compression": "^1.0.0-next.25",
     "@rolldown/pluginutils": "1.0.0-beta.24",
     "@rollup/plugin-alias": "^5.1.1",
@@ -106,7 +106,7 @@
     "@rollup/pluginutils": "^5.2.0",
     "@types/escape-html": "^1.0.4",
     "@types/pnpapi": "^0.0.5",
-    "artichokie": "^0.3.1",
+    "artichokie": "^0.3.2",
     "baseline-browser-mapping": "^2.4.4",
     "cac": "^6.7.14",
     "chokidar": "^3.6.0",
@@ -116,7 +116,7 @@
     "cross-spawn": "^7.0.6",
     "debug": "^4.4.1",
     "dep-types": "link:./src/types",
-    "dotenv": "^16.6.1",
+    "dotenv": "^17.0.1",
     "dotenv-expand": "^12.0.2",
     "es-module-lexer": "^1.7.0",
     "esbuild": "^0.25.0",
diff --git a/packages/vite/src/client/client.ts b/packages/vite/src/client/client.ts
@@ -105,7 +105,8 @@ const transport = normalizeModuleRunnerTransport(
 
 let willUnload = false
 if (typeof window !== 'undefined') {
-  window.addEventListener('beforeunload', () => {
+  // window can be misleadingly defined in a worker if using define (see #19307)
+  window.addEventListener?.('beforeunload', () => {
     willUnload = true
   })
 }
diff --git a/packages/vite/src/node/plugins/define.ts b/packages/vite/src/node/plugins/define.ts
@@ -9,6 +9,7 @@ const nonJsRe = /\.json(?:$|\?)/
 const isNonJsRequest = (request: string): boolean => nonJsRe.test(request)
 const importMetaEnvMarker = '__vite_import_meta_env__'
 const importMetaEnvKeyReCache = new Map<string, RegExp>()
+const escapedDotRE = /(?<!\\)\\./g
 
 export function definePlugin(config: ResolvedConfig): Plugin {
   const isBuild = config.command === 'build'
@@ -90,7 +91,12 @@ export function definePlugin(config: ResolvedConfig): Plugin {
       patternKeys.push('import.meta.env', 'import.meta.hot')
     }
     const pattern = patternKeys.length
-      ? new RegExp(patternKeys.map(escapeRegex).join('|'))
+      ? new RegExp(
+          patternKeys
+            // replace `\.` (ignore `\\.`) with `\??\.` to match with `?.` as well
+            .map((key) => escapeRegex(key).replaceAll(escapedDotRE, '\\??\\.'))
+            .join('|'),
+        )
       : null
 
     return [define, pattern, importMetaEnvVal] as const
diff --git a/packages/vite/src/node/ssr/runtime/__tests__/fixtures/native.js b/packages/vite/src/node/ssr/runtime/__tests__/fixtures/native.js
@@ -1,3 +1,3 @@
 export { existsSync } from 'node:fs'
-// eslint-disable-next-line import-x/no-nodejs-modules -- testing that importing without node prefix works
+// eslint-disable-next-line n/prefer-node-protocol -- testing that importing without node prefix works
 export { readdirSync } from 'fs'
diff --git a/playground/cli-module/vite.config.js b/playground/cli-module/vite.config.js
@@ -1,4 +1,4 @@
-// eslint-disable-next-line import-x/no-nodejs-modules
+// eslint-disable-next-line n/prefer-node-protocol
 import { URL } from 'url'
 import { defineConfig } from 'vite'
 
diff --git a/playground/define/__tests__/define.spec.ts b/playground/define/__tests__/define.spec.ts
@@ -109,3 +109,9 @@ test('replace constants on import.meta.env when it is a invalid json', async ()
     ),
   ).toBe('true')
 })
+
+test('optional values are detected by pattern properly', async () => {
+  expect(await page.textContent('.optional-env')).toBe(
+    JSON.parse(defines['process.env.SOMEVAR']),
+  )
+})
diff --git a/playground/define/index.html b/playground/define/index.html
@@ -72,6 +72,12 @@ <h2>Define undefined constants on import.meta.env when it's a invalid json</h2>
   </p>
 </section>
 
+<h2>Optional values are detected by pattern properly</h2>
+<p>
+  process?.env?.SOMEVAR
+  <code class="optional-env"></code>
+</p>
+
 <script>
   // inject __VITE_SOME_IDENTIFIER__ to test if it's replaced
   window.__VITE_SOME_IDENTIFIER__ = true
@@ -154,6 +160,9 @@ <h2>Define undefined constants on import.meta.env when it's a invalid json</h2>
     '.replace-undefined-constants-on-import-meta-env .import-meta-env-SOME_IDENTIFIER',
     `${import.meta.env.SOME_IDENTIFIER}`,
   )
+
+  import optionalEnv from './optional-env.js'
+  text('.optional-env', optionalEnv)
 </script>
 
 <style>
diff --git a/playground/define/optional-env.js b/playground/define/optional-env.js
@@ -0,0 +1,2 @@
+// separate file to test pattern filter
+export default process?.env?.SOMEVAR
diff --git a/playground/object-hooks/vite.config.ts b/playground/object-hooks/vite.config.ts
@@ -1,4 +1,4 @@
-/* eslint-disable import-x/no-nodejs-modules */
+/* eslint-disable n/prefer-node-protocol */
 import assert from 'assert'
 import { defineConfig } from 'vite'
 
diff --git a/playground/optimize-deps/dep-cjs-browser-field-bare/internal.js b/playground/optimize-deps/dep-cjs-browser-field-bare/internal.js
@@ -1,6 +1,6 @@
 'use strict'
 
-// eslint-disable-next-line import-x/no-nodejs-modules
+// eslint-disable-next-line n/prefer-node-protocol
 const events = require('events')
 
 module.exports = 'foo' in events ? 'pong' : ''
diff --git a/playground/optimize-deps/dep-cjs-with-external-deps/index.js b/playground/optimize-deps/dep-cjs-with-external-deps/index.js
@@ -1,5 +1,5 @@
 // `stream` is used as the package name for `@vitejs/test-dep-esm-dummy-node-builtin` so that it is treated like a Node builtin
-// eslint-disable-next-line import-x/no-nodejs-modules
+// eslint-disable-next-line n/prefer-node-protocol
 let externalDummyNodeBuiltin = require('stream')
 // NOTE: plugin-commonjs adds some compat code (`requireReturnsDefault`), but rolldown doesn't
 if (process.env.NODE_ENV === 'production') {
diff --git a/playground/optimize-deps/dep-with-builtin-module-cjs/index.js b/playground/optimize-deps/dep-with-builtin-module-cjs/index.js
@@ -1,7 +1,7 @@
 // no node: protocol intentionally
-// eslint-disable-next-line import-x/no-nodejs-modules
+// eslint-disable-next-line n/prefer-node-protocol
 const fs = require('fs')
-// eslint-disable-next-line import-x/no-nodejs-modules
+// eslint-disable-next-line n/prefer-node-protocol
 const path = require('path')
 
 // NOTE: require destructure would error immediately because of how esbuild
diff --git a/playground/optimize-deps/dep-with-builtin-module-esm/index.js b/playground/optimize-deps/dep-with-builtin-module-esm/index.js
@@ -1,7 +1,7 @@
 // no node: protocol intentionally
-// eslint-disable-next-line import-x/no-nodejs-modules
+// eslint-disable-next-line n/prefer-node-protocol
 import { readFileSync } from 'fs'
-// eslint-disable-next-line import-x/no-nodejs-modules
+// eslint-disable-next-line n/prefer-node-protocol
 import path from 'path'
 
 // access from named import
diff --git a/playground/ssr-webworker/package.json b/playground/ssr-webworker/package.json
@@ -13,7 +13,7 @@
     "@vitejs/test-worker-exports": "file:./worker-exports"
   },
   "devDependencies": {
-    "miniflare": "^4.20250617.4",
+    "miniflare": "^4.20250617.5",
     "@vitejs/test-resolve-linked": "workspace:*"
   }
 }
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@`
`15`	`15`	`"oxc-minify": "^0.74.0",`
`16`	`16`	`"vitepress": "^2.0.0-alpha.7",`
`17`	`17`	`"vitepress-plugin-group-icons": "^1.6.1",`
`18`		`- "vitepress-plugin-llms": "^1.6.0",`
	`18`	`+ "vitepress-plugin-llms": "^1.7.0",`
`19`	`19`	`"vue": "^3.5.17"`
`20`	`20`	`}`
`21`	`21`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "create-vite",`
`3`		`- "version": "7.0.0",`
	`3`	`+ "version": "7.0.1",`
`4`	`4`	`"type": "module",`
`5`	`5`	`"license": "MIT",`
`6`	`6`	`"author": "Evan You",`