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');