Upgrade babel to 7.0.0

Changing to scoped packages (@babel/...)
micromaomao · Aug 30, 2018 · 6fd85ba · 6fd85ba
1 parent f430300
commit 6fd85ba
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 12 deletions.
diff --git a/package.json b/package.json
@@ -8,7 +8,7 @@
     "install": "if [ -e binding.gyp ]; then node-gyp rebuild; fi",
     "prepare": "if [ -e webpack.config.js ]; then npm run webpack; fi",
     "webpack-dev": "NODE_ENV=development webpack --progress --colors --watch",
-    "webpack": "NODE_ENV=production webpack --progress --optimize-minimize --define process.env.NODE_ENV='\"production\"'; if [ $? -eq 0 ]; then echo OK.; else echo Failed.; fi",
+    "webpack": "NODE_ENV=production webpack --progress --optimize-minimize --define process.env.NODE_ENV='\"production\"'; if [ $? -eq 0 ]; then echo OK.; else echo Failed && exit 1.; fi",
     "test": "mocha --delay --exit",
     "coverage": "node_modules/.bin/istanbul cover -x \"**/dist-server/**\" --report lcovonly node_modules/.bin/_mocha -- --delay --exit -R spec",
     "coverage-html": "node_modules/.bin/istanbul cover -x \"**/dist-server/**\" node_modules/.bin/_mocha -- --delay --exit"
@@ -40,11 +40,11 @@
     "mongoose": ">=4.0.0"
   },
   "devDependencies": {
-    "babel-core": "^6.26.3",
+    "@babel/core": "^7.0.0",
     "babel-loader": "^8.0.0",
-    "babel-plugin-transform-react-jsx": "^6.24.1",
-    "babel-polyfill": "^6.26.0",
-    "babel-preset-env": "^1.7.0",
+    "@babel/plugin-transform-react-jsx": "^7.0.0",
+    "@babel/polyfill": "^7.0.0",
+    "@babel/preset-env": "^7.0.0",
     "css-loader": "^1.0.0",
     "elasticsearch": "^15.1.1",
     "es6-map": "^0.1.5",

diff --git a/view/clientrender.jsx b/view/clientrender.jsx
@@ -1,6 +1,6 @@
 'use strict'
 
-require('babel-polyfill')
+require('@babel/polyfill')
 require('fetch-polyfill')
 require('offline-plugin/runtime').install()
 require('fullscreen-api-polyfill')

diff --git a/webpack.config.js b/webpack.config.js
@@ -15,8 +15,8 @@ baseConfig = {
           {
             loader: 'babel-loader',
             options: {
-              presets: ['env'],
-              plugins: ['transform-react-jsx']
+              presets: ['@babel/preset-env'],
+              plugins: ['@babel/plugin-transform-react-jsx']
             }
           }
         ]
@@ -27,7 +27,7 @@ baseConfig = {
           {
             loader: 'babel-loader',
             options: {
-              presets: ['env']
+              presets: ['@babel/preset-env']
             }
           }
         ]
@@ -95,12 +95,12 @@ module.exports = [
             {
               loader: 'babel-loader',
               options: {
-                presets: [['env', {
+                presets: [['@babel/preset-env', {
                   targets: {
                     node: 'current'
                   }
                 }]],
-                plugins: ['transform-react-jsx']
+                plugins: ['@babel/plugin-transform-react-jsx']
               }
             }
           ]
@@ -111,7 +111,7 @@ module.exports = [
             {
               loader: 'babel-loader',
               options: {
-                presets: [['env', {
+                presets: [['@babel/preset-env', {
                   targets: {
                     node: 'current'
                   }