Merge pull request #6864 from webpack/bump_prettier

Update prettier toolchain
webpack · Mar 29, 2018 · 2bd495c · 2bd495c
2 parents 0f70fcb + 8d8da4c
commit 2bd495c
Show file tree

Hide file tree

Showing 39 changed files with 202 additions and 254 deletions.
diff --git a/.eslintrc.js b/.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",

diff --git a/.prettierrc b/.prettierrc
diff --git a/.prettierrc.js b/.prettierrc.js
@@ -0,0 +1,5 @@
+module.exports = {
+	printWidth: 80,
+	useTabs: true,
+	tabWidth: 2
+};
diff --git a/bin/webpack.js b/bin/webpack.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({

diff --git a/lib/APIPlugin.js b/lib/APIPlugin.js
@@ -52,11 +52,11 @@ class APIPlugin {
 									? ParserHelpers.toConstantDependency(
 											parser,
 											REPLACEMENTS[key]
-										)
+									  )
 									: ParserHelpers.toConstantDependencyWithWebpackRequire(
 											parser,
 											REPLACEMENTS[key]
-										)
+									  )
 							);
 						parser.hooks.evaluateTypeof
 							.for(key)

diff --git a/lib/AmdMainTemplatePlugin.js b/lib/AmdMainTemplatePlugin.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,
 					"});"
 				);

diff --git a/lib/AsyncDependencyToInitialChunkError.js b/lib/AsyncDependencyToInitialChunkError.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;

diff --git a/lib/Compilation.js b/lib/Compilation.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" ||

diff --git a/lib/ContextModule.js b/lib/ContextModule.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,

diff --git a/lib/DefinePlugin.js b/lib/DefinePlugin.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

diff --git a/lib/EnvironmentPlugin.js b/lib/EnvironmentPlugin.js
@@ -42,9 +42,7 @@ class EnvironmentPlugin {
 			if (value === undefined) {
 				compiler.hooks.thisCompilation.tap("EnvironmentPlugin", compilation => {
 					const error = new Error(
-						`EnvironmentPlugin - ${
-							key
-						} environment variable is undefined.\n\n` +
+						`EnvironmentPlugin - ${key} environment variable is undefined.\n\n` +
 							"You can pass an object with default values to suppress this warning.\n" +
 							"See https://webpack.js.org/plugins/environment-plugin for example."
 					);

diff --git a/lib/ExternalModule.js b/lib/ExternalModule.js
@@ -76,9 +76,9 @@ class ExternalModule extends Module {
 	}
 
 	checkExternalVariable(variableToCheck, request) {
-		return `if(typeof ${
-			variableToCheck
-		} === 'undefined') {${WebpackMissingModule.moduleCode(request)}}\n`;
+		return `if(typeof ${variableToCheck} === 'undefined') {${WebpackMissingModule.moduleCode(
+			request
+		)}}\n`;
 	}
 
 	getSourceForAmdOrUmdExternal(id, optional, request) {

diff --git a/lib/MainTemplate.js b/lib/MainTemplate.js
@@ -179,15 +179,15 @@ module.exports = class MainTemplate extends Tapable {
 									"if(threw) delete installedModules[moduleId];"
 								]),
 								"}"
-							]
+						  ]
 						: [
 								"// Execute the module function",
 								`modules[moduleId].call(module.exports, module, module.exports, ${this.renderRequireFunctionForModule(
 									hash,
 									chunk,
 									"moduleId"
 								)});`
-							]
+						  ]
 				),
 				"",
 				"// Flag the module as loaded",

diff --git a/lib/ModuleFilenameHelpers.js b/lib/ModuleFilenameHelpers.js
@@ -63,7 +63,7 @@ ModuleFilenameHelpers.createFilename = (module, options, requestShortener) => {
 			? options
 			: {
 					moduleFilenameTemplate: options
-				}
+			  }
 	);
 
 	let absoluteResourcePath;

diff --git a/lib/NormalModuleFactory.js b/lib/NormalModuleFactory.js
@@ -412,7 +412,7 @@ class NormalModuleFactory extends Tapable {
 						const optionsOnly = item.options
 							? {
 									options: item.options
-								}
+							  }
 							: undefined;
 						return callback(
 							null,

diff --git a/lib/RecordIdsPlugin.js b/lib/RecordIdsPlugin.js
@@ -26,7 +26,7 @@ class RecordIdsPlugin {
 									compiler.context,
 									module.identifier(),
 									compilation.cache
-								)
+							  )
 							: module.identifier();
 						records.modules.byIdentifier[identifier] = module.id;
 						records.modules.usedIds[module.id] = module.id;
@@ -46,7 +46,7 @@ class RecordIdsPlugin {
 										compiler.context,
 										module.identifier(),
 										compilation.cache
-									)
+								  )
 								: module.identifier();
 							const id = records.modules.byIdentifier[identifier];
 							if (id === undefined) continue;

diff --git a/lib/RuntimeTemplate.js b/lib/RuntimeTemplate.js
@@ -86,15 +86,11 @@ module.exports = class RuntimeTemplate {
 		if (exportsType === "namespace") {
 			return rawModule;
 		} else if (exportsType === "named") {
-			return `Object.assign({/* fake namespace object */}, ${
-				rawModule
-			}, { "default": ${rawModule} })`;
+			return `Object.assign({/* fake namespace object */}, ${rawModule}, { "default": ${rawModule} })`;
 		} else if (strict) {
 			return `Object({ /* fake namespace object */ "default": ${rawModule} })`;
 		} else {
-			return `Object(function() { var module = ${
-				rawModule
-			}; return typeof module === "object" && module && module.__esModule ? module : Object.assign({/* fake namespace object */}, typeof module === "object" && module, { "default": module }); }())`;
+			return `Object(function() { var module = ${rawModule}; return typeof module === "object" && module && module.__esModule ? module : Object.assign({/* fake namespace object */}, typeof module === "object" && module, { "default": module }); }())`;
 		}
 	}
 
@@ -120,11 +116,7 @@ module.exports = class RuntimeTemplate {
 				header += `var id = ${idExpr}; `;
 				idExpr = "id";
 			}
-			header += `if(!__webpack_require__.m[${
-				idExpr
-			}]) { var e = new Error("Module '" + ${
-				idExpr
-			} + "' is not available (weak dependency)"); e.code = 'MODULE_NOT_FOUND'; throw e; } `;
+			header += `if(!__webpack_require__.m[${idExpr}]) { var e = new Error("Module '" + ${idExpr} + "' is not available (weak dependency)"); e.code = 'MODULE_NOT_FOUND'; throw e; } `;
 		}
 		const rawModule = this.moduleRaw({
 			module,
@@ -135,22 +127,14 @@ module.exports = class RuntimeTemplate {
 			if (header) {
 				getModuleFunction = `function() { ${header}return ${rawModule}; }`;
 			} else {
-				getModuleFunction = `__webpack_require__.bind(null, ${comment}${
-					idExpr
-				})`;
+				getModuleFunction = `__webpack_require__.bind(null, ${comment}${idExpr})`;
 			}
 		} else if (exportsType === "named") {
-			getModuleFunction = `function() { ${header}var module = ${
-				rawModule
-			}; return Object.assign({/* fake namespace object */}, module, { "default": module }); }`;
+			getModuleFunction = `function() { ${header}var module = ${rawModule}; return Object.assign({/* fake namespace object */}, module, { "default": module }); }`;
 		} else if (strict) {
-			getModuleFunction = `function() { ${
-				header
-			}return { /* fake namespace object */ "default": ${rawModule} }; }`;
+			getModuleFunction = `function() { ${header}return { /* fake namespace object */ "default": ${rawModule} }; }`;
 		} else {
-			getModuleFunction = `function() { ${header}var module = ${
-				rawModule
-			}; return typeof module === "object" && module && module.__esModule ? module : Object.assign({/* fake namespace object */}, typeof module === "object" && module, { "default": module }); }`;
+			getModuleFunction = `function() { ${header}var module = ${rawModule}; return typeof module === "object" && module && module.__esModule ? module : Object.assign({/* fake namespace object */}, typeof module === "object" && module, { "default": module }); }`;
 		}
 
 		return `${promise || "Promise.resolve()"}.then(${getModuleFunction})`;
@@ -167,28 +151,18 @@ module.exports = class RuntimeTemplate {
 		const optDeclaration = update ? "" : "var ";
 
 		const exportsType = module.buildMeta && module.buildMeta.exportsType;
-		let content = `/* harmony import */ ${optDeclaration}${
-			importVar
-		} = __webpack_require__(${comment}${JSON.stringify(module.id)});\n`;
+		let content = `/* harmony import */ ${optDeclaration}${importVar} = __webpack_require__(${comment}${JSON.stringify(
+			module.id
+		)});\n`;
 
 		if (!exportsType && !originModule.buildMeta.strictHarmonyModule) {
-			content += `/* harmony import */ ${optDeclaration}${
-				importVar
-			}_default = /*#__PURE__*/__webpack_require__.n(${importVar});\n`;
+			content += `/* harmony import */ ${optDeclaration}${importVar}_default = /*#__PURE__*/__webpack_require__.n(${importVar});\n`;
 		}
 		if (exportsType === "named") {
 			if (Array.isArray(module.buildMeta.providedExports))
-				content += `${optDeclaration}${
-					importVar
-				}_namespace = /*#__PURE__*/Object.assign({}, ${
-					importVar
-				}, {"default": ${importVar}});\n`;
+				content += `${optDeclaration}${importVar}_namespace = /*#__PURE__*/Object.assign({}, ${importVar}, {"default": ${importVar}});\n`;
 			else
-				content += `${optDeclaration}${
-					importVar
-				}_namespace = /*#__PURE__*/{ /* fake namespace object */ "default": ${
-					importVar
-				} };\n`;
+				content += `${optDeclaration}${importVar}_namespace = /*#__PURE__*/{ /* fake namespace object */ "default": ${importVar} };\n`;
 		}
 		return content;
 	}
@@ -223,13 +197,9 @@ module.exports = class RuntimeTemplate {
 					return "/* non-default import from non-esm module */undefined";
 				} else if (!exportName) {
 					if (asiSafe) {
-						return `/*#__PURE__*/{ /* fake namespace object */ "default": ${
-							importVar
-						} }`;
+						return `/*#__PURE__*/{ /* fake namespace object */ "default": ${importVar} }`;
 					} else {
-						return `/*#__PURE__*/Object({ /* fake namespace object */ "default": ${
-							importVar
-						} })`;
+						return `/*#__PURE__*/Object({ /* fake namespace object */ "default": ${importVar} })`;
 					}
 				}
 			}

diff --git a/lib/TemplatedPathPlugin.js b/lib/TemplatedPathPlugin.js
@@ -81,9 +81,7 @@ const replacePathVariables = (path, data) => {
 			REGEXP_CONTENTHASH_FOR_TEST.test(path))
 	) {
 		throw new Error(
-			`Cannot use [chunkhash] or [contenthash] for chunk in '${
-				path
-			}' (use [hash] instead)`
+			`Cannot use [chunkhash] or [contenthash] for chunk in '${path}' (use [hash] instead)`
 		);
 	}