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.

Sign up for GitHub

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

Jump to bottom

Upstream sync #273

Merged
merged 35 commits into from
Nov 28, 2023
Merged

Upstream sync #273

merged 35 commits into from
Nov 28, 2023

Conversation

matrunchyk
Copy link
Collaborator

jillztom and others added 30 commits October 16, 2023 11:46
@jillztom
Add Vue Toronto banner - schedule 2 (#2536)
71ecfd5
@FreshHead
Update built-in-components.md rename <teleport> to <Teleport> (#2497)
7d93d28 
I think teleport component name should be capitalized. Sincere sorry if I'm wrong.
@devloos
Update composable guide reset values (#2511)
620fe6c 
* update

* update
@haoqunjiang
Add information about canary releases (#2518)
6e3fac2
@jay-es
docs: consist usage of in-DOM template (#2521)
b949158
@altrusl
Update rules-strongly-recommended.md (#2522)
0a32566 
Changed "In Dom" to "In in-DOM" in two places as used in the rest of the document
@AloisSeckar
fix: update dead link (#2539)
c9c25da
@dependabot
chore(deps): bump vue from 3.3.4 to 3.3.6 (#2542)
4013ced 
Bumps [vue](https://github.com/vuejs/core) from 3.3.4 to 3.3.6.
- [Release notes](https://github.com/vuejs/core/releases)
- [Changelog](https://github.com/vuejs/core/blob/main/CHANGELOG.md)
- [Commits](vuejs/core@v3.3.4...v3.3.6)

---
updated-dependencies:
- dependency-name: vue
  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>
@abfahimb
docs: remove broken link to focus indicator extension (closes #2530)
009cb99
@mingpepe
docs: update url for vue-tsc in overview.md (#2546)
ea76103
@dependabot
chore(deps): bump vue from 3.3.6 to 3.3.7 (#2549)
ca0ece7 
Bumps [vue](https://github.com/vuejs/core) from 3.3.6 to 3.3.7.
- [Release notes](https://github.com/vuejs/core/releases)
- [Changelog](https://github.com/vuejs/core/blob/main/CHANGELOG.md)
- [Commits](vuejs/core@v3.3.6...v3.3.7)

---
updated-dependencies:
- dependency-name: vue
  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>
@yyx990803
Revert "Add Vue Toronto banner - schedule 2 (#2536)" (#2553)
1a8b6f6 
This reverts commit 71ecfd5.
@leoelz
Remove the app constant name from the method name (#2523)
666561e 
* Remove the app variable name from the method name

To be consitent with the rest of the guide, it should be displayed the method name (with the dot accessor)
i.e.: https://vuejs.org/guide/essentials/application.html#mounting-the-app

* remove app const name from method
@JeremieLitzler
Update rules-recommended.md (#2540)
575a6a7 
docs: add missing div to seperate bad and good examples
@leoelz @NataliaTepluhina
Update events.md - Diff between Options API and Composition API text …
626a4bf 
…(#2550)

* Update events.md - Diff between Options API and Composition API text

The emits support for object sintax for Options API text was displayed for both, Options and Composition API.

* Update events.md - in span instead of repeat code in different divs

* Update events.md - fix options-api class

* Update src/guide/components/events.md

Co-authored-by: Natalia Tepluhina <[email protected]>

---------

Co-authored-by: Natalia Tepluhina <[email protected]>
@cabbageshop
Add missing ':' on duration property (#2556)
47b7a2f
@andrewvasilchuk
docs: consistent colons in input labels (#2557)
a6c8282 
* docs: consistent colons in input labels

* Update colons everywhere
@yakirgot
docs: use useByRole in example and fix typos (#2559)
9e0d774 
getByRole validates the role of an element, giving us an extra free assertion

https://testing-library.com/docs/queries/about/#priority
@dependabot
chore(deps): bump @vue/theme from 2.2.4 to 2.2.5 (#2555)
0fe5b3d 
Bumps [@vue/theme](https://github.com/vuejs/theme) from 2.2.4 to 2.2.5.
- [Commits](https://github.com/vuejs/theme/commits/v2.2.5)

---
updated-dependencies:
- dependency-name: "@vue/theme"
  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>
@jay-es @NataliaTepluhina
Fix watch examples (#2537)
c979157 
* Add note to `watch` examples

* fix watch examples

* fix: fixed disabling an input

---------

Co-authored-by: NataliaTepluhina <[email protected]>
@stevenks17
imported and changed twitter icon to new logo (#2548)
7b9eb9c
@i5dr0id
Vuemastery free weekend banner nov 2023 (#2561)
49aaa80
@yyx990803
chore: temporarily remove vueschool script
8c16348
@dependabot
chore(deps): bump vue from 3.3.7 to 3.3.8 (#2563)
d3169e6 
Bumps [vue](https://github.com/vuejs/core) from 3.3.7 to 3.3.8.
- [Release notes](https://github.com/vuejs/core/releases)
- [Changelog](https://github.com/vuejs/core/blob/main/CHANGELOG.md)
- [Commits](vuejs/core@v3.3.7...v3.3.8)

---
updated-dependencies:
- dependency-name: vue
  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>
@yyx990803
Revert "chore: temporarily remove vueschool script"
def9358 
This reverts commit 8c16348.
@ubugeeei
fix(tutorial): race condition on step-10 (#2567)
8087e30
@jacekkarczmarczyk
fix: ref example (#2570)
67f4d3a
@yyx990803
special handling for priority platinum sponsor
74970a9
@yyx990803
fix aside special max height
07cac45
@heygsc @brc-dd
fix: aside style error caused by banner (#2572)
4485782 
Co-authored-by: Divyansh Singh <[email protected]>
yyx990803 and others added 5 commits November 17, 2023 12:18
@yyx990803
Revert "Vuemastery free weekend banner nov 2023 (#2561)"
0806e26 
This reverts commit 49aaa80.
@thevrus
docs: fix link to vue tsc package (#2574)
c81e315
@heygsc
fix : undefined function retry (#2578)
20730b6
@amiria703
Add Persian to WIP languages (#2579)
70dfbd1
@matrunchyk
Merge branch 'main-upstream' into upstream-sync
1cfa065 
# Conflicts:
#	pnpm-lock.yaml
#	src/about/faq.md
#	src/about/releases.md
#	src/guide/best-practices/accessibility.md
#	src/guide/built-ins/transition.md
#	src/guide/components/events.md
#	src/guide/components/registration.md
#	src/guide/essentials/watchers.md
#	src/guide/reusability/composables.md
#	src/guide/scaling-up/testing.md
#	src/guide/scaling-up/tooling.md
#	src/guide/typescript/overview.md
#	src/tutorial/src/step-10/App/template.html
@vercel Vercel
Copy link

vercel bot commented Nov 28, 2023 •
edited
Loading

The latest updates on your projects. Learn more about Vercel for Git ↗︎

Name Status Preview Comments Updated (UTC)
docs-uk ✅ Ready (Inspect) Visit Preview 💬 Add feedback Nov 28, 2023 1:26pm

maxdzin
maxdzin approved these changes Nov 28, 2023
View reviewed changes
Copy link
Collaborator

@maxdzin maxdzin left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

All OK

@maxdzin maxdzin merged commit 5e3aac8 into main Nov 28, 2023
3 checks passed
@maxdzin maxdzin deleted the upstream-sync branch November 28, 2023 13:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@maxdzin maxdzin maxdzin approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.