From 02cf4eac00f8108e7cf1314970f509a68ec10804 Mon Sep 17 00:00:00 2001 From: Eric Willhoit Date: Wed, 26 Mar 2025 15:38:19 -0500 Subject: [PATCH 01/14] feat!: update default license to Apache 2.0 BREAKING CHANGES: default license is now Apache 2.0 --- files/LICENSE.txt | 206 +++++++++++++++++++++++++++++++++++-- utils/sf-config.js | 6 ++ utils/standardize-files.js | 18 +++- utils/standardize-pjson.js | 12 ++- 4 files changed, 232 insertions(+), 10 deletions(-) diff --git a/files/LICENSE.txt b/files/LICENSE.txt index 026246e2..83a7ac43 100644 --- a/files/LICENSE.txt +++ b/files/LICENSE.txt @@ -1,12 +1,206 @@ -Copyright (c) REPLACE_YEAR, Salesforce.com, Inc. +Apache License Version 2.0 + +Copyright (c) REPLACE_YEAR Salesforce, Inc. All rights reserved. -Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "{}" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. -* Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. + Copyright {yyyy} {name of copyright owner} -* Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at -* Neither the name of Salesforce.com nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. + http://www.apache.org/licenses/LICENSE-2.0 -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. \ No newline at end of file + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/utils/sf-config.js b/utils/sf-config.js index 3a650883..f0da6383 100644 --- a/utils/sf-config.js +++ b/utils/sf-config.js @@ -80,6 +80,7 @@ const PACKAGE_DEFAULTS = { // Path to resolved config object. const resolvedConfigs = {}; +// eslint-disable-next-line complexity const resolveConfig = (path) => { if (path && resolvedConfigs[path]) { return resolvedConfigs[path]; @@ -147,6 +148,11 @@ const resolveConfig = (path) => { defaults.wireit['test:only'].command = `nyc mocha "${configFromFile.test.testsPath}"`; } + // If a custom license exists in the config file, don't add the fix-license script + if (!configFromFile.license) { + defaults.scripts['fix-license'] = 'eslint src test --fix --rule "header/header: [2]"'; + } + // Allow users to override certain scripts const config = Object.assign({}, defaults, configFromFile, { scripts: Object.assign({}, defaults.scripts ?? {}, configFromFile.scripts ?? {}), diff --git a/utils/standardize-files.js b/utils/standardize-files.js index b47f4f9b..2484e6fd 100644 --- a/utils/standardize-files.js +++ b/utils/standardize-files.js @@ -180,7 +180,23 @@ module.exports = (packageRoot = require('./package-path')) => { let added = []; let removed = []; - added.push(writeLicenseFile(packageRoot)); + // If the repo has a license specified in the '.sfdevrc' config, we don't want to override it + if (!config.license) { + added.push(writeLicenseFile(packageRoot)); + + // Replace the old README License badge with the new one + const readmeTargetPath = join(packageRoot, 'README.md'); + // https://regex101.com/r/j7JZFW/1 + const oldLicenseRegex = /\[!\[License\]\(https:\/\/summer-heart-0930.chufeiyun1688.workers.dev:443\/https\/img\.shields\.io\/badge\/License.*?\.svg\)\]\(.*?\)/gi; + const newLicenseBadge = + '[![License](https://img.shields.io/badge/License-Apache--2.0-blue.svg)](https://opensource.org/license/apache-2-0)'; // eslint-disable-line max-len + + if (exists(readmeTargetPath)) { + replaceInFile(readmeTargetPath, (contents) => contents.replace(oldLicenseRegex, newLicenseBadge)); + added.push(readmeTargetPath); + } + } + added.push(writeGitignore(packageRoot)); added.push(writeMocharcJson(packageRoot)); diff --git a/utils/standardize-pjson.js b/utils/standardize-pjson.js index 3001ff75..717db674 100644 --- a/utils/standardize-pjson.js +++ b/utils/standardize-pjson.js @@ -22,9 +22,15 @@ module.exports = (packageRoot = require('./package-path')) => { const pjson = new PackageJson(packageRoot); const license = pjson.get('license'); - if (license !== (config.license || 'BSD-3-Clause')) { - pjson.contents.license = 'BSD-3-Clause'; - pjson.actions.push(`updating license`); + + if (config.license && license !== config.license) { + pjson.contents.license = config.license; + pjson.actions.push(`updating license to ${config.license} to match config`); + } + + if (!config.license && license !== 'Apache-2.0') { + pjson.contents.license = 'Apache-2.0'; + pjson.actions.push(`updating license to Apache-2.0. Add a 'license' to your '.sfdevrc' to skip this.`); } const type = determineProjectType(packageRoot); From 149eb1ee73b63cc4a12cc2ae43868da37c254818 Mon Sep 17 00:00:00 2001 From: Willhoit Date: Thu, 10 Apr 2025 15:02:37 -0500 Subject: [PATCH 02/14] fix: major bump failed --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index c8998bce..5a26edd0 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@salesforce/dev-scripts", - "version": "10.2.12", + "version": "11.0.0", "description": "Standardize package.json scripts and config files for Salesforce projects.", "repository": "forcedotcom/dev-scripts", "bin": { From 962277a6e19d050aaceed2dff66003706519519f Mon Sep 17 00:00:00 2001 From: svc-cli-bot Date: Thu, 10 Apr 2025 20:02:53 +0000 Subject: [PATCH 03/14] chore(release): 11.0.1 [skip ci] --- CHANGELOG.md | 9 +++++++++ package.json | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 71a94974..9f0df37b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,12 @@ +## [11.0.1](https://github.com/forcedotcom/dev-scripts/compare/10.2.12...11.0.1) (2025-04-10) + + +### Bug Fixes + +* major bump failed ([149eb1e](https://github.com/forcedotcom/dev-scripts/commit/149eb1ee73b63cc4a12cc2ae43868da37c254818)) + + + ## [10.2.12](https://github.com/forcedotcom/dev-scripts/compare/10.2.11...10.2.12) (2025-02-27) diff --git a/package.json b/package.json index 5a26edd0..e83c6c03 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@salesforce/dev-scripts", - "version": "11.0.0", + "version": "11.0.1", "description": "Standardize package.json scripts and config files for Salesforce projects.", "repository": "forcedotcom/dev-scripts", "bin": { From 5c41ed868de17d6aae6d0b83982052c4cdb45a78 Mon Sep 17 00:00:00 2001 From: Eric Willhoit Date: Mon, 21 Apr 2025 11:48:55 -0500 Subject: [PATCH 04/14] fix: bump wireit for new cache --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index e83c6c03..6ae729aa 100644 --- a/package.json +++ b/package.json @@ -57,7 +57,7 @@ "typedoc": "^0.26.5", "typedoc-plugin-missing-exports": "^3.0.0", "typescript": "^5.5.4", - "wireit": "^0.14.5" + "wireit": "^0.14.12" }, "publishConfig": { "access": "public" diff --git a/yarn.lock b/yarn.lock index 36f25b9c..8e69f578 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4199,10 +4199,10 @@ which@^2.0.1: dependencies: isexe "^2.0.0" -wireit@^0.14.5: - version "0.14.5" - resolved "https://registry.npmjs.org/wireit/-/wireit-0.14.5.tgz#cd1c4136444c8dbe655f34f60fe2454a9e69d430" - integrity sha512-K4ka9YBpSyD6pmFZYTJd4VpPsAiPT6j/fOtLzYgnKWlPIMM7lAZjQQ30H7urO+Lqx1Wvrw88tQHBz4njy+lglg== +wireit@^0.14.12: + version "0.14.12" + resolved "https://registry.npmjs.org/wireit/-/wireit-0.14.12.tgz#c35788b4be4a796a8d05d204ec7d3f5c4b355d71" + integrity sha512-gNSd+nZmMo6cuICezYXRIayu6TSOeCSCDzjSF0q6g8FKDsRbdqrONrSZYzdk/uBISmRcv4vZtsno6GyGvdXwGA== dependencies: brace-expansion "^4.0.0" chokidar "^3.5.3" From 53751acafc281147124696065afa2556129888d3 Mon Sep 17 00:00:00 2001 From: svc-cli-bot Date: Mon, 21 Apr 2025 19:35:35 +0000 Subject: [PATCH 05/14] chore(release): 11.0.2 [skip ci] --- CHANGELOG.md | 9 +++++++++ package.json | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9f0df37b..b8a341ef 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,12 @@ +## [11.0.2](https://github.com/forcedotcom/dev-scripts/compare/11.0.1...11.0.2) (2025-04-21) + + +### Bug Fixes + +* bump wireit for new cache ([5c41ed8](https://github.com/forcedotcom/dev-scripts/commit/5c41ed868de17d6aae6d0b83982052c4cdb45a78)) + + + ## [11.0.1](https://github.com/forcedotcom/dev-scripts/compare/10.2.12...11.0.1) (2025-04-10) diff --git a/package.json b/package.json index 6ae729aa..421b128e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@salesforce/dev-scripts", - "version": "11.0.1", + "version": "11.0.2", "description": "Standardize package.json scripts and config files for Salesforce projects.", "repository": "forcedotcom/dev-scripts", "bin": { From 041dfde7cfcd4f8d9241285bab1ad248dac4ed25 Mon Sep 17 00:00:00 2001 From: Cristian Dominguez Date: Mon, 18 Aug 2025 14:53:06 -0300 Subject: [PATCH 06/14] fix: bump node types --- package.json | 2 +- yarn.lock | 39 ++++++++++++++++++++++++++++++++------- 2 files changed, 33 insertions(+), 8 deletions(-) diff --git a/package.json b/package.json index 421b128e..dc549d9b 100644 --- a/package.json +++ b/package.json @@ -38,7 +38,7 @@ "@salesforce/prettier-config": "^0.0.3", "@types/chai": "^4.3.14", "@types/mocha": "^10.0.7", - "@types/node": "^18.19.41", + "@types/node": "^18", "@types/sinon": "^10.0.20", "chai": "^4.3.10", "chalk": "^4.0.0", diff --git a/yarn.lock b/yarn.lock index 8e69f578..a1fff137 100644 --- a/yarn.lock +++ b/yarn.lock @@ -589,10 +589,10 @@ resolved "https://registry.npmjs.org/@types/node/-/node-20.2.3.tgz#b31eb300610c3835ac008d690de6f87e28f9b878" integrity sha512-pg9d0yC4rVNWQzX8U7xb4olIOFuuVL9za3bzMT2pu2SU0SNEi66i2qrvhE2qt0HvkhuCaWJu7pLNOt/Pj8BIrw== -"@types/node@^18.19.41": - version "18.19.41" - resolved "https://registry.npmjs.org/@types/node/-/node-18.19.41.tgz#27695cf2cac63f22c202b9217c0bcf3fb192a2f0" - integrity sha512-LX84pRJ+evD2e2nrgYCHObGWkiQJ1mL+meAgbvnwk/US6vmMY7S2ygBTGV2Jw91s9vUsLSXeDEkUHZIJGLrhsg== +"@types/node@^18": + version "18.19.123" + resolved "https://registry.npmjs.org/@types/node/-/node-18.19.123.tgz#08a3e4f5e0c73b8840c677b7635ce59d5dc1f76d" + integrity sha512-K7DIaHnh0mzVxreCR9qwgNxp3MH9dltPNIEddW9MYUlcKAzm+3grKNSTe2vCJHI1FaLpvpL5JGJrz1UZDKYvDg== dependencies: undici-types "~5.26.4" @@ -3779,7 +3779,16 @@ srcset@^5.0.0: resolved "https://registry.npmjs.org/srcset/-/srcset-5.0.0.tgz#9df6c3961b5b44a02532ce6ae4544832609e2e3f" integrity sha512-SqEZaAEhe0A6ETEa9O1IhSPC7MdvehZtCnTR0AftXk3QhY2UNgb+NApFOUPZILXk/YTDfFxMTNJOBpzrJsEdIA== -"string-width-cjs@npm:string-width@^4.2.0", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3: +"string-width-cjs@npm:string-width@^4.2.0": + version "4.2.3" + resolved "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" + integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== + dependencies: + emoji-regex "^8.0.0" + is-fullwidth-code-point "^3.0.0" + strip-ansi "^6.0.1" + +string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3: version "4.2.3" resolved "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== @@ -3831,7 +3840,14 @@ string_decoder@^1.1.1: dependencies: safe-buffer "~5.2.0" -"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.0, strip-ansi@^6.0.1: +"strip-ansi-cjs@npm:strip-ansi@^6.0.1": + version "6.0.1" + resolved "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" + integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== + dependencies: + ansi-regex "^5.0.1" + +strip-ansi@^6.0.0, strip-ansi@^6.0.1: version "6.0.1" resolved "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== @@ -4215,7 +4231,7 @@ workerpool@^6.5.1: resolved "https://registry.npmjs.org/workerpool/-/workerpool-6.5.1.tgz#060f73b39d0caf97c6db64da004cd01b4c099544" integrity sha512-Fs4dNYcsdpYSAfVxhnl1L5zTksjvOJxtC5hzMNl+1t9B8hTJTdKDyZ5ju7ztgPy+ft9tBFXoOlDNiOT9WUXZlA== -"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0: +"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0": version "7.0.0" resolved "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== @@ -4233,6 +4249,15 @@ wrap-ansi@^6.2.0: string-width "^4.1.0" strip-ansi "^6.0.0" +wrap-ansi@^7.0.0: + version "7.0.0" + resolved "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" + integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== + dependencies: + ansi-styles "^4.0.0" + string-width "^4.1.0" + strip-ansi "^6.0.0" + wrap-ansi@^8.1.0: version "8.1.0" resolved "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz#56dc22368ee570face1b49819975d9b9a5ead214" From d42e83ed49a1a9fc98a6b6e8bac035a555f17009 Mon Sep 17 00:00:00 2001 From: svc-cli-bot Date: Mon, 18 Aug 2025 17:57:52 +0000 Subject: [PATCH 07/14] chore(release): 11.0.3 [skip ci] --- CHANGELOG.md | 9 +++++++++ package.json | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b8a341ef..f9f76ecc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,12 @@ +## [11.0.3](https://github.com/forcedotcom/dev-scripts/compare/11.0.2...11.0.3) (2025-08-18) + + +### Bug Fixes + +* bump node types ([041dfde](https://github.com/forcedotcom/dev-scripts/commit/041dfde7cfcd4f8d9241285bab1ad248dac4ed25)) + + + ## [11.0.2](https://github.com/forcedotcom/dev-scripts/compare/11.0.1...11.0.2) (2025-04-21) diff --git a/package.json b/package.json index dc549d9b..24379ebb 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@salesforce/dev-scripts", - "version": "11.0.2", + "version": "11.0.3", "description": "Standardize package.json scripts and config files for Salesforce projects.", "repository": "forcedotcom/dev-scripts", "bin": { From 3c46a0200334b2f6f2fd6839df65506f9f60d62d Mon Sep 17 00:00:00 2001 From: Eric Willhoit Date: Thu, 28 Aug 2025 17:49:37 -0500 Subject: [PATCH 08/14] fix: oss-templates and apache 2.0 --- .eslintrc.js | 17 ++- .git2gus/config.json | 2 +- .github/CODEOWNERS | 10 -- CODEOWNERS | 5 +- LICENSE.txt | 206 ++++++++++++++++++++++++++++++++- bin/sf-clean.js | 17 ++- bin/sf-docs.js | 17 ++- bin/sf-install.js | 17 ++- bin/sf-prepack.js | 17 ++- commitlint.config.js | 16 +++ core-plugins.json | 1 + files/eslintrc-strict.cjs | 17 ++- files/eslintrc-test-strict.cjs | 17 ++- files/eslintrc-test.cjs | 17 ++- files/eslintrc.cjs | 17 ++- jit-plugins.json | 7 +- package.json | 5 +- test/.eslintrc.js | 17 ++- test/order-map.test.js | 17 ++- utils/exists.js | 17 ++- utils/husky-init.js | 17 ++- utils/load-root-path.js | 17 ++- utils/log.js | 17 ++- utils/order-map.js | 17 ++- utils/package-json.js | 17 ++- utils/package-path.js | 17 ++- utils/project-type.js | 17 ++- utils/semver.js | 17 ++- utils/sf-config.js | 17 ++- utils/shelljs.js | 17 ++- utils/standardize-files.js | 17 ++- utils/standardize-pjson.js | 17 ++- utils/write-dependencies.js | 17 ++- yarn.lock | 49 ++------ 34 files changed, 564 insertions(+), 162 deletions(-) delete mode 100644 .github/CODEOWNERS diff --git a/.eslintrc.js b/.eslintrc.js index f4f8a8c2..b8e9a64b 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -1,8 +1,17 @@ /* - * Copyright (c) 2020, salesforce.com, inc. - * All rights reserved. - * 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 + * Copyright 2025, Salesforce, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ module.exports = { diff --git a/.git2gus/config.json b/.git2gus/config.json index 4a52dbbe..203c8086 100644 --- a/.git2gus/config.json +++ b/.git2gus/config.json @@ -1,6 +1,6 @@ { "productTag": "a1aB00000004Bx8IAE", - "defaultBuild": "offcore.tooling.56", + "defaultBuild": "offcore.tooling.58", "issueTypeLabels": { "feature": "USER STORY", "regression": "BUG P1", diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS deleted file mode 100644 index cd1558d7..00000000 --- a/.github/CODEOWNERS +++ /dev/null @@ -1,10 +0,0 @@ -#ECCN: Open Source -#GUSINFO:Open Source,Open Source Workflow - -# For more info on this file syntax: -# https://help.github.com/en/articles/about-code-owners - -# These owners will be the default owners for everything in -# the repo. - -* @forcedotcom/platform-cli diff --git a/CODEOWNERS b/CODEOWNERS index 522fa4a0..0d912e63 100644 --- a/CODEOWNERS +++ b/CODEOWNERS @@ -1,2 +1,3 @@ -# Comment line immediately above ownership line is reserved for related gus information. Please be careful while editing. -#ECCN:Open Source +# Comment line immediately above ownership line is reserved for related other information. Please be careful while editing. +#ECCN:Open Source 5D002 +#GUSINFO:Platform CLI,Platform CLI \ No newline at end of file diff --git a/LICENSE.txt b/LICENSE.txt index 9b64188e..ca35d0df 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -1,12 +1,206 @@ -Copyright (c) 2018, Salesforce.com, Inc. +Apache License Version 2.0 + +Copyright (c) 2025 Salesforce, Inc. All rights reserved. -Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "{}" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. -* Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. + Copyright {yyyy} {name of copyright owner} -* Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at -* Neither the name of Salesforce.com nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. + http://www.apache.org/licenses/LICENSE-2.0 -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. \ No newline at end of file + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/bin/sf-clean.js b/bin/sf-clean.js index 657c5256..951df2f6 100755 --- a/bin/sf-clean.js +++ b/bin/sf-clean.js @@ -1,9 +1,18 @@ #!/usr/bin/env node /* - * Copyright (c) 2020, salesforce.com, inc. - * All rights reserved. - * 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 + * Copyright 2025, Salesforce, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ const { readFileSync } = require('fs'); diff --git a/bin/sf-docs.js b/bin/sf-docs.js index d0695bbc..6fd16412 100755 --- a/bin/sf-docs.js +++ b/bin/sf-docs.js @@ -1,9 +1,18 @@ #!/usr/bin/env node /* - * Copyright (c) 2020, salesforce.com, inc. - * All rights reserved. - * 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 + * Copyright 2025, Salesforce, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ const { join } = require('path'); diff --git a/bin/sf-install.js b/bin/sf-install.js index 2e1a739d..cb0e1d0c 100755 --- a/bin/sf-install.js +++ b/bin/sf-install.js @@ -1,9 +1,18 @@ #!/usr/bin/env node /* - * Copyright (c) 2021, salesforce.com, inc. - * All rights reserved. - * 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 + * Copyright 2025, Salesforce, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ const chalk = require('chalk'); diff --git a/bin/sf-prepack.js b/bin/sf-prepack.js index 85f89401..f0834162 100755 --- a/bin/sf-prepack.js +++ b/bin/sf-prepack.js @@ -1,9 +1,18 @@ #!/usr/bin/env node /* - * Copyright (c) 2020, salesforce.com, inc. - * All rights reserved. - * 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 + * Copyright 2025, Salesforce, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ const chalk = require('chalk'); diff --git a/commitlint.config.js b/commitlint.config.js index 422b1944..acac8fd8 100644 --- a/commitlint.config.js +++ b/commitlint.config.js @@ -1 +1,17 @@ +/* + * Copyright 2025, Salesforce, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + module.exports = { extends: ['@commitlint/config-conventional'] }; diff --git a/core-plugins.json b/core-plugins.json index 34df47d2..05b8afa9 100644 --- a/core-plugins.json +++ b/core-plugins.json @@ -1,4 +1,5 @@ [ + "@salesforce/plugin-agent", "@salesforce/plugin-apex", "@salesforce/plugin-api", "@salesforce/plugin-auth", diff --git a/files/eslintrc-strict.cjs b/files/eslintrc-strict.cjs index 33b19f51..497f87ac 100644 --- a/files/eslintrc-strict.cjs +++ b/files/eslintrc-strict.cjs @@ -1,8 +1,17 @@ /* - * Copyright (c) 2020, salesforce.com, inc. - * All rights reserved. - * 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 + * Copyright 2025, Salesforce, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ // Generated - Do not modify. Controlled by @salesforce/dev-scripts diff --git a/files/eslintrc-test-strict.cjs b/files/eslintrc-test-strict.cjs index da31d212..ce6aaaa4 100644 --- a/files/eslintrc-test-strict.cjs +++ b/files/eslintrc-test-strict.cjs @@ -1,8 +1,17 @@ /* - * Copyright (c) 2020, salesforce.com, inc. - * All rights reserved. - * 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 + * Copyright 2025, Salesforce, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ // Generated - Do not modify. Controlled by @salesforce/dev-scripts diff --git a/files/eslintrc-test.cjs b/files/eslintrc-test.cjs index fadf2c90..524a246c 100644 --- a/files/eslintrc-test.cjs +++ b/files/eslintrc-test.cjs @@ -1,8 +1,17 @@ /* - * Copyright (c) 2020, salesforce.com, inc. - * All rights reserved. - * 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 + * Copyright 2025, Salesforce, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ module.exports = { diff --git a/files/eslintrc.cjs b/files/eslintrc.cjs index d4166fd0..d9a770f8 100644 --- a/files/eslintrc.cjs +++ b/files/eslintrc.cjs @@ -1,8 +1,17 @@ /* - * Copyright (c) 2020, salesforce.com, inc. - * All rights reserved. - * 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 + * Copyright 2025, Salesforce, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ module.exports = { extends: ['eslint-config-salesforce-typescript', 'eslint-config-salesforce-license', 'eslint-config-prettier'], diff --git a/jit-plugins.json b/jit-plugins.json index 290a46e8..7f1c8700 100644 --- a/jit-plugins.json +++ b/jit-plugins.json @@ -1,11 +1,10 @@ [ + "@salesforce/code-analyzer", "@salesforce/plugin-community", "@salesforce/plugin-custom-metadata", "@salesforce/plugin-dev", "@salesforce/plugin-devops-center", - "@salesforce/plugin-env", - "@salesforce/plugin-functions", + "@salesforce/plugin-flow", "@salesforce/plugin-signups", - "@salesforce/sfdx-plugin-lwc-test", - "@salesforce/sfdx-scanner" + "@salesforce/sfdx-plugin-lwc-test" ] diff --git a/package.json b/package.json index 24379ebb..40326fbc 100644 --- a/package.json +++ b/package.json @@ -15,6 +15,7 @@ "lint": "eslint \"{files,test,utils,bin}/**/*.js\"", "clean": "bin/sf-clean.js", "clean-all": "bin/sf-clean.js all", + "fix-license": "eslint utils files/*.cjs test --fix --rule \"header/header: [2]\"", "test": "nyc mocha test/**/*.test.js", "prepare": "husky install" }, @@ -22,7 +23,7 @@ "sfdx" ], "author": "Platform CLI", - "license": "BSD-3-Clause", + "license": "Apache-2.0", "files": [ "bin", "utils", @@ -43,7 +44,7 @@ "chai": "^4.3.10", "chalk": "^4.0.0", "cosmiconfig": "^8.3.6", - "eslint-config-salesforce-typescript": "^3.4.0", + "eslint-config-salesforce-typescript": "4.0.1-deb.0", "husky": "^7.0.4", "linkinator": "^6.1.1", "mocha": "^10.7.0", diff --git a/test/.eslintrc.js b/test/.eslintrc.js index 077cae96..445f32fb 100644 --- a/test/.eslintrc.js +++ b/test/.eslintrc.js @@ -1,8 +1,17 @@ /* - * Copyright (c) 2020, salesforce.com, inc. - * All rights reserved. - * 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 + * Copyright 2025, Salesforce, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ module.exports = { extends: '../.eslintrc.js', diff --git a/test/order-map.test.js b/test/order-map.test.js index 086fb722..0b0c2bd2 100644 --- a/test/order-map.test.js +++ b/test/order-map.test.js @@ -1,8 +1,17 @@ /* - * Copyright (c) 2020, salesforce.com, inc. - * All rights reserved. - * 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 + * Copyright 2025, Salesforce, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ const { expect } = require('chai'); diff --git a/utils/exists.js b/utils/exists.js index 31a8eabb..fa3d040a 100644 --- a/utils/exists.js +++ b/utils/exists.js @@ -1,8 +1,17 @@ /* - * Copyright (c) 2020, salesforce.com, inc. - * All rights reserved. - * 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 + * Copyright 2025, Salesforce, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ const { accessSync } = require('fs'); diff --git a/utils/husky-init.js b/utils/husky-init.js index a0f6ff0e..9d03eed0 100644 --- a/utils/husky-init.js +++ b/utils/husky-init.js @@ -1,8 +1,17 @@ /* - * Copyright (c) 2021, salesforce.com, inc. - * All rights reserved. - * 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 + * Copyright 2025, Salesforce, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ const fs = require('fs'); diff --git a/utils/load-root-path.js b/utils/load-root-path.js index b1e95da7..119e35e1 100644 --- a/utils/load-root-path.js +++ b/utils/load-root-path.js @@ -1,8 +1,17 @@ /* - * Copyright (c) 2020, salesforce.com, inc. - * All rights reserved. - * 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 + * Copyright 2025, Salesforce, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ const { accessSync } = require('fs'); diff --git a/utils/log.js b/utils/log.js index 69c6a1f3..0fa7a24c 100644 --- a/utils/log.js +++ b/utils/log.js @@ -1,8 +1,17 @@ /* - * Copyright (c) 2020, salesforce.com, inc. - * All rights reserved. - * 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 + * Copyright 2025, Salesforce, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ const chalk = require('chalk'); diff --git a/utils/order-map.js b/utils/order-map.js index e999cbc1..564d97e7 100644 --- a/utils/order-map.js +++ b/utils/order-map.js @@ -1,8 +1,17 @@ /* - * Copyright (c) 2020, salesforce.com, inc. - * All rights reserved. - * 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 + * Copyright 2025, Salesforce, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ module.exports = (map) => { diff --git a/utils/package-json.js b/utils/package-json.js index c1d55c86..f5693bfe 100644 --- a/utils/package-json.js +++ b/utils/package-json.js @@ -1,8 +1,17 @@ /* - * Copyright (c) 2020, salesforce.com, inc. - * All rights reserved. - * 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 + * Copyright 2025, Salesforce, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ const { writeFileSync } = require('fs'); diff --git a/utils/package-path.js b/utils/package-path.js index 4dfcd048..ed6a5749 100644 --- a/utils/package-path.js +++ b/utils/package-path.js @@ -1,8 +1,17 @@ /* - * Copyright (c) 2020, salesforce.com, inc. - * All rights reserved. - * 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 + * Copyright 2025, Salesforce, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ const loadRootPath = require('./load-root-path'); diff --git a/utils/project-type.js b/utils/project-type.js index 8dded03d..25f50b36 100644 --- a/utils/project-type.js +++ b/utils/project-type.js @@ -1,8 +1,17 @@ /* - * Copyright (c) 2020, salesforce.com, inc. - * All rights reserved. - * 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 + * Copyright 2025, Salesforce, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ const { join } = require('path'); diff --git a/utils/semver.js b/utils/semver.js index 2010c1fc..8c96a1fa 100644 --- a/utils/semver.js +++ b/utils/semver.js @@ -1,8 +1,17 @@ /* - * Copyright (c) 2023, salesforce.com, inc. - * All rights reserved. - * 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 + * Copyright 2025, Salesforce, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ exports.semverIsLessThan = (version, target) => { diff --git a/utils/sf-config.js b/utils/sf-config.js index f0da6383..a4be0224 100644 --- a/utils/sf-config.js +++ b/utils/sf-config.js @@ -1,8 +1,17 @@ /* - * Copyright (c) 2020, salesforce.com, inc. - * All rights reserved. - * 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 + * Copyright 2025, Salesforce, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ const { existsSync } = require('fs'); diff --git a/utils/shelljs.js b/utils/shelljs.js index 7a7dc396..6185bf3e 100644 --- a/utils/shelljs.js +++ b/utils/shelljs.js @@ -1,8 +1,17 @@ /* - * Copyright (c) 2020, salesforce.com, inc. - * All rights reserved. - * 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 + * Copyright 2025, Salesforce, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ const shell = require('shelljs'); diff --git a/utils/standardize-files.js b/utils/standardize-files.js index 2484e6fd..04a96a79 100644 --- a/utils/standardize-files.js +++ b/utils/standardize-files.js @@ -1,8 +1,17 @@ /* - * Copyright (c) 2020, salesforce.com, inc. - * All rights reserved. - * 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 + * Copyright 2025, Salesforce, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ const { join } = require('path'); diff --git a/utils/standardize-pjson.js b/utils/standardize-pjson.js index 717db674..84a53218 100644 --- a/utils/standardize-pjson.js +++ b/utils/standardize-pjson.js @@ -1,8 +1,17 @@ /* - * Copyright (c) 2020, salesforce.com, inc. - * All rights reserved. - * 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 + * Copyright 2025, Salesforce, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ const { readFileSync } = require('fs'); diff --git a/utils/write-dependencies.js b/utils/write-dependencies.js index 6d58b0dd..0097a293 100644 --- a/utils/write-dependencies.js +++ b/utils/write-dependencies.js @@ -1,8 +1,17 @@ /* - * Copyright (c) 2020, salesforce.com, inc. - * All rights reserved. - * 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 + * Copyright 2025, Salesforce, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ const { join } = require('path'); diff --git a/yarn.lock b/yarn.lock index a1fff137..9f8db100 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1557,22 +1557,22 @@ eslint-config-prettier@^9.1.0: resolved "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-9.1.0.tgz#31af3d94578645966c082fcb71a5846d3c94867f" integrity sha512-NSWl5BFQWEPi1j4TjVNItzYV7dZXZ+wP6I6ZhrBGpChQhZRUaElihE9uRRkcbRnNb76UMKDF3r+WTmNcGPKsqw== -eslint-config-salesforce-license@^0.2.0: - version "0.2.0" - resolved "https://registry.npmjs.org/eslint-config-salesforce-license/-/eslint-config-salesforce-license-0.2.0.tgz#323193f1aa15dd33fbf108d25fc1210afc11065e" - integrity sha512-DJdBvgj82Erum82YMe+YvG/o6ukna3UA++lRl0HSTldj0VlBl3Q8hzCp97nRXZHra6JH1I912yievZzklXDw6w== +eslint-config-salesforce-license@^1.0.2: + version "1.0.2" + resolved "https://registry.npmjs.org/eslint-config-salesforce-license/-/eslint-config-salesforce-license-1.0.2.tgz#0bc7f482677f44105a6a28644f5ccbd4c9abfa01" + integrity sha512-l/1uz9RJHQHnVEEexHpHsQt3+aP/Ys2HGfZcLuUg/FZ6NGhL15ey33OJfYCYtSUKMLGiEKdUhdWVp34WD4rIdQ== -eslint-config-salesforce-typescript@^3.4.0: - version "3.4.0" - resolved "https://registry.npmjs.org/eslint-config-salesforce-typescript/-/eslint-config-salesforce-typescript-3.4.0.tgz#3542e96aa6054b3df3b7c636b3b7f5bf4238bfb3" - integrity sha512-pT+kJsmLrXIsVw1f24gWB+a2Iefan9qp02iSdx5mk4Jb/Jv68LhS+V/dfJxN5vvKhzvc86UwUPEIQBX9OCSbpQ== +eslint-config-salesforce-typescript@4.0.1-deb.0: + version "4.0.1-deb.0" + resolved "https://registry.npmjs.org/eslint-config-salesforce-typescript/-/eslint-config-salesforce-typescript-4.0.1-deb.0.tgz#dafaaf48d9f0dc2d3f7010d20b135f92bab34086" + integrity sha512-k2GrNEdgg5Hrb9+T3MsPf6c/f2TCaYpVXzqclHLobaTiJigKJl/t6ToMopO0h5UYMVSQYKYreqWwJrObPX7wyg== dependencies: "@typescript-eslint/eslint-plugin" "^6.21.0" "@typescript-eslint/parser" "^6.21.0" eslint "^8.56.0" eslint-config-prettier "^9.1.0" eslint-config-salesforce "^2.2.0" - eslint-config-salesforce-license "^0.2.0" + eslint-config-salesforce-license "^1.0.2" eslint-plugin-header "^3.1.1" eslint-plugin-import "^2.29.1" eslint-plugin-jsdoc "^46.10.1" @@ -3779,16 +3779,7 @@ srcset@^5.0.0: resolved "https://registry.npmjs.org/srcset/-/srcset-5.0.0.tgz#9df6c3961b5b44a02532ce6ae4544832609e2e3f" integrity sha512-SqEZaAEhe0A6ETEa9O1IhSPC7MdvehZtCnTR0AftXk3QhY2UNgb+NApFOUPZILXk/YTDfFxMTNJOBpzrJsEdIA== -"string-width-cjs@npm:string-width@^4.2.0": - version "4.2.3" - resolved "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" - integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== - dependencies: - emoji-regex "^8.0.0" - is-fullwidth-code-point "^3.0.0" - strip-ansi "^6.0.1" - -string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3: +"string-width-cjs@npm:string-width@^4.2.0", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3: version "4.2.3" resolved "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== @@ -3840,14 +3831,7 @@ string_decoder@^1.1.1: dependencies: safe-buffer "~5.2.0" -"strip-ansi-cjs@npm:strip-ansi@^6.0.1": - version "6.0.1" - resolved "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" - integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== - dependencies: - ansi-regex "^5.0.1" - -strip-ansi@^6.0.0, strip-ansi@^6.0.1: +"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.0, strip-ansi@^6.0.1: version "6.0.1" resolved "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== @@ -4231,7 +4215,7 @@ workerpool@^6.5.1: resolved "https://registry.npmjs.org/workerpool/-/workerpool-6.5.1.tgz#060f73b39d0caf97c6db64da004cd01b4c099544" integrity sha512-Fs4dNYcsdpYSAfVxhnl1L5zTksjvOJxtC5hzMNl+1t9B8hTJTdKDyZ5ju7ztgPy+ft9tBFXoOlDNiOT9WUXZlA== -"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0": +"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0: version "7.0.0" resolved "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== @@ -4249,15 +4233,6 @@ wrap-ansi@^6.2.0: string-width "^4.1.0" strip-ansi "^6.0.0" -wrap-ansi@^7.0.0: - version "7.0.0" - resolved "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" - integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== - dependencies: - ansi-styles "^4.0.0" - string-width "^4.1.0" - strip-ansi "^6.0.0" - wrap-ansi@^8.1.0: version "8.1.0" resolved "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz#56dc22368ee570face1b49819975d9b9a5ead214" From bd2fae48836dcf3bbc14b0fb7ab8be1852ce4053 Mon Sep 17 00:00:00 2001 From: svc-cli-bot Date: Thu, 28 Aug 2025 22:58:49 +0000 Subject: [PATCH 09/14] chore(release): 11.0.4-dev.0 [skip ci] --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 40326fbc..a60aa5e4 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@salesforce/dev-scripts", - "version": "11.0.3", + "version": "11.0.4-dev.0", "description": "Standardize package.json scripts and config files for Salesforce projects.", "repository": "forcedotcom/dev-scripts", "bin": { From f189cdd08a347a53be0d0d3b69ef5e30fa476bda Mon Sep 17 00:00:00 2001 From: Eric Willhoit Date: Fri, 29 Aug 2025 09:16:10 -0500 Subject: [PATCH 10/14] fix: bump eslint lib --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index a60aa5e4..b42f9881 100644 --- a/package.json +++ b/package.json @@ -44,7 +44,7 @@ "chai": "^4.3.10", "chalk": "^4.0.0", "cosmiconfig": "^8.3.6", - "eslint-config-salesforce-typescript": "4.0.1-deb.0", + "eslint-config-salesforce-typescript": "4.0.1", "husky": "^7.0.4", "linkinator": "^6.1.1", "mocha": "^10.7.0", diff --git a/yarn.lock b/yarn.lock index 9f8db100..d700cc8a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1562,10 +1562,10 @@ eslint-config-salesforce-license@^1.0.2: resolved "https://registry.npmjs.org/eslint-config-salesforce-license/-/eslint-config-salesforce-license-1.0.2.tgz#0bc7f482677f44105a6a28644f5ccbd4c9abfa01" integrity sha512-l/1uz9RJHQHnVEEexHpHsQt3+aP/Ys2HGfZcLuUg/FZ6NGhL15ey33OJfYCYtSUKMLGiEKdUhdWVp34WD4rIdQ== -eslint-config-salesforce-typescript@4.0.1-deb.0: - version "4.0.1-deb.0" - resolved "https://registry.npmjs.org/eslint-config-salesforce-typescript/-/eslint-config-salesforce-typescript-4.0.1-deb.0.tgz#dafaaf48d9f0dc2d3f7010d20b135f92bab34086" - integrity sha512-k2GrNEdgg5Hrb9+T3MsPf6c/f2TCaYpVXzqclHLobaTiJigKJl/t6ToMopO0h5UYMVSQYKYreqWwJrObPX7wyg== +eslint-config-salesforce-typescript@4.0.1: + version "4.0.1" + resolved "https://registry.npmjs.org/eslint-config-salesforce-typescript/-/eslint-config-salesforce-typescript-4.0.1.tgz#d310a40ab117bb77c19d9f5d2377f278d2da97a4" + integrity sha512-aYRFIjVXA8b0fJt7JImcqRBb++lhFjLSeZhboMZZWMNGQyWeQ8pGX7ZW2/71TQiM0b4P8Nrpapi1w4VuM0kc/A== dependencies: "@typescript-eslint/eslint-plugin" "^6.21.0" "@typescript-eslint/parser" "^6.21.0" From a0e0693dd1f92b3c8410a1913b3e7813046de525 Mon Sep 17 00:00:00 2001 From: svc-cli-bot Date: Fri, 29 Aug 2025 14:22:10 +0000 Subject: [PATCH 11/14] chore(release): 11.0.4 [skip ci] --- CHANGELOG.md | 18 ++++++++++++++++++ package.json | 2 +- 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f9f76ecc..d0ce2cc9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,21 @@ +## [11.0.4](https://github.com/forcedotcom/dev-scripts/compare/11.0.4-dev.0...11.0.4) (2025-08-29) + + +### Bug Fixes + +* bump eslint lib ([f189cdd](https://github.com/forcedotcom/dev-scripts/commit/f189cdd08a347a53be0d0d3b69ef5e30fa476bda)) + + + +## [11.0.4-dev.0](https://github.com/forcedotcom/dev-scripts/compare/11.0.3...11.0.4-dev.0) (2025-08-28) + + +### Bug Fixes + +* oss-templates and apache 2.0 ([3c46a02](https://github.com/forcedotcom/dev-scripts/commit/3c46a0200334b2f6f2fd6839df65506f9f60d62d)) + + + ## [11.0.3](https://github.com/forcedotcom/dev-scripts/compare/11.0.2...11.0.3) (2025-08-18) diff --git a/package.json b/package.json index b42f9881..53541e30 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@salesforce/dev-scripts", - "version": "11.0.4-dev.0", + "version": "11.0.4", "description": "Standardize package.json scripts and config files for Salesforce projects.", "repository": "forcedotcom/dev-scripts", "bin": { From 38a07fd39ffedfd9eb776210c5c40756ba3542ce Mon Sep 17 00:00:00 2001 From: Salesforce OSPO Service Bot Date: Fri, 7 Nov 2025 15:39:48 -0500 Subject: [PATCH 12/14] Upload required file(s) for compliance --- CODEOWNERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CODEOWNERS b/CODEOWNERS index 0d912e63..3752f28b 100644 --- a/CODEOWNERS +++ b/CODEOWNERS @@ -1,3 +1,3 @@ # Comment line immediately above ownership line is reserved for related other information. Please be careful while editing. -#ECCN:Open Source 5D002 +#ECCN:Open Source #GUSINFO:Platform CLI,Platform CLI \ No newline at end of file From a66c723976e2ad0d6b21aed8a6feb9c6db79ef75 Mon Sep 17 00:00:00 2001 From: Salesforce OSPO Service Bot Date: Mon, 10 Nov 2025 06:47:07 -0500 Subject: [PATCH 13/14] Upload required file(s) for compliance From 898273fb8e69f6c485bc80f9fbda8d36b0129ab3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 25 Nov 2025 11:01:09 -0600 Subject: [PATCH 14/14] chore(deps): bump linkinator from 6.1.1 to 6.1.2 (#381) Bumps [linkinator](https://github.com/JustinBeckwith/linkinator) from 6.1.1 to 6.1.2. - [Release notes](https://github.com/JustinBeckwith/linkinator/releases) - [Commits](https://github.com/JustinBeckwith/linkinator/compare/v6.1.1...v6.1.2) --- updated-dependencies: - dependency-name: linkinator dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 39 ++++++++++++++++++++++++++++++++------- 2 files changed, 33 insertions(+), 8 deletions(-) diff --git a/package.json b/package.json index 53541e30..5829a4fa 100644 --- a/package.json +++ b/package.json @@ -46,7 +46,7 @@ "cosmiconfig": "^8.3.6", "eslint-config-salesforce-typescript": "4.0.1", "husky": "^7.0.4", - "linkinator": "^6.1.1", + "linkinator": "^6.1.2", "mocha": "^10.7.0", "nyc": "^17.0.0", "prettier": "^2.8.8", diff --git a/yarn.lock b/yarn.lock index d700cc8a..33f6aec0 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2693,10 +2693,10 @@ linkify-it@^5.0.0: dependencies: uc.micro "^2.0.0" -linkinator@^6.1.1: - version "6.1.1" - resolved "https://registry.npmjs.org/linkinator/-/linkinator-6.1.1.tgz#73b01877573af1df9c09eb7355e6d47fdf740210" - integrity sha512-VNFhw71A8ORQKdNdUz6MqcdmoCK2SKWI+22dmcN/7KuERTxv9yfezh5MqwetH66DmRPvj9FMtATk+ck2P5XJjw== +linkinator@^6.1.2: + version "6.1.2" + resolved "https://registry.npmjs.org/linkinator/-/linkinator-6.1.2.tgz#0cc25d934685d740f8cd3ccb95127ec1345a7605" + integrity sha512-PndSrQe21Hf4sn2vZldEzJmD0EUJbIsEy4jcZLcHd6IZfQ6rC6iv+Fwo666TWM9DcXjbCrHpxnVX6xaGrcJ/eA== dependencies: chalk "^5.0.0" escape-html "^1.0.3" @@ -3779,7 +3779,16 @@ srcset@^5.0.0: resolved "https://registry.npmjs.org/srcset/-/srcset-5.0.0.tgz#9df6c3961b5b44a02532ce6ae4544832609e2e3f" integrity sha512-SqEZaAEhe0A6ETEa9O1IhSPC7MdvehZtCnTR0AftXk3QhY2UNgb+NApFOUPZILXk/YTDfFxMTNJOBpzrJsEdIA== -"string-width-cjs@npm:string-width@^4.2.0", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3: +"string-width-cjs@npm:string-width@^4.2.0": + version "4.2.3" + resolved "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" + integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== + dependencies: + emoji-regex "^8.0.0" + is-fullwidth-code-point "^3.0.0" + strip-ansi "^6.0.1" + +string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3: version "4.2.3" resolved "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== @@ -3831,7 +3840,14 @@ string_decoder@^1.1.1: dependencies: safe-buffer "~5.2.0" -"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.0, strip-ansi@^6.0.1: +"strip-ansi-cjs@npm:strip-ansi@^6.0.1": + version "6.0.1" + resolved "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" + integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== + dependencies: + ansi-regex "^5.0.1" + +strip-ansi@^6.0.0, strip-ansi@^6.0.1: version "6.0.1" resolved "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== @@ -4215,7 +4231,7 @@ workerpool@^6.5.1: resolved "https://registry.npmjs.org/workerpool/-/workerpool-6.5.1.tgz#060f73b39d0caf97c6db64da004cd01b4c099544" integrity sha512-Fs4dNYcsdpYSAfVxhnl1L5zTksjvOJxtC5hzMNl+1t9B8hTJTdKDyZ5ju7ztgPy+ft9tBFXoOlDNiOT9WUXZlA== -"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0: +"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0": version "7.0.0" resolved "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== @@ -4233,6 +4249,15 @@ wrap-ansi@^6.2.0: string-width "^4.1.0" strip-ansi "^6.0.0" +wrap-ansi@^7.0.0: + version "7.0.0" + resolved "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" + integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== + dependencies: + ansi-styles "^4.0.0" + string-width "^4.1.0" + strip-ansi "^6.0.0" + wrap-ansi@^8.1.0: version "8.1.0" resolved "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz#56dc22368ee570face1b49819975d9b9a5ead214"