From f2b69d79ca95ba1da9d9e1909de3493b3a7720aa Mon Sep 17 00:00:00 2001 From: Evan You Date: Mon, 11 Nov 2024 22:45:34 +0800 Subject: [PATCH] chore: remove non-function-related changes from vapor branch --- .github/FUNDING.yml | 2 +- .github/ISSUE_TEMPLATE/bug_report.yml | 74 +++++++++++++++ .github/ISSUE_TEMPLATE/config.yml | 17 ++++ .github/workflows/canary-minor.yml | 33 +++++++ .github/workflows/canary.yml | 31 +++++++ .github/workflows/ci.yml | 26 ++++++ .../workflows/close-cant-reproduce-issues.yml | 2 +- .github/workflows/ecosystem-ci-trigger.yml | 90 +++++++++++++++++++ .github/workflows/lock-closed-issues.yml | 2 +- .github/workflows/release.yml | 55 ++++++++++++ .github/workflows/size-data.yml | 13 +-- .github/workflows/size-report.yml | 2 +- .github/workflows/test.yml | 82 +++++++++++------ .vscode/settings.json | 1 - README.md | 51 +++++------ package.json | 3 +- packages-private/sfc-playground/index.html | 2 +- packages-private/sfc-playground/src/App.vue | 4 - .../sfc-playground/src/Header.vue | 2 +- .../template-explorer/src/options.ts | 4 +- packages/compiler-core/package.json | 6 +- packages/compiler-dom/package.json | 6 +- packages/compiler-sfc/package.json | 6 +- packages/compiler-ssr/package.json | 6 +- packages/compiler-vapor/package.json | 6 +- packages/reactivity/package.json | 6 +- packages/runtime-core/package.json | 6 +- packages/runtime-dom/package.json | 6 +- packages/runtime-test/package.json | 6 +- packages/runtime-vapor/package.json | 6 +- packages/server-renderer/package.json | 6 +- packages/shared/package.json | 6 +- packages/vue-compat/package.json | 6 +- packages/vue/package.json | 6 +- 34 files changed, 458 insertions(+), 122 deletions(-) create mode 100644 .github/ISSUE_TEMPLATE/bug_report.yml create mode 100644 .github/ISSUE_TEMPLATE/config.yml create mode 100644 .github/workflows/canary-minor.yml create mode 100644 .github/workflows/canary.yml create mode 100644 .github/workflows/ecosystem-ci-trigger.yml create mode 100644 .github/workflows/release.yml diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml index 98c4c6d9b..9288efdb9 100644 --- a/.github/FUNDING.yml +++ b/.github/FUNDING.yml @@ -1,2 +1,2 @@ -github: [yyx990803, sxzz] +github: yyx990803 open_collective: vuejs diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml new file mode 100644 index 000000000..95e0ca79c --- /dev/null +++ b/.github/ISSUE_TEMPLATE/bug_report.yml @@ -0,0 +1,74 @@ +name: "\U0001F41E Bug report" +description: Create a report to help us improve +body: + - type: markdown + attributes: + value: | + **Before You Start...** + + This form is only for submitting bug reports. If you have a usage question + or are unsure if this is really a bug, make sure to: + + - Read the [docs](https://vuejs.org/) + - Ask on [Discord Chat](https://chat.vuejs.org/) + - Ask on [GitHub Discussions](https://github.com/vuejs/core/discussions) + - Look for / ask questions on [Stack Overflow](https://stackoverflow.com/questions/ask?tags=vue.js) + + Also try to search for your issue - it may have already been answered or even fixed in the development branch. + However, if you find that an old, closed issue still persists in the latest version, + you should open a new issue using the form below instead of commenting on the old issue. + - type: input + id: version + attributes: + label: Vue version + validations: + required: true + - type: input + id: reproduction-link + attributes: + label: Link to minimal reproduction + description: | + The easiest way to provide a reproduction is by showing the bug in [The SFC Playground](https://play.vuejs.org/). + If it cannot be reproduced in the playground and requires a proper build setup, try [StackBlitz](https://vite.new/vue). + If neither of these are suitable, you can always provide a GitHub repository. + + The reproduction should be **minimal** - i.e. it should contain only the bare minimum amount of code needed + to show the bug. See [Bug Reproduction Guidelines](https://github.com/vuejs/core/blob/main/.github/bug-repro-guidelines.md) for more details. + + Please do not just fill in a random link. The issue will be closed if no valid reproduction is provided. + placeholder: Reproduction Link + validations: + required: true + - type: textarea + id: steps-to-reproduce + attributes: + label: Steps to reproduce + description: | + What do we need to do after opening your repro in order to make the bug happen? Clear and concise reproduction instructions are important for us to be able to triage your issue in a timely manner. Note that you can use [Markdown](https://guides.github.com/features/mastering-markdown/) to format lists and code. + placeholder: Steps to reproduce + validations: + required: true + - type: textarea + id: expected + attributes: + label: What is expected? + validations: + required: true + - type: textarea + id: actually-happening + attributes: + label: What is actually happening? + validations: + required: true + - type: textarea + id: system-info + attributes: + label: System Info + description: Output of `npx envinfo --system --npmPackages vue --binaries --browsers` + render: shell + placeholder: System, Binaries, Browsers + - type: textarea + id: additional-comments + attributes: + label: Any additional comments? + description: e.g. some background/context of how you ran into this bug. diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml new file mode 100644 index 000000000..02f99c6bf --- /dev/null +++ b/.github/ISSUE_TEMPLATE/config.yml @@ -0,0 +1,17 @@ +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. + - name: Questions & Discussions + url: https://github.com/vuejs/core/discussions + about: Use GitHub discussions for message-board style questions and discussions. + - name: Patreon + url: https://www.patreon.com/evanyou + about: Love Vue.js? Please consider supporting us via Patreon. + - name: Open Collective + url: https://opencollective.com/vuejs/donate + about: Love Vue.js? Please consider supporting us via Open Collective. diff --git a/.github/workflows/canary-minor.yml b/.github/workflows/canary-minor.yml new file mode 100644 index 000000000..b5d75b9ce --- /dev/null +++ b/.github/workflows/canary-minor.yml @@ -0,0 +1,33 @@ +name: canary minor release +on: + # Runs every Monday at 1 AM UTC (9:00 AM in Singapore) + schedule: + - cron: 0 1 * * MON + workflow_dispatch: + +jobs: + canary: + # prevents this action from running on forks + if: github.repository == 'vuejs/core' + runs-on: ubuntu-latest + environment: Release + steps: + - uses: actions/checkout@v4 + with: + ref: minor + + - name: Install pnpm + uses: pnpm/action-setup@v4.0.0 + + - name: Install Node.js + uses: actions/setup-node@v4 + with: + node-version-file: '.node-version' + registry-url: 'https://registry.npmjs.org' + cache: 'pnpm' + + - run: pnpm install + + - run: pnpm release --canary --publish --tag minor + env: + NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }} diff --git a/.github/workflows/canary.yml b/.github/workflows/canary.yml new file mode 100644 index 000000000..bb622725a --- /dev/null +++ b/.github/workflows/canary.yml @@ -0,0 +1,31 @@ +name: canary release +on: + # Runs every Monday at 1 AM UTC (9:00 AM in Singapore) + schedule: + - cron: 0 1 * * MON + workflow_dispatch: + +jobs: + canary: + # prevents this action from running on forks + if: github.repository == 'vuejs/core' + runs-on: ubuntu-latest + environment: Release + steps: + - uses: actions/checkout@v4 + + - name: Install pnpm + uses: pnpm/action-setup@v4.0.0 + + - name: Install Node.js + uses: actions/setup-node@v4 + with: + node-version-file: '.node-version' + registry-url: 'https://registry.npmjs.org' + cache: 'pnpm' + + - run: pnpm install + + - run: pnpm release --canary --publish + env: + NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }} diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index fdbcd4cac..c8c217f62 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -14,3 +14,29 @@ jobs: test: if: ${{ ! startsWith(github.event.head_commit.message, 'release:') && (github.event_name == 'push' || github.event.pull_request.head.repo.full_name != github.repository) }} uses: ./.github/workflows/test.yml + + continuous-release: + if: github.repository == 'vuejs/core' + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v4 + + - name: Install pnpm + uses: pnpm/action-setup@v4 + + - name: Install Node.js + uses: actions/setup-node@v4 + with: + node-version-file: '.node-version' + registry-url: 'https://registry.npmjs.org' + cache: 'pnpm' + + - name: Install deps + run: pnpm install + + - name: Build + run: pnpm build --withTypes + + - name: Release + run: pnpx pkg-pr-new publish --compact --pnpm './packages/*' diff --git a/.github/workflows/close-cant-reproduce-issues.yml b/.github/workflows/close-cant-reproduce-issues.yml index 90a3b0406..8fb48f842 100644 --- a/.github/workflows/close-cant-reproduce-issues.yml +++ b/.github/workflows/close-cant-reproduce-issues.yml @@ -9,7 +9,7 @@ permissions: jobs: close-issues: - if: github.repository == 'vuejs/vue-vapor' + if: github.repository == 'vuejs/core' runs-on: ubuntu-latest steps: - name: can't reproduce diff --git a/.github/workflows/ecosystem-ci-trigger.yml b/.github/workflows/ecosystem-ci-trigger.yml new file mode 100644 index 000000000..b3e963ece --- /dev/null +++ b/.github/workflows/ecosystem-ci-trigger.yml @@ -0,0 +1,90 @@ +name: ecosystem-ci trigger + +on: + issue_comment: + types: [created] + +jobs: + trigger: + runs-on: ubuntu-latest + if: github.repository == 'vuejs/core' && github.event.issue.pull_request && startsWith(github.event.comment.body, '/ecosystem-ci run') + steps: + - name: Check user permission + uses: actions/github-script@v7 + with: + script: | + const user = context.payload.sender.login + console.log(`Validate user: ${user}`) + + let isVuejsMember = false + try { + const { status } = await github.rest.orgs.checkMembershipForUser({ + org: 'vuejs', + username: user + }); + + isVuejsMember = (status === 204) + } catch (e) {} + + if (isVuejsMember) { + console.log('Allowed') + await github.rest.reactions.createForIssueComment({ + owner: context.repo.owner, + repo: context.repo.repo, + comment_id: context.payload.comment.id, + content: '+1', + }) + } else { + console.log('Not allowed') + await github.rest.reactions.createForIssueComment({ + owner: context.repo.owner, + repo: context.repo.repo, + comment_id: context.payload.comment.id, + content: '-1', + }) + throw new Error('not allowed') + } + - name: Get PR info + uses: actions/github-script@v7 + id: get-pr-data + with: + script: | + console.log(`Get PR info: ${context.repo.owner}/${context.repo.repo}#${context.issue.number}`) + const { data: pr } = await github.rest.pulls.get({ + owner: context.repo.owner, + repo: context.repo.repo, + pull_number: context.issue.number + }) + return { + num: context.issue.number, + branchName: pr.head.ref, + repo: pr.head.repo.full_name, + commit: pr.head.sha + } + - name: Trigger run + uses: actions/github-script@v7 + id: trigger + env: + COMMENT: ${{ github.event.comment.body }} + with: + github-token: ${{ secrets.ECOSYSTEM_CI_ACCESS_TOKEN }} + result-encoding: string + script: | + const comment = process.env.COMMENT.trim() + const prData = ${{ steps.get-pr-data.outputs.result }} + + const suite = comment.replace(/^\/ecosystem-ci run/, '').trim() + + await github.rest.actions.createWorkflowDispatch({ + owner: context.repo.owner, + repo: 'ecosystem-ci', + workflow_id: 'ecosystem-ci-from-pr.yml', + ref: 'main', + inputs: { + prNumber: '' + prData.num, + branchName: prData.branchName, + repo: prData.repo, + suite: suite === '' ? '-' : suite, + commit: prData.commit + } + }) diff --git a/.github/workflows/lock-closed-issues.yml b/.github/workflows/lock-closed-issues.yml index cbb47c08e..68a7d6c7a 100644 --- a/.github/workflows/lock-closed-issues.yml +++ b/.github/workflows/lock-closed-issues.yml @@ -9,7 +9,7 @@ permissions: jobs: action: - if: github.repository == 'vuejs/vue-vapor' + if: github.repository == 'vuejs/core' runs-on: ubuntu-latest steps: - uses: dessant/lock-threads@v5 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml new file mode 100644 index 000000000..c260a728e --- /dev/null +++ b/.github/workflows/release.yml @@ -0,0 +1,55 @@ +name: Release + +on: + push: + tags: + - 'v*' # Push events to matching v*, i.e. v1.0, v20.15.10 + +jobs: + test: + uses: ./.github/workflows/test.yml + + release: + # prevents this action from running on forks + if: github.repository == 'vuejs/core' + needs: [test] + runs-on: ubuntu-latest + permissions: + contents: write + id-token: write + # Use Release environment for deployment protection + environment: Release + steps: + - name: Checkout + uses: actions/checkout@v4 + + - name: Install pnpm + uses: pnpm/action-setup@v4 + + - name: Install Node.js + uses: actions/setup-node@v4 + with: + node-version-file: '.node-version' + registry-url: 'https://registry.npmjs.org' + cache: 'pnpm' + + - name: Install deps + run: pnpm install + + - name: Build and publish + id: publish + run: | + pnpm release --publishOnly + env: + NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }} + + - name: Create GitHub release + id: release_tag + uses: yyx990803/release-tag@master + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + with: + tag_name: ${{ github.ref }} + body: | + For stable releases, please refer to [CHANGELOG.md](https://github.com/vuejs/core/blob/main/CHANGELOG.md) for details. + For pre-releases, please refer to [CHANGELOG.md](https://github.com/vuejs/core/blob/minor/CHANGELOG.md) of the `minor` branch. diff --git a/.github/workflows/size-data.yml b/.github/workflows/size-data.yml index 78da7e931..7f8bf7b08 100644 --- a/.github/workflows/size-data.yml +++ b/.github/workflows/size-data.yml @@ -18,7 +18,7 @@ env: jobs: upload: - if: github.repository == 'vuejs/vue-vapor' + if: github.repository == 'vuejs/core' runs-on: ubuntu-latest steps: @@ -38,17 +38,6 @@ jobs: - run: pnpm run size - - name: Download Previous Size Data - uses: dawidd6/action-download-artifact@v2 - if: ${{ github.event_name == 'push' }} - with: - branch: main - workflow: size-data.yml - event: push - name: size-data - path: temp/size-prev - if_no_artifact_found: warn - - name: Save PR number & base branch if: ${{github.event_name == 'pull_request'}} run: | diff --git a/.github/workflows/size-report.yml b/.github/workflows/size-report.yml index 7e763e157..f9d2052b6 100644 --- a/.github/workflows/size-report.yml +++ b/.github/workflows/size-report.yml @@ -18,7 +18,7 @@ jobs: size-report: runs-on: ubuntu-latest if: > - github.repository == 'vuejs/vue-vapor' && + github.repository == 'vuejs/core' && github.event.workflow_run.event == 'pull_request' && github.event.workflow_run.conclusion == 'success' steps: diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index bc5beb5ec..70dc82248 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -27,6 +27,59 @@ jobs: - name: Run unit tests run: pnpm run test-unit + unit-test-windows: + runs-on: windows-latest + env: + PUPPETEER_SKIP_DOWNLOAD: 'true' + steps: + - uses: actions/checkout@v4 + + - name: Install pnpm + uses: pnpm/action-setup@v4.0.0 + + - name: Install Node.js + uses: actions/setup-node@v4 + with: + node-version-file: '.node-version' + cache: 'pnpm' + + - run: pnpm install + + - name: Run compiler unit tests + run: pnpm run test-unit compiler + + - name: Run ssr unit tests + run: pnpm run test-unit server-renderer + + e2e-test: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + + - name: Setup cache for Chromium binary + uses: actions/cache@v4 + with: + path: ~/.cache/puppeteer + key: chromium-${{ hashFiles('pnpm-lock.yaml') }} + + - name: Install pnpm + uses: pnpm/action-setup@v4.0.0 + + - name: Install Node.js + uses: actions/setup-node@v4 + with: + node-version-file: '.node-version' + cache: 'pnpm' + + - run: pnpm install + - run: node node_modules/puppeteer/install.mjs + + - name: Run e2e tests + run: pnpm run test-e2e + + - name: verify treeshaking + run: node scripts/verify-treeshaking.js + lint-and-test-dts: runs-on: ubuntu-latest env: @@ -53,32 +106,3 @@ jobs: - name: Run type declaration tests run: pnpm run test-dts - - continuous-release: - if: github.repository == 'vuejs/vue-vapor' - runs-on: ubuntu-latest - permissions: - contents: read - id-token: write - steps: - - name: Checkout - uses: actions/checkout@v4 - - - name: Install pnpm - uses: pnpm/action-setup@v4 - - - name: Install Node.js - uses: actions/setup-node@v4 - with: - node-version-file: '.node-version' - registry-url: 'https://registry.npmjs.org' - cache: 'pnpm' - - - name: Install deps - run: pnpm install - - - name: Build - run: pnpm build --withTypes - - - name: Release - run: pnpx pkg-pr-new publish --pnpm './packages/*' --template './playground' diff --git a/.vscode/settings.json b/.vscode/settings.json index 9e6f6c9fb..302428290 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -5,7 +5,6 @@ "cSpell.enabledLanguageIds": ["markdown", "plaintext", "text", "yml"], // Use prettier to format typescript, javascript and JSON files - "editor.formatOnSave": true, "[typescript]": { "editor.defaultFormatter": "esbenp.prettier-vscode" }, diff --git a/README.md b/README.md index c9bba9372..afe5711e8 100644 --- a/README.md +++ b/README.md @@ -1,31 +1,12 @@ -# Vue Vapor +# vuejs/core [![npm](https://img.shields.io/npm/v/vue.svg)](https://www.npmjs.com/package/vue) [![build status](https://github.com/vuejs/core/actions/workflows/ci.yml/badge.svg?branch=main)](https://github.com/vuejs/core/actions/workflows/ci.yml) [![Download](https://img.shields.io/npm/dm/vue)](https://www.npmjs.com/package/vue) -This repository is a fork of [vuejs/core](https://github.com/vuejs/core) and is used for research and development of no virtual dom mode. +## Getting Started -- [Vapor Playground](https://vapor-repl.netlify.app/) -- [Vapor Template Explorer](https://vapor-template-explorer.netlify.app/) - -## Vue Vapor Team - -- [Evan You](https://github.com/yyx990803) - Creator of Vue.js and Vue Vapor. -- [Kevin Deng 三咲智子](https://github.com/sxzz) - Creator Vue Vapor. -- [Rizumu Ayaka](https://github.com/LittleSound) - Active contributor. -- [Ubugeeei](https://github.com/Ubugeeei) - Active contributor. -- [Doctor Wu](https://github.com/doctor-wu) - Active contributor. +Please follow the documentation at [vuejs.org](https://vuejs.org/)! ## Sponsors -Vue Vapor is an MIT-licensed open source project with its ongoing development made possible entirely by the support of these amazing sponsors and [Vue's backers](https://github.com/vuejs/core/blob/main/BACKERS.md). If you'd like to join them, please consider [sponsoring Kevin Deng](https://github.com/sponsors/sxzz) or [supporting Vue's development](https://vuejs.org/sponsor). - -

-

Kevin Deng's Sponsors

-

- -

- - - -

+Vue.js is an MIT-licensed open source project with its ongoing development made possible entirely by the support of these awesome [backers](https://github.com/vuejs/core/blob/main/BACKERS.md). If you'd like to join them, please consider [ sponsoring Vue's development](https://vuejs.org/sponsor/).

Special Sponsor

@@ -43,10 +24,30 @@ Vue Vapor is an MIT-licensed open source project with its ongoing development ma

+## Questions + +For questions and support please use [the official forum](https://forum.vuejs.org) or [community chat](https://chat.vuejs.org/). The issue list of this repo is **exclusively** for bug reports and feature requests. + +## Issues + +Please make sure to respect issue requirements and use [the new issue helper](https://new-issue.vuejs.org/) when opening an issue. Issues not conforming to the guidelines may be closed immediately. + +## Stay In Touch + +- [Twitter](https://twitter.com/vuejs) +- [Blog](https://blog.vuejs.org/) +- [Job Board](https://vuejobs.com/?ref=vuejs) + +## Contribution + +Please make sure to read the [Contributing Guide](https://github.com/vuejs/core/blob/main/.github/contributing.md) before making a pull request. If you have a Vue-related project/component/tool, add it with a pull request to [this curated list](https://github.com/vuejs/awesome-vue)! + +Thank you to all the people who already contributed to Vue! + + + ## License [MIT](https://opensource.org/licenses/MIT) -Copyright (c) 2024-present, Kevin Deng 三咲智子 - Copyright (c) 2013-present, Yuxi (Evan) You diff --git a/package.json b/package.json index 8dd04ee52..157e99fec 100644 --- a/package.json +++ b/package.json @@ -45,7 +45,8 @@ "postinstall": "simple-git-hooks" }, "simple-git-hooks": { - "pre-commit": "pnpm lint-staged" + "pre-commit": "pnpm lint-staged && pnpm check", + "commit-msg": "node scripts/verify-commit.js" }, "lint-staged": { "*.{js,json}": [ diff --git a/packages-private/sfc-playground/index.html b/packages-private/sfc-playground/index.html index 6e8684562..3a21d956c 100644 --- a/packages-private/sfc-playground/index.html +++ b/packages-private/sfc-playground/index.html @@ -5,7 +5,7 @@ - Vue Vapor SFC Playground + Vue SFC Playground