Skip to content

Commit 7554f30

Browse files
author
Martin Krulis
committed
Fixing security issues, removing unused packages, fixing webpack dev setup broken with last update.
1 parent 599d4df commit 7554f30

File tree

5 files changed

+531
-677
lines changed

5 files changed

+531
-677
lines changed

bin/dev.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ var server = new WebpackDevServer(webpack(config), {
4141
quiet: false,
4242
noInfo: false,
4343
publicPath: '/',
44+
port: WEBPACK_DEV_SERVER_PORT,
4445
stats: { colors: true },
4546
});
4647

config/webpack.config-dev.js

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,10 +51,6 @@ module.exports = {
5151
test: /\.less$/,
5252
use: [MiniCssExtractPlugin.loader, 'css-loader?modules', 'less-loader'],
5353
},
54-
{
55-
test: /\.scss$/,
56-
use: [MiniCssExtractPlugin.loader, 'css-loader?modules', 'sass-loader'],
57-
},
5854
{
5955
test: /.*\.(gif|png|jpe?g|svg)$/i,
6056
use: ['file-loader'],

config/webpack.config.js

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -61,10 +61,6 @@ module.exports = {
6161
test: /\.less$/,
6262
use: [MiniCssExtractPlugin.loader, 'css-loader?modules', 'less-loader'],
6363
},
64-
{
65-
test: /\.scss$/,
66-
use: [MiniCssExtractPlugin.loader, 'css-loader?modules', 'sass-loader'],
67-
},
6864
{
6965
test: /.*\.(gif|png|jpe?g|svg)$/i,
7066
use: ['file-loader'],

package.json

Lines changed: 31 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -36,15 +36,15 @@
3636
"admin-lte": "2.3.11",
3737
"ajv": "5.5.1",
3838
"ajv-keywords": "2.1.1",
39-
"babel-plugin-react-intl": "^3.2.0",
39+
"babel-plugin-react-intl": "^4.1.2",
4040
"bluebird": "^3.3.5",
4141
"browser-cookies": "^1.0.8",
4242
"buffer": "^5.0.7",
4343
"chai-immutable": "^1.6.0",
4444
"classnames": "^2.2.5",
4545
"codemirror": "^5.25.2",
4646
"cookie-parser": "^1.4.1",
47-
"css-loader": "^2.1.1",
47+
"css-loader": "^3.1.0",
4848
"deep-equal": "^1.0.1",
4949
"ejs": "^2.6.1",
5050
"exenv": "^1.2.1",
@@ -97,15 +97,15 @@
9797
"viz.js": "^1.8.0"
9898
},
9999
"devDependencies": {
100-
"@babel/cli": "^7.5.0",
101-
"@babel/core": "^7.5.4",
102-
"@babel/node": "^7.5.0",
103-
"@babel/plugin-proposal-class-properties": "^7.5.0",
104-
"@babel/preset-env": "^7.5.4",
100+
"@babel/cli": "^7.5.5",
101+
"@babel/core": "^7.5.5",
102+
"@babel/node": "^7.5.5",
103+
"@babel/plugin-proposal-class-properties": "^7.5.5",
104+
"@babel/preset-env": "^7.5.5",
105105
"@babel/preset-react": "^7.0.0",
106-
"@babel/register": "^7.4.4",
107-
"async": "^2.4.0",
108-
"babel-eslint": "^10.0.1",
106+
"@babel/register": "^7.5.5",
107+
"async": "^3.1.0",
108+
"babel-eslint": "^10.0.2",
109109
"babel-loader": "^8.0.6",
110110
"babel-plugin-transform-flow-strip-types": "^6.22.0",
111111
"babel-plugin-transform-object-assign": "^6.22.0",
@@ -115,47 +115,50 @@
115115
"chai": "^3.5.0",
116116
"chai-spies": "^0.7.1",
117117
"colors": "^1.1.2",
118-
"css-loader": "^2.1.1",
119-
"css-modules-require-hook": "^4.0.0",
118+
"css-loader": "^3.1.0",
119+
"css-modules-require-hook": "^4.2.3",
120120
"dotenv": "^4.0.0",
121-
"eslint": "^5.16.0",
122-
"eslint-config-prettier": "^2.1.1",
123-
"eslint-config-standard": "^12.0.0",
124-
"eslint-config-standard-react": "^7.0.2",
125-
"eslint-plugin-babel": "^5.2.1",
126-
"eslint-plugin-import": "^2.14.0",
127-
"eslint-plugin-node": "^7.0.1",
128-
"eslint-plugin-promise": "^4.0.1",
129-
"eslint-plugin-react": "^7.11.1",
121+
"eslint": "^6.1.0",
122+
"eslint-config-prettier": "^6.0.0",
123+
"eslint-config-standard": "^13.0.1",
124+
"eslint-config-standard-react": "^8.0.0",
125+
"eslint-plugin-babel": "^5.3.0",
126+
"eslint-plugin-import": "^2.18.2",
127+
"eslint-plugin-node": "^9.1.0",
128+
"eslint-plugin-promise": "^4.2.1",
129+
"eslint-plugin-react": "^7.14.3",
130130
"eslint-plugin-standard": "^4.0.0",
131131
"fetch-mock": "^5.10.0",
132-
"file-loader": "^2.0.0",
132+
"file-loader": "^4.1.0",
133133
"git-revision-webpack-plugin": "^2.5.1",
134134
"image-webpack-loader": "^5.0.0",
135135
"isomorphic-fetch": "^2.2.1",
136136
"isomorphic-style-loader": "^2.0.0",
137137
"jsdom": "^15.1.1",
138138
"json-loader": "^0.5.4",
139-
"less": "^3.8.1",
140-
"less-loader": "^4.1.0",
141-
"marked": "^0.6.2",
139+
"less": "^3.9.0",
140+
"less-loader": "^5.0.0",
141+
"marked": "^0.7.0",
142142
"mini-css-extract-plugin": "^0.4.3",
143143
"mocha": "^6.1.4",
144144
"mocha-lcov-reporter": "^1.3.0",
145145
"mock-local-storage": "^1.0.2",
146-
"node-sass": "^4.9.3",
147146
"postcss-loader": "^3.0.0",
148-
"prettier": "^1.16.4",
147+
"prettier": "^1.18.2",
149148
"react-intl-translations-manager": "^5.0.0",
150149
"request": "^2.88.0",
151150
"scroll-behavior": "^0.4.0",
152151
"strip-loader": "^0.1.2",
153152
"style-loader": "^0.17.0",
154153
"terser-webpack-plugin": "^1.1.0",
155-
"webpack": "^4.36.1",
154+
"webpack": "^4.37.0",
156155
"webpack-cli": "^3.3.6",
157156
"webpack-dev-middleware": "^3.7.0",
158157
"webpack-dev-server": "^3.7.2",
159158
"webpack-isomorphic-tools": "^3.0.6"
159+
},
160+
"resolutions": {
161+
"lodash": "4.17.15",
162+
"lodash.merge": "4.6.2"
160163
}
161164
}

0 commit comments

Comments
 (0)