Merge branch 'master' into vue3-support

Author: weaverryan

bin/encore.js

@@ -12,7 +12,7 @@
 
 const parseRuntime = require('../lib/config/parse-runtime');
 const context = require('../lib/context');
-const chalk = require('chalk').default;
+const chalk = require('chalk');
 const logger = require('../lib/logger');
 
 const runtimeConfig = parseRuntime(

lib/EncoreProxy.js

@@ -9,7 +9,7 @@
 
 'use strict';
 
-const chalk = require('chalk').default;
+const chalk = require('chalk');
 const levenshtein = require('fast-levenshtein');
 const prettyError = require('./utils/pretty-error');
 

lib/config/parse-runtime.js

@@ -64,7 +64,7 @@ module.exports = function(argv, cwd) {
 
     runtimeConfig.context = argv.context;
     if (typeof runtimeConfig.context === 'undefined') {
-        const packagesPath = pkgUp.sync(cwd);
+        const packagesPath = pkgUp.sync({ cwd });
 
         if (null === packagesPath) {
             throw new Error('Cannot determine webpack context. (Are you executing webpack from a directory outside of your project?). Try passing the --context option.');

lib/friendly-errors/asset-output-display-plugin.js

@@ -9,7 +9,7 @@
 
 'use strict';
 
-const chalk = require('chalk').default;
+const chalk = require('chalk');
 
 function AssetOutputDisplayPlugin(outputPath, friendlyErrorsPlugin) {
     this.outputPath = outputPath;

lib/friendly-errors/formatters/missing-css-file.js

@@ -9,7 +9,7 @@
 
 'use strict';
 
-const chalk = require('chalk').default;
+const chalk = require('chalk');
 
 function formatErrors(errors) {
     if (errors.length === 0) {

lib/friendly-errors/formatters/missing-loader.js

@@ -9,7 +9,7 @@
 
 'use strict';
 
-const chalk = require('chalk').default;
+const chalk = require('chalk');
 const loaderFeatures = require('../../features');
 
 function formatErrors(errors) {

lib/friendly-errors/formatters/missing-postcss-config.js

@@ -9,7 +9,7 @@
 
 'use strict';
 
-const chalk = require('chalk').default;
+const chalk = require('chalk');
 
 function formatErrors(errors) {
     if (errors.length === 0) {

lib/loaders/eslint.js

@@ -45,7 +45,7 @@ module.exports = {
             }
         } catch (e) {
             if (isMissingConfigError(e)) {
-                const chalk = require('chalk').default;
+                const chalk = require('chalk');
                 const packageHelper = require('../package-helper');
 
                 const message = `No ESLint configration has been found.

lib/logger.js

@@ -9,7 +9,7 @@
 
 'use strict';
 
-const chalk = require('chalk').default;
+const chalk = require('chalk');
 
 const messagesKeys = [
     'debug',

lib/package-helper.js

@@ -9,7 +9,7 @@
 
 'use strict';
 
-const chalk = require('chalk').default;
+const chalk = require('chalk');
 const fs = require('fs');
 const logger = require('./logger');
 const semver = require('semver');

package.json

@@ -30,28 +30,28 @@
     "@babel/preset-env": "^7.4.0",
     "assets-webpack-plugin": "^3.9.7",
     "babel-loader": "^8.0.0",
-    "chalk": "^2.4.1",
+    "chalk": "^4.0.0",
     "clean-webpack-plugin": "^0.1.19",
     "css-loader": "^3.5.2",
     "fast-levenshtein": "^2.0.6",
     "file-loader": "^6.0.0",
     "friendly-errors-webpack-plugin": "^2.0.0-beta.1",
-    "loader-utils": "^1.1.0",
+    "loader-utils": "^2.0.0",
     "mini-css-extract-plugin": ">=0.4.0 <0.4.3",
     "optimize-css-assets-webpack-plugin": "^5.0.1",
-    "pkg-up": "^1.0.0",
+    "pkg-up": "^3.1.0",
     "pretty-error": "^2.1.1",
     "resolve-url-loader": "^3.0.1",
-    "semver": "^5.5.0",
+    "semver": "^7.3.2",
     "style-loader": "^1.1.3",
     "terser-webpack-plugin": "^1.1.0",
-    "tmp": "^0.0.33",
+    "tmp": "^0.2.1",
     "webpack": "^4.22.0",
     "webpack-cli": "^3.0.0",
     "webpack-dev-server": "^3.1.14",
     "webpack-manifest-plugin": "^2.0.2",
     "webpack-sources": "^1.3.0",
-    "yargs-parser": "^12.0.0"
+    "yargs-parser": "^18.1.3"
   },
   "devDependencies": {
     "@babel/plugin-proposal-class-properties": "^7.0.0",
@@ -73,10 +73,10 @@
     "eslint-plugin-import": "^2.8.0",
     "eslint-plugin-node": "^8.0.1",
     "fork-ts-checker-webpack-plugin": "^0.4.1",
-    "fs-extra": "^8.1.0",
+    "fs-extra": "^9.0.0",
     "handlebars": "^4.0.11",
     "handlebars-loader": "^1.7.0",
-    "http-server": "^0.11.1",
+    "http-server": "^0.12.3",
     "less": "^3.9.0",
     "less-loader": "^4.1.0",
     "mocha": "^6.0.2",
@@ -87,7 +87,7 @@
     "sass": "^1.17.0",
     "sass-loader": "^7.0.1",
     "sinon": "^2.3.4",
-    "strip-ansi": "^5.0.0",
+    "strip-ansi": "^6.0.0",
     "stylus": "^0.54.5",
     "stylus-loader": "^3.0.2",
     "ts-loader": "^5.3.0",