Create Block: Fix issue with processing unrelated engines (#29066)

WordPress · Feb 18, 2021 · cdcfa64 · cdcfa64
1 parent e8b901c
commit cdcfa64
Show file tree

Hide file tree

Showing 7 changed files with 69 additions and 24 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/README.md b/packages/README.md
@@ -85,7 +85,7 @@ _Example:_
 ```diff
 +++ b/packages/scripts/package.json
 @@ -43,7 +43,6 @@
-                "check-node-version": "^3.1.1",
+                "check-node-version": "^4.1.0",
                 "cross-spawn": "^5.1.0",
                 "eslint": "^7.1.0",
 -               "jest": "^26.6.3",

diff --git a/packages/create-block/CHANGELOG.md b/packages/create-block/CHANGELOG.md
@@ -10,6 +10,10 @@
 
 -   Block scaffolded with `esnext` template is now registered from `block.json` with the `register_block_type_from_metadata` helper ([#28883](https://github.com/WordPress/gutenberg/pull/28883)).
 
+### Bug Fixes
+
+-   Updated `check-node-version` to version `^4.1.0` that no longer processes unrelated engines ([#29066](https://github.com/WordPress/gutenberg/pull/29066)).
+
 ## 2.0.1 (2021-02-01)
 
 ### Bug Fix

diff --git a/packages/create-block/package.json b/packages/create-block/package.json
@@ -33,7 +33,7 @@
 	"dependencies": {
 		"@wordpress/lazy-import": "file:../lazy-import",
 		"chalk": "^4.0.0",
-		"check-node-version": "^3.1.1",
+		"check-node-version": "^4.1.0",
 		"commander": "^4.1.0",
 		"execa": "^4.0.2",
 		"fast-glob": "^2.2.7",

diff --git a/packages/scripts/CHANGELOG.md b/packages/scripts/CHANGELOG.md
@@ -2,10 +2,15 @@
 
 ## Unreleased
 
+### New Features
+
+-   Default `check-engines` command to the `engines` config in `package.json` file of the current project ([#29066](https://github.com/WordPress/gutenberg/pull/29066)).
+
 ### Enhancements
 
 -   Make `check-licenses` command compatible with npm v7 ([#28909](https://github.com/WordPress/gutenberg/pull/28909)).
 -   Add `Python 2.0` to non-GPL compatible OSS licenses allowed for development in `check-licenses` command ([#29968](https://github.com/WordPress/gutenberg/pull/28968)).
+-   Updated `check-node-version` to version `^4.1.0` that no longer processes unrelated engines with `check-engines` command ([#29066](https://github.com/WordPress/gutenberg/pull/29066)).
 
 ## 13.0.0 (2021-01-21)
 

diff --git a/packages/scripts/package.json b/packages/scripts/package.json
@@ -44,7 +44,7 @@
 		"babel-jest": "^26.6.3",
 		"babel-loader": "^8.1.0",
 		"chalk": "^4.0.0",
-		"check-node-version": "^3.1.1",
+		"check-node-version": "^4.1.0",
 		"clean-webpack-plugin": "^3.0.0",
 		"cross-spawn": "^5.1.0",
 		"css-loader": "^3.5.2",

diff --git a/packages/scripts/scripts/check-engines.js b/packages/scripts/scripts/check-engines.js
@@ -7,7 +7,7 @@ const { sync: resolveBin } = require( 'resolve-bin' );
 /**
  * Internal dependencies
  */
-const { getArgsFromCLI, hasArgInCLI } = require( '../utils' );
+const { getArgsFromCLI, hasArgInCLI, getPackageProp } = require( '../utils' );
 
 const getConfig = () => {
 	const hasConfig =
@@ -19,9 +19,8 @@ const getConfig = () => {
 	if ( hasConfig ) {
 		return [];
 	}
-	const {
-		engines: { node, npm },
-	} = require( '../package.json' );
+	const { node, npm } =
+		getPackageProp( 'engines' ) || require( '../package.json' ).engines;
 
 	return [ '--node', node, '--npm', npm ];
 };