Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Sync #4ba12e46 #743

Merged
merged 15 commits into from
Jul 18, 2023
Merged

Sync #4ba12e46 #743

merged 15 commits into from
Jul 18, 2023

Commits on Jun 20, 2023

  1. Configuration menu
    Copy the full SHA
    8c2e852 View commit details
    Browse the repository at this point in the history

Commits on Jun 21, 2023

  1. Configuration menu
    Copy the full SHA
    fe15ed8 View commit details
    Browse the repository at this point in the history

Commits on Jun 27, 2023

  1. Bump vitepress from 1.0.0-beta.1 to 1.0.0-beta.3 (#2421)

    Bumps [vitepress](https://github.com/vuejs/vitepress) from 1.0.0-beta.1 to 1.0.0-beta.3.
    - [Release notes](https://github.com/vuejs/vitepress/releases)
    - [Changelog](https://github.com/vuejs/vitepress/blob/main/CHANGELOG.md)
    - [Commits](vuejs/vitepress@v1.0.0-beta.1...v1.0.0-beta.3)
    
    ---
    updated-dependencies:
    - dependency-name: vitepress
      dependency-type: direct:production
      update-type: version-update:semver-patch
    ...
    
    Signed-off-by: dependabot[bot] <[email protected]>
    Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
    dependabot[bot] authored Jun 27, 2023
    Configuration menu
    Copy the full SHA
    b1d7a68 View commit details
    Browse the repository at this point in the history
  2. docs: remove duplicate defineOptions script setup example (#2422)

    removes an old example that used to document using defineOptions without a setup but now says the same thing twice
    hwkr authored Jun 27, 2023
    Configuration menu
    Copy the full SHA
    f9e5233 View commit details
    Browse the repository at this point in the history
  3. Update forms.md (#2420)

    Added a key property to line 344 on the select option dynamic rendering.
    Sam Vitare authored Jun 27, 2023
    Configuration menu
    Copy the full SHA
    0c5a612 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    9b06c2f View commit details
    Browse the repository at this point in the history
  5. examples (todomvc): change @vnode-mounted to @vue:mounted (#2418)

    This example was using a deprecated API (`@vnode-mounted`), so I updated it.
    jynxio authored Jun 27, 2023
    Configuration menu
    Copy the full SHA
    9c34f13 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    0530fc5 View commit details
    Browse the repository at this point in the history

Commits on Jun 29, 2023

  1. Configuration menu
    Copy the full SHA
    ca5f159 View commit details
    Browse the repository at this point in the history

Commits on Jul 16, 2023

  1. docs(faq): remove outdated information about considering to use vue 2…

    … (#2428)
    
    I removed the section in the FAQ page that mentioned the consider to use Vue 2 due to the lack of stable versions for major ecosystem projects like Nuxt or Vuetify. The information was outdated as there are now stable versions available.
    arashsheyda authored Jul 16, 2023
    Configuration menu
    Copy the full SHA
    d22496b View commit details
    Browse the repository at this point in the history
  2. Bump vitepress from 1.0.0-beta.3 to 1.0.0-beta.5 (#2430)

    Bumps [vitepress](https://github.com/vuejs/vitepress) from 1.0.0-beta.3 to 1.0.0-beta.5.
    - [Release notes](https://github.com/vuejs/vitepress/releases)
    - [Changelog](https://github.com/vuejs/vitepress/blob/main/CHANGELOG.md)
    - [Commits](vuejs/vitepress@v1.0.0-beta.3...v1.0.0-beta.5)
    
    ---
    updated-dependencies:
    - dependency-name: vitepress
      dependency-type: direct:production
      update-type: version-update:semver-patch
    ...
    
    Signed-off-by: dependabot[bot] <[email protected]>
    Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
    dependabot[bot] authored Jul 16, 2023
    Configuration menu
    Copy the full SHA
    5cef088 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    a2e950b View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    4ba12e4 View commit details
    Browse the repository at this point in the history

Commits on Jul 18, 2023

  1. Merge remote-tracking branch 'origin/upstream' into sync

    # Conflicts:
    #	README.md
    #	pnpm-lock.yaml
    #	src/about/faq.md
    #	src/api/composition-api-dependency-injection.md
    #	src/guide/components/attrs.md
    #	src/guide/extras/reactivity-transform.md
    #	src/guide/extras/ways-of-using-vue.md
    #	src/guide/scaling-up/ssr.md
    wxsms committed Jul 18, 2023
    Configuration menu
    Copy the full SHA
    edfd8a9 View commit details
    Browse the repository at this point in the history
  2. resolve lockfile

    wxsms committed Jul 18, 2023
    Configuration menu
    Copy the full SHA
    8366d8a View commit details
    Browse the repository at this point in the history