Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

🏗 Remove --eager_build flag from gulp #24948

Merged
merged 1 commit into from
Oct 8, 2019
Merged

🏗 Remove --eager_build flag from gulp #24948

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
31 changes: 6 additions & 25 deletions build-system/tasks/build.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
* limitations under the License.
*/

const argv = require('minimist')(process.argv.slice(2));
const log = require('fancy-log');
const {
bootstrapThirdPartyFrames,
Expand Down Expand Up @@ -60,21 +59,11 @@ async function build() {
*/
function printDefaultTaskHelp() {
log(green('Running the default ') + cyan('gulp ') + green('task.'));
const defaultTaskMessage =
green('⤷ JS and extensions will be ') +
log(
green(
argv.eager_build
? 'built after server startup.'
: 'lazily built when requested from the server.'
);
log(defaultTaskMessage);
if (!argv.eager_build) {
const eagerBuildMessage =
green('⤷ Use ') +
cyan('--eager_build ') +
green('to build JS and extensions after server startup.');
log(eagerBuildMessage);
}
'⤷ JS and extensions will be lazily built when requested from the server.'
)
);
}

/**
Expand Down Expand Up @@ -113,16 +102,10 @@ async function defaultTask() {
process.env.NODE_ENV = 'development';
printConfigHelp('gulp');
printDefaultTaskHelp();
parseExtensionFlags(/* preBuild */ !argv.eager_build);
parseExtensionFlags(/* preBuild */ true);
await performPrerequisiteSteps(/* watch */ true);
await serve();
if (!argv.eager_build) {
log(green('JS and extensions will be lazily built when requested...'));
} else {
log(green('Building JS and extensions...'));
await compileAllUnminifiedJs(/* watch */ true);
await buildExtensions({watch: true});
}
log(green('JS and extensions will be lazily built when requested...'));
}

module.exports = {
Expand Down Expand Up @@ -153,8 +136,6 @@ watch.flags = {
defaultTask.description =
'Starts the dev server and lazily builds JS and extensions when requested';
defaultTask.flags = {
eager_build:
' Starts the dev server and builds JS and extensions after server startup',
config: ' Sets the runtime\'s AMP_CONFIG to one of "prod" or "canary"',
extensions: ' Watches and builds only the listed extensions.',
extensions_from:
Expand Down
4 changes: 2 additions & 2 deletions build-system/tasks/serve.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ function getMiddleware() {
if (argv.cache) {
middleware.push(header({'cache-control': 'max-age=600'}));
}
if (!argv._.includes('serve') && !argv.eager_build) {
if (!argv._.includes('serve')) {
middleware.push(lazyBuildExtensions);
middleware.push(lazyBuildJs);
}
Expand Down Expand Up @@ -134,7 +134,7 @@ function restartServer() {
* Initiates pre-build steps requested via command line args.
*/
function initiatePreBuildSteps() {
if (!argv._.includes('serve') && !argv.eager_build) {
if (!argv._.includes('serve')) {
preBuildCoreRuntime();
if (argv.extensions || argv.extensions_from) {
preBuildSomeExtensions();
Expand Down