wip

shakacode · Sep 12, 2018 · 32a6366 · 32a6366
1 parent d8304fe
commit 32a6366
Show file tree

Hide file tree

Showing 7 changed files with 1,926 additions and 2,430 deletions.
diff --git a/spec/dummy_no_webpacker/client/.babelrc b/spec/dummy_no_webpacker/client/.babelrc
@@ -1,3 +1,3 @@
 {
-  "presets": ["es2015", "stage-2", "react"]
+  "presets": ["@babel/preset-env", "@babel/preset-react"]
 }
diff --git a/spec/dummy_no_webpacker/client/app/startup/clientRegistration.jsx b/spec/dummy_no_webpacker/client/app/startup/clientRegistration.jsx
@@ -1,4 +1,4 @@
-import 'babel-polyfill';
+import '@babel/polyfill';
 import 'es5-shim';
 
 import ReactOnRails from 'react-on-rails';

diff --git a/spec/dummy_no_webpacker/client/app/startup/serverRegistration.jsx b/spec/dummy_no_webpacker/client/app/startup/serverRegistration.jsx
@@ -1,4 +1,4 @@
-import 'babel-polyfill';
+import '@babel/polyfill';
 import 'es5-shim';
 
 // Shows the mapping from the exported object to the name used by the server rendering.

diff --git a/spec/dummy_no_webpacker/client/package.json b/spec/dummy_no_webpacker/client/package.json
@@ -8,15 +8,14 @@
   },
   "main": "js/app.js",
   "dependencies": {
+    "@babel/cli": "^7.0.0",
+    "@babel/core": "^7.0.0",
+    "@babel/polyfill": "^7.0.0",
+    "@babel/preset-env": "^7.0.0",
+    "@babel/preset-react": "^7.0.0",
+    "@babel/runtime": "^7.0.0",
     "autoprefixer": "^7.1.2",
-    "babel-cli": "^6.24.1",
-    "babel-core": "^6.25.0",
-    "babel-loader": "^7.1.1",
-    "babel-polyfill": "^6.23.0",
-    "babel-preset-es2015": "^6.24.1",
-    "babel-preset-react": "^6.24.1",
-    "babel-preset-stage-2": "^6.24.1",
-    "babel-runtime": "^6.25.0",
+    "babel-loader": "^8.0.2",
     "css-loader": "^0.28.4",
     "es5-shim": "^4.5.9",
     "expose-loader": "^0.7.3",
@@ -29,7 +28,7 @@
     "loader-utils": "^1.1.0",
     "lodash": "^4.17.4",
     "node-libs-browser": "^2.0.0",
-    "node-sass": "^4.5.3",
+    "node-sass": "^4.9.3",
     "postcss-loader": "^1.3.3",
     "react": "^15.6.1",
     "react-dom": "^15.6.1",
@@ -51,7 +50,6 @@
     "webpack-merge": "^4.1.0"
   },
   "devDependencies": {
-    "babel-plugin-react-transform": "^2.0.2",
     "body-parser": "^1.17.1",
     "eslint": "^3.19.0",
     "eslint-config-shakacode": "^15.0.0",

diff --git a/spec/dummy_no_webpacker/client/webpack.client.js b/spec/dummy_no_webpacker/client/webpack.client.js
@@ -4,7 +4,7 @@ module.exports = {
   entry: [
     'es5-shim/es5-shim', // for poltergeist
     'es5-shim/es5-sham', // for poltergeist
-    'babel-polyfill',
+    '@babel/polyfill',
     'jquery',
     'jquery-ujs',
     'startup/clientRegistration',

diff --git a/spec/dummy_no_webpacker/client/webpack.server.js b/spec/dummy_no_webpacker/client/webpack.server.js
@@ -2,7 +2,7 @@ const path = require('path');
 
 module.exports = {
   entry: [
-    'babel-polyfill',
+    '@babel/polyfill',
     'startup/serverRegistration',
   ],
   output: {