Skip to content

Commit 6c8eb90

Browse files
bertho-zerobertho-zero
committed
remove dlls, upgrade babel
1 parent 9bc4017 commit 6c8eb90

File tree

17 files changed

+881
-831
lines changed

17 files changed

+881
-831
lines changed

‎.babelrc‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,22 @@
88
"browsers": ["last 2 versions", "IE >= 8"],
99
"node": "current"
1010
},
11-
"useBuiltIns": "entry"
11+
"useBuiltIns": "usage",
12+
"corejs": {
13+
"version": 3,
14+
"proposals": true
15+
}
1216
}
1317
]
1418
],
1519
"plugins": [
1620
[
1721
"@babel/plugin-transform-runtime",
1822
{
19-
"corejs": 2
23+
"corejs": {
24+
"version": 3,
25+
"proposals": true
26+
}
2027
}
2128
],
2229
[

‎.dockerignore‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@ static/dist/
88
*.iml
99
webpack-assets.json
1010
webpack-stats.json
11-
.happypack/
12-
webpack/dlls/*.json
1311
# api/**/*.nedb
1412
*.report.html
15-
coverage/
13+
coverage/

‎.eslintrc‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,6 @@
6666
"__SERVER__": true,
6767
"__DISABLE_SSR__": true,
6868
"__DEVTOOLS__": true,
69-
"__DLLS__": true,
7069
"webpackIsomorphicTools": true
7170
}
7271
}

‎.gitignore‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@ static/dist/
77
*.iml
88
webpack-assets.json
99
webpack-stats.json
10-
.happypack/
11-
webpack/dlls/*.json
1210
api/**/*.nedb
1311
*.report.html
14-
coverage/
12+
coverage/

‎bin/server.js‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ global.__CLIENT__ = false;
1010
global.__SERVER__ = true;
1111
global.__DISABLE_SSR__ = false; // <----- DISABLES SERVER SIDE RENDERING FOR ERROR DEBUGGING
1212
global.__DEVELOPMENT__ = process.env.NODE_ENV !== 'production';
13-
global.__DLLS__ = process.env.WEBPACK_DLLS === '1';
1413

1514
if (__DEVELOPMENT__) {
1615
if (

‎jest.config.js‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ module.exports = {
88
__CLIENT__: process.env.NODE_PATH === 'src',
99
__SERVER__: process.env.NODE_PATH === 'api',
1010
__DEVELOPMENT__: true,
11-
__DEVTOOLS__: false, // <-------- DISABLE redux-devtools HERE
12-
__DLLS__: false
11+
__DEVTOOLS__: false // <-------- DISABLE redux-devtools HERE
1312
}
1413
};

‎package.json‎

Lines changed: 29 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,11 @@
3131
"start-prod": "cross-env NODE_PATH=src NODE_ENV=production PORT=8080 APIPORT=3030 node ./bin/server.js",
3232
"start-prod-api": "cross-env NODE_PATH=api NODE_ENV=production APIPORT=3030 node ./bin/api.js",
3333
"dev": "concurrently --kill-others \"yarn watch-client\" \"yarn start-dev\" \"yarn start-dev-api\"",
34-
"start-dev": "cross-env NODE_PATH=src NODE_ENV=development PORT=3000 APIPORT=3030 WEBPACK_DLLS=1 node ./bin/server.js",
34+
"start-dev": "cross-env NODE_PATH=src NODE_ENV=development PORT=3000 APIPORT=3030 node ./bin/server.js",
3535
"start-dev-api": "cross-env NODE_PATH=api NODE_ENV=development APIPORT=3030 node ./bin/api.js",
36-
"watch-client": "cross-env UV_THREADPOOL_SIZE=100 NODE_PATH=src NODE_ENV=development PORT=3000 APIPORT=3030 WEBPACK_DLLS=1 node webpack/webpack-dev-server.js",
36+
"watch-client": "cross-env UV_THREADPOOL_SIZE=100 NODE_PATH=src NODE_ENV=development PORT=3000 APIPORT=3030 node webpack/webpack-dev-server.js",
3737
"build": "cross-env NODE_ENV=production webpack --colors --display-error-details --config=webpack/prod.config.js",
38-
"build-dlls": "webpack --colors --display-error-details --config webpack/vendor.config.js",
39-
"postinstall": "concurrently \"yarn build\" \"yarn build-dlls\"",
38+
"postinstall": "yarn build",
4039
"prettier": "prettier-eslint --write --eslint-config-path .eslintrc '**/*.js'",
4140
"lint": "eslint .",
4241
"test": "cross-env NODE_PATH=src jest src",
@@ -47,29 +46,8 @@
4746
"docker-down": "docker-compose down"
4847
},
4948
"dependencies": {
50-
"@babel/core": "^7.0.0",
51-
"@babel/plugin-proposal-class-properties": "^7.0.0",
52-
"@babel/plugin-proposal-decorators": "^7.0.0",
53-
"@babel/plugin-proposal-do-expressions": "^7.0.0",
54-
"@babel/plugin-proposal-export-default-from": "^7.0.0",
55-
"@babel/plugin-proposal-export-namespace-from": "^7.0.0",
56-
"@babel/plugin-proposal-function-bind": "^7.0.0",
57-
"@babel/plugin-proposal-function-sent": "^7.0.0",
58-
"@babel/plugin-proposal-json-strings": "^7.0.0",
59-
"@babel/plugin-proposal-logical-assignment-operators": "^7.0.0",
60-
"@babel/plugin-proposal-nullish-coalescing-operator": "^7.0.0",
61-
"@babel/plugin-proposal-numeric-separator": "^7.0.0",
62-
"@babel/plugin-proposal-optional-chaining": "^7.0.0",
63-
"@babel/plugin-proposal-pipeline-operator": "^7.0.0",
64-
"@babel/plugin-proposal-throw-expressions": "^7.0.0",
65-
"@babel/plugin-syntax-dynamic-import": "^7.0.0",
66-
"@babel/plugin-syntax-import-meta": "^7.0.0",
67-
"@babel/plugin-transform-runtime": "^7.0.0",
68-
"@babel/polyfill": "^7.0.0",
69-
"@babel/preset-env": "^7.0.0",
70-
"@babel/preset-react": "^7.0.0",
71-
"@babel/register": "^7.0.0",
72-
"@babel/runtime-corejs2": "^7.0.0",
49+
"@babel/register": "^7.4.0",
50+
"@babel/runtime-corejs3": "^7.4.3",
7351
"@feathersjs/authentication": "^2.1.0",
7452
"@feathersjs/authentication-client": "^1.0.1",
7553
"@feathersjs/authentication-jwt": "^2.0.0",
@@ -82,13 +60,13 @@
8260
"@feathersjs/socketio": "^3.0.1",
8361
"@feathersjs/socketio-client": "^1.0.1",
8462
"axios": "^0.18.0",
85-
"babel-plugin-dynamic-import-node": "^2.0.0",
8663
"body-parser": "^1.16.1",
8764
"classnames": "^2.2.5",
8865
"compression": "^1.6.2",
8966
"cookie-parser": "^1.4.3",
9067
"cookies": "^0.7.1",
9168
"cookies-js": "^1.2.3",
69+
"core-js": "^3.0.1",
9270
"express": "^4.15.4",
9371
"express-session": "^1.15.5",
9472
"feathers-authentication-hooks": "^0.3.0",
@@ -128,17 +106,38 @@
128106
"redux-logger": "^3.0.6",
129107
"redux-persist": "^5.3.4",
130108
"redux-persist-cookie-storage": "^1.0.0",
109+
"regenerator-runtime": "^0.13.2",
131110
"serialize-javascript": "^1.3.0",
132111
"serve-favicon": "^2.3.2",
133112
"socket.io-client": "^2.0.1"
134113
},
135114
"devDependencies": {
136-
"@babel/core": "^7.0.0",
115+
"@babel/core": "^7.4.3",
116+
"@babel/plugin-proposal-class-properties": "^7.4.0",
117+
"@babel/plugin-proposal-decorators": "^7.4.0",
118+
"@babel/plugin-proposal-do-expressions": "^7.2.0",
119+
"@babel/plugin-proposal-export-default-from": "^7.2.0",
120+
"@babel/plugin-proposal-export-namespace-from": "^7.2.0",
121+
"@babel/plugin-proposal-function-bind": "^7.2.0",
122+
"@babel/plugin-proposal-function-sent": "^7.2.0",
123+
"@babel/plugin-proposal-json-strings": "^7.2.0",
124+
"@babel/plugin-proposal-logical-assignment-operators": "^7.2.0",
125+
"@babel/plugin-proposal-nullish-coalescing-operator": "^7.4.3",
126+
"@babel/plugin-proposal-numeric-separator": "^7.2.0",
127+
"@babel/plugin-proposal-optional-chaining": "^7.2.0",
128+
"@babel/plugin-proposal-pipeline-operator": "^7.3.2",
129+
"@babel/plugin-proposal-throw-expressions": "^7.2.0",
130+
"@babel/plugin-syntax-dynamic-import": "^7.2.0",
131+
"@babel/plugin-syntax-import-meta": "^7.2.0",
137132
"@babel/plugin-transform-react-jsx-source": "^7.0.0",
133+
"@babel/plugin-transform-runtime": "^7.4.3",
134+
"@babel/preset-env": "^7.4.3",
135+
"@babel/preset-react": "^7.0.0",
138136
"babel-core": "^7.0.0-bridge.0",
139137
"babel-eslint": "^10.0.1",
140138
"babel-jest": "^23.0.0",
141139
"babel-loader": "^8.0.0",
140+
"babel-plugin-dynamic-import-node": "^2.2.0",
142141
"bootstrap-loader": "^2.1.0",
143142
"bootstrap-sass": "^3.3.7",
144143
"chai": "^4.1.1",
@@ -155,9 +154,8 @@
155154
"extract-text-webpack-plugin": "^4.0.0-beta.0",
156155
"file-loader": "^2.0.0",
157156
"font-awesome": "^4.7.0",
158-
"happypack": "^5.0.0",
159157
"html-webpack-plugin": "^3.1.0",
160-
"husky": "^1.0.0-rc.2",
158+
"husky": "^1.3.1",
161159
"identity-obj-proxy": "^3.0.0",
162160
"jest": "^23.0.0",
163161
"jest-cli": "^23.0.0",

‎server.babel.js‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
// enable runtime transpilation to use ES6/7 in node
2-
require('@babel/polyfill');
2+
require('core-js/stable');
3+
require('regenerator-runtime/runtime');
34

45
const fs = require('fs');
56

‎src/client.js‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
/**
22
* THIS IS THE ENTRY POINT FOR THE CLIENT, JUST LIKE server.js IS THE ENTRY POINT FOR THE SERVER.
33
*/
4-
import '@babel/polyfill';
4+
import 'core-js/stable';
5+
import 'regenerator-runtime/runtime';
56
import React from 'react';
67
import ReactDOM from 'react-dom';
78
import { ConnectedRouter } from 'react-router-redux';

‎src/helpers/Html.js‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,6 @@ const Html = ({
6565
charSet="UTF-8"
6666
/>
6767
)}
68-
{__DLLS__ && <script key="dlls__vendor" src="/dist/dlls/dll__vendor.js" charSet="UTF-8" />}
6968
{assets.javascript && <script src={assets.javascript.main} charSet="UTF-8" />}
7069
{bundles.map(bundle => bundle && <script src={config.assetsPath + bundle.file} key={bundle.id} />)}
7170

0 commit comments

Comments
 (0)