Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 13 additions & 13 deletions .bxformat.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{
"indentSize" : 4,
"tabIndent" : true,
"maxLineLength" : 115,
"maxLineLength" : 120,
"newLine" : "\n",
"singleQuote" : false,
"preserveStringQuotes" : false,
"alignConsecutiveAssignments" : true,
"alignConsecutiveProperties" : true,
"alignConsecutiveProperties" : false,
"bracketPadding" : true,
"parensPadding" : true,
"binaryOperatorsPadding" : true,
Expand All @@ -17,9 +17,9 @@
"padding" : true,
"empty_padding" : false,
"quote_keys" : false,
"separator" : " : ",
"separator" : ": ",
"multiline" : {
"element_count" : 2,
"element_count" : 5,
"comma_dangle" : false,
"leading_comma" : {
"enabled" : false,
Expand All @@ -30,13 +30,13 @@
},
"property" : {
"multiline" : {
"element_count" : 3,
"element_count" : 5,
"comma_dangle" : false,
"leading_comma" : {
"enabled" : false,
"padding" : true
},
"min_length" : 30
"min_length" : 80
},
"key_value" : {
"padding" : false
Expand All @@ -46,13 +46,13 @@
"padding" : true,
"empty_padding" : false,
"multiline" : {
"element_count" : 2,
"element_count" : 5,
"comma_dangle" : false,
"leading_comma" : {
"enabled" : false,
"padding" : true
},
"min_length" : 50
"min_length" : 60
}
},
"for_loop_semicolons" : {
Expand All @@ -64,7 +64,7 @@
"padding" : true,
"empty_padding" : false,
"comma_dangle" : false,
"multiline_count" : 3,
"multiline_count" : 5,
"multiline_length" : 50
},
"arrow" : {
Expand All @@ -76,7 +76,7 @@
"empty_padding" : false,
"comma_dangle" : false,
"multiline_count" : 3,
"multiline_length" : 50
"multiline_length" : 60
},
"braces" : {
"style" : "same-line",
Expand All @@ -99,12 +99,12 @@
},
"template" : {
"component_prefix" : "bx",
"indent_content" : true,
"indent_content" : false,
"single_attribute_per_line" : false,
"self_closing" : false
},
"import" : {
"sort" : false,
"sort" : true,
"group" : false
},
"comments" : {
Expand All @@ -116,7 +116,7 @@
"member_spacing" : 1,
"property_order" : "preserve",
"method_order" : "preserve",
"method_grouping" : false
"method_grouping" : true
},
"sql" : {
"uppercase_keywords" : true,
Expand Down
68 changes: 68 additions & 0 deletions .bxlint.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
{
"diagnostics": {
"duplicateMethod": {
"enabled": true,
"severity": "error"
},
"duplicateProperty": {
"enabled": true,
"severity": "error"
},
"emptyCatchBlock": {
"enabled": true,
"severity": "warning"
},
"invalidExtends": {
"enabled": false,
"severity": "error"
},
"invalidImplements": {
"enabled": false,
"severity": "error"
},
"missingQueryParamCfsqltype": {
"enabled": true,
"severity": "warning"
},
"missingReturnStatement": {
"enabled": true,
"severity": "warning"
},
"shadowedVariable": {
"enabled": true,
"severity": "warning"
},
"unescapedQueryParam": {
"enabled": true,
"severity": "warning"
},
"unreachableCode": {
"enabled": true,
"severity": "warning"
},
"unscopedVariable": {
"enabled": true,
"severity": "warning"
},
"unusedImport": {
"enabled": true,
"severity": "warning"
},
"unusedPrivateMethod": {
"enabled": true,
"severity": "warning"
},
"unusedVariable": {
"enabled": true,
"severity": "hint"
}
},
"include": [],
"exclude": [],
"mappings": {},
"formatting": {
"experimental": {
"enabled": false
}
}
}
79 changes: 0 additions & 79 deletions .cflintrc

This file was deleted.

46 changes: 26 additions & 20 deletions .github/workflows/snapshot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,11 @@ on:
branches:
- 'development'

# Unique group name per workflow-branch/tag combo
concurrency:
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
cancel-in-progress: true

jobs:
##########################################################################################
# Tests
Expand All @@ -16,32 +21,33 @@ jobs:
##########################################################################################
# Format Source Code
##########################################################################################
format:
name: Code Auto-Formatting
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4

- name: Setup CommandBox CLI
uses: Ortus-Solutions/setup-commandbox@v2.0.1

- name: Auto-format
run: |
box install commandbox-cfformat
box run-script format

- name: Commit Format Changes
uses: stefanzweifel/git-auto-commit-action@v4
with:
commit_message: Apply cfformat changes
push_options: --force
# Will enable once we have more testing in.
# format:
# name: Code Auto-Formatting
# runs-on: ubuntu-latest
# steps:
# - uses: actions/checkout@v6

# - name: Setup CommandBox CLI
# uses: Ortus-Solutions/setup-commandbox@v2.0.1

# - name: Auto-format
# run: |
# box install commandbox-cfformat
# box run-script format

# - name: Commit Format Changes
# uses: stefanzweifel/git-auto-commit-action@v4
# with:
# commit_message: Apply cfformat changes
# push_options: --force

##########################################################################################
# Release it
##########################################################################################
release:
uses: ./.github/workflows/release.yml
needs: [ tests, format ]
needs: [ tests ]
secrets: inherit
with:
snapshot: true
16 changes: 4 additions & 12 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,14 +1,6 @@
{
"boxlang.cfml.mappings": [
{
"logicalPath": "/coldbox",
"directoryPath": "./coldbox",
"isPhysicalDirectoryPath" :false
},
{
"logicalPath": "/testbox",
"directoryPath": "./testbox",
"isPhysicalDirectoryPath" :false
}
]
"boxlang.mappings": {
"coldbox" : "./lib/coldbox",
"testbox" : "./lib/testbox"
}
}
12 changes: 5 additions & 7 deletions box.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name":"Vite Based ColdBox Template",
"version":"8.3.0",
"version":"8.4.0",
"author":"You",
"location":"forgeboxStorage",
"slug":"cbtemplate-vite",
Expand All @@ -25,8 +25,7 @@
".github/PULL_REQUEST_TEMPLATE.md"
],
"devDependencies":{
"testbox":"^6.0.0",
"commandbox-cfformat":"*"
"testbox":"^6.0.0"
},
"installPaths":{
"coldbox":"coldbox/",
Expand All @@ -35,13 +34,12 @@
},
"dependencies":{
"vite-helpers":"^2.0.0",
"coldbox":"^8.0.0"
"coldbox":"^8.2.0"
},
"scripts":{
"postInstall":"pathExists .env || cp .env.example .env && package set ignore=[]",
"format":"cfformat run config/,handlers/,interceptors/,models/,modules_app/,tests/specs/,*.cfc ./.cfformat.json --overwrite",
"format:check":"cfformat check config/,handlers/,interceptors/,models/,modules_app/,tests/specs/,*.cfc ./.cfformat.json",
"format:watch":"cfformat watch path='config/,handlers/,interceptors/,models/,modules_app/,tests/specs/,*.cfc' settingsPath='.cfformat.json'",
"format":"!boxlang format --source config/,handlers/,interceptors/,models/,modules_app/,tests/specs/,*.cfc",
"format:check":"!boxlang format --check --source config/,handlers/,interceptors/,models/,modules_app/,tests/specs/,*.cfc",
"docker:build":"!docker build --no-cache -t my-coldbox-app -f ./docker/Dockerfile ./",
"docker:run":"!docker run -it -p 8080:8080 my-coldbox-app",
"docker:bash":"!docker run -it my-coldbox-app /bin/bash",
Expand Down
2 changes: 1 addition & 1 deletion views/main/index.cfm
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
<span class="badge badge-danger">index()</span>
</p>
<ul>
<cfloop list="#getSetting("RegisteredHandlers")#" index="handler">
<cfloop collection="#getSetting( "RegisteredHandlers" )#" item="handler">
<li><a href="#event.buildLink( handler )#">#handler#</a></li>
</cfloop>
</ul>
Expand Down
Loading