Skip to content

Commit

Permalink
fix: update to new structure
Browse files Browse the repository at this point in the history
  • Loading branch information
ClayChipps committed Jan 10, 2024
1 parent 9574fae commit 7ac0c54
Show file tree
Hide file tree
Showing 17 changed files with 313 additions and 297 deletions.
15 changes: 11 additions & 4 deletions .eslintrc.cjs
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
/*
* Copyright (c) 2024, Clay Chipps; Copyright (c) 2024, 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
*/

module.exports = {
extends: ['eslint-config-salesforce-typescript', 'plugin:sf-plugin/recommended'],
plugins: ['eslint-plugin-header'],
Expand All @@ -9,12 +16,12 @@ module.exports = {
[
'',
{
pattern: ' \\* Copyright \\(c\\) \\d{4}, Clay Chipps',
template: ' * Copyright (c) 2023, Clay Chipps',
pattern: ' \\* Copyright \\(c\\) \\d{4}, Clay Chipps; Copyright \\(c\\) \\d{4}, Salesforce.com, Inc.',
template: ' * Copyright (c) 2024, Clay Chipps; Copyright (c) 2024, Salesforce.com, Inc.',
},
' * All rights reserved.',
' * Licensed under the MIT License.',
' * For full license text, see LICENSE.md file in the repo root or https://opensource.org/licenses/MIT',
' * 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',
' ',
],
],
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/create-github-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,16 @@ on:
- main
- prerelease/**
tags-ignore:
- "*"
- '*'
workflow_dispatch:
inputs:
prerelease:
type: string
description: "Name to use for the prerelease: beta, dev, etc. NOTE: If this is already set in the package.json, it does not need to be passed in here."
description: 'Name to use for the prerelease: beta, dev, etc. NOTE: If this is already set in the package.json, it does not need to be passed in here.'

jobs:
release:
uses: salesforcecli/github-workflows/.github/workflows/create-github-release.yml@main
uses: ClayChipps/sf-chipps-github-workflows/.github/workflows/create-github-release.yml@main
secrets: inherit
with:
prerelease: ${{ inputs.prerelease }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/devScripts.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@ on:

jobs:
update:
uses: salesforcecli/github-workflows/.github/workflows/devScriptsUpdate.yml@main
uses: ClayChipps/sf-chipps-github-workflows/.github/workflows/devScriptsUpdate.yml@main
secrets: inherit
6 changes: 2 additions & 4 deletions .github/workflows/onRelease.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,11 @@ jobs:
- uses: actions/checkout@v3
with:
ref: ${{ github.event.release.tag_name || inputs.tag }}
- uses: salesforcecli/github-workflows/.github/actions/getPreReleaseTag@main
- uses: ClayChipps/sf-chipps-github-workflows/.github/actions/getPreReleaseTag@main
id: distTag
npm:
uses: salesforcecli/github-workflows/.github/workflows/npmPublish.yml@main
uses: ClayChipps/sf-chipps-github-workflows/.github/workflows/npmPublish.yml@main
needs: [getDistTag]
with:
tag: ${{ needs.getDistTag.outputs.tag || 'latest' }}
githubTag: ${{ github.event.release.tag_name || inputs.tag }}

secrets: inherit
20 changes: 8 additions & 12 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,11 @@ on:
workflow_dispatch:

jobs:
unit-tests:
uses: salesforcecli/github-workflows/.github/workflows/unitTest.yml@main
nuts:
needs: unit-tests
uses: salesforcecli/github-workflows/.github/workflows/nut.yml@main
secrets: inherit
strategy:
matrix:
os: [ubuntu-latest, windows-latest]
fail-fast: false
with:
os: ${{ matrix.os }}
yarn-lockfile-check:
uses: ClayChipps/sf-chipps-github-workflows/.github/workflows/lockFileCheck.yml@main
linux-unit-tests:
needs: yarn-lockfile-check
uses: ClayChipps/sf-chipps-github-workflows/.github/workflows/unitTestsLinux.yml@main
windows-unit-tests:
needs: yarn-lockfile-check
uses: ClayChipps/sf-chipps-github-workflows/.github/workflows/unitTestsWindows.yml@main
25 changes: 8 additions & 17 deletions LICENSE.txt
Original file line number Diff line number Diff line change
@@ -1,21 +1,12 @@
MIT License
Copyright (c) 2024, Clay Chipps; Copyright (c) 2024, Salesforce.com, Inc.
All rights reserved.

Copyright (c) 2023 Clay Chipps
Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
* Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.
* 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.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
* 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.

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.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# sf-chipps-package

[![NPM](https://img.shields.io/npm/v/sf-chipps-package.svg?label=sf-chipps-package)](https://www.npmjs.com/package/sf-chipps-package) [![Downloads/week](https://img.shields.io/npm/dw/sf-chipps-package.svg)](https://npmjs.org/package/sf-chipps-package) [![Known Vulnerabilities](https://snyk.io/test/github/ClayChipps/sf-chipps-package/badge.svg)](https://snyk.io/test/github/ClayChipps/sf-chipps-package) [![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://raw.githubusercontent.com/ClayChipps/sf-chipps-package/main/LICENSE.txt)
[![NPM](https://img.shields.io/npm/v/sf-chipps-package.svg?label=sf-chipps-package)](https://www.npmjs.com/package/sf-chipps-package) [![Downloads/week](https://img.shields.io/npm/dw/sf-chipps-package.svg)](https://npmjs.org/package/sf-chipps-package) [![Known Vulnerabilities](https://snyk.io/test/github/ClayChipps/sf-chipps-package/badge.svg)](https://snyk.io/test/github/ClayChipps/sf-chipps-package) [![License: BSD-3-Clause](https://img.shields.io/badge/License-BSD_3--Clause-yellow.svg)](https://raw.githubusercontent.com/ClayChipps/sf-chipps-package/main/LICENSE.txt)

## Install

Expand Down
7 changes: 4 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,18 +9,19 @@
"@salesforce/core": "^6.4.4",
"@salesforce/kit": "^3.0.15",
"@salesforce/packaging": "^3.1.0",
"@salesforce/sf-plugins-core": "^5.0.13"
"@salesforce/sf-plugins-core": "^5.0.13",
"@salesforce/ts-types": "^2.0.9"
},
"devDependencies": {
"@oclif/plugin-command-snapshot": "^5.0.5",
"@salesforce/cli-plugins-testkit": "^5.1.3",
"@salesforce/dev-scripts": "^8.2.0",
"@salesforce/plugin-command-reference": "^3.0.58",
"@salesforce/ts-sinon": "1.4.19",
"@types/shelljs": "^0.8.15",
"eslint-plugin-sf-plugin": "^1.17.0",
"moment": "^2.30.1",
"oclif": "^4.1.3",
"sf-chipps-dev-scripts": "^1.0.1",
"shelljs": "^0.8.5",
"shx": "0.3.4",
"ts-node": "^10.9.2",
Expand All @@ -46,7 +47,7 @@
"sf-plugin",
"sf"
],
"license": "MIT",
"license": "BSD-3-Clause",
"oclif": {
"additionalVersionFlags": [
"-v"
Expand Down
6 changes: 3 additions & 3 deletions src/commands/chipps/package/dependencies/install.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
/*
* Copyright (c) 2023, Clay Chipps
* Copyright (c) 2024, Clay Chipps; Copyright (c) 2024, Salesforce.com, Inc.
* All rights reserved.
* Licensed under the MIT License.
* For full license text, see LICENSE.md file in the repo root or https://opensource.org/licenses/MIT
* 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
*/

/* eslint-disable complexity */
Expand Down
6 changes: 3 additions & 3 deletions src/commands/chipps/package/version/cleanup.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
/*
* Copyright (c) 2023, Clay Chipps
* Copyright (c) 2024, Clay Chipps; Copyright (c) 2024, Salesforce.com, Inc.
* All rights reserved.
* Licensed under the MIT License.
* For full license text, see LICENSE.md file in the repo root or https://opensource.org/licenses/MIT
* 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
*/

import { SfCommand, Flags } from '@salesforce/sf-plugins-core';
Expand Down
6 changes: 3 additions & 3 deletions src/common/packageUtils.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
/*
* Copyright (c) 2023, Clay Chipps
* Copyright (c) 2024, Clay Chipps; Copyright (c) 2024, Salesforce.com, Inc.
* All rights reserved.
* Licensed under the MIT License.
* For full license text, see LICENSE.md file in the repo root or https://opensource.org/licenses/MIT
* 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
*/

import { Connection, SfError } from '@salesforce/core';
Expand Down
6 changes: 3 additions & 3 deletions src/index.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
/*
* Copyright (c) 2023, Clay Chipps
* Copyright (c) 2024, Clay Chipps; Copyright (c) 2024, Salesforce.com, Inc.
* All rights reserved.
* Licensed under the MIT License.
* For full license text, see LICENSE.md file in the repo root or https://opensource.org/licenses/MIT
* 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 default {};
6 changes: 3 additions & 3 deletions test/commands/chipps/package/dependencies/install.nut.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
/*
* Copyright (c) 2023, Clay Chipps
* Copyright (c) 2024, Clay Chipps; Copyright (c) 2024, Salesforce.com, Inc.
* All rights reserved.
* Licensed under the MIT License.
* For full license text, see LICENSE.md file in the repo root or https://opensource.org/licenses/MIT
* 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
*/

import path from 'node:path';
Expand Down
6 changes: 3 additions & 3 deletions test/commands/chipps/package/dependencies/install.test.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
/*
* Copyright (c) 2023, Clay Chipps
* Copyright (c) 2024, Clay Chipps; Copyright (c) 2024, Salesforce.com, Inc.
* All rights reserved.
* Licensed under the MIT License.
* For full license text, see LICENSE.md file in the repo root or https://opensource.org/licenses/MIT
* 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
*/

import { MockTestOrgData, TestContext } from '@salesforce/core/lib/testSetup.js';
Expand Down
6 changes: 3 additions & 3 deletions test/commands/chipps/package/version/cleanup.nut.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
/*
* Copyright (c) 2023, Clay Chipps
* Copyright (c) 2024, Clay Chipps; Copyright (c) 2024, Salesforce.com, Inc.
* All rights reserved.
* Licensed under the MIT License.
* For full license text, see LICENSE.md file in the repo root or https://opensource.org/licenses/MIT
* 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
*/

import { TestSession } from '@salesforce/cli-plugins-testkit';
Expand Down
6 changes: 3 additions & 3 deletions test/commands/chipps/package/version/cleanup.test.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
/*
* Copyright (c) 2023, Clay Chipps
* Copyright (c) 2024, Clay Chipps; Copyright (c) 2024, Salesforce.com, Inc.
* All rights reserved.
* Licensed under the MIT License.
* For full license text, see LICENSE.md file in the repo root or https://opensource.org/licenses/MIT
* 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
*/

import { SfError } from '@salesforce/core';
Expand Down
Loading

0 comments on commit 7ac0c54

Please sign in to comment.