Skip to content

Commit f515ba7

Browse files
authored
Merge branch 'main' into bwsy/feat/compilerSearchElm
2 parents 3caddec + b775b71 commit f515ba7

File tree

15 files changed

+1017
-944
lines changed

15 files changed

+1017
-944
lines changed

.github/contributing.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -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

.github/dependabot.yml

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

.github/renovate.json5

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
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+
'chalk',
49+
'estree-walker'
50+
]
51+
}

.github/workflows/autofix.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
env:
1212
PUPPETEER_SKIP_DOWNLOAD: 'true'
1313
steps:
14-
- uses: actions/checkout@v3
14+
- uses: actions/checkout@v4
1515

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

.github/workflows/canary.yml

Lines changed: 1 addition & 1 deletion
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

.github/workflows/ci.yml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
env:
1818
PUPPETEER_SKIP_DOWNLOAD: 'true'
1919
steps:
20-
- uses: actions/checkout@v3
20+
- uses: actions/checkout@v4
2121

2222
- name: Install pnpm
2323
uses: pnpm/action-setup@v2
@@ -39,7 +39,7 @@ jobs:
3939
env:
4040
PUPPETEER_SKIP_DOWNLOAD: 'true'
4141
steps:
42-
- uses: actions/checkout@v3
42+
- uses: actions/checkout@v4
4343

4444
- name: Install pnpm
4545
uses: pnpm/action-setup@v2
@@ -62,12 +62,12 @@ jobs:
6262
runs-on: ubuntu-latest
6363
if: github.event_name == 'push' || github.event.pull_request.head.repo.full_name != github.repository
6464
steps:
65-
- uses: actions/checkout@v3
65+
- uses: actions/checkout@v4
6666

6767
- name: Setup cache for Chromium binary
6868
uses: actions/cache@v3
6969
with:
70-
path: ~/.cache/puppeteer/chrome
70+
path: ~/.cache/puppeteer
7171
key: chromium-${{ hashFiles('pnpm-lock.yaml') }}
7272

7373
- name: Install pnpm
@@ -80,6 +80,7 @@ jobs:
8080
cache: 'pnpm'
8181

8282
- run: pnpm install
83+
- run: node node_modules/puppeteer/install.js
8384

8485
- name: Run e2e tests
8586
run: pnpm run test-e2e
@@ -90,7 +91,7 @@ jobs:
9091
env:
9192
PUPPETEER_SKIP_DOWNLOAD: 'true'
9293
steps:
93-
- uses: actions/checkout@v3
94+
- uses: actions/checkout@v4
9495

9596
- name: Install pnpm
9697
uses: pnpm/action-setup@v2

.github/workflows/size-data.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
runs-on: ubuntu-latest
2020

2121
steps:
22-
- uses: actions/checkout@v3
22+
- uses: actions/checkout@v4
2323

2424
- name: Install pnpm
2525
uses: pnpm/action-setup@v2
@@ -45,7 +45,7 @@ jobs:
4545
if: ${{github.event_name == 'pull_request'}}
4646
run: echo ${{ github.event.number }} > ./pr.txt
4747

48-
- uses: actions/upload-artifact@v2
48+
- uses: actions/upload-artifact@v3
4949
if: ${{github.event_name == 'pull_request'}}
5050
with:
5151
name: pr-number

.github/workflows/size-report.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
github.event.workflow_run.event == 'pull_request' &&
2222
github.event.workflow_run.conclusion == 'success'
2323
steps:
24-
- uses: actions/checkout@v3
24+
- uses: actions/checkout@v4
2525

2626
- name: Install pnpm
2727
uses: pnpm/action-setup@v2

package.json

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
"dev-sfc-serve": "vite packages/sfc-playground --host",
3131
"dev-sfc-run": "run-p \"dev compiler-sfc -f esm-browser\" \"dev vue -if esm-bundler-runtime\" \"dev server-renderer -if esm-bundler\" dev-sfc-serve",
3232
"serve": "serve",
33-
"open": "open http://localhost:5000/packages/template-explorer/local.html",
33+
"open": "open http://localhost:3000/packages/template-explorer/local.html",
3434
"build-sfc-playground": "run-s build-compiler-cjs build-runtime-esm build-ssr-esm build-sfc-playground-self",
3535
"build-compiler-cjs": "node scripts/build.js compiler reactivity-transform shared -af cjs",
3636
"build-runtime-esm": "node scripts/build.js runtime reactivity shared -af esm-bundler && node scripts/build.js vue -f esm-bundler-runtime && node scripts/build.js vue -f esm-browser-runtime",
@@ -53,7 +53,7 @@
5353
]
5454
},
5555
"engines": {
56-
"node": ">=16.11.0"
56+
"node": ">=16.14.0"
5757
},
5858
"devDependencies": {
5959
"@babel/parser": "^7.21.3",
@@ -66,43 +66,43 @@
6666
"@rollup/plugin-terser": "^0.4.0",
6767
"@types/hash-sum": "^1.0.0",
6868
"@types/node": "^16.4.7",
69-
"@typescript-eslint/parser": "^5.56.0",
70-
"@vitest/coverage-istanbul": "^0.29.7",
69+
"@typescript-eslint/parser": "^6.6.0",
70+
"@vitest/coverage-istanbul": "^0.34.3",
7171
"@vue/consolidate": "0.17.3",
7272
"chalk": "^4.1.0",
7373
"conventional-changelog-cli": "^2.0.31",
7474
"enquirer": "^2.3.2",
7575
"esbuild": "^0.17.4",
7676
"esbuild-plugin-polyfill-node": "^0.2.0",
77-
"eslint": "^8.33.0",
78-
"eslint-plugin-jest": "^27.2.1",
77+
"eslint": "^8.48.0",
78+
"eslint-plugin-jest": "^27.2.3",
7979
"estree-walker": "^2.0.2",
8080
"execa": "^4.0.2",
81-
"jsdom": "^21.1.0",
82-
"lint-staged": "^10.2.10",
81+
"jsdom": "^22.1.0",
82+
"lint-staged": "^14.0.1",
8383
"lodash": "^4.17.15",
8484
"magic-string": "^0.30.0",
8585
"markdown-table": "^3.0.3",
8686
"marked": "^4.0.10",
8787
"minimist": "^1.2.0",
8888
"npm-run-all": "^4.1.5",
89-
"prettier": "^3.0.1",
89+
"prettier": "^3.0.3",
9090
"pretty-bytes": "^6.1.1",
9191
"pug": "^3.0.1",
92-
"puppeteer": "~19.6.0",
92+
"puppeteer": "~21.1.1",
9393
"rollup": "^3.26.0",
9494
"rollup-plugin-dts": "^5.3.0",
9595
"rollup-plugin-esbuild": "^5.0.0",
9696
"rollup-plugin-polyfill-node": "^0.12.0",
9797
"semver": "^7.3.2",
98-
"serve": "^12.0.0",
99-
"simple-git-hooks": "^2.8.1",
98+
"serve": "^14.2.1",
99+
"simple-git-hooks": "^2.9.0",
100100
"terser": "^5.19.2",
101101
"todomvc-app-css": "^2.3.0",
102102
"tslib": "^2.5.0",
103103
"tsx": "^3.12.7",
104104
"typescript": "^5.1.6",
105105
"vite": "^4.3.0",
106-
"vitest": "^0.30.1"
106+
"vitest": "^0.34.3"
107107
}
108108
}

packages/sfc-playground/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@
1212
"vite": "^4.4.2"
1313
},
1414
"dependencies": {
15-
"@vue/repl": "^2.5.4",
15+
"@vue/repl": "^2.5.8",
1616
"file-saver": "^2.0.5",
17-
"jszip": "^3.6.0",
17+
"jszip": "^3.10.1",
1818
"vue": "workspace:*"
1919
}
2020
}

0 commit comments

Comments
 (0)