Merge remote-tracking branch 'origin/main' into legacy-module

Conflicts:
   packages/vite/src/node/plugins/worker.ts

.eslintrc.js

@@ -1,17 +1,34 @@
-module.exports = {
+// @ts-check
+const { defineConfig } = require('eslint-define-config')
+
+module.exports = defineConfig({
   root: true,
-  extends: ['plugin:node/recommended'],
+  extends: [
+    'eslint:recommended',
+    'plugin:node/recommended',
+    'plugin:@typescript-eslint/recommended'
+  ],
   parser: '@typescript-eslint/parser',
   parserOptions: {
     sourceType: 'module',
     ecmaVersion: 2020
   },
   rules: {
     'no-debugger': ['error'],
+    'no-empty': ['warn', { allowEmptyCatch: true }],
+    'no-process-exit': 'off',
+    'no-useless-escape': 'off',
+    'prefer-const': [
+      'warn',
+      {
+        destructuring: 'all'
+      }
+    ],
+
     'node/no-missing-import': [
       'error',
       {
-        allowModules: ['types', 'estree', 'testUtils'],
+        allowModules: ['types', 'estree', 'testUtils', 'stylus'],
         tryExtensions: ['.ts', '.js', '.jsx', '.tsx', '.d.ts']
       }
     ],
@@ -31,7 +48,7 @@ module.exports = {
           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 dep, use (await import('dep')).default instead.`
+            `lazy load a dependency, use (await import('dependency')).default instead.`
         })
       )
     ],
@@ -51,7 +68,19 @@ module.exports = {
     'node/no-unpublished-import': 'off',
     'node/no-unpublished-require': 'off',
     'node/no-unsupported-features/es-syntax': 'off',
-    'no-process-exit': 'off'
+
+    '@typescript-eslint/ban-ts-comment': 'off', // TODO: we should turn this on in a new PR
+    '@typescript-eslint/ban-types': 'off', // TODO: we should turn this on in a new PR
+    '@typescript-eslint/no-empty-function': [
+      'error',
+      { allow: ['arrowFunctions'] }
+    ],
+    '@typescript-eslint/no-explicit-any': 'off', // maybe we should turn this on in a new PR
+    '@typescript-eslint/no-extra-semi': 'off', // conflicts with prettier
+    '@typescript-eslint/no-inferrable-types': 'off',
+    '@typescript-eslint/no-non-null-assertion': 'off', // maybe we should turn this on in a new PR
+    '@typescript-eslint/no-unused-vars': 'off', // maybe we should turn this on in a new PR
+    '@typescript-eslint/no-var-requires': 'off'
   },
   overrides: [
     {
@@ -74,4 +103,4 @@ module.exports = {
       }
     }
   ]
-}
+})

.github/ISSUE_TEMPLATE/feature_request.md

@@ -2,7 +2,7 @@
 name: "\U0001F680 New feature proposal"
 about: Propose a new feature to be added to Vite
 title: ''
-labels: 'feat: pending triage'
+labels: 'enhancement: pending triage'
 assignees: ''
 ---
 

.github/commit-convention.md

@@ -6,7 +6,8 @@
 
 Messages must be matched by the following regex:
 
-``` js
+<!-- prettier-ignore -->
+```js
 /^(revert: )?(feat|fix|docs|dx|refactor|perf|test|workflow|build|ci|chore|types|wip|release|deps)(\(.+\))?: .{1,50}/
 ```
 
@@ -44,7 +45,7 @@ This reverts commit 667ecc1654a317a13331b17617d973392f415f02.
 
 ### Full Message Format
 
-A commit message consists of a **header**, **body** and **footer**.  The header has a **type**, **scope** and **subject**:
+A commit message consists of a **header**, **body** and **footer**. The header has a **type**, **scope** and **subject**:
 
 ```
 <type>(<scope>): <subject>
@@ -74,9 +75,9 @@ The scope could be anything specifying the place of the commit change. For examp
 
 The subject contains a succinct description of the change:
 
-* use the imperative, present tense: "change" not "changed" nor "changes"
-* don't capitalize the first letter
-* no dot (.) at the end
+- use the imperative, present tense: "change" not "changed" nor "changes"
+- don't capitalize the first letter
+- no dot (.) at the end
 
 ### Body
 

.github/contributing.md

@@ -12,8 +12,8 @@ To development and test the core `vite` package:
 
 2. Run `yarn link` in `packages/vite`. This links `vite` globally so that you can:
 
-    - Run `yarn link vite` in another Vite project to use the locally built Vite;
-    - Use the `vite` binary anywhere.
+   - Run `yarn link vite` in another Vite project to use the locally built Vite;
+   - Use the `vite` binary anywhere.
 
 ## Running Tests
 
@@ -29,7 +29,7 @@ Each test can be run under either dev server mode or build mode.
 
 - You can also use `yarn test-serve [match]` or `yarn test-build [match]` to run tests in a specific playground package, e.g. `yarn test-serve css` will run tests for both `playground/css` and `playground/css-codesplit` under serve mode.
 
-  Note package matching is not aviable for the `yarn test` script, which always runs all tests.
+  Note package matching is not available for the `yarn test` script, which always runs all tests.
 
 ### Test Env and Helpers
 
@@ -43,6 +43,38 @@ test('should work', async () => {
 
 Some common test helpers, e.g. `testDir`, `isBuild` or `editFile` are available in `packages/playground/testUtils.ts`.
 
+### Extending the Test Suite
+
+To add new tests, you should find a related playground to the fix or feature (or create a new one). As an example, static assets loading are tested in the [assets playground](https://github.com/vitejs/vite/tree/main/packages/playground/assets). In this Vite App, there is a test for `?raw` imports, with [a section is defined in the `index.html` for it](https://github.com/vitejs/vite/blob/71215533ac60e8ff566dc3467feabfc2c71a01e2/packages/playground/assets/index.html#L121):
+
+```html
+<h2>?raw import</h2>
+<code class="raw"></code>
+```
+
+This will be modified [with the result of a file import](https://github.com/vitejs/vite/blob/71215533ac60e8ff566dc3467feabfc2c71a01e2/packages/playground/assets/index.html#L151):
+
+```js
+import rawSvg from './nested/fragment.svg?raw'
+text('.raw', rawSvg)
+```
+
+Where the `text` util is defined as:
+
+```js
+function text(el, text) {
+  document.querySelector(el).textContent = text
+}
+```
+
+In the [spec tests](https://github.com/vitejs/vite/blob/71215533ac60e8ff566dc3467feabfc2c71a01e2/packages/playground/assets/__tests__/assets.spec.ts#L180), the modifications to the DOM listed above are used to test this feature:
+
+```js
+test('?raw import', async () => {
+  expect(await page.textContent('.raw')).toMatch('SVG')
+})
+```
+
 ## Pull Request Guidelines
 
 - Checkout a topic branch from a base branch, e.g. `main`, and merge back against that branch.

.github/workflows/ci.yml

@@ -0,0 +1,98 @@
+name: CI
+
+env:
+  # 7 GiB by default on GitHub, setting to 6 GiB
+  # https://docs.github.com/en/actions/using-github-hosted-runners/about-github-hosted-runners#supported-runners-and-hardware-resources
+  NODE_OPTIONS: --max-old-space-size=6144
+
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+
+jobs:
+  build:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ubuntu-latest]
+        node_version: [12, 14, 15, 16]
+        include:
+          - os: macos-latest
+            node_version: 14
+          - os: windows-latest
+            node_version: 14
+      fail-fast: false
+
+    name: 'Build&Test: node-${{ matrix.node_version }}, ${{ matrix.os }}'
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: Set node version to ${{ matrix.node_version }}
+        uses: actions/setup-node@v2
+        with:
+          node-version: ${{ matrix.node_version }}
+
+      - name: Get yarn cache directory
+        id: yarn-cache
+        run: echo "::set-output name=dir::$(yarn cache dir)"
+
+      - name: Set dependencies cache
+        uses: actions/cache@v2
+        with:
+          path: ${{ steps.yarn-cache.outputs.dir }}
+          key: ${{ runner.os }}-${{ matrix.node_version }}-${{ hashFiles('yarn.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-${{ matrix.node_version }}-${{ hashFiles('yarn.lock') }}
+            ${{ runner.os }}-${{ matrix.node_version }}-
+
+      - name: Versions
+        run: yarn versions
+
+      - name: Install dependencies
+        run: yarn install --frozen-lockfile
+
+      - name: Build vite
+        run: yarn ci-build-vite
+
+      - name: Build plugin-vue
+        run: yarn build-plugin-vue
+
+      - name: Test serve
+        run: yarn test-serve --runInBand
+
+      - name: Test build
+        run: yarn test-build --runInBand
+
+  lint:
+    runs-on: ubuntu-latest
+    name: 'Lint: node-14, ubuntu-latest'
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+
+      - name: Set node version to 14
+        uses: actions/setup-node@v2
+        with:
+          node-version: 14
+
+      - name: Set dependencies cache
+        uses: actions/cache@v2
+        with:
+          path: ~/.cache/yarn
+          key: lint-dependencies-${{ hashFiles('yarn.lock') }}
+          restore-keys: |
+            lint-dependencies-${{ hashFiles('yarn.lock') }}
+            lint-dependencies-
+
+      - name: Prepare
+        run: |
+          yarn install --frozen-lockfile
+          yarn ci-build-vite
+          yarn build-plugin-vue
+
+      - name: Lint
+        run: yarn lint

.github/workflows/issue-close-require.yml

@@ -2,7 +2,7 @@ name: Issue Close Require
 
 on:
   schedule:
-    - cron: "0 0 * * *"
+    - cron: '0 0 * * *'
 
 jobs:
   close-issues:

.prettierignore

@@ -0,0 +1,6 @@
+docs/.vitepress/dist/
+packages/vite/dist/
+packages/plugin-vue/dist/
+packages/*/CHANGELOG.md
+LICENSE.md
+.prettierrc

CODE_OF_CONDUCT.md

@@ -34,12 +34,12 @@ This Code of Conduct applies both within project spaces and in public spaces whe
 
 ## Enforcement
 
-Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team by DM at [Vite Land](chat.vitejs.dev). All complaints will be reviewed and investigated and will result in a response that is deemed necessary and appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.
+Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team by DM at [Vite Land](https://chat.vitejs.dev). All complaints will be reviewed and investigated and will result in a response that is deemed necessary and appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.
 
 Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership.
 
 ## Attribution
 
 This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html
 
-[homepage]: https://www.contributor-covenant.org
+[homepage]: https://www.contributor-covenant.org

README.md

@@ -6,9 +6,8 @@
 <br/>
 <p align="center">
   <a href="https://npmjs.com/package/vite"><img src="https://img.shields.io/npm/v/vite.svg" alt="npm package"></a>
-  <a href="https://nodejs.org/en/about/releases/"><img src="https://img.shields.io/node/v/vite.svg" alt="node compatility"></a>
-  <a href="https://app.circleci.com/pipelines/github/vitejs/vite?branch=main"><img src="https://circleci.com/gh/vitejs/vite/tree/main.svg?style=shield" alt="unix build status"></a>
-  <a href="https://ci.appveyor.com/project/yyx990803/vite/branch/main"><img src="https://ci.appveyor.com/api/projects/status/0q4j8062olbcs71l/branch/main?svg=true" alt="windows build status"></a>
+  <a href="https://nodejs.org/en/about/releases/"><img src="https://img.shields.io/node/v/vite.svg" alt="node compatibility"></a>
+  <a href="https://github.com/vitejs/vite/actions/workflows/ci.yml"><img src="https://github.com/vitejs/vite/actions/workflows/ci.yml/badge.svg?branch=main" alt="build status"></a>
   <a href="https://chat.vitejs.dev"><img src="https://img.shields.io/badge/chat-discord-blue?style=flat&logo=discord" alt="discord chat"></a>
 </p>
 <br/>
@@ -56,14 +55,3 @@ See [Contributing Guide](https://github.com/vitejs/vite/tree/main/.github/contri
 ## License
 
 MIT
-
-[npm-img]: https://img.shields.io/npm/v/vite.svg
-[npm-url]: https://npmjs.com/package/vite
-[node-img]: https://img.shields.io/node/v/vite.svg
-[node-url]: https://nodejs.org/en/about/releases/
-[unix-ci-img]: https://circleci.com/gh/vitejs/vite/tree/main.svg?style=shield
-[unix-ci-url]: https://app.circleci.com/pipelines/github/vitejs/vite?branch=main
-[windows-ci-img]: https://ci.appveyor.com/api/projects/status/0q4j8062olbcs71l/branch/main?svg=true
-[windows-ci-url]: https://ci.appveyor.com/project/yyx990803/vite/branch/main
-[discord-img]: https://img.shields.io/badge/chat-discord-blue?style=flat&logo=discord
-[discord-url]: https://chat.vitejs.dev