🐛 Fix Alchemy#findModule() assuming some package is a module too fast

11ways · Oct 5, 2023 · 7d7f24c · 7d7f24c
1 parent 12b58a1
commit 7d7f24c
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.3.17 (WIP)
+
+* Fix `Alchemy#findModule()` assuming some package is a module too fast
+
 ## 1.3.16 (2023-10-05)
 
 * Fix `Document#saveRecord()` throwing an error when a related record does not exist

diff --git a/lib/core/middleware.js b/lib/core/middleware.js
@@ -311,7 +311,7 @@ Alchemy.setMethod(function sourcemapMiddleware(req, res, nextMiddleware) {
  *
  * @author   Jelle De Loecker   <jelle@develry.be>
  * @since    0.2.0
- * @version  1.3.4
+ * @version  1.3.17
  *
  * @param    {String}   path
  * @param    {Object}   options
@@ -418,7 +418,7 @@ Alchemy.setMethod(function minifyScript(path, options, callback) {
 			}
 		}
 
-		if (should_minify) {
+		if (should_minify && typeof Terser?.minify == 'function') {
 
 			// Force Blast.isNode & Blast.isBrowser to be replaced later
 			data = data.replaceAll('Blast.isNode', '__BLAST_IS_NODE');

diff --git a/lib/init/alchemy.js b/lib/init/alchemy.js
@@ -1051,7 +1051,7 @@ Alchemy.setMethod(function searchModule(startPath, moduleName, recurse) {
  * 
  * @author   Jelle De Loecker   <jelle@develry.be>
  * @since    0.0.1
- * @version  1.3.16
+ * @version  1.3.17
  *
  * @param    {String}   moduleName
  * @param    {Object}   options
@@ -1183,10 +1183,22 @@ Alchemy.setMethod(function findModule(moduleName, options) {
 			// Make sure this does not support CJS.
 			// Some packages have the `module` type, but do have CJS exports too
 			if (!supports_cjs) {
-				let exports = package_json.exports?.['.'];
 
-				if (exports?.require) {
+				if (package_json.module && package_json.main) {
 					supports_cjs = true;
+				} else {
+
+					let exports = package_json.exports?.['.'];
+
+					if (Array.isArray(exports)) {
+						for (let entry of exports) {
+							if (entry && typeof entry == 'object' && entry.require) {
+								supports_cjs = true;
+							}
+						}
+					} else if (exports?.require) {
+						supports_cjs = true;
+					}
 				}
 			}
 

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "alchemymvc",
 	"description": "MVC framework for Node.js",
-	"version": "1.3.16",
+	"version": "1.3.17-alpha",
 	"author": "Jelle De Loecker <jelle@elevenways.be>",
 	"keywords": [
 		"alchemy",