chore: rebase

vitejs · Jan 28, 2022 · fc1caa4 · fc1caa4
2 parents ed4af2d + 4bf3d51
commit fc1caa4
Show file tree

Hide file tree

Showing 81 changed files with 5,303 additions and 206 deletions.
diff --git a/.github/issue-workflow.excalidraw b/.github/issue-workflow.excalidraw
diff --git a/.github/issue-workflow.png b/.github/issue-workflow.png
diff --git a/.github/pr-workflow.excalidraw b/.github/pr-workflow.excalidraw
diff --git a/.github/pr-workflow.png b/.github/pr-workflow.png
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -188,7 +188,7 @@ We already have many config options, and we should avoid fixing an issue by addi
 
 If you would like to start a translation in your language, you are welcome to contribute! Please join [the #translations channel in Vite Land](https://chat.vitejs.dev) to discuss and coordinate with others.
 
-The english docs are embeded in the main Vite repo, to allow contributors to work on docs, tests and implementation in the same PR. Translations are done by forking the main repo.
+The english docs are embedded in the main Vite repo, to allow contributors to work on docs, tests and implementation in the same PR. Translations are done by forking the main repo.
 
 ### How to start a translation repo
 
@@ -207,4 +207,4 @@ The english docs are embeded in the main Vite repo, to allow contributors to wor
 4. Push your commits to your Github repo. you can setup a netlify preview as well.
 5. Use [Ryu-cho](https://github.com/vuejs-translations/ryu-cho) tool to setup a Github Action, automatically track English docs update later.
 
-We recommend talking with others in Vite Land so you find more contributors for your language to share the maintainance work. Once the translation is done, communicate it to the Vite team so the repo can be moved to the official vitejs org in GitHub.
+We recommend talking with others in Vite Land so you find more contributors for your language to share the maintenance work. Once the translation is done, communicate it to the Vite team so the repo can be moved to the official vitejs org in GitHub.
diff --git a/docs/.vitepress/theme/sponsors.css b/docs/.vitepress/theme/sponsors.css
@@ -5,7 +5,7 @@
 
 .sponsors a {
   color: #999;
-  margin: 1em;
+  margin: 1em 2em;
   display: block;
 }
 
@@ -45,7 +45,7 @@
 .gold-sponsors {
   display: flex;
   flex-wrap: wrap;
-  justify-content: space-evenly;
+  justify-content: center;
   align-items: center;
 }
 

diff --git a/docs/.vitepress/theme/sponsors.json b/docs/.vitepress/theme/sponsors.json
@@ -6,6 +6,12 @@
     "src": "/stackblitz.svg",
     "tier": "platinum"
   },
+  {
+    "id": "cypress",
+    "name": "Cypress.io",
+    "href": "https://cypress.io",
+    "src": "/cypress.svg"
+  },
   {
     "id": "tailwind",
     "name": "Tailwind Labs",

diff --git a/docs/config/index.md b/docs/config/index.md
@@ -27,6 +27,14 @@ You can also explicitly specify a config file to use with the `--config` CLI opt
 vite --config my-config.js
 ```
 
+Note that Vite will replace `__filename`, `__dirname`, and `import.meta.url`. Using these as variable names will result in an error:
+
+```js
+const __filename = "value"
+// will be transformed to
+const "path/vite.config.js" = "value"
+```
+
 ### Config Intellisense
 
 Since Vite ships with TypeScript typings, you can leverage your IDE's intellisense with jsdoc type hints:
@@ -169,7 +177,7 @@ export default defineConfig(async ({ command, mode }) => {
 - **Type:** `string`
 - **Default:** `"node_modules/.vite"`
 
-  Directory to save cache files. Files in this directory are pre-bundled deps or some other cache files generated by vite, which can improve the performance. You can use `--force` flag or manually delete the directory to regenerate the cache files. The value can be either an absolute file system path or a path relative to project root.
+  Directory to save cache files. Files in this directory are pre-bundled deps or some other cache files generated by vite, which can improve the performance. You can use `--force` flag or manually delete the directory to regenerate the cache files. The value can be either an absolute file system path or a path relative to project root. Default to `.vite` when no package.json is detected.
 
 ### resolve.alias
 
@@ -474,6 +482,11 @@ export default defineConfig(async ({ command, mode }) => {
           configure: (proxy, options) => {
             // proxy will be an instance of 'http-proxy'
           }
+        },
+        // Proxying websockets or socket.io
+        '/socket.io': {
+          target: 'ws://localhost:3000',
+          ws: true
         }
       }
     }
@@ -584,6 +597,7 @@ createServer()
 
   - contains `workspaces` field in `package.json`
   - contains one of the following file
+    - `lerna.json`
     - `pnpm-workspace.yaml`
 
   Accepts a path to specify the custom workspace root. Could be a absolute path or a path relative to [project root](/guide/#index-html-and-project-root). For example:
@@ -845,7 +859,7 @@ export default defineConfig({
 ### preview.port
 
 - **Type:** `number`
-- **Default:** `5000`
+- **Default:** `4173`
 
   Specify server port. Note if the port is already being used, Vite will automatically try the next available port so this may not be the actual port the server ends up listening on.
 

diff --git a/docs/guide/env-and-mode.md b/docs/guide/env-and-mode.md
@@ -83,7 +83,7 @@ interface ImportMeta {
 
 ## Modes
 
-By default, the dev server (`dev` command) runs in `development` mode and the `build` and `serve` commands run in `production` mode.
+By default, the dev server (`dev` command) runs in `development` mode and the `build` command run in `production` mode.
 
 This means when running `vite build`, it will load the env variables from `.env.production` if there is one:
 

diff --git a/docs/guide/features.md b/docs/guide/features.md
@@ -191,13 +191,13 @@ That said, Vite does provide built-in support for `.scss`, `.sass`, `.less`, `.s
 
 ```bash
 # .scss and .sass
-npm install -D sass
+npm add -D sass
 
 # .less
-npm install -D less
+npm add -D less
 
 # .styl and .stylus
-npm install -D stylus
+npm add -D stylus
 ```
 
 If using Vue single file components, this also automatically enables `<style lang="sass">` et al.

diff --git a/docs/guide/index.md b/docs/guide/index.md
@@ -44,7 +44,7 @@ Vite requires [Node.js](https://nodejs.org/en/) version >=12.2.0. However, some
 With NPM:
 
 ```bash
-$ npm init vite@latest
+$ npm create vite@latest
 ```
 
 With Yarn:
@@ -65,10 +65,10 @@ You can also directly specify the project name and the template you want to use
 
 ```bash
 # npm 6.x
-npm init vite@latest my-vue-app --template vue
+npm create vite@latest my-vue-app --template vue
 
 # npm 7+, extra double-dash is needed:
-npm init vite@latest my-vue-app -- --template vue
+npm create vite@latest my-vue-app -- --template vue
 
 # yarn
 yarn create vite my-vue-app --template vue

diff --git a/docs/guide/ssr.md b/docs/guide/ssr.md
@@ -100,7 +100,7 @@ Here `vite` is an instance of [ViteDevServer](./api-javascript#vitedevserver). `
 The next step is implementing the `*` handler to serve server-rendered HTML:
 
 ```js
-app.use('*', async (req, res) => {
+app.use('*', async (req, res, next) => {
   const url = req.originalUrl
 
   try {
@@ -134,8 +134,7 @@ app.use('*', async (req, res) => {
     // If an error is caught, let Vite fix the stracktrace so it maps back to
     // your actual source code.
     vite.ssrFixStacktrace(e)
-    console.error(e)
-    res.status(500).end(e.message)
+    next(e)
   }
 })
 ```

diff --git a/docs/guide/using-plugins.md b/docs/guide/using-plugins.md
@@ -7,7 +7,7 @@ Vite can be extended using plugins, which are based on Rollup's well-designed pl
 To use a plugin, it needs to be added to the `devDependencies` of the project and included in the `plugins` array in the `vite.config.js` config file. For example, to provide support for legacy browsers, the official [@vitejs/plugin-legacy](https://github.com/vitejs/vite/tree/main/packages/plugin-legacy) can be used:
 
 ```
-$ npm i -D @vitejs/plugin-legacy
+$ npm add -D @vitejs/plugin-legacy
 ```
 
 ```js

diff --git a/docs/public/cypress.svg b/docs/public/cypress.svg
diff --git a/package.json b/package.json
@@ -4,6 +4,14 @@
   "engines": {
     "node": ">=12.2.0"
   },
+  "homepage": "https://vitejs.dev/",
+  "keywords": [
+    "frontend",
+    "hmr",
+    "dev-server",
+    "build-tool",
+    "vite"
+  ],
   "scripts": {
     "preinstall": "npx only-allow pnpm",
     "format": "prettier --write .",

diff --git a/packages/create-vite/README.md b/packages/create-vite/README.md
@@ -8,7 +8,7 @@
 With NPM:
 
 ```bash
-$ npm init vite@latest
+$ npm create vite@latest
 ```
 
 With Yarn:
@@ -29,10 +29,10 @@ You can also directly specify the project name and the template you want to use
 
 ```bash
 # npm 6.x
-npm init vite@latest my-vue-app --template vue
+npm create vite@latest my-vue-app --template vue
 
 # npm 7+, extra double-dash is needed:
-npm init vite@latest my-vue-app -- --template vue
+npm create vite@latest my-vue-app -- --template vue
 
 # yarn
 yarn create vite my-vue-app --template vue

diff --git a/packages/create-vite/index.js b/packages/create-vite/index.js
@@ -15,7 +15,8 @@ const {
   blue,
   magenta,
   lightRed,
-  red
+  red,
+  reset
 } = require('kolorist')
 
 const cwd = process.cwd()
@@ -141,7 +142,7 @@ async function init() {
         {
           type: targetDir ? null : 'text',
           name: 'projectName',
-          message: 'Project name:',
+          message: reset('Project name:'),
           initial: defaultProjectName,
           onState: (state) =>
             (targetDir = state.value.trim() || defaultProjectName)
@@ -168,7 +169,7 @@ async function init() {
         {
           type: () => (isValidPackageName(targetDir) ? null : 'text'),
           name: 'packageName',
-          message: 'Package name:',
+          message: reset('Package name:'),
           initial: () => toValidPackageName(targetDir),
           validate: (dir) =>
             isValidPackageName(dir) || 'Invalid package.json name'
@@ -178,8 +179,10 @@ async function init() {
           name: 'framework',
           message:
             typeof template === 'string' && !TEMPLATES.includes(template)
-              ? `"${template}" isn't a valid template. Please choose from below: `
-              : 'Select a framework:',
+              ? reset(
+                  `"${template}" isn't a valid template. Please choose from below: `
+                )
+              : reset('Select a framework:'),
           initial: 0,
           choices: FRAMEWORKS.map((framework) => {
             const frameworkColor = framework.color
@@ -193,7 +196,7 @@ async function init() {
           type: (framework) =>
             framework && framework.variants ? 'select' : null,
           name: 'variant',
-          message: 'Select a variant:',
+          message: reset('Select a variant:'),
           // @ts-ignore
           choices: (framework) =>
             framework.variants.map((variant) => {

diff --git a/packages/create-vite/template-lit-ts/tsconfig.json b/packages/create-vite/template-lit-ts/tsconfig.json
@@ -5,7 +5,6 @@
     "declaration": true,
     "emitDeclarationOnly": true,
     "outDir": "./types",
-    "rootDir": "./src",
     "strict": true,
     "noUnusedLocals": true,
     "noUnusedParameters": true,
@@ -18,5 +17,5 @@
     "useDefineForClassFields": false
   },
   "include": ["src/**/*.ts"],
-  "exclude": []
+  "references": [{ "path": "./tsconfig.node.json" }]
 }
diff --git a/packages/create-vite/template-lit-ts/tsconfig.node.json b/packages/create-vite/template-lit-ts/tsconfig.node.json
@@ -0,0 +1,8 @@
+{
+  "compilerOptions": {
+    "composite": true,
+    "module": "esnext",
+    "moduleResolution": "node"
+  },
+  "include": ["vite.config.ts"]
+}
diff --git a/packages/create-vite/template-preact-ts/tsconfig.json b/packages/create-vite/template-preact-ts/tsconfig.json
@@ -18,5 +18,6 @@
     "jsxFactory": "h",
     "jsxFragmentFactory": "Fragment"
   },
-  "include": ["src"]
+  "include": ["src"],
+  "references": [{ "path": "./tsconfig.node.json" }]
 }
diff --git a/packages/create-vite/template-preact-ts/tsconfig.node.json b/packages/create-vite/template-preact-ts/tsconfig.node.json
@@ -0,0 +1,8 @@
+{
+  "compilerOptions": {
+    "composite": true,
+    "module": "esnext",
+    "moduleResolution": "node"
+  },
+  "include": ["vite.config.ts"]
+}
diff --git a/packages/create-vite/template-react-ts/tsconfig.json b/packages/create-vite/template-react-ts/tsconfig.json
@@ -16,5 +16,6 @@
     "noEmit": true,
     "jsx": "react-jsx"
   },
-  "include": ["./src"]
+  "include": ["src"],
+  "references": [{ "path": "./tsconfig.node.json" }]
 }
diff --git a/packages/create-vite/template-react-ts/tsconfig.node.json b/packages/create-vite/template-react-ts/tsconfig.node.json
@@ -0,0 +1,8 @@
+{
+  "compilerOptions": {
+    "composite": true,
+    "module": "esnext",
+    "moduleResolution": "node"
+  },
+  "include": ["vite.config.ts"]
+}
diff --git a/packages/create-vite/template-svelte-ts/tsconfig.json b/packages/create-vite/template-svelte-ts/tsconfig.json
@@ -15,5 +15,6 @@
     "allowJs": true,
     "checkJs": true
   },
-  "include": ["src/**/*.d.ts", "src/**/*.ts", "src/**/*.js", "src/**/*.svelte"]
+  "include": ["src/**/*.d.ts", "src/**/*.ts", "src/**/*.js", "src/**/*.svelte"],
+  "references": [{ "path": "./tsconfig.node.json" }]
 }
diff --git a/packages/create-vite/template-svelte-ts/tsconfig.node.json b/packages/create-vite/template-svelte-ts/tsconfig.node.json
@@ -0,0 +1,8 @@
+{
+  "compilerOptions": {
+    "composite": true,
+    "module": "esnext",
+    "moduleResolution": "node"
+  },
+  "include": ["vite.config.ts"]
+}
diff --git a/...te-vite/template-svelte-ts/vite.config.js → ...te-vite/template-svelte-ts/vite.config.ts b/...te-vite/template-svelte-ts/vite.config.js → ...te-vite/template-svelte-ts/vite.config.ts
diff --git a/packages/create-vite/template-vanilla-ts/tsconfig.json b/packages/create-vite/template-vanilla-ts/tsconfig.json
@@ -14,5 +14,5 @@
     "noUnusedParameters": true,
     "noImplicitReturns": true
   },
-  "include": ["./src"]
+  "include": ["src"]
 }
diff --git a/packages/create-vite/template-vue-ts/tsconfig.json b/packages/create-vite/template-vue-ts/tsconfig.json
@@ -11,5 +11,6 @@
     "esModuleInterop": true,
     "lib": ["esnext", "dom"]
   },
-  "include": ["src/**/*.ts", "src/**/*.d.ts", "src/**/*.tsx", "src/**/*.vue"]
+  "include": ["src/**/*.ts", "src/**/*.d.ts", "src/**/*.tsx", "src/**/*.vue"],
+  "references": [{ "path": "./tsconfig.node.json" }]
 }
diff --git a/packages/create-vite/template-vue-ts/tsconfig.node.json b/packages/create-vite/template-vue-ts/tsconfig.node.json
@@ -0,0 +1,8 @@
+{
+  "compilerOptions": {
+    "composite": true,
+    "module": "esnext",
+    "moduleResolution": "node"
+  },
+  "include": ["vite.config.ts"]
+}
diff --git a/packages/playground/assets/__tests__/assets.spec.ts b/packages/playground/assets/__tests__/assets.spec.ts
@@ -57,6 +57,12 @@ describe('raw references from /public', () => {
   })
 })
 
+test('import-expression from simple script', async () => {
+  expect(await page.textContent('.import-expression')).toMatch(
+    '[success][success]'
+  )
+})
+
 describe('asset imports from js', () => {
   test('relative', async () => {
     expect(await page.textContent('.asset-import-relative')).toMatch(assetMatch)