Merge branch 'develop' into goog.module-prep

This resolves a conflict in `blockly_uncompressed.js`, and missing
updates to `test/deps.js`, caused by PR #5041.
This commit is contained in:
Christopher Allen
2021-07-13 22:16:35 +01:00
60 changed files with 12865 additions and 691 deletions

View File

@@ -28,8 +28,8 @@ function prepareDeployDir(done) {
if (fs.existsSync(demoTmpDir)) {
rimraf.sync(demoTmpDir);
}
fs.mkdirSync(demoStaticTmpDir, { recursive: true });
done()
fs.mkdirSync(demoStaticTmpDir, {recursive: true});
done();
}
/**

View File

@@ -383,9 +383,8 @@ this removal!
*/
function buildLangfiles(done) {
// Create output directory.
// TODO(#5000): does mkidr -p work on Windows?
const outputDir = path.join(BUILD_DIR, 'msg', 'js');
execSync(`mkdir -p ${outputDir}`, {stdio: 'inherit'});
fs.mkdirSync(outputDir, {recursive: true});
// Run create_messages.py.
let json_files = fs.readdirSync(path.join('msg', 'json'));

View File

@@ -374,7 +374,7 @@ function packageJSON(cb) {
const json = Object.assign({}, packageJson);
delete json['scripts'];
if (!fs.existsSync(RELEASE_DIR)) {
fs.mkdirSync(RELEASE_DIR);
fs.mkdirSync(RELEASE_DIR, {recursive: true});
}
fs.writeFileSync(`${RELEASE_DIR}/package.json`,
JSON.stringify(json, null, 2));