Merge branch 'main' into ew/eslint-to-8-for-now

CHANGELOG.md

@@ -1,3 +1,12 @@
+## [61.4.12](https://github.com/forcedotcom/salesforcedx-templates/compare/61.4.11...61.4.12) (2024-10-02)
+
+
+### Bug Fixes
+
+* avoid delta between templates locally and on org ([#616](https://github.com/forcedotcom/salesforcedx-templates/issues/616)) ([31e806c](https://github.com/forcedotcom/salesforcedx-templates/commit/31e806ce07723094cff385d7a9f3ff7f3d2d3b89))
+
+
+
 ## [61.4.11](https://github.com/forcedotcom/salesforcedx-templates/compare/61.4.10...61.4.11) (2024-09-15)
 
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@salesforce/templates",
-  "version": "61.4.11",
+  "version": "62.0.1",
   "description": "Salesforce JS library for templates",
   "bugs": "https://github.com/forcedotcom/salesforcedx-templates/issues",
   "main": "lib/index.js",
@@ -35,7 +35,7 @@
     "@typescript-eslint/parser": "^5.30.7",
     "chai": "^4.5.0",
     "chai-as-promised": "^7.1.2",
-    "commitizen": "^4.3.0",
+    "commitizen": "^4.3.1",
     "cz-conventional-changelog": "^3.3.0",
     "eslint": "^7.27.0",
     "eslint-config-prettier": "^6.11.0",
@@ -44,10 +44,10 @@
     "eslint-config-salesforce-typescript": "^0.2.7",
     "eslint-plugin-header": "^3.0.0",
     "eslint-plugin-import": "^2.29.0",
-    "eslint-plugin-jsdoc": "^46.8.2",
+    "eslint-plugin-jsdoc": "^46.10.1",
     "eslint-plugin-prettier": "^3.1.3",
     "husky": "^8.0.3",
-    "mocha": "^10.4.0",
+    "mocha": "^10.7.3",
     "nyc": "^15.1.0",
     "prettier": "^2.0.5",
     "pretty-quick": "^3.1.0",

src/templates/apexclass/_class.cls-meta.xml

@@ -2,4 +2,4 @@
 <ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
     <apiVersion><%= apiVersion %></apiVersion>
     <status>Active</status>
-</ApexClass>
+</ApexClass>

src/templates/apextrigger/_trigger.trigger-meta.xml

@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <ApexTrigger xmlns="http://soap.sforce.com/2006/04/metadata">
   <apiVersion><%= apiVersion %></apiVersion>
   <status>Active</status>
-</ApexTrigger>
+</ApexTrigger>

src/templates/lightningapp/DefaultLightningApp.app

@@ -1,3 +1,3 @@
 <aura:application>
 
-</aura:application>	
+</aura:application>

src/templates/lightningapp/DefaultLightningController.js

@@ -2,4 +2,4 @@
     myAction : function(component, event, helper) {
 
     }
-})
+})

src/templates/lightningapp/DefaultLightningCss.css

@@ -1,2 +1,2 @@
 .THIS {
-}
+}

src/templates/lightningapp/DefaultLightningHelper.js

@@ -2,4 +2,4 @@
     helperMethod : function() {
 
     }
-})
+})

src/templates/lightningapp/DefaultLightningRenderer.js

@@ -2,4 +2,4 @@
 
 // Your renderer method overrides go here
 
-})
+})

src/templates/lightningapp/_auradefinitionbundle.app-meta.xml

@@ -2,4 +2,4 @@
 <AuraDefinitionBundle xmlns="http://soap.sforce.com/2006/04/metadata">
     <apiVersion><%= apiVersion %></apiVersion>
     <description><%= description %></description>
-</AuraDefinitionBundle>
+</AuraDefinitionBundle>

src/templates/lightningcomponent/aura/default/default.cmp

@@ -1,3 +1,3 @@
 <aura:component>
 
-</aura:component>	
+</aura:component>

src/templates/lightningcomponent/aura/default/default.cmp-meta.xml

@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="UTF-8" ?>
+<?xml version="1.0" encoding="UTF-8"?>
 <AuraDefinitionBundle xmlns="http://soap.sforce.com/2006/04/metadata">
     <apiVersion><%= apiVersion %></apiVersion>
     <description><%= description %></description>
-</AuraDefinitionBundle>
+</AuraDefinitionBundle>

src/templates/lightningcomponent/aura/default/default.css

@@ -1,2 +1,2 @@
 .THIS {
-}
+}

src/templates/lightningcomponent/aura/default/defaultController.js

@@ -2,4 +2,4 @@
     myAction : function(component, event, helper) {
 
     }
-})
+})

src/templates/lightningcomponent/aura/default/defaultHelper.js

@@ -2,4 +2,4 @@
     helperMethod : function() {
 
     }
-})
+})

src/templates/lightningcomponent/aura/default/defaultRenderer.js

@@ -2,4 +2,4 @@
 
 // Your renderer method overrides go here
 
-})
+})

src/templates/lightningevent/DefaultLightningEvt.evt

@@ -1 +1 @@
-<aura:event type="APPLICATION" description="Event template"/>
+<aura:event type="APPLICATION" description="Event template" />

src/templates/lightningevent/_auradefinitionbundle.evt-meta.xml

@@ -2,4 +2,4 @@
 <AuraDefinitionBundle xmlns="http://soap.sforce.com/2006/04/metadata">
     <apiVersion><%= apiVersion %></apiVersion>
     <description><%= description %></description>
-</AuraDefinitionBundle>
+</AuraDefinitionBundle>

src/templates/lightninginterface/DefaultLightningIntf.intf

@@ -1,3 +1,3 @@
 <aura:interface description="Interface template">
   <aura:attribute name="example" type="String" default="" description="An example attribute."/>
-</aura:interface>
+</aura:interface>

src/templates/visualforcecomponent/DefaultVFComponent.component

@@ -1,6 +1,6 @@
-<apex:component>
+<apex:component >
 <!-- Begin Default Content REMOVE THIS -->
 <h1>Congratulations</h1>
 This is your new Component
 <!-- End Default Content REMOVE THIS -->
-</apex:component>
+</apex:component>

src/templates/visualforcecomponent/_component.component-meta.xml

@@ -2,4 +2,4 @@
 <ApexComponent xmlns="http://soap.sforce.com/2006/04/metadata">
     <apiVersion><%= apiVersion %></apiVersion>
     <label><%= vfLabel %></label>
-</ApexComponent>
+</ApexComponent>

src/templates/visualforcepage/DefaultVFPage.page

@@ -1,4 +1,4 @@
-<apex:page>
+<apex:page >
 <!-- Begin Default Content REMOVE THIS -->
 <h1>Congratulations</h1>
 This is your new Page

src/templates/visualforcepage/_page.page-meta.xml

@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexPage xmlns="http://soap.sforce.com/2006/04/metadata"> 
     <apiVersion><%= apiVersion %></apiVersion>
+    <availableInTouch>false</availableInTouch>
+     <confirmationTokenRequired>false</confirmationTokenRequired>
     <label><%= vfLabel %></label>
-</ApexPage>
+</ApexPage>

src/utils/constants.ts

@@ -4,4 +4,4 @@
  * Licensed under the BSD 3-Clause license.
  * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
  */
-export const DEFAULT_API_VERSION = '61.0';
+export const DEFAULT_API_VERSION = '62.0';