mirror of
https://github.com/google/blockly.git
synced 2026-01-07 17:10:11 +01:00
6f20ac290d
* fix(build): Have buildShims clean up up after itself
We need to create a build/package.json file to allow node.js to
load build/src/core/blockly.js and the other chunk entry points
as ES modules (it forcibly assumes .js means CJS even if one is
trying to import, unless package.json says {"type": "module"}),
but this interferes with scripts/migration/js2ts doing a
require('build/deps.js'), which is _not_ an ES module.
Specific error message was:
/Users/cpcallen/src/blockly/scripts/migration/js2ts:56
require(path.resolve(__dirname, '../../build/deps.js'));
^
Error [ERR_REQUIRE_ESM]: require() of ES Module
/Users/cpcallen/src/blockly/build/deps.js from /Users/cpcallen/src/blockly/scripts/migration/js2ts
not supported.
deps.js is treated as an ES module file as it is a .js file whose
nearest parent package.json contains "type": "module" which
declares all .js files in that package scope as ES modules.
Instead rename deps.js to end in .cjs, change the requiring code
to use dynamic import() which is available in all CommonJS
modules, or change "type": "module" to "type": "commonjs" in
/Users/cpcallen/src/blockly/build/package.json to treat all .js
files as CommonJS (using .mjs for all ES modules instead).
at Object.<anonymous> (/Users/cpcallen/src/blockly/scripts/migration/js2ts:56:1) {
code: 'ERR_REQUIRE_ESM'
}
* chore(tests): Reorder to put interesting script nearer top of file
* chore(tests): Add missing imports of closure/goog/goog.js
These modules were depending on being loaded via the
debug module loader, which cannot be used without first loading
base.js as a script, and thereby defining goog.declareModuleId
as a side effect—but if they are to be loaded via direct import
statements then they need to actually import their own
dependencies.
This is a temporary measure as soon the goog.declareMouleId
calls can themselves be deleted.
* refactor(tests): Use import instead of bootstrap to load Blockly
* chores(build): Stop generating deps.mocha.js
This file was only needed by tests/mocha/index.html's use of
the debug module loader (via bootstrap.js), which has now been
removed.
* chore(tests): Remove unneeded goog.declareModuleId calls
These were only needed because these modules were previously
being loaded by goog.require and/or goog.bootstrap.
* chores(tests): Remove dead code
We are fully committed to proper modules now.
82 lines
2.4 KiB
JavaScript
82 lines
2.4 KiB
JavaScript
/**
|
|
* @license
|
|
* Copyright 2019 Google LLC
|
|
* SPDX-License-Identifier: Apache-2.0
|
|
*/
|
|
|
|
/**
|
|
* Captures the strings sent to console.warn() when calling a function.
|
|
* Copies from core.
|
|
* @param {Function} innerFunc The function where warnings may called.
|
|
* @return {Array<string>} The warning messages (only the first arguments).
|
|
*/
|
|
export function captureWarnings(innerFunc) {
|
|
const msgs = [];
|
|
const nativeConsoleWarn = console.warn;
|
|
try {
|
|
console.warn = function (msg) {
|
|
msgs.push(msg);
|
|
};
|
|
innerFunc();
|
|
} finally {
|
|
console.warn = nativeConsoleWarn;
|
|
}
|
|
return msgs;
|
|
}
|
|
|
|
/**
|
|
* Asserts that the given function logs the provided warning messages.
|
|
* @param {function()} innerFunc The function to call.
|
|
* @param {Array<!RegExp>|!RegExp} messages A list of regex for the expected
|
|
* messages (in the expected order).
|
|
*/
|
|
export function assertWarnings(innerFunc, messages) {
|
|
if (!Array.isArray(messages)) {
|
|
messages = [messages];
|
|
}
|
|
const warnings = captureWarnings(innerFunc);
|
|
chai.assert.lengthOf(warnings, messages.length);
|
|
messages.forEach((message, i) => {
|
|
chai.assert.match(warnings[i], message);
|
|
});
|
|
}
|
|
|
|
/**
|
|
* Asserts that the given function logs no warning messages.
|
|
* @param {function()} innerFunc The function to call.
|
|
*/
|
|
export function assertNoWarnings(innerFunc) {
|
|
assertWarnings(innerFunc, []);
|
|
}
|
|
|
|
/**
|
|
* Stubs Blockly.utils.deprecation.warn call.
|
|
* @return {!SinonStub} The created stub.
|
|
*/
|
|
export function createDeprecationWarningStub() {
|
|
return sinon.stub(Blockly.utils.deprecation, 'warn');
|
|
}
|
|
|
|
/**
|
|
* Asserts whether the given deprecation warning stub or call was called with
|
|
* the expected functionName.
|
|
* @param {!SinonSpy|!SinonSpyCall} spyOrSpyCall The spy or spy call to use.
|
|
* @param {string} functionName The function name to check that the given spy or
|
|
* spy call was called with.
|
|
*/
|
|
export function assertDeprecationWarningCall(spyOrSpyCall, functionName) {
|
|
sinon.assert.calledWith(spyOrSpyCall, functionName);
|
|
}
|
|
|
|
/**
|
|
* Asserts that there was a single deprecation warning call with the given
|
|
* functionName passed.
|
|
* @param {!SinonSpy} spy The spy to use.
|
|
* @param {string} functionName The function name to check that the given spy
|
|
* was called with.
|
|
*/
|
|
export function assertSingleDeprecationWarningCall(spy, functionName) {
|
|
sinon.assert.calledOnce(spy);
|
|
assertDeprecationWarningCall(spy.getCall(0), functionName);
|
|
}
|