8000 chore: Merge branch 'minor' into feat/effect/pause-resume · vuejs/core@272fb51 · GitHub
[go: up one dir, main page]
Skip to content

Commit 272fb51

Browse files
yyx990803yyx990803
committed
chore: Merge branch 'minor' into feat/effect/pause-resume
2 parents 108eb94 + 55acabe commit 272fb51

File tree

8000

299 files changed

+17704
-7754
lines changed
  • ssrSlotOutlet.spec.ts
  • ssrTransitionGroup.spec.ts
  • package.json
  • src
  • dts-built-test
  • dts-test
  • global.d.ts
  • reactivity
  • runtime-core
  • runtime-dom
  • server-renderer
  • sfc-playground
  • shared
  • template-explorer
  • vue-compat
  • vue
  • pnpm-lock.yaml
  • pnpm-workspace.yaml
  • rollup.config.js
  • rollup.dts.config.js
  • scripts
  • tsconfig.build-browser.json
  • tsconfig.build-node.json
  • tsconfig.build.json
  • tsconfig.json
  • vitest.config.ts
  • vitest.e2e.config.ts

    • Some content is hidden

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

    299 files changed

    +17704
    -7754
    lines changed

    ‎.eslintignore

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

    ‎.eslintrc.cjs

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

    ‎.github/commit-convention.md

    Lines changed: 1 addition & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -6,7 +6,7 @@
    66

    77
    Messages must be matched by the following regex:
    88

    9-
    ``` js
    9+
    ```regexp
    1010
    /^(revert: )?(feat|fix|docs|dx|style|refactor|perf|test|workflow|build|ci|chore|types|wip)(\(.+\))?: .{1,50}/
    1111
    ```
    1212

    ‎.github/contributing.md

    Lines changed: 22 additions & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -17,6 +17,27 @@ Hi! I'm really excited that you are interested in contributing to Vue.js. Before
    1717

    1818
    ## Pull Request Guidelines
    1919

    20+
    ### What kinds of Pull Requests are accepted?
    21+
    22+
    - Bug fix that addresses a clearly identified bug. **"Clearly identified bug"** means the bug has a proper reproduction either from a related open issue, or is included in the PR itself. Avoid submitting PRs that claim to fix something but do not sufficiently explain what is being fixed.
    23+
    24+
    - New feature that addresses a clearly explained and widely applicable use case. **"Widely applicable"** means the new feature should provide non-trivial improvements to the majority of the user base. Vue already has a large API surface so we are quite cautious about adding new features - if the use case is niche and can be addressed via userland implementations, it likely isn't suitable to go into core.
    25+
    26+
    The feature implementation should also consider the trade-off between the added complexity vs. the benefits gained. For example, if a small feature requires significant changes that spreads across the codebase, it is likely not worth it, or the approach should be reconsidered.
    27+
    28+
    If the feature has a non-trivial API surface addition, or significantly affects the way a common use case is approached by the users, it should go through a discussion first in the [RFC repo](https://github.com/vuejs/rfcs/discussions). PRs of such features without prior discussion make it really difficult to steer / adjust the API design due to coupling with concrete implementations, and can lead to wasted work.
    29+
    30+
    - Chore: typos, comment improvements, build config, CI config, etc. For typos and comment changes, try to combine multiple of them into a single PR.
    31+
    32+
    - **It should be noted that we discourage contributors from submitting code refactors that are largely stylistic.** Code refactors are only accepted if it improves performance, or comes with sufficient explanations on why it objectively improves the code quality (e.g. makes a related feature implementation easier).
    33+
    34+
    The reason is that code readability is subjective. The maintainers of this project have chosen to write the code in its current style based on our preferences, and we do not want to spend time explaining our stylistic preferences. Contributors should just respect the established conventions when contributing code.
    35+
    36+
    Another aspect of it is that large scale stylistic changes result in massive diffs that touch multiple files, adding noise to the git history and makes tracing behavior changes across commits more cumbersome.
    37+
    38+
    39+
    ### Pull Request Checklist
    40+
    2041
    - Vue core has two primary work branches: `main` and `minor`.
    2142

    2243
    - If your pull request is a feature that adds new API surface, it should be submitted against the `minor` branch.
    @@ -61,7 +82,7 @@ Hi! I'm really excited that you are interested in contributing to Vue.js. Before
    6182

    6283
    ## Development Setup
    6384

    64-
    You will need [Node.js](https://nodejs.org) **version 18.12+**, and [PNPM](https://pnpm.io) **version 8+**.
    85+
    You will need [Node.js](https://nodejs.org) with minimum version as specified in the [`.node-version`](https://github.com/vuejs/core/blob/main/.node-version) file, and [PNPM](https://pnpm.io) with minimum version as specified in the [`"packageManager"` field in `package.json`](https://github.com/vuejs/core/blob/main/package.json#L4).
    6586

    6687
    We also recommend installing [@antfu/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.
    6788

    ‎.github/renovate.json5

    Lines changed: 2 additions & 2 deletions
    Original file line numberDiff line numberDiff line change
    @@ -28,13 +28,13 @@
    2828
    },
    2929
    {
    3030
    groupName: 'build',
    31-
    matchPackageNames: ['vite', 'terser'],
    31+
    matchPackageNames: ['vite', '@swc/core'],
    3232
    matchPackagePrefixes: ['rollup', 'esbuild', '@rollup', '@vitejs'],
    3333
    },
    3434
    {
    3535
    groupName: 'lint',
    3636
    matchPackageNames: ['simple-git-hooks', 'lint-staged'],
    37-
    matchPackagePrefixes: ['@typescript-eslint', 'eslint', 'prettier'],
    37+
    matchPackagePrefixes: ['typescript-eslint', 'eslint', 'prettier'],
    3838
    },
    3939
    ],
    4040
    ignoreDeps: [

    ‎.github/workflows/autofix.yml

    Lines changed: 6 additions & 5 deletions
    Original file line numberDiff line numberDiff line change
    @@ -14,13 +14,14 @@ jobs:
    1414
    - uses: actions/checkout@v4
    1515

    1616
    - name: Install pnpm
    17-
    uses: pnpm/action-setup@v2
    17+
    uses: pnpm/action-setup@v4.0.0
    1818

    19-
    - name: Set node version to 18
    19+
    - name: Install Node.js
    2020
    uses: actions/setup-node@v4
    2121
    with:
    22-
    node-version: 18
    23-
    cache: pnpm
    22+
    node-version-file: '.node-version'
    23+
    registry-url: 'https://registry.npmjs.org'
    24+
    cache: 'pnpm'
    2425

    2526
    - run: pnpm install
    2627

    @@ -30,4 +31,4 @@ jobs:
    3031
    - name: Run prettier
    3132
    run: pnpm run format
    3233

    33-
    - uses: autofix-ci/action@ea32e3a12414e6d3183163c3424a7d7a8631ad84
    34+
    - uses: autofix-ci/action@ff86a557419858bb967097bfc916833f5647fa8c

    ‎.github/workflows/canary-minor.yml

    Lines changed: 3 additions & 3 deletions
    Original file line numberDiff line numberDiff line change
    @@ -17,12 +17,12 @@ jobs:
    1717
    ref: minor
    1818

    1919
    - name: Install pnpm
    20-
    uses: pnpm/action-setup@v2
    20+
    uses: pnpm/action-setup@v4.0.0
    2121

    22-
    - name: Set node version to 18
    22+
    - name: Install Node.js
    2323
    uses: actions/setup-node@v4
    2424
    with:
    25-
    node-version: 18
    25+
    node-version-file: '.node-version'
    2626
    registry-url: 'https://registry.npmjs.org'
    2727
    cache: 'pnpm'
    2828

    ‎.github/workflows/canary.yml

    Lines changed: 1 addition & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -15,7 +15,7 @@ jobs:
    1515
    - uses: actions/checkout@v4
    1616

    1717
    - name: Install pnpm
    18-
    uses: pnpm/action-setup@v2
    18+
    uses: pnpm/action-setup@v4.0.0
    1919

    2020
    - name: Install Node.js
    2121
    uses: actions/setup-node@v4

    ‎.github/workflows/ci.yml

    Lines changed: 6 additions & 5 deletions
    Original file line numberDiff line numberDiff line change
    @@ -6,6 +6,7 @@ on:
    66
    pull_request:
    77
    branches:
    88
    - main
    9+
    - minor
    910

    1011
    permissions:
    1112
    contents: read # to fetch code (actions/checkout)
    @@ -20,7 +21,7 @@ jobs:
    2021
    - uses: actions/checkout@v4
    2122

    2223
    - name: Install pnpm
    23-
    uses: pnpm/action-setup@v2
    24+
    uses: pnpm/action-setup@v4.0.0
    2425

    2526
    - name: Install Node.js
    2627
    uses: actions/setup-node@v4
    @@ -42,7 +43,7 @@ jobs:
    4243
    - uses: actions/checkout@v4
    4344

    4445
    - name: Install pnpm
    45-
    uses: pnpm/action-setup@v2
    46+
    uses: pnpm/action-setup@v4.0.0
    4647

    4748
    - name: Install Node.js
    4849
    uses: actions/setup-node@v4
    @@ -71,7 +72,7 @@ jobs:
    7172
    key: chromium-${{ hashFiles('pnpm-lock.yaml') }}
    7273

    7374
    - name: Install pnpm
    74-
    uses: pnpm/action-setup@v2
    75+
    uses: pnpm/action-setup@v4.0.0
    7576

    7677
    - name: Install Node.js
    7778
    uses: actions/setup-node@v4
    @@ -97,7 +98,7 @@ jobs:
    9798
    - uses: actions/checkout@v4
    9899

    99100
    - name: Install pnpm
    100-
    uses: pnpm/action-setup@v2
    101+
    uses: pnpm/action-setup@v4.0.0
    101102

    102103
    - name: Install Node.js
    103104
    uses: actions/setup-node@v4
    @@ -125,7 +126,7 @@ jobs:
    125126
    # - uses: actions/checkout@v4
    126127

    127128
    # - name: Install pnpm
    128-
    # uses: pnpm/action-setup@v2
    129+
    # uses: pnpm/action-setup@v3.0.0
    129130

    130131
    # - name: Install Node.js
    131132
    # uses: actions/setup-node@v4

    ‎.github/workflows/release-tag.yml

    Lines changed: 2 additions & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -24,4 +24,5 @@ jobs:
    2424
    with:
    2525
    tag_name: ${{ github.ref }}
    2626
    body: |
    27-
    Please refer to [CHANGELOG.md](https://github.com/vuejs/core/blob/main/CHANGELOG.md) for details.
    27+
    For stable releases, please refer to [CHANGELOG.md](https://github.com/vuejs/core/blob/main/CHANGELOG.md) for details.
    28+
    For pre-releases, please refer to [CHANGELOG.md](https://github.com/vuejs/core/blob/minor/CHANGELOG.md) of the `minor` branch.

    0 commit comments

    Comments
     (0)
    0