chore: Merge branch 'master' back into develop after v9.0.1 release #6581
Conversation
This file contains 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
Merge pull request google#6483 from google/rc_2022_10
Bumps [node-fetch](https://github.com/node-fetch/node-fetch) and [@wdio/cli](https://github.com/webdriverio/webdriverio). These dependencies needed to be updated together. Updates `node-fetch` from 2.6.5 to 2.6.7 - [Release notes](https://github.com/node-fetch/node-fetch/releases) - [Commits](node-fetch/node-fetch@v2.6.5...v2.6.7) Updates `@wdio/cli` from 7.16.10 to 7.25.1 - [Release notes](https://github.com/webdriverio/webdriverio/releases) - [Changelog](https://github.com/webdriverio/webdriverio/blob/main/CHANGELOG.md) - [Commits](webdriverio/webdriverio@v7.16.10...v7.25.1) --- updated-dependencies: - dependency-name: node-fetch dependency-type: indirect - dependency-name: "@wdio/cli" dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]> Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
This reverts commit 179232f.
revert: "chore: remove unused import"
* fix: fix pinch to zoom * chore: format
* fix: make getSourceBlock nullable again * chore: format * chore: move to a specific error * chore: also update procedures with new error * chore: format
* chore: fix mutator blocks jumping * chore: format
Merge pull request google#6573 from cpcallen/blockly-9.0.1
Merge changes made in the master branch since the v9.0.0 release (specifically, updating the version number to 9.0.1 and correcting an error in renamings.json5) so as to reduce the liklihood of merge conflicts when we next release (by merging from develop to master). There were conflicts in * core/field_angle.ts * core/field_dropdown.ts * core/field_variable.ts that were due to having cherry-picked changes from develop into master for the 9.0.1 release; these were "resolved" by resetting those files to the develop version, since the "changes" thereby lost were just adapting the cherry-picks to fit code in master that had not had various intermediate PRs applied to it yet. Similarly, conflicts in blockly_compressed.js and .js.map were "resolved" by restting those files; I note that we could do a rebuild to update the pre-built files in develop but they will soon be deleted anyway, and in any case rebuilding them would not make them the same as the 9.0.1 release as many other PRs have landed in the meantime. A conflict in package-lock.json was resolved by resetting that file to the develop version and then running npm install to update package-lock.json with the change to the blockly version number.
github-actions
bot
added
PR: chore
rachel-fenichel
approved these changes
Oct 25, 2022
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.
The basics
npm run formatandnpm run lintThe details
Proposed Changes
Merge changes made in the master branch since the v9.0.0 release. This merges a substantial number of commits, but most are either rolled back by other later commits or are cherry-picks of changes already in
develop, leaving just two actual changes:renamings.json5.Reason for Changes
Keep
developup-to-date with respect to changes inmaster, and thereby reduce the likelihood of merge conflicts when we next release (i.e. merge fromdeveloptomaster).Additional Information
There were conflicts in
core/field_angle.tscore/field_dropdown.tscore/field_variable.tsthat were due to having cherry-picked changes from
developintomasterfor the 9.0.1 release; these were "resolved" by resetting those files to thedevelopversion, since the "changes" thereby lost were just adapting the cherry-picks to fit code inmasterthat had not had various intermediate PRs applied to it yet.Similarly, conflicts in
blockly_compressed.jsand.js.mapwere "resolved" by resetting those files; I note that we could do a rebuild to update the pre-built files indevelopbut they will soon be deleted anyway, and in any case rebuilding them would not make them the same as the 9.0.1 release as many other PRs have landed in the meantime.A conflict in
package-lock.jsonwas resolved by resetting that file to the develop version and then runningnpm installto updatepackage-lock.jsonwith the change to the blockly version number.