Skip to content

Commit 2b68e5a

Browse files
committed
Update dependencies, add support for styled-components
1 parent 0860187 commit 2b68e5a

File tree

3 files changed

+1514
-1274
lines changed

3 files changed

+1514
-1274
lines changed

package.json

Lines changed: 22 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -6,39 +6,39 @@
66
"@fortawesome/react-fontawesome": "^0.1.4",
77
"@hot-loader/react-dom": "^16.8.6",
88
"axios": "^0.18.0",
9-
"brace": "^0.11.1",
109
"classnames": "^2.2.6",
1110
"date-fns": "^1.29.0",
1211
"easy-peasy": "^2.5.0",
1312
"events": "^3.0.0",
14-
"feather-icons": "^4.10.0",
1513
"formik": "^1.5.7",
1614
"jquery": "^3.3.1",
17-
"lodash": "^4.17.11",
1815
"path": "^0.12.7",
1916
"query-string": "^6.7.0",
2017
"react": "^16.8.6",
2118
"react-dom": "^16.8.6",
22-
"react-hot-loader": "^4.9.0",
19+
"react-hot-loader": "^4.12.13",
2320
"react-redux": "^7.1.0",
2421
"react-router-dom": "^5.0.1",
2522
"react-transition-group": "^4.1.0",
26-
"socket.io-client": "^2.2.0",
2723
"sockette": "^2.0.6",
2824
"styled-components": "^4.3.2",
2925
"use-react-router": "^1.0.7",
3026
"uuid": "^3.3.2",
31-
"ws-wrapper": "^2.0.0",
3227
"xterm": "^3.14.4",
3328
"xterm-addon-attach": "^0.1.0",
3429
"xterm-addon-fit": "^0.1.0",
3530
"yup": "^0.27.0"
3631
},
3732
"devDependencies": {
38-
"@babel/core": "^7.2.2",
33+
"@babel/core": "^7.6.0",
34+
"@babel/plugin-proposal-class-properties": "^7.5.5",
35+
"@babel/plugin-proposal-object-rest-spread": "^7.5.5",
3936
"@babel/plugin-syntax-dynamic-import": "^7.2.0",
40-
"@babel/preset-env": "^7.3.1",
37+
"@babel/plugin-transform-runtime": "^7.6.0",
38+
"@babel/preset-env": "^7.6.0",
4139
"@babel/preset-react": "^7.0.0",
40+
"@babel/preset-typescript": "^7.6.0",
41+
"@babel/runtime": "^7.6.0",
4242
"@types/classnames": "^2.2.8",
4343
"@types/events": "^3.0.0",
4444
"@types/feather-icons": "^4.7.0",
@@ -56,21 +56,21 @@
5656
"@types/yup": "^0.26.17",
5757
"@typescript-eslint/eslint-plugin": "^1.10.1",
5858
"@typescript-eslint/parser": "^1.10.1",
59-
"babel-loader": "^8.0.5",
59+
"babel-loader": "^8.0.6",
6060
"babel-plugin-styled-components": "^1.10.6",
6161
"babel-plugin-tailwind-components": "^0.5.10",
62-
"css-loader": "^2.1.0",
63-
"cssnano": "^4.0.3",
62+
"css-loader": "^3.2.0",
63+
"cssnano": "^4.1.10",
6464
"eslint": "^5.16.0",
6565
"eslint-config-standard": "^12.0.0",
6666
"eslint-plugin-import": "^2.17.3",
6767
"eslint-plugin-node": "^9.1.0",
6868
"eslint-plugin-promise": "^4.1.1",
6969
"eslint-plugin-standard": "^4.0.0",
70-
"fork-ts-checker-webpack-plugin": "^0.5.2",
70+
"fork-ts-checker-webpack-plugin": "^1.5.0",
7171
"glob-all": "^3.1.0",
7272
"html-webpack-plugin": "^3.2.0",
73-
"mini-css-extract-plugin": "^0.5.0",
73+
"mini-css-extract-plugin": "^0.8.0",
7474
"postcss": "^6.0.21",
7575
"postcss-import": "^11.1.0",
7676
"postcss-loader": "^3.0.0",
@@ -83,19 +83,21 @@
8383
"tailwindcss": "^0.7.4",
8484
"terser-webpack-plugin": "^1.3.0",
8585
"ts-loader": "^5.3.3",
86-
"typescript": "^3.3.1",
87-
"webpack": "^4.29.0",
86+
"typescript": "^3.6.3",
87+
"webpack": "^4.40.2",
8888
"webpack-assets-manifest": "^3.1.1",
89-
"webpack-cli": "^3.0.2",
90-
"webpack-dev-server": "^3.1.14",
89+
"webpack-cli": "^3.3.9",
90+
"webpack-dev-server": "^3.8.1",
9191
"webpack-manifest-plugin": "^2.0.3"
9292
},
9393
"scripts": {
9494
"clean": "rm -rf public/assets/*.js && rm -rf public/assets/*.css",
9595
"watch": "NODE_ENV=development ./node_modules/.bin/webpack --watch --progress",
9696
"build": "NODE_ENV=development ./node_modules/.bin/webpack --progress",
9797
"build:production": "NODE_ENV=production ./node_modules/.bin/webpack",
98-
"serve": "yarn run clean && NODE_ENV=development webpack-dev-server --host 0.0.0.0 --hot",
99-
"v:serve": "PUBLIC_PATH=https://pterodactyl.test:8080 yarn run serve --https --key /etc/ssl/private/pterodactyl.test-key.pem --cert /etc/ssl/private/pterodactyl.test.pem"
100-
}
98+
"serve": "yarn run clean && PUBLIC_PATH=https://pterodactyl.test:8080 NODE_ENV=development webpack-dev-server --host 0.0.0.0 --hot --https --key /etc/ssl/private/pterodactyl.test-key.pem --cert /etc/ssl/private/pterodactyl.test.pem"
99+
},
100+
"browserslist": [
101+
"defaults"
102+
]
101103
}

webpack.config.js

Lines changed: 19 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -71,24 +71,21 @@ module.exports = {
7171
loader: 'babel-loader',
7272
options: {
7373
cacheDirectory: !isProduction,
74-
presets: ['@babel/env', '@babel/react'],
74+
presets: [
75+
'@babel/typescript',
76+
'@babel/env',
77+
'@babel/react',
78+
],
7579
plugins: [
76-
'react-hot-loader/babel',
77-
'@babel/plugin-syntax-dynamic-import',
78-
['styled-components', {
79-
displayName: true,
80-
}],
8180
'tailwind-components',
81+
'react-hot-loader/babel',
82+
'@babel/transform-runtime',
83+
'@babel/proposal-class-properties',
84+
'@babel/proposal-object-rest-spread',
85+
'@babel/syntax-dynamic-import',
8286
],
8387
},
8488
},
85-
{
86-
loader: 'ts-loader',
87-
options: {
88-
experimentalWatchApi: true,
89-
transpileOnly: true,
90-
},
91-
},
9289
],
9390
},
9491
{
@@ -97,7 +94,12 @@ module.exports = {
9794
path.resolve(__dirname, 'resources'),
9895
],
9996
use: [
100-
{ loader: MiniCssExtractPlugin.loader },
97+
{
98+
loader: MiniCssExtractPlugin.loader,
99+
options: {
100+
hmr: !isProduction,
101+
},
102+
},
101103
{
102104
loader: 'css-loader',
103105
options: {
@@ -157,6 +159,9 @@ module.exports = {
157159
}),
158160
],
159161
},
162+
watchOptions: {
163+
ignored: /node_modules/,
164+
},
160165
devServer: {
161166
contentBase: path.join(__dirname, 'public'),
162167
publicPath: _.get(process.env, 'PUBLIC_PATH', '') + '/assets/',

0 commit comments

Comments
 (0)