Merge branch 'main' into fix/optimize-deps-on-dev-ssr-opt-in

docs/guide/migration.md

@@ -100,7 +100,7 @@ You can use `?init` which is similar to the previous behavior.
 -import init from 'example.wasm'
 +import init from 'example.wasm?init'
 
--init().then((instance) => {
+-init().then((exports) => {
 +init().then(({ exports }) => {
   exports.test()
 })

package.json

@@ -36,15 +36,15 @@
     "ci-docs": "run-s build docs-build"
   },
   "devDependencies": {
-    "@babel/types": "^7.18.4",
-    "@microsoft/api-extractor": "^7.25.2",
+    "@babel/types": "^7.18.7",
+    "@microsoft/api-extractor": "^7.28.1",
     "@rollup/plugin-typescript": "^8.3.3",
     "@types/babel__core": "^7.1.19",
     "@types/babel__standalone": "^7.1.4",
     "@types/convert-source-map": "^1.5.2",
     "@types/cross-spawn": "^6.0.2",
     "@types/debug": "^4.1.7",
-    "@types/estree": "^0.0.51",
+    "@types/estree": "^0.0.52",
     "@types/etag": "^1.8.1",
     "@types/fs-extra": "^9.0.13",
     "@types/hash-sum": "^1.0.0",
@@ -59,8 +59,8 @@
     "@types/semver": "^7.3.10",
     "@types/stylus": "^0.48.38",
     "@types/ws": "^8.5.3",
-    "@typescript-eslint/eslint-plugin": "^5.28.0",
-    "@typescript-eslint/parser": "^5.28.0",
+    "@typescript-eslint/eslint-plugin": "^5.30.0",
+    "@typescript-eslint/parser": "^5.30.0",
     "conventional-changelog-cli": "^2.2.2",
     "cross-env": "^7.0.3",
     "esbuild": "^0.14.47",
@@ -71,13 +71,13 @@
     "execa": "^6.1.0",
     "fs-extra": "^10.1.0",
     "kill-port": "^1.6.1",
-    "lint-staged": "^13.0.2",
+    "lint-staged": "^13.0.3",
     "minimist": "^1.2.6",
     "node-fetch": "^3.2.6",
     "npm-run-all": "^4.1.5",
     "picocolors": "^1.0.0",
-    "playwright-chromium": "^1.22.2",
-    "pnpm": "^7.3.0",
+    "playwright-chromium": "^1.23.0",
+    "pnpm": "^7.4.0",
     "prettier": "2.7.1",
     "prompts": "^2.4.2",
     "rimraf": "^3.0.2",
@@ -90,8 +90,8 @@
     "typescript": "^4.6.4",
     "unbuild": "^0.7.4",
     "vite": "workspace:*",
-    "vitepress": "^1.0.0-alpha.2",
-    "vitest": "^0.15.1",
+    "vitepress": "^1.0.0-alpha.4",
+    "vitest": "^0.16.0",
     "vue": "^3.2.37"
   },
   "simple-git-hooks": {
@@ -112,7 +112,7 @@
       "eslint --cache --fix"
     ]
   },
-  "packageManager": "pnpm@7.3.0",
+  "packageManager": "pnpm@7.4.0",
   "pnpm": {
     "overrides": {
       "vite": "workspace:*",

packages/create-vite/template-lit-ts/package.json

@@ -21,6 +21,6 @@
   },
   "devDependencies": {
     "typescript": "^4.6.4",
-    "vite": "^2.9.12"
+    "vite": "^2.9.13"
   }
 }

packages/create-vite/template-lit/package.json

@@ -18,6 +18,6 @@
     "lit": "^2.2.6"
   },
   "devDependencies": {
-    "vite": "^2.9.12"
+    "vite": "^2.9.13"
   }
 }

packages/create-vite/template-preact-ts/package.json

@@ -9,11 +9,11 @@
     "preview": "vite preview"
   },
   "dependencies": {
-    "preact": "^10.8.1"
+    "preact": "^10.8.2"
   },
   "devDependencies": {
-    "@preact/preset-vite": "^2.2.0",
+    "@preact/preset-vite": "^2.3.0",
     "typescript": "^4.6.4",
-    "vite": "^2.9.12"
+    "vite": "^2.9.13"
   }
 }

packages/create-vite/template-preact/package.json

@@ -9,10 +9,10 @@
     "preview": "vite preview"
   },
   "dependencies": {
-    "preact": "^10.8.1"
+    "preact": "^10.8.2"
   },
   "devDependencies": {
-    "@preact/preset-vite": "^2.2.0",
-    "vite": "^2.9.12"
+    "@preact/preset-vite": "^2.3.0",
+    "vite": "^2.9.13"
   }
 }

packages/create-vite/template-react-ts/package.json

@@ -17,6 +17,6 @@
     "@types/react-dom": "^18.0.5",
     "@vitejs/plugin-react": "^1.3.2",
     "typescript": "^4.6.4",
-    "vite": "^2.9.12"
+    "vite": "^2.9.13"
   }
 }

packages/create-vite/template-react/package.json

@@ -16,6 +16,6 @@
     "@types/react": "^18.0.14",
     "@types/react-dom": "^18.0.5",
     "@vitejs/plugin-react": "^1.3.2",
-    "vite": "^2.9.12"
+    "vite": "^2.9.13"
   }
 }

packages/create-vite/template-svelte-ts/package.json

@@ -13,10 +13,10 @@
     "@sveltejs/vite-plugin-svelte": "^1.0.0-next.49",
     "@tsconfig/svelte": "^3.0.0",
     "svelte": "^3.48.0",
-    "svelte-check": "^2.7.2",
+    "svelte-check": "^2.8.0",
     "svelte-preprocess": "^4.10.7",
     "tslib": "^2.4.0",
     "typescript": "^4.6.4",
-    "vite": "^2.9.12"
+    "vite": "^2.9.13"
   }
 }

packages/create-vite/template-svelte/package.json

@@ -11,6 +11,6 @@
   "devDependencies": {
     "@sveltejs/vite-plugin-svelte": "^1.0.0-next.49",
     "svelte": "^3.48.0",
-    "vite": "^2.9.12"
+    "vite": "^2.9.13"
   }
 }

packages/create-vite/template-vanilla-ts/package.json

@@ -10,6 +10,6 @@
   },
   "devDependencies": {
     "typescript": "^4.6.4",
-    "vite": "^2.9.12"
+    "vite": "^2.9.13"
   }
 }

packages/create-vite/template-vanilla/package.json

@@ -9,6 +9,6 @@
     "preview": "vite preview"
   },
   "devDependencies": {
-    "vite": "^2.9.12"
+    "vite": "^2.9.13"
   }
 }

packages/create-vite/template-vue-ts/package.json

@@ -14,7 +14,7 @@
   "devDependencies": {
     "@vitejs/plugin-vue": "^2.3.3",
     "typescript": "^4.6.4",
-    "vite": "^2.9.12",
-    "vue-tsc": "^0.38.1"
+    "vite": "^2.9.13",
+    "vue-tsc": "^0.38.2"
   }
 }

packages/create-vite/template-vue/package.json

@@ -13,6 +13,6 @@
   },
   "devDependencies": {
     "@vitejs/plugin-vue": "^2.3.3",
-    "vite": "^2.9.12"
+    "vite": "^2.9.13"
   }
 }

packages/plugin-legacy/package.json

@@ -35,7 +35,7 @@
   },
   "homepage": "https://github.com/vitejs/vite/tree/main/packages/plugin-legacy#readme",
   "dependencies": {
-    "@babel/standalone": "^7.18.5",
+    "@babel/standalone": "^7.18.7",
     "core-js": "^3.23.1",
     "magic-string": "^0.26.2",
     "regenerator-runtime": "^0.13.9",
@@ -46,7 +46,7 @@
     "vite": "^3.0.0-alpha"
   },
   "devDependencies": {
-    "@babel/core": "^7.18.5",
+    "@babel/core": "^7.18.6",
     "vite": "workspace:*"
   }
 }

packages/plugin-react/package.json

@@ -39,11 +39,11 @@
   },
   "homepage": "https://github.com/vitejs/vite/tree/main/packages/plugin-react#readme",
   "dependencies": {
-    "@babel/core": "^7.18.5",
-    "@babel/plugin-transform-react-jsx": "^7.17.12",
-    "@babel/plugin-transform-react-jsx-development": "^7.16.7",
-    "@babel/plugin-transform-react-jsx-self": "^7.17.12",
-    "@babel/plugin-transform-react-jsx-source": "^7.16.7",
+    "@babel/core": "^7.18.6",
+    "@babel/plugin-transform-react-jsx": "^7.18.6",
+    "@babel/plugin-transform-react-jsx-development": "^7.18.6",
+    "@babel/plugin-transform-react-jsx-self": "^7.18.6",
+    "@babel/plugin-transform-react-jsx-source": "^7.18.6",
     "react-refresh": "^0.14.0"
   },
   "peerDependencies": {

packages/plugin-vue-jsx/package.json

@@ -35,9 +35,9 @@
   },
   "homepage": "https://github.com/vitejs/vite/tree/main/packages/plugin-vue-jsx#readme",
   "dependencies": {
-    "@babel/core": "^7.18.5",
+    "@babel/core": "^7.18.6",
     "@babel/plugin-syntax-import-meta": "^7.10.4",
-    "@babel/plugin-transform-typescript": "^7.18.4",
+    "@babel/plugin-transform-typescript": "^7.18.6",
     "@vue/babel-plugin-jsx": "^1.1.1"
   },
   "devDependencies": {

packages/plugin-vue/package.json

@@ -39,8 +39,8 @@
     "vue": "^3.2.25"
   },
   "devDependencies": {
-    "@jridgewell/gen-mapping": "^0.3.1",
-    "@jridgewell/trace-mapping": "^0.3.13",
+    "@jridgewell/gen-mapping": "^0.3.2",
+    "@jridgewell/trace-mapping": "^0.3.14",
     "debug": "^4.3.4",
     "rollup": "^2.75.6",
     "slash": "^4.0.0",

packages/vite/package.json

@@ -68,9 +68,9 @@
   },
   "devDependencies": {
     "@ampproject/remapping": "^2.2.0",
-    "@babel/parser": "^7.18.5",
-    "@babel/types": "^7.18.4",
-    "@jridgewell/trace-mapping": "^0.3.13",
+    "@babel/parser": "^7.18.6",
+    "@babel/types": "^7.18.7",
+    "@jridgewell/trace-mapping": "^0.3.14",
     "@rollup/plugin-alias": "^3.1.9",
     "@rollup/plugin-commonjs": "^22.0.1",
     "@rollup/plugin-dynamic-import-vars": "^1.4.3",

packages/vite/src/node/config.ts

@@ -648,6 +648,19 @@ export async function resolveConfig(
     )
   }
 
+  if (
+    config.server?.force &&
+    !isBuild &&
+    config.optimizeDeps?.force === undefined
+  ) {
+    resolved.optimizeDeps.force = true
+    logger.warn(
+      colors.yellow(
+        `server.force is deprecated, use optimizeDeps.force instead`
+      )
+    )
+  }
+
   if (resolved.legacy?.buildRollupPluginCommonjs) {
     const optimizerDisabled = resolved.optimizeDeps.disabled
     if (!optimizerDisabled) {

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

@@ -77,13 +77,14 @@ export function workerImportMetaUrlPlugin(config: ResolvedConfig): Plugin {
 
     async transform(code, id, options) {
       const ssr = options?.ssr === true
-      const query = parseRequest(id)
-      let s: MagicString | undefined
       if (
+        !options?.ssr &&
         (code.includes('new Worker') || code.includes('new SharedWorker')) &&
         code.includes('new URL') &&
         code.includes(`import.meta.url`)
       ) {
+        const query = parseRequest(id)
+        let s: MagicString | undefined
         const cleanString = stripLiteral(code)
         const workerImportMetaUrlRE =
           /\bnew\s+(Worker|SharedWorker)\s*\(\s*(new\s+URL\s*\(\s*('[^']+'|"[^"]+"|`[^`]+`)\s*,\s*import\.meta\.url\s*\))/g
@@ -97,13 +98,6 @@ export function workerImportMetaUrlPlugin(config: ResolvedConfig): Plugin {
           const urlEnd = urlStart + emptyUrl.length
           const rawUrl = code.slice(urlStart, urlEnd)
 
-          if (options?.ssr) {
-            this.error(
-              `\`new URL(url, import.meta.url)\` is not supported in SSR.`,
-              urlIndex
-            )
-          }
-
           // potential dynamic template string
           if (rawUrl[0] === '`' && /\$\{/.test(rawUrl)) {
             this.error(

packages/vite/src/node/server/index.ts

@@ -100,6 +100,13 @@ export interface ServerOptions extends CommonServerOptions {
    * @default true
    */
   preTransformRequests?: boolean
+  /**
+   * Force dep pre-optimization regardless of whether deps have changed.
+   *
+   * @deprecated Use optimizeDeps.force instead, this option may be removed
+   * in a future minor version without following semver
+   */
+  force?: boolean
 }
 
 export interface ResolvedServerOptions extends ServerOptions {
@@ -710,7 +717,7 @@ async function restartServer(server: ViteDevServer) {
   let inlineConfig = server.config.inlineConfig
   if (server._forceOptimizeOnRestart) {
     inlineConfig = mergeConfig(inlineConfig, {
-      server: {
+      optimizeDeps: {
         force: true
       }
     })

playground/backend-integration/package.json

@@ -9,8 +9,8 @@
     "preview": "vite preview"
   },
   "devDependencies": {
-    "sass": "^1.52.3",
-    "tailwindcss": "^3.1.3",
+    "sass": "^1.53.0",
+    "tailwindcss": "^3.1.4",
     "fast-glob": "^3.2.11"
   }
 }

playground/css-sourcemap/package.json

@@ -11,7 +11,7 @@
   "devDependencies": {
     "less": "^4.1.3",
     "magic-string": "^0.26.2",
-    "sass": "^1.52.3",
+    "sass": "^1.53.0",
     "stylus": "^0.58.1"
   }
 }

playground/css/package.json

@@ -16,7 +16,7 @@
     "fast-glob": "^3.2.11",
     "less": "^4.1.3",
     "postcss-nested": "^5.0.6",
-    "sass": "^1.52.3",
+    "sass": "^1.53.0",
     "stylus": "^0.58.1"
   }
 }

playground/multiple-entrypoints/package.json

@@ -10,6 +10,6 @@
   },
   "devDependencies": {
     "fast-glob": "^3.2.11",
-    "sass": "^1.52.3"
+    "sass": "^1.53.0"
   }
 }

playground/react-classic/package.json

@@ -9,8 +9,8 @@
     "preview": "vite preview"
   },
   "dependencies": {
-    "react": "^18.1.0",
-    "react-dom": "^18.1.0"
+    "react": "^18.2.0",
+    "react-dom": "^18.2.0"
   },
   "devDependencies": {
     "@vitejs/plugin-react": "workspace:*"

playground/react-emotion/package.json

@@ -15,7 +15,7 @@
     "react-switch": "^7.0.0"
   },
   "devDependencies": {
-    "@babel/plugin-proposal-pipeline-operator": "^7.18.2",
+    "@babel/plugin-proposal-pipeline-operator": "^7.18.6",
     "@emotion/babel-plugin": "^11.9.2",
     "@vitejs/plugin-react": "workspace:*"
   },