diff --git a/.gitignore b/.gitignore index 2ada811..0f04594 100644 --- 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 index a1f59a5..f20eddc 100644 --- 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 index c54819e..181b9d1 100644 --- 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 index 1bfea7d..376d60a 100644 --- a/box.json +++ b/box.json @@ -16,10 +16,7 @@ "bugs":"", "shortDescription":"", "contributors":[], - "ignore":[ - "changelog.md", - ".github/**" - ], + "ignore":[], "devDependencies":{ "testbox":"*", "commandbox-dotenv":"*", @@ -27,8 +24,8 @@ "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 index a982c19..bda2618 100644 --- 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 index 66adb2d..a54e221 100644 --- 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