chore: merge conflict

.github/ISSUE_TEMPLATE/config.yml

@@ -1,5 +1,8 @@
 blank_issues_enabled: false
 contact_links:
+ - name: Feature Request
+ url: https://github.com/vuejs/rfcs/discussions
+ about: Suggest new features for consideration
  - name: Discord Chat
  url: https://chat.vuejs.org
  about: Ask questions and discuss with other Vue users in real time.

.github/contributing.md

@@ -185,7 +185,7 @@ Builds and watches `vue/dist/vue-runtime.esm-bundler.js` with all deps inlined u
 
 ### `nr dev-compiler`
 
-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.
+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.
 
 ### `nr test`
 

.github/renovate.json5

@@ -0,0 +1,51 @@
+{
+ $schema: 'https://docs.renovatebot.com/renovate-schema.json',
+ extends: ['config:base', 'schedule:weekly', 'group:allNonMajor'],
+ labels: ['dependencies'],
+ ignorePaths: ['**/__tests__/**'],
+ rangeStrategy: 'bump',
+ packageRules: [
+ {
+ depTypeList: ['peerDependencies'],
+ enabled: false
+ },
+ {
+ groupName: 'test',
+ matchPackageNames: ['vitest', 'jsdom', 'puppeteer'],
+ matchPackagePrefixes: ['@vitest']
+ },
+ {
+ groupName: 'playground',
+ matchFileNames: [
+ 'packages/sfc-playground/package.json',
+ 'packages/template-explorer/package.json'
+ ]
+ },
+ {
+ groupName: 'compiler',
+ matchPackageNames: ['magic-string'],
+ matchPackagePrefixes: ['@babel', 'postcss']
+ },
+ {
+ groupName: 'build',
+ matchPackageNames: ['vite', 'terser'],
+ matchPackagePrefixes: ['rollup', 'esbuild', '@rollup', '@vitejs']
+ },
+ {
+ groupName: 'lint',
+ matchPackageNames: ['simple-git-hooks', 'lint-staged'],
+ matchPackagePrefixes: ['@typescript-eslint', 'eslint', 'prettier']
+ }
+ ],
+ ignoreDeps: [
+ 'vue',
+
+ // manually bumping
+ 'node',
+ 'typescript',
+
+ // ESM only
+ 'chalk',
+ 'estree-walker'
+ ]
+}

.github/workflows/autofix.yml

@@ -0,0 +1,33 @@
+name: autofix.ci
+
+on:
+ pull_request:
+permissions:
+ contents: read
+
+jobs:
+ autofix:
+ runs-on: ubuntu-latest
+ env:
+ PUPPETEER_SKIP_DOWNLOAD: 'true'
+ steps:
+ - uses: actions/checkout@v4
+
+ - name: Install pnpm
+ uses: pnpm/action-setup@v2
+
+ - name: Set node version to 18
+ uses: actions/setup-node@v3
+ with:
+ node-version: 18
+ cache: pnpm
+
+ - run: pnpm install
+
+ - name: Run eslint
+ run: pnpm run lint --fix
+
+ - name: Run prettier
+ run: pnpm run format
+
+ - uses: autofix-ci/action@8caa572fd27b0019a65e4c695447089c8d3138b9

.github/workflows/canary.yml

@@ -12,7 +12,7 @@ jobs:
  runs-on: ubuntu-latest
  environment: Release
  steps:
- - uses: actions/checkout@v3
+ - uses: actions/checkout@v4
 
  - name: Install pnpm
  uses: pnpm/action-setup@v2

.github/workflows/ci.yml

@@ -14,8 +14,10 @@ jobs:
  unit-test:
  runs-on: ubuntu-latest
  if: github.event_name == 'push' || github.event.pull_request.head.repo.full_name != github.repository
+ env:
+ PUPPETEER_SKIP_DOWNLOAD: 'true'
  steps:
- - uses: actions/checkout@v3
+ - uses: actions/checkout@v4
 
  - name: Install pnpm
  uses: pnpm/action-setup@v2
@@ -26,9 +28,6 @@ jobs:
  node-version: 18
  cache: 'pnpm'
 
- - name: Skip Puppeteer download
- run: echo "PUPPETEER_SKIP_DOWNLOAD=1" >> $GITHUB_ENV
-
  - run: pnpm install
 
  - name: Run unit tests
@@ -37,8 +36,10 @@ jobs:
  unit-test-windows:
  runs-on: windows-latest
  if: github.event_name == 'push' || github.event.pull_request.head.repo.full_name != github.repository
+ env:
+ PUPPETEER_SKIP_DOWNLOAD: 'true'
  steps:
- - uses: actions/checkout@v3
+ - uses: actions/checkout@v4
 
  - name: Install pnpm
  uses: pnpm/action-setup@v2
@@ -49,9 +50,6 @@ jobs:
  node-version: 18
  cache: 'pnpm'
 
- - name: Skip Puppeteer download
- run: echo "PUPPETEER_SKIP_DOWNLOAD=1" >> $env:GITHUB_ENV
-
  - run: pnpm install
 
  - name: Run compiler unit tests
@@ -64,12 +62,12 @@ jobs:
  runs-on: ubuntu-latest
  if: github.event_name == 'push' || github.event.pull_request.head.repo.full_name != github.repository
  steps:
- - uses: actions/checkout@v3
+ - uses: actions/checkout@v4
 
  - name: Setup cache for Chromium binary
  uses: actions/cache@v3
  with:
- path: ~/.cache/puppeteer/chrome
+ path: ~/.cache/puppeteer
  key: chromium-${{ hashFiles('pnpm-lock.yaml') }}
 
  - name: Install pnpm
@@ -82,15 +80,18 @@ jobs:
  cache: 'pnpm'
 
  - run: pnpm install
+ - run: node node_modules/puppeteer/install.js
 
  - name: Run e2e tests
  run: pnpm run test-e2e
 
  lint-and-test-dts:
  runs-on: ubuntu-latest
  if: github.event_name == 'push' || github.event.pull_request.head.repo.full_name != github.repository
+ env:
+ PUPPETEER_SKIP_DOWNLOAD: 'true'
  steps:
- - uses: actions/checkout@v3
+ - uses: actions/checkout@v4
 
  - name: Install pnpm
  uses: pnpm/action-setup@v2
@@ -101,9 +102,6 @@ jobs:
  node-version: 18
  cache: 'pnpm'
 
- - name: Skip Puppeteer download
- run: echo "PUPPETEER_SKIP_DOWNLOAD=1" >> $GITHUB_ENV
-
  - run: pnpm install
 
  - name: Run eslint

.github/workflows/lock-closed-issues.yml

@@ -0,0 +1,20 @@
+name: Lock Closed Issues
+
+on:
+ schedule:
+ - cron: '0 0 * * *'
+
+permissions:
+ issues: write
+
+jobs:
+ action:
+ if: github.repository == 'vuejs/core'
+ runs-on: ubuntu-latest
+ steps:
+ - uses: dessant/lock-threads@v4
+ with:
+ github-token: ${{ secrets.GITHUB_TOKEN }}
+ issue-inactive-days: '14'
+ issue-lock-reason: ''
+ process-only: 'issues'

.github/workflows/size-data.yml

@@ -11,12 +11,15 @@ on:
 permissions:
  contents: read
 
+env:
+ PUPPETEER_SKIP_DOWNLOAD: 'true'
+
 jobs:
  upload:
  runs-on: ubuntu-latest
 
  steps:
- - uses: actions/checkout@v3
+ - uses: actions/checkout@v4
 
  - name: Install pnpm
  uses: pnpm/action-setup@v2
@@ -28,7 +31,7 @@ jobs:
  cache: pnpm
 
  - name: Install dependencies
- run: PUPPETEER_SKIP_DOWNLOAD=1 pnpm install
+ run: pnpm install
 
  - run: pnpm run size
 
@@ -42,7 +45,7 @@ jobs:
  if: ${{github.event_name == 'pull_request'}}
  run: echo ${{ github.event.number }} > ./pr.txt
 
- - uses: actions/upload-artifact@v2
+ - uses: actions/upload-artifact@v3
  if: ${{github.event_name == 'pull_request'}}
  with:
  name: pr-number

.github/workflows/size-report.yml

@@ -11,14 +11,17 @@ permissions:
  pull-requests: write
  issues: write
 
+env:
+ PUPPETEER_SKIP_DOWNLOAD: 'true'
+
 jobs:
  size-report:
  runs-on: ubuntu-latest
  if: >
  github.event.workflow_run.event == 'pull_request' &&
  github.event.workflow_run.conclusion == 'success'
  steps:
- - uses: actions/checkout@v3
+ - uses: actions/checkout@v4
 
  - name: Install pnpm
  uses: pnpm/action-setup@v2
@@ -30,7 +33,7 @@ jobs:
  cache: pnpm
 
  - name: Install dependencies
- run: PUPPETEER_SKIP_DOWNLOAD=1 pnpm install
+ run: pnpm install
 
  - name: Download PR number
  uses: dawidd6/action-download-artifact@v2