- Reverted the lib/vendor convention as this is on cb7 not cb6.

coldbox-templates · Mar 22, 2023 · 16594fb · 16594fb
1 parent c24ce4e
commit 16594fb
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 12 deletions.
diff --git a/.gitignore b/.gitignore
@@ -19,5 +19,6 @@ npm-debug.log
 yarn-error.log
 
 ## Ignored Dependencies
-lib/vendor/**
+coldbox/**
+testbox/**
 modules/**
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -2,12 +2,12 @@
 	"cfml.mappings": [
 		{
 			"logicalPath": "/coldbox",
-			"directoryPath": "./lib/vendor/coldbox",
+			"directoryPath": "./coldbox",
 			"isPhysicalDirectoryPath" :false
 		},
 		{
 			"logicalPath": "/testbox",
-			"directoryPath": "./lib/vendor/testbox",
+			"directoryPath": "./testbox",
 			"isPhysicalDirectoryPath" :false
 		}
 	]

diff --git a/Application.cfc b/Application.cfc
@@ -59,7 +59,7 @@ component {
 	 * - coldbox : Where ColdBox library is installed
 	 */
 	this.mappings[ "/cbapp" ]   = COLDBOX_APP_ROOT_PATH;
-	this.mappings[ "/coldbox" ] = COLDBOX_APP_ROOT_PATH & "lib/vendor/coldbox";
+	this.mappings[ "/coldbox" ] = COLDBOX_APP_ROOT_PATH & "coldbox";
 
 	/**
 	 * --------------------------------------------------------------------------

diff --git a/box.json b/box.json
@@ -16,19 +16,16 @@
     "bugs":"",
     "shortDescription":"",
     "contributors":[],
-    "ignore":[
-        "changelog.md",
-        ".github/**"
-    ],
+    "ignore":[],
     "devDependencies":{
         "testbox":"*",
         "commandbox-dotenv":"*",
         "commandbox-cfconfig":"*",
         "commandbox-cfformat":"*"
     },
     "installPaths":{
-        "coldbox":"lib/vendor/coldbox/",
-        "testbox":"lib/vendor/testbox/"
+        "coldbox":"coldbox/",
+        "testbox":"testbox/"
     },
     "dependencies":{
         "coldbox":"^6.0.0"

diff --git a/changelog.md b/changelog.md
@@ -9,6 +9,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Regression
+
+- Reverted the `lib/vendor` convention as this is on cb7 not cb6.
+
 ## [v6.21.0] - 2023-03-21
 
 ### Added

diff --git a/tests/Application.cfc b/tests/Application.cfc
@@ -27,8 +27,8 @@ component {
 	// The root application mapping
 	rootPath                    = reReplaceNoCase( this.mappings[ "/tests" ], "tests(\\|/)", "" );
 	this.mappings[ "/root" ]    = this.mappings[ "/cbapp" ] = rootPath;
-	this.mappings[ "/coldbox" ] = rootPath & "lib/vendor/coldbox";
-	this.mappings[ "/testbox" ] = rootPath & "lib/vendor/testbox";
+	this.mappings[ "/coldbox" ] = rootPath & "coldbox";
+	this.mappings[ "/testbox" ] = rootPath & "testbox";
 
 	/**
 	 * Fires on every test request. It builds a Virtual ColdBox application for you