fix: config detection

Author: rigor789

lib/services/project-config-service.ts

@@ -93,108 +93,61 @@ export default {
 		);
 	}
 
-	private getConfigPathsFromPossiblePaths(paths: {
-		[key: string]: string[];
-	}): any {
-		const {
-			possibleTSConfigPaths,
-			possibleJSConfigPaths,
-			possibleNSConfigPaths,
-		} = paths;
-
-		let TSConfigPath;
-		let JSConfigPath;
-		let NSConfigPath;
-
-		// look up a ts config first
-		TSConfigPath = possibleTSConfigPaths
-			.filter(Boolean)
-			.find((path) => this.$fs.exists(path));
-
-		// if not found, look up a JS config
-		if (!TSConfigPath) {
-			JSConfigPath = possibleJSConfigPaths
-				.filter(Boolean)
-				.find((path) => this.$fs.exists(path));
-		}
-
-		// lastly look for nsconfig/json config
-		if (!TSConfigPath && !JSConfigPath) {
-			NSConfigPath = possibleNSConfigPaths
-				.filter(Boolean)
-				.find((path) => this.$fs.exists(path));
-		}
-
-		return {
-			TSConfigPath,
-			JSConfigPath,
-			NSConfigPath,
-			found: TSConfigPath || JSConfigPath || NSConfigPath,
-		};
-	}
-
 	public detectProjectConfigs(projectDir?: string): IProjectConfigInformation {
-		const possibleTSConfigPaths = [];
-		const possibleJSConfigPaths = [];
-		const possibleNSConfigPaths = [];
-		let paths;
-
 		// allow overriding config name with env variable or --config (or -c)
-		const configFilename =
+		let configName: string | boolean =
 			process.env.NATIVESCRIPT_CONFIG_NAME ?? this.$options.config;
-		if (configFilename) {
-			const fullPath = this.$fs.isRelativePath(configFilename)
-				? path.join(projectDir || this.projectHelper.projectDir, configFilename)
-				: configFilename;
 
-			possibleTSConfigPaths.unshift(
-				fullPath.endsWith(".ts") ? fullPath : `${fullPath}.ts`
-			);
-			possibleJSConfigPaths.unshift(
-				fullPath.endsWith(".js") ? fullPath : `${fullPath}.js`
-			);
-			possibleNSConfigPaths.unshift(
-				fullPath.endsWith(".json") ? fullPath : `${fullPath}.json`
-			);
-
-			paths = this.getConfigPathsFromPossiblePaths({
-				possibleTSConfigPaths,
-				possibleJSConfigPaths,
-				possibleNSConfigPaths,
-			});
+		if (configName === "false") {
+			configName = false;
 		}
 
-		// look up default paths if no path found yet
-		if (!paths?.found) {
-			possibleTSConfigPaths.push(
-				path.join(
-					projectDir || this.projectHelper.projectDir,
-					CONFIG_FILE_NAME_TS
-				)
-			);
-			possibleJSConfigPaths.push(
-				path.join(
-					projectDir || this.projectHelper.projectDir,
-					CONFIG_FILE_NAME_JS
-				)
-			);
-			possibleNSConfigPaths.push(
-				path.join(
-					projectDir || this.projectHelper.projectDir,
-					CONFIG_NS_FILE_NAME
-				)
-			);
+		const possibleConfigPaths = [
+			configName &&
+				(configName?.endsWith(".ts") ? configName : `${configName}.ts`),
+			configName &&
+				(configName?.endsWith(".js") ? configName : `${configName}.js`),
+			configName &&
+				(configName?.endsWith(".json") ? configName : `${configName}.json`),
+			CONFIG_FILE_NAME_TS,
+			CONFIG_FILE_NAME_JS,
+			CONFIG_NS_FILE_NAME,
+		]
+			.filter(Boolean)
+			.map((c) => {
+				if (this.$fs.isRelativePath(c)) {
+					return path.join(projectDir || this.projectHelper.projectDir, c);
+				}
 
-			paths = this.getConfigPathsFromPossiblePaths({
-				possibleTSConfigPaths,
-				possibleJSConfigPaths,
-				possibleNSConfigPaths,
+				return c;
 			});
+
+		const existingConfigs = possibleConfigPaths.filter((path) => {
+			return this.$fs.exists(path);
+		});
+
+		// push the first possible config into the "existing" list
+		const hasExistingConfig = !!existingConfigs.length;
+		if (!hasExistingConfig) {
+			this.$logger.trace(
+				`No config file found - falling back to ${possibleConfigPaths[0]}.`
+			);
+			existingConfigs.push(possibleConfigPaths[0]);
 		}
 
-		const hasTSConfig = !!paths.TSConfigPath;
-		const hasJSConfig = !!paths.JSConfigPath;
-		const hasNSConfig = !!paths.NSConfigPath;
+		const TSConfigPath = existingConfigs.find((config) =>
+			config.endsWith(".ts")
+		);
+		const JSConfigPath = existingConfigs.find((config) =>
+			config.endsWith(".js")
+		);
+		const NSConfigPath = existingConfigs.find((config) =>
+			config.endsWith(".json")
+		);
+
+		const hasTSConfig = !!TSConfigPath && hasExistingConfig;
+		const hasJSConfig = !!JSConfigPath && hasExistingConfig;
+		const hasNSConfig = !!NSConfigPath && hasExistingConfig;
 		const usingNSConfig = !(hasTSConfig || hasJSConfig);
 
 		if (hasTSConfig && hasJSConfig) {
@@ -208,9 +161,9 @@ export default {
 			hasJSConfig,
 			hasNSConfig,
 			usingNSConfig,
-			TSConfigPath: paths.TSConfigPath,
-			JSConfigPath: paths.JSConfigPath,
-			NSConfigPath: paths.NSConfigPath,
+			TSConfigPath,
+			JSConfigPath,
+			NSConfigPath,
 		};
 	}
 

lib/services/webpack/webpack-compiler-service.ts

@@ -373,10 +373,13 @@ export class WebpackCompilerService
 
 		// add the config file name to the env data so the webpack process can read the
 		// correct config file when resolving the CLI lib and the config service
-		// we are explicityly setting it to false to force using the defaults
+		// we are explicitly setting it to false to force using the defaults
 		envData.config =
 			process.env.NATIVESCRIPT_CONFIG_NAME ?? this.$options.config ?? "false";
 
+		// explicitly set the env variable
+		process.env.NATIVESCRIPT_CONFIG_NAME = envData.config;
+
 		// The snapshot generation is wrongly located in the Webpack plugin.
 		// It should be moved in the Native Prepare of the CLI or a Gradle task in the Runtime.
 		// As a workaround, we skip the mksnapshot, xxd and android-ndk calls based on skipNativePrepare.