Skip to content

Commit 9b63921

Browse files
authored
Merge branch 'main' into main
2 parents c9698c6 + 04d2c05 commit 9b63921

File tree

410 files changed

+24240
-12339
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

410 files changed

+24240
-12339
lines changed

.eslintrc.cjs

+11-12
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
/* eslint-disable no-restricted-globals */
2+
13
const DOMGlobals = ['window', 'document']
24
const NodeGlobals = ['module', 'require']
35

@@ -9,12 +11,6 @@ module.exports = {
911
plugins: ['jest'],
1012
rules: {
1113
'no-debugger': 'error',
12-
'no-unused-vars': [
13-
'error',
14-
// we are only using this rule to check for unused arguments since TS
15-
// catches unused variables but not args.
16-
{ varsIgnorePattern: '.*', args: 'none' }
17-
],
1814
// most of the codebase are expected to be env agnostic
1915
'no-restricted-globals': ['error', ...DOMGlobals, ...NodeGlobals],
2016

@@ -72,14 +68,17 @@ module.exports = {
7268
'no-restricted-syntax': 'off'
7369
}
7470
},
71+
// JavaScript files
72+
{
73+
files: ['*.js', '*.cjs'],
74+
rules: {
75+
// We only do `no-unused-vars` checks for js files, TS files are checked by TypeScript itself.
76+
'no-unused-vars': ['error', { vars: 'all', args: 'none' }]
77+
}
78+
},
7579
// Node scripts
7680
{
77-
files: [
78-
'scripts/**',
79-
'*.{js,ts}',
80-
'packages/**/index.js',
81-
'packages/size-check/**'
82-
],
81+
files: ['scripts/**', '*.{js,ts}', 'packages/**/index.js'],
8382
rules: {
8483
'no-restricted-globals': 'off',
8584
'no-restricted-syntax': 'off'

.github/ISSUE_TEMPLATE/bug_report.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ body:
2828
attributes:
2929
label: Link to minimal reproduction
3030
description: |
31-
The easiest way to provide a reproduction is by showing the bug in [The SFC Playground](https://sfc.vuejs.org/).
31+
The easiest way to provide a reproduction is by showing the bug in [The SFC Playground](https://play.vuejs.org/).
3232
If it cannot be reproduced in the playground and requires a proper build setup, try [StackBlitz](https://vite.new/vue).
3333
If neither of these are suitable, you can always provide a GitHub repository.
3434

.github/ISSUE_TEMPLATE/config.yml

+3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
blank_issues_enabled: false
22
contact_links:
3+
- name: Feature Request
4+
url: https://github.com/vuejs/rfcs/discussions
5+
about: Suggest new features for consideration
36
- name: Discord Chat
47
url: https://chat.vuejs.org
58
about: Ask questions and discuss with other Vue users in real time.

.github/ISSUE_TEMPLATE/feature_request.yml

-39
This file was deleted.

.github/bug-repro-guidelines.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ A minimal reproduction means it demonstrates the bug, and the bug only. It shoul
2222

2323
### How to create a repro
2424

25-
For Vue 3 core reproductions, try reproducing it in [The SFC Playground](https://sfc.vuejs.org/).
25+
For Vue 3 core reproductions, try reproducing it in [The SFC Playground](https://play.vuejs.org/).
2626

2727
If it cannot be reproduced in the playground and requires a proper build setup, try [StackBlitz](https://vite.new/vue).
2828

.github/contributing.md

+11-9
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,11 @@ Hi! I'm really excited that you are interested in contributing to Vue.js. Before
1717

1818
## Pull Request Guidelines
1919

20-
- Checkout a topic branch from a base branch, e.g. `main`, and merge back against that branch.
20+
- Vue core has two primary work branches: `main` and `minor`.
21+
22+
- If your pull request is a feature that adds new API surface, it should be submitted against the `minor` branch.
23+
24+
- Otherwise, it should be submitted against the `main` branch.
2125

2226
- [Make sure to tick the "Allow edits from maintainers" box](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/working-with-forks/allowing-changes-to-a-pull-request-branch-created-from-a-fork). This allows us to directly make minor edits / refactors and saves a lot of time.
2327

@@ -57,7 +61,7 @@ Hi! I'm really excited that you are interested in contributing to Vue.js. Before
5761

5862
## Development Setup
5963

60-
You will need [Node.js](https://nodejs.org) **version 16+**, and [PNPM](https://pnpm.io) **version 7+**.
64+
You will need [Node.js](https://nodejs.org) **version 18.12+**, and [PNPM](https://pnpm.io) **version 8+**.
6165

6266
We also recommend installing [ni](https://github.com/antfu/ni) to help switching between repos using different package managers. `ni` also provides the handy `nr` command which running npm scripts easier.
6367

@@ -181,11 +185,11 @@ Shortcut for starting the SFC Playground in local dev mode. This provides the fa
181185

182186
### `nr dev-esm`
183187

184-
Builds and watches `vue/dist/vue-runtime.esm-bundler.js` with all deps inlined using esbuild. This is useful when debugging the ESM build in a reproductions that require real build setups: link `packages/vue` globally, then link it into the project being debugged.
188+
Builds and watches `vue/dist/vue-runtime.esm-bundler.js` with all deps inlined using esbuild. This is useful when debugging the ESM build in a reproduction that requires real build setups: link `packages/vue` globally, then link it into the project being debugged.
185189

186190
### `nr dev-compiler`
187191

188-
The `dev-compiler` script builds, watches and serves the [Template Explorer](https://github.com/vuejs/core/tree/main/packages/template-explorer) at `http://localhost:5000`. This is useful when working on pure compiler issues.
192+
The `dev-compiler` script builds, watches and serves the [Template Explorer](https://github.com/vuejs/core/tree/main/packages/template-explorer) at `http://localhost:3000`. This is useful when working on pure compiler issues.
189193

190194
### `nr test`
191195

@@ -244,12 +248,10 @@ This repository employs a [monorepo](https://en.wikipedia.org/wiki/Monorepo) set
244248

245249
- `dts-test`: Contains type-only tests against generated dts files.
246250

247-
- `sfc-playground`: The playground continuously deployed at https://sfc.vuejs.org. To run the playground locally, use [`nr dev-sfc`](#nr-dev-sfc).
251+
- `sfc-playground`: The playground continuously deployed at https://play.vuejs.org. To run the playground locally, use [`nr dev-sfc`](#nr-dev-sfc).
248252

249253
- `template-explorer`: A development tool for debugging compiler output, continuously deployed at https://template-explorer.vuejs.org/. To run it locally, run [`nr dev-compiler`](#nr-dev-compiler).
250254

251-
- `size-check`: Used for checking built bundle sizes on CI.
252-
253255
### Importing Packages
254256

255257
The packages can import each other directly using their package names. Note that when importing a package, the name listed in its `package.json` should be used. Most of the time the `@vue/` prefix is needed:
@@ -261,7 +263,7 @@ import { h } from '@vue/runtime-core'
261263
This is made possible via several configurations:
262264

263265
- For TypeScript, `compilerOptions.paths` in `tsconfig.json`
264-
- Vitest and Rollup share the sae set of aliases from `scripts/aliases.js`
266+
- Vitest and Rollup share the same set of aliases from `scripts/aliases.js`
265267
- For plain Node.js, they are linked using [PNPM Workspaces](https://pnpm.io/workspaces).
266268

267269
### Package Dependencies
@@ -330,4 +332,4 @@ Funds donated via Patreon go directly to support Evan You's full-time work on Vu
330332

331333
Thank you to all the people who have already contributed to Vue.js!
332334

333-
<a href="https://github.com/vuejs/vue/graphs/contributors"><img src="https://opencollective.com/vuejs/contributors.svg?width=890" /></a>
335+
<a href="https://github.com/vuejs/core/graphs/contributors"><img src="https://opencollective.com/vuejs/contributors.svg?width=890" /></a>

.github/dependabot.yml

-70
This file was deleted.

0 commit comments

Comments
 (0)