Skip to content

Commit b01a258

Browse files
taiontimdorr
authored andcommitted
Update Babel config (#3703)
* Update Babel config * Update for Babel 6.13.2 * Lint all the things * __DEV__ is a non-writable global
1 parent eda7d47 commit b01a258

File tree

5 files changed

+32
-21
lines changed

5 files changed

+32
-21
lines changed

.babelrc

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,16 @@
11
{
2-
"presets": ["react"],
2+
"presets": [
3+
"./tools/es2015Preset",
4+
"stage-1",
5+
"react"
6+
],
37
"plugins": ["dev-expression"],
48

59
"env": {
610
"cjs": {
7-
"presets": ["es2015-loose", "stage-1"],
811
"plugins": ["add-module-exports"]
912
},
10-
"es": {
11-
"presets": ["es2015-loose-native-modules", "stage-1"]
12-
},
1313
"test": {
14-
"presets": ["es2015-loose", "stage-1"],
1514
"plugins": ["istanbul"]
1615
}
1716
}

.eslintrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"extends": ["rackt", "plugin:react/recommended"],
33
"globals": {
4-
"__DEV__": true
4+
"__DEV__": false
55
},
66
"rules": {
77
"react/display-name": 0,

package.json

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@
1818
"build": "npm run build-cjs && npm run build-es",
1919
"build-cjs": "rimraf lib && cross-env BABEL_ENV=cjs babel ./modules -d lib --ignore '__tests__'",
2020
"build-es": "rimraf es6 && cross-env BABEL_ENV=es babel ./modules -d es6 --ignore '__tests__'",
21-
"build-umd": "cross-env BABEL_ENV=cjs NODE_ENV=development webpack modules/index.js umd/ReactRouter.js",
22-
"build-min": "cross-env BABEL_ENV=cjs NODE_ENV=production webpack -p modules/index.js umd/ReactRouter.min.js",
23-
"lint": "eslint modules examples *.js",
24-
"start": "cross-env BABEL_ENV=cjs node examples/server.js",
21+
"build-umd": "cross-env NODE_ENV=development webpack modules/index.js umd/ReactRouter.js",
22+
"build-min": "cross-env NODE_ENV=production webpack -p modules/index.js umd/ReactRouter.min.js",
23+
"lint": "eslint examples modules scripts tools *.js",
24+
"start": "node examples/server.js",
2525
"test": "npm run lint && npm run test-node && npm run test-browser",
2626
"test-browser": "cross-env NODE_ENV=test karma start",
2727
"test-node": "cross-env NODE_ENV=test mocha --compilers js:babel-register tests.node.js"
@@ -43,17 +43,15 @@
4343
},
4444
"devDependencies": {
4545
"babel-cli": "^6.11.4",
46-
"babel-core": "^6.11.4",
46+
"babel-core": "^6.13.2",
4747
"babel-eslint": "^6.1.2",
4848
"babel-loader": "^6.2.4",
4949
"babel-plugin-add-module-exports": "^0.2.1",
5050
"babel-plugin-dev-expression": "^0.2.1",
5151
"babel-plugin-istanbul": "^1.0.3",
52-
"babel-preset-es2015": "^6.9.0",
53-
"babel-preset-es2015-loose": "^7.0.0",
54-
"babel-preset-es2015-loose-native-modules": "^1.0.0",
52+
"babel-preset-es2015": "^6.13.2",
5553
"babel-preset-react": "^6.11.1",
56-
"babel-preset-stage-1": "^6.5.0",
54+
"babel-preset-stage-1": "^6.13.0",
5755
"babel-register": "^6.11.6",
5856
"bundle-loader": "^0.5.4",
5957
"codecov": "^1.0.1",

scripts/build.js

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
1-
var execSync = require('child_process').execSync
2-
var readFileSync = require('fs').readFileSync
3-
var prettyBytes = require('pretty-bytes')
4-
var gzipSize = require('gzip-size')
1+
/* eslint-disable no-console */
2+
3+
const execSync = require('child_process').execSync
4+
const readFileSync = require('fs').readFileSync
5+
const prettyBytes = require('pretty-bytes')
6+
const gzipSize = require('gzip-size')
57

68
function exec(command) {
7-
execSync(command, { stdio: [0, 1, 2] })
9+
execSync(command, { stdio: [ 0, 1, 2 ] })
810
}
911

1012
exec('npm run build')

tools/es2015Preset.js

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
const { buildPreset } = require('babel-preset-es2015')
2+
3+
const { BABEL_ENV } = process.env
4+
5+
module.exports = {
6+
presets: [
7+
[ buildPreset, {
8+
loose: true,
9+
modules: BABEL_ENV === 'es' ? false : 'commonjs'
10+
} ]
11+
]
12+
}

0 commit comments

Comments
 (0)