CodingPirates/blockly
1
0
Fork 0
mirror of https://github.com/google/blockly.git synced 2026-01-07 09:00:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

chore(build,tests): Remove obsolete kludges / config options (#6835)

Browse Source 
* chore(tests): Remove circular import loading issue kludge

  Prior to PR #6818, circular imports resulted in the debug module
  loader (in closure/goog/base.js) failing to record the
  goog.module ID of most modules that were
  involved in the cycle, and in particular of the Blockly.Xml
  module.  This had secondary fallout that resulted
  in library blocks modules being loaded in the wrong order.

  A kludge was introduced in PR #6703 that worked around this
  problem by making sure that window.Blockly was set, allowing
  the modules loaded out-of-order to still work.

  Now that we have removed all remaining circular dependencies
  there is no need for the kludge, since all module IDs are
  properly recorded and modules are loaded in the correct order.

* chore(build): Remove exclude for non-existent core/blockly.js

  There was a transitional period where we had both
  core/blockly.ts and core/blockly.js, and wished to exclude
  the latter from tsc's input, but the latter file was deleted
  (and inadvertently restored, then re-deleted) some time ago.
This commit is contained in:
Christopher Allen
2023-02-08 10:56:35 +00:00
committed by GitHub
parent 72b2af2100
commit d83dcfbe2e
2 changed files with 0 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
tests/bootstrap_helper.js vendored
View File

@@ -21,20 +21,6 @@
// Force debug module loader to finish loading all modules. // Force debug module loader to finish loading all modules.
for (const require of info.requires) { for (const require of info.requires) {
goog.require(require); goog.require(require);
// This is a kludge to work around an issue where attempting to
// load Blockly.libraryBlocks (blocks/blocks.js) fails if the
// Blockly global variable is not defined.
//
// This is apparently because the debug module loader fails to
// load Blockly.libraryBlocks.lists (blocks/lists.js) and
// .procedures (blocks/procedures.js) first, despite they both
// being required from blocks.js, and that is apparently because
// they both depend on Blockly.Xml which the debug loader seems
// to think has not been loaded yet even though it has.
if (require === 'Blockly') {
window.Blockly = goog.module.get('Blockly');
}
} }
} }

3
tsconfig.json
View File

@@ -3,9 +3,6 @@
"core/**/*", // N.B.: also pulls in closure/goog/goog.js if needed. "core/**/*", // N.B.: also pulls in closure/goog/goog.js if needed.
"closure/**/*", // Just for ouptut directory structure. "closure/**/*", // Just for ouptut directory structure.
], ],
"exclude": [
"core/blockly.js"
],
"compilerOptions": { "compilerOptions": {
// Tells TypeScript to read JS files, as // Tells TypeScript to read JS files, as
// normally they are ignored as source files // normally they are ignored as source files