Merge pull request #6864 from webpack/bump_prettier

Update prettier toolchain

Author: sokra

.eslintrc.js

@@ -1,7 +1,7 @@
 module.exports = {
 root: true,
 plugins: ["prettier", "node"],
-extends: ["eslint:recommended", "plugin:node/recommended"],
+extends: ["eslint:recommended", "plugin:node/recommended", "plugin:prettier/recommended"],
 env: {
 node: true,
 es6: true
@@ -16,6 +16,7 @@ module.exports = {
 "semi": "error",
 "no-template-curly-in-string": "error",
 "no-caller": "error",
+"no-control-regex": "off",
 "yoda": "error",
 "eqeqeq": "error",
 "global-require": "off",

.prettierrc

@@ -0,0 +1,5 @@
+module.exports = {
+printWidth: 80,
+useTabs: true,
+tabWidth: 2
+};

.prettierrc.js

@@ -43,9 +43,7 @@ if (!webpackCliInstalled) {
 
 const commandToBeRun = `${packageManager} ${options.join(" ")}`;
 
-const question = `Would you like to install webpack-cli? (That will run ${
-commandToBeRun
-}) `;
+const question = `Would you like to install webpack-cli? (That will run ${commandToBeRun}) `;
 
 console.error("The CLI moved into a separate package: webpack-cli");
 const questionInterface = readLine.createInterface({

bin/webpack.js

@@ -52,11 +52,11 @@ class APIPlugin {
 ? ParserHelpers.toConstantDependency(
 parser,
 REPLACEMENTS[key]
-)
+ )
 : ParserHelpers.toConstantDependencyWithWebpackRequire(
 parser,
 REPLACEMENTS[key]
-)
+ )
 );
 parser.hooks.evaluateTypeof
 .for(key)

lib/APIPlugin.js

@@ -36,17 +36,15 @@ class AmdMainTemplatePlugin {
 });
 
 return new ConcatSource(
-`define(${JSON.stringify(name)}, ${externalsDepsArray}, function(${
-externalsArguments
-}) { return `,
+`define(${JSON.stringify(
+name
+)}, ${externalsDepsArray}, function(${externalsArguments}) { return `,
 source,
 "});"
 );
 } else if (externalsArguments) {
 return new ConcatSource(
-`define(${externalsDepsArray}, function(${
-externalsArguments
-}) { return `,
+`define(${externalsDepsArray}, function(${externalsArguments}) { return `,
 source,
 "});"
 );

lib/AmdMainTemplatePlugin.js

@@ -11,9 +11,7 @@ module.exports = class AsyncDependencyToInitialChunkError extends WebpackError {
 super();
 
 this.name = "AsyncDependencyToInitialChunkError";
-this.message = `It's not allowed to load an initial chunk on demand. The chunk name "${
-chunkName
-}" is already used by an entrypoint.`;
+this.message = `It's not allowed to load an initial chunk on demand. The chunk name "${chunkName}" is already used by an entrypoint.`;
 this.module = module;
 this.origin = module;
 this.originLoc = loc;

lib/AsyncDependencyToInitialChunkError.js

@@ -628,12 +628,12 @@ class Compilation extends Tapable {
 const errorAndCallback = this.bail
 ? err => {
 callback(err);
-}
+ }
 : err => {
 err.dependencies = [dependency];
 this.errors.push(err);
 callback();
-};
+ };
 
 if (
 typeof dependency !== "object" ||

lib/Compilation.js

@@ -293,9 +293,11 @@ class ContextModule extends Module {
 getReturnModuleObjectSource(fakeMap, fakeMapDataExpression = "fakeMap[id]") {
 if (typeof fakeMap === "number")
 return `return ${this.getReturn(fakeMap)};`;
-return `return ${fakeMapDataExpression} === 1 ? ${this.getReturn(1)} : ${
-fakeMapDataExpression
-} ? ${this.getReturn(2)} : ${this.getReturn(0)};`;
+return `return ${fakeMapDataExpression} === 1 ? ${this.getReturn(
+1
+)} : ${fakeMapDataExpression} ? ${this.getReturn(2)} : ${this.getReturn(
+0
+)};`;
 }
 
 getSyncSource(dependencies, id) {
@@ -512,9 +514,7 @@ module.exports = webpackAsyncContext;`;
 
 const chunksStartPosition = typeof fakeMap === "object" ? 2 : 1;
 const requestPrefix = hasMultipleOrNoChunks
-? `Promise.all(ids.slice(${
-chunksStartPosition
-}).map(__webpack_require__.e))`
+? `Promise.all(ids.slice(${chunksStartPosition}).map(__webpack_require__.e))`
 : `__webpack_require__.e(ids[${chunksStartPosition}])`;
 const returnModuleObject = this.getReturnModuleObjectSource(
 fakeMap,

lib/ContextModule.js

@@ -112,7 +112,7 @@ class DefinePlugin {
 ? ParserHelpers.toConstantDependencyWithWebpackRequire(
 parser,
 code
-)
+ )
 : ParserHelpers.toConstantDependency(parser, code)
 );
 }
@@ -164,7 +164,7 @@ class DefinePlugin {
 ? ParserHelpers.toConstantDependencyWithWebpackRequire(
 parser,
 code
-)
+ )
 : ParserHelpers.toConstantDependency(parser, code)
 );
 parser.hooks.typeof