Merge branch 'development'

Author: lmajano

.github/workflows/pr.yml

@@ -19,7 +19,7 @@ jobs:
 
   formatCheck:
     name: Checks Source Code Formatting
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     steps:
       - name: Checkout Repository
         uses: actions/checkout@v4

.github/workflows/release.yml

@@ -26,7 +26,7 @@ jobs:
   ##########################################################################################
   build:
     name: Build & Publish
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     steps:
       - name: Checkout Repository
         uses: actions/checkout@v4
@@ -133,7 +133,7 @@ jobs:
   prep_next_release:
     name: Prep Next Release
     if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/main'
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     needs: [ build ]
     steps:
       # Checkout development

.github/workflows/snapshot.yml

@@ -18,7 +18,7 @@ jobs:
   ##########################################################################################
   format:
     name: Code Auto-Formatting
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
 

.github/workflows/tests.yml

@@ -10,7 +10,7 @@ on:
 jobs:
   tests:
     name: Tests
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     steps:
       - name: Checkout Repository
         uses: actions/checkout@v4

.gitignore

@@ -7,6 +7,7 @@ modules/**
 .tmp/**
 .artifacts/**
 changelog-latest.md
+modules/**
 
 # Test App
 testapp/**

box.json

@@ -1,6 +1,6 @@
 {
     "name":"ColdBox CLI",
-    "version":"7.5.0",
+    "version":"7.6.0",
     "location":"https://downloads.ortussolutions.com/ortussolutions/commandbox-modules/coldbox-cli/@build.version@/[email protected]@.zip",
     "slug":"coldbox-cli",
     "author":"Ortus Solutions, Corp",

changelog.md

@@ -9,6 +9,18 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Added
+
+- New `modern` template for creating modern apps with the latest features
+- New `boxlang` template for creating apps with the latest boxlang features
+- Modernization of all templates to use the latest features of ColdBox
+- New `--boxlang` argument to create content for BoxLang
+- New `language` argument detection for BoxLang
+
+### Changed
+
+- Updated to the latest Ubuntu images for the GitHub actions
+
 ## [7.5.0] - 2024-10-16
 
 ### Fixed

commands/coldbox/create/app-wizard.cfc

@@ -69,24 +69,34 @@ component extends="app" aliases="" {
 				.options( [
 					{
 						accessKey : 1,
-						value     : "cbtemplate-simple",
-						display   : "Simple Script - Script based Coldbox App WITHOUT cfconfig & .env settings"
+						value     : "cbtemplate-bx-default",
+						display   : "BoxLang ColdBox Template - Default ColdBox App with BoxLang"
 					},
 					{
 						accessKey : 2,
+						value     : "cbtemplate-supersimple",
+						display   : "Super simple starting template - no modules, no config, no nothing"
+					},
+					{
+						accessKey : 3,
 						value     : "cbtemplate-advanced-script",
-						display   : "Advanced Script - Script based Coldbox App which uses cfconfig & .env settings",
+						display   : "Default Script based Coldbox App which uses cfconfig & .env settings",
 						selected  : true
 					},
 					{
-						accessKey : 3,
+						accessKey : 4,
 						value     : "cbtemplate-elixir",
 						display   : "Elixir Template - Advanced Script + ColdBox Elixir: Enable Webpack tasks for your ColdBox applications"
 					},
 					{
-						accessKey : 4,
-						value     : "cbtemplate-elixir-vuejs",
-						display   : "Elixir + Vuejs Template - Elixir Template + pre-installed & configured VueJS"
+						accessKey : 5,
+						value     : "cbtemplate-modern",
+						display   : "A modern ColdBox template with a modern approach to building apps"
+					},
+					{
+						accessKey : 6,
+						value     : "cbtemplate-vite",
+						display   : "A ColdBox template with ViteJS for modern web development"
 					}
 				] )
 				.required()

commands/coldbox/create/app.cfc

@@ -8,6 +8,7 @@
  * {code}
  * .
  *  Here are the basic skeletons that are available for you that come from ForgeBox
+ *  - BoxLang
  *  - Default (default)
  *  - Elixir
  *  - Modern
@@ -39,13 +40,14 @@ component extends="coldbox-cli.models.BaseCommand" {
 	function init(){
 		// Map these shortcut names to the actual ForgeBox slugs
 		variables.templateMap = {
-			"AdvancedScript" : "cbtemplate-advanced-script",
-			"Default"        : "cbtemplate-advanced-script",
-			"Elixir"         : "cbtemplate-elixir",
-			"rest"           : "cbtemplate-rest",
-			"rest-hmvc"      : "cbtemplate-rest-hmvc",
-			"Vite"           : "cbtemplate-vite",
-			"SuperSimple"    : "cbtemplate-supersimple"
+			"Default"     : "cbtemplate-advanced-script",
+			"BoxLang"     : "cbtemplate-bx-default",
+			"Elixir"      : "cbtemplate-elixir",
+			"modern"      : "cbtemplate-modern",
+			"rest"        : "cbtemplate-rest",
+			"rest-hmvc"   : "cbtemplate-rest-hmvc",
+			"Vite"        : "cbtemplate-vite",
+			"SuperSimple" : "cbtemplate-supersimple"
 		};
 
 		variables.defaultAppName = "My ColdBox App";
@@ -127,6 +129,11 @@ component extends="coldbox-cli.models.BaseCommand" {
 			shell.cd( originalPath );
 		}
 
+		// Prepare language
+		if ( arguments.boxlang ) {
+			command( "package set" ).params( language: "BoxLang" ).run();
+		}
+
 		// Prepare defaults on box.json so we remove template based ones
 		command( "package set" )
 			.params(

commands/coldbox/create/handler.cfc

@@ -36,6 +36,7 @@ component aliases="coldbox create controller" extends="coldbox-cli.models.BaseCo
 	 * @rest             Make this a REST handler instead of a normal ColdBox Handler
 	 * @force            Force overwrite of existing handler
 	 * @resource         Generate a resourceful handler with all the actions
+	 * @boxlang         Is this a boxlang project? else it is a CFML project
 	 **/
 	function run(
 		required name,
@@ -50,7 +51,8 @@ component aliases="coldbox create controller" extends="coldbox-cli.models.BaseCo
 		boolean open             = false,
 		boolean rest             = false,
 		boolean force            = false,
-		boolean resource         = false
+		boolean resource         = false,
+		boolean boxlang          = isBoxLangProject( getCWD() )
 	){
 		// This will make each directory canonical and absolute
 		arguments.directory      = resolvePath( arguments.directory );
@@ -100,6 +102,11 @@ component aliases="coldbox create controller" extends="coldbox-cli.models.BaseCo
 			arguments.description,
 			"all"
 		);
+		// BoxLang replacements
+		if ( arguments.boxlang ) {
+			handlerContent     = toBoxLangClass( handlerContent );
+			handlerTestContent = toBoxLangClass( handlerTestContent );
+		}
 
 		// Auto Actions Determination if none passed via resource && rest, else empty handler
 		if ( !len( arguments.actions ) ) {