mirror of
https://github.com/google/blockly.git
synced 2026-01-10 02:17:09 +01:00
* feat(build): Make build tasks invoke their prerequisites
- Divide gulp targets into three kinds: main sequence,
manually invokable, and script-only. The first two categories
automatically invoke their prerequisites.
- Give (most of) the affected gulp targets shorter and more memorable
names that could become their npm script names in future.
* feat(build): Make package tasks invoke their prerequisites
Have the package task invoke the cleanBuildDir (as well as
cleanPackageDir) and build tasks. Remove the checkBuildDir
task as it is now redundant since a fresh build is done every
time.
* feat(build): Make git tasks invoke their prerequisites
* feat(build): Make cleanup, license [sic] tasks invoke their prerequisites
Turns out they don't have any, so this commit just classifies
their gulp targets according to the established scheme.
* feat(build): Make appengine tasks invoke their prerequisites
In this case prepareDeployDir will eventually depend on package
but does not for now.
* feat(build): Have npm scripts run npm ci first where applicable
Have any npm script that have external effects (e.g. publishing an
npm package, pushing a new version to appengine, or updating GitHub
Pages) start by running npm ci to ensure that all dependencies are
up-to-date with respect to package-lock.json.
(This is done by npm and not a gulp script because gulp itself
might need updating. So might npm, but that is less likely to
make any difference to what gets published/pushed.)
* chore(build): have tests use package target
Have the tests just run the package target (with debug flags)
since that runs the the build target automatically.
* feat(tests): Write Closure Compiler output directly to dist/
Since they are already UMD-wrapped, have Closure Compiler write
output chunks directly to RELEASE_DIR, i.e. dist/.
* chore(tests): Use freshly-build files in compressed mode.
Use the freshly-built build/*_compresssed.js files when bootstrapping
in compressed mode, rather than using the checked-in files in the
repository root.
This helps ensure that compressed and uncompressed mode will be
testing (as closely as possible) the same code.
Obsoletes #6218 (though the issues discussed there have not actually
yet been addressed in this branch).
* chore(build): Write intermediate langfiles to build/msg
Write the results of create_messages.py to build/msg instead of
build/msg/js.
* fix(build): Use build/msg/en.js instead of msg/messages.js in tests
This has no direct effect but fixes a long-standing misdesign
where we are testing against the input to, rather than the output
of, the language file processing pipeline.
* feat(demos): Use freshly-built files
Use the freshly-built dist/*_compresssed.js and build/msg/* files
rather than using the checked-in files in the repository root.
This helps ensure that these demos are using the most recent
version of Blockly (even in the develop branch).
* fix(build): Update appengine deployment to include built files
Modify the prepareDemos task as follows:
- Use the git index instead of HEAD, so that most local changes
will be applied (without copying whatever .gitignored cruft
might be in the local directory).
- Run clean and build and then copy build/msg and
dist/*_compressed.js* to the deploy directory.
This fixes the problem created by the previous commit, wherein the
demos relied on built files that were not being deployed to
appengine.
* fix(build): Update GitHub Pages deployment to include built files
Modify the updateGithubPages task to run clean and build and
then git add build/msg dist/*_compressed.js*, so that they will
be included in the deployed pages.
This fixes the problem created by the previous^2 commit,
wherein the demos relied on built files that were not being
deployed to GitHub Pages.
* chore(build): Remove build products from repository
Remove *_compressed.js* and msg/js/* from the blockly repository.
Also remove the now-obsolete checkinBuilt gulp task.
* chore(build): Apply relevant changes to test_tasks.js
Apply changes made to run_all_tests.sh and check_metadata.sh to
the corresponding parts of their JS replacements in
test_tasks.js.
* chore(build): Make updates suggested in PR #6475
- Remove `clean:builddir` and `clean:releasedir` - `clean`
is sufficient.
- Remove duplicate `require` from `appengine_tasks.js`.
* feat(build): Use shorter npm script names
Since scripts that run build tasks now automatically run their
prerequisite tasks, the previous naming scheme of task `build`
running all the `build:subtask`s no longe really makes very
much sense.
Additionally, following a chat discussion, there seems to be a
rough consensus to use "messages" to refer to the .json input
files, and "langfiles" to the generated .js output files.
Consequently, simplify npm script names by renaming as follows:
- "generate:langfiles" -> "messages"
- "build:langfiles" -> "langfiles"
- "build:js" -> "tsc"
- "build:deps" -> "deps"
- "build:compiled" -> "minify"
- "build:compressed": delete this synonym for "build:compiled",
("minify" was chosen as agnostic to Closure Compiler vs. WebPack.)
* chores(build): Add deprecation notice for old scripts
To reduce potential confusion/frustration, restore the previous
npm scripts but have them display a deprecation notice instead
(note that npm prints the script contents before running it, so
echo is not needed).
* docs(build): Add comments distinguishing 'messages' from 'langfiles'
175 lines
4.6 KiB
JavaScript
175 lines
4.6 KiB
JavaScript
/**
|
|
* @license
|
|
* Copyright 2020 Google LLC
|
|
* SPDX-License-Identifier: Apache-2.0
|
|
*/
|
|
|
|
/**
|
|
* @fileoverview Gulp script to deploy Blockly demos on appengine.
|
|
*/
|
|
|
|
var gulp = require('gulp');
|
|
|
|
var fs = require('fs');
|
|
var rimraf = require('rimraf');
|
|
var path = require('path');
|
|
var execSync = require('child_process').execSync;
|
|
const buildTasks = require('./build_tasks.js');
|
|
const packageTasks = require('./package_tasks.js');
|
|
|
|
var packageJson = require('../../package.json');
|
|
const demoTmpDir = '../_deploy';
|
|
const demoStaticTmpDir = '../_deploy/static';
|
|
|
|
/**
|
|
* Cleans and creates the tmp directory used for deploying.
|
|
*/
|
|
function prepareDeployDir(done) {
|
|
// Clean directory if exists.
|
|
if (fs.existsSync(demoTmpDir)) {
|
|
rimraf.sync(demoTmpDir);
|
|
}
|
|
fs.mkdirSync(demoStaticTmpDir, {recursive: true});
|
|
done();
|
|
}
|
|
|
|
/**
|
|
* Copies all files from current git index into static deploy
|
|
* directory. We do this rather than just copying the working tree,
|
|
* because the working tree is probably full of leftover editor
|
|
* backup-save files, vesigial empty directories, etc.
|
|
*/
|
|
function copyStaticSrc(done) {
|
|
execSync(`GIT_WORK_TREE='${demoStaticTmpDir}' git checkout-index --all`,
|
|
{ stdio: 'inherit' });
|
|
done();
|
|
}
|
|
|
|
/**
|
|
* Copies needed built files into the static deploy directory.
|
|
*
|
|
* Prerequisite: clean, build.
|
|
*/
|
|
function copyBuilt(done) {
|
|
return gulp.src(['build/msg/**/*', 'dist/*_compressed.js*'], {base: '.'})
|
|
.pipe(gulp.dest(demoTmpDir));
|
|
}
|
|
|
|
/**
|
|
* Copies appengine files into deploy directory.
|
|
*/
|
|
function copyAppengineSrc() {
|
|
const appengineSrc = [
|
|
`${demoStaticTmpDir}/appengine/**/*`,
|
|
`${demoStaticTmpDir}/appengine/.gcloudignore`,
|
|
];
|
|
return gulp.src(appengineSrc).pipe(gulp.dest(demoTmpDir));
|
|
}
|
|
|
|
/**
|
|
* Copies playground deps into deploy directory.
|
|
*/
|
|
function copyPlaygroundDeps() {
|
|
const playgroundDeps = [
|
|
'./node_modules/@blockly/dev-tools/dist/index.js',
|
|
'./node_modules/@blockly/theme-modern/dist/index.js',
|
|
'./node_modules/@blockly/block-test/dist/index.js',
|
|
];
|
|
return gulp.src(playgroundDeps, {base: '.'}).pipe(gulp.dest(demoStaticTmpDir));
|
|
}
|
|
|
|
/**
|
|
* Deploys files from tmp directory to appengine to version based on the version
|
|
* passed in and then cleans the tmp directory.
|
|
*/
|
|
function deployToAndClean(demoVersion) {
|
|
try {
|
|
execSync(`gcloud app deploy --project blockly-demo --version ${demoVersion} --no-promote`, { stdio: 'inherit', cwd: demoTmpDir });
|
|
} finally {
|
|
// Clean up tmp directory.
|
|
if (fs.existsSync(demoTmpDir)) {
|
|
rimraf.sync(demoTmpDir);
|
|
}
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Constructs a demo version name based on the version specified in
|
|
* package.json.
|
|
*/
|
|
function getDemosVersion() {
|
|
const minorVersion = packageJson.version.split('.')[1];
|
|
const patchVersion = packageJson.version.split('.')[2];
|
|
let demoVersion = minorVersion;
|
|
if (patchVersion !== 0) {
|
|
demoVersion += '-' + patchVersion;
|
|
}
|
|
return demoVersion;
|
|
}
|
|
|
|
/**
|
|
* Deploys files from tmp directory to appengine to version based on the version
|
|
* specified in package.json and then cleans the tmp directory.
|
|
*/
|
|
function deployAndClean(done) {
|
|
const demoVersion = getDemosVersion();
|
|
deployToAndClean(demoVersion);
|
|
done();
|
|
}
|
|
|
|
/**
|
|
* Constructs a beta demo version name based on the current date.
|
|
*/
|
|
function getDemosBetaVersion() {
|
|
var date = new Date();
|
|
var mm = date.getMonth() + 1; // Month, 0-11
|
|
var dd = date.getDate(); // Day of the month, 1-31
|
|
var yyyy = date.getFullYear();
|
|
return `${yyyy}${mm < 10 ? '0' + mm : mm}${dd}-beta`;
|
|
}
|
|
|
|
/**
|
|
* Deploys files from tmp directory to appengine to a beta version based on the
|
|
* current date and then cleans the tmp directory.
|
|
*/
|
|
function deployBetaAndClean(done) {
|
|
const demoVersion = getDemosBetaVersion();
|
|
deployToAndClean(demoVersion);
|
|
done();
|
|
}
|
|
|
|
/**
|
|
* Prepares demos.
|
|
*
|
|
* Prerequisites (invoked): clean, build
|
|
*/
|
|
const prepareDemos = gulp.series(
|
|
prepareDeployDir,
|
|
gulp.parallel(
|
|
gulp.series(
|
|
copyStaticSrc,
|
|
copyAppengineSrc),
|
|
gulp.series(
|
|
gulp.parallel(buildTasks.cleanBuildDir,
|
|
packageTasks.cleanReleaseDir),
|
|
buildTasks.build,
|
|
copyBuilt),
|
|
copyPlaygroundDeps));
|
|
|
|
/**
|
|
* Deploys demos.
|
|
*/
|
|
const deployDemos = gulp.series(prepareDemos, deployAndClean);
|
|
|
|
/**
|
|
* Deploys beta version of demos (version appended with -beta).
|
|
*/
|
|
const deployDemosBeta = gulp.series(prepareDemos, deployBetaAndClean);
|
|
|
|
module.exports = {
|
|
// Main sequence targets. Each should invoke any immediate prerequisite(s).
|
|
deployDemos: deployDemos,
|
|
deployDemosBeta: deployDemosBeta,
|
|
prepareDemos: prepareDemos
|
|
};
|