Merge pull request react-bootstrap#621 from react-bootstrap/babelrc

Use .babelrc for babel configuration

Author: AlexKVal

.babelrc

@@ -0,0 +1,5 @@
+{
+  "optional": [
+    "es7.objectRestSpread"
+  ]
+}

karma.conf.js

@@ -1,5 +1,5 @@
 /* eslint no-var: 0 */
-require('./register-babel');
+require('babel/register');
 
 var webpackConfig = require('./webpack/test.config.js');
 var isCI = process.env.CONTINUOUS_INTEGRATION === 'true';
@@ -46,7 +46,7 @@ module.exports = function (config) {
     browsers: [ isCI ? 'PhantomJS' : 'Chrome' ],
 
     captureTimeout: 60000,
-    browserNoActivityTimeout: 30000,
+    browserNoActivityTimeout: 45000,
 
     singleRun: isCI
   });

package.json

@@ -8,14 +8,14 @@
   },
   "homepage": "http://react-bootstrap.github.io/",
   "scripts": {
-    "build": "node run-babel tools/build.js",
+    "build": "babel-node tools/build-cli.js",
     "test-watch": "karma start",
     "test": "npm run lint && npm run build && karma start --single-run",
     "lint": "eslint src test docs ie8 tools webpack karma.conf.js webpack.config.js webpack.docs.js",
-    "docs-build": "node run-babel tools/build.js --docs-only",
-    "docs": "node run-babel docs/server.js",
-    "docs-prod": "webpack --config webpack.docs.js -p --progress && NODE_ENV=production node run-babel docs/server.js",
-    "ie8": "node run-babel ie8/server.js"
+    "docs-build": "babel-node tools/build-cli.js --docs-only",
+    "docs": "babel-node docs/server.js",
+    "docs-prod": "webpack --config webpack.docs.js -p --progress && NODE_ENV=production babel-node docs/server.js",
+    "ie8": "babel-node ie8/server.js"
   },
   "main": "lib/index.js",
   "directories": {

register-babel.js

@@ -13,7 +13,7 @@ const bowerJson = path.join(bowerRoot, 'bower.json');
 const readme = path.join(__dirname, 'README.md');
 const license = path.join(repoRoot, 'LICENSE');
 
-const babelOptions = '--modules amd --optional es7.objectRestSpread';
+const babelOptions = '--modules amd';
 
 const factoriesDestination = path.join(bowerRoot, 'factories');
 
@@ -35,7 +35,7 @@ export default function BuildBower() {
     .then(() => fsp.mkdirs(factoriesDestination))
     .then(() => Promise.all([
       bowerConfig(),
-      generateFactories(babelOptions, factoriesDestination),
+      generateFactories(factoriesDestination, babelOptions),
       exec(`babel ${babelOptions} ${srcRoot} --out-dir ${bowerRoot}`),
       copy(readme, bowerRoot),
       copy(license, bowerRoot)

run-babel

@@ -0,0 +1,33 @@
+/* eslint no-process-exit: 0 */
+
+import 'colors';
+import build from './build';
+import docs from '../docs/build';
+import { setExecOptions } from './exec';
+
+import yargs from 'yargs';
+
+const argv = yargs
+  .option('docs-only', {
+    demand: false,
+    default: false
+  })
+  .option('verbose', {
+    demand: false,
+    default: false,
+    describe: 'Increased debug output'
+  })
+  .argv;
+
+setExecOptions(argv);
+
+let buildProcess = argv.docsOnly ? docs() : build();
+
+buildProcess
+  .catch(err => {
+    console.error(err.toString().red);
+    if (err.stack) {
+      console.error(err.stack.red);
+    }
+    process.exit(1);
+  });

tools/amd/build.js

@@ -1,62 +1,26 @@
-/* eslint no-process-exit: 0 */
-
 import 'colors';
 import bower from './amd/build';
 import lib from './lib/build';
-import docs from '../docs/build';
 import dist from './dist/build';
 import { copy } from './fs-utils';
 import { distRoot, bowerRoot } from './constants';
-import { exec, setExecOptions } from './exec';
-
-import yargs from 'yargs';
-
-const argv = yargs
-  .option('docs-only', {
-    demand: false,
-    default: false
-  })
-  .option('verbose', {
-    demand: false,
-    default: false,
-    describe: 'Increased debug output'
-  })
-  .argv;
+import { exec } from './exec';
 
-setExecOptions(argv);
-
-function forkAndBuildDocs(fork) {
+function forkAndBuildDocs(verbose) {
   console.log('Building: '.cyan + 'docs'.green);
 
-  let options = argv.verbose ? ' -- --verbose' : '';
+  let options = verbose ? ' -- --verbose' : '';
 
   return exec(`npm run docs-build${options}`)
     .then(() => console.log('Built: '.cyan + 'docs'.green));
 }
 
-export default function Build(noExitOnFailure) {
-  if (argv.docsOnly) {
-    return docs();
-  } else {
-    let result = Promise.all([
+export default function Build(verbose) {
+  return Promise.all([
       lib(),
       bower(),
       dist(),
-      forkAndBuildDocs()
+      forkAndBuildDocs(verbose)
     ])
     .then(() => copy(distRoot, bowerRoot));
-
-    if (!noExitOnFailure) {
-      result = result
-        .catch(err => {
-          console.error(err.toString().red);
-          if (err.stack) {
-            console.error(err.stack.red);
-          }
-          process.exit(1);
-        });
-    }
-
-    return result;
-  }
 }

tools/build-cli.js

@@ -9,7 +9,7 @@ const templatePath = path.join(srcRoot, 'templates');
 const factoryTemplatePath = path.join(templatePath, 'factory.js.template');
 const indexTemplatePath = path.join(templatePath, 'factory.index.js.template');
 
-export default function generateFactories(babelOptions, destination) {
+export default function generateFactories(destination, babelOptions='') {
 
   let generateCompiledFile = function (file, content) {
     let outpath = path.join(destination, `${file}.js`);

tools/build.js

@@ -6,16 +6,15 @@ import { srcRoot, libRoot } from '../constants';
 import generateFactories from '../generateFactories';
 
 const factoryDestination = path.join(libRoot, 'factories');
-const babelOptions = '--optional es7.objectRestSpread';
 
 export default function BuildCommonJs() {
   console.log('Building: '.cyan + 'npm module'.green);
 
   return exec(`rimraf ${libRoot}`)
     .then(() => fsp.mkdirs(factoryDestination))
     .then(() => Promise.all([
-      generateFactories(babelOptions, factoryDestination),
-      exec(`babel ${babelOptions} ${srcRoot} --out-dir ${libRoot}`)
+      generateFactories(factoryDestination),
+      exec(`babel ${srcRoot} --out-dir ${libRoot}`)
     ]))
     .then(() => console.log('Built: '.cyan + 'npm module'.green));
 }