Skip to content

Commit 93b25f4

Browse files
committed
wip
1 parent c942181 commit 93b25f4

7 files changed

Lines changed: 1951 additions & 2431 deletions

File tree

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
11
{
2-
"presets": ["es2015", "stage-2", "react"]
2+
"presets": [
3+
"@babel/preset-env",
4+
"@babel/preset-react"
5+
],
6+
"plugins": [
7+
"@babel/plugin-proposal-class-properties"
8+
]
39
}

spec/dummy_no_webpacker/client/app/startup/clientRegistration.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import 'babel-polyfill';
1+
import '@babel/polyfill';
22
import 'es5-shim';
33

44
import ReactOnRails from 'react-on-rails';

spec/dummy_no_webpacker/client/app/startup/serverRegistration.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import 'babel-polyfill';
1+
import '@babel/polyfill';
22
import 'es5-shim';
33

44
// Shows the mapping from the exported object to the name used by the server rendering.

spec/dummy_no_webpacker/client/package.json

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,15 @@
88
},
99
"main": "js/app.js",
1010
"dependencies": {
11+
"@babel/cli": "^7.0.0",
12+
"@babel/core": "^7.0.0",
13+
"@babel/plugin-proposal-class-properties": "^7.0.0",
14+
"@babel/polyfill": "^7.0.0",
15+
"@babel/preset-env": "^7.0.0",
16+
"@babel/preset-react": "^7.0.0",
17+
"@babel/runtime": "^7.0.0",
1118
"autoprefixer": "^7.1.2",
12-
"babel-cli": "^6.24.1",
13-
"babel-core": "^6.25.0",
14-
"babel-loader": "^7.1.1",
15-
"babel-polyfill": "^6.23.0",
16-
"babel-preset-es2015": "^6.24.1",
17-
"babel-preset-react": "^6.24.1",
18-
"babel-preset-stage-2": "^6.24.1",
19-
"babel-runtime": "^6.25.0",
19+
"babel-loader": "^8.0.2",
2020
"css-loader": "^0.28.4",
2121
"es5-shim": "^4.5.9",
2222
"expose-loader": "^0.7.3",
@@ -29,7 +29,7 @@
2929
"loader-utils": "^1.1.0",
3030
"lodash": "^4.17.4",
3131
"node-libs-browser": "^2.0.0",
32-
"node-sass": "^4.5.3",
32+
"node-sass": "^4.9.3",
3333
"postcss-loader": "^1.3.3",
3434
"react": "^15.6.1",
3535
"react-dom": "^15.6.1",
@@ -51,7 +51,6 @@
5151
"webpack-merge": "^4.1.0"
5252
},
5353
"devDependencies": {
54-
"babel-plugin-react-transform": "^2.0.2",
5554
"body-parser": "^1.17.1",
5655
"eslint": "^3.19.0",
5756
"eslint-config-shakacode": "^15.0.0",

spec/dummy_no_webpacker/client/webpack.client.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ module.exports = {
44
entry: [
55
'es5-shim/es5-shim', // for poltergeist
66
'es5-shim/es5-sham', // for poltergeist
7-
'babel-polyfill',
7+
'@babel/polyfill',
88
'jquery',
99
'jquery-ujs',
1010
'startup/clientRegistration',

spec/dummy_no_webpacker/client/webpack.server.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ const path = require('path');
22

33
module.exports = {
44
entry: [
5-
'babel-polyfill',
5+
'@babel/polyfill',
66
'startup/serverRegistration',
77
],
88
output: {

0 commit comments

Comments
 (0)