Skip to content

Commit 1eddacf

Browse files
committed
chore: Merge branch 'master' into feat/deep-selector-support-multiple
1 parent b2bc080 commit 1eddacf

File tree

605 files changed

+45627
-35431
lines changed

Some content is hidden

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

605 files changed

+45627
-35431
lines changed

.eslintrc.cjs

Lines changed: 0 additions & 89 deletions
This file was deleted.

.git-blame-ignore-revs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
# update prettier & eslint config (#9162)
2+
bfe6b459d3a0ce6168611ee1ac7e6e789709df9d

.github/ISSUE_TEMPLATE/config.yml

Lines changed: 3 additions & 0 deletions
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

Lines changed: 0 additions & 39 deletions
This file was deleted.

.github/contributing.md

Lines changed: 13 additions & 11 deletions
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,9 +61,9 @@ 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

62-
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.
66+
We also recommend installing [@antfu/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

6468
After cloning the repo, run:
6569

@@ -82,11 +86,11 @@ The project uses [simple-git-hooks](https://github.com/toplenboren/simple-git-ho
8286

8387
- Type check the entire project
8488
- Automatically format changed files using Prettier
85-
- Verify commit message format (logic in `scripts/verifyCommit.js`)
89+
- Verify commit message format (logic in `scripts/verify-commit.js`)
8690

8791
## Scripts
8892

89-
**The examples below will be using the `nr` command from the [ni](https://github.com/antfu/ni) package.** You can also use plain `npm run`, but you will need to pass all additional arguments after the command after an extra `--`. For example, `nr build runtime --all` is equivalent to `npm run build -- runtime --all`.
93+
**The examples below will be using the `nr` command from the [@antfu/ni](https://github.com/antfu/ni) package.** You can also use plain `npm run`, but you will need to pass all additional arguments after the command after an extra `--`. For example, `nr build runtime --all` is equivalent to `npm run build -- runtime --all`.
9094

9195
The `run-s` and `run-p` commands found in some scripts are from [npm-run-all](https://github.com/mysticatea/npm-run-all) for orchestrating multiple scripts. `run-s` means "run in sequence" while `run-p` means "run in parallel".
9296

@@ -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

@@ -248,8 +252,6 @@ This repository employs a [monorepo](https://en.wikipedia.org/wiki/Monorepo) set
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

Lines changed: 0 additions & 70 deletions
This file was deleted.

0 commit comments

Comments
 (0)