Skip to content

Revert "fix: bump the blockly peer dependency in dev-tools and remove version probing" #1190

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

Merged
BeksOmega merged 1 commit into from
Jul 15, 2022
Merged

Revert "fix: bump the blockly peer dependency in dev-tools and remove version probing" #1190

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion plugins/dev-tools/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
"blockly": "^8.0.0"
},
"peerDependencies": {
"blockly": ">=8 <9"
"blockly": ">=7 <9"
},
"publishConfig": {
"access": "public",
Expand Down
21 changes: 19 additions & 2 deletions plugins/dev-tools/src/block_test_helpers.mocha.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,8 +211,25 @@ export const runSerializationTestSuite = (testCases) => {
});
suite('xml round-trip', function() {
setup(function() {
sinon.stub(Blockly.utils.idGenerator.TEST_ONLY, 'genUid')
.returns('1');
// The genUid is undergoing change as part of the 2021Q3
// goog.module migration:
//
// - It is being moved from Blockly.utils to
// Blockly.utils.idGenerator (which itself is being renamed
// from IdGenerator).
// - For compatibility with changes to the module system (from
// goog.provide to goog.module and in future to ES modules),
// .genUid is now a wrapper around .TEST_ONLY.genUid, which
// can be safely stubbed by sinon or other similar
// frameworks in a way that will continue to work.
if (Blockly.utils.idGenerator &&
Blockly.utils.idGenerator.TEST_ONLY) {
sinon.stub(Blockly.utils.idGenerator.TEST_ONLY, 'genUid')
.returns('1');
} else {
// Fall back to stubbing original version on Blockly.utils.
sinon.stub(Blockly.utils, 'genUid').returns('1');
}
});

teardown(function() {
Expand Down
8 changes: 7 additions & 1 deletion plugins/dev-tools/src/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,13 @@ if (typeof window !== 'undefined') {

// Export Blockly into the global namespace to make it easier to debug from the
// console.
globalThis.Blockly = Blockly;
if (Blockly.utils.global) {
if (Blockly.utils.global.globalThis) {
Blockly.utils.global.globalThis.Blockly = Blockly;
} else {
Blockly.utils.global.Blockly = Blockly;
}
}

export {
addCodeEditor,
Expand Down
2 changes: 1 addition & 1 deletion plugins/eslint-config/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ module.exports = {
env: {
browser: true,
commonjs: true,
es2020: true,
es6: true,
node: true,
},

Expand Down