Merge 2.6.14 into 2.6 #12121
Closed
Merge 2.6.14 into 2.6 #12121
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
breaking the entire app fix #9459
This commit is for vuejs/vue-loader#1494
… scoped slots fix #9644
The previous detection code compared time stamps based on Date.now() which are not monotonic, so the check could fail due to clock skew or adjustments. This fix changes the check to compare against performance.now() if it is supported, because it is monotonic (strictly increasing).
Co-authored-by: Eduardo San Martin Morote <posva@users.noreply.github.com>
Co-authored-by: zrh122 <1229550935@qq.com>
Co-authored-by: wangzongxu <wangzongxu@vipkid.com.cn>
Co-authored-by: Eduardo San Martin Morote <posva@users.noreply.github.com>
Co-authored-by: mac2 <mac2@example.com>
Added undefined as a return type of $refs as it was quite hard to convince typescript that something COULD be undefined if you type in a ref that doesn't exist, I also changed the two array statements from `Element[] | Vue[]` to `(Element | Vue)[]` because it's not guaranteed that they are ALL Elements or they are ALL Vue components. (Very likely, yes, but not always) For example ```html <template v-for="(a, index) of b"> <div v-if="index % 2 === 0" ref="test"></div> <my-component v-else ref="test"></my-component> </template> ```
…#12015) Co-authored-by: zrh122 <1229550935@qq.com>
Bumps [ssri](https://github.com/npm/ssri) from 6.0.1 to 6.0.2. - [Release notes](https://github.com/npm/ssri/releases) - [Changelog](https://github.com/npm/ssri/blob/v6.0.2/CHANGELOG.md) - [Commits](npm/ssri@v6.0.1...v6.0.2) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* feat(ssr): vue-ssr-webpack-plugin compatible with webpack 5 * chore(ssr): remove webpack from peerDependencies
* Update options.d.ts * Create async-component-test.ts * add generics to Component ad EsModuleComponent * remove not needed , and ; * revert unrelated changes * revert unrelated changes * revert unrelated changes * revert unrelated changes * optimize EsModuleImports * Update async-component-test.ts
Member
|
Thank you but we will do this locally |
Author
|
Oh, I forgot GitHub doesn't support fast-forward merges (GitLab does). |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What kind of change does this PR introduce? (check at least one)
2.6branchDoes this PR introduce a breaking change? (check one)
If yes, please describe the impact and migration path for existing applications:
The PR fulfills these requirements:
devbranch for v2.x (or to a previous version branch), not themasterbranchfix #xxx[,#xxx], where "xxx" is the issue number)If adding a new feature, the PR's description includes:
Other information: