alchemymvc 1.3.20 → 1.3.22

package/lib/init/load_functions.js

@@ -19,7 +19,7 @@ var fs               = alchemy.use('fs'),
  * 
  * @author   Jelle De Loecker   <jelle@develry.be>
  * @since    0.0.1
- * @version  1.1.5
+ * @version  1.3.22
  *
  * @param   {String}  dirPath    The path to load
  * @param   {Object}  options
@@ -44,6 +44,7 @@ Alchemy.setMethod(function usePath(dirPath, options) {
 
 	options._level++;
 	useOptions._level = options._level;
+	useOptions.skip = options.skip;
 
 	// Always ignore .git directories
 	modularRegex.push(/^.git$/);
@@ -166,7 +167,7 @@ Alchemy.setProperty('default_use_path_options', {
  *
  * @author   Jelle De Loecker   <jelle@develry.be>
  * @since    0.0.1
- * @version  1.2.0
+ * @version  1.3.22
  *
  * @param   {String}   dir_path
  * @param   {Object}   options
@@ -214,6 +215,10 @@ Alchemy.setMethod(function _usePath(dir_path, options) {
 	for (i = 0; i < files.length; i++) {
 		file_name = files[i];
 
+		if (file_name == 'routes.js' && options.skip?.length && options.skip.includes('routes')) {
+			continue;
+		}
+
 		// Skip hidden files or the "empty" file
 		if (file_name[0] == '.' || file_name == 'empty') {
 			continue;
@@ -289,7 +294,8 @@ Alchemy.setMethod(function _usePath(dir_path, options) {
 			ignore        : options.ignore,
 			recursive     : options.recursive - 1,
 			_level        : options._level,
-			modularParent : options.modularParent
+			modularParent : options.modularParent,
+			skip          : options.skip,
 		});
 	}
 

package/lib/stages.js

@@ -156,11 +156,11 @@ alchemy.sputnik.add(function plugins() {
  *
  * @author        Jelle De Loecker   <jelle@develry.be>
  * @since         0.0.1
- * @version       0.0.1
+ * @version       1.3.22
  */
 alchemy.sputnik.add(function base_app() {
 	// Load in the app
-	alchemy.usePath(PATH_APP, {weight: 20});
+	alchemy.usePath(PATH_APP, {weight: 20, skip: ['routes']});
 });
 
 /**
@@ -185,7 +185,7 @@ alchemy.sputnik.add(function define_debug() {
  *
  * @author        Jelle De Loecker   <jelle@elevenways.be>
  * @since         0.0.1
- * @version       1.3.3
+ * @version       1.3.22
  */
 alchemy.sputnik.add(function hawkejs_setup() {
 
@@ -202,7 +202,8 @@ alchemy.sputnik.add(function hawkejs_setup() {
 			modify_prototypes : true,
 			ua                : req.conduit.headers.useragent,
 			create_source_map : alchemy.settings.source_map,
-			enable_coverage   : !!global.__coverage__
+			enable_coverage   : !!global.__coverage__,
+			debug             : alchemy.settings.debug,
 		}).done(gotClientFile);
 
 		function gotClientFile(err, path) {
@@ -244,6 +245,7 @@ alchemy.sputnik.add(function hawkejs_setup() {
 				modify_prototypes : true,
 				ua                : req.conduit.headers.useragent,
 				create_source_map : alchemy.settings.source_map,
+				debug             : alchemy.settings.debug,
 			}).done(gotClientFile);
 		}
 	});
@@ -362,15 +364,15 @@ alchemy.sputnik.add(function middleware() {
  *
  * @author        Jelle De Loecker   <jelle@develry.be>
  * @since         0.0.1
- * @version       0.4.0
+ * @version       1.3.22
  */
 alchemy.sputnik.add(function routes() {
 	try {
-		alchemy.useOnce(path.resolve(PATH_APP, 'config', 'routes'));
+		alchemy.useOnce(path.resolve(PATH_APP, 'config', 'routes.js'));
 	} catch (err) {
 		// Only output warning when not in client mode
 		if (!alchemy.settings.client_mode) {
-			log.warn('No route config was found');
+			log.warn('No app routes were found:', err);
 		}
 	}
 });

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "alchemymvc",
 	"description": "MVC framework for Node.js",
-	"version": "1.3.20",
+	"version": "1.3.22",
 	"author": "Jelle De Loecker <jelle@elevenways.be>",
 	"keywords": [
 		"alchemy",
@@ -22,7 +22,7 @@
 		"chokidar"         : "~3.5.3",
 		"formidable"       : "~3.5.1",
 		"graceful-fs"      : "~4.2.11",
-		"hawkejs"          : "~2.3.13",
+		"hawkejs"          : "~2.3.15",
 		"jsondiffpatch"    : "~0.5.0",
 		"mime"             : "~3.0.0",
 		"minimist"         : "~1.2.5",
@@ -31,7 +31,7 @@
 		"mongodb"          : "~6.1.0",
 		"ncp"              : "~2.0.0",
 		"postcss"          : "~8.4.31",
-		"protoblast"       : "~0.8.14",
+		"protoblast"       : "~0.8.15",
 		"semver"           : "~7.5.4",
 		"socket.io"        : "~4.7.2",
 		"@11ways/socket.io-stream" : "~0.9.2",