feat!: upgrade all plugins to use Blockly v11 #2367
Merged
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
* chore: install beta * fix: align reference * fix: add serialization hooks to procedure models * fix: add deserialization code to procedure models * fix: update to latest beta * chore: format * chore: lint * chore: format
…config.js` and `'blockly'` imports (google#2229) * chore(dev-scripts)!: Remove support acquiring Blockly through git Completes revert of PR google#335. BREAKING CHANGE: This PR removes the support that was added in PR google#335 for aquiring Blockly directly from a git:// URL. This feature was useful insofar as it enabled merging changes into blockly-samples that depend on changes in blockly that have not yet been published (even as a beta)—and still have tests pass. For this to work seamlessly, however, the code in webpack.config.js depended on a postinstall script that was removed in PR google#1630. When testing such PRs going forward use npm link for local testing and wait for changes to blockly to be published before merging the corresponding changes to samples—or wait for blockly to become a monorepo so both changes can be made in the same PR! Note that this change is breaking only to the dev-scripts plugin itself, and will not cause other plugins that use it as a dev dependency to experience a breaking change. * fix(dev-scripts): Restore packageJson for setting PACKAGE_NAME The commit which removed support for git:// URLS by completing the revert of PR google#335 removed the initialisation of packageJson (from the package.json of the plugin being built) which turns out to still be needed by a DefinePlugin call added later. * fix(dev-scripts): Don't use alias when resolving blockly PR google#226 addedd a resolve.alias for blockly to webpack.config.js. It is not entirely clear what the purpose of this was at the time, but it has the effect of treating imports of submodules (e.g. 'blockly/core') as if they were direct imports (e.g. of './node_modules/blockly/core.js'), causing webpack to ignore the blockly package's package.json file. This causes plugins to fail to build due to the introduction of an exports stanza in that file (and other related changes) in google/blockly#7822. * fix(dev-scripts): Exclude blockly from plugin bundles Fix bloat caused by some plugins depending on all of blockly (instead of just blockly/core), resulting in webpack including a copy of blockly in the bundled plugin becuase only the subpackage entrypoints were listed inthe externals stanza of webpack.config.js. This will also avoid certain problems that might occur due to apps using such bundled inadvertently containing two or more different copies of Blockly. Also fix the one plugin which did still have an unnecessary dependency on blockly intead of blockly/core. * refactor(dev-scripts): Introduce exists() for readability Currently webpack.conf.js is hard to understand. Attempt to improve readability by making some parts more DRY ("don't repeat yourself") and others more DAMP ("descriptive and meaningful phrases"). * fix(dev-scripts): Ignore more jsdom subdependencies Add bufferutils and utf-8-validate to IgnorePlugin config when building tests. These are optional dependencies of wd, which is itself a dependency of jsdom. Also refactor how plugins config is generated to improve readability. * refactor(dev-scripts): Simplify resolve.extensions There doesn't appear to be any reason not to include the '.ts' in resolve.extensions even for pure-JS plugins, but it is _necessary_ to include it in TS plugins. Since the default value for resolve.extensions is ['.js', '.json', '.wasm'] set it to ['.ts', '.js', '.json', '.wasm'] which gives priority to TS, then JS, then the other default extensions. Also add a helpful comment explaining the purpose of resolve.fallback. * fix(plugins): Build tests against 'blockly', not 'blockly/node' The latter has never been an advertised entrypoint, and will cease to be a valid entrypoint in v11 (see google/blockly#7822). Fortunately the 'blockly' entrypoint behaves the same as the 'blockly/node' entrypoint does in a node.js environment. * chore(plugins): Fix lint, formatting * fix(dev-tools): Have runSerializationTestSuite accept Blockly Have runSerializationTestSuite accept a second argument which is the Blockly object to use for XML serialization/deserialization. This works around an issue in blockly-samples that (following the deletion of the alias for blockly in webpack.config.js) causes tests using this function to fail due to having two copies of jsdom loaded, where each will reject DOM objects created by the other. See google#2229 (comment) for more details. * chore(typed-variable-modal): Skip failing test
Merge pull request google#2267 from BeksOmega/merge-master-v11
* work on fixing build * chore: fix keyboard nav tests * chore: fix suggested blocks
…oogle#2192) * fix: dynamic blocks finalizing connections when children are deleted * chore: jsdoc
* chore: update package.json to beta 7 * chore: update package locks
* feat: support keyboard navigation of flyout buttons * fix: linting errors and rebase
* feat: move backpack to use interface for backpackability * chore: PR comments * fix: nits * chore: update README * chore: use version number
* fix!: update the scroll options to work with v11 dragging * fix: remove unnecessary private properties * fix: naming and logs * chore: fixup readme * chore: clean up other uses of ScrollDragger
…le#2334) * Update blockly dependency from 11.0.0-beta.7 to 11.0.0-beta.9 * Disallow reenabling a call block with a disabled def.
Following the previous merge commit, the state of some of the package-lock.json files was not quite in sync with their corresponding package.json files. Running npm install fixed this and resulted in the two changes in this commit.
Merge pull request google#2348 from cpcallen/chore/merge-master
* fix: update keyboard nav to use proper getContents * fix: remove use of flyoutitem.type * chore: update to latest blockly beta * chore: format
* fix: stop using generateFieldTestBlocks for bitmap field * fix: stop using generateFieldTestBlock for HSV slider field * fix: stop using generateFieldTestBlocks for date field * fix: stop using generateFieldTestBlocks for the slider field * fix: stop using generateFieldTestBlocks for the angle field * fix: stop using generateFieldTestBlocks for dropdown grid field * chore: format
…oogle#2358) * fix: fix scroll-options base class * feat: convert scroll-options to typescript * fix: use method instead of private attribute * Add AutoScrollable interface * fix: remove cast to any * fix: wheel listener on the drag layer * fix: update readme and export interface * fix: switch to drag instead of moveDuringDrag
* fix: update react example to v11 beta and fix imports * fix: update svelte example to v11 beta and fix imports * fix: update vue3 example to v11 beta and fix imports * fix: use more specific imports for vue example * chore: tidy import * fix: update rollup demo to fix imports * fix: use blockly latest instead of beta in react * chore: format
BeksOmega
approved these changes
May 21, 2024
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
The details
This PR merges in changes from the
rc/v11.0.0branch of samples intomaster. It also updates the minimum version of all plugins and most examples to use Blockly v11 as the minimum required peer dependency and dev dependency.If you are a user of plugins, make sure you update to the latest major version of the plugins you use at the same time you update Blockly to v11. This will avoid "invalid peer dependency" problems. Any other breaking changes for a particular plugin will be noted in its
CHANGELOG.mdfile.To review
This PR is best reviewed commit-wise. The commits, in order:
rc/v11.0.0intomaster.field-bitmapplugin in master while in therc/v11branch, all the field plugins were updated to remove the field block generator test helper. I converted the new test block to the new format as part of this commit in order to resolve the conflict.package-lockandpackagebackpack-demo,react, andkeyboard-navigation-codelab, andcustom-tooltips-demoexamples have not been updated yet.theme-hackermodeplugin.dev-toolswhen the latter is published.dev-toolsis published, if that doesn't happen automatically.package-lock.jsonfile which shouldn't have been there.package-lock.jsonfile ofdev-scripts, which incorrectly contained some local dependencies.custom-tooltips-demoback to v10 for reasons listed above. It was mistakenly updated to begin with, causing peerdeps errors.field-datedidn't need this fix, but it doesn't appear tofield-bitmapandscroll-options-- those plugins were converted to ts but the dependency was never added, so we were just using random versions installed by other pluginsBlockly.ALIGN_RIGHTvalue inblock-plus-minusAfter this change, I've verified that the string
betadoes not appear in the repository except where expected (some non-blockly dependencies in package-lock files). I've also verified that all 41 plugins have been updated to use v11 in theirpackage.jsonandpackage-lock.jsonfiles.Before merging, I'll publish this branch on my local github pages to verify everything looks good. I have already verified that the sample app and the devsite-landing-demo pages look good locally.
This PR must be merged, not squashed