[Snyk] Upgrade alpinejs from 3.13.0 to 3.13.1 (#585)

* fix: upgrade alpinejs from 3.13.0 to 3.13.1 Snyk has created this PR to upgrade alpinejs from 3.13.0 to 3.13.1. See this package in npm: https://www.npmjs.com/package/alpinejs See this project in Snyk: https://app.snyk.io/org/lmajano/project/d1f29baa-b4f3-4d42-a506-7dadd8ce340e?utm_source=github&utm_medium=referral&page=upgrade-pr * Apply cfformat changes --------- Co-authored-by: snyk-bot <[email protected]> Co-authored-by: lmajano <[email protected]>
Ortus-Solutions · Oct 24, 2023 · 380adf2 · 380adf2
1 parent 836ea14
commit 380adf2
Show file tree

Hide file tree

Showing 11 changed files with 39 additions and 43 deletions.
diff --git a/modules/contentbox/migrations/2023_07_13_092814_v_6_0_0_ContentTemplates.cfc b/modules/contentbox/migrations/2023_07_13_092814_v_6_0_0_ContentTemplates.cfc
@@ -9,7 +9,7 @@ component {
 
 	function up( schema, qb ){
 		// Content Templates
-		if( !schema.hasTable( "cb_contentTemplate" ) ){
+		if ( !schema.hasTable( "cb_contentTemplate" ) ) {
 			arguments.schema.create( "cb_contentTemplate", ( table ) => {
 				// Columns
 				table.string( "templateID", 36 ).primaryKey();
@@ -65,7 +65,6 @@ component {
 		} else {
 			systemOutput( "- skipping 'cb_content.FK_childContentTemplateID' creation, column already there", true );
 		}
-
 	}
 
 	function down( schema, qb ){

diff --git a/modules/contentbox/migrations/2023_10_18_173527_v_6_0_0_SiteDomainAliases.cfc b/modules/contentbox/migrations/2023_10_18_173527_v_6_0_0_SiteDomainAliases.cfc
@@ -3,7 +3,7 @@
  */
 component {
 
-    // Include Utils
+	// Include Utils
 	include template="./_MigrationUtils.cfm";
 
 	function up( schema, qb ){
@@ -15,8 +15,7 @@ component {
 		}
 	}
 
-    function down( schema, qb ) {
-
-    }
+	function down( schema, qb ){
+	}
 
 }
diff --git a/modules/contentbox/models/importers/ContentBoxImporter.cfc b/modules/contentbox/models/importers/ContentBoxImporter.cfc
@@ -159,8 +159,8 @@ component accessors=true {
 		// get all content
 		var descriptorContents = getDescriptorContents( true );
 		// Fix for null priorites, this should go away in later versions
-		for( var fixKey in descriptorContents.content ){
-			if( isNull( descriptorContents.content[ fixKey ].priority ) ){
+		for ( var fixKey in descriptorContents.content ) {
+			if ( isNull( descriptorContents.content[ fixKey ].priority ) ) {
 				descriptorContents.content[ fixKey ].priority = 1;
 			}
 		}

diff --git a/modules/contentbox/models/system/SettingService.cfc b/modules/contentbox/models/system/SettingService.cfc
@@ -776,11 +776,13 @@ component
 			// iterate and import
 			for ( var thisSetting in arguments.importData ) {
 				// Site Setting or Global Setting
-				var oSetting =  findWhere( {
+				var oSetting = findWhere( {
 					name : thisSetting.name,
-					site : isNull( thisSetting.site.siteID ) ? javaCast( "null", "" ) : siteService.get( thisSetting.site.siteID )
+					site : isNull( thisSetting.site.siteID ) ? javacast( "null", "" ) : siteService.get(
+						thisSetting.site.siteID
+					)
 				} );
-				oSetting     = ( isNull( oSetting ) ? new () : oSetting );
+				oSetting = ( isNull( oSetting ) ? new () : oSetting );
 
 				// Check for boolean values
 				if ( isSimpleValue( thisSetting.value ) && isBoolean( thisSetting.value ) ) {

diff --git a/modules/contentbox/modules/contentbox-admin/handlers/authors.cfc b/modules/contentbox/modules/contentbox-admin/handlers/authors.cfc
@@ -459,16 +459,13 @@ component extends="baseHandler" {
 			// save Author preference
 			variables.authorService.save( prc.oCurrentAuthor );
 			// response
-			response
-				.setData( { "preference" : rc.preference, "value" : rc.value } )
-				.addMessage( "Preference saved!" );
+			response.setData( { "preference" : rc.preference, "value" : rc.value } ).addMessage( "Preference saved!" );
 		} else {
-			response
-				.setErrorMessage(
-					"No preference sent",
-					event.STATUS.BAD_REQUEST,
-					response.400
-				);
+			response.setErrorMessage(
+				"No preference sent",
+				event.STATUS.BAD_REQUEST,
+				response.400
+			);
 		}
 	}
 

diff --git a/modules/contentbox/modules/contentbox-admin/handlers/menus.cfc b/modules/contentbox/modules/contentbox-admin/handlers/menus.cfc
@@ -135,7 +135,7 @@ component extends="baseHandler" {
 		};
 
 		// set new or persisted id in args
-		if( args.menuItem.isLoaded() ){
+		if ( args.menuItem.isLoaded() ) {
 			args.menuItemID = args.menuItem.getMenuItemID();
 		} else {
 			args.menuItemID = "new-#createUUID()#";
@@ -147,7 +147,7 @@ component extends="baseHandler" {
 				class=""dd-item dd3-item""
 				data-id=""#encodeForHTMLAttribute( args.menuItemID )#""
 				:key=""#encodeForHTMLAttribute( args.menuItemID )#"">" )
-			writeOutput( view( view : "menus/provider", args : args ) );
+			writeOutput( view( view: "menus/provider", args: args ) );
 			writeOutput( "</li>" );
 		};
 

diff --git a/modules/contentbox/modules/contentbox-admin/handlers/settings.cfc b/modules/contentbox/modules/contentbox-admin/handlers/settings.cfc
@@ -331,10 +331,10 @@ component extends="baseHandler" {
 	 * @return html
 	 */
 	function authLogs( event, rc, prc ){
-		prc.featureEnabled = prc.cbsettings.cb_security_login_blocker;
-		prc.xehTruncate    = "#prc.cbAdminEntryPoint#.settings.truncateAuthLogs";
+		prc.featureEnabled     = prc.cbsettings.cb_security_login_blocker;
+		prc.xehTruncate        = "#prc.cbAdminEntryPoint#.settings.truncateAuthLogs";
 		// Get all logs
-		prc.logs = variables.loginTrackerService.getAll( sortOrder = "attempts", asQuery = false );
+		prc.logs               = variables.loginTrackerService.getAll( sortOrder = "attempts", asQuery = false );
 		// Raw tab
 		prc.tabSystem_authLogs = true;
 		// View

diff --git a/modules/contentbox/modules/contentbox-admin/modules/contentbox-filebrowser/handlers/Home.cfc b/modules/contentbox/modules/contentbox-admin/modules/contentbox-filebrowser/handlers/Home.cfc
@@ -115,7 +115,7 @@ component extends="cbadmin.handlers.baseHandler" {
 
 		// Exit handlers
 		prc.xehFBDownload = "#prc.fbModEntryPoint#/download";
-		prc.xehFBUpload    = "#prc.fbModEntryPoint#/upload";
+		prc.xehFBUpload   = "#prc.fbModEntryPoint#/upload";
 
 		// Store directory roots and web root
 		prc.fbDirRoot     = prc.fbSettings.directoryRoot;
@@ -380,7 +380,7 @@ component extends="cbadmin.handlers.baseHandler" {
 		// param values
 		event.paramValue( "path", "" ).paramValue( "manual", false );
 
-		systemoutput( "path: [#rc.path#]", true );
+		systemOutput( "path: [#rc.path#]", true );
 
 		// clean incoming path for destination directory
 		rc.path = cleanIncomingPath( urlDecode( trim( rc.path ) ) );

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -24,7 +24,7 @@
 		"@alpinejs/ui": "^3.10.4-beta.5",
 		"@fortawesome/fontawesome-free": "^5.15.4",
 		"@popperjs/core": "^2.11.8",
-		"alpinejs": "^3.13.0",
+		"alpinejs": "^3.13.1",
 		"animate.css": "^3.5.2",
 		"bootbox": "^5.5.3",
 		"bootstrap-datepicker": "^1.10.0",

diff --git a/tests/specs/contentbox-web/contentbox/unit/importers/ContentBoxImporterSpec.cfc b/tests/specs/contentbox-web/contentbox/unit/importers/ContentBoxImporterSpec.cfc
@@ -21,22 +21,21 @@ component extends="tests.resources.BaseTest" {
 
 			it( "can import settings", function(){
 				withRollback( () => {
-					var importData = deserializeJSON( fileRead( expandPath( "/tests/resources/exports/setting.json" ) ) );
-					var importLog =	createObject( "java", "java.lang.StringBuilder" ).init(
-						""
+					var importData = deserializeJSON(
+						fileRead( expandPath( "/tests/resources/exports/setting.json" ) )
 					);
+					var importLog = createObject( "java", "java.lang.StringBuilder" ).init( "" );
 
 					var output = getInstance( "settingService@contentbox" ).importFromData(
-						importData : importData,
-						override : false,
+						importData: importData,
+						override  : false,
 						importLog : importLog
 					);
 
 					expect( output ).notToBeEmpty();
 					expect( output ).toInclude( "No settings imported as none where found or able to be overriden from the import file." );
-				})
-			});
-
+				} )
+			} );
 		} );
 	}