Skip to content

Commit bfd6230

Browse files
committed
Package updates
1 parent ae3f05b commit bfd6230

File tree

4 files changed

+749
-1912
lines changed

4 files changed

+749
-1912
lines changed

package.json

Lines changed: 31 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,13 @@
44
"@fortawesome/fontawesome-svg-core": "^1.2.19",
55
"@fortawesome/free-solid-svg-icons": "^5.9.0",
66
"@fortawesome/react-fontawesome": "^0.1.4",
7-
"@hot-loader/react-dom": "^16.8.6",
8-
"axios": "^0.18.0",
7+
"axios": "^0.19.0",
98
"ayu-ace": "^2.0.4",
109
"brace": "^0.11.1",
1110
"chart.js": "^2.8.0",
1211
"classnames": "^2.2.6",
1312
"date-fns": "^1.29.0",
14-
"easy-peasy": "^3.0.2",
13+
"easy-peasy": "^3.2.3",
1514
"events": "^3.0.0",
1615
"formik": "^1.5.7",
1716
"i18next": "^19.0.0",
@@ -22,15 +21,15 @@
2221
"lodash-es": "^4.17.15",
2322
"path": "^0.12.7",
2423
"query-string": "^6.7.0",
25-
"react": "^16.8.6",
26-
"react-dom": "^16.8.6",
27-
"react-hot-loader": "^4.12.13",
24+
"react": "^16.12.0",
25+
"react-dom": "npm:@hot-loader/react-dom",
26+
"react-hot-loader": "^4.12.18",
2827
"react-i18next": "^11.2.1",
2928
"react-redux": "^7.1.0",
30-
"react-router-dom": "^5.0.1",
31-
"react-transition-group": "^4.1.0",
29+
"react-router-dom": "^5.1.2",
30+
"react-transition-group": "^4.3.0",
3231
"sockette": "^2.0.6",
33-
"styled-components": "^4.3.2",
32+
"styled-components": "^4.4.1",
3433
"use-react-router": "^1.0.7",
3534
"uuid": "^3.3.2",
3635
"xterm": "^3.14.4",
@@ -39,15 +38,15 @@
3938
"yup": "^0.27.0"
4039
},
4140
"devDependencies": {
42-
"@babel/core": "^7.6.0",
43-
"@babel/plugin-proposal-class-properties": "^7.5.5",
44-
"@babel/plugin-proposal-object-rest-spread": "^7.5.5",
45-
"@babel/plugin-syntax-dynamic-import": "^7.2.0",
46-
"@babel/plugin-transform-runtime": "^7.6.0",
47-
"@babel/preset-env": "^7.6.0",
48-
"@babel/preset-react": "^7.0.0",
49-
"@babel/preset-typescript": "^7.6.0",
50-
"@babel/runtime": "^7.6.0",
41+
"@babel/core": "^7.7.5",
42+
"@babel/plugin-proposal-class-properties": "^7.7.4",
43+
"@babel/plugin-proposal-object-rest-spread": "^7.7.4",
44+
"@babel/plugin-syntax-dynamic-import": "^7.7.4",
45+
"@babel/plugin-transform-runtime": "^7.7.5",
46+
"@babel/preset-env": "^7.7.5",
47+
"@babel/preset-react": "^7.7.4",
48+
"@babel/preset-typescript": "^7.7.4",
49+
"@babel/runtime": "^7.7.5",
5150
"@types/chart.js": "^2.8.5",
5251
"@types/classnames": "^2.2.8",
5352
"@types/events": "^3.0.0",
@@ -56,12 +55,13 @@
5655
"@types/lodash-es": "^4.17.3",
5756
"@types/node": "^12.6.9",
5857
"@types/query-string": "^6.3.0",
59-
"@types/react": "^16.8.19",
60-
"@types/react-dom": "^16.8.4",
58+
"@types/react": "^16.9.15",
59+
"@types/react-dom": "^16.9.4",
6160
"@types/react-redux": "^7.1.1",
62-
"@types/react-router-dom": "^4.3.3",
61+
"@types/react-router": "^5.1.3",
62+
"@types/react-router-dom": "^5.1.3",
6363
"@types/react-transition-group": "^2.9.2",
64-
"@types/styled-components": "^4.1.18",
64+
"@types/styled-components": "^4.4.0",
6565
"@types/uuid": "^3.4.5",
6666
"@types/webpack-env": "^1.13.6",
6767
"@types/yup": "^0.26.17",
@@ -70,7 +70,7 @@
7070
"babel-loader": "^8.0.6",
7171
"babel-plugin-styled-components": "^1.10.6",
7272
"babel-plugin-tailwind-components": "^0.5.10",
73-
"css-loader": "^3.2.0",
73+
"css-loader": "^3.2.1",
7474
"cssnano": "^4.1.10",
7575
"eslint": "^5.16.0",
7676
"eslint-config-standard": "^12.0.0",
@@ -83,30 +83,31 @@
8383
"glob-all": "^3.1.0",
8484
"html-webpack-plugin": "^3.2.0",
8585
"mini-css-extract-plugin": "^0.8.0",
86-
"postcss": "^7.0.21",
86+
"postcss": "^7.0.24",
8787
"postcss-import": "^12.0.1",
8888
"postcss-loader": "^3.0.0",
8989
"postcss-preset-env": "^6.7.0",
9090
"precss": "^4.0.0",
91-
"purgecss-webpack-plugin": "^1.1.0",
91+
"purgecss-webpack-plugin": "^1.6.0",
9292
"resolve-url-loader": "^3.0.0",
9393
"source-map-loader": "^0.2.4",
9494
"style-loader": "^0.23.1",
9595
"tailwindcss": "^0.7.4",
9696
"terser-webpack-plugin": "^1.3.0",
9797
"ts-loader": "^5.3.3",
9898
"typescript": "^3.6.3",
99-
"webpack": "^4.40.2",
99+
"webpack": "^4.41.2",
100100
"webpack-assets-manifest": "^3.1.1",
101-
"webpack-cli": "^3.3.9",
102-
"webpack-dev-server": "^3.8.1",
103-
"webpack-manifest-plugin": "^2.0.3"
101+
"webpack-cli": "^3.3.10",
102+
"webpack-dev-server": "^3.9.0",
103+
"webpack-manifest-plugin": "^2.0.3",
104+
"yarn-deduplicate": "^1.1.1"
104105
},
105106
"scripts": {
106107
"clean": "rm -rf public/assets/*.js && rm -rf public/assets/*.css",
107108
"watch": "NODE_ENV=development ./node_modules/.bin/webpack --watch --progress",
108109
"build": "NODE_ENV=development ./node_modules/.bin/webpack --progress",
109-
"build:production": "NODE_ENV=production ./node_modules/.bin/webpack",
110+
"build:production": "NODE_ENV=production ./node_modules/.bin/webpack --mode production",
110111
"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"
111112
},
112113
"browserslist": [

resources/scripts/api/server/files/getFileContents.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ export default (server: string, file: string): Promise<string> => {
55
http.get(`/api/client/servers/${server}/files/contents`, {
66
params: { file },
77
transformResponse: res => res,
8-
responseType: 'text/plain',
8+
responseType: 'text',
99
})
1010
.then(({ data }) => resolve(data))
1111
.catch(reject);

webpack.config.js

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,11 @@ module.exports = {
5353
performance: {
5454
hints: false,
5555
},
56-
entry: ['./resources/styles/main.css', './resources/scripts/index.tsx'],
56+
entry: [
57+
'react-hot-loader/patch',
58+
'./resources/styles/main.css',
59+
'./resources/scripts/index.tsx',
60+
],
5761
output: {
5862
path: path.resolve(__dirname, 'public/assets'),
5963
filename: isProduction ? 'bundle.[chunkhash:8].js' : 'bundle.[hash:8].js',
@@ -138,7 +142,6 @@ module.exports = {
138142
extensions: ['.ts', '.tsx', '.js', '.json'],
139143
alias: {
140144
'@': path.join(__dirname, 'resources/scripts'),
141-
'react-dom': '@hot-loader/react-dom',
142145
},
143146
symlinks: false,
144147
},

0 commit comments

Comments
 (0)