Fixing security issues, removing unused packages, fixing webpack dev …

…setup broken with last update.
ReCodEx · Jul 25, 2019 · 7554f30 · 7554f30
1 parent 599d4df
commit 7554f30
Show file tree

Hide file tree

Showing 5 changed files with 531 additions and 677 deletions.
diff --git a/bin/dev.js b/bin/dev.js
@@ -41,6 +41,7 @@ var server = new WebpackDevServer(webpack(config), {
   quiet: false,
   noInfo: false,
   publicPath: '/',
+  port: WEBPACK_DEV_SERVER_PORT,
   stats: { colors: true },
 });
 

diff --git a/config/webpack.config-dev.js b/config/webpack.config-dev.js
@@ -51,10 +51,6 @@ module.exports = {
         test: /\.less$/,
         use: [MiniCssExtractPlugin.loader, 'css-loader?modules', 'less-loader'],
       },
-      {
-        test: /\.scss$/,
-        use: [MiniCssExtractPlugin.loader, 'css-loader?modules', 'sass-loader'],
-      },
       {
         test: /.*\.(gif|png|jpe?g|svg)$/i,
         use: ['file-loader'],

diff --git a/config/webpack.config.js b/config/webpack.config.js
@@ -61,10 +61,6 @@ module.exports = {
         test: /\.less$/,
         use: [MiniCssExtractPlugin.loader, 'css-loader?modules', 'less-loader'],
       },
-      {
-        test: /\.scss$/,
-        use: [MiniCssExtractPlugin.loader, 'css-loader?modules', 'sass-loader'],
-      },
       {
         test: /.*\.(gif|png|jpe?g|svg)$/i,
         use: ['file-loader'],

diff --git a/package.json b/package.json
@@ -36,15 +36,15 @@
     "admin-lte": "2.3.11",
     "ajv": "5.5.1",
     "ajv-keywords": "2.1.1",
-    "babel-plugin-react-intl": "^3.2.0",
+    "babel-plugin-react-intl": "^4.1.2",
     "bluebird": "^3.3.5",
     "browser-cookies": "^1.0.8",
     "buffer": "^5.0.7",
     "chai-immutable": "^1.6.0",
     "classnames": "^2.2.5",
     "codemirror": "^5.25.2",
     "cookie-parser": "^1.4.1",
-    "css-loader": "^2.1.1",
+    "css-loader": "^3.1.0",
     "deep-equal": "^1.0.1",
     "ejs": "^2.6.1",
     "exenv": "^1.2.1",
@@ -97,15 +97,15 @@
     "viz.js": "^1.8.0"
   },
   "devDependencies": {
-    "@babel/cli": "^7.5.0",
-    "@babel/core": "^7.5.4",
-    "@babel/node": "^7.5.0",
-    "@babel/plugin-proposal-class-properties": "^7.5.0",
-    "@babel/preset-env": "^7.5.4",
+    "@babel/cli": "^7.5.5",
+    "@babel/core": "^7.5.5",
+    "@babel/node": "^7.5.5",
+    "@babel/plugin-proposal-class-properties": "^7.5.5",
+    "@babel/preset-env": "^7.5.5",
     "@babel/preset-react": "^7.0.0",
-    "@babel/register": "^7.4.4",
-    "async": "^2.4.0",
-    "babel-eslint": "^10.0.1",
+    "@babel/register": "^7.5.5",
+    "async": "^3.1.0",
+    "babel-eslint": "^10.0.2",
     "babel-loader": "^8.0.6",
     "babel-plugin-transform-flow-strip-types": "^6.22.0",
     "babel-plugin-transform-object-assign": "^6.22.0",
@@ -115,47 +115,50 @@
     "chai": "^3.5.0",
     "chai-spies": "^0.7.1",
     "colors": "^1.1.2",
-    "css-loader": "^2.1.1",
-    "css-modules-require-hook": "^4.0.0",
+    "css-loader": "^3.1.0",
+    "css-modules-require-hook": "^4.2.3",
     "dotenv": "^4.0.0",
-    "eslint": "^5.16.0",
-    "eslint-config-prettier": "^2.1.1",
-    "eslint-config-standard": "^12.0.0",
-    "eslint-config-standard-react": "^7.0.2",
-    "eslint-plugin-babel": "^5.2.1",
-    "eslint-plugin-import": "^2.14.0",
-    "eslint-plugin-node": "^7.0.1",
-    "eslint-plugin-promise": "^4.0.1",
-    "eslint-plugin-react": "^7.11.1",
+    "eslint": "^6.1.0",
+    "eslint-config-prettier": "^6.0.0",
+    "eslint-config-standard": "^13.0.1",
+    "eslint-config-standard-react": "^8.0.0",
+    "eslint-plugin-babel": "^5.3.0",
+    "eslint-plugin-import": "^2.18.2",
+    "eslint-plugin-node": "^9.1.0",
+    "eslint-plugin-promise": "^4.2.1",
+    "eslint-plugin-react": "^7.14.3",
     "eslint-plugin-standard": "^4.0.0",
     "fetch-mock": "^5.10.0",
-    "file-loader": "^2.0.0",
+    "file-loader": "^4.1.0",
     "git-revision-webpack-plugin": "^2.5.1",
     "image-webpack-loader": "^5.0.0",
     "isomorphic-fetch": "^2.2.1",
     "isomorphic-style-loader": "^2.0.0",
     "jsdom": "^15.1.1",
     "json-loader": "^0.5.4",
-    "less": "^3.8.1",
-    "less-loader": "^4.1.0",
-    "marked": "^0.6.2",
+    "less": "^3.9.0",
+    "less-loader": "^5.0.0",
+    "marked": "^0.7.0",
     "mini-css-extract-plugin": "^0.4.3",
     "mocha": "^6.1.4",
     "mocha-lcov-reporter": "^1.3.0",
     "mock-local-storage": "^1.0.2",
-    "node-sass": "^4.9.3",
     "postcss-loader": "^3.0.0",
-    "prettier": "^1.16.4",
+    "prettier": "^1.18.2",
     "react-intl-translations-manager": "^5.0.0",
     "request": "^2.88.0",
     "scroll-behavior": "^0.4.0",
     "strip-loader": "^0.1.2",
     "style-loader": "^0.17.0",
     "terser-webpack-plugin": "^1.1.0",
-    "webpack": "^4.36.1",
+    "webpack": "^4.37.0",
     "webpack-cli": "^3.3.6",
     "webpack-dev-middleware": "^3.7.0",
     "webpack-dev-server": "^3.7.2",
     "webpack-isomorphic-tools": "^3.0.6"
+  },
+  "resolutions": {
+  	"lodash": "4.17.15",
+  	"lodash.merge": "4.6.2"
   }
 }