Skip to content

Commit

Permalink
Merge branch 'master' into development
Browse files Browse the repository at this point in the history
  • Loading branch information
grantcopley committed Jun 22, 2024
2 parents 8c71a8a + a11ff9e commit c61fbd6
Show file tree
Hide file tree
Showing 66 changed files with 1,377 additions and 523 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,10 @@ jobs:
strategy:
fail-fast: false
matrix:
cfengine: [ "lucee@5", "adobe@2018", "adobe@2021", "adobe@2023" ]
cfengine: [ "lucee@5", "adobe@2021", "adobe@2023" ]
steps:
- name: Checkout Repository
uses: actions/checkout@v2
uses: actions/checkout@v3

- name: Setup Java
uses: actions/setup-java@v2
Expand All @@ -36,7 +36,7 @@ jobs:
java-version: "11"

- name: Cache CommandBox Dependencies
uses: actions/cache@v1
uses: actions/cache@v4
if: ${{ true }}
with:
path: ~/.CommandBox/artifacts
Expand Down Expand Up @@ -82,7 +82,7 @@ jobs:
box testbox run --verbose outputFile=tests/results/test-results outputFormats=json,antjunit
- name: Publish Test Results
uses: EnricoMi/publish-unit-test-result-action@v1
uses: EnricoMi/publish-unit-test-result-action@v2
if: always()
with:
files: test-harness/tests/results/**/*.xml
Expand Down
171 changes: 80 additions & 91 deletions ModuleConfig.cfc
Original file line number Diff line number Diff line change
@@ -1,100 +1,89 @@
component {
this.name = "cbwire";
this.version = "1.0.0";
this.author = "";
this.webUrl = "https://github.com/coldbox-modules/cbwire";
this.dependencies = [];
this.entryPoint = "cbwire";
this.layoutParentLookup = false;
this.viewParentLookup = false;
this.cfmapping = "cbwire";
this.modelNamespace = "cbwire";
this.applicationHelper = [ "helpers/helpers.cfm" ];

this.name = "cbwire";
this.version = "1.0.0";
this.author = "";
this.webUrl = "https://github.com/coldbox-modules/cbwire";
this.dependencies = [];
this.entryPoint = "cbwire";
this.layoutParentLookup = false;
this.viewParentLookup = false;
this.cfmapping = "cbwire";
this.modelNamespace = "cbwire";
this.applicationHelper = [ "helpers/helpers.cfm" ];

function configure(){
settings = {
/**
* Set to true to automatically include CSS and JS
* assets for CBWIRE. This makes it where you do not
* need to add wireStyles() and wireScripts() to your layout.
*/
"autoInjectAssets": true,
/**
* Capture our module root for use throughout CBWIRE.
*/
"moduleRootPath": getCanonicalPath( getCurrentTemplatePath().replaceNoCase( "/ModuleConfig.cfc", "", "one" ) ),
/**
* Set to true to throw a 'WireSetterNotFound' exception if
* the incoming cbwire request tries to update a property
* without a setter on our component. Otherwise, missing setters are ignored.
*/
"throwOnMissingSetterMethod" : false,
/**
* The default folder name where your cbwire components are stored.
* Defaults to 'wires' folder.
*/
"componentLocation" : "wires",
/**
* Determines if Turbo should be enabled
*/
"enableTurbo" : false,
/**
* Caching for single-file components to speed up response time.
* Should be false for local development.
*/
"cacheSingleFileComponents": false,
/**
* Trims string properties if set to true
*/
"trimStringValues" : false
};
function configure(){
settings = {
/**
* Set to true to automatically include CSS and JS
* assets for CBWIRE. This makes it where you do not
* need to add wireStyles() and wireScripts() to your layout.
*/
"autoInjectAssets": true,
/**
* Capture our module root for use throughout CBWIRE.
*/
"moduleRootPath": getCanonicalPath( getCurrentTemplatePath().replaceNoCase( "/ModuleConfig.cfc", "", "one" ) ),
/**
* Set to true to throw a 'WireSetterNotFound' exception if
* the incoming cbwire request tries to update a property
* without a setter on our component. Otherwise, missing setters are ignored.
*/
"throwOnMissingSetterMethod" : false,
/**
* The default folder name where your cbwire components are stored.
* Defaults to 'wires' folder.
*/
"componentLocation" : "wires",
/**
* Determines if Turbo should be enabled
*/
"enableTurbo" : false,
/**
* Caching for single-file components to speed up response time.
* Should be false for local development.
*/
"cacheSingleFileComponents": false,
/**
* Trims string properties if set to true
*/
"trimStringValues" : false
};

routes = [
{
"pattern" : "preview-file/:uploadUUID",
"handler" : "Main",
"action" : "previewFile"
},
{
"pattern" : "upload",
"handler" : "Main",
"action" : "uploadFile"
},
{
"pattern" : "update",
"handler" : "Main",
"action": "index"
}
];
routes = [
{
"pattern" : "preview-file/:uploadUUID",
"handler" : "Main",
"action" : "previewFile"
},
{
"pattern" : "upload",
"handler" : "Main",
"action" : "uploadFile"
},
{
"pattern" : "update",
"handler" : "Main",
"action": "index"
}
];

interceptorSettings = {
customInterceptionPoints : [
"onCBWireMount",
"onCBWireSubsequentRenderIt"
]
};
interceptors = [
// Init
{ class : "#moduleMapping#.interceptors.CBWIRE" }
];

interceptors = [
// Init
{ class : "#moduleMapping#.interceptors.Reinit" },
// Security
{ class : "#moduleMapping#.interceptors.hydrate.CheckIncomingRequestHeaders" },
// Mounting
{ class : "#moduleMapping#.interceptors.ComponentMounting" },
// Rendering
{ class : "#moduleMapping#.interceptors.SubsequentComponentRendering" },
{ class : "#moduleMapping#.interceptors.AutoInjectAssets" },
{ class : "#moduleMapping#.interceptors.Preprocessor" }
];
}
interceptorSettings = {
customInterceptionPoints : []
};
}

/**
* Returns Livewire's manifest as a struct.
*/
function getLivewireManifest(){
var path = getCanonicalPath( variables.modulePath & "/includes/js/manifest.json" );
return deserializeJSON( fileRead( path ) );
}
/**
* Returns Livewire's manifest as a struct.
*/
function getLivewireManifest(){
var path = getCanonicalPath( variables.modulePath & "/includes/js/manifest.json" );
return deserializeJSON( fileRead( path ) );
}

}
24 changes: 0 additions & 24 deletions interceptors/AutoInjectAssets.cfc

This file was deleted.

Loading

0 comments on commit c61fbd6

Please sign in to comment.