From 01c547f1df131ac885546c861ba5f9c49ce4ddd8 Mon Sep 17 00:00:00 2001 From: Jimmy Jia Date: Mon, 15 Jun 2015 14:25:05 -0400 Subject: [PATCH] [fixed] Do not use Babel cache for release build Fixes #840 --- docs/build.js | 7 +++++-- tools/build-cli.js | 9 ++++++++- tools/build.js | 13 +++++++------ tools/dist/build.js | 8 +++++--- tools/release-scripts/release.js | 6 ++++-- webpack/base.config.js | 33 +++++++++++++++++++------------- 6 files changed, 49 insertions(+), 27 deletions(-) diff --git a/docs/build.js b/docs/build.js index 6f9b8a666c..f167e47641 100644 --- a/docs/build.js +++ b/docs/build.js @@ -32,16 +32,19 @@ function generateHTML(fileName) { }); } -export default function BuildDocs({ dev }) { +export default function BuildDocs({useCache, dev}) { console.log('Building: '.cyan + 'docs'.green + (dev ? ' [DEV]'.grey : '')); + const useCacheOption = `--use-cache=${Boolean(useCache)}`; + const devOption = dev ? '' : '-p'; + return exec(`rimraf ${docsBuilt}`) .then(() => fsp.mkdir(docsBuilt)) .then(() => { let pagesGenerators = Root.getPages().map(generateHTML); return Promise.all(pagesGenerators.concat([ - exec(`webpack --config webpack.docs.js ${dev ? '' : '-p '}--bail`), + exec(`webpack --config webpack.docs.js ${useCacheOption} --bail ${devOption}`), copy(license, docsBuilt), copy(readmeSrc, readmeDest) ])); diff --git a/tools/build-cli.js b/tools/build-cli.js index 2ff0148967..204ed5cea5 100644 --- a/tools/build-cli.js +++ b/tools/build-cli.js @@ -8,10 +8,17 @@ import { setExecOptions } from './exec'; import yargs from 'yargs'; const argv = yargs + .help('h') .option('docs-only', { demand: false, default: false }) + .option('use-cache', { + type: 'boolean', + demand: false, + default: true, + describe: 'Use Babel cache when running webpack' + }) .option('verbose', { demand: false, default: false, @@ -26,7 +33,7 @@ const argv = yargs setExecOptions(argv); -let buildProcess = argv.docsOnly ? docs(argv) : build(); +let buildProcess = argv.docsOnly ? docs(argv) : build(argv); buildProcess .catch(err => { diff --git a/tools/build.js b/tools/build.js index d0e79ae53e..ee3a1bdbce 100644 --- a/tools/build.js +++ b/tools/build.js @@ -6,21 +6,22 @@ import { copy } from './fs-utils'; import { distRoot, bowerRoot } from './constants'; import { exec } from './exec'; -function forkAndBuildDocs(verbose) { +function forkAndBuildDocs({verbose, useCache}) { console.log('Building: '.cyan + 'docs'.green); - let options = verbose ? ' -- --verbose' : ''; + const verboseOption = verbose ? '--verbose' : ''; + const useCacheOption = `--use-cache=${Boolean(useCache)}`; - return exec(`npm run docs-build${options}`) + return exec(`npm run docs-build -- ${verboseOption} ${useCacheOption}`) .then(() => console.log('Built: '.cyan + 'docs'.green)); } -export default function Build(verbose) { +export default function Build({verbose, useCache} = {}) { return Promise.all([ lib(), bower(), - dist(), - forkAndBuildDocs(verbose) + dist({useCache}), + forkAndBuildDocs({verbose, useCache}) ]) .then(() => copy(distRoot, bowerRoot)); } diff --git a/tools/dist/build.js b/tools/dist/build.js index 27047db903..c47704fd27 100644 --- a/tools/dist/build.js +++ b/tools/dist/build.js @@ -1,13 +1,15 @@ import { exec } from '../exec'; import { distRoot } from '../constants'; -export default function BuildDistributable() { +export default function BuildDistributable({useCache}) { console.log('Building: '.cyan + 'distributable'.green); + const useCacheOption = `--use-cache=${Boolean(useCache)}`; + return exec(`rimraf ${distRoot}`) .then(() => Promise.all([ - exec('webpack --bail'), - exec('webpack --bail -p') + exec(`webpack ${useCacheOption} --bail`), + exec(`webpack ${useCacheOption} --bail -p`) ])) .then(() => console.log('Built: '.cyan + 'distributable'.green)); } diff --git a/tools/release-scripts/release.js b/tools/release-scripts/release.js index 927b11a0cb..26b81e351e 100644 --- a/tools/release-scripts/release.js +++ b/tools/release-scripts/release.js @@ -15,6 +15,7 @@ import { bowerRepo, bowerRoot, tmpBowerRepo, docsRoot, docsRepo, tmpDocsRepo } f const yargsConf = yargs .usage('Usage: $0 [--preid ]') + .help('h') .example('$0 minor --preid beta', 'Release with minor version bump with pre-release tag') .example('$0 major', 'Release with major version bump') .example('$0 major --dry-run', 'Release dry run with patch version bump') @@ -32,7 +33,7 @@ const yargsConf = yargs alias: 'n', demand: false, default: false, - describe: 'Execute command in dry run mode. Will not commit, tag, push, or publish anything. Userful for testing.' + describe: 'Execute command in dry run mode. Will not commit, tag, push, or publish anything. Useful for testing.' }) .option('verbose', { demand: false, @@ -66,7 +67,8 @@ preConditions() .then(v => { version = v; }) .then(() => addChangelog(version)) .then(() => { - return build(argv.verbose) + // useCache implicitly defaults to false here. + return build(argv) .catch(err => { console.log('Build failed, reverting version bump'.red); diff --git a/webpack/base.config.js b/webpack/base.config.js index bbcefeaa53..902ff6174f 100644 --- a/webpack/base.config.js +++ b/webpack/base.config.js @@ -3,28 +3,35 @@ import path from 'path'; import webpack from 'webpack'; import yargs from 'yargs'; -const babelCache = path.resolve(path.join(__dirname, '../.babel-cache')); - -if (!fs.existsSync(babelCache)) { - try { - fs.mkdirSync(babelCache); - } catch (err) { - if (err.code !== 'EEXIST') { - console.error(err.stack); - } - } -} - export const options = yargs .alias('p', 'optimize-minimize') .alias('d', 'debug') + .option('use-cache', { + type: 'boolean', + default: true + }) .option('port', { default: '8080', type: 'string' }) .argv; -export const jsLoader = `babel?cacheDirectory=${babelCache}`; +export let jsLoader = 'babel'; +if (options.useCache) { + const babelCache = path.resolve(path.join(__dirname, '../.babel-cache')); + + if (!fs.existsSync(babelCache)) { + try { + fs.mkdirSync(babelCache); + } catch (err) { + if (err.code !== 'EEXIST') { + console.error(err.stack); + } + } + } + + jsLoader += `?cacheDirectory=${babelCache}`; +} const baseConfig = { entry: undefined,