fix(npm-scripts): temporary work around for grabbing rules config at …

…both the root and module level
bryceosterhaus · Jan 18, 2023 · 92591ce · 92591ce
1 parent a6ad830
commit 92591ce
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 2 deletions.
diff --git a/projects/npm-tools/packages/npm-scripts/src/utils/collectDefinedDependencies.js b/projects/npm-tools/packages/npm-scripts/src/utils/collectDefinedDependencies.js
@@ -3,10 +3,26 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-const getUserConfig = require('./getUserConfig');
+const path = require('path');
+
+const findRoot = require('./findRoot');
 
 function collectDefinedDependencies() {
-	const rootConfig = getUserConfig('npmscripts');
+	const rootDir = findRoot();
+
+	let rootConfig = {};
+
+	if (!rootDir) {
+		return new Set();
+	}
+
+	try {
+		/* eslint-disable-next-line @liferay/no-dynamic-require */
+		rootConfig = require(path.join(rootDir, 'npmscripts.config'));
+	}
+	catch (error) {
+		return new Set();
+	}
 
 	const amdImports = new Set(
 		Object.entries(rootConfig.build.bundler.config.imports).reduce(

diff --git a/projects/npm-tools/packages/npm-scripts/src/utils/getMergedConfig.js b/projects/npm-tools/packages/npm-scripts/src/utils/getMergedConfig.js
@@ -201,6 +201,10 @@ function getMergedConfig(type, property) {
 				mergedConfig = deepMerge(
 					[
 						require('../config/npmscripts.config'),
+
+						// Temporary workaround until we re-evaluate global key
+
+						{rules: rootConfig.global?.rules || {}},
 						rootConfig,
 						getUserConfig('npmscripts'),
 					],