mirror of
https://github.com/google/blockly.git
synced 2026-01-09 01:50: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.
107 lines
2.7 KiB
JavaScript
107 lines
2.7 KiB
JavaScript
/**
|
|
* @license
|
|
* Copyright 2020 Google LLC
|
|
* SPDX-License-Identifier: Apache-2.0
|
|
*/
|
|
|
|
/**
|
|
* Test case configuration.
|
|
* @record
|
|
*/
|
|
export class TestCase {
|
|
/**
|
|
* Class for a test case configuration.
|
|
*/
|
|
constructor() {
|
|
/**
|
|
* @type {string} The title for the test case.
|
|
*/
|
|
this.title;
|
|
/**
|
|
* @type {boolean|undefined} Whether this test case should be skipped.
|
|
* Used to skip buggy test case and should have an associated bug.
|
|
*/
|
|
this.skip;
|
|
/**
|
|
* @type {boolean|undefined} Whether this test case should be called as
|
|
* only. Used for debugging.
|
|
*/
|
|
this.only;
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Test suite configuration.
|
|
* @record
|
|
* @template {TestCase} T
|
|
* @template {TestSuite} U
|
|
*/
|
|
export class TestSuite {
|
|
/**
|
|
* Class for a test suite configuration.
|
|
*/
|
|
constructor() {
|
|
/**
|
|
* @type {string} The title for the test case.
|
|
*/
|
|
this.title;
|
|
/**
|
|
* @type {?Array<T>} The associated test cases.
|
|
*/
|
|
this.testCases;
|
|
/**
|
|
* @type {?Array<U>} List of nested inner test suites.
|
|
*/
|
|
this.testSuites;
|
|
/**
|
|
* @type {boolean|undefined} Whether this test suite should be skipped.
|
|
* Used to skip buggy test case and should have an associated bug.
|
|
*/
|
|
this.skip;
|
|
/**
|
|
* @type {boolean|undefined} Whether this test suite should be called as
|
|
* only. Used for debugging.
|
|
*/
|
|
this.only;
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Runs provided test cases.
|
|
* @template {TestCase} T
|
|
* @param {!Array<T>} testCases The test cases to run.
|
|
* @param {function(T):Function} createTestCallback Creates test
|
|
* callback using given test case.
|
|
*/
|
|
export function runTestCases(testCases, createTestCallback) {
|
|
testCases.forEach((testCase) => {
|
|
let testCall = testCase.skip ? test.skip : test;
|
|
testCall = testCase.only ? test.only : testCall;
|
|
testCall(testCase.title, createTestCallback(testCase));
|
|
});
|
|
}
|
|
|
|
/**
|
|
* Runs provided test suite.
|
|
* @template {TestCase} T
|
|
* @template {TestSuite<T, U>} U
|
|
* @param {Array<!U>} testSuites The test suites to run.
|
|
* @param {function(!U):(function(T):!Function)
|
|
* } createTestCaseCallback Creates test case callback using given test
|
|
* suite.
|
|
*/
|
|
export function runTestSuites(testSuites, createTestCaseCallback) {
|
|
testSuites.forEach((testSuite) => {
|
|
let suiteCall = testSuite.skip ? suite.skip : suite;
|
|
suiteCall = testSuite.only ? suite.only : suiteCall;
|
|
suiteCall(testSuite.title, function () {
|
|
if (testSuite.testSuites && testSuite.testSuites.length) {
|
|
runTestSuites(testSuite.testSuites, createTestCaseCallback);
|
|
}
|
|
if (testSuite.testCases && testSuite.testCases.length) {
|
|
runTestCases(testSuite.testCases, createTestCaseCallback(testSuite));
|
|
}
|
|
});
|
|
});
|
|
}
|