Skip to content

Commit 4503800

Browse files
authored
Merge branch 'main' into fix/vuejs#7823
2 parents 0f0cf53 + 5ebb459 commit 4503800

Some content is hidden

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

80 files changed

+2896
-2396
lines changed

.eslintrc.cjs

+1-6
Original file line numberDiff line numberDiff line change
@@ -74,12 +74,7 @@ module.exports = {
7474
},
7575
// Node scripts
7676
{
77-
files: [
78-
'scripts/**',
79-
'*.{js,ts}',
80-
'packages/**/index.js',
81-
'packages/size-check/**'
82-
],
77+
files: ['scripts/**', '*.{js,ts}', 'packages/**/index.js'],
8378
rules: {
8479
'no-restricted-globals': 'off',
8580
'no-restricted-syntax': 'off'

.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/contributing.md

+2-4
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ Hi! I'm really excited that you are interested in contributing to Vue.js. Before
5757

5858
## Development Setup
5959

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

6262
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.
6363

@@ -185,7 +185,7 @@ Builds and watches `vue/dist/vue-runtime.esm-bundler.js` with all deps inlined u
185185

186186
### `nr dev-compiler`
187187

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.
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:3000`. This is useful when working on pure compiler issues.
189189

190190
### `nr test`
191191

@@ -248,8 +248,6 @@ This repository employs a [monorepo](https://en.wikipedia.org/wiki/Monorepo) set
248248

249249
- `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).
250250

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

255253
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:

.github/dependabot.yml

-70
This file was deleted.

.github/renovate.json5

+50
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
{
2+
$schema: 'https://docs.renovatebot.com/renovate-schema.json',
3+
extends: ['config:base', 'schedule:weekly', 'group:allNonMajor'],
4+
labels: ['dependencies'],
5+
ignorePaths: ['**/__tests__/**'],
6+
rangeStrategy: 'bump',
7+
packageRules: [
8+
{
9+
depTypeList: ['peerDependencies'],
10+
enabled: false
11+
},
12+
{
13+
groupName: 'test',
14+
matchPackageNames: ['vitest', 'jsdom', 'puppeteer'],
15+
matchPackagePrefixes: ['@vitest']
16+
},
17+
{
18+
groupName: 'playground',
19+
matchFileNames: [
20+
'packages/sfc-playground/package.json',
21+
'packages/template-explorer/package.json'
22+
]
23+
},
24+
{
25+
groupName: 'compiler',
26+
matchPackageNames: ['magic-string'],
27+
matchPackagePrefixes: ['@babel', 'postcss']
28+
},
29+
{
30+
groupName: 'build',
31+
matchPackageNames: ['vite', 'terser'],
32+
matchPackagePrefixes: ['rollup', 'esbuild', '@rollup', '@vitejs']
33+
},
34+
{
35+
groupName: 'lint',
36+
matchPackageNames: ['simple-git-hooks', 'lint-staged'],
37+
matchPackagePrefixes: ['@typescript-eslint', 'eslint', 'prettier']
38+
}
39+
],
40+
ignoreDeps: [
41+
'vue',
42+
43+
// manually bumping
44+
'node',
45+
'typescript',
46+
47+
// ESM only
48+
'estree-walker'
49+
]
50+
}

.github/workflows/autofix.yml

+33
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
name: autofix.ci
2+
3+
on:
4+
pull_request:
5+
permissions:
6+
contents: read
7+
8+
jobs:
9+
autofix:
10+
runs-on: ubuntu-latest
11+
env:
12+
PUPPETEER_SKIP_DOWNLOAD: 'true'
13+
steps:
14+
- uses: actions/checkout@v4
15+
16+
- name: Install pnpm
17+
uses: pnpm/action-setup@v2
18+
19+
- name: Set node version to 18
20+
uses: actions/setup-node@v3
21+
with:
22+
node-version: 18
23+
cache: pnpm
24+
25+
- run: pnpm install
26+
27+
- name: Run eslint
28+
run: pnpm run lint --fix
29+
30+
- name: Run prettier
31+
run: pnpm run format
32+
33+
- uses: autofix-ci/action@d3e591514b99d0fca6779455ff8338516663f7cc

.github/workflows/canary-minor.yml

+33
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
name: canary minor release
2+
on:
3+
# Runs every Monday at 1 AM UTC (9:00 AM in Singapore)
4+
schedule:
5+
- cron: 0 1 * * MON
6+
workflow_dispatch:
7+
8+
jobs:
9+
canary:
10+
# prevents this action from running on forks
11+
if: github.repository == 'vuejs/core'
12+
runs-on: ubuntu-latest
13+
environment: Release
14+
steps:
15+
- uses: actions/checkout@v4
16+
with:
17+
ref: minor
18+
19+
- name: Install pnpm
20+
uses: pnpm/action-setup@v2
21+
22+
- name: Set node version to 18
23+
uses: actions/setup-node@v3
24+
with:
25+
node-version: 18
26+
registry-url: 'https://registry.npmjs.org'
27+
cache: 'pnpm'
28+
29+
- run: pnpm install
30+
31+
- run: pnpm release --canary --tag minor
32+
env:
33+
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}

.github/workflows/canary.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
runs-on: ubuntu-latest
1313
environment: Release
1414
steps:
15-
- uses: actions/checkout@v3
15+
- uses: actions/checkout@v4
1616

1717
- name: Install pnpm
1818
uses: pnpm/action-setup@v2

0 commit comments

Comments
 (0)