Merge branch 'main' into fix-slots-level

Author: Doctor-wu

.github/FUNDING.yml

@@ -1,2 +1,2 @@
-github: yyx990803
+github: [yyx990803, sxzz]
 open_collective: vuejs

.github/contributing.md

@@ -236,7 +236,7 @@ Tests that test against source code are grouped under `nr test-unit`, while test
 
 ### `nr test-dts`
 
-Runs `nr build-dts` first, then verify the type tests in `packages/dts-test` are working correctly against the actual built type declarations.
+Runs `nr build-dts` first, then verify the type tests in `packages-private/dts-test` are working correctly against the actual built type declarations.
 
 ## Project Structure
 
@@ -335,7 +335,7 @@ Test coverage is continuously deployed at https://coverage.vuejs.org. PRs that i
 
 ### Testing Type Definition Correctness
 
-Type tests are located in the `packages/dts-test` directory. To run the dts tests, run `nr test-dts`. Note that the type test requires all relevant `*.d.ts` files to be built first (and the script does it for you). Once the `d.ts` files are built and up-to-date, the tests can be re-run by running `nr test-dts-only`.
+Type tests are located in the `packages-private/dts-test` directory. To run the dts tests, run `nr test-dts`. Note that the type test requires all relevant `*.d.ts` files to be built first (and the script does it for you). Once the `d.ts` files are built and up-to-date, the tests can be re-run by running `nr test-dts-only`.
 
 ## Financial Contribution
 

.github/renovate.json5

@@ -17,8 +17,8 @@
     {
       groupName: 'playground',
       matchFileNames: [
-        'packages/sfc-playground/package.json',
-        'packages/template-explorer/package.json',
+        'packages-private/sfc-playground/package.json',
+        'packages-private/template-explorer/package.json',
       ],
     },
     {
@@ -54,5 +54,13 @@
     // pinned
     // https://github.com/vuejs/core/commit/a012e39b373f1b6918e5c89856e8f902e1bfa14d
     '@rollup/plugin-replace',
+
+    // pinned
+    // only used in example for e2e tests
+    'marked',
+
+    // pinned, 5.0+ has exports issues
+    // https://github.com/vuejs/core/issues/11603
+    'entities',
   ],
 }

.github/workflows/ci.yml

@@ -3,6 +3,8 @@ on:
   push:
     branches:
       - '**'
+    tags:
+      - '!**'
   pull_request:
     branches:
       - main

.github/workflows/close-cant-reproduce-issues.yml

@@ -0,0 +1,21 @@
+name: Auto close issues with "can't reproduce" label
+
+on:
+  schedule:
+    - cron: '0 0 * * *'
+
+permissions:
+  issues: write
+
+jobs:
+  close-issues:
+    if: github.repository == 'vuejs/core-vapor'
+    runs-on: ubuntu-latest
+    steps:
+      - name: can't reproduce
+        uses: actions-cool/issues-helper@v3
+        with:
+          actions: 'close-issues'
+          token: ${{ secrets.GITHUB_TOKEN }}
+          labels: "can't reproduce"
+          inactive-day: 3

.github/workflows/ecosystem-ci-trigger.yml

@@ -9,7 +9,7 @@ permissions:
 
 jobs:
   action:
-    if: github.repository == 'vuejs/core'
+    if: github.repository == 'vuejs/core-vapor'
     runs-on: ubuntu-latest
     steps:
       - uses: dessant/lock-threads@v5

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

@@ -18,6 +18,7 @@ env:
 
 jobs:
   upload:
+    if: github.repository == 'vuejs/core-vapor'
     runs-on: ubuntu-latest
 
     steps:
@@ -48,22 +49,14 @@ jobs:
           path: temp/size-prev
           if_no_artifact_found: warn
 
-      - name: Upload Size Data
-        uses: actions/upload-artifact@v4
-        with:
-          name: size-data
-          path: temp/size
-
       - name: Save PR number & base branch
         if: ${{github.event_name == 'pull_request'}}
         run: |
-          echo ${{ github.event.number }} > ./number.txt
-          echo ${{ github.base_ref }} > ./base.txt
+          echo ${{ github.event.number }} > ./temp/size/number.txt
+          echo ${{ github.base_ref }} > ./temp/size/base.txt
 
-      - uses: actions/upload-artifact@v4
-        if: ${{github.event_name == 'pull_request'}}
+      - name: Upload Size Data
+        uses: actions/upload-artifact@v4
         with:
-          name: pr-info
-          path: |
-            number.txt
-            base.txt
+          name: size-data
+          path: temp/size

.github/workflows/release.yml

@@ -18,6 +18,7 @@ jobs:
   size-report:
     runs-on: ubuntu-latest
     if: >
+      github.repository == 'vuejs/core-vapor' &&
       github.event.workflow_run.event == 'pull_request' &&
       github.event.workflow_run.conclusion == 'success'
     steps:
@@ -35,31 +36,24 @@ jobs:
       - name: Install dependencies
         run: pnpm install
 
-      - name: Download PR info
+      - name: Download Size Data
         uses: dawidd6/action-download-artifact@v6
         with:
-          name: pr-info
+          name: size-data
           run_id: ${{ github.event.workflow_run.id }}
-          path: /tmp/pr-info
+          path: temp/size
 
       - name: Read PR Number
         id: pr-number
         uses: juliangruber/read-file-action@v1
         with:
-          path: /tmp/pr-info/number.txt
+          path: temp/size/number.txt
 
-      - name: Read PR base branch
+      - name: Read base branch
         id: pr-base
         uses: juliangruber/read-file-action@v1
         with:
-          path: /tmp/pr-info/base.txt
-
-      - name: Download Size Data
-        uses: dawidd6/action-download-artifact@v6
-        with:
-          name: size-data
-          run_id: ${{ github.event.workflow_run.id }}
-          path: temp/size
+          path: temp/size/base.txt
 
       - name: Download Previous Size Data
         uses: dawidd6/action-download-artifact@v6
@@ -72,7 +66,7 @@ jobs:
           if_no_artifact_found: warn
 
       - name: Prepare report
-        run: pnpm tsx scripts/size-report.ts > size-report.md
+        run: node scripts/size-report.js > size-report.md
 
       - name: Read Size Report
         id: size-report

.github/workflows/size-data.yml

@@ -54,17 +54,19 @@ jobs:
       - name: Run type declaration tests
         run: pnpm run test-dts
 
-  release:
+  continuous-release:
+    if: github.repository == 'vuejs/core-vapor'
     runs-on: ubuntu-latest
     needs: [unit-test, lint-and-test-dts]
     permissions:
       contents: read
       id-token: write
     steps:
-      - uses: actions/checkout@v4
+      - name: Checkout
+        uses: actions/checkout@v4
 
       - name: Install pnpm
-        uses: pnpm/action-setup@v4.0.0
+        uses: pnpm/action-setup@v4
 
       - name: Install Node.js
         uses: actions/setup-node@v4
@@ -73,10 +75,11 @@ jobs:
           registry-url: 'https://registry.npmjs.org'
           cache: 'pnpm'
 
-      - run: pnpm install
+      - name: Install deps
+        run: pnpm install
 
       - name: Build
         run: pnpm build --withTypes
 
-      - name: Publish
-        run: pnpm dlx pkg-pr-new@0.0 publish './packages/*' --template './playground' --pnpm
+      - name: Release
+        run: pnpx pkg-pr-new publish --pnpm './packages/*' --template './playground'

.github/workflows/size-report.yml

@@ -0,0 +1,3 @@
+{
+  "recommendations": ["vitest.explorer"]
+}