Merge branch 'vitejs:main' into main

vitejs · Aug 3, 2022 · ef52db1 · ef52db1
2 parents 2658e21 + 1983cf4
commit ef52db1
Show file tree

Hide file tree

Showing 43 changed files with 564 additions and 376 deletions.
diff --git a/.eslintrc.cjs b/.eslintrc.cjs
@@ -42,18 +42,6 @@ module.exports = defineConfig({
         tryExtensions: ['.ts', '.js', '.jsx', '.tsx', '.d.ts']
       }
     ],
-    'node/no-restricted-require': [
-      'error',
-      Object.keys(require('./packages/vite/package.json').devDependencies).map(
-        (d) => ({
-          name: d,
-          message:
-            `devDependencies can only be imported using ESM syntax so ` +
-            `that they are included in the rollup bundle. If you are trying to ` +
-            `lazy load a dependency, use (await import('dependency')).default instead.`
-        })
-      )
-    ],
     'node/no-extraneous-import': [
       'error',
       {
@@ -107,6 +95,30 @@ module.exports = defineConfig({
     ]
   },
   overrides: [
+    {
+      files: ['packages/**'],
+      excludedFiles: '**/__tests__/**',
+      rules: {
+        'no-restricted-globals': ['error', 'require', '__dirname', '__filename']
+      }
+    },
+    {
+      files: 'packages/vite/**/*.*',
+      rules: {
+        'node/no-restricted-require': [
+          'error',
+          Object.keys(
+            require('./packages/vite/package.json').devDependencies
+          ).map((d) => ({
+            name: d,
+            message:
+              `devDependencies can only be imported using ESM syntax so ` +
+              `that they are included in the rollup bundle. If you are trying to ` +
+              `lazy load a dependency, use (await import('dependency')).default instead.`
+          }))
+        ]
+      }
+    },
     {
       files: ['packages/vite/src/node/**'],
       rules: {
@@ -120,9 +132,11 @@ module.exports = defineConfig({
       }
     },
     {
-      files: ['packages/plugin-*/**/*'],
+      files: ['packages/create-vite/template-*/**', '**/build.config.ts'],
       rules: {
-        'no-restricted-globals': ['error', 'require', '__dirname', '__filename']
+        'no-undef': 'off',
+        'node/no-missing-import': 'off',
+        '@typescript-eslint/explicit-module-boundary-types': 'off'
       }
     },
     {
@@ -132,7 +146,6 @@ module.exports = defineConfig({
         'node/no-extraneous-require': 'off',
         'node/no-missing-import': 'off',
         'node/no-missing-require': 'off',
-        'no-undef': 'off',
         // engine field doesn't exist in playgrounds
         'node/no-unsupported-features/es-builtins': [
           'error',
@@ -145,17 +158,22 @@ module.exports = defineConfig({
           {
             version: '^14.18.0 || >=16.0.0'
           }
-        ]
+        ],
+        '@typescript-eslint/explicit-module-boundary-types': 'off'
       }
     },
     {
-      files: ['packages/create-vite/template-*/**', '**/build.config.ts'],
+      files: ['playground/**'],
+      excludedFiles: '**/__tests__/**',
       rules: {
-        'node/no-missing-import': 'off'
+        'no-undef': 'off',
+        'no-empty': 'off',
+        'no-constant-condition': 'off',
+        '@typescript-eslint/no-empty-function': 'off'
       }
     },
     {
-      files: ['playground/**', '*.js'],
+      files: ['*.js'],
       rules: {
         '@typescript-eslint/explicit-module-boundary-types': 'off'
       }
@@ -165,12 +183,6 @@ module.exports = defineConfig({
       rules: {
         '@typescript-eslint/triple-slash-reference': 'off'
       }
-    },
-    {
-      files: 'packages/vite/**/*.*',
-      rules: {
-        'no-restricted-globals': ['error', 'require', '__dirname', '__filename']
-      }
     }
   ],
   reportUnusedDisableDirectives: true

diff --git a/docs/guide/features.md b/docs/guide/features.md
@@ -102,6 +102,20 @@ This will provide the following type shims:
 - Types for the Vite-injected [env variables](./env-and-mode#env-variables) on `import.meta.env`
 - Types for the [HMR API](./api-hmr) on `import.meta.hot`
 
+::: tip
+To override the default typing, declare it before the triple-slash reference. For example, to make the default import of `*.svg` a React component:
+
+```ts
+declare module '*.svg' {
+  const content: React.FC<React.SVGProps<SVGElement>>
+  export default content
+}
+
+/// <reference types="vite/client" />
+```
+
+:::
+
 ## Vue
 
 Vite provides first-class Vue support:

diff --git a/package.json b/package.json
@@ -16,7 +16,7 @@
     "preinstall": "npx only-allow pnpm",
     "postinstall": "simple-git-hooks",
     "format": "prettier --write --cache .",
-    "lint": "eslint --cache packages/*/{src,types,__tests__}/** playground/**/__tests__/**/*.ts scripts/**",
+    "lint": "eslint --cache .",
     "typecheck": "tsc -p scripts --noEmit && tsc -p playground --noEmit",
     "test": "run-s test-unit test-serve test-build",
     "test-serve": "vitest run -c vitest.config.e2e.ts",
@@ -37,8 +37,8 @@
   },
   "devDependencies": {
     "@babel/types": "^7.18.9",
-    "@microsoft/api-extractor": "^7.28.6",
-    "@rollup/plugin-typescript": "^8.3.3",
+    "@microsoft/api-extractor": "^7.28.7",
+    "@rollup/plugin-typescript": "^8.3.4",
     "@types/babel__core": "^7.1.19",
     "@types/babel__standalone": "^7.1.4",
     "@types/convert-source-map": "^1.5.2",
@@ -47,10 +47,8 @@
     "@types/estree": "^1.0.0",
     "@types/etag": "^1.8.1",
     "@types/fs-extra": "^9.0.13",
-    "@types/hash-sum": "^1.0.0",
     "@types/less": "^3.0.3",
     "@types/micromatch": "^4.0.2",
-    "@types/mime": "^2.0.3",
     "@types/minimist": "^1.2.2",
     "@types/node": "^17.0.42",
     "@types/prompts": "^2.4.0",
@@ -59,39 +57,36 @@
     "@types/semver": "^7.3.10",
     "@types/stylus": "^0.48.38",
     "@types/ws": "^8.5.3",
-    "@typescript-eslint/eslint-plugin": "^5.30.7",
-    "@typescript-eslint/parser": "^5.30.7",
+    "@typescript-eslint/eslint-plugin": "^5.31.0",
+    "@typescript-eslint/parser": "^5.31.0",
     "conventional-changelog-cli": "^2.2.2",
     "cross-env": "^7.0.3",
     "esbuild": "^0.14.47",
-    "eslint": "^8.20.0",
-    "eslint-define-config": "^1.5.1",
+    "eslint": "^8.21.0",
+    "eslint-define-config": "^1.6.0",
     "eslint-plugin-import": "^2.26.0",
     "eslint-plugin-node": "^11.1.0",
     "execa": "^6.1.0",
     "fs-extra": "^10.1.0",
-    "kill-port": "^1.6.1",
     "lint-staged": "^13.0.3",
     "minimist": "^1.2.6",
-    "node-fetch": "^3.2.9",
     "npm-run-all": "^4.1.5",
     "picocolors": "^1.0.0",
-    "playwright-chromium": "^1.24.0",
-    "pnpm": "^7.6.0",
+    "playwright-chromium": "^1.24.2",
+    "pnpm": "^7.8.0",
     "prettier": "2.7.1",
     "prompts": "^2.4.2",
     "rimraf": "^3.0.2",
     "rollup": "^2.75.6",
     "semver": "^7.3.7",
     "simple-git-hooks": "^2.8.0",
-    "sirv": "^2.0.2",
     "tslib": "^2.4.0",
     "tsx": "^3.8.0",
     "typescript": "^4.6.4",
     "unbuild": "^0.7.6",
     "vite": "workspace:*",
     "vitepress": "^1.0.0-alpha.4",
-    "vitest": "^0.19.0",
+    "vitest": "^0.20.2",
     "vue": "^3.2.37"
   },
   "simple-git-hooks": {
@@ -112,7 +107,7 @@
       "eslint --cache --fix"
     ]
   },
-  "packageManager": "pnpm@7.6.0",
+  "packageManager": "pnpm@7.8.0",
   "pnpm": {
     "overrides": {
       "vite": "workspace:*",

diff --git a/packages/create-vite/template-lit-ts/package.json b/packages/create-vite/template-lit-ts/package.json
@@ -21,6 +21,6 @@
   },
   "devDependencies": {
     "typescript": "^4.6.4",
-    "vite": "^3.0.2"
+    "vite": "^3.0.4"
   }
 }
diff --git a/packages/create-vite/template-lit-ts/src/my-element.ts b/packages/create-vite/template-lit-ts/src/my-element.ts
@@ -1,4 +1,4 @@
-import { html, css, LitElement } from 'lit'
+import { LitElement, css, html } from 'lit'
 import { customElement, property } from 'lit/decorators.js'
 import litLogo from './assets/lit.svg'
 

diff --git a/packages/create-vite/template-lit/package.json b/packages/create-vite/template-lit/package.json
@@ -18,6 +18,6 @@
     "lit": "^2.2.8"
   },
   "devDependencies": {
-    "vite": "^3.0.2"
+    "vite": "^3.0.4"
   }
 }
diff --git a/packages/create-vite/template-lit/src/my-element.js b/packages/create-vite/template-lit/src/my-element.js
@@ -1,4 +1,4 @@
-import { html, css, LitElement } from 'lit'
+import { LitElement, css, html } from 'lit'
 import litLogo from './assets/lit.svg'
 
 /**

diff --git a/packages/create-vite/template-preact-ts/package.json b/packages/create-vite/template-preact-ts/package.json
@@ -14,6 +14,6 @@
   "devDependencies": {
     "@preact/preset-vite": "^2.3.0",
     "typescript": "^4.6.4",
-    "vite": "^3.0.2"
+    "vite": "^3.0.4"
   }
 }
diff --git a/packages/create-vite/template-preact/package.json b/packages/create-vite/template-preact/package.json
@@ -13,6 +13,6 @@
   },
   "devDependencies": {
     "@preact/preset-vite": "^2.3.0",
-    "vite": "^3.0.2"
+    "vite": "^3.0.4"
   }
 }
diff --git a/packages/create-vite/template-react-ts/package.json b/packages/create-vite/template-react-ts/package.json
@@ -17,6 +17,6 @@
     "@types/react-dom": "^18.0.6",
     "@vitejs/plugin-react": "^2.0.0",
     "typescript": "^4.6.4",
-    "vite": "^3.0.2"
+    "vite": "^3.0.4"
   }
 }
diff --git a/packages/create-vite/template-react/package.json b/packages/create-vite/template-react/package.json
@@ -16,6 +16,6 @@
     "@types/react": "^18.0.15",
     "@types/react-dom": "^18.0.6",
     "@vitejs/plugin-react": "^2.0.0",
-    "vite": "^3.0.2"
+    "vite": "^3.0.4"
   }
 }
diff --git a/packages/create-vite/template-svelte-ts/package.json b/packages/create-vite/template-svelte-ts/package.json
@@ -17,6 +17,6 @@
     "svelte-preprocess": "^4.10.7",
     "tslib": "^2.4.0",
     "typescript": "^4.6.4",
-    "vite": "^3.0.2"
+    "vite": "^3.0.4"
   }
 }
diff --git a/packages/create-vite/template-svelte/package.json b/packages/create-vite/template-svelte/package.json
@@ -11,6 +11,6 @@
   "devDependencies": {
     "@sveltejs/vite-plugin-svelte": "^1.0.1",
     "svelte": "^3.49.0",
-    "vite": "^3.0.2"
+    "vite": "^3.0.4"
   }
 }
diff --git a/packages/create-vite/template-vanilla-ts/package.json b/packages/create-vite/template-vanilla-ts/package.json
@@ -10,6 +10,6 @@
   },
   "devDependencies": {
     "typescript": "^4.6.4",
-    "vite": "^3.0.2"
+    "vite": "^3.0.4"
   }
 }
diff --git a/packages/create-vite/template-vanilla/package.json b/packages/create-vite/template-vanilla/package.json
@@ -9,6 +9,6 @@
     "preview": "vite preview"
   },
   "devDependencies": {
-    "vite": "^3.0.2"
+    "vite": "^3.0.4"
   }
 }
diff --git a/packages/create-vite/template-vue-ts/package.json b/packages/create-vite/template-vue-ts/package.json
@@ -14,7 +14,7 @@
   "devDependencies": {
     "@vitejs/plugin-vue": "^3.0.1",
     "typescript": "^4.6.4",
-    "vite": "^3.0.2",
-    "vue-tsc": "^0.39.0"
+    "vite": "^3.0.4",
+    "vue-tsc": "^0.39.4"
   }
 }
diff --git a/packages/create-vite/template-vue/package.json b/packages/create-vite/template-vue/package.json
@@ -13,6 +13,6 @@
   },
   "devDependencies": {
     "@vitejs/plugin-vue": "^3.0.1",
-    "vite": "^3.0.2"
+    "vite": "^3.0.4"
   }
 }
diff --git a/packages/plugin-legacy/package.json b/packages/plugin-legacy/package.json
@@ -36,7 +36,7 @@
   "homepage": "https://github.com/vitejs/vite/tree/main/packages/plugin-legacy#readme",
   "dependencies": {
     "@babel/standalone": "^7.18.9",
-    "core-js": "^3.24.0",
+    "core-js": "^3.24.1",
     "magic-string": "^0.26.2",
     "regenerator-runtime": "^0.13.9",
     "systemjs": "^6.12.1"

diff --git a/packages/vite/package.json b/packages/vite/package.json
@@ -76,7 +76,7 @@
     "@rollup/plugin-dynamic-import-vars": "^1.4.3",
     "@rollup/plugin-json": "^4.1.0",
     "@rollup/plugin-node-resolve": "13.3.0",
-    "@rollup/plugin-typescript": "^8.3.3",
+    "@rollup/plugin-typescript": "^8.3.4",
     "@rollup/pluginutils": "^4.2.1",
     "@vue/compiler-dom": "^3.2.37",
     "acorn": "^8.8.0",

diff --git a/packages/vite/rollup.config.ts b/packages/vite/rollup.config.ts
@@ -11,7 +11,7 @@ import MagicString from 'magic-string'
 import colors from 'picocolors'
 import fg from 'fast-glob'
 import { sync as resolve } from 'resolve'
-import type { Plugin } from 'rollup'
+import type { Plugin, RollupOptions } from 'rollup'
 import { defineConfig } from 'rollup'
 import pkg from './package.json'
 
@@ -185,7 +185,7 @@ function createCjsConfig(isProduction: boolean) {
   })
 }
 
-export default (commandLineArgs: any) => {
+export default (commandLineArgs: any): RollupOptions[] => {
   const isDev = commandLineArgs.watch
   const isProduction = !isDev
 

diff --git a/packages/vite/src/node/config.ts b/packages/vite/src/node/config.ts
@@ -932,6 +932,7 @@ async function bundleConfigFile(
     entryPoints: [fileName],
     outfile: 'out.js',
     write: false,
+    target: ['node14.18', 'node16'],
     platform: 'node',
     bundle: true,
     format: isESM ? 'esm' : 'cjs',
@@ -975,7 +976,7 @@ async function bundleConfigFile(
               if (path.relative(idPkgDir, fileName).startsWith('..')) {
                 return {
                   // normalize actual import after bundled as a single vite config
-                  path: idFsPath,
+                  path: pathToFileURL(idFsPath).href,
                   external: true
                 }
               }

diff --git a/packages/vite/src/node/preview.ts b/packages/vite/src/node/preview.ts
@@ -48,7 +48,7 @@ export interface PreviewServer {
    */
   httpServer: http.Server
   /**
-   * The resolved urls Vite prints on the
+   * The resolved urls Vite prints on the CLI
    *
    * @experimental
    */