Cherry-pick 16.5 RC package changes

bin/tsconfig.json

@@ -17,7 +17,6 @@
 	},
 	"files": [
 		"./api-docs/update-api-docs.js",
-		"./check-latest-npm.js",
 		"./plugin/config.js",
 		"./plugin/commands/changelog.js",
 		"./plugin/commands/performance.js",

package.json

@@ -359,8 +359,7 @@
 			"wp-scripts lint-style"
 		],
 		"package-lock.json": [
-			"npm run lint:lockfile",
-			"node ./bin/check-latest-npm.js"
+			"npm run lint:lockfile"
 		],
 		"packages/*/package.json": [
 			"wp-scripts lint-pkg-json"

packages/dependency-extraction-webpack-plugin/lib/index.js

@@ -62,28 +62,38 @@ class DependencyExtractionWebpackPlugin {
 	externalizeWpDeps( { request }, callback ) {
 		let externalRequest;
 
-		// Handle via options.requestToExternal(Module)  first.
-		if ( this.useModules ) {
-			if ( typeof this.options.requestToExternalModule === 'function' ) {
-				externalRequest =
-					this.options.requestToExternalModule( request );
+		try {
+			// Handle via options.requestToExternal(Module)  first.
+			if ( this.useModules ) {
+				if (
+					typeof this.options.requestToExternalModule === 'function'
+				) {
+					externalRequest =
+						this.options.requestToExternalModule( request );
+
+					// requestToExternalModule allows a boolean shorthand
+					if ( externalRequest === false ) {
+						externalRequest = undefined;
+					}
+					if ( externalRequest === true ) {
+						externalRequest = request;
+					}
+				}
+			} else if ( typeof this.options.requestToExternal === 'function' ) {
+				externalRequest = this.options.requestToExternal( request );
 			}
-		} else if ( typeof this.options.requestToExternal === 'function' ) {
-			externalRequest = this.options.requestToExternal( request );
-		}
-
-		// Cascade to default if unhandled and enabled.
-		if (
-			typeof externalRequest === 'undefined' &&
-			this.options.useDefaults
-		) {
-			externalRequest = this.useModules
-				? defaultRequestToExternalModule( request )
-				: defaultRequestToExternal( request );
-		}
 
-		if ( this.useModules && externalRequest === true ) {
-			externalRequest = request;
+			// Cascade to default if unhandled and enabled.
+			if (
+				typeof externalRequest === 'undefined' &&
+				this.options.useDefaults
+			) {
+				externalRequest = this.useModules
+					? defaultRequestToExternalModule( request )
+					: defaultRequestToExternal( request );
+			}
+		} catch ( err ) {
+			return callback( err );
 		}
 
 		if ( externalRequest ) {

packages/dependency-extraction-webpack-plugin/lib/util.js

@@ -61,9 +61,13 @@ function defaultRequestToExternal( request ) {
  *
  * Currently only @wordpress/interactivity
  *
+ * Do not use the boolean shorthand here, it's only handled for the `requestToExternalModule` option.
+ *
  * @param {string} request Module request (the module name in `import from`) to be transformed
- * @return {string|undefined} The resulting external definition. Return `undefined`
- *   to ignore the request. Return `string` to map the request to an external. This may simply be returning the request, e.g. `@wordpress/interactivity` maps to the external `@wordpress/interactivity`.
+ * @return {string|Error|undefined} The resulting external definition.
+ *   - Return `undefined` to ignore the request (do not externalize).
+ *   - Return `string` to map the request to an external.
+ *   - Return `Error` to emit an error.
  */
 function defaultRequestToExternalModule( request ) {
 	if ( request === '@wordpress/interactivity' ) {
@@ -73,6 +77,14 @@ function defaultRequestToExternalModule( request ) {
 		// which forces @wordpress/interactivity imports to be hoisted to static imports.
 		return `module ${ request }`;
 	}
+
+	const isWordPressScript = Boolean( defaultRequestToExternal( request ) );
+
+	if ( isWordPressScript ) {
+		throw new Error(
+			`Attempted to use WordPress script in a module: ${ request }, which is not supported yet.`
+		);
+	}
 }
 
 /**