mirror of
https://github.com/google/blockly.git
synced 2026-01-10 02:17:09 +01:00
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:
@@ -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();
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -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'));
|
||||
|
||||
@@ -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));
|
||||
|
||||
Reference in New Issue
Block a user