Merge branch 'master' into feat/issue_11571

.eslintrc.js

@@ -96,7 +96,8 @@ module.exports = {
 				"jest/globals": true
 			},
 			globals: {
-				nsObj: false
+				nsObj: false,
+				jasmine: false
 			}
 		}
 	]

bin/webpack.js

@@ -41,6 +41,19 @@ const isInstalled = packageName => {
 	}
 };
 
+/**
+ * @param {CliOption} cli options
+ * @returns {void}
+ */
+const runCli = cli => {
+	const path = require("path");
+	const pkgPath = require.resolve(`${cli.package}/package.json`);
+	// eslint-disable-next-line node/no-missing-require
+	const pkg = require(pkgPath);
+	// eslint-disable-next-line node/no-missing-require
+	require(path.resolve(path.dirname(pkgPath), pkg.bin[cli.binName]));
+};
+
 /**
  * @typedef {Object} CliOption
  * @property {string} name display name
@@ -69,15 +82,22 @@ if (!cli.installed) {
 
 	console.error(notify);
 
-	const isYarn = fs.existsSync(path.resolve(process.cwd(), "yarn.lock"));
+	let packageManager;
+
+	if (fs.existsSync(path.resolve(process.cwd(), "yarn.lock"))) {
+		packageManager = "yarn";
+	} else if (fs.existsSync(path.resolve(process.cwd(), "pnpm-lock.yaml"))) {
+		packageManager = "pnpm";
+	} else {
+		packageManager = "npm";
+	}
 
-	const packageManager = isYarn ? "yarn" : "npm";
-	const installOptions = [isYarn ? "add" : "install", "-D"];
+	const installOptions = [packageManager === "yarn" ? "add" : "install", "-D"];
 
 	console.error(
 		`We will use "${packageManager}" to install the CLI via "${packageManager} ${installOptions.join(
 			" "
-		)}".`
+		)} ${cli.package}".`
 	);
 
 	const question = `Do you want to install 'webpack-cli' (yes/no): `;
@@ -116,18 +136,13 @@ if (!cli.installed) {
 
 		runCommand(packageManager, installOptions.concat(cli.package))
 			.then(() => {
-				require(cli.package); //eslint-disable-line
+				runCli(cli);
 			})
 			.catch(error => {
 				console.error(error);
 				process.exitCode = 1;
 			});
 	});
 } else {
-	const path = require("path");
-	const pkgPath = require.resolve(`${cli.package}/package.json`);
-	// eslint-disable-next-line node/no-missing-require
-	const pkg = require(pkgPath);
-	// eslint-disable-next-line node/no-missing-require
-	require(path.resolve(path.dirname(pkgPath), pkg.bin[cli.binName]));
+	runCli(cli);
 }

cspell.json

@@ -181,6 +181,8 @@
     "destructure",
     "onconnect",
     "nwjs",
+    "redeclaration",
+    "kaios",
 
     "webassemblyjs",
     "fsevents",
@@ -218,7 +220,9 @@
     "codecov",
     "opencollective",
     "dependabot",
-    "browserslist"
+    "browserslist",
+    "samsunginternet",
+    "pnpm"
   ],
   "ignoreRegExpList": ["/Author.+/", "/data:.*/", "/\"mappings\":\".+\"/"],
   "ignorePaths": ["**/dist/**", "examples/**/README.md"]

declarations.d.ts

@@ -234,6 +234,7 @@ declare module "@webassemblyjs/ast" {
 		args: string[];
 		result: string[];
 	}
+	export function moduleContextFromModuleAST(ast: any): any;
 
 	// Node matcher
 	export function isGlobalType(n: Node): boolean;
@@ -243,7 +244,7 @@ declare module "@webassemblyjs/ast" {
 }
 
 declare module "webpack-sources" {
-	type MapOptions = { columns?: boolean; module?: boolean };
+	export type MapOptions = { columns?: boolean; module?: boolean };
 
 	export abstract class Source {
 		size(): number;
@@ -299,15 +300,17 @@ declare module "webpack-sources" {
 			name: string,
 			sourceMap: Object | string | Buffer,
 			originalSource?: string | Buffer,
-			innerSourceMap?: Object | string | Buffer
+			innerSourceMap?: Object | string | Buffer,
+			removeOriginalSource?: boolean
 		);
 
 		getArgsAsBuffers(): [
 			Buffer,
 			string,
 			Buffer,
 			Buffer | undefined,
-			Buffer | undefined
+			Buffer | undefined,
+			boolean
 		];
 	}
 

declarations.test.d.ts

@@ -1,4 +1,5 @@
 declare module "*.json";
+declare module "mini-css-extract-plugin";
 
 declare namespace jest {
 	interface Matchers<R> {