chore: merge main

Author: sapphi-red

packages/create-vite/template-react-ts/README.md

@@ -39,16 +39,19 @@ import reactX from 'eslint-plugin-react-x'
 import reactDom from 'eslint-plugin-react-dom'
 
 export default tseslint.config({
-  plugins: {
-    // Add the react-x and react-dom plugins
-    'react-x': reactX,
-    'react-dom': reactDom,
-  },
-  rules: {
-    // other rules...
-    // Enable its recommended typescript rules
-    ...reactX.configs['recommended-typescript'].rules,
-    ...reactDom.configs.recommended.rules,
+  extends: [
+    // other configs...
+    // Enable lint rules for React
+    reactX.configs['recommended-typescript'],
+    // Enable lint rules for React DOM
+    reactDom.configs.recommended,
+  ],
+  languageOptions: {
+    // other options...
+    parserOptions: {
+      project: ['./tsconfig.node.json', './tsconfig.app.json'],
+      tsconfigRootDir: import.meta.dirname,
+    },
   },
 })
 ```

packages/create-vite/template-react/eslint.config.js

@@ -2,11 +2,13 @@ import js from '@eslint/js'
 import globals from 'globals'
 import reactHooks from 'eslint-plugin-react-hooks'
 import reactRefresh from 'eslint-plugin-react-refresh'
+import { defineConfig } from 'eslint/config'
 
-export default [
+export default defineConfig([
   { ignores: ['dist'] },
   {
     files: ['**/*.{js,jsx}'],
+    extends: [js.configs.recommended],
     languageOptions: {
       ecmaVersion: 2020,
       globals: globals.browser,
@@ -21,7 +23,6 @@ export default [
       'react-refresh': reactRefresh,
     },
     rules: {
-      ...js.configs.recommended.rules,
       ...reactHooks.configs.recommended.rules,
       'no-unused-vars': ['error', { varsIgnorePattern: '^[A-Z_]' }],
       'react-refresh/only-export-components': [
@@ -30,4 +31,4 @@ export default [
       ],
     },
   },
-]
+])

packages/vite/src/node/cli.ts

@@ -95,6 +95,7 @@ function cleanGlobalCLIOptions<Options extends GlobalCLIOptions>(
   delete ret.filter
   delete ret.m
   delete ret.mode
+  delete ret.force
   delete ret.w
 
   // convert the sourcemap option to a boolean if necessary

playground/optimize-deps/__tests__/optimize-deps.spec.ts

@@ -30,6 +30,18 @@ test('default import from webpacked cjs (clipboard)', async () => {
   await expectWithRetry(() => page.textContent('.cjs-clipboard')).toBe('ok')
 })
 
+test('default import from cjs (cjs-dep-cjs-compiled-from-esm)', async () => {
+  await expectWithRetry(() =>
+    page.textContent('.cjs-dep-cjs-compiled-from-esm'),
+  ).toBe('ok')
+})
+
+test('default import from cjs (cjs-dep-cjs-compiled-from-cjs)', async () => {
+  await expectWithRetry(() =>
+    page.textContent('.cjs-dep-cjs-compiled-from-cjs'),
+  ).toBe('ok')
+})
+
 // NOTE: rolldown behaves differently from @rollup/plugin-commonjs https://github.com/rolldown/rolldown/issues/2031
 test.skip('dynamic imports from cjs dep (react)', async () => {
   await expectWithRetry(() => page.textContent('.cjs-dynamic button')).toBe(

playground/optimize-deps/cjs-dynamic.js

@@ -17,13 +17,11 @@
   }
 
   const cjsFromESM = await import('@vitejs/test-dep-cjs-compiled-from-esm')
-  console.log('cjsFromESM', cjsFromESM)
   if (typeof cjsFromESM.default === 'function') {
     text('.cjs-dynamic-dep-cjs-compiled-from-esm', 'ok')
   }
 
   const cjsFromCJS = await import('@vitejs/test-dep-cjs-compiled-from-cjs')
-  console.log('cjsFromCJS', cjsFromCJS)
   if (typeof cjsFromCJS.default === 'function') {
     text('.cjs-dynamic-dep-cjs-compiled-from-cjs', 'ok')
   }

playground/optimize-deps/cjs.js

@@ -5,6 +5,8 @@ import React, { useState } from 'react'
 import ReactDOM from 'react-dom/client'
 import { Socket } from 'phoenix'
 import clip from 'clipboard'
+import cjsFromESM from '@vitejs/test-dep-cjs-compiled-from-esm'
+import cjsFromCJS from '@vitejs/test-dep-cjs-compiled-from-cjs'
 
 // Test exporting a name that was already imported
 export { useState } from 'react'
@@ -19,6 +21,14 @@ if (typeof Socket === 'function') {
   text('.cjs-phoenix', 'ok')
 }
 
+if (typeof cjsFromESM === 'function') {
+  text('.cjs-dep-cjs-compiled-from-esm', 'ok')
+}
+
+if (typeof cjsFromCJS === 'function') {
+  text('.cjs-dep-cjs-compiled-from-cjs', 'ok')
+}
+
 function App() {
   const [count, setCount] = useState(0)
 

playground/optimize-deps/index.html

@@ -6,6 +6,10 @@ <h2>CommonJS w/ named imports (phoenix)</h2>
 <div class="cjs-phoenix">fail</div>
 <h2>CommonJS w/ default export (clipboard)</h2>
 <div class="cjs-clipboard">fail</div>
+<h2>CommonJS import default (dep-cjs-compiled-from-esm)</h2>
+<div class="cjs-dep-cjs-compiled-from-esm"></div>
+<h2>CommonJS import default (dep-cjs-compiled-from-cjs)</h2>
+<div class="cjs-dep-cjs-compiled-from-cjs"></div>
 
 <script type="module" src="./cjs.js"></script>
 

playground/ssr-html/__tests__/ssr-html.spec.ts

@@ -86,7 +86,7 @@ describe.runIf(isServe)('stacktrace', () => {
 
         const reg = new RegExp(
           path
-            .resolve(__dirname, '../src', `error.${ext}`)
+            .resolve(__dirname, '../src', `error-${ext}.${ext}`)
             .replace(/\\/g, '\\\\') + ':2:9',
           'i',
         )