webpack 5.99.8 → 5.100.0

package/lib/cli.js

@@ -68,6 +68,8 @@ const webpackSchema = require("../schemas/WebpackOptions.json");
 
 /** @typedef {Record<string, Argument>} Flags */
 
+/** @typedef {Record<string, EXPECTED_ANY>} ObjectConfiguration */
+
 /**
  * @param {Schema=} schema a json schema to create arguments for (by default webpack schema is used)
  * @returns {Flags} object of arguments
@@ -429,10 +431,10 @@ const cliAddedItems = new WeakMap();
 /** @typedef {string | number} Property */
 
 /**
- * @param {Configuration} config configuration
+ * @param {ObjectConfiguration} config configuration
  * @param {string} schemaPath path in the config
  * @param {number | undefined} index index of value when multiple values are provided, otherwise undefined
- * @returns {{ problem?: LocalProblem, object?: TODO, property?: Property, value?: EXPECTED_OBJECT | EXPECTED_ANY[] }} problem or object with property and value
+ * @returns {{ problem?: LocalProblem, object?: ObjectConfiguration, property?: Property, value?: EXPECTED_OBJECT | EXPECTED_ANY[] }} problem or object with property and value
  */
 const getObjectAndProperty = (config, schemaPath, index = 0) => {
 	if (!schemaPath) return { value: config };
@@ -529,7 +531,7 @@ const getObjectAndProperty = (config, schemaPath, index = 0) => {
 };
 
 /**
- * @param {Configuration} config configuration
+ * @param {ObjectConfiguration} config configuration
  * @param {string} schemaPath path in the config
  * @param {ParsedValue} value parsed value
  * @param {number | undefined} index index of value when multiple values are provided, otherwise undefined
@@ -542,13 +544,14 @@ const setValue = (config, schemaPath, value, index) => {
 		index
 	);
 	if (problem) return problem;
-	object[/** @type {Property} */ (property)] = value;
+	/** @type {ObjectConfiguration} */
+	(object)[/** @type {Property} */ (property)] = value;
 	return null;
 };
 
 /**
  * @param {ArgumentConfig} argConfig processing instructions
- * @param {Configuration} config configuration
+ * @param {ObjectConfiguration} config configuration
  * @param {Value} value the value
  * @param {number | undefined} index the index if multiple values provided
  * @returns {LocalProblem | null} a problem if any
@@ -632,16 +635,18 @@ const parseValueForArgumentConfig = (argConfig, value) => {
 			if (typeof value === "string") {
 				// cspell:word yugi
 				const match = /^\/(.*)\/([yugi]*)$/.exec(value);
-				if (match && !/[^\\]\//.test(match[1]))
+				if (match && !/[^\\]\//.test(match[1])) {
 					return new RegExp(match[1], match[2]);
+				}
 			}
 			break;
 		case "enum": {
 			const values =
 				/** @type {EnumValue[]} */
 				(argConfig.values);
-			if (values.includes(/** @type {Exclude<Value, RegExp>} */ (value)))
+			if (values.includes(/** @type {Exclude<Value, RegExp>} */ (value))) {
 				return value;
+			}
 			for (const item of values) {
 				if (`${item}` === value) return item;
 			}
@@ -653,12 +658,12 @@ const parseValueForArgumentConfig = (argConfig, value) => {
 	}
 };
 
-/** @typedef {TODO} Configuration */
+/** @typedef {Record<string, Value[]>} Values */
 
 /**
  * @param {Flags} args object of arguments
- * @param {Configuration} config configuration
- * @param {Record<string, Value[]>} values object with values
+ * @param {ObjectConfiguration} config configuration
+ * @param {Values} values object with values
  * @returns {Problem[] | null} problems or null for success
  */
 const processArguments = (args, config, values) => {

package/lib/config/browserslistTargetHandler.js

@@ -5,8 +5,8 @@
 
 "use strict";
 
-const browserslist = require("browserslist");
 const path = require("path");
+const browserslist = require("browserslist");
 
 /** @typedef {import("./target").ApiTargetProperties} ApiTargetProperties */
 /** @typedef {import("./target").EcmaTargetProperties} EcmaTargetProperties */
@@ -358,6 +358,6 @@ const resolve = browsers => {
 };
 
 module.exports = {
-	resolve,
-	load
+	load,
+	resolve
 };

package/lib/config/defaults.js

@@ -8,26 +8,26 @@
 const fs = require("fs");
 const path = require("path");
 const {
-	JAVASCRIPT_MODULE_TYPE_AUTO,
-	JAVASCRIPT_MODULE_TYPE_ESM,
-	JAVASCRIPT_MODULE_TYPE_DYNAMIC,
-	JSON_MODULE_TYPE,
-	WEBASSEMBLY_MODULE_TYPE_ASYNC,
-	WEBASSEMBLY_MODULE_TYPE_SYNC,
 	ASSET_MODULE_TYPE,
 	ASSET_MODULE_TYPE_INLINE,
 	ASSET_MODULE_TYPE_RESOURCE,
-	CSS_MODULE_TYPE_AUTO,
 	CSS_MODULE_TYPE,
+	CSS_MODULE_TYPE_AUTO,
+	CSS_MODULE_TYPE_GLOBAL,
 	CSS_MODULE_TYPE_MODULE,
-	CSS_MODULE_TYPE_GLOBAL
+	JAVASCRIPT_MODULE_TYPE_AUTO,
+	JAVASCRIPT_MODULE_TYPE_DYNAMIC,
+	JAVASCRIPT_MODULE_TYPE_ESM,
+	JSON_MODULE_TYPE,
+	WEBASSEMBLY_MODULE_TYPE_ASYNC,
+	WEBASSEMBLY_MODULE_TYPE_SYNC
 } = require("../ModuleTypeConstants");
 const Template = require("../Template");
 const { cleverMerge } = require("../util/cleverMerge");
 const {
-	getTargetsProperties,
+	getDefaultTarget,
 	getTargetProperties,
-	getDefaultTarget
+	getTargetsProperties
 } = require("./target");
 
 /** @typedef {import("../../declarations/WebpackOptions").CacheOptions} CacheOptions */
@@ -287,6 +287,7 @@ const applyWebpackOptionsDefaults = (options, compilerIndex) => {
 	F(options, "externalsType", () => {
 		const validExternalTypes = require("../../schemas/WebpackOptions.json")
 			.definitions.ExternalsType.enum;
+
 		return options.output.library &&
 			validExternalTypes.includes(options.output.library.type)
 			? /** @type {ExternalsType} */ (options.output.library.type)
@@ -585,6 +586,7 @@ const applyJavascriptParserOptionsDefaults = (
 	D(parserOptions, "dynamicImportPreload", false);
 	D(parserOptions, "dynamicImportFetchPriority", false);
 	D(parserOptions, "createRequire", isNode);
+	D(parserOptions, "dynamicUrl", true);
 	if (futureDefaults) D(parserOptions, "exportsPresence", "error");
 };
 
@@ -993,7 +995,7 @@ const applyOutputDefaults = (
 		if (libraryName) return libraryName;
 		const pkgPath = path.resolve(context, "package.json");
 		try {
-			const packageInfo = JSON.parse(fs.readFileSync(pkgPath, "utf-8"));
+			const packageInfo = JSON.parse(fs.readFileSync(pkgPath, "utf8"));
 			return packageInfo.name || "";
 		} catch (err) {
 			if (/** @type {Error & { code: string }} */ (err).code !== "ENOENT") {
@@ -1240,7 +1242,7 @@ const applyOutputDefaults = (
 					tp.nodeBuiltins === null ||
 					tp.importScriptsInWorker === null) &&
 				output.module &&
-				environment.dynamicImport
+				environment.dynamicImportInWorker
 			) {
 				return "universal";
 			}
@@ -1275,7 +1277,11 @@ const applyOutputDefaults = (
 		"hotUpdateChunkFilename",
 		`[id].[fullhash].hot-update.${output.module ? "mjs" : "js"}`
 	);
-	D(output, "hotUpdateMainFilename", "[runtime].[fullhash].hot-update.json");
+	D(
+		output,
+		"hotUpdateMainFilename",
+		`[runtime].[fullhash].hot-update.${output.module ? "json.mjs" : "json"}`
+	);
 	D(output, "crossOriginLoading", false);
 	F(output, "scriptType", () => (output.module ? "module" : false));
 	D(
@@ -1348,7 +1354,7 @@ const applyOutputDefaults = (
 				enabledChunkLoadingTypes.add(desc.chunkLoading);
 			}
 		});
-		return Array.from(enabledChunkLoadingTypes);
+		return [...enabledChunkLoadingTypes];
 	});
 
 	A(output, "enabledWasmLoadingTypes", () => {
@@ -1364,7 +1370,7 @@ const applyOutputDefaults = (
 				enabledWasmLoadingTypes.add(desc.wasmLoading);
 			}
 		});
-		return Array.from(enabledWasmLoadingTypes);
+		return [...enabledWasmLoadingTypes];
 	});
 };
 
@@ -1480,8 +1486,9 @@ const applyNodeDefaults = (
 	});
 
 	const handlerForNames = () => {
-		if (targetProperties && targetProperties.node)
+		if (targetProperties && targetProperties.node) {
 			return outputModule ? "node-module" : "eval-only";
+		}
 		// TODO webpack 6 should always default to false
 		return futureDefaults ? "warn-mock" : "mock";
 	};
@@ -1549,6 +1556,7 @@ const applyOptimizationDefaults = (
 			apply: compiler => {
 				// Lazy load the Terser plugin
 				const TerserPlugin = require("terser-webpack-plugin");
+
 				new TerserPlugin({
 					terserOptions: {
 						compress: {
@@ -1738,7 +1746,7 @@ const applyInfrastructureLoggingDefaults = infrastructureLogging => {
 	D(infrastructureLogging, "appendOnly", !tty);
 };
 
+module.exports.DEFAULTS = DEFAULTS;
 module.exports.applyWebpackOptionsBaseDefaults =
 	applyWebpackOptionsBaseDefaults;
 module.exports.applyWebpackOptionsDefaults = applyWebpackOptionsDefaults;
-module.exports.DEFAULTS = DEFAULTS;

package/lib/config/normalization.js

@@ -386,8 +386,9 @@ const getNormalizedWebpackOptions = config => ({
 			strictModuleExceptionHandling: output.strictModuleExceptionHandling,
 			trustedTypes: optionalNestedConfig(output.trustedTypes, trustedTypes => {
 				if (trustedTypes === true) return {};
-				if (typeof trustedTypes === "string")
+				if (typeof trustedTypes === "string") {
 					return { policyName: trustedTypes };
+				}
 				return { ...trustedTypes };
 			}),
 			uniqueName: output.uniqueName,

package/lib/config/target.js

@@ -194,7 +194,7 @@ You can also more options via the 'target' option: 'browserslist' / 'browserslis
 				destructuring: v(6),
 				bigIntLiteral: v(10, 4),
 				dynamicImport: v(12, 17),
-				dynamicImportInWorker: major ? false : undefined,
+				dynamicImportInWorker: v(12, 17),
 				module: v(12, 17)
 			};
 		}
@@ -240,7 +240,7 @@ You can also more options via the 'target' option: 'browserslist' / 'browserslis
 				destructuring: v(1, 1),
 				bigIntLiteral: v(4),
 				dynamicImport: v(11),
-				dynamicImportInWorker: major ? false : undefined,
+				dynamicImportInWorker: v(11),
 				module: v(11)
 			};
 		}
@@ -278,7 +278,7 @@ You can also more options via the 'target' option: 'browserslist' / 'browserslis
 				destructuring: v(0, 15),
 				bigIntLiteral: v(0, 32),
 				dynamicImport: v(0, 43),
-				dynamicImportInWorker: major ? false : undefined,
+				dynamicImportInWorker: v(0, 44),
 				module: v(0, 43)
 			};
 		}
@@ -289,7 +289,7 @@ You can also more options via the 'target' option: 'browserslist' / 'browserslis
 		/^es(\d+)$/,
 		version => {
 			let v = Number(version);
-			if (v < 1000) v = v + 2009;
+			if (v < 1000) v += 2009;
 			return {
 				const: v >= 2015,
 				templateLiteral: v >= 2015,
@@ -357,9 +357,10 @@ const mergeTargetProperties = targetProperties => {
 					break;
 			}
 		}
-		if (hasTrue || hasFalse)
+		if (hasTrue || hasFalse) {
 			/** @type {TargetProperties} */
 			(result)[key] = hasFalse && hasTrue ? null : Boolean(hasTrue);
+		}
 	}
 	return result;
 };

package/lib/container/ContainerPlugin.js

@@ -22,7 +22,7 @@ const getModuleFederationPlugin = memoize(() =>
 );
 
 const validate = createSchemaValidation(
-	require("../../schemas/plugins/container/ContainerPlugin.check.js"),
+	require("../../schemas/plugins/container/ContainerPlugin.check"),
 	() => require("../../schemas/plugins/container/ContainerPlugin.json"),
 	{
 		name: "Container Plugin",

package/lib/container/ContainerReferencePlugin.js

@@ -21,7 +21,7 @@ const { parseOptions } = require("./options");
 /** @typedef {import("../Compiler")} Compiler */
 
 const validate = createSchemaValidation(
-	require("../../schemas/plugins/container/ContainerReferencePlugin.check.js"),
+	require("../../schemas/plugins/container/ContainerReferencePlugin.check"),
 	() =>
 		require("../../schemas/plugins/container/ContainerReferencePlugin.json"),
 	{

package/lib/container/FallbackModule.js

@@ -104,8 +104,9 @@ class FallbackModule extends Module {
 		};
 
 		this.clearDependenciesAndBlocks();
-		for (const request of this.requests)
+		for (const request of this.requests) {
 			this.addDependency(new FallbackItemDependency(request));
+		}
 
 		callback();
 	}

package/lib/container/HoistContainerReferencesPlugin.js

@@ -56,7 +56,7 @@ class HoistContainerReferences {
 					// advanced stage is where SplitChunksPlugin runs.
 					stage: STAGE_ADVANCED + 1
 				},
-				chunks => {
+				_chunks => {
 					this.hoistModulesInChunks(
 						compilation,
 						depsToTrace,

package/lib/container/ModuleFederationPlugin.js

@@ -6,7 +6,7 @@
 "use strict";
 
 const { SyncHook } = require("tapable");
-const isValidExternalsType = require("../../schemas/plugins/container/ExternalsType.check.js");
+const isValidExternalsType = require("../../schemas/plugins/container/ExternalsType.check");
 const Compilation = require("../Compilation");
 const SharePlugin = require("../sharing/SharePlugin");
 const createSchemaValidation = require("../util/create-schema-validation");
@@ -27,7 +27,7 @@ const HoistContainerReferences = require("./HoistContainerReferencesPlugin");
  */
 
 const validate = createSchemaValidation(
-	require("../../schemas/plugins/container/ModuleFederationPlugin.check.js"),
+	require("../../schemas/plugins/container/ModuleFederationPlugin.check"),
 	() => require("../../schemas/plugins/container/ModuleFederationPlugin.json"),
 	{
 		name: "Module Federation Plugin",

package/lib/container/RemoteModule.js

@@ -141,7 +141,7 @@ class RemoteModule extends Module {
 	 * @param {CodeGenerationContext} context context for code generation
 	 * @returns {CodeGenerationResult} result
 	 */
-	codeGeneration({ runtimeTemplate, moduleGraph, chunkGraph }) {
+	codeGeneration({ moduleGraph, chunkGraph }) {
 		const module = moduleGraph.getModule(this.dependencies[0]);
 		const id = module && chunkGraph.getModuleId(module);
 		const sources = new Map();

package/lib/css/CssGenerator.js

@@ -5,16 +5,16 @@
 
 "use strict";
 
-const { ReplaceSource, RawSource, ConcatSource } = require("webpack-sources");
+const { ConcatSource, RawSource, ReplaceSource } = require("webpack-sources");
 const { UsageState } = require("../ExportsInfo");
 const Generator = require("../Generator");
 const InitFragment = require("../InitFragment");
 const {
+	CSS_TYPE,
+	CSS_TYPES,
 	JS_AND_CSS_EXPORT_TYPES,
 	JS_AND_CSS_TYPES,
-	CSS_TYPES,
-	JS_TYPE,
-	CSS_TYPE
+	JS_TYPE
 } = require("../ModuleSourceTypesConstants");
 const RuntimeGlobals = require("../RuntimeGlobals");
 const Template = require("../Template");
@@ -155,7 +155,9 @@ class CssGenerator extends Generator {
 							continue;
 						}
 						let identifier = Template.toIdentifier(usedName);
+
 						const { RESERVED_IDENTIFIER } = require("../util/propertyName");
+
 						if (RESERVED_IDENTIFIER.has(identifier)) {
 							identifier = `_${identifier}`;
 						}
@@ -260,8 +262,9 @@ class CssGenerator extends Generator {
 			if (!connection.originModule) {
 				continue;
 			}
-			if (connection.originModule.type.split("/")[0] !== CSS_TYPE)
+			if (connection.originModule.type.split("/")[0] !== CSS_TYPE) {
 				sourceTypes.add(JS_TYPE);
+			}
 		}
 		if (sourceTypes.has(JS_TYPE)) {
 			return JS_AND_CSS_TYPES;
@@ -289,7 +292,7 @@ class CssGenerator extends Generator {
 				}
 				const exports = cssData.exports;
 				const stringifiedExports = JSON.stringify(
-					Array.from(exports).reduce((obj, [key, value]) => {
+					[...exports].reduce((obj, [key, value]) => {
 						obj[key] = value;
 						return obj;
 					}, /** @type {Record<string, string>} */ ({}))

package/lib/css/CssModulesPlugin.js

@@ -5,13 +5,13 @@
 
 "use strict";
 
-const { SyncWaterfallHook, SyncHook } = require("tapable");
+const { SyncHook, SyncWaterfallHook } = require("tapable");
 const {
+	CachedSource,
 	ConcatSource,
 	PrefixSource,
-	ReplaceSource,
-	CachedSource,
-	RawSource
+	RawSource,
+	ReplaceSource
 } = require("webpack-sources");
 const Compilation = require("../Compilation");
 const CssModule = require("../CssModule");
@@ -19,9 +19,9 @@ const { tryRunOrWebpackError } = require("../HookWebpackError");
 const HotUpdateChunk = require("../HotUpdateChunk");
 const {
 	CSS_MODULE_TYPE,
+	CSS_MODULE_TYPE_AUTO,
 	CSS_MODULE_TYPE_GLOBAL,
-	CSS_MODULE_TYPE_MODULE,
-	CSS_MODULE_TYPE_AUTO
+	CSS_MODULE_TYPE_MODULE
 } = require("../ModuleTypeConstants");
 const NormalModule = require("../NormalModule");
 const RuntimeGlobals = require("../RuntimeGlobals");
@@ -56,6 +56,7 @@ const CssParser = require("./CssParser");
 /** @typedef {import("../Compilation").ChunkHashContext} ChunkHashContext */
 /** @typedef {import("../Compiler")} Compiler */
 /** @typedef {import("../CssModule").Inheritance} Inheritance */
+/** @typedef {import("../CssModule").CSSModuleCreateData} CSSModuleCreateData */
 /** @typedef {import("../Module")} Module */
 /** @typedef {import("../Module").BuildInfo} BuildInfo */
 /** @typedef {import("../Template").RuntimeTemplate} RuntimeTemplate */
@@ -99,6 +100,7 @@ const getCssLoadingRuntimeModule = memoize(() =>
  */
 const getSchema = name => {
 	const { definitions } = require("../../schemas/WebpackOptions.json");
+
 	return {
 		definitions,
 		oneOf: [{ $ref: `#/definitions/${name}` }]
@@ -111,22 +113,22 @@ const generatorValidationOptions = {
 };
 const validateGeneratorOptions = {
 	css: createSchemaValidation(
-		require("../../schemas/plugins/css/CssGeneratorOptions.check.js"),
+		require("../../schemas/plugins/css/CssGeneratorOptions.check"),
 		() => getSchema("CssGeneratorOptions"),
 		generatorValidationOptions
 	),
 	"css/auto": createSchemaValidation(
-		require("../../schemas/plugins/css/CssAutoGeneratorOptions.check.js"),
+		require("../../schemas/plugins/css/CssAutoGeneratorOptions.check"),
 		() => getSchema("CssAutoGeneratorOptions"),
 		generatorValidationOptions
 	),
 	"css/module": createSchemaValidation(
-		require("../../schemas/plugins/css/CssModuleGeneratorOptions.check.js"),
+		require("../../schemas/plugins/css/CssModuleGeneratorOptions.check"),
 		() => getSchema("CssModuleGeneratorOptions"),
 		generatorValidationOptions
 	),
 	"css/global": createSchemaValidation(
-		require("../../schemas/plugins/css/CssGlobalGeneratorOptions.check.js"),
+		require("../../schemas/plugins/css/CssGlobalGeneratorOptions.check"),
 		() => getSchema("CssGlobalGeneratorOptions"),
 		generatorValidationOptions
 	)
@@ -138,22 +140,22 @@ const parserValidationOptions = {
 };
 const validateParserOptions = {
 	css: createSchemaValidation(
-		require("../../schemas/plugins/css/CssParserOptions.check.js"),
+		require("../../schemas/plugins/css/CssParserOptions.check"),
 		() => getSchema("CssParserOptions"),
 		parserValidationOptions
 	),
 	"css/auto": createSchemaValidation(
-		require("../../schemas/plugins/css/CssAutoParserOptions.check.js"),
+		require("../../schemas/plugins/css/CssAutoParserOptions.check"),
 		() => getSchema("CssAutoParserOptions"),
 		parserValidationOptions
 	),
 	"css/module": createSchemaValidation(
-		require("../../schemas/plugins/css/CssModuleParserOptions.check.js"),
+		require("../../schemas/plugins/css/CssModuleParserOptions.check"),
 		() => getSchema("CssModuleParserOptions"),
 		parserValidationOptions
 	),
 	"css/global": createSchemaValidation(
-		require("../../schemas/plugins/css/CssGlobalParserOptions.check.js"),
+		require("../../schemas/plugins/css/CssGlobalParserOptions.check"),
 		() => getSchema("CssGlobalParserOptions"),
 		parserValidationOptions
 	)
@@ -346,25 +348,34 @@ class CssModulesPlugin {
 											inheritance.push(...parent.inheritance);
 										}
 
-										return new CssModule({
+										return new CssModule(
+											/** @type {CSSModuleCreateData} */
+											({
+												...createData,
+												cssLayer: dependency.layer,
+												supports: dependency.supports,
+												media: dependency.media,
+												inheritance
+											})
+										);
+									}
+
+									return new CssModule(
+										/** @type {CSSModuleCreateData} */
+										({
 											...createData,
 											cssLayer: dependency.layer,
 											supports: dependency.supports,
-											media: dependency.media,
-											inheritance
-										});
-									}
-
-									return new CssModule({
-										...createData,
-										cssLayer: dependency.layer,
-										supports: dependency.supports,
-										media: dependency.media
-									});
+											media: dependency.media
+										})
+									);
 								}
 							}
 
-							return new CssModule(createData);
+							return new CssModule(
+								/** @type {CSSModuleCreateData} */
+								(createData)
+							);
 						});
 
 					NormalModule.getCompilationHooks(compilation).processResult.tap(
@@ -392,7 +403,7 @@ class CssModulesPlugin {
 						const exports = cssData.exports;
 						const stringifiedExports = JSON.stringify(
 							JSON.stringify(
-								Array.from(exports).reduce((obj, [key, value]) => {
+								[...exports].reduce((obj, [key, value]) => {
 									obj[key] = value;
 									return obj;
 								}, /** @type {Record<string, string>} */ ({}))
@@ -622,8 +633,9 @@ class CssModulesPlugin {
 			return { list: sortedModules, set: new Set(sortedModules) };
 		});
 
-		if (modulesByChunkGroup.length === 1)
+		if (modulesByChunkGroup.length === 1) {
 			return modulesByChunkGroup[0].list.reverse();
+		}
 
 		const boundCompareModulesByIdOrIdentifier = compareModulesByIdOrIdentifier(
 			compilation.chunkGraph
@@ -698,8 +710,9 @@ class CssModulesPlugin {
 			// Remove the selected module from all lists
 			for (const { list, set } of modulesByChunkGroup) {
 				const lastModule = list[list.length - 1];
-				if (lastModule === selectedModule) list.pop();
-				else if (hasFailed && set.has(selectedModule)) {
+				if (lastModule === selectedModule) {
+					list.pop();
+				} else if (hasFailed && set.has(selectedModule)) {
 					const idx = list.indexOf(selectedModule);
 					if (idx >= 0) list.splice(idx, 1);
 				}

package/lib/css/CssParser.js

@@ -24,8 +24,8 @@ const StaticExportsDependency = require("../dependencies/StaticExportsDependency
 const binarySearchBounds = require("../util/binarySearchBounds");
 const { parseResource } = require("../util/identifier");
 const {
-	webpackCommentRegExp,
-	createMagicCommentContext
+	createMagicCommentContext,
+	webpackCommentRegExp
 } = require("../util/magicComment");
 const walkCssTokens = require("./walkCssTokens");
 
@@ -117,6 +117,7 @@ const escapeIdentifier = str => {
 
 		let value;
 
+		// eslint-disable-next-line no-control-regex
 		if (/[\t\n\f\r\u000B]/.test(character)) {
 			const codePoint = character.charCodeAt(0);
 
@@ -254,8 +255,9 @@ class LocConverter {
 				} else {
 					this.column = str.length - i - 1;
 					this.line++;
-					while (i > 0 && (i = str.lastIndexOf("\n", i - 1)) !== -1)
+					while (i > 0 && (i = str.lastIndexOf("\n", i - 1)) !== -1) {
 						this.line++;
+					}
 				}
 			} else {
 				let i = this._input.lastIndexOf("\n", this.pos);
@@ -337,7 +339,7 @@ class CssParser extends Parser {
 	 */
 	parse(source, state) {
 		if (Buffer.isBuffer(source)) {
-			source = source.toString("utf-8");
+			source = source.toString("utf8");
 		} else if (typeof source === "object") {
 			throw new Error("webpackAst is unexpected for the CssParser");
 		}