fix: more robust conditionNames detection

dummdidumm · dummdidumm · commit 09f9bc168b7e · 2023-02-27T20:12:31.000+01:00
fixes #226
diff --git a/.eslintrc b/.eslintrc
@@ -8,7 +8,8 @@
     "space-before-function-paren": [ 2, "never" ],
     "semi": [ 2, "always" ],
     "no-console": 0,
-    "mocha/no-exclusive-tests": 2
+    "mocha/no-exclusive-tests": 2,
+    "no-inner-declarations": 0
   },
   "extends": "eslint:recommended",
   "parserOptions": {
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # svelte-loader changelog
 
+## 3.1.7
+
+* More robust `conditionNames: ['svelte']` detection ([#226](https://github.com/sveltejs/svelte-loader/pull/226))
+
 ## 3.1.6
 
 * Detect missing `conditionNames: ['svelte']` ([#225](https://github.com/sveltejs/svelte-loader/pull/225))
diff --git a/index.js b/index.js
@@ -1,4 +1,5 @@
 const path = require('path');
+const fs = require('fs');
 const { getOptions } = require('loader-utils');
 const { buildMakeHot } = require('./lib/make-hot.js');
 const { compile, preprocess } = require('svelte/compiler');
@@ -24,10 +25,30 @@ for (let i = 0; i < process.argv.length; i++) {
 }
 
 try {
-	const config = require(path.resolve(process.cwd(), configFile));
-	if (!config.resolve || !config.resolve.conditionNames || !config.resolve.conditionNames.includes('svelte')) {
+	const configPath = path.resolve(process.cwd(), configFile);
+	const config = require(configPath);
+	let found = false;
+	if (Array.isArray(config)) {
+		found = config.some(check);
+	} else {
+		found = check(config);
+	}
+
+	if (!found) {
 		console.warn('\n\u001B[1m\u001B[31mWARNING: You should add "svelte" to the "resolve.conditionNames" array in your webpack config. See https://github.com/sveltejs/svelte-loader#resolveconditionnames for more information\u001B[39m\u001B[22m\n');
 	}
+
+	function check(config) {
+		if (typeof config === 'function') {
+			// We could try to invoke it but that could maybe have side unintended side effects
+			// and/or fail due to missing parameters, so we read the file instead
+			const configString = fs.readFileSync(configPath, 'utf-8');
+			const result = /conditionNames\s*:[\s|\n]*\[([^\]]+?)\]/.exec(configString);
+			return !!result && !!result[1].includes('svelte');
+		} else {
+			return !!config.resolve && !!config.resolve.conditionNames && config.resolve.conditionNames.includes('svelte');
+		}
+	}
 } catch (e) {
 	// do nothing and hope for the best
 }
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "svelte-loader",
-  "version": "3.1.6",
+  "version": "3.1.7",
   "author": "Nico Rehwaldt <git_nikku@nixis.de>",
   "description": "A webpack loader for svelte",
   "license": "MIT",

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "svelte-loader",`
`3`		`- "version": "3.1.6",`
	`3`	`+ "version": "3.1.7",`
`4`	`4`	`"author": "Nico Rehwaldt <git_nikku@nixis.de>",`
`5`	`5`	`"description": "A webpack loader for svelte",`
`6`	`6`	`"license": "MIT",`