Merge branch 'development'

Author: lmajano

.github/workflows/pr.yml

@@ -22,7 +22,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Repository
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
       - uses: Ortus-Solutions/commandbox-action@v1.0.3
         with:

.github/workflows/release.yml

@@ -29,7 +29,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Repository
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
       - name: Setup CommandBox
         uses: Ortus-Solutions/setup-commandbox@v2.0.1
@@ -82,7 +82,7 @@ jobs:
 
       - name: Upload Build Artifacts
         if: success()
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         with:
           name: ${{ env.MODULE_ID }}
           path: |
@@ -138,7 +138,7 @@ jobs:
     steps:
       # Checkout development
       - name: Checkout Repository
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           ref: development
 
@@ -148,7 +148,7 @@ jobs:
           forgeboxAPIKey: ${{ secrets.FORGEBOX_TOKEN }}
 
       - name: Download build artifacts
-        uses: actions/download-artifact@v5
+        uses: actions/download-artifact@v6
         with:
           name: ${{ env.MODULE_ID }}
           path: .tmp

.github/workflows/snapshot.yml

@@ -20,15 +20,15 @@ jobs:
     name: Code Auto-Formatting
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
 
       - name: Auto-format
         uses: Ortus-Solutions/commandbox-action@v1.0.3
         with:
           cmd: run-script format
 
       - name: Commit Format Changes
-        uses: stefanzweifel/git-auto-commit-action@v6
+        uses: stefanzweifel/git-auto-commit-action@v7
         with:
           commit_message: Apply cfformat changes
 

.github/workflows/tests.yml

@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Repository
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
       - name: Setup Java
         uses: actions/setup-java@v5

box.json

@@ -1,6 +1,6 @@
 {
     "name":"ColdBox CLI",
-    "version":"8.2.0",
+    "version":"8.3.0",
     "location":"https://downloads.ortussolutions.com/ortussolutions/commandbox-modules/coldbox-cli/@build.version@/coldbox-cli-@build.version@.zip",
     "slug":"coldbox-cli",
     "author":"Ortus Solutions, Corp",

changelog.md

@@ -13,6 +13,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Added
 
+- More Modern CFML template support
+
+## [8.2.0] - 2025-11-11
+
+### Added
+
 - Missing rest resources for the `boxlang` template
 
 ### Fixed

commands/coldbox/create/app.cfc

@@ -171,11 +171,11 @@ component extends="coldbox-cli.models.BaseCommand" {
 		// Prepare defaults on box.json so we remove template based ones
 		command( "package set" )
 			.params(
-				name    : arguments.name,
-				slug    : variables.formatterUtil.slugify( arguments.name ),
-				version : "1.0.0",
-				location: "forgeboxStorage",
-				ignore  : "[]",
+				name       : arguments.name,
+				slug       : variables.formatterUtil.slugify( arguments.name ),
+				version    : "1.0.0",
+				location   : "forgeboxStorage",
+				ignore     : "[]",
 				description: "A ColdBox Application created with the ColdBox CLI"
 			)
 			.run();
@@ -290,14 +290,29 @@ component extends="coldbox-cli.models.BaseCommand" {
 					"#variables.settings.templatesPath#/vite/vite.config.mjs",
 					arguments.directory & "vite.config.mjs"
 				)
-				fileDelete( arguments.directory & "app/layouts/Main.bxm" )
-				fileCopy(
-					"#variables.settings.templatesPath#/vite/layouts/Main.bxm",
-					arguments.directory & "app/layouts/Main.bxm"
-				)
-				fileCopy(
+
+                // BoxLang Layout
+                if( fileExists( arguments.directory & "app/layouts/Main.bxm" ) ) {
+                    fileDelete( arguments.directory & "app/layouts/Main.bxm" )
+                    fileCopy(
+                        "#variables.settings.templatesPath#/vite/layouts/Main.bxm",
+                        arguments.directory & "app/layouts/Main.bxm"
+                    )
+                }
+
+                // CFML Layout
+                if( fileExists( arguments.directory & "app/layouts/Main.cfm" ) ) {
+                    fileDelete( arguments.directory & "app/layouts/Main.cfm" )
+                    fileCopy(
+                        "#variables.settings.templatesPath#/vite/layouts/Main.cfm",
+                        arguments.directory & "app/layouts/Main.cfm"
+                    )
+                }
+
+				directoryCopy(
 					"#variables.settings.templatesPath#/vite/assets",
-					arguments.directory & "resources/assets"
+					arguments.directory & "resources/assets",
+                    true
 				)
 
 				printInfo( "🥊 Installing ColdBox Vite Helpers" )

templates/vite/layouts/Main.cfm

@@ -0,0 +1,25 @@
+<cfoutput>
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
+
+	<title>Welcome to Coldbox!</title>
+
+	<meta name="description" content="ColdBox Application Template">
+    <meta name="author" content="Ortus Solutions, Corp">
+
+	<!---Base URL --->
+	<base href="#event.getHTMLBaseURL()#" />
+	<!--- Vite Assets --->
+	#vite( [ "resources/assets/css/app.css", "resources/assets/js/app.js" ] )#
+</head>
+<body>
+	<div id="app">
+		<!--- Vue App --->
+		<Hello />
+	</div>
+</body>
+</html>
+</cfoutput>