diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index 34f75418c..6388efbb7 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -1,14 +1,12 @@
-reviewpad:summary
-
#### Checklist
All items have to be completed before a PR is merged
-- [x] Adhere to [Contribution Guidelines](https://docs.dxatscale.io/about-us/contributing-to-dx-scale)
+- [x] Adhere to [Contribution Guidelines](https://docs.flxbl.io/about-us/contributing-to-fxlbl)
- [ ] Updates to Decision Records considered?
-- [ ] Updates to documentation at [DX@Scale Guide](https://github.com/dxatscale/dxatscale-guide) considered?
+- [ ] Updates to documentation at [flxbl-sfp Guide](https://github.com/flxbl-io/sfp-docs) considered?
- [ ] Tested changes?
- [ ] Unit Tests new and existing passing locally?
diff --git a/.github/workflows/buildPackages.yml b/.github/workflows/buildPackages.yml
index 435ff6675..7b3769796 100644
--- a/.github/workflows/buildPackages.yml
+++ b/.github/workflows/buildPackages.yml
@@ -1,4 +1,4 @@
-# This pipeline is used as template to build the sfpowerscripts plugin
+# This pipeline is used as template to build the sfp plugin
name: 'Build Packages'
@@ -40,7 +40,7 @@ jobs:
- name: 'Set Git Config'
run: |
- git config --global user.email "ciuser@dxatscale.io"
+ git config --global user.email "ciuser@flxbl.io"
git config --global user.name "ciuser"
@@ -59,9 +59,12 @@ jobs:
if: ${{ inputs.publish == true }}
run: npx lerna run test -- --colors
- - name: Upload to Codecov
- uses: codecov/codecov-action@v1
+ - name: Upload coverage reports to Codecov
+ uses: codecov/codecov-action@v3
+ env:
+ CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
+
- name: 'Publish CLI/Core'
if: ${{ inputs.publish == true }}
run: 'npx lerna publish from-package --yes --dist-tag ${{ inputs.version }}'
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 75e0d6512..b08709791 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -1,4 +1,4 @@
-# This pipeline builds the sfpowerscripts & sfp cli plugin
+# This pipeline builds the sfp cli plugin
# Needs following secrets
# NPM_TOKEN : Token to npm.js for dx@scale scope
# DOCKER_USERNAME : Token to username for ghcr.io for publishing docker
@@ -25,7 +25,7 @@ on:
workflow_dispatch:
-run-name: Release ${{ github.run_id }} / ${{ github.ref_name }}
+
# Merge to Develop, create builds
jobs:
@@ -47,11 +47,11 @@ jobs:
with:
job-environment: 'build-docker'
suffix-tag: ${{ github.run_id }}
- repo: 'dxatscale'
- image: 'sfpowerscripts-rc'
+ repo: 'flxbl-io'
+ image: 'sfp-rc'
secrets:
- username: ${{ secrets.DOCKER_USERNAME }}
- token: ${{ secrets.DOCKER_SECRET }}
+ username: ${{ secrets.DOCKER_USERNAME }}
+ token: ${{ secrets.GITHUB_TOKEN }}
needs: [ build ]
build-docker-lite:
@@ -60,12 +60,12 @@ jobs:
with:
job-environment: 'build-docker'
suffix-tag: ${{ github.run_id }}
- repo: 'dxatscale'
+ repo: 'flxbl-io'
dockerFileName: 'sfp-lite'
image: 'sfp-lite-rc'
secrets:
- username: ${{ secrets.DOCKER_USERNAME }}
- token: ${{ secrets.DOCKER_SECRET }}
+ username: ${{ secrets.DOCKER_USERNAME }}
+ token: ${{ secrets.GITHUB_TOKEN }}
needs: [ build ]
#Promotion Stages
@@ -77,7 +77,7 @@ jobs:
uses: ./.github/workflows/promotePackage.yml
with:
version: 'alpha'
- pathToPackageJson: 'packages/sfpowerscripts-cli/package.json'
+ pathToPackageJson: 'packages/sfp-cli/package.json'
environment: sfpowerscripts-alpha
secrets:
npm-token: ${{ secrets.NPM_TOKEN }}
@@ -88,12 +88,12 @@ jobs:
uses: ./.github/workflows/sfpowerscripts-promote-docker.yml
with:
job-environment: 'sfpowerscripts-alpha-docker'
- repo: 'dxatscale'
+ repo: 'flxbl-io'
new-tag: alpha
- image: 'sfpowerscripts-rc'
+ image: 'sfp-rc'
secrets:
username: ${{ secrets.DOCKER_USERNAME }}
- token: ${{ secrets.DOCKER_SECRET }}
+ token: ${{ secrets.GITHUB_TOKEN }}
needs: [ build-docker ]
alpha-docker-lite:
@@ -101,12 +101,12 @@ jobs:
uses: ./.github/workflows/sfpowerscripts-promote-docker.yml
with:
job-environment: 'sfpowerscripts-alpha-docker'
- repo: 'dxatscale'
+ repo: 'flxbl-io'
new-tag: alpha
image: 'sfp-lite-rc'
secrets:
username: ${{ secrets.DOCKER_USERNAME }}
- token: ${{ secrets.DOCKER_SECRET }}
+ token: ${{ secrets.GITHUB_TOKEN }}
needs: [ build-docker-lite ]
@@ -115,7 +115,7 @@ jobs:
uses: ./.github/workflows/promotePackage.yml
with:
version: 'beta'
- pathToPackageJson: 'packages/sfpowerscripts-cli/package.json'
+ pathToPackageJson: 'packages/sfp-cli/package.json'
environment: sfpowerscripts-beta
secrets:
npm-token: ${{ secrets.NPM_TOKEN }}
@@ -126,12 +126,12 @@ jobs:
uses: ./.github/workflows/sfpowerscripts-promote-docker.yml
with:
job-environment: 'sfpowerscripts-beta-docker'
- repo: 'dxatscale'
+ repo: 'flxbl-io'
new-tag: beta
image: 'sfp-lite-rc'
secrets:
username: ${{ secrets.DOCKER_USERNAME }}
- token: ${{ secrets.DOCKER_SECRET }}
+ token: ${{ secrets.GITHUB_TOKEN }}
needs: [ build-docker ]
beta-docker-lite:
@@ -139,12 +139,12 @@ jobs:
uses: ./.github/workflows/sfpowerscripts-promote-docker.yml
with:
job-environment: 'sfpowerscripts-beta-docker'
- repo: 'dxatscale'
+ repo: 'flxbl-io'
new-tag: beta
- image: 'sfpowerscripts-rc'
+ image: 'sfp-rc'
secrets:
username: ${{ secrets.DOCKER_USERNAME }}
- token: ${{ secrets.DOCKER_SECRET }}
+ token: ${{ secrets.GITHUB_TOKEN }}
needs: [ build-docker-lite ]
@@ -155,7 +155,7 @@ jobs:
uses: ./.github/workflows/promotePackage.yml
with:
version: 'latest'
- pathToPackageJson: 'packages/sfpowerscripts-cli/package.json'
+ pathToPackageJson: 'packages/sfp-cli/package.json'
environment: sfpowerscripts-prod
secrets:
npm-token: ${{ secrets.NPM_TOKEN }}
@@ -168,7 +168,7 @@ jobs:
job-environment: 'sfpowerscripts-prod-docker'
secrets:
username: ${{ secrets.DOCKER_USERNAME }}
- token: ${{ secrets.DOCKER_SECRET }}
+ token: ${{ secrets.GITHUB_TOKEN }}
signing_secret: ${{ secrets.SIGNING_SECRET }}
cosign_password: ${{ secrets.COSIGN_PASSWORD }}
needs: [ build-docker ]
@@ -182,7 +182,7 @@ jobs:
image-as: sfp-lite
secrets:
username: ${{ secrets.DOCKER_USERNAME }}
- token: ${{ secrets.DOCKER_SECRET }}
+ token: ${{ secrets.GITHUB_TOKEN }}
signing_secret: ${{ secrets.SIGNING_SECRET }}
cosign_password: ${{ secrets.COSIGN_PASSWORD }}
needs: [ build-docker-lite ]
diff --git a/.github/workflows/review.yml b/.github/workflows/review.yml
index 38ce13ed1..29a549217 100644
--- a/.github/workflows/review.yml
+++ b/.github/workflows/review.yml
@@ -19,7 +19,7 @@ jobs:
- name: Use Node.js
uses: actions/setup-node@v3
with:
- node-version: '16.x'
+ node-version: '18'
registry-url: 'https://registry.npmjs.org'
- uses: pnpm/action-setup@v2
with:
@@ -29,6 +29,10 @@ jobs:
run: pnpm i
- run: npx lerna run build
- run: npx lerna run test -- --colors
- - run: bash <(curl -s https://codecov.io/bash) -v
+
+ - name: Upload coverage reports to Codecov
+ uses: codecov/codecov-action@v3
+ env:
+ CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
diff --git a/.github/workflows/sfpowerscripts-build-docker.yml b/.github/workflows/sfpowerscripts-build-docker.yml
index 7ba97fe1e..798ea4154 100644
--- a/.github/workflows/sfpowerscripts-build-docker.yml
+++ b/.github/workflows/sfpowerscripts-build-docker.yml
@@ -13,11 +13,11 @@ on:
dockerFileName:
type: string
required: false
- default: sfpowerscripts
+ default: sfp
image:
type: string
required: false
- default: sfpowerscripts
+ default: sfp
suffix-tag:
type: string
required: true
@@ -63,8 +63,8 @@ jobs:
- name: 'Get package version and name'
run: |
- echo "PKG_VERSION=$(jq -r ".version" packages/sfpowerscripts-cli/package.json)" >> $GITHUB_ENV
- RELEASE_NAME=$(jq -r ".release" packages/sfpowerscripts-cli/package.json)
+ echo "PKG_VERSION=$(jq -r ".version" packages/sfp-cli/package.json)" >> $GITHUB_ENV
+ RELEASE_NAME=$(jq -r ".release" packages/sfp-cli/package.json)
RELEASE_NAME_AS_ARRAY=($RELEASE_NAME)
RELEASE_NAME=$(echo ${RELEASE_NAME_AS_ARRAY[0]} | cut -c1-3)${RELEASE_NAME_AS_ARRAY[1]}
echo "RELEASE_NAME=release-$RELEASE_NAME" >> $GITHUB_ENV
diff --git a/.github/workflows/sfpowerscripts-copy-docker.yml b/.github/workflows/sfpowerscripts-copy-docker.yml
index a21be93c9..c9a35af51 100644
--- a/.github/workflows/sfpowerscripts-copy-docker.yml
+++ b/.github/workflows/sfpowerscripts-copy-docker.yml
@@ -10,11 +10,11 @@ on:
repo:
type: string
required: false
- default: 'dxatscale'
+ default: 'flxbl-io'
image:
type: string
required: false
- default: sfpowerscripts-rc
+ default: sfp-rc
image-as:
type: string
required: false
@@ -53,8 +53,8 @@ jobs:
- name: 'Get package version'
run: |
- echo "PKG_VERSION=$(jq -r ".version" packages/sfpowerscripts-cli/package.json)" >> $GITHUB_ENV
- RELEASE_NAME=$(jq -r ".release" packages/sfpowerscripts-cli/package.json)
+ echo "PKG_VERSION=$(jq -r ".version" packages/sfp-cli/package.json)" >> $GITHUB_ENV
+ RELEASE_NAME=$(jq -r ".release" packages/sfp-cli/package.json)
RELEASE_NAME_AS_ARRAY=($RELEASE_NAME)
RELEASE_NAME=$(echo ${RELEASE_NAME_AS_ARRAY[0]} | cut -c1-3)${RELEASE_NAME_AS_ARRAY[1]}
echo "RELEASE_NAME=release-$RELEASE_NAME" >> $GITHUB_ENV
diff --git a/.github/workflows/sfpowerscripts-promote-docker.yml b/.github/workflows/sfpowerscripts-promote-docker.yml
index 18e18f129..8baef73dc 100644
--- a/.github/workflows/sfpowerscripts-promote-docker.yml
+++ b/.github/workflows/sfpowerscripts-promote-docker.yml
@@ -13,7 +13,7 @@ on:
image:
type: string
required: false
- default: sfpowerscripts
+ default: sfp
new-tag:
type: string
required: true
@@ -37,8 +37,8 @@ jobs:
- name: 'Get package version'
run: |
- echo "PKG_VERSION=$(jq -r ".version" packages/sfpowerscripts-cli/package.json)" >> $GITHUB_ENV
- RELEASE_NAME=$(jq -r ".release" packages/sfpowerscripts-cli/package.json)
+ echo "PKG_VERSION=$(jq -r ".version" packages/sfp-cli/package.json)" >> $GITHUB_ENV
+ RELEASE_NAME=$(jq -r ".release" packages/sfp-cli/package.json)
RELEASE_NAME_AS_ARRAY=($RELEASE_NAME)
RELEASE_NAME=$(echo ${RELEASE_NAME_AS_ARRAY[0]} | cut -c1-3)${RELEASE_NAME_AS_ARRAY[1]}
echo "RELEASE_NAME=release-$RELEASE_NAME" >> $GITHUB_ENV
diff --git a/.github/workflows/tagDockerImage.yml b/.github/workflows/tagDockerImage.yml
index f2e357307..a65c58a76 100644
--- a/.github/workflows/tagDockerImage.yml
+++ b/.github/workflows/tagDockerImage.yml
@@ -7,11 +7,11 @@ on:
repo:
type: string
required: true
- default: dxatscale
+ default: flxbl-io
image:
type: string
required: true
- default: sfpowerscripts
+ default: sfp
existing-tag:
type: string
required: true
@@ -24,7 +24,7 @@ on:
jobs:
build:
- name: 'tag sfpowerscripts docker image'
+ name: 'tag sfp docker image'
environment: tagger
runs-on: ubuntu-latest
steps:
@@ -43,5 +43,5 @@ jobs:
new-tag: ${{ github.event.new-tag }}
registry: ghcr.io
username: ${{ secrets.DOCKER_USERNAME }}
- token: ${{ secrets.DOCKER_SECRET }}
+ token: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.gitignore b/.gitignore
index b0b70f3c5..68d368d1a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,12 +14,13 @@ oclif.manifest.json
packages/azpipelines_release_management_extensions/BuildTasks/ManageReleaseTask/*
packages/core/coverage
-packages/sfpowerscripts-cli/coverage
+packages/sfp-cli/coverage
.DS_Store
-packages/core/.sfpowerscripts/**
+
coverage/**
packages/apexlink/coverage
-packages/sfpowerscripts-cli/oclif.manifest.json
+packages/sfp-cli/oclif.manifest.json
packages/apexlink/tests/resources/core-crm/apexlink.json
packages/apexlink/tests/resources/feature-mgmt/apexlink.json
+.nx
\ No newline at end of file
diff --git a/.prettierignore b/.prettierignore
index fbb53a323..1488dbd3b 100644
--- a/.prettierignore
+++ b/.prettierignore
@@ -9,11 +9,11 @@ tmp/
oclif.manifest.json
packages/azpipelines_release_management_extensions/BuildTasks/ManageReleaseTask/*
packages/core/coverage
-packages/sfpowerscripts-cli/coverage
+packages/sfp-cli/coverage
.DS_Store
packages/core/resources
packages/sfp-cli/resources
-packages/sfpowerscripts-cli/resources
+packages/sfp-cli/resources
.github
decision records
demoreel
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 2bdd1c608..4a43b069e 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,7 +1,7 @@
-# Contributing to sfpowerscripts
+# Contributing to sfp
-First and foremost, **thank you**! We appreciate that you want to contribute to sfpowerscripts, your time is valuable, and your contributions mean a lot to us.
+First and foremost, **thank you**! We appreciate that you want to contribute to sfp, your time is valuable, and your contributions mean a lot to us.
## Important!
@@ -25,5 +25,5 @@ Creating an issue is the simplest form of contributing to the project. But there
## Issues
-Please only create issues for bug reports or feature requests at [sfpowerscripts repo](https://github.com/dxatscale/sfpowerscripts). Issues discussing any other topics may be closed by the project’s maintainers without further explanation.
+Please only create issues for bug reports or feature requests at [sfp repo](https://github.com/flxbl-io/sfp). Issues discussing any other topics may be closed by the project’s maintainers without further explanation.
diff --git a/LICENSE b/LICENSE
index 57e4dfbd0..cd17a41af 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,6 +1,6 @@
MIT License
-Copyright (c) 2022 dxatscale
+Copyright (c) 2024 flxbl.io
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
diff --git a/README.md b/README.md
index b9864306c..d927044b2 100644
--- a/README.md
+++ b/README.md
@@ -1,19 +1,19 @@
- 
+
-
-[](https://gitHub.com/dxatscale/sfpowerscripts/stargazers/)
-[](https://github.com/dxatscale/sfpowerscripts/graphs/contributors/)
-[](https://github.com/dxatscale/sfpowerscripts/blob/master/LICENSE)
+
+[](https://gitHub.com/flxbl-io/sfp/stargazers/)
+[](https://github.com/flxbl-io/sfp/graphs/contributors/)
+[](https://github.com/flxbl-io/sfp/blob/main/LICENSE)
[](http://makeapullrequest.com)
[](https://deepscan.io/dashboard#view=project&tid=10234&pid=12959&bid=208838)
-[](https://app.fossa.com/projects/git%2Bgithub.com%2Fdxatscale%2Fsfpowerscripts?ref=badge_shield) [](https://bestpractices.coreinfrastructure.org/projects/5614)
+[](https://app.fossa.com/projects/git%2Bgithub.com%2Fflxbl-io%2Fsfp?ref=badge_shield&issueType=license) [](https://bestpractices.coreinfrastructure.org/projects/5614)
-[](https://launchpass.com/dxatscale)
+[](https://launchpass.com/flxblio)
-A build system for package based development in Salesforce, delivered as a node cli that can be implemented in any CI/CD system of choice.Read more about the cli and details here - https://docs.dxatscale.io
+A build system for package based development in Salesforce, delivered as a node cli that can be implemented in any CI/CD system of choice.Read more about the cli and details here - https://docs.flxbl.io
#### Features
@@ -26,10 +26,10 @@ A build system for package based development in Salesforce, delivered as a node
- Integrate with any CI/CD system of choice
- All commands are enabled with statsD, for collecting metrics about your pipeline.
-There are lot more features to explore. Read more at https://docs.dxatscale.io
+There are lot more features to explore. Read more at https://docs.flxblio.io
-The project is delivered as a CLI that can be deployed in any CI/CD system, The module is available in [NPM](https://www.npmjs.com/package/@dxatscale/sfpowerscripts) or can be
-used by using the [docker image](https://github.com/dxatscale/sfpowerscripts/pkgs/container/sfpowerscripts)
+The project is delivered as a CLI that can be deployed in any CI/CD system, The module is available in [NPM](https://www.npmjs.com/package/@flxblio/sfp) or can be
+used by using the [docker image](https://github.com/flxblio/sfp/pkgs/container/sfp)
@@ -39,34 +39,34 @@ used by using the [docker image](https://github.com/dxatscale/sfpowerscripts/pkg
- Need for artifact driven build system for package based development models especially on complex and large programs
-- Providing additional functionality that is either not supported by the sfdx-cli, such as data packages or automatically understanding tests in a given package
+- Providing additional functionality that is either not supported by the sf cli, such as data packages or automatically understanding tests in a given package
- Ease of use, one should not be spending too much time scripting a pipeline.
#### CI/CD Reference Implementation
-Getting started guides for popular CI/CD platforms along with reference pipelines are available [here](https://docs.dxatscale.io/implementing-your-ci-cd/github)
+Getting started guides for popular CI/CD platforms along with reference pipelines are available [here](https://docs.flxblio.io/implementing-your-ci-cd/github)
-#### Installing sfpowerscripts locally
+#### Installing sfp locally
-sfpowerscripts can be installed on your local device using npm
+sfp can be installed on your local device using npm
```
-npm i -g @dxatscale/sfpowerscripts
+npm i -g @flxblio/sfp
```
#### Docker
-Docker images for sfpowerscripts are available at [GitHub Container Registry](https://github.com/dxatscale/sfpowerscripts/pkgs/container/sfpowerscripts).
+Docker images for sfp are available at [GitHub Container Registry](https://github.com/flxblio/sfp/pkgs/container/sfp).
-We recommend using the sfpowerscripts docker image to avoid breakages in your CI/CD pipelines due to updates in sfpowerscripts or any of its dependencies such as the SFDX CLI.
+We recommend using the sfp docker image to avoid breakages in your CI/CD pipelines due to updates in sfp or any of its dependencies such as the SFDX CLI.
#### Build Instructions
-To build sfpowerscripts execute the following on the terminal:
+To build sfp execute the following on the terminal:
```
npm i -g lerna #Install Lerna Globally
-cd # Navigate to the checked out directory
+cd # Navigate to the checked out directory
pnpm i
lerna run build
```
@@ -80,19 +80,19 @@ lerna run test
To debug and test plugin
```
- cd packages/sfpowerscripts-cli
+ cd packages/sfp-cli
npm link
```
#### Maintainers
-List of Maintainers are available in the [link](https://docs.dxatscale.io/about-us)
+List of Maintainers are available in the [link](https://docs.flxblio.io/about-us)
#### Where do I reach for queries?
-Please create an issue in the repo for bugs or utilize GitHub Discussions for other queries. Join our [Slack Community](https://launchpass.com/dxatscale) as well.
+Please create an issue in the repo for bugs or utilize GitHub Discussions for other queries. Join our [Slack Community](https://launchpass.com/flxblio) as well.
## License
-[](https://app.fossa.com/projects/git%2Bgithub.com%2Fdxatscale%2Fsfpowerscripts?ref=badge_large)
+[](https://app.fossa.com/projects/git%2Bgithub.com%2Fflxblio%2Fsfp?ref=badge_large)
diff --git a/Third Party Notices.md b/Third Party Notices.md
index 65632f624..0a5727229 100644
--- a/Third Party Notices.md
+++ b/Third Party Notices.md
@@ -927,7 +927,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
---
-### [@dxatscale/forcemula (0.1.2)](https://www.npmjs.com/package/@dxatscale/forcemula)
+### [@flxblio/forcemula (0.1.2)](https://www.npmjs.com/package/@flxblio/forcemula)
#### Declared Licenses
@@ -935,7 +935,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
```
-Copyright (c) 2023, @dxatscale/forcemula Contributors
+Copyright (c) 2023, @flxblio/forcemula Contributors
Permission to use, copy, modify, and distribute this software for any purpose with or without fee is hereby granted, provided that the above copyright notice and this permission notice appear in all copies.
THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
```
@@ -1048,7 +1048,7 @@ SOFTWARE.
---
-### [@dxatscale/sfp-logger (1.2.0)](https://www.npmjs.com/package/@dxatscale/sfp-logger)
+### [@flxblio/sfp-logger (1.2.0)](https://www.npmjs.com/package/@flxblio/sfp-logger)
#### Declared Licenses
@@ -1101,7 +1101,7 @@ SOFTWARE.
---
-### [@dxatscale/sfpowerscripts (^20.25.4)](https://www.npmjs.com/package/@dxatscale/sfpowerscripts)
+### [@flxblio/sfp (^20.25.4)](https://www.npmjs.com/package/@flxblio/sfp)
#### Declared Licenses
@@ -1188,7 +1188,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
---
-### [@dxatscale/sfpowerscripts.core (33.21.2)](https://www.npmjs.com/package/@dxatscale/sfpowerscripts.core)
+### [@flxblio/sfp.core (33.21.2)](https://www.npmjs.com/package/@flxblio/sfp.core)
#### Declared Licenses
diff --git a/decision records/001-sfpowerscripts-artifact-customsettings.md b/decision records/001-sfpowerscripts-artifact-customsettings.md
index b88d46297..1056eb1cb 100644
--- a/decision records/001-sfpowerscripts-artifact-customsettings.md
+++ b/decision records/001-sfpowerscripts-artifact-customsettings.md
@@ -4,7 +4,7 @@
* Deciders: Azlam, Alan
* Date:
-Issue [Issue #476](https://github.com/dxatscale/sfpowerscripts/issues/476)
+Issue [Issue #476](https://github.com/flxbl-io/sfp/issues/476)
## Context and Problem Statement
diff --git a/decision records/003-dependency-manager.md b/decision records/003-dependency-manager.md
index c61796faa..47e9b702f 100644
--- a/decision records/003-dependency-manager.md
+++ b/decision records/003-dependency-manager.md
@@ -5,7 +5,7 @@
## Context and Problem Statement
As the number of packages increases in large scale projects, with multiple dependencies, updating package versions and dependencies manually is time consuming and takes great care to update dependencies one by one.
-Other solutions encountered were local bash scripts as documented in both the issue https://github.com/dxatscale/sfpowerscripts/issues/638 raised and in the discussions has here: https://github.com/dxatscale/sfpowerscripts/discussions/468
+Other solutions encountered were local bash scripts as documented in both the issue https://github.com/flxbl-io/sfp/issues/638 raised and in the discussions has here: https://github.com/dxatscale/sfpowerscripts/discussions/468
## Solution
The dependency manager should utilise the SemVer incrementation style https://semver.org/ and be of a similar method to the ‘lerna version’ command. It should prompt the user for the version either for individual packages or for all packages in the sfdx-project.json: (major, minor, patch, custom).
diff --git a/decision records/deployments/001-aliasified-data-sourcepackages.md b/decision records/deployments/001-aliasified-data-sourcepackages.md
index 418de9ef4..70f91b9d7 100644
--- a/decision records/deployments/001-aliasified-data-sourcepackages.md
+++ b/decision records/deployments/001-aliasified-data-sourcepackages.md
@@ -4,8 +4,8 @@
* Deciders: Azlam, Alan
* Date:
-Issue [Issue #632](https://github.com/dxatscale/sfpowerscripts/issues/632)
-Issue [Issue #715](https://github.com/dxatscale/sfpowerscripts/issues/715)
+Issue [Issue #632](https://github.com/flxbl-io/sfp/issues/632)
+Issue [Issue #715](https://github.com/flxbl-io/sfp/issues/715)
## Context and Problem Statement
diff --git a/decision records/deployments/003-flow-management.md b/decision records/deployments/003-flow-management.md
new file mode 100644
index 000000000..64d01cdd7
--- /dev/null
+++ b/decision records/deployments/003-flow-management.md
@@ -0,0 +1,33 @@
+# Flow Activation/Deactivation during deployment
+
+- Status: Accepted
+- Deciders: @azlam-abdulsalam, @vuha-acn, @zhebinliu @Rocko1204
+
+## Context and Problem Statement
+
+While installing a source/diff package, flows by default are deployed as 'Inactive' in the production org. One can deploy flow as 'Active' using the steps mentioned [here](https://help.salesforce.com/s/articleView?id=sf.flow_distribute_deploy_active.htm&language=en_US&type=5), however, this requires the flow to meet test coverage requirement.
+
+Also making a flow inactive, is convoluted, find the detailed article provided by [Gearset](https://gearset.com/blog/deactivate-flows-within-your-data-deployments/)
+
+Currently, sfp is unable to validate test coverage requirements for a flow and unable to determine the impacted test class for a flow, Hence in projects utilizing sfp, flows has to be manually activated with source/diff packages causing environment discrepancy
+
+## Decision
+
+Adopt a process within sfp deployments to manage Salesforce Flows, focusing on the dynamic activation and deactivation of Flows as part of the deployment of a package. This process aims to ensure that Flows included in the deployment package are correctly set to their intended active or inactive states, reflecting the desired automation behavior in the target org.
+
+The process will be auto enabled for source/diff packages and can be turned off by 'enableFlowActivation' as an additional package descriptor
+
+The following workflow will be utilized by sfp to manage flows
+
+### Process Summary
+- Deploy flow along with the intended status as provided by the developer in the package using the deployment mechanism of the package type
+- Prior to activation, identify all Flows included in the deployment package and determine their intended states (active or inactive) based on their configuration in the source control.
+- Post-Deployment Adjustment: After successful deployment, adjust the activation state of each Flow based on its intended state identified by reading the metadata, This involves:
+ - Activating Flows intended to be active but are currently inactive in the target org, using tooling api
+ - Deactivating Flows intended to be inactive but are currently active in the target org.
+
+
+## Consequences
+
+- Improved Automation and Efficiency: Automating the process of activating and deactivating flows as part of the deployment package enhances the efficiency of deployments and reduces manual intervention, ensuring consistency across environments.
+- Increased Complexity: Implementing this feature adds complexity to the sfp deployment process, requiring robust error handling and logging to manage the activation and deactivation of flows effectively.
diff --git a/decision records/release/001-release.md b/decision records/release/001-release.md
index 6c9efdde6..39415dea0 100644
--- a/decision records/release/001-release.md
+++ b/decision records/release/001-release.md
@@ -4,7 +4,7 @@
* Deciders: Azlam, Alan
* Date: 23/03/21
-Issue: [Issue #452](https://github.com/dxatscale/sfpowerscripts/issues/452)
+Issue: [Issue #452](https://github.com/flxbl-io/sfp/issues/452)
## Context and Problem Statement
diff --git a/decision records/release/002-release-installing-packages.md b/decision records/release/002-release-installing-packages.md
index c8616aa7d..111ef0b56 100644
--- a/decision records/release/002-release-installing-packages.md
+++ b/decision records/release/002-release-installing-packages.md
@@ -4,7 +4,7 @@
* Deciders: Azlam, Alan
* Date: 23/03/21
-Issue: [Issue #452](https://github.com/dxatscale/sfpowerscripts/issues/452)
+Issue: [Issue #452](https://github.com/flxbl-io/sfp/issues/452)
## Context and Problem Statement
diff --git a/decision records/release/003-release-autorollback.md b/decision records/release/003-release-autorollback.md
index 454b0606c..0cb6cd2f1 100644
--- a/decision records/release/003-release-autorollback.md
+++ b/decision records/release/003-release-autorollback.md
@@ -3,7 +3,7 @@
* Status: Proposed
-Issue: [Issue #478](https://github.com/dxatscale/sfpowerscripts/issues/478)
+Issue: [Issue #478](https://github.com/flxbl-io/sfp/issues/478)
## Context and Problem Statement
diff --git a/dockerfiles/sfp-lite.Dockerfile b/dockerfiles/sfp-lite.Dockerfile
index 1d80ac161..e2e36806f 100644
--- a/dockerfiles/sfp-lite.Dockerfile
+++ b/dockerfiles/sfp-lite.Dockerfile
@@ -5,14 +5,14 @@ ARG SFPOWERSCRIPTS_VERSION=alpha
ARG GIT_COMMIT
ARG NODE_MAJOR=18
-LABEL org.opencontainers.image.description "sfpowerscripts is a build system for modular development in Salesforce."
+LABEL org.opencontainers.image.description "sfp is a build system for modular development in Salesforce."
LABEL org.opencontainers.image.licenses "MIT"
-LABEL org.opencontainers.image.url "https://github.com/dxatscale/sfpowerscripts"
-LABEL org.opencontainers.image.documentation "https://docs.dxatscale.io/sfpowerscripts/sfpowerscripts"
+LABEL org.opencontainers.image.url "https://github.com/flxbl-io/sfp"
+LABEL org.opencontainers.image.documentation "https://docs.flxbl.io/sfp"
LABEL org.opencontainers.image.revision $GIT_COMMIT
-LABEL org.opencontainers.image.vendor "DX@Scale"
-LABEL org.opencontainers.image.source "https://github.com/dxatscale/sfpowerscripts"
-LABEL org.opencontainers.image.title "DX@Scale sfp lite docker image - January 24"
+LABEL org.opencontainers.image.vendor "Flxbl"
+LABEL org.opencontainers.image.source "https://github.com/flxbl-io/sfp"
+LABEL org.opencontainers.image.title "Flxbl sfp lite docker image - February 24"
ENV DEBIAN_FRONTEND=noninteractive
@@ -54,9 +54,9 @@ RUN mkdir -p /etc/apt/keyrings \
&& rm -rf /var/lib/apt/list/*
-# Install sfpowerscripts
+# Install sfp
RUN npm install --global --omit=dev \
- @dxatscale/sfpowerscripts@${SFPOWERSCRIPTS_VERSION}
+ @flxblio/sfp@${SFPOWERSCRIPTS_VERSION}
WORKDIR /root
diff --git a/dockerfiles/sfpowerscripts.Dockerfile b/dockerfiles/sfp.Dockerfile
similarity index 83%
rename from dockerfiles/sfpowerscripts.Dockerfile
rename to dockerfiles/sfp.Dockerfile
index 4ba5541e4..a6ef1cb83 100644
--- a/dockerfiles/sfpowerscripts.Dockerfile
+++ b/dockerfiles/sfp.Dockerfile
@@ -2,20 +2,20 @@ FROM ubuntu:22.04
ARG SFPOWERSCRIPTS_VERSION=alpha
-ARG SF_CLI_VERSION=2.17.14
-ARG BROWSERFORCE_VERSION=0.0.3
-ARG SFDMU_VERSION=4.18.2
+ARG SF_CLI_VERSION=2.25.7
+ARG BROWSERFORCE_VERSION=4.0.0
+ARG SFDMU_VERSION=4.32.2
ARG GIT_COMMIT
ARG NODE_MAJOR=18
-LABEL org.opencontainers.image.description "sfpowerscripts is a build system for modular development in Salesforce."
+LABEL org.opencontainers.image.description "sfp is a build system for modular development in Salesforce."
LABEL org.opencontainers.image.licenses "MIT"
-LABEL org.opencontainers.image.url "https://github.com/dxatscale/sfpowerscripts"
-LABEL org.opencontainers.image.documentation "https://docs.dxatscale.io/sfpowerscripts/sfpowerscripts"
+LABEL org.opencontainers.image.url "https://github.com/flxbl-io/sfp"
+LABEL org.opencontainers.image.documentation "https://docs.flxbl.io/sfp"
LABEL org.opencontainers.image.revision $GIT_COMMIT
-LABEL org.opencontainers.image.vendor "DX@Scale"
-LABEL org.opencontainers.image.source "https://github.com/dxatscale/sfpowerscripts"
-LABEL org.opencontainers.image.title "DX@Scale sfpowercripts docker image - January 24"
+LABEL org.opencontainers.image.vendor "Flxbl"
+LABEL org.opencontainers.image.source "https://github.com/flxbl-io/sfp"
+LABEL org.opencontainers.image.title "Flxbl sfp docker image - February 24"
ENV DEBIAN_FRONTEND=noninteractive
@@ -72,7 +72,7 @@ RUN npm install --global yarn --omit-dev \
# Install SF cli and sfpowerscripts
RUN npm install --global --omit=dev \
@salesforce/cli@${SF_CLI_VERSION} \
- @dxatscale/sfpowerscripts@${SFPOWERSCRIPTS_VERSION} \
+ @flxblio/sfp@${SFPOWERSCRIPTS_VERSION} \
&& npm cache clean --force
@@ -103,7 +103,7 @@ RUN mkdir -p $XDG_DATA_HOME && \
# Install sfdx plugins
-RUN echo 'y' | sf plugins:install @dxatscale/browserforce@${BROWSERFORCE_VERSION} \
+RUN echo 'y' | sf plugins:install sfdx-browserforce-plugin@${BROWSERFORCE_VERSION} \
&& echo 'y' | sf plugins:install sfdmu@${SFDMU_VERSION} \
&& echo 'y' | sf plugins:install @salesforce/plugin-signups@1.5.0 \
&& echo 'y' | sf plugins:install @salesforce/sfdx-scanner@3.16.0 \
diff --git a/package.json b/package.json
index ca3752633..f50272d7f 100644
--- a/package.json
+++ b/package.json
@@ -1,5 +1,5 @@
{
- "name": "sfpowerscripts",
+ "name": "sfp",
"private": true,
"license": "MIT",
"scripts": {
@@ -15,13 +15,12 @@
"@types/node": "^10",
"@types/q": "^1.5.2",
"@types/xml2js": "^0.4.5",
- "lerna": "^7.1.4",
- "lerna-update-wizard": "^1.1.0",
+ "lerna": "8.0.2",
"prettier": "^2.0.5",
"rimraf": "^3.0.2",
"semver": "7.5.2",
- "ts-loader": "~9.4.2",
- "ts-node": "^9",
+ "ts-loader": "~9.5.1",
+ "ts-node": "10.9.2",
"typescript": "^5"
},
"dependencies": {
diff --git a/packages/apexlink/README.md b/packages/apexlink/README.md
index 54c1da6ff..cc61c79ae 100644
--- a/packages/apexlink/README.md
+++ b/packages/apexlink/README.md
@@ -1,4 +1,4 @@
-# @dxatscale/apexlink`
+# @flxblio/apexlink`
ApexLink is the a thin node invoker for @nawforce/apex-link, which is delivered as a JAR file. This invoker executes a sub process where the apex link jar is executed
diff --git a/packages/apexlink/package.json b/packages/apexlink/package.json
index 59e992828..748f126d0 100644
--- a/packages/apexlink/package.json
+++ b/packages/apexlink/package.json
@@ -1,9 +1,9 @@
{
- "name": "@dxatscale/apexlink",
- "version": "1.0.2",
+ "name": "@flxblio/apexlink",
+ "version": "2.0.0",
"description": "Wrappers around @nawforce's apexlink java pom ",
- "author": "dxatscale",
- "homepage": "https://github.com/dxatscale/sfpowerscripts",
+ "author": "flxblio",
+ "homepage": "https://github.com/flxbl-io/sfp",
"license": "MIT",
"main": "lib/index",
"types": "lib/index",
@@ -12,15 +12,13 @@
"/jars"
],
"dependencies": {
- "@dxatscale/sfdx-process-wrapper": "^1.0.2",
- "@dxatscale/sfp-logger": "^2.1.2",
+ "@flxblio/sfdx-process-wrapper": "^1.0.3",
+ "@flxblio/sfp-logger": "^2.1.3",
"find-java-home": "2.0.0",
"fs-extra": "11.1.1"
},
"devDependencies": {
"@babel/core": "7.18.2",
- "@babel/plugin-proposal-nullish-coalescing-operator": "^7.17.12",
- "@babel/plugin-proposal-optional-chaining": "7.17.12",
"@jest/globals": "^29.6.1",
"@types/jest": "^29.5.3",
"@types/mocha": "9.1.0",
@@ -31,7 +29,7 @@
},
"repository": {
"type": "git",
- "url": "git+https://github.com/dxatscale/sfpowerscripts.git"
+ "url": "git+https://github.com/flxbl-io/sfp.git"
},
"publishConfig": {
"access": "public"
@@ -45,6 +43,6 @@
"spec-test": "FORCE_COLOR=true jest -i packages/apexlink/tests/ApexDependencyCheckImpl.test.ts --verbose true --coverage --detectOpenHandles"
},
"bugs": {
- "url": "https://github.com/dxatscale/sfpowerscripts/issues"
+ "url": "https://github.com/flxbl-io/sfp/issues"
}
}
diff --git a/packages/apexlink/src/ApexDepedencyCheckImpl.ts b/packages/apexlink/src/ApexDepedencyCheckImpl.ts
index 589212413..c5b26df00 100644
--- a/packages/apexlink/src/ApexDepedencyCheckImpl.ts
+++ b/packages/apexlink/src/ApexDepedencyCheckImpl.ts
@@ -1,8 +1,8 @@
import findJavaHome from 'find-java-home';
-import ExecuteCommand from '@dxatscale/sfdx-process-wrapper/lib/commandExecutor/ExecuteCommand';
-import { Logger, LoggerLevel } from '@dxatscale/sfp-logger';
-import SFPLogger from '@dxatscale/sfp-logger';
-import { ConsoleLogger } from '@dxatscale/sfp-logger';
+import ExecuteCommand from '@flxblio/sfdx-process-wrapper/lib/commandExecutor/ExecuteCommand';
+import { Logger, LoggerLevel } from '@flxblio/sfp-logger';
+import SFPLogger from '@flxblio/sfp-logger';
+import { ConsoleLogger } from '@flxblio/sfp-logger';
import * as fs from 'fs-extra';
import path from 'path';
diff --git a/packages/apexlink/tests/ApexDependencyCheckImpl.test.ts b/packages/apexlink/tests/ApexDependencyCheckImpl.test.ts
index dbc1fee09..44f3429ec 100644
--- a/packages/apexlink/tests/ApexDependencyCheckImpl.test.ts
+++ b/packages/apexlink/tests/ApexDependencyCheckImpl.test.ts
@@ -1,5 +1,5 @@
import { jest, expect } from '@jest/globals';
-import { ConsoleLogger } from '@dxatscale/sfp-logger';
+import { ConsoleLogger } from '@flxblio/sfp-logger';
import ApexDepedencyCheckImpl from '../src/ApexDepedencyCheckImpl';
import path from 'path';
diff --git a/packages/core/.editorconfig b/packages/core/.editorconfig
deleted file mode 100644
index a9b0d2824..000000000
--- a/packages/core/.editorconfig
+++ /dev/null
@@ -1,12 +0,0 @@
-
-root = false
-
-[*]
-indent_style = space
-indent_size = 4
-charset = utf-8
-trim_trailing_whitespace = true
-insert_final_newline = true
-
-[*.md]
-trim_trailing_whitespace = false
diff --git a/packages/core/CHANGELOG.md b/packages/core/CHANGELOG.md
deleted file mode 100644
index a4a2da8af..000000000
--- a/packages/core/CHANGELOG.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# Change Log
-
-All notable changes to this project will be documented in this file.
-See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
-
-# [33.23.0](https://github.com/dxatscale/sfpowerscripts/compare/@dxatscale/sfpowerscripts.core@33.22.1...@dxatscale/sfpowerscripts.core@33.23.0) (2023-03-22)
-
-
-### Features
-
-* **publish:** Add new flag to delete Git tags by age and limit ([#1275](https://github.com/dxatscale/sfpowerscripts/issues/1275)) ([aae62d6](https://github.com/dxatscale/sfpowerscripts/commit/aae62d6d3e7eb390dddcf2ca46b99b44ca4cc933))
diff --git a/packages/core/babel.config.js b/packages/core/babel.config.js
deleted file mode 100644
index 6e7404754..000000000
--- a/packages/core/babel.config.js
+++ /dev/null
@@ -1,7 +0,0 @@
-module.exports = {
-
- plugins: [
- '@babel/plugin-proposal-optional-chaining',
- '@babel/plugin-proposal-nullish-coalescing-operator'
- ],
-};
\ No newline at end of file
diff --git a/packages/core/jest.config.js b/packages/core/jest.config.js
deleted file mode 100644
index 4d647c055..000000000
--- a/packages/core/jest.config.js
+++ /dev/null
@@ -1,20 +0,0 @@
-module.exports = {
- preset: 'ts-jest/presets/js-with-babel',
- testEnvironment: 'node',
- restoreMocks: true,
- clearMocks: true,
- resetMocks: true,
- transform: {
- '^.+\\.[t]sx?$': [
- 'ts-jest',
- {
- tsconfig: 'tsconfig.json',
- babelConfig: true,
- },
- ]
- },
- transformIgnorePatterns: ['/node_modules/(?!@salesforce/source-deploy-retrieve)(.*)'],
- moduleNameMapper: {
- '^axios$': require.resolve('axios'),
- }
-};
diff --git a/packages/core/package.json b/packages/core/package.json
deleted file mode 100644
index 03083aa44..000000000
--- a/packages/core/package.json
+++ /dev/null
@@ -1,93 +0,0 @@
-{
- "name": "@dxatscale/sfpowerscripts.core",
- "version": "36.5.3",
- "description": "Core Module used by sfpowerscripts",
- "main": "lib/index",
- "types": "lib/index",
- "files": [
- "lib",
- "resources"
- ],
- "scripts": {
- "build": "pnpm run clean && pnpm run compile",
- "clean": "rimraf ./lib && rimraf tsconfig.tsbuildinfo",
- "compile": "tsc -b tsconfig.json",
- "clearCache": "jest --clearCache",
- "test": "FORCE_COLOR=true jest --silent --verbose true --coverage --detectOpenHandles"
- },
- "engines": {
- "node": ">=14.0.0"
- },
- "dependencies": {
- "@dxatscale/apexlink": "^1.0.2",
- "@dxatscale/sfdx-process-wrapper": "^1.0.2",
- "@dxatscale/sfp-logger": "^2.1.2",
- "@dxatscale/sfprofiles": "^2.0.8",
- "@newrelic/telemetry-sdk": "^0.6.0",
- "@salesforce/apex-node": "2.1.0",
- "@salesforce/core": "5.3.9",
- "@salesforce/kit": "3.0.13",
- "@salesforce/packaging": "2.3.3",
- "@salesforce/source-deploy-retrieve": "9.7.24",
- "@salesforce/source-tracking": "4.2.16",
- "adm-zip": "^0.5.6",
- "apex-parser": "2.13.0",
- "async-retry": "^1.3.3",
- "axios": "^1.4.0",
- "bottleneck": "^2.19.5",
- "chalk": "^4.1.2",
- "cli-table": "0.3.11",
- "datadog-metrics": "^0.9.3",
- "fast-xml-parser": "4.2.7",
- "fs-extra": "11.1.1",
- "glob": "^10.3.3",
- "hot-shots": "^8.5.0",
- "ignore": "^5.1.6",
- "js-yaml": "4.1.0",
- "jsforce": "^2.0.0-beta.27",
- "lodash": "^4.17.21",
- "neverthrow": "4.4.2",
- "rimraf": "^3.0.2",
- "semver": "7.5.2",
- "simple-git": "3.16.0",
- "tar": "^6.1.9",
- "tmp": "^0.2.1",
- "xml2js": "^0.6.0"
- },
- "devDependencies": {
- "@babel/core": "7.18.2",
- "@babel/plugin-proposal-nullish-coalescing-operator": "^7.17.12",
- "@babel/plugin-proposal-optional-chaining": "7.17.12",
- "@jest/globals": "^29.6.1",
- "@salesforce/ts-sinon": "^1.3.21",
- "@salesforce/ts-types": "2.0.7",
- "@types/adm-zip": "^0.5.0",
- "@types/async-retry": "^1.4.2",
- "@types/datadog-metrics": "^0.6.1",
- "@types/jest": "^29.5.3",
- "@types/mocha": "9.1.0",
- "@types/node": "20.4.4",
- "@types/splunk-logging": "^0.11.1",
- "@types/tmp": "^0.2.3",
- "jest": "^29.5.3",
- "ts-jest": "^29.1.1",
- "ts-node": "10.7.0",
- "typescript": "^5"
- },
- "repository": {
- "type": "git",
- "url": "https://github.com/dxatscale/sfpowerscripts.git",
- "directory": "packages/core"
- },
- "keywords": [
- "sfdx",
- "cli",
- "ci/cd"
- ],
- "author": "dxatscale",
- "license": "MIT",
- "bugs": {
- "url": "https://github.com/dxatscale/sfpowerscripts/issues"
- },
- "homepage": "https://github.com/dxatscale/sfpowerscripts#readme"
-}
diff --git a/packages/core/tsconfig.json b/packages/core/tsconfig.json
deleted file mode 100644
index c0fdf19e2..000000000
--- a/packages/core/tsconfig.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
- "extends": "../../tsconfig.json",
- "compilerOptions": {
- "experimentalDecorators": true,
- "outDir": "./lib",
- "rootDir": "./src",
- "skipLibCheck": true,
- "declarationMap": true,
- "baseUrl": "/src",
- "paths": {}
- },
- "exclude": ["node_modules", "dist", "tests", "lib"]
-}
diff --git a/packages/forcemula/package.json b/packages/forcemula/package.json
index 0060fe19f..fbe0942d5 100644
--- a/packages/forcemula/package.json
+++ b/packages/forcemula/package.json
@@ -1,6 +1,6 @@
{
- "name": "@dxatscale/forcemula",
- "version": "1.0.0",
+ "name": "@flxblio/forcemula",
+ "version": "1.0.1",
"description": "Extract fields from Salesforce formulas",
"main": "src/index.js",
"scripts": {
@@ -9,7 +9,10 @@
"watch": "jest --silent=false --verbose --detectOpenHandles --coverage --watchAll",
"test:coverage": "jest --silent=false --verbose --detectOpenHandles --coverage"
},
- "author": "dxatscale",
+ "publishConfig": {
+ "access": "public"
+ },
+ "author": "flxblio",
"license": "MIT",
"devDependencies": {
"jest": "^29.6.1"
diff --git a/packages/sfdx-process-wrapper/package.json b/packages/sfdx-process-wrapper/package.json
index 1ffbb719c..00d74f6b5 100644
--- a/packages/sfdx-process-wrapper/package.json
+++ b/packages/sfdx-process-wrapper/package.json
@@ -1,9 +1,9 @@
{
- "name": "@dxatscale/sfdx-process-wrapper",
- "version": "1.0.2",
+ "name": "@flxblio/sfdx-process-wrapper",
+ "version": "1.0.3",
"description": "Wraps around SFDXCommand to exeute it using a subprocess",
- "author": "dxatscale",
- "homepage": "https://github.com/dxatscale/sfpowerscripts#readme",
+ "author": "flxbl",
+ "homepage": "https://github.com/flxbl-io/sfp#readme",
"license": "MIT",
"main": "lib/index",
"types": "lib/index",
@@ -11,7 +11,7 @@
"lib": "lib"
},
"dependencies": {
- "@dxatscale/sfp-logger": "^2.1.2",
+ "@flxblio/sfp-logger": "^2.1.3",
"fs-extra": "^9.1.0"
},
"devDependencies": {
@@ -24,7 +24,7 @@
],
"repository": {
"type": "git",
- "url": "git+https://github.com/dxatscale/sfpowerscripts.git"
+ "url": "git+https://github.com/flxbl-io/sfp.git"
},
"publishConfig": {
"access": "public"
@@ -35,6 +35,6 @@
"compile": "tsc -b tsconfig.json"
},
"bugs": {
- "url": "https://github.com/dxatscale/sfpowerscripts/issues"
+ "url": "https://github.com/flxbl-io/sfp/issues"
}
}
diff --git a/packages/sfdx-process-wrapper/src/SFDXCommand.ts b/packages/sfdx-process-wrapper/src/SFDXCommand.ts
index 7a15821c4..bb2092baa 100644
--- a/packages/sfdx-process-wrapper/src/SFDXCommand.ts
+++ b/packages/sfdx-process-wrapper/src/SFDXCommand.ts
@@ -1,5 +1,5 @@
import ExecuteCommand from './commandExecutor/ExecuteCommand';
-import SFPLogger, { Logger, LoggerLevel } from '@dxatscale/sfp-logger';
+import SFPLogger, { Logger, LoggerLevel } from '@flxblio/sfp-logger';
export abstract class SFDXCommand {
public constructor(
diff --git a/packages/sfdx-process-wrapper/src/commandExecutor/ExecuteCommand.ts b/packages/sfdx-process-wrapper/src/commandExecutor/ExecuteCommand.ts
index d7be83457..d84cd0718 100644
--- a/packages/sfdx-process-wrapper/src/commandExecutor/ExecuteCommand.ts
+++ b/packages/sfdx-process-wrapper/src/commandExecutor/ExecuteCommand.ts
@@ -1,5 +1,5 @@
import child_process = require('child_process');
-import SFPLogger, { COLOR_TRACE, Logger, LoggerLevel } from '@dxatscale/sfp-logger';
+import SFPLogger, { COLOR_TRACE, Logger, LoggerLevel } from '@flxblio/sfp-logger';
import defaultProcessOptions from './DefaultProcessOptions';
diff --git a/packages/sfpowerscripts-cli/.babel.config.js b/packages/sfp-cli/.babel.config.js
similarity index 100%
rename from packages/sfpowerscripts-cli/.babel.config.js
rename to packages/sfp-cli/.babel.config.js
diff --git a/packages/sfpowerscripts-cli/README.md b/packages/sfp-cli/README.md
similarity index 56%
rename from packages/sfpowerscripts-cli/README.md
rename to packages/sfp-cli/README.md
index fabe4ea56..9c7f12720 100644
--- a/packages/sfpowerscripts-cli/README.md
+++ b/packages/sfp-cli/README.md
@@ -1,19 +1,19 @@
-
+
-
-[](https://gitHub.com/dxatscale/sfpowerscripts/stargazers/)
-[](https://github.com/forcedotcom/dxatscale/sfpowerscripts/graphs/contributors/)
-[](https://github.com/dxatscale/sfpowerscripts/blob/master/LICENSE)
+
+[](https://github.com/flxbl-io/sfp/stargazers/)
+[](https://github.com/flxbl-io/sfp/graphs/contributors/)
+[](https://github.com/flxbl-io/sfp/blob/master/LICENSE)
[](http://makeapullrequest.com)
[](https://deepscan.io/dashboard#view=project&tid=10234&pid=12959&bid=208838)
-[](https://app.fossa.com/projects/git%2Bgithub.com%2Fdxatscale%2Fsfpowerscripts?ref=badge_shield) [](https://bestpractices.coreinfrastructure.org/projects/5614)
+[](https://app.fossa.com/projects/git%2Bgithub.com%2Fflxblio%2Fsfp?ref=badge_shield) [](https://bestpractices.coreinfrastructure.org/projects/5614)
-[](https://launchpass.com/dxatscale)
+[](https://launchpass.com/flxblio)
-A build system for package based development in Salesforce, delivered as a node cli that can be implemented in any CI/CD system of choice.Read more about the cli and details here - https://docs.dxatscale.io
+A build system for package based development in Salesforce, delivered as a node cli that can be implemented in any CI/CD system of choice.Read more about the cli and details here - https://docs.flxblio.io
#### Features
@@ -26,10 +26,10 @@ A build system for package based development in Salesforce, delivered as a node
- Integrate with any CI/CD system of choice
- All commands are enabled with statsD, for collecting metrics about your pipeline.
-There are lot more features to explore. Read more at https://docs.dxatscale.io
+There are lot more features to explore. Read more at https://docs.flxblio.io
-The project is delivered as a CLI that can be deployed in any CI/CD system, The module is available in [NPM](https://www.npmjs.com/package/@dxatscale/sfpowerscripts) or can be
-used by using the [docker image](https://github.com/dxatscale/sfpowerscripts/pkgs/container/sfpowerscripts)
+The project is delivered as a CLI that can be deployed in any CI/CD system, The module is available in [NPM](https://www.npmjs.com/package/@flxblio/sfp) or can be
+used by using the [docker image](https://github.com/flxbl-io/sfp/pkgs/container/sfp)
@@ -45,29 +45,29 @@ used by using the [docker image](https://github.com/dxatscale/sfpowerscripts/pkg
#### CI/CD Reference Implementation
-Getting started guides for popular CI/CD platforms along with reference pipelines are available [here](https://docs.dxatscale.io/reference-implementation/github)
+Getting started guides for popular CI/CD platforms along with reference pipelines are available [here](https://docs.flxblio.io/implementing-your-ci-cd/github)
-#### Installing sfpowerscripts locally
+#### Installing sfp locally
-sfpowerscripts can be installed on your local device using npm
+sfp can be installed on your local device using npm
```
-npm i -g @dxatscale/sfpowerscripts
+npm i -g @flxblio/sfp
```
#### Docker
-Docker images for sfpowerscripts are available at [GitHub Container Registry](https://github.com/dxatscale/sfpowerscripts/pkgs/container/sfpowerscripts).
+Docker images for sfp are available at [GitHub Container Registry](https://github.com/flxbl-io/sfp/pkgs/container/sfp).
-We recommend using the sfpowerscripts docker image to avoid breakages in your CI/CD pipelines due to updates in sfpowerscripts or any of its dependencies such as the SFDX CLI.
+We recommend using the sfp docker image to avoid breakages in your CI/CD pipelines due to updates in sfp or any of its dependencies such as the SFDX CLI.
#### Build Instructions
-To build sfpowerscripts execute the following on the terminal:
+To build sfp execute the following on the terminal:
```
npm i -g lerna #Install Lerna Globally
-cd # Navigate to the checked out directory
-npm i
+cd # Navigate to the checked out directory
+pnpm i
lerna run build
```
@@ -80,19 +80,19 @@ lerna run test
To debug and test plugin
```
- cd packages/sfpowerscripts-cli
+ cd packages/sfp-cli
npm link
```
#### Maintainers
-List of Maintainers are available in the [link](https://docs.dxatscale.io/about-us)
+List of Maintainers are available in the [link](https://docs.flxblio.io/about-us)
#### Where do I reach for queries?
-Please create an issue in the repo for bugs or utilize GitHub Discussions for other queries. Join our [Slack Community](https://launchpass.com/dxatscale) as well.
+Please create an issue in the repo for bugs or utilize GitHub Discussions for other queries. Join our [Slack Community](https://launchpass.com/flxblio) as well.
## License
-[](https://app.fossa.com/projects/git%2Bgithub.com%2Fdxatscale%2Fsfpowerscripts?ref=badge_large)
+[](https://app.fossa.com/projects/git%2Bgithub.com%2Fflxblio%2Fsfp?ref=badge_large)
diff --git a/packages/sfpowerscripts-cli/bin/run b/packages/sfp-cli/bin/run
similarity index 100%
rename from packages/sfpowerscripts-cli/bin/run
rename to packages/sfp-cli/bin/run
diff --git a/packages/sfpowerscripts-cli/bin/run.cmd b/packages/sfp-cli/bin/run.cmd
similarity index 100%
rename from packages/sfpowerscripts-cli/bin/run.cmd
rename to packages/sfp-cli/bin/run.cmd
diff --git a/packages/sfpowerscripts-cli/jest.config.js b/packages/sfp-cli/jest.config.js
similarity index 100%
rename from packages/sfpowerscripts-cli/jest.config.js
rename to packages/sfp-cli/jest.config.js
diff --git a/packages/sfpowerscripts-cli/messages/analyze.json b/packages/sfp-cli/messages/analyze.json
similarity index 100%
rename from packages/sfpowerscripts-cli/messages/analyze.json
rename to packages/sfp-cli/messages/analyze.json
diff --git a/packages/sfpowerscripts-cli/messages/analyze_with_PMD.json b/packages/sfp-cli/messages/analyze_with_PMD.json
similarity index 100%
rename from packages/sfpowerscripts-cli/messages/analyze_with_PMD.json
rename to packages/sfp-cli/messages/analyze_with_PMD.json
diff --git a/packages/sfpowerscripts-cli/messages/artifacts_query.json b/packages/sfp-cli/messages/artifacts_query.json
similarity index 100%
rename from packages/sfpowerscripts-cli/messages/artifacts_query.json
rename to packages/sfp-cli/messages/artifacts_query.json
diff --git a/packages/sfpowerscripts-cli/messages/build.json b/packages/sfp-cli/messages/build.json
similarity index 100%
rename from packages/sfpowerscripts-cli/messages/build.json
rename to packages/sfp-cli/messages/build.json
diff --git a/packages/sfpowerscripts-cli/messages/core-messages.md b/packages/sfp-cli/messages/core-messages.md
similarity index 100%
rename from packages/sfpowerscripts-cli/messages/core-messages.md
rename to packages/sfp-cli/messages/core-messages.md
diff --git a/packages/sfpowerscripts-cli/messages/create-package.json b/packages/sfp-cli/messages/create-package.json
similarity index 100%
rename from packages/sfpowerscripts-cli/messages/create-package.json
rename to packages/sfp-cli/messages/create-package.json
diff --git a/packages/sfpowerscripts-cli/messages/create_data_package.json b/packages/sfp-cli/messages/create_data_package.json
similarity index 100%
rename from packages/sfpowerscripts-cli/messages/create_data_package.json
rename to packages/sfp-cli/messages/create_data_package.json
diff --git a/packages/sfpowerscripts-cli/messages/create_delta_package.json b/packages/sfp-cli/messages/create_delta_package.json
similarity index 100%
rename from packages/sfpowerscripts-cli/messages/create_delta_package.json
rename to packages/sfp-cli/messages/create_delta_package.json
diff --git a/packages/sfpowerscripts-cli/messages/create_source_package.json b/packages/sfp-cli/messages/create_source_package.json
similarity index 100%
rename from packages/sfpowerscripts-cli/messages/create_source_package.json
rename to packages/sfp-cli/messages/create_source_package.json
diff --git a/packages/sfpowerscripts-cli/messages/create_unlocked_package.json b/packages/sfp-cli/messages/create_unlocked_package.json
similarity index 100%
rename from packages/sfpowerscripts-cli/messages/create_unlocked_package.json
rename to packages/sfp-cli/messages/create_unlocked_package.json
diff --git a/packages/sfpowerscripts-cli/messages/dependency_expand.json b/packages/sfp-cli/messages/dependency_expand.json
similarity index 100%
rename from packages/sfpowerscripts-cli/messages/dependency_expand.json
rename to packages/sfp-cli/messages/dependency_expand.json
diff --git a/packages/sfpowerscripts-cli/messages/dependency_install.json b/packages/sfp-cli/messages/dependency_install.json
similarity index 100%
rename from packages/sfpowerscripts-cli/messages/dependency_install.json
rename to packages/sfp-cli/messages/dependency_install.json
diff --git a/packages/sfpowerscripts-cli/messages/dependency_shrink.json b/packages/sfp-cli/messages/dependency_shrink.json
similarity index 100%
rename from packages/sfpowerscripts-cli/messages/dependency_shrink.json
rename to packages/sfp-cli/messages/dependency_shrink.json
diff --git a/packages/sfpowerscripts-cli/messages/deploy.json b/packages/sfp-cli/messages/deploy.json
similarity index 100%
rename from packages/sfpowerscripts-cli/messages/deploy.json
rename to packages/sfp-cli/messages/deploy.json
diff --git a/packages/sfpowerscripts-cli/messages/fetch.json b/packages/sfp-cli/messages/fetch.json
similarity index 100%
rename from packages/sfpowerscripts-cli/messages/fetch.json
rename to packages/sfp-cli/messages/fetch.json
diff --git a/packages/sfp-cli/messages/flow.json b/packages/sfp-cli/messages/flow.json
new file mode 100644
index 000000000..d0bf1b519
--- /dev/null
+++ b/packages/sfp-cli/messages/flow.json
@@ -0,0 +1,8 @@
+{
+ "activateDescription": "Activate the flow on a target org",
+ "cleanupDescription": "Cleanup inactive flows on a target org",
+ "deactivateDescription": "Deactivate the flow on a target org",
+ "developernameFlagDescription": "The developer name of the flow",
+ "namespacePrefixFlagDescription": "Use to specify a specific namespace prefix",
+ "deactivatedDescription": "Deactivate a Flow based on API Name"
+}
\ No newline at end of file
diff --git a/packages/sfpowerscripts-cli/messages/generate_changelog.json b/packages/sfp-cli/messages/generate_changelog.json
similarity index 98%
rename from packages/sfpowerscripts-cli/messages/generate_changelog.json
rename to packages/sfp-cli/messages/generate_changelog.json
index fb6f78cf1..8844686d9 100644
--- a/packages/sfpowerscripts-cli/messages/generate_changelog.json
+++ b/packages/sfp-cli/messages/generate_changelog.json
@@ -1,7 +1,7 @@
{
"commandDescription": "Generates release changelog, providing a summary of artifact versions, work items and commits introduced in a release. Creates a release definition based on artifacts contained in the artifact directory, and compares it to previous release definition in changelog stored on a source repository",
"limitFlagDescription": "limit the number of releases to display in changelog markdown",
- "artifactDirectoryFlagDescription": "Directory containing sfpowerscripts artifacts",
+ "artifactDirectoryFlagDescription": "Directory containing sfp artifacts",
"releaseNameFlagDescription": "Name of the release for which to generate changelog",
"workItemFilterFlagDescription": "Regular expression used to search for work items (user stories) introduced in release",
"workItemUrlFlagDescription": "Generic URL for work items. Each work item ID will be appended to the URL, providing quick access to work items",
diff --git a/packages/sfpowerscripts-cli/messages/impact_package.json b/packages/sfp-cli/messages/impact_package.json
similarity index 100%
rename from packages/sfpowerscripts-cli/messages/impact_package.json
rename to packages/sfp-cli/messages/impact_package.json
diff --git a/packages/sfpowerscripts-cli/messages/impact_release_config.json b/packages/sfp-cli/messages/impact_release_config.json
similarity index 55%
rename from packages/sfpowerscripts-cli/messages/impact_release_config.json
rename to packages/sfp-cli/messages/impact_release_config.json
index d96edc890..0c9536c14 100644
--- a/packages/sfpowerscripts-cli/messages/impact_release_config.json
+++ b/packages/sfp-cli/messages/impact_release_config.json
@@ -1,7 +1,9 @@
{
"commandDescription": "Figures out impacted release configurations of a project, due to a change,from the last known tags",
"releaseConfigFileFlagDescription":"Path to the directory containing release defns",
+ "branchFlagDescription":"The branch on which the comparison is carried out",
"baseCommitOrBranchFlagDescription": "The base branch on which the git tags should be used from",
"filterByFlagDescription": "Filter by a specific release config name",
- "explictDependencyCheckFlagDescription": "Activate to consider dependencyOn attribut while handling impact"
+ "filterByChangesInBranchFlagDescription": "Filter packages by changes with the provided branches as opposed to tags",
+ "explicitDependencyCheckFlagDescription": "Activate to consider dependencyOn attribut while handling impact"
}
diff --git a/packages/sfpowerscripts-cli/messages/increment_build_number.json b/packages/sfp-cli/messages/increment_build_number.json
similarity index 100%
rename from packages/sfpowerscripts-cli/messages/increment_build_number.json
rename to packages/sfp-cli/messages/increment_build_number.json
diff --git a/packages/sfpowerscripts-cli/messages/install_data_package.json b/packages/sfp-cli/messages/install_data_package.json
similarity index 100%
rename from packages/sfpowerscripts-cli/messages/install_data_package.json
rename to packages/sfp-cli/messages/install_data_package.json
diff --git a/packages/sfpowerscripts-cli/messages/install_package.json b/packages/sfp-cli/messages/install_package.json
similarity index 93%
rename from packages/sfpowerscripts-cli/messages/install_package.json
rename to packages/sfp-cli/messages/install_package.json
index 89db89720..2dfc9c318 100644
--- a/packages/sfpowerscripts-cli/messages/install_package.json
+++ b/packages/sfp-cli/messages/install_package.json
@@ -1,5 +1,5 @@
{
- "commandDescription": "Installs a sfpowerscripts artifact to an org",
+ "commandDescription": "Installs a sfp artifact to an org",
"packageFlagDescription": "Name of the package to be installed",
"targetOrgFlagDescription": "Alias/User Name of the target environment",
"apexCompileOnlyPackageFlagDescription": "(unlocked) package installation triggers a compilation of apex, flag to trigger compilation of package only",
diff --git a/packages/sfpowerscripts-cli/messages/install_package_command.json b/packages/sfp-cli/messages/install_package_command.json
similarity index 100%
rename from packages/sfpowerscripts-cli/messages/install_package_command.json
rename to packages/sfp-cli/messages/install_package_command.json
diff --git a/packages/sfpowerscripts-cli/messages/install_source_package.json b/packages/sfp-cli/messages/install_source_package.json
similarity index 89%
rename from packages/sfpowerscripts-cli/messages/install_source_package.json
rename to packages/sfp-cli/messages/install_source_package.json
index 11e743801..0d5be458a 100644
--- a/packages/sfpowerscripts-cli/messages/install_source_package.json
+++ b/packages/sfp-cli/messages/install_source_package.json
@@ -1,5 +1,5 @@
{
- "commandDescription": "(DEPRECATED) Installs a sfpowerscripts source package to the target org",
+ "commandDescription": "(DEPRECATED) Installs a sfp source package to the target org",
"packageFlagDescription": "Name of the package to be installed",
"targetOrgFlagDescription": "Alias/User Name of the target environment",
"artifactDirectoryFlagDescription": "The directory where the artifact is located",
diff --git a/packages/sfpowerscripts-cli/messages/install_unlocked_package.json b/packages/sfp-cli/messages/install_unlocked_package.json
similarity index 97%
rename from packages/sfpowerscripts-cli/messages/install_unlocked_package.json
rename to packages/sfp-cli/messages/install_unlocked_package.json
index 454034c9d..ac93c9e9d 100644
--- a/packages/sfpowerscripts-cli/messages/install_unlocked_package.json
+++ b/packages/sfp-cli/messages/install_unlocked_package.json
@@ -1,5 +1,5 @@
{
- "commandDescription": "(DEPRECATED) Installs an unlocked package using sfpowerscripts metadata",
+ "commandDescription": "(DEPRECATED) Installs an unlocked package using sfp metadata",
"packageFlagDescription": "Name of the package to be installed",
"targetOrgFlagDescription": "Alias/User Name of the target environment",
"packageInstalledFromFlagDescription": "automatically retrieve the version ID of the package to be installed, from the build artifact",
diff --git a/packages/sfp-cli/messages/metrics_report.json b/packages/sfp-cli/messages/metrics_report.json
new file mode 100644
index 000000000..9a2718a83
--- /dev/null
+++ b/packages/sfp-cli/messages/metrics_report.json
@@ -0,0 +1,3 @@
+{
+ "commandDescription": "Report a custom metric to any sfp supported metric provider"
+}
diff --git a/packages/sfpowerscripts-cli/messages/org_profile_diff.json b/packages/sfp-cli/messages/org_profile_diff.json
similarity index 100%
rename from packages/sfpowerscripts-cli/messages/org_profile_diff.json
rename to packages/sfp-cli/messages/org_profile_diff.json
diff --git a/packages/sfpowerscripts-cli/messages/patch.json b/packages/sfp-cli/messages/patch.json
similarity index 100%
rename from packages/sfpowerscripts-cli/messages/patch.json
rename to packages/sfp-cli/messages/patch.json
diff --git a/packages/sfpowerscripts-cli/messages/pool_delete.json b/packages/sfp-cli/messages/pool_delete.json
similarity index 83%
rename from packages/sfpowerscripts-cli/messages/pool_delete.json
rename to packages/sfp-cli/messages/pool_delete.json
index 1e558d567..a1ddb8c53 100644
--- a/packages/sfpowerscripts-cli/messages/pool_delete.json
+++ b/packages/sfp-cli/messages/pool_delete.json
@@ -4,5 +4,5 @@
"mypoolDescription": "Filter only Scratch orgs created by current user in the pool",
"allscratchorgsDescription": "Deletes all used and unused Scratch orgs from pool by the tag",
"inprogressonlyDescription": "Deletes all In Progress Scratch orgs from pool by the tag",
- "recoverOrphanedScratchOrgsDescription": "Recovers scratch orgs that were created by salesforce but were not tagged to sfpowerscripts due to timeouts etc."
+ "recoverOrphanedScratchOrgsDescription": "Recovers scratch orgs that were created by salesforce but were not tagged to sfp due to timeouts etc."
}
diff --git a/packages/sfpowerscripts-cli/messages/prepare.json b/packages/sfp-cli/messages/prepare.json
similarity index 100%
rename from packages/sfpowerscripts-cli/messages/prepare.json
rename to packages/sfp-cli/messages/prepare.json
diff --git a/packages/sfpowerscripts-cli/messages/profile_merge.json b/packages/sfp-cli/messages/profile_merge.json
similarity index 100%
rename from packages/sfpowerscripts-cli/messages/profile_merge.json
rename to packages/sfp-cli/messages/profile_merge.json
diff --git a/packages/sfpowerscripts-cli/messages/profile_reconcile.json b/packages/sfp-cli/messages/profile_reconcile.json
similarity index 100%
rename from packages/sfpowerscripts-cli/messages/profile_reconcile.json
rename to packages/sfp-cli/messages/profile_reconcile.json
diff --git a/packages/sfpowerscripts-cli/messages/profile_retrieve.json b/packages/sfp-cli/messages/profile_retrieve.json
similarity index 100%
rename from packages/sfpowerscripts-cli/messages/profile_retrieve.json
rename to packages/sfp-cli/messages/profile_retrieve.json
diff --git a/packages/sfpowerscripts-cli/messages/promote.json b/packages/sfp-cli/messages/promote.json
similarity index 100%
rename from packages/sfpowerscripts-cli/messages/promote.json
rename to packages/sfp-cli/messages/promote.json
diff --git a/packages/sfpowerscripts-cli/messages/publish.json b/packages/sfp-cli/messages/publish.json
similarity index 100%
rename from packages/sfpowerscripts-cli/messages/publish.json
rename to packages/sfp-cli/messages/publish.json
diff --git a/packages/sfpowerscripts-cli/messages/quickbuild.json b/packages/sfp-cli/messages/quickbuild.json
similarity index 100%
rename from packages/sfpowerscripts-cli/messages/quickbuild.json
rename to packages/sfp-cli/messages/quickbuild.json
diff --git a/packages/sfpowerscripts-cli/messages/release.json b/packages/sfp-cli/messages/release.json
similarity index 93%
rename from packages/sfpowerscripts-cli/messages/release.json
rename to packages/sfp-cli/messages/release.json
index dfe21fdc9..890fd0a22 100644
--- a/packages/sfpowerscripts-cli/messages/release.json
+++ b/packages/sfp-cli/messages/release.json
@@ -15,5 +15,6 @@
"allowUnpromotedPackagesFlagDescription": "Allow un-promoted packages to be installed in production",
"devhubAliasFlagDescription": "Provide the alias of the devhub previously authenticated, default value is HubOrg",
"directoryFlagDescription": "Relative path to directory to which the changelog should be generated, if the directory doesnt exist, it will be created",
- "branchNameFlagDescription": "Repository branch in which the changelog files are located"
+ "branchNameFlagDescription": "Repository branch in which the changelog files are located",
+ "changelogByDomainsFlagDescription":"Create changelog files by domains or name mentioned in release config"
}
diff --git a/packages/sfpowerscripts-cli/messages/releasedefinition_generate.json b/packages/sfp-cli/messages/releasedefinition_generate.json
similarity index 73%
rename from packages/sfpowerscripts-cli/messages/releasedefinition_generate.json
rename to packages/sfp-cli/messages/releasedefinition_generate.json
index c8f314871..f3072d865 100644
--- a/packages/sfpowerscripts-cli/messages/releasedefinition_generate.json
+++ b/packages/sfp-cli/messages/releasedefinition_generate.json
@@ -1,10 +1,11 @@
{
"commandDescription": "Generates release definition based on the artifacts installed from a commit reference",
- "configFileFlagDescription":"Path to the config file which determines how the release definition should be generated",
+ "configFileFlagDescription":"Path to the release config file which determines how the release definition should be generated",
"releaseNameFlagDescription": "Set a release name on the release definition file created",
"commitFlagDescription": "Utilize the tags on the source branch to generate release definiton",
"directoryFlagDescription": "Relative path to directory to which the release definition file should be generated, if the directory doesnt exist, it will be created",
"branchNameFlagDescription": "Repository branch in which the release definition files are to be written",
"noPushFlagDescription":"Do not push the changelog to a repository to the provided branch",
- "forcePushFlagDescription": "Force push changes to the repository branch"
+ "forcePushFlagDescription": "Force push changes to the repository branch",
+ "metadataFlagDescription": "Additional metadata in json format that needs to be added to the release definition file"
}
diff --git a/packages/sfpowerscripts-cli/messages/scratchorg_poolFetch.json b/packages/sfp-cli/messages/scratchorg_poolFetch.json
similarity index 100%
rename from packages/sfpowerscripts-cli/messages/scratchorg_poolFetch.json
rename to packages/sfp-cli/messages/scratchorg_poolFetch.json
diff --git a/packages/sfpowerscripts-cli/messages/scratchorg_pool_metrics_publish.json b/packages/sfp-cli/messages/scratchorg_pool_metrics_publish.json
similarity index 100%
rename from packages/sfpowerscripts-cli/messages/scratchorg_pool_metrics_publish.json
rename to packages/sfp-cli/messages/scratchorg_pool_metrics_publish.json
diff --git a/packages/sfpowerscripts-cli/messages/scratchorg_pool_org_delete.json b/packages/sfp-cli/messages/scratchorg_pool_org_delete.json
similarity index 100%
rename from packages/sfpowerscripts-cli/messages/scratchorg_pool_org_delete.json
rename to packages/sfp-cli/messages/scratchorg_pool_org_delete.json
diff --git a/packages/sfpowerscripts-cli/messages/scratchorg_poollist.json b/packages/sfp-cli/messages/scratchorg_poollist.json
similarity index 100%
rename from packages/sfpowerscripts-cli/messages/scratchorg_poollist.json
rename to packages/sfp-cli/messages/scratchorg_poollist.json
diff --git a/packages/sfpowerscripts-cli/messages/trigger_apex_test.json b/packages/sfp-cli/messages/trigger_apex_test.json
similarity index 100%
rename from packages/sfpowerscripts-cli/messages/trigger_apex_test.json
rename to packages/sfp-cli/messages/trigger_apex_test.json
diff --git a/packages/sfpowerscripts-cli/messages/validate.json b/packages/sfp-cli/messages/validate.json
similarity index 100%
rename from packages/sfpowerscripts-cli/messages/validate.json
rename to packages/sfp-cli/messages/validate.json
diff --git a/packages/sfpowerscripts-cli/messages/validateAgainstOrg.json b/packages/sfp-cli/messages/validateAgainstOrg.json
similarity index 100%
rename from packages/sfpowerscripts-cli/messages/validateAgainstOrg.json
rename to packages/sfp-cli/messages/validateAgainstOrg.json
diff --git a/packages/sfpowerscripts-cli/messages/validate_apex_coverage.json b/packages/sfp-cli/messages/validate_apex_coverage.json
similarity index 100%
rename from packages/sfpowerscripts-cli/messages/validate_apex_coverage.json
rename to packages/sfp-cli/messages/validate_apex_coverage.json
diff --git a/packages/sfpowerscripts-cli/package.json b/packages/sfp-cli/package.json
similarity index 77%
rename from packages/sfpowerscripts-cli/package.json
rename to packages/sfp-cli/package.json
index 426418c15..1c3984870 100644
--- a/packages/sfpowerscripts-cli/package.json
+++ b/packages/sfp-cli/package.json
@@ -1,35 +1,49 @@
{
- "name": "@dxatscale/sfpowerscripts",
- "description": "DX@Scale Toolkit",
- "version": "25.6.0",
+ "name": "@flxblio/sfp",
+ "description": "Flxbl Toolkit",
+ "version": "34.0.2",
"license": "MIT",
- "author": "dxatscale",
- "release": "January 24",
+ "author": "flxblio",
+ "release": "February 24",
"bin": {
"sfp": "./bin/run",
"sfpowerscripts": "./bin/run"
},
- "bugs": "https://github.com/dxatscale/sfpowerscripts/issues",
+ "bugs": "https://github.com/flxbl-io/sfp/issues",
+ "publishConfig": {
+ "access": "public"
+ },
"dependencies": {
- "@dxatscale/sfdx-process-wrapper": "^1.0.2",
- "@dxatscale/sfp-logger": "^2.1.2",
- "@dxatscale/sfpowerscripts.core": "^36.5.3",
- "@dxatscale/sfprofiles": "^2.0.8",
+ "@flxblio/apexlink": "^2.0.0",
+ "@flxblio/sfdx-process-wrapper": "^1.0.3",
+ "@flxblio/sfp-logger": "^2.1.3",
+ "@flxblio/sfprofiles": "^3.0.0",
+ "@newrelic/telemetry-sdk": "^0.6.0",
"@oclif/core": "2.11.8",
"@oclif/plugin-commands": "^3.0.3",
"@oclif/plugin-help": "5.2.17",
- "@salesforce/core": "5.3.9",
- "@salesforce/kit": "3.0.13",
+ "@salesforce/apex-node": "3.0.2",
+ "@salesforce/core": "6.5.1",
+ "@salesforce/kit": "3.0.15",
+ "@salesforce/packaging": "3.2.5",
+ "@salesforce/source-deploy-retrieve": "10.2.13",
+ "@salesforce/source-tracking": "5.1.7",
"adm-zip": "^0.5.10",
"ajv": "8.11.0",
+ "apex-parser": "2.13.0",
"async-retry": "^1.3.1",
+ "axios": "^1.4.0",
"bottleneck": "^2.19.5",
"chalk": "^4.1.2",
"cli-table": "0.3.11",
+ "datadog-metrics": "^0.9.3",
"dotenv": "16.3.1",
+ "fast-xml-parser": "4.2.7",
"fs-extra": "^11.1.1",
"glob": "^10.3.3",
"handlebars": "^4.7.7",
+ "hot-shots": "^8.5.0",
+ "ignore": "^5.1.6",
"js-yaml": "^4.0.0",
"jsforce": "2.0.0-beta.27",
"lodash": "^4.17.21",
@@ -41,7 +55,10 @@
"object-hash": "^2.1.1",
"rimraf": "^5.0.1",
"semver": "7.5.2",
- "simple-git": "3.19.1"
+ "simple-git": "3.19.1",
+ "tar": "^6.1.9",
+ "tmp": "^0.2.1",
+ "xml2js": "^0.6.0"
},
"devDependencies": {
"@babel/core": "7.18.2",
@@ -54,6 +71,7 @@
"@salesforce/ts-sinon": "^1.3.21",
"@salesforce/ts-types": "2.0.5",
"@types/adm-zip": "^0.4.33",
+ "@types/fs-extra": "11.0.4",
"@types/jest": "^29.5.3",
"@types/js-yaml": "^4.0.5",
"@types/marked": "4.0.2",
@@ -64,7 +82,7 @@
"typescript": "^5"
},
"engines": {
- "node": ">=16.0.0"
+ "node": ">=18.0.0"
},
"files": [
"/lib",
@@ -74,10 +92,10 @@
"/resources",
"/oclif.manifest.json"
],
- "homepage": "https://github.com/dxatscale/sfpowerscripts",
+ "homepage": "https://github.com/flxbl-io/sfp",
"keywords": [
- "dxatscale",
- "sf-cli",
+ "flxblio",
+ "sfp-cli",
"sfdx",
"salesforce",
"sf",
@@ -93,7 +111,7 @@
"description": "Orchestrate packages from a monorepo through its lifecycle, driven by descriptors in your sfdx-project.json"
},
"pool": {
- "description": "Manage the pooled orgs created by the sfpowerscripts orchestrator in prepare stage"
+ "description": "Manage the pooled orgs created by the sfp orchestrator in prepare stage"
},
"changelog": {
"description": "Track your artifacts & user stories as they progress through different environments, with release changelogs"
@@ -108,12 +126,12 @@
"description": "Commands to create and install unlocked packages"
},
"source": {
- "description": "Commands to create and install sfpowerscripts source packages"
+ "description": "Commands to create and install sfp source packages"
}
}
},
"impact": {
- "description": "Figures out the impact of various components of sfpowerscripts",
+ "description": "Figures out the impact of various components of sfp",
"external": true
},
"analyze": {
@@ -126,6 +144,9 @@
"repo": {
"description": "Commands to help with maintaing repository"
},
+ "flow": {
+ "description": "Commands to help with management of flows"
+ },
"dependency": {
"description": "Commands to help with dependency management of a project",
"subtopics": {
@@ -148,8 +169,8 @@
},
"repository": {
"type": "git",
- "url": "https://github.com/dxatscale/sfpowerscripts.git",
- "directory": "packages/sfpowerscripts-cli"
+ "url": "https://github.com/flxbl-io/sfp.git",
+ "directory": "packages/sfp-cli"
},
"scripts": {
"build": "pnpm run clean && pnpm run compile",
diff --git a/packages/core/resources/metadatainfo.json b/packages/sfp-cli/resources/metadatainfo.json
similarity index 100%
rename from packages/core/resources/metadatainfo.json
rename to packages/sfp-cli/resources/metadatainfo.json
diff --git a/packages/core/resources/pooldefinition.schema.json b/packages/sfp-cli/resources/schemas/pooldefinition.schema.json
similarity index 89%
rename from packages/core/resources/pooldefinition.schema.json
rename to packages/sfp-cli/resources/schemas/pooldefinition.schema.json
index 1ecb997d9..ce6cadc0a 100644
--- a/packages/core/resources/pooldefinition.schema.json
+++ b/packages/sfp-cli/resources/schemas/pooldefinition.schema.json
@@ -1,8 +1,8 @@
{
"$schema": "http://json-schema.org/draft-07/schema#",
- "$id": "https://raw.githubusercontent.com/dxatscale/sfpowerscripts/develop/packages/sfpowerscripts-cli/resources/schemas/pooldefinition.schema.json",
+ "$id": "https://raw.githubusercontent.com/flxblio/sfp/develop/packages/sfp-cli/resources/schemas/pooldefinition.schema.json",
"title": "pool definition",
- "description": "The definition for creating a pool of scratch orgs in sfpowerscripts",
+ "description": "The definition for creating a pool of scratch orgs in sfp",
"type": "object",
"required": ["tag", "maxAllocation"],
"additionalProperties": false,
@@ -10,7 +10,7 @@
"$schema": {
"description": "Support editors like vscode to help with IntelliSense",
"type": "string",
- "default": "https://raw.githubusercontent.com/dxatscale/sfpowerscripts/develop/packages/sfpowerscripts-cli/resources/schemas/pooldefinition.schema.json"
+ "default": "https://raw.githubusercontent.com/flxblio/sfp/develop/packages/sfp-cli/resources/schemas/pooldefinition.schema.json"
},
"tag": {
"title": "Tag of the pool",
@@ -94,7 +94,7 @@
},
"maxRetryCount": {
"title": "Max Retry Count",
- "description": "Maximum number of attempts sfpowerscripts should retry installation of packages on failed deployment",
+ "description": "Maximum number of attempts sfp should retry installation of packages on failed deployment",
"type": "number",
"default": "2"
},
@@ -119,6 +119,12 @@
"type": "boolean",
"default":false
},
+ "noAnchestors": {
+ "title": "Disable second-generation managed package (2GP) ancestors in the scratch org.",
+ "description": "Don't include second-generation managed package (2GP) ancestors in the scratch org when set to true",
+ "type": "boolean",
+ "default":false
+ },
"fetchArtifacts": {
"title": "Fetch Artifacts using below mechanism",
"description": "Fetch artifacts from artifact registry using below mechanism",
diff --git a/packages/sfpowerscripts-cli/resources/schemas/releasedefinitiongenerator.schema.json b/packages/sfp-cli/resources/schemas/release-config.schema.json
similarity index 82%
rename from packages/sfpowerscripts-cli/resources/schemas/releasedefinitiongenerator.schema.json
rename to packages/sfp-cli/resources/schemas/release-config.schema.json
index 9a7f2cc7c..64d485174 100644
--- a/packages/sfpowerscripts-cli/resources/schemas/releasedefinitiongenerator.schema.json
+++ b/packages/sfp-cli/resources/schemas/release-config.schema.json
@@ -1,14 +1,22 @@
{
"$schema": "http://json-schema.org/draft-07/schema#",
- "$id": "https://github.com/dxatscale/sfpowerscripts/blob/develop/packages/sfpowerscripts-cli/resources/releasedefinitiongenerator.schema.json",
- "title": "release definition generator",
- "description": "The definition for generating a release defintion using generator command",
+ "$id": "https://github.com/flxbl-io/json-schemas/blob/main/release-config.schema.json",
+ "title": "Configuration of a release, used as an input to the release definition generator or by sfops for understanding how the repo is structure",
+ "description": "Configuration of a release",
"type": "object",
"additionalProperties": true,
"dependencies": {
"baselineOrg": ["skipIfAlreadyInstalled"]
},
"properties": {
+ "releaseName": {
+ "type": "string",
+ "title": "Name of the domain this release configuration belongs to"
+ },
+ "pool": {
+ "type": "string",
+ "title": "The pool of review sandbox or scratch org to be used for validating the packages that are part of this release configuration"
+ },
"excludeArtifacts": {
"type": "array",
"title": "Exclude the below artifacts while creating a release definition",
@@ -57,7 +65,7 @@
},
"releasedefinitionProperties":{
"type": "object",
- "title": "Properties that need to be set in the generated definition file",
+ "title": "Properties that need to be set in the generated release definition",
"additionalProperties": true,
"properties": {
"skipIfAlreadyInstalled": {
diff --git a/packages/sfpowerscripts-cli/resources/schemas/releasedefinition.schema.json b/packages/sfp-cli/resources/schemas/release-defn.schema.json
similarity index 75%
rename from packages/sfpowerscripts-cli/resources/schemas/releasedefinition.schema.json
rename to packages/sfp-cli/resources/schemas/release-defn.schema.json
index 04c4f5d93..33a25f335 100644
--- a/packages/sfpowerscripts-cli/resources/schemas/releasedefinition.schema.json
+++ b/packages/sfp-cli/resources/schemas/release-defn.schema.json
@@ -1,8 +1,8 @@
{
"$schema": "http://json-schema.org/draft-07/schema#",
- "$id": "https://github.com/dxatscale/sfpowerscripts/blob/develop/packages/sfpowerscripts-cli/resources/releasedefinition.schema.json",
- "title": "release definition",
- "description": "The definition for a release using sfpowerscripts orchestrator",
+ "$id": "https://github.com/flxbl-io/json-schemas/blob/main/release-defn.schema.json",
+ "title": "A definition of a release, the artifacts to be deployed along with its version,",
+ "description": "This yaml file is either manually defined or auto generated by sfp release definition generator",
"type": "object",
"required": ["release", "artifacts"],
"additionalProperties": false,
@@ -13,6 +13,14 @@
"release": {
"type": "string"
},
+ "releaseConfigName": {
+ "type": "string",
+ "title": "The name of the release config that generated this release definition,autopopulated when generated by release definition generator"
+ },
+ "metadata": {
+ "type": "object",
+ "title": "Additional data to be written to the release definition"
+ },
"skipIfAlreadyInstalled": {
"type": "boolean"
},
diff --git a/packages/sfpowerscripts-cli/resources/schemas/sfdx-project.schema.json b/packages/sfp-cli/resources/schemas/sfdx-project.schema.json
similarity index 96%
rename from packages/sfpowerscripts-cli/resources/schemas/sfdx-project.schema.json
rename to packages/sfp-cli/resources/schemas/sfdx-project.schema.json
index 743d62127..04932d084 100644
--- a/packages/sfpowerscripts-cli/resources/schemas/sfdx-project.schema.json
+++ b/packages/sfp-cli/resources/schemas/sfdx-project.schema.json
@@ -1,8 +1,8 @@
{
"$schema": "http://json-schema.org/draft-07/schema#",
- "$id": "https://github.com/dxatscale/sfpowerscripts/blob/develop/packages/sfpowerscripts-cli/resources/sfdx-project.schema.json",
- "title": "sfpowerscripts DX Project File",
- "description": "The properties and shape of the SFDX project enhanced for sfpowerscripts",
+ "$id": "https://github.com/flxbl-io/sfp/blob/develop/packages/sfp-cli/resources/sfdx-project.schema.json",
+ "title": "sfp DX Project File",
+ "description": "The properties and shape of the SFDX project enhanced for sfp",
"type": "object",
"additionalProperties": true,
"required": [
@@ -12,7 +12,7 @@
"$schema": {
"description": "Support editors like vscode to help with IntelliSense",
"type": "string",
- "default": "https://raw.githubusercontent.com/dxatscale/sfpowerscripts/main/packages/sfpowerscripts-cli/resources/schemas/sfdx-project.schema.json"
+ "default": "https://raw.githubusercontent.com/flxblio/sfp/main/packages/sfp-cli/resources/schemas/sfdx-project.schema.json"
},
"packageDirectories": {
"title": "Package Directories",
@@ -187,6 +187,9 @@
"enableFHT": {
"$ref": "#/definitions/packageDirectory.enableFHT"
},
+ "enableFlowActivation": {
+ "$ref": "#/definitions/packageDirectory.enableFlowActivation"
+ },
"enablePicklist": {
"$ref": "#/definitions/packageDirectory.enablePicklist"
},
@@ -236,8 +239,8 @@
"description": "Salesforce CLI plugin configurations used with this project.",
"additionalProperties": true,
"properties": {
- "sfpowerscripts": {
- "$ref": "#/definitions/plugins.sfpowerscripts"
+ "sfp": {
+ "$ref": "#/definitions/plugins.sfp"
}
}
},
@@ -543,6 +546,12 @@
"title": "Enable Field History Tracking support?",
"description": "Enable automated update of field history tracking in the target org upon deployment"
},
+ "packageDirectory.enableFlowActivation": {
+ "type": "boolean",
+ "default": true,
+ "title": "Enable Automated Flow Management?",
+ "description": "Enable automated activation,deactivation of flows in the target org, Enabled by default for source/diff packages"
+ },
"packageDirectory.enableFT": {
"type": "boolean",
"default": true,
@@ -560,10 +569,10 @@
"title": "Package branch",
"description": "branched package for the specific dev team"
},
- "plugins.sfpowerscripts": {
+ "plugins.sfp": {
"type": "object",
- "title": "sfpowerscripts plugin configuration",
- "description": "Configuration for sfpowerscripts plugin",
+ "title": "sfp plugin configuration",
+ "description": "Configuration for sfp plugin",
"additionalProperties": false,
"properties": {
"ignoreFiles": {
@@ -626,7 +635,7 @@
"externalDependencyMap": {
"title": "Map of external package and its dependencies",
"type": "object",
- "description": "Use this map to define dependencies of unlocked packages built elsewhere, This information will be used by sfpowerscripts while expanding package dependencies",
+ "description": "Use this map to define dependencies of unlocked packages built elsewhere, This information will be used by sfp while expanding package dependencies",
"patternProperties": {
".*": {
"type": "array",
diff --git a/packages/sfpowerscripts-cli/src/BuildBase.ts b/packages/sfp-cli/src/BuildBase.ts
similarity index 90%
rename from packages/sfpowerscripts-cli/src/BuildBase.ts
rename to packages/sfp-cli/src/BuildBase.ts
index d6eae1e1b..e2c6f3439 100644
--- a/packages/sfpowerscripts-cli/src/BuildBase.ts
+++ b/packages/sfp-cli/src/BuildBase.ts
@@ -1,12 +1,12 @@
-import ArtifactGenerator from '@dxatscale/sfpowerscripts.core/lib/artifacts/generators/ArtifactGenerator';
+import ArtifactGenerator from './core/artifacts/generators/ArtifactGenerator';
import { EOL } from 'os';
-import SfpowerscriptsCommand from './SfpowerscriptsCommand';
+import SfpCommand from './SfpCommand';
import { Messages } from '@salesforce/core';
import fs = require('fs');
-import SFPStatsSender from '@dxatscale/sfpowerscripts.core/lib/stats/SFPStatsSender';
+import SFPStatsSender from './core/stats/SFPStatsSender';
import BuildImpl, { BuildProps } from './impl/parallelBuilder/BuildImpl';
-import ProjectConfig from '@dxatscale/sfpowerscripts.core/lib/project/ProjectConfig';
+import ProjectConfig from './core/project/ProjectConfig';
import { Stage } from './impl/Stage';
import SFPLogger, {
COLOR_ERROR,
@@ -19,10 +19,10 @@ import SFPLogger, {
ConsoleLogger,
LoggerLevel,
COLOR_KEY_VALUE,
-} from '@dxatscale/sfp-logger';
-import getFormattedTime from '@dxatscale/sfpowerscripts.core/lib/utils/GetFormattedTime';
-import SfpPackage from '@dxatscale/sfpowerscripts.core/lib/package/SfpPackage';
-import ReleaseConfig from './impl/release/ReleaseConfig';
+} from '@flxblio/sfp-logger';
+import getFormattedTime from './core/utils/GetFormattedTime';
+import SfpPackage from './core/package/SfpPackage';
+import ReleaseConfigLoader from './impl/release/ReleaseConfigLoader';
import { Flags } from '@oclif/core';
import { loglevel, orgApiVersionFlagSfdxStyle, targetdevhubusername } from './flags/sfdxflags';
@@ -32,9 +32,9 @@ Messages.importMessagesDirectory(__dirname);
// Load the specific messages for this file. Messages from @salesforce/command, @salesforce/core,
// or any library that is using the messages framework can also be loaded this way.
-const messages = Messages.loadMessages('@dxatscale/sfpowerscripts', 'build');
+const messages = Messages.loadMessages('@flxblio/sfp', 'build');
-export default abstract class BuildBase extends SfpowerscriptsCommand {
+export default abstract class BuildBase extends SfpCommand {
protected static requiresUsername = false;
protected static requiresDevhubUsername = false;
protected static requiresProject = true;
@@ -115,7 +115,7 @@ export default abstract class BuildBase extends SfpowerscriptsCommand {
SFPLogger.log(COLOR_HEADER(`command: ${COLOR_KEY_MESSAGE(this.getStage())}`));
SFPLogger.log(COLOR_HEADER(`Build Packages Only Changed: ${flags.diffcheck}`));
- if(projectConfig?.plugins?.sfpowerscripts?.scratchOrgDefFilePaths?.enableMultiDefinitionFiles){
+ if(projectConfig?.plugins?.sfp?.scratchOrgDefFilePaths?.enableMultiDefinitionFiles){
SFPLogger.log(COLOR_HEADER(`Multiple Config Files Mode: enabled`));
}else{
SFPLogger.log(COLOR_HEADER(`Config File Path: ${flags.configfilepath}`));
@@ -234,8 +234,8 @@ export default abstract class BuildBase extends SfpowerscriptsCommand {
private includeOnlyPackagesAsPerReleaseConfig(releaseConfigFilePath:string,buildProps: BuildProps,logger?:Logger): BuildProps {
if (releaseConfigFilePath) {
- let releaseConfig:ReleaseConfig = new ReleaseConfig(logger, releaseConfigFilePath);
- buildProps.includeOnlyPackages = releaseConfig.getPackagesAsPerReleaseConfig();
+ let releaseConfigLoader:ReleaseConfigLoader = new ReleaseConfigLoader(logger, releaseConfigFilePath);
+ buildProps.includeOnlyPackages = releaseConfigLoader.getPackagesAsPerReleaseConfig();
printIncludeOnlyPackages(buildProps.includeOnlyPackages);
}
return buildProps;
diff --git a/packages/sfpowerscripts-cli/src/InstallPackageCommand.ts b/packages/sfp-cli/src/InstallPackageCommand.ts
similarity index 79%
rename from packages/sfpowerscripts-cli/src/InstallPackageCommand.ts
rename to packages/sfp-cli/src/InstallPackageCommand.ts
index ed6767c53..3febb84ad 100644
--- a/packages/sfpowerscripts-cli/src/InstallPackageCommand.ts
+++ b/packages/sfp-cli/src/InstallPackageCommand.ts
@@ -1,23 +1,23 @@
-import SfpowerscriptsCommand from './SfpowerscriptsCommand';
+import SfpCommand from './SfpCommand';
import { Messages } from '@salesforce/core';
-import ArtifactFetcher, { Artifact } from '@dxatscale/sfpowerscripts.core/lib/artifacts/ArtifactFetcher';
+import ArtifactFetcher, { Artifact } from './core/artifacts/ArtifactFetcher';
import * as rimraf from 'rimraf';
-import SfpPackage from '@dxatscale/sfpowerscripts.core/lib/package/SfpPackage';
-import { ConsoleLogger } from '@dxatscale/sfp-logger';
-import SfpPackageBuilder from '@dxatscale/sfpowerscripts.core/lib/package/SfpPackageBuilder';
-import SFPOrg from '@dxatscale/sfpowerscripts.core/lib/org/SFPOrg';
+import SfpPackage from './core/package/SfpPackage';
+import { ConsoleLogger } from '@flxblio/sfp-logger';
+import SfpPackageBuilder from './core/package/SfpPackageBuilder';
+import SFPOrg from './core/org/SFPOrg';
import { Flags } from '@oclif/core';
import { requiredUserNameFlag } from './flags/sfdxflags';
Messages.importMessagesDirectory(__dirname);
-const messages = Messages.loadMessages('@dxatscale/sfpowerscripts', 'install_package_command');
+const messages = Messages.loadMessages('@flxblio/sfp', 'install_package_command');
/**
* Base class providing common functionality for package installation
*
- * @extends SfpowerscriptsCommand
+ * @extends SfpCommand
*/
-export default abstract class InstallPackageCommand extends SfpowerscriptsCommand {
+export default abstract class InstallPackageCommand extends SfpCommand {
protected sfpPackage: SfpPackage;
protected sfpOrg: SFPOrg;
/**
diff --git a/packages/sfpowerscripts-cli/src/PackageCreateCommand.ts b/packages/sfp-cli/src/PackageCreateCommand.ts
similarity index 89%
rename from packages/sfpowerscripts-cli/src/PackageCreateCommand.ts
rename to packages/sfp-cli/src/PackageCreateCommand.ts
index 0036b1ed1..f98707fba 100644
--- a/packages/sfpowerscripts-cli/src/PackageCreateCommand.ts
+++ b/packages/sfp-cli/src/PackageCreateCommand.ts
@@ -1,20 +1,20 @@
-import ArtifactGenerator from '@dxatscale/sfpowerscripts.core/lib/artifacts/generators/ArtifactGenerator';
-import { COLOR_HEADER, COLOR_KEY_MESSAGE, ConsoleLogger } from '@dxatscale/sfp-logger';
-import PackageDiffImpl from '@dxatscale/sfpowerscripts.core/lib/package/diff/PackageDiffImpl';
+import ArtifactGenerator from './core/artifacts/generators/ArtifactGenerator';
+import { COLOR_HEADER, COLOR_KEY_MESSAGE, ConsoleLogger } from '@flxblio/sfp-logger';
+import PackageDiffImpl from './core/package/diff/PackageDiffImpl';
import { Messages } from '@salesforce/core';
import { EOL } from 'os';
-import SfpowerscriptsCommand from './SfpowerscriptsCommand';
-import SfpPackage, { PackageType } from '@dxatscale/sfpowerscripts.core/lib/package/SfpPackage';
-import getFormattedTime from '@dxatscale/sfpowerscripts.core/lib/utils/GetFormattedTime';
+import SfpCommand from './SfpCommand';
+import SfpPackage, { PackageType } from './core/package/SfpPackage';
+import getFormattedTime from './core/utils/GetFormattedTime';
const fs = require('fs-extra');
-import Git from '@dxatscale/sfpowerscripts.core/lib/git/Git';
+import Git from './core/git/Git';
import { Flags } from '@oclif/core';
import { loglevel } from './flags/sfdxflags';
Messages.importMessagesDirectory(__dirname);
-const messages = Messages.loadMessages('@dxatscale/sfpowerscripts', 'create-package');
+const messages = Messages.loadMessages('@flxblio/sfp', 'create-package');
-export default abstract class PackageCreateCommand extends SfpowerscriptsCommand {
+export default abstract class PackageCreateCommand extends SfpCommand {
protected static requiresUsername = false;
protected static requiresDevhubUsername = false;
protected static requiresProject = true;
@@ -115,7 +115,7 @@ export default abstract class PackageCreateCommand extends SfpowerscriptsCommand
let git = await Git.initiateRepo(new ConsoleLogger());
let tagname = `${this.sfdxPackage}_v${sfpPackage.package_version_number}`;
- await git.addAnnotatedTag(tagname, `${sfpPackage.packageName} sfpowerscripts package ${sfpPackage.package_version_number}`)
+ await git.addAnnotatedTag(tagname, `${sfpPackage.packageName} sfp package ${sfpPackage.package_version_number}`)
sfpPackage.tag = tagname;
}
@@ -131,7 +131,7 @@ export default abstract class PackageCreateCommand extends SfpowerscriptsCommand
}
private generateEnvironmentVariables(artifactFilepath: string, sfpPackage: SfpPackage) {
- let prefix = 'sfpowerscripts';
+ let prefix = 'sfp';
if (this.refname != null) prefix = `${this.refname}_${prefix}`;
console.log('\nOutput variables:');
diff --git a/packages/sfpowerscripts-cli/src/ProjectValidation.ts b/packages/sfp-cli/src/ProjectValidation.ts
similarity index 91%
rename from packages/sfpowerscripts-cli/src/ProjectValidation.ts
rename to packages/sfp-cli/src/ProjectValidation.ts
index 64606e013..ba957611a 100644
--- a/packages/sfpowerscripts-cli/src/ProjectValidation.ts
+++ b/packages/sfp-cli/src/ProjectValidation.ts
@@ -1,9 +1,9 @@
-import ProjectConfig from '@dxatscale/sfpowerscripts.core/lib/project/ProjectConfig';
+import ProjectConfig from './core/project/ProjectConfig';
import Ajv from 'ajv';
import path = require('path');
import * as fs from 'fs-extra';
-import { PackageType } from '@dxatscale/sfpowerscripts.core/lib/package/SfpPackage';
-import SFPLogger, { LoggerLevel } from '@dxatscale/sfp-logger';
+import { PackageType } from './core/package/SfpPackage';
+import SFPLogger, { LoggerLevel } from '@flxblio/sfp-logger';
export default class ProjectValidation {
private readonly projectConfig;
@@ -32,7 +32,7 @@ export default class ProjectValidation {
});
- SFPLogger.log(`The following attributes are not recognized by sfpowerscripts, You might need to remove them`,LoggerLevel.WARN)
+ SFPLogger.log(`The following attributes are not recognized by sfp, You might need to remove them`,LoggerLevel.WARN)
SFPLogger.log(errorMsg, LoggerLevel.WARN);
}
}
diff --git a/packages/sfpowerscripts-cli/src/SfpowerscriptsCommand.ts b/packages/sfp-cli/src/SfpCommand.ts
similarity index 89%
rename from packages/sfpowerscripts-cli/src/SfpowerscriptsCommand.ts
rename to packages/sfp-cli/src/SfpCommand.ts
index 78c3b1ab3..1be9996af 100644
--- a/packages/sfpowerscripts-cli/src/SfpowerscriptsCommand.ts
+++ b/packages/sfp-cli/src/SfpCommand.ts
@@ -1,8 +1,7 @@
-import SFPStatsSender from '@dxatscale/sfpowerscripts.core/lib/stats/SFPStatsSender';
+import SFPStatsSender from './core/stats/SFPStatsSender';
import * as rimraf from 'rimraf';
import ProjectValidation from './ProjectValidation';
-import * as fs from 'fs-extra';
-import SFPLogger, { COLOR_HEADER, ConsoleLogger, LoggerLevel } from '@dxatscale/sfp-logger';
+import SFPLogger, { COLOR_HEADER, ConsoleLogger, LoggerLevel } from '@flxblio/sfp-logger';
import GroupConsoleLogs from './ui/GroupConsoleLogs';
import { Command, Flags, ux } from '@oclif/core';
import { FlagOutput } from '@oclif/core/lib/interfaces/parser';
@@ -10,11 +9,11 @@ import { Org } from '@salesforce/core';
/**
- * A base class that provides common funtionality for sfpowerscripts commands
+ * A base class that provides common funtionality for sfp commands
*
* @extends SfdxCommand
*/
-export default abstract class SfpowerscriptsCommand extends Command {
+export default abstract class SfpCommand extends Command {
protected static requiresProject: boolean;
@@ -24,7 +23,7 @@ export default abstract class SfpowerscriptsCommand extends Command {
private isSfpowerkitFound: boolean;
- private sfpowerscriptsConfig;
+ private sfpConfig;
private isSfdmuFound: boolean;
protected static requiresUsername: boolean=false;
protected static requiresDevhubUsername: boolean=false;
@@ -78,7 +77,7 @@ export default abstract class SfpowerscriptsCommand extends Command {
//Clear temp directory before every run
- rimraf.sync('.sfpowerscripts');
+ rimraf.sync('.sfp');
//Initialise StatsD
@@ -89,7 +88,7 @@ export default abstract class SfpowerscriptsCommand extends Command {
SFPLogger.printHeaderLine('',COLOR_HEADER,LoggerLevel.INFO);
SFPLogger.log(
COLOR_HEADER(
- `sfp -- The DX@Scale CLI -Version:${this.config.version} -Release:${this.config.pjson.release}`
+ `sfp -- Salesforce Package Manager -Version:${this.config.version} -Release:${this.config.pjson.release}`
)
);
@@ -171,8 +170,8 @@ export default abstract class SfpowerscriptsCommand extends Command {
}
- protected get statics(): typeof SfpowerscriptsCommand {
- return this.constructor as typeof SfpowerscriptsCommand;
+ protected get statics(): typeof SfpCommand {
+ return this.constructor as typeof SfpCommand;
}
}
diff --git a/packages/sfpowerscripts-cli/src/commands/apextests/trigger.ts b/packages/sfp-cli/src/commands/apextests/trigger.ts
similarity index 88%
rename from packages/sfpowerscripts-cli/src/commands/apextests/trigger.ts
rename to packages/sfp-cli/src/commands/apextests/trigger.ts
index afeeed9a2..bac3454f8 100644
--- a/packages/sfpowerscripts-cli/src/commands/apextests/trigger.ts
+++ b/packages/sfp-cli/src/commands/apextests/trigger.ts
@@ -6,16 +6,16 @@ import {
TestLevel,
TestOptions,
RunAllTestsInPackageOptions,
-} from '@dxatscale/sfpowerscripts.core/lib/apextest/TestOptions';
-import TriggerApexTests from '@dxatscale/sfpowerscripts.core/lib/apextest/TriggerApexTests';
-import SfpowerscriptsCommand from '../../SfpowerscriptsCommand';
+} from '../../core/apextest/TestOptions';
+import TriggerApexTests from '../../core/apextest/TriggerApexTests';
+import SfpCommand from '../../SfpCommand';
import { Messages } from '@salesforce/core';
-import SfpPackage from '@dxatscale/sfpowerscripts.core/lib/package/SfpPackage';
+import SfpPackage from '../../core/package/SfpPackage';
-import { ConsoleLogger } from '@dxatscale/sfp-logger';
-import { CoverageOptions } from '@dxatscale/sfpowerscripts.core/lib/apex/coverage/IndividualClassCoverage';
-import SfpPackageBuilder from '@dxatscale/sfpowerscripts.core/lib/package/SfpPackageBuilder';
-import { PackageType } from '@dxatscale/sfpowerscripts.core/lib/package/SfpPackage';
+import { ConsoleLogger } from '@flxblio/sfp-logger';
+import { CoverageOptions } from '../../core/apex/coverage/IndividualClassCoverage';
+import SfpPackageBuilder from '../../core/package/SfpPackageBuilder';
+import { PackageType } from '../../core/package/SfpPackage';
import { Flags } from '@oclif/core';
import { loglevel, orgApiVersionFlagSfdxStyle, requiredUserNameFlag } from '../../flags/sfdxflags';
const path = require('path');
@@ -25,9 +25,9 @@ Messages.importMessagesDirectory(__dirname);
// Load the specific messages for this file. Messages from @salesforce/command, @salesforce/core,
// or any library that is using the messages framework can also be loaded this way.
-const messages = Messages.loadMessages('@dxatscale/sfpowerscripts', 'trigger_apex_test');
+const messages = Messages.loadMessages('@flxblio/sfp', 'trigger_apex_test');
-export default class TriggerApexTest extends SfpowerscriptsCommand {
+export default class TriggerApexTest extends SfpCommand {
public static description = messages.getMessage('commandDescription');
public static examples = [
diff --git a/packages/sfpowerscripts-cli/src/commands/artifacts/fetch.ts b/packages/sfp-cli/src/commands/artifacts/fetch.ts
similarity index 86%
rename from packages/sfpowerscripts-cli/src/commands/artifacts/fetch.ts
rename to packages/sfp-cli/src/commands/artifacts/fetch.ts
index 849ec10a0..50f67c830 100644
--- a/packages/sfpowerscripts-cli/src/commands/artifacts/fetch.ts
+++ b/packages/sfp-cli/src/commands/artifacts/fetch.ts
@@ -1,18 +1,18 @@
-import SfpowerscriptsCommand from '../../SfpowerscriptsCommand';
+import SfpCommand from '../../SfpCommand';
import { LoggerLevel, Messages } from '@salesforce/core';
import FetchImpl, { ArtifactVersion } from '../../impl/artifacts/FetchImpl';
-import ReleaseDefinition from '../../impl/release/ReleaseDefinition';
+import ReleaseDefinitionLoader from '../../impl/release/ReleaseDefinitionLoader';
import FetchArtifactsError from '../../impl/artifacts/FetchArtifactsError';
-import { ConsoleLogger } from '@dxatscale/sfp-logger';
+import { ConsoleLogger } from '@flxblio/sfp-logger';
import { Flags } from '@oclif/core';
import { loglevel } from '../../flags/sfdxflags';
-import SFPLogger from '@dxatscale/sfp-logger';
-import { COLOR_HEADER } from '@dxatscale/sfp-logger';
+import SFPLogger from '@flxblio/sfp-logger';
+import { COLOR_HEADER } from '@flxblio/sfp-logger';
Messages.importMessagesDirectory(__dirname);
-const messages = Messages.loadMessages('@dxatscale/sfpowerscripts', 'fetch');
+const messages = Messages.loadMessages('@flxblio/sfp', 'fetch');
-export default class Fetch extends SfpowerscriptsCommand {
+export default class Fetch extends SfpCommand {
public static description = messages.getMessage('commandDescription');
public static examples = [
@@ -58,7 +58,7 @@ export default class Fetch extends SfpowerscriptsCommand {
public async execute() {
this.validateFlags();
- let releaseDefinition = (await ReleaseDefinition.loadReleaseDefinition(this.flags.releasedefinition)).releaseDefinition;
+ let releaseDefinition = await ReleaseDefinitionLoader.loadReleaseDefinition(this.flags.releasedefinition);
let result: {
success: ArtifactVersion[];
failed: ArtifactVersion[];
diff --git a/packages/sfpowerscripts-cli/src/commands/artifacts/query.ts b/packages/sfp-cli/src/commands/artifacts/query.ts
similarity index 79%
rename from packages/sfpowerscripts-cli/src/commands/artifacts/query.ts
rename to packages/sfp-cli/src/commands/artifacts/query.ts
index 464755f64..ecaaa72db 100644
--- a/packages/sfpowerscripts-cli/src/commands/artifacts/query.ts
+++ b/packages/sfp-cli/src/commands/artifacts/query.ts
@@ -1,15 +1,15 @@
-import SfpowerscriptsCommand from '../../SfpowerscriptsCommand';
+import SfpCommand from '../../SfpCommand';
import { LoggerLevel, Messages } from '@salesforce/core';
-import SFPOrg from '@dxatscale/sfpowerscripts.core/lib/org/SFPOrg';
-import SFPLogger, { ConsoleLogger } from '@dxatscale/sfp-logger';
+import SFPOrg from '../../core/org/SFPOrg';
+import SFPLogger, { ConsoleLogger } from '@flxblio/sfp-logger';
import { ZERO_BORDER_TABLE } from '../../ui/TableConstants';
import { loglevel, requiredUserNameFlag } from '../../flags/sfdxflags';
const Table = require('cli-table');
Messages.importMessagesDirectory(__dirname);
-const messages = Messages.loadMessages('@dxatscale/sfpowerscripts', 'artifacts_query');
+const messages = Messages.loadMessages('@flxblio/sfp', 'artifacts_query');
-export default class Query extends SfpowerscriptsCommand {
+export default class Query extends SfpCommand {
public static description = messages.getMessage('commandDescription');
public static examples = [`$ sfp artifacts:query -u `];
@@ -35,7 +35,7 @@ export default class Query extends SfpowerscriptsCommand {
'Commmit Id',
'Subcriber Version',
'Type',
- 'Is Sfpowerscripts Installed',
+ 'Is sfp Installed',
],
chars: ZERO_BORDER_TABLE
});
@@ -46,7 +46,7 @@ export default class Query extends SfpowerscriptsCommand {
installedArtifact.commitId.substring(0,8),
installedArtifact.subscriberVersion,
installedArtifact.type,
- installedArtifact.isInstalledBySfpowerscripts,
+ installedArtifact.isInstalledBysfp,
]);
});
SFPLogger.log(minTable.toString(), LoggerLevel.INFO, new ConsoleLogger());
diff --git a/packages/sfpowerscripts-cli/src/commands/changelog/generate.ts b/packages/sfp-cli/src/commands/changelog/generate.ts
similarity index 92%
rename from packages/sfpowerscripts-cli/src/commands/changelog/generate.ts
rename to packages/sfp-cli/src/commands/changelog/generate.ts
index a65b56183..8258a363d 100644
--- a/packages/sfpowerscripts-cli/src/commands/changelog/generate.ts
+++ b/packages/sfp-cli/src/commands/changelog/generate.ts
@@ -1,14 +1,14 @@
-import { ConsoleLogger } from '@dxatscale/sfp-logger';
+import { ConsoleLogger } from '@flxblio/sfp-logger';
import { Messages } from '@salesforce/core';
import ChangelogImpl from '../../impl/changelog/ChangelogImpl';
-import SfpowerscriptsCommand from '../../SfpowerscriptsCommand';
+import SfpCommand from '../../SfpCommand';
import { Flags } from '@oclif/core';
import { loglevel } from '../../flags/sfdxflags';
Messages.importMessagesDirectory(__dirname);
-const messages = Messages.loadMessages('@dxatscale/sfpowerscripts', 'generate_changelog');
+const messages = Messages.loadMessages('@flxblio/sfp', 'generate_changelog');
-export default class GenerateChangelog extends SfpowerscriptsCommand {
+export default class GenerateChangelog extends SfpCommand {
public static description = messages.getMessage('commandDescription');
@@ -89,6 +89,8 @@ export default class GenerateChangelog extends SfpowerscriptsCommand {
this.flags.forcepush,
this.flags.branchname,
this.flags.nopush,
+ false,
+ undefined,
null
);
diff --git a/packages/sfpowerscripts-cli/src/commands/dependency/expand.ts b/packages/sfp-cli/src/commands/dependency/expand.ts
similarity index 83%
rename from packages/sfpowerscripts-cli/src/commands/dependency/expand.ts
rename to packages/sfp-cli/src/commands/dependency/expand.ts
index 0faac4c5c..3f93008c6 100644
--- a/packages/sfpowerscripts-cli/src/commands/dependency/expand.ts
+++ b/packages/sfp-cli/src/commands/dependency/expand.ts
@@ -1,11 +1,11 @@
-import TransitiveDependencyResolver from '@dxatscale/sfpowerscripts.core/lib/package/dependencies/TransitiveDependencyResolver';
+import TransitiveDependencyResolver from '../../core/package/dependencies/TransitiveDependencyResolver';
import { Messages } from '@salesforce/core';
-import SfpowerscriptsCommand from '../../SfpowerscriptsCommand';
-import ProjectConfig from '@dxatscale/sfpowerscripts.core/lib/project/ProjectConfig';
-import SFPLogger, { LoggerLevel, Logger } from '@dxatscale/sfp-logger';
+import SfpCommand from '../../SfpCommand';
+import ProjectConfig from '../../core/project/ProjectConfig';
+import SFPLogger, { LoggerLevel, Logger } from '@flxblio/sfp-logger';
import * as fs from 'fs-extra';
import path = require('path');
-import UserDefinedExternalDependency from "@dxatscale/sfpowerscripts.core/lib/project/UserDefinedExternalDependency";
+import UserDefinedExternalDependency from "../../core/project/UserDefinedExternalDependency";
import { Flags } from '@oclif/core';
import { loglevel, targetdevhubusername } from '../../flags/sfdxflags';
@@ -14,9 +14,9 @@ Messages.importMessagesDirectory(__dirname);
// Load the specific messages for this file. Messages from @salesforce/command, @salesforce/core,
// or any library that is using the messages framework can also be loaded this way.
-const messages = Messages.loadMessages('@dxatscale/sfpowerscripts', 'dependency_expand');
+const messages = Messages.loadMessages('@flxblio/sfp', 'dependency_expand');
-export default class Expand extends SfpowerscriptsCommand {
+export default class Expand extends SfpCommand {
public static description = messages.getMessage('commandDescription');
diff --git a/packages/sfpowerscripts-cli/src/commands/dependency/install.ts b/packages/sfp-cli/src/commands/dependency/install.ts
similarity index 75%
rename from packages/sfpowerscripts-cli/src/commands/dependency/install.ts
rename to packages/sfp-cli/src/commands/dependency/install.ts
index 9414fa37a..67073338b 100644
--- a/packages/sfpowerscripts-cli/src/commands/dependency/install.ts
+++ b/packages/sfp-cli/src/commands/dependency/install.ts
@@ -1,11 +1,11 @@
-import SfpowerscriptsCommand from '../../SfpowerscriptsCommand';
+import SfpCommand from '../../SfpCommand';
import { Messages } from '@salesforce/core';
-import ExternalPackage2DependencyResolver from '@dxatscale/sfpowerscripts.core/lib/package/dependencies/ExternalPackage2DependencyResolver';
-import ProjectConfig from '@dxatscale/sfpowerscripts.core/lib/project/ProjectConfig';
-import SFPLogger, { COLOR_KEY_MESSAGE, ConsoleLogger, LoggerLevel } from '@dxatscale/sfp-logger';
-import ExternalDependencyDisplayer from '@dxatscale/sfpowerscripts.core/lib/display/ExternalDependencyDisplayer';
-import InstallUnlockedPackageCollection from '@dxatscale/sfpowerscripts.core/lib/package/packageInstallers/InstallUnlockedPackageCollection';
-import SFPOrg from '@dxatscale/sfpowerscripts.core/lib/org/SFPOrg';
+import ExternalPackage2DependencyResolver from '../../core/package/dependencies/ExternalPackage2DependencyResolver';
+import ProjectConfig from '../../core/project/ProjectConfig';
+import SFPLogger, { COLOR_KEY_MESSAGE, ConsoleLogger, LoggerLevel } from '@flxblio/sfp-logger';
+import ExternalDependencyDisplayer from '../../core/display/ExternalDependencyDisplayer';
+import InstallUnlockedPackageCollection from '../../core/package/packageInstallers/InstallUnlockedPackageCollection';
+import SFPOrg from '../../core/org/SFPOrg';
import { Flags } from '@oclif/core';
import { loglevel, targetdevhubusername, requiredUserNameFlag } from '../../flags/sfdxflags';
@@ -14,9 +14,9 @@ Messages.importMessagesDirectory(__dirname);
// Load the specific messages for this file. Messages from @salesforce/command, @salesforce/core,
// or any library that is using the messages framework can also be loaded this way.
-const messages = Messages.loadMessages('@dxatscale/sfpowerscripts', 'dependency_install');
+const messages = Messages.loadMessages('@flxblio/sfp', 'dependency_install');
-export default class Install extends SfpowerscriptsCommand {
+export default class Install extends SfpCommand {
public static description = messages.getMessage('commandDescription');
protected static requiresUsername = true;
protected static requiresDevhubUsername = true;
diff --git a/packages/sfpowerscripts-cli/src/commands/dependency/shrink.ts b/packages/sfp-cli/src/commands/dependency/shrink.ts
similarity index 88%
rename from packages/sfpowerscripts-cli/src/commands/dependency/shrink.ts
rename to packages/sfp-cli/src/commands/dependency/shrink.ts
index 2a2573f06..28aa2a4a2 100644
--- a/packages/sfpowerscripts-cli/src/commands/dependency/shrink.ts
+++ b/packages/sfp-cli/src/commands/dependency/shrink.ts
@@ -1,10 +1,10 @@
import ShrinkImpl from '../../impl/dependency/ShrinkImpl';
import { Messages } from '@salesforce/core';
-import SfpowerscriptsCommand from '../../SfpowerscriptsCommand';
-import ProjectConfig from '@dxatscale/sfpowerscripts.core/lib/project/ProjectConfig';
+import SfpCommand from '../../SfpCommand';
+import ProjectConfig from '../../core/project/ProjectConfig';
import * as fs from 'fs-extra';
import path = require('path');
-import SFPLogger, { LoggerLevel, Logger } from '@dxatscale/sfp-logger';
+import SFPLogger, { LoggerLevel, Logger } from '@flxblio/sfp-logger';
import { Flags } from '@oclif/core';
import { loglevel, targetdevhubusername } from '../../flags/sfdxflags';
@@ -14,9 +14,9 @@ Messages.importMessagesDirectory(__dirname);
// Load the specific messages for this file. Messages from @salesforce/command, @salesforce/core,
// or any library that is using the messages framework can also be loaded this way.
-const messages = Messages.loadMessages('@dxatscale/sfpowerscripts', 'dependency_shrink');
+const messages = Messages.loadMessages('@flxblio/sfp', 'dependency_shrink');
-export default class Shrink extends SfpowerscriptsCommand {
+export default class Shrink extends SfpCommand {
public static description = messages.getMessage('commandDescription');
protected static requiresDevhubUsername = true;
diff --git a/packages/sfp-cli/src/commands/flow/activate.ts b/packages/sfp-cli/src/commands/flow/activate.ts
new file mode 100644
index 000000000..4c6d47eb3
--- /dev/null
+++ b/packages/sfp-cli/src/commands/flow/activate.ts
@@ -0,0 +1,64 @@
+import { Messages } from '@salesforce/core';
+import sfpCommand from '../../SfpCommand';
+import SFPLogger, { LoggerLevel, Logger, COLOR_KEY_MESSAGE, COLOR_HEADER, COLOR_ERROR } from '@flxblio/sfp-logger';
+import { Flags } from '@oclif/core';
+import { loglevel } from '../../flags/sfdxflags';
+import {activate, getFlowDefinition} from '../../core/flows/FlowOperations';
+import { requiredUserNameFlag } from '../../flags/sfdxflags';
+import SFPOrg from '../../core/org/SFPOrg';
+
+// Initialize Messages with the current plugin directory
+Messages.importMessagesDirectory(__dirname);
+
+// Load the specific messages for this file. Messages from @salesforce/command, @salesforce/core,
+// or any library that is using the messages framework can also be loaded this way.
+const messages = Messages.loadMessages('@flxblio/sfp', 'flow');
+
+export default class Activate extends sfpCommand {
+ public static description = messages.getMessage('activateDescription');
+
+ protected sfpOrg: SFPOrg;
+
+
+ protected static requiresUsername = true;
+ protected static supportsDevhubUsername = true;
+ protected static requiresProject = false;
+
+ public static flags = {
+ developername: Flags.string({
+ char: 'f',
+ description: messages.getMessage('developernameFlagDescription')
+ }),
+ namespaceprefix: Flags.string({
+ char: 'p',
+ description: messages.getMessage('namespacePrefixFlagDescription')
+ }),
+ targetorg: requiredUserNameFlag,
+ loglevel
+ };
+
+ public async execute() {
+ SFPLogger.log(COLOR_HEADER(`command: ${COLOR_KEY_MESSAGE(`flow:activate`)}`),LoggerLevel.INFO);
+ const { developername, namespaceprefix } = this.flags as unknown as {
+ developername: string;
+ namespaceprefix: string;
+ };
+ this.sfpOrg = await SFPOrg.create({aliasOrUsername:this.flags.targetorg});
+
+ try {
+ const flowdefinition = await getFlowDefinition(
+ {
+ developername,
+ namespaceprefix,
+ },
+ this.sfpOrg
+ );
+ await activate(flowdefinition, this.sfpOrg);
+ SFPLogger.log(`Successfully activated the flow ${developername}`,LoggerLevel.INFO);
+
+
+ } catch (error) {
+ throw new Error(COLOR_ERROR('Unable to activate flow:' + error.message));
+ }
+ }
+}
diff --git a/packages/sfp-cli/src/commands/flow/cleanup.ts b/packages/sfp-cli/src/commands/flow/cleanup.ts
new file mode 100644
index 000000000..b99272c17
--- /dev/null
+++ b/packages/sfp-cli/src/commands/flow/cleanup.ts
@@ -0,0 +1,93 @@
+import { Messages } from '@salesforce/core';
+import sfpCommand from '../../SfpCommand';
+import SFPLogger, {
+ LoggerLevel,
+ Logger,
+ ConsoleLogger,
+ COLOR_HEADER,
+ COLOR_KEY_MESSAGE,
+ COLOR_ERROR,
+} from '@flxblio/sfp-logger';
+import { Flags } from '@oclif/core';
+import { loglevel } from '../../flags/sfdxflags';
+import { deactivate, deleteFlows, getFlowDefinition, getFlowsByDefinition } from '../../core/flows/FlowOperations';
+import { requiredUserNameFlag } from '../../flags/sfdxflags';
+import SFPOrg from '../../core/org/SFPOrg';
+
+// Initialize Messages with the current plugin directory
+Messages.importMessagesDirectory(__dirname);
+
+// Load the specific messages for this file. Messages from @salesforce/command, @salesforce/core,
+// or any library that is using the messages framework can also be loaded this way.
+const messages = Messages.loadMessages('@flxblio/sfp', 'flow');
+
+export default class Cleanup extends sfpCommand {
+ public static description = messages.getMessage('cleanupDescription');
+
+ protected sfpOrg: SFPOrg;
+
+ protected static requiresUsername = true;
+ protected static supportsDevhubUsername = true;
+ protected static requiresProject = false;
+
+ public static flags = {
+ developername: Flags.string({
+ char: 'f',
+ description: messages.getMessage('developernameFlagDescription'),
+ }),
+ namespaceprefix: Flags.string({
+ char: 'p',
+ description: messages.getMessage('namespacePrefixFlagDescription'),
+ }),
+ targetorg: requiredUserNameFlag,
+ loglevel,
+ };
+
+ public async execute() {
+ SFPLogger.log(COLOR_HEADER(`command: ${COLOR_KEY_MESSAGE(`flow:cleanup`)}`), LoggerLevel.INFO);
+ const { developername, namespaceprefix } = (this.flags as unknown) as {
+ developername: string;
+ namespaceprefix: string;
+ };
+ this.sfpOrg = await SFPOrg.create({ aliasOrUsername: this.flags.targetorg });
+
+ try {
+ const flowdefinition = await getFlowDefinition(
+ {
+ developername,
+ namespaceprefix,
+ },
+ this.sfpOrg,
+ new ConsoleLogger()
+ );
+ //discover the active version of the flow
+ if (flowdefinition.ActiveVersionId) {
+ SFPLogger.log(
+ `Successfully discovered the active version of flow ${developername}: ${flowdefinition.ActiveVersionId}`,
+ LoggerLevel.INFO
+ );
+ }
+
+ let flows = await getFlowsByDefinition(flowdefinition, this.sfpOrg, new ConsoleLogger());
+ let succeededFlowIds = [];
+ if (flows && flows.length > 0) {
+ flows = flows.filter((flow) => flow.Id != flowdefinition.ActiveVersionId);
+ succeededFlowIds = await deleteFlows(flows, this.sfpOrg, new ConsoleLogger());
+ }
+ // do a comparison of the requested flows and succeeded flows
+ const flowIds = flows.map((flow) => flow.Id);
+ const failedFlowIds = flowIds.filter((flowId) => !succeededFlowIds.includes(flowId));
+ if (failedFlowIds.length > 0) {
+ throw new Error(
+ `Failed to delete the following flow versions: ${failedFlowIds.join(
+ ', '
+ )}, You may need to try again or manually delete them from the org.`
+ );
+ }
+
+ SFPLogger.log(`Successfully cleaned up the flow ${developername}`, LoggerLevel.INFO);
+ } catch (error) {
+ throw new Error(COLOR_ERROR('Unable to cleanup flow:' + error.message));
+ }
+ }
+}
diff --git a/packages/sfp-cli/src/commands/flow/deactivate.ts b/packages/sfp-cli/src/commands/flow/deactivate.ts
new file mode 100644
index 000000000..7689f30bb
--- /dev/null
+++ b/packages/sfp-cli/src/commands/flow/deactivate.ts
@@ -0,0 +1,64 @@
+import { Messages } from '@salesforce/core';
+import sfpCommand from '../../SfpCommand';
+import SFPLogger, { LoggerLevel, Logger, COLOR_HEADER, COLOR_KEY_MESSAGE, COLOR_ERROR } from '@flxblio/sfp-logger';
+import { Flags } from '@oclif/core';
+import { loglevel } from '../../flags/sfdxflags';
+import {deactivate, getFlowDefinition} from '../../core/flows/FlowOperations';
+import { requiredUserNameFlag } from '../../flags/sfdxflags';
+import SFPOrg from '../../core/org/SFPOrg';
+
+// Initialize Messages with the current plugin directory
+Messages.importMessagesDirectory(__dirname);
+
+// Load the specific messages for this file. Messages from @salesforce/command, @salesforce/core,
+// or any library that is using the messages framework can also be loaded this way.
+const messages = Messages.loadMessages('@flxblio/sfp', 'flow');
+
+export default class DeActivate extends sfpCommand {
+ public static description = messages.getMessage('deactivateDescription');
+
+ protected sfpOrg: SFPOrg;
+
+
+ protected static requiresUsername = true;
+ protected static supportsDevhubUsername = true;
+ protected static requiresProject = false;
+
+ public static flags = {
+ developername: Flags.string({
+ char: 'f',
+ description: messages.getMessage('developernameFlagDescription')
+ }),
+ namespaceprefix: Flags.string({
+ char: 'p',
+ description: messages.getMessage('namespacePrefixFlagDescription')
+ }),
+ targetorg: requiredUserNameFlag,
+ loglevel
+ };
+
+ public async execute() {
+ SFPLogger.log(COLOR_HEADER(`command: ${COLOR_KEY_MESSAGE(`flow:deactivate`)}`),LoggerLevel.INFO);
+ const { developername, namespaceprefix } = this.flags as unknown as {
+ developername: string;
+ namespaceprefix: string;
+ };
+ this.sfpOrg = await SFPOrg.create({aliasOrUsername:this.flags.targetorg});
+
+ try {
+ const flowdefinition = await getFlowDefinition(
+ {
+ developername,
+ namespaceprefix,
+ },
+ this.sfpOrg
+ );
+ await deactivate(flowdefinition, this.sfpOrg);
+ SFPLogger.log(`Successfully deactivated the flow ${developername}`,LoggerLevel.INFO);
+
+
+ } catch (error) {
+ throw new Error(COLOR_ERROR('Unable to deactivate flow:' + error.message));
+ }
+ }
+}
diff --git a/packages/sfpowerscripts-cli/src/commands/impact/package.ts b/packages/sfp-cli/src/commands/impact/package.ts
similarity index 90%
rename from packages/sfpowerscripts-cli/src/commands/impact/package.ts
rename to packages/sfp-cli/src/commands/impact/package.ts
index a550b7d3f..bd5ee5933 100644
--- a/packages/sfpowerscripts-cli/src/commands/impact/package.ts
+++ b/packages/sfp-cli/src/commands/impact/package.ts
@@ -1,7 +1,7 @@
import { Messages } from '@salesforce/core';
-import SfpowerscriptsCommand from '../../SfpowerscriptsCommand';
+import SfpCommand from '../../SfpCommand';
import { Stage } from '../../impl/Stage';
-import SFPLogger, { COLOR_KEY_MESSAGE, ConsoleLogger } from '@dxatscale/sfp-logger';
+import SFPLogger, { COLOR_KEY_MESSAGE, ConsoleLogger } from '@flxblio/sfp-logger';
import { Flags } from '@oclif/core';
import { loglevel } from '../../flags/sfdxflags';
import { ZERO_BORDER_TABLE } from '../../ui/TableConstants';
@@ -12,9 +12,9 @@ import * as fs from 'fs-extra';
Messages.importMessagesDirectory(__dirname);
-const messages = Messages.loadMessages('@dxatscale/sfpowerscripts', 'impact_package');
+const messages = Messages.loadMessages('@flxblio/sfp', 'impact_package');
-export default class Package extends SfpowerscriptsCommand {
+export default class Package extends SfpCommand {
public static flags = {
loglevel,
basebranch: Flags.string({
diff --git a/packages/sfpowerscripts-cli/src/commands/impact/releaseconfig.ts b/packages/sfp-cli/src/commands/impact/releaseconfig.ts
similarity index 83%
rename from packages/sfpowerscripts-cli/src/commands/impact/releaseconfig.ts
rename to packages/sfp-cli/src/commands/impact/releaseconfig.ts
index c3dac0b9d..31318c57e 100644
--- a/packages/sfpowerscripts-cli/src/commands/impact/releaseconfig.ts
+++ b/packages/sfp-cli/src/commands/impact/releaseconfig.ts
@@ -1,8 +1,8 @@
import { Messages } from '@salesforce/core';
-import SfpowerscriptsCommand from '../../SfpowerscriptsCommand';
+import SfpCommand from '../../SfpCommand';
import { Stage } from '../../impl/Stage';
import * as fs from 'fs-extra';
-import SFPLogger, { COLOR_KEY_MESSAGE, ConsoleLogger } from '@dxatscale/sfp-logger';
+import SFPLogger, { COLOR_KEY_MESSAGE, ConsoleLogger } from '@flxblio/sfp-logger';
import { Flags } from '@oclif/core';
import { loglevel } from '../../flags/sfdxflags';
import { ZERO_BORDER_TABLE } from '../../ui/TableConstants';
@@ -13,11 +13,14 @@ const Table = require('cli-table');
Messages.importMessagesDirectory(__dirname);
-const messages = Messages.loadMessages('@dxatscale/sfpowerscripts', 'impact_release_config');
+const messages = Messages.loadMessages('@flxblio/sfp', 'impact_release_config');
-export default class ReleaseConfig extends SfpowerscriptsCommand {
+export default class ReleaseConfig extends SfpCommand {
public static flags = {
loglevel,
+ branch: Flags.string({
+ description: messages.getMessage('branchFlagDescription'),
+ }),
basebranch: Flags.string({
description: messages.getMessage('baseCommitOrBranchFlagDescription'),
required: true,
@@ -26,13 +29,16 @@ export default class ReleaseConfig extends SfpowerscriptsCommand {
description: messages.getMessage('releaseConfigFileFlagDescription'),
default: 'config',
}),
- explictDependencyCheck: Flags.boolean({
- description: messages.getMessage('explictDependencyCheckFlagDescription'),
+ explicitDependencyCheck: Flags.boolean({
+ description: messages.getMessage('explicitDependencyCheckFlagDescription'),
default: false,
}),
filterBy: Flags.string({
description: messages.getMessage('filterByFlagDescription'),
}),
+ filterByChangesInBranch: Flags.boolean({
+ description: messages.getMessage('filterByChangesInBranchFlagDescription'),
+ }),
};
public static description = messages.getMessage('commandDescription');
@@ -52,6 +58,13 @@ export default class ReleaseConfig extends SfpowerscriptsCommand {
},
};
+ if(this.flags.filterByChangesInBranch)
+ {
+ this.props.diffOptions.useBranchCompare=true;
+ this.props.diffOptions.branch=this.flags.branch;
+ this.props.diffOptions.baseBranch=this.flags.basebranch;
+ }
+
const impactedPackageResolver = new ImpactedPackageResolver(this.props, new ConsoleLogger());
let packagesToBeBuiltWithReasons = await impactedPackageResolver.getImpactedPackages();
@@ -67,7 +80,7 @@ export default class ReleaseConfig extends SfpowerscriptsCommand {
let impactedReleaseConfigs = impactedReleaseConfigResolver.getImpactedReleaseConfigs(
packagesToBeBuilt,
this.flags.releaseconfig,
- this.flags.explictDependencyCheck,
+ this.flags.explicitDependencyCheck,
this.flags.filterBy
);
diff --git a/packages/sfpowerscripts-cli/src/commands/metrics/report.ts b/packages/sfp-cli/src/commands/metrics/report.ts
similarity index 87%
rename from packages/sfpowerscripts-cli/src/commands/metrics/report.ts
rename to packages/sfp-cli/src/commands/metrics/report.ts
index bf596628b..17c806ca1 100644
--- a/packages/sfpowerscripts-cli/src/commands/metrics/report.ts
+++ b/packages/sfp-cli/src/commands/metrics/report.ts
@@ -1,6 +1,6 @@
-import SfpowerscriptsCommand from '../../SfpowerscriptsCommand';
-import SFPStatsSender from '@dxatscale/sfpowerscripts.core/lib/stats/SFPStatsSender';
-import SFPLogger, { LoggerLevel, COLOR_KEY_MESSAGE } from '@dxatscale/sfp-logger';
+import SfpCommand from '../../SfpCommand';
+import SFPStatsSender from '../../core/stats/SFPStatsSender';
+import SFPLogger, { LoggerLevel, COLOR_KEY_MESSAGE } from '@flxblio/sfp-logger';
import { Messages } from '@salesforce/core';
import { Flags } from '@oclif/core';
import { loglevel } from '../../flags/sfdxflags';
@@ -10,9 +10,9 @@ Messages.importMessagesDirectory(__dirname);
// Load the specific messages for this file. Messages from @salesforce/command, @salesforce/core,
// or any library that is using the messages framework can also be loaded this way.
-const messages = Messages.loadMessages('@dxatscale/sfpowerscripts', 'metrics_report');
+const messages = Messages.loadMessages('@flxblio/sfp', 'metrics_report');
-export default class Report extends SfpowerscriptsCommand {
+export default class Report extends SfpCommand {
public static description = messages.getMessage('commandDescription');
protected static requiresDevhubUsername = false;
diff --git a/packages/sfpowerscripts-cli/src/commands/orchestrator/build.ts b/packages/sfp-cli/src/commands/orchestrator/build.ts
similarity index 95%
rename from packages/sfpowerscripts-cli/src/commands/orchestrator/build.ts
rename to packages/sfp-cli/src/commands/orchestrator/build.ts
index 0d2c20cff..6cbcfb656 100644
--- a/packages/sfpowerscripts-cli/src/commands/orchestrator/build.ts
+++ b/packages/sfp-cli/src/commands/orchestrator/build.ts
@@ -8,7 +8,7 @@ Messages.importMessagesDirectory(__dirname);
// Load the specific messages for this file. Messages from @salesforce/command, @salesforce/core,
// or any library that is using the messages framework can also be loaded this way.
-const messages = Messages.loadMessages('@dxatscale/sfpowerscripts', 'build');
+const messages = Messages.loadMessages('@flxblio/sfp', 'build');
export default class Build extends BuildBase {
public static description = messages.getMessage('commandDescription');
diff --git a/packages/sfpowerscripts-cli/src/commands/orchestrator/deploy.ts b/packages/sfp-cli/src/commands/orchestrator/deploy.ts
similarity index 92%
rename from packages/sfpowerscripts-cli/src/commands/orchestrator/deploy.ts
rename to packages/sfp-cli/src/commands/orchestrator/deploy.ts
index 968610594..a9d8c9ce9 100644
--- a/packages/sfpowerscripts-cli/src/commands/orchestrator/deploy.ts
+++ b/packages/sfp-cli/src/commands/orchestrator/deploy.ts
@@ -1,6 +1,6 @@
-import SfpowerscriptsCommand from '../../SfpowerscriptsCommand';
+import SfpCommand from '../../SfpCommand';
import { Messages } from '@salesforce/core';
-import SFPStatsSender from '@dxatscale/sfpowerscripts.core/lib/stats/SFPStatsSender';
+import SFPStatsSender from '../../core/stats/SFPStatsSender';
import DeployImpl, { DeploymentMode, DeployProps, DeploymentResult } from '../../impl/deploy/DeployImpl';
import { Stage } from '../../impl/Stage';
import SFPLogger, {
@@ -8,21 +8,21 @@ import SFPLogger, {
COLOR_HEADER,
COLOR_KEY_MESSAGE,
COLOR_SUCCESS,
-} from '@dxatscale/sfp-logger';
-import { COLOR_TIME } from '@dxatscale/sfp-logger';
-import getFormattedTime from '@dxatscale/sfpowerscripts.core/lib/utils/GetFormattedTime';
+} from '@flxblio/sfp-logger';
+import { COLOR_TIME } from '@flxblio/sfp-logger';
+import getFormattedTime from '../../core/utils/GetFormattedTime';
import { Flags } from '@oclif/core';
import { arrayFlagSfdxStyle, loglevel, logsgroupsymbol, requiredUserNameFlag } from '../../flags/sfdxflags';
-import { LoggerLevel } from '@dxatscale/sfp-logger';
+import { LoggerLevel } from '@flxblio/sfp-logger';
// Initialize Messages with the current plugin directory
Messages.importMessagesDirectory(__dirname);
// Load the specific messages for this file. Messages from @salesforce/command, @salesforce/core,
// or any library that is using the messages framework can also be loaded this way.
-const messages = Messages.loadMessages('@dxatscale/sfpowerscripts', 'deploy');
+const messages = Messages.loadMessages('@flxblio/sfp', 'deploy');
-export default class Deploy extends SfpowerscriptsCommand {
+export default class Deploy extends SfpCommand {
public static description = messages.getMessage('commandDescription');
public static examples = [`$ sfp orchestrator:deploy -u `];
diff --git a/packages/sfpowerscripts-cli/src/commands/orchestrator/prepare.ts b/packages/sfp-cli/src/commands/orchestrator/prepare.ts
similarity index 89%
rename from packages/sfpowerscripts-cli/src/commands/orchestrator/prepare.ts
rename to packages/sfp-cli/src/commands/orchestrator/prepare.ts
index 36910cd39..0e6c3a024 100644
--- a/packages/sfpowerscripts-cli/src/commands/orchestrator/prepare.ts
+++ b/packages/sfp-cli/src/commands/orchestrator/prepare.ts
@@ -1,13 +1,13 @@
import { Messages } from '@salesforce/core';
-import SfpowerscriptsCommand from '../../SfpowerscriptsCommand';
+import SfpCommand from '../../SfpCommand';
import PrepareImpl from '../../impl/prepare/PrepareImpl';
-import SFPStatsSender from '@dxatscale/sfpowerscripts.core/lib/stats/SFPStatsSender';
+import SFPStatsSender from '../../core/stats/SFPStatsSender';
import { Stage } from '../../impl/Stage';
import * as fs from 'fs-extra';
-import ScratchOrgInfoFetcher from '@dxatscale/sfpowerscripts.core/lib/scratchorg/pool/services/fetchers/ScratchOrgInfoFetcher';
+import ScratchOrgInfoFetcher from '../../core/scratchorg/pool/services/fetchers/ScratchOrgInfoFetcher';
import Ajv from 'ajv';
import path = require('path');
-import { PoolErrorCodes } from '@dxatscale/sfpowerscripts.core/lib/scratchorg/pool/PoolError';
+import { PoolErrorCodes } from '../../core/scratchorg/pool/PoolError';
import SFPLogger, {
LoggerLevel,
COLOR_ERROR,
@@ -15,19 +15,18 @@ import SFPLogger, {
COLOR_SUCCESS,
COLOR_TIME,
COLOR_KEY_MESSAGE,
-} from '@dxatscale/sfp-logger';
-import getFormattedTime from '@dxatscale/sfpowerscripts.core/lib/utils/GetFormattedTime';
-import { PoolConfig } from '@dxatscale/sfpowerscripts.core/lib/scratchorg/pool/PoolConfig';
-import { COLOR_WARNING } from '@dxatscale/sfp-logger';
-import PoolSchema from '@dxatscale/sfpowerscripts.core/resources/pooldefinition.schema.json';
-import SFPOrg from '@dxatscale/sfpowerscripts.core/lib/org/SFPOrg';
+} from '@flxblio/sfp-logger';
+import getFormattedTime from '../../core/utils/GetFormattedTime';
+import { PoolConfig } from '../../core/scratchorg/pool/PoolConfig';
+import { COLOR_WARNING } from '@flxblio/sfp-logger';
+import SFPOrg from '../../core/org/SFPOrg';
import { Flags } from '@oclif/core';
import { loglevel, logsgroupsymbol, targetdevhubusername } from '../../flags/sfdxflags';
Messages.importMessagesDirectory(__dirname);
-const messages = Messages.loadMessages('@dxatscale/sfpowerscripts', 'prepare');
+const messages = Messages.loadMessages('@flxblio/sfp', 'prepare');
-export default class Prepare extends SfpowerscriptsCommand {
+export default class Prepare extends SfpCommand {
protected static requiresDevhubUsername = true;
protected static requiresProject = true;
@@ -200,7 +199,11 @@ export default class Prepare extends SfpowerscriptsCommand {
public validatePoolConfig(poolConfig: any) {
let ajv = new Ajv({ allErrors: true });
- let validator = ajv.compile(PoolSchema);
+ let schema = fs.readJSONSync(
+ path.join(__dirname, '..', '..', '..', 'resources', 'schemas', 'pooldefinition.schema.json'),
+ { encoding: 'UTF-8' }
+ );
+ let validator = ajv.compile(schema);
let isSchemaValid = validator(poolConfig);
if (!isSchemaValid) {
let errorMsg: string = `The pool configuration is invalid, Please fix the following errors\n`;
diff --git a/packages/sfpowerscripts-cli/src/commands/orchestrator/promote.ts b/packages/sfp-cli/src/commands/orchestrator/promote.ts
similarity index 82%
rename from packages/sfpowerscripts-cli/src/commands/orchestrator/promote.ts
rename to packages/sfp-cli/src/commands/orchestrator/promote.ts
index ea585d4c9..fb067b87e 100644
--- a/packages/sfpowerscripts-cli/src/commands/orchestrator/promote.ts
+++ b/packages/sfp-cli/src/commands/orchestrator/promote.ts
@@ -1,20 +1,20 @@
-import SfpowerscriptsCommand from '../../SfpowerscriptsCommand';
+import SfpCommand from '../../SfpCommand';
import { Messages } from '@salesforce/core';
-import PromoteUnlockedPackageImpl from '@dxatscale/sfpowerscripts.core/lib/package/promote/PromoteUnlockedPackageImpl'
-import ArtifactFetcher from '@dxatscale/sfpowerscripts.core/lib/artifacts/ArtifactFetcher';
-import { ConsoleLogger } from '@dxatscale/sfp-logger';
-import SfpPackageBuilder from '@dxatscale/sfpowerscripts.core/lib/package/SfpPackageBuilder';
-import { PackageType } from '@dxatscale/sfpowerscripts.core/lib/package/SfpPackage';
+import PromoteUnlockedPackageImpl from '../../core/package/promote/PromoteUnlockedPackageImpl'
+import ArtifactFetcher from '../../core/artifacts/ArtifactFetcher';
+import { ConsoleLogger } from '@flxblio/sfp-logger';
+import SfpPackageBuilder from '../../core/package/SfpPackageBuilder';
+import { PackageType } from '../../core/package/SfpPackage';
import { Flags, ux } from '@oclif/core';
import { loglevel, targetdevhubusername } from '../../flags/sfdxflags';
-import { LoggerLevel } from '@dxatscale/sfp-logger';
-import { COLOR_HEADER } from '@dxatscale/sfp-logger';
-import SFPLogger from '@dxatscale/sfp-logger';
+import { LoggerLevel } from '@flxblio/sfp-logger';
+import { COLOR_HEADER } from '@flxblio/sfp-logger';
+import SFPLogger from '@flxblio/sfp-logger';
Messages.importMessagesDirectory(__dirname);
-const messages = Messages.loadMessages('@dxatscale/sfpowerscripts', 'promote');
+const messages = Messages.loadMessages('@flxblio/sfp', 'promote');
-export default class Promote extends SfpowerscriptsCommand {
+export default class Promote extends SfpCommand {
public static description = messages.getMessage('commandDescription');
public static examples = [`$ sfp orchestrator:promote -d path/to/artifacts -v `];
diff --git a/packages/sfpowerscripts-cli/src/commands/orchestrator/publish.ts b/packages/sfp-cli/src/commands/orchestrator/publish.ts
similarity index 92%
rename from packages/sfpowerscripts-cli/src/commands/orchestrator/publish.ts
rename to packages/sfp-cli/src/commands/orchestrator/publish.ts
index 71b255523..2209abba3 100644
--- a/packages/sfpowerscripts-cli/src/commands/orchestrator/publish.ts
+++ b/packages/sfp-cli/src/commands/orchestrator/publish.ts
@@ -1,35 +1,35 @@
-import SfpowerscriptsCommand from '../../SfpowerscriptsCommand';
+import SfpCommand from '../../SfpCommand';
import { Messages } from '@salesforce/core';
import * as fs from 'fs-extra';
import path = require('path');
-import ArtifactFetcher, { Artifact } from '@dxatscale/sfpowerscripts.core/lib/artifacts/ArtifactFetcher';
-import SFPStatsSender from '@dxatscale/sfpowerscripts.core/lib/stats/SFPStatsSender';
+import ArtifactFetcher, { Artifact } from '../../core/artifacts/ArtifactFetcher';
+import SFPStatsSender from '../../core/stats/SFPStatsSender';
import SFPLogger, {
COLOR_ERROR,
COLOR_HEADER,
COLOR_KEY_MESSAGE,
COLOR_SUCCESS,
COLOR_TIME,
-} from '@dxatscale/sfp-logger';
-import getFormattedTime from '@dxatscale/sfpowerscripts.core/lib/utils/GetFormattedTime';
-import defaultShell from '@dxatscale/sfpowerscripts.core/lib/utils/DefaultShell';
-import SfpPackage, { PackageType } from '@dxatscale/sfpowerscripts.core/lib/package/SfpPackage';
-import { ConsoleLogger } from '@dxatscale/sfp-logger';
-import SfpPackageBuilder from '@dxatscale/sfpowerscripts.core/lib/package/SfpPackageBuilder';
-import Git from '@dxatscale/sfpowerscripts.core/lib/git/Git';
+} from '@flxblio/sfp-logger';
+import getFormattedTime from '../../core/utils/GetFormattedTime';
+import defaultShell from '../../core/utils/DefaultShell';
+import SfpPackage, { PackageType } from '../../core/package/SfpPackage';
+import { ConsoleLogger } from '@flxblio/sfp-logger';
+import SfpPackageBuilder from '../../core/package/SfpPackageBuilder';
+import Git from '../../core/git/Git';
import GroupConsoleLogs from '../../ui/GroupConsoleLogs';
-import PackageVersionLister from '@dxatscale/sfpowerscripts.core/lib/package/version/PackageVersionLister';
-import SFPOrg from '@dxatscale/sfpowerscripts.core/lib/org/SFPOrg';
-import ExecuteCommand from '@dxatscale/sfdx-process-wrapper/lib/commandExecutor/ExecuteCommand';
-import { LoggerLevel } from '@dxatscale/sfp-logger';
-import GitTags from '@dxatscale/sfpowerscripts.core/lib/git/GitTags';
+import PackageVersionLister from '../../core/package/version/PackageVersionLister';
+import SFPOrg from '../../core/org/SFPOrg';
+import ExecuteCommand from '@flxblio/sfdx-process-wrapper/lib/commandExecutor/ExecuteCommand';
+import { LoggerLevel } from '@flxblio/sfp-logger';
+import GitTags from '../../core/git/GitTags';
import { arrayFlagSfdxStyle, loglevel, logsgroupsymbol, optionalDevHubFlag } from '../../flags/sfdxflags';
import { Flags } from '@oclif/core';
Messages.importMessagesDirectory(__dirname);
-const messages = Messages.loadMessages('@dxatscale/sfpowerscripts', 'publish');
+const messages = Messages.loadMessages('@flxblio/sfp', 'publish');
-export default class Promote extends SfpowerscriptsCommand {
+export default class Promote extends SfpCommand {
public static description = messages.getMessage('commandDescription');
public static examples = [
@@ -92,7 +92,7 @@ export default class Promote extends SfpowerscriptsCommand {
required: false,
deprecated: {
message:
- '--npmtag is deprecated, sfpowerscripts will automatically tag the artifact with the branch name',
+ '--npmtag is deprecated, sfp will automatically tag the artifact with the branch name',
},
}),
npmrcpath: Flags.file({
diff --git a/packages/sfpowerscripts-cli/src/commands/orchestrator/quickbuild.ts b/packages/sfp-cli/src/commands/orchestrator/quickbuild.ts
similarity index 95%
rename from packages/sfpowerscripts-cli/src/commands/orchestrator/quickbuild.ts
rename to packages/sfp-cli/src/commands/orchestrator/quickbuild.ts
index b8aabaf6f..0ff13dabb 100644
--- a/packages/sfpowerscripts-cli/src/commands/orchestrator/quickbuild.ts
+++ b/packages/sfp-cli/src/commands/orchestrator/quickbuild.ts
@@ -8,7 +8,7 @@ Messages.importMessagesDirectory(__dirname);
// Load the specific messages for this file. Messages from @salesforce/command, @salesforce/core,
// or any library that is using the messages framework can also be loaded this way.
-const messages = Messages.loadMessages('@dxatscale/sfpowerscripts', 'quickbuild');
+const messages = Messages.loadMessages('@flxblio/sfp', 'quickbuild');
export default class QuickBuild extends BuildBase {
public static description = messages.getMessage('commandDescription');
diff --git a/packages/sfpowerscripts-cli/src/commands/orchestrator/release.ts b/packages/sfp-cli/src/commands/orchestrator/release.ts
similarity index 81%
rename from packages/sfpowerscripts-cli/src/commands/orchestrator/release.ts
rename to packages/sfp-cli/src/commands/orchestrator/release.ts
index 930184777..6a88f1933 100644
--- a/packages/sfpowerscripts-cli/src/commands/orchestrator/release.ts
+++ b/packages/sfp-cli/src/commands/orchestrator/release.ts
@@ -1,8 +1,8 @@
-import SfpowerscriptsCommand from '../../SfpowerscriptsCommand';
+import SfpCommand from '../../SfpCommand';
import { LoggerLevel, Messages } from '@salesforce/core';
-import SFPStatsSender from '@dxatscale/sfpowerscripts.core/lib/stats/SFPStatsSender';
+import SFPStatsSender from '../../core/stats/SFPStatsSender';
import ReleaseImpl, { ReleaseProps, ReleaseResult } from '../../impl/release/ReleaseImpl';
-import ReleaseDefinition from '../../impl/release/ReleaseDefinition';
+import ReleaseDefinitionLoader from '../../impl/release/ReleaseDefinitionLoader';
import ReleaseError from '../../errors/ReleaseError';
import path = require('path');
import SFPLogger, {
@@ -13,15 +13,21 @@ import SFPLogger, {
COLOR_WARNING,
COLOR_KEY_MESSAGE,
ConsoleLogger,
-} from '@dxatscale/sfp-logger';
-import ReleaseDefinitionSchema from '../../impl/release/ReleaseDefinitionSchema';
-import { arrayFlagSfdxStyle, loglevel, logsgroupsymbol, optionalDevHubFlag, requiredUserNameFlag } from '../../flags/sfdxflags';
+} from '@flxblio/sfp-logger';
+import ReleaseDefinition from '../../impl/release/ReleaseDefinition';
+import {
+ arrayFlagSfdxStyle,
+ loglevel,
+ logsgroupsymbol,
+ optionalDevHubFlag,
+ requiredUserNameFlag,
+} from '../../flags/sfdxflags';
import { Flags } from '@oclif/core';
Messages.importMessagesDirectory(__dirname);
-const messages = Messages.loadMessages('@dxatscale/sfpowerscripts', 'release');
+const messages = Messages.loadMessages('@flxblio/sfp', 'release');
-export default class Release extends SfpowerscriptsCommand {
+export default class Release extends SfpCommand {
public static description = messages.getMessage('commandDescription');
public static examples = [
@@ -91,12 +97,16 @@ export default class Release extends SfpowerscriptsCommand {
allowunpromotedpackages: Flags.boolean({
description: messages.getMessage('allowUnpromotedPackagesFlagDescription'),
hidden: true,
- deprecated: {
+ deprecated: {
message: '--allowunpromotedpackages is deprecated, All packages are allowed',
- },
+ },
+ }),
+ changelogByDomains: Flags.boolean({
+ description: messages.getMessage('changelogByDomainsFlagDescription'),
+ hidden: true,
}),
devhubalias: optionalDevHubFlag,
- loglevel
+ loglevel,
};
public async execute() {
@@ -117,15 +127,14 @@ export default class Release extends SfpowerscriptsCommand {
SFPLogger.log(COLOR_HEADER(`Release Definitions: ${this.flags.releasedefinition}`));
SFPLogger.log(COLOR_HEADER(`Artifact Directory: ${path.resolve('artifacts')}`));
- SFPLogger.printHeaderLine('',COLOR_HEADER,LoggerLevel.INFO);
+ SFPLogger.printHeaderLine('', COLOR_HEADER, LoggerLevel.INFO);
- let releaseDefinitions: ReleaseDefinitionSchema[] = [];
+ let releaseDefinitions: ReleaseDefinition[] = [];
for (const pathToReleaseDefintion of this.flags.releasedefinition) {
- let releaseDefinition = (await ReleaseDefinition.loadReleaseDefinition(pathToReleaseDefintion)).releaseDefinition;
+ let releaseDefinition = await ReleaseDefinitionLoader.loadReleaseDefinition(pathToReleaseDefintion);
//Support Legacy by taking the existing single workItemFilter and pushing it to the new model
- if(releaseDefinition.changelog?.workItemFilter)
- {
+ if (releaseDefinition.changelog?.workItemFilter) {
releaseDefinition.changelog.workItemFilters = new Array();
releaseDefinition.changelog.workItemFilters.push(releaseDefinition.changelog?.workItemFilter);
}
@@ -160,21 +169,19 @@ export default class Release extends SfpowerscriptsCommand {
isGenerateChangelog: this.flags.generatechangelog,
devhubUserName: this.flags.devhubalias,
branch: this.flags.branchname,
- directory:this.flags.directory,
+ directory: this.flags.directory,
};
- let releaseImpl: ReleaseImpl = new ReleaseImpl(props,new ConsoleLogger());
+ let releaseImpl: ReleaseImpl = new ReleaseImpl(props, new ConsoleLogger());
releaseResult = await releaseImpl.exec();
- if(!this.flags.dryrun)
- SFPStatsSender.logCount('release.succeeded', tags);
+ if (!this.flags.dryrun) SFPStatsSender.logCount('release.succeeded', tags);
} catch (err) {
if (err instanceof ReleaseError) {
releaseResult = err.data;
} else SFPLogger.log(err.message);
- if(!this.flags.dryrun)
- SFPStatsSender.logCount('release.failed', tags);
+ if (!this.flags.dryrun) SFPStatsSender.logCount('release.failed', tags);
// Fail the task when an error occurs
process.exitCode = 1;
@@ -189,8 +196,7 @@ export default class Release extends SfpowerscriptsCommand {
}
private sendMetrics(releaseResult: ReleaseResult, tags: any, totalElapsedTime: number) {
- if(!this.flags.dryrun)
- {
+ if (!this.flags.dryrun) {
SFPStatsSender.logCount('release.scheduled', tags);
SFPStatsSender.logGauge('release.duration', totalElapsedTime, tags);
@@ -219,8 +225,8 @@ export default class Release extends SfpowerscriptsCommand {
private printReleaseSummary(releaseResult: ReleaseResult, totalElapsedTime: number): void {
if (this.flags.logsgroupsymbol?.[0])
SFPLogger.log(COLOR_HEADER(this.flags.logsgroupsymbol[0], 'Release Summary'));
-
- SFPLogger.printHeaderLine('',COLOR_HEADER,LoggerLevel.INFO);
+
+ SFPLogger.printHeaderLine('', COLOR_HEADER, LoggerLevel.INFO);
if (releaseResult.installDependenciesResult) {
SFPLogger.log(COLOR_HEADER(`\nPackage Dependencies`));
SFPLogger.log(COLOR_SUCCESS(` ${releaseResult.installDependenciesResult.success.length} succeeded`));
@@ -229,13 +235,25 @@ export default class Release extends SfpowerscriptsCommand {
}
for (const succeededDeployment of releaseResult.succeededDeployments) {
- SFPLogger.log(COLOR_HEADER(`\n Release Defintion: ${succeededDeployment.releaseDefinition.release}`));
+ SFPLogger.log(
+ COLOR_HEADER(
+ `\n Release Defintion: ${succeededDeployment.releaseDefinition.release} for Release Config: ${
+ succeededDeployment.releaseDefinition.releaseConfigName
+ ? succeededDeployment.releaseDefinition.releaseConfigName
+ : 'N/A'
+ }`
+ )
+ );
SFPLogger.log(COLOR_SUCCESS(` ${succeededDeployment.result.deployed.length} succeeded`));
SFPLogger.log(COLOR_ERROR(` ${succeededDeployment.result.failed.length} failed`));
}
for (const failedDeployment of releaseResult.failedDeployments) {
- SFPLogger.log(COLOR_HEADER(`\n Release Defintion: ${failedDeployment.releaseDefinition.release}`));
+ SFPLogger.log(COLOR_HEADER(`\n Release Defintion: ${failedDeployment.releaseDefinition.release} for for Release Config: ${
+ failedDeployment.releaseDefinition.releaseConfigName
+ ? failedDeployment.releaseDefinition.releaseConfigName
+ : 'N/A'
+ }`));
SFPLogger.log(COLOR_SUCCESS(` ${failedDeployment.result.deployed.length} succeeded`));
SFPLogger.log(
COLOR_ERROR(
@@ -245,12 +263,11 @@ export default class Release extends SfpowerscriptsCommand {
);
}
- SFPLogger.log(COLOR_TIME(`\nElapsed Time: ${new Date(totalElapsedTime).toISOString().substr(11, 8)}`));
- SFPLogger.printHeaderLine('',COLOR_HEADER,LoggerLevel.INFO);
+ SFPLogger.log(COLOR_TIME(`\nElapsed Time: ${new Date(totalElapsedTime).toISOString().substring(11,19)}`));
+ SFPLogger.printHeaderLine('', COLOR_HEADER, LoggerLevel.INFO);
}
protected validateFlags() {
if (this.flags.npm && !this.flags.scope) throw new Error('--scope parameter is required for NPM');
-
}
}
diff --git a/packages/sfpowerscripts-cli/src/commands/orchestrator/validate.ts b/packages/sfp-cli/src/commands/orchestrator/validate.ts
similarity index 95%
rename from packages/sfpowerscripts-cli/src/commands/orchestrator/validate.ts
rename to packages/sfp-cli/src/commands/orchestrator/validate.ts
index 70f4567f8..272abc423 100644
--- a/packages/sfpowerscripts-cli/src/commands/orchestrator/validate.ts
+++ b/packages/sfp-cli/src/commands/orchestrator/validate.ts
@@ -1,19 +1,19 @@
import { Messages } from '@salesforce/core';
-import SfpowerscriptsCommand from '../../SfpowerscriptsCommand';
+import SfpCommand from '../../SfpCommand';
import ValidateImpl, { ValidateAgainst, ValidateProps, ValidationMode } from '../../impl/validate/ValidateImpl';
-import SFPStatsSender from '@dxatscale/sfpowerscripts.core/lib/stats/SFPStatsSender';
-import SFPLogger, { COLOR_HEADER, COLOR_KEY_MESSAGE } from '@dxatscale/sfp-logger';
+import SFPStatsSender from '../../core/stats/SFPStatsSender';
+import SFPLogger, { COLOR_HEADER, COLOR_KEY_MESSAGE } from '@flxblio/sfp-logger';
import ValidateError from '../../errors/ValidateError';
import ValidateResult from '../../impl/validate/ValidateResult';
import * as fs from 'fs-extra';
import { arrayFlagSfdxStyle, loglevel, logsgroupsymbol, targetdevhubusername } from '../../flags/sfdxflags';
import { Flags } from '@oclif/core';
-import { LoggerLevel } from '@dxatscale/sfp-logger';
+import { LoggerLevel } from '@flxblio/sfp-logger';
Messages.importMessagesDirectory(__dirname);
-const messages = Messages.loadMessages('@dxatscale/sfpowerscripts', 'validate');
+const messages = Messages.loadMessages('@flxblio/sfp', 'validate');
-export default class Validate extends SfpowerscriptsCommand {
+export default class Validate extends SfpCommand {
protected static requiresProject = true;
public static description = messages.getMessage('commandDescription');
diff --git a/packages/sfpowerscripts-cli/src/commands/orchestrator/validateAgainstOrg.ts b/packages/sfp-cli/src/commands/orchestrator/validateAgainstOrg.ts
similarity index 94%
rename from packages/sfpowerscripts-cli/src/commands/orchestrator/validateAgainstOrg.ts
rename to packages/sfp-cli/src/commands/orchestrator/validateAgainstOrg.ts
index 1c5a9d6c1..88201ef37 100644
--- a/packages/sfpowerscripts-cli/src/commands/orchestrator/validateAgainstOrg.ts
+++ b/packages/sfp-cli/src/commands/orchestrator/validateAgainstOrg.ts
@@ -1,8 +1,8 @@
import { LoggerLevel, Messages, Org } from '@salesforce/core';
-import SfpowerscriptsCommand from '../../SfpowerscriptsCommand';
+import SfpCommand from '../../SfpCommand';
import ValidateImpl, { ValidateAgainst, ValidateProps, ValidationMode } from '../../impl/validate/ValidateImpl';
-import SFPStatsSender from '@dxatscale/sfpowerscripts.core/lib/stats/SFPStatsSender';
-import SFPLogger, { COLOR_HEADER, COLOR_KEY_MESSAGE } from '@dxatscale/sfp-logger';
+import SFPStatsSender from '../../core/stats/SFPStatsSender';
+import SFPLogger, { COLOR_HEADER, COLOR_KEY_MESSAGE } from '@flxblio/sfp-logger';
import * as fs from 'fs-extra';
import ValidateError from '../../errors/ValidateError';
import ValidateResult from '../../impl/validate/ValidateResult';
@@ -11,9 +11,9 @@ import { Flags } from '@oclif/core';
Messages.importMessagesDirectory(__dirname);
-const messages = Messages.loadMessages('@dxatscale/sfpowerscripts', 'validateAgainstOrg');
+const messages = Messages.loadMessages('@flxblio/sfp', 'validateAgainstOrg');
-export default class ValidateAgainstOrg extends SfpowerscriptsCommand {
+export default class ValidateAgainstOrg extends SfpCommand {
public static description = messages.getMessage('commandDescription');
public static examples = [`$ sfp orchestrator:validateAgainstOrg -u `];
diff --git a/packages/sfpowerscripts-cli/src/commands/package/data/create.ts b/packages/sfp-cli/src/commands/package/data/create.ts
similarity index 85%
rename from packages/sfpowerscripts-cli/src/commands/package/data/create.ts
rename to packages/sfp-cli/src/commands/package/data/create.ts
index aa4b5fbb3..4631d2c51 100644
--- a/packages/sfpowerscripts-cli/src/commands/package/data/create.ts
+++ b/packages/sfp-cli/src/commands/package/data/create.ts
@@ -1,14 +1,14 @@
import { Messages } from '@salesforce/core';
-import ProjectConfig from '@dxatscale/sfpowerscripts.core/lib/project/ProjectConfig';
-import { COLOR_SUCCESS, ConsoleLogger } from '@dxatscale/sfp-logger';
+import ProjectConfig from '../../../core/project/ProjectConfig'
+import { COLOR_SUCCESS, ConsoleLogger } from '@flxblio/sfp-logger';
import PackageCreateCommand from '../../../PackageCreateCommand';
-import SfpPackage, { PackageType } from '@dxatscale/sfpowerscripts.core/lib/package/SfpPackage';
-import SfpPackageBuilder from '@dxatscale/sfpowerscripts.core/lib/package/SfpPackageBuilder';
+import SfpPackage, { PackageType } from '../../../core/package/SfpPackage';
+import SfpPackageBuilder from '../../../core/package/SfpPackageBuilder';
import { Flags } from '@oclif/core';
import { loglevel } from '../../../flags/sfdxflags';
Messages.importMessagesDirectory(__dirname);
-const messages = Messages.loadMessages('@dxatscale/sfpowerscripts', 'create_data_package');
+const messages = Messages.loadMessages('@flxblio/sfp', 'create_data_package');
export default class CreateDataPackage extends PackageCreateCommand {
public static description = messages.getMessage('commandDescription');
diff --git a/packages/sfpowerscripts-cli/src/commands/package/data/install.ts b/packages/sfp-cli/src/commands/package/data/install.ts
similarity index 82%
rename from packages/sfpowerscripts-cli/src/commands/package/data/install.ts
rename to packages/sfp-cli/src/commands/package/data/install.ts
index 945d078d7..51827ebb6 100644
--- a/packages/sfpowerscripts-cli/src/commands/package/data/install.ts
+++ b/packages/sfp-cli/src/commands/package/data/install.ts
@@ -1,9 +1,9 @@
import { Messages } from '@salesforce/core';
import InstallPackageCommand from '../../../InstallPackageCommand';
-import { PackageInstallationStatus } from '@dxatscale/sfpowerscripts.core/lib/package/packageInstallers/PackageInstallationResult';
-import SFPLogger, { ConsoleLogger, LoggerLevel } from '@dxatscale/sfp-logger';
-import SfpPackageInstaller from '@dxatscale/sfpowerscripts.core/lib/package/SfpPackageInstaller';
-import { SfpPackageInstallationOptions } from '@dxatscale/sfpowerscripts.core/lib/package/packageInstallers/InstallPackage';
+import { PackageInstallationStatus } from '../../../core/package/packageInstallers/PackageInstallationResult';
+import SFPLogger, { ConsoleLogger, LoggerLevel } from '@flxblio/sfp-logger';
+import SfpPackageInstaller from '../../../core/package/SfpPackageInstaller';
+import { SfpPackageInstallationOptions } from '../../../core/package/packageInstallers/InstallPackage';
import { Flags } from '@oclif/core';
import { loglevel, requiredUserNameFlag } from '../../../flags/sfdxflags';
@@ -13,7 +13,7 @@ Messages.importMessagesDirectory(__dirname);
// Load the specific messages for this file. Messages from @salesforce/command, @salesforce/core,
// or any library that is using the messages framework can also be loaded this way.
-const messages = Messages.loadMessages('@dxatscale/sfpowerscripts', 'install_data_package');
+const messages = Messages.loadMessages('@flxblio/sfp', 'install_data_package');
export default class InstallDataPackage extends InstallPackageCommand {
public static description = messages.getMessage('commandDescription');
diff --git a/packages/sfpowerscripts-cli/src/commands/package/install.ts b/packages/sfp-cli/src/commands/package/install.ts
similarity index 88%
rename from packages/sfpowerscripts-cli/src/commands/package/install.ts
rename to packages/sfp-cli/src/commands/package/install.ts
index aa36e0717..7dd37751d 100644
--- a/packages/sfpowerscripts-cli/src/commands/package/install.ts
+++ b/packages/sfp-cli/src/commands/package/install.ts
@@ -1,16 +1,16 @@
import { Messages } from '@salesforce/core';
import InstallPackageCommand from '../../InstallPackageCommand';
-import { PackageInstallationStatus } from '@dxatscale/sfpowerscripts.core/lib/package/packageInstallers/PackageInstallationResult';
-import SFPLogger, { COLOR_HEADER, COLOR_KEY_MESSAGE, ConsoleLogger, LoggerLevel } from '@dxatscale/sfp-logger';
-import { SfpPackageInstallationOptions } from '@dxatscale/sfpowerscripts.core/lib/package/packageInstallers/InstallPackage';
-import SfpPackageInstaller from '@dxatscale/sfpowerscripts.core/lib/package/SfpPackageInstaller';
+import { PackageInstallationStatus } from '../../core/package/packageInstallers/PackageInstallationResult';
+import SFPLogger, { COLOR_HEADER, COLOR_KEY_MESSAGE, ConsoleLogger, LoggerLevel } from '@flxblio/sfp-logger';
+import { SfpPackageInstallationOptions } from '../../core/package/packageInstallers/InstallPackage';
+import SfpPackageInstaller from '../../core/package/SfpPackageInstaller';
import { Flags } from '@oclif/core';
import { loglevel, requiredUserNameFlag } from '../../flags/sfdxflags';
-import { PackageType } from '@dxatscale/sfpowerscripts.core/lib/package/SfpPackage';
+import { PackageType } from '../../core/package/SfpPackage';
Messages.importMessagesDirectory(__dirname);
-const messages = Messages.loadMessages('@dxatscale/sfpowerscripts', 'install_package');
+const messages = Messages.loadMessages('@flxblio/sfp', 'install_package');
export default class Install extends InstallPackageCommand {
public static description = messages.getMessage('commandDescription');
diff --git a/packages/sfpowerscripts-cli/src/commands/package/source/create.ts b/packages/sfp-cli/src/commands/package/source/create.ts
similarity index 87%
rename from packages/sfpowerscripts-cli/src/commands/package/source/create.ts
rename to packages/sfp-cli/src/commands/package/source/create.ts
index c36fb405f..0c2817fd6 100644
--- a/packages/sfpowerscripts-cli/src/commands/package/source/create.ts
+++ b/packages/sfp-cli/src/commands/package/source/create.ts
@@ -1,13 +1,13 @@
import { Messages } from '@salesforce/core';
-import { COLOR_SUCCESS, ConsoleLogger } from '@dxatscale/sfp-logger';
+import { COLOR_SUCCESS, ConsoleLogger } from '@flxblio/sfp-logger';
import PackageCreateCommand from '../../../PackageCreateCommand';
-import SfpPackage, { PackageType } from '@dxatscale/sfpowerscripts.core/lib/package/SfpPackage';
-import SfpPackageBuilder from '@dxatscale/sfpowerscripts.core/lib/package/SfpPackageBuilder';
+import SfpPackage, { PackageType } from '../../../core/package/SfpPackage';
+import SfpPackageBuilder from '../../../core/package/SfpPackageBuilder';
import { Flags } from '@oclif/core';
import { loglevel } from '../../../flags/sfdxflags';
Messages.importMessagesDirectory(__dirname);
-const messages = Messages.loadMessages('@dxatscale/sfpowerscripts', 'create_source_package');
+const messages = Messages.loadMessages('@flxblio/sfp', 'create_source_package');
export default class CreateSourcePackage extends PackageCreateCommand {
public static description = messages.getMessage('commandDescription');
diff --git a/packages/sfpowerscripts-cli/src/commands/package/source/install.ts b/packages/sfp-cli/src/commands/package/source/install.ts
similarity index 87%
rename from packages/sfpowerscripts-cli/src/commands/package/source/install.ts
rename to packages/sfp-cli/src/commands/package/source/install.ts
index f553bc66a..b8f4aeaa1 100644
--- a/packages/sfpowerscripts-cli/src/commands/package/source/install.ts
+++ b/packages/sfp-cli/src/commands/package/source/install.ts
@@ -1,11 +1,11 @@
import { Messages } from '@salesforce/core';
import InstallPackageCommand from '../../../InstallPackageCommand';
import * as fs from 'fs-extra';
-import { PackageInstallationStatus } from '@dxatscale/sfpowerscripts.core/lib/package/packageInstallers/PackageInstallationResult';
-import SFPLogger, { ConsoleLogger, LoggerLevel } from '@dxatscale/sfp-logger';
-import { DeploymentType } from '@dxatscale/sfpowerscripts.core/lib/deployers/DeploymentExecutor';
-import { SfpPackageInstallationOptions } from '@dxatscale/sfpowerscripts.core/lib/package/packageInstallers/InstallPackage';
-import SfpPackageInstaller from '@dxatscale/sfpowerscripts.core/lib/package/SfpPackageInstaller';
+import { PackageInstallationStatus } from '../../../core/package/packageInstallers/PackageInstallationResult';
+import SFPLogger, { ConsoleLogger, LoggerLevel } from '@flxblio/sfp-logger';
+import { DeploymentType } from '../../../core/deployers/DeploymentExecutor';
+import { SfpPackageInstallationOptions } from '../../../core/package/packageInstallers/InstallPackage';
+import SfpPackageInstaller from '../../../core/package/SfpPackageInstaller';
import { loglevel, requiredUserNameFlag } from '../../../flags/sfdxflags';
import { Flags } from '@oclif/core';
@@ -14,7 +14,7 @@ Messages.importMessagesDirectory(__dirname);
// Load the specific messages for this file. Messages from @salesforce/command, @salesforce/core,
// or any library that is using the messages framework can also be loaded this way.
-const messages = Messages.loadMessages('@dxatscale/sfpowerscripts', 'install_source_package');
+const messages = Messages.loadMessages('@flxblio/sfp', 'install_source_package');
export default class InstallSourcePackage extends InstallPackageCommand {
public static description = messages.getMessage('commandDescription');
@@ -74,7 +74,7 @@ export default class InstallSourcePackage extends InstallPackageCommand {
const wait_time: string = this.flags.waittime;
const skipIfAlreadyInstalled = this.flags.skipifalreadyinstalled;
- console.log('sfpowerscripts.Install Source Package To Org');
+ console.log('sfp.Install Source Package To Org');
try {
let options: SfpPackageInstallationOptions = {
diff --git a/packages/sfpowerscripts-cli/src/commands/package/unlocked/create.ts b/packages/sfp-cli/src/commands/package/unlocked/create.ts
similarity index 93%
rename from packages/sfpowerscripts-cli/src/commands/package/unlocked/create.ts
rename to packages/sfp-cli/src/commands/package/unlocked/create.ts
index fc233f270..81972d059 100644
--- a/packages/sfpowerscripts-cli/src/commands/package/unlocked/create.ts
+++ b/packages/sfp-cli/src/commands/package/unlocked/create.ts
@@ -1,8 +1,8 @@
import { Messages } from '@salesforce/core';
import PackageCreateCommand from '../../../PackageCreateCommand';
-import { COLOR_SUCCESS, ConsoleLogger } from '@dxatscale/sfp-logger';
-import SfpPackage from '@dxatscale/sfpowerscripts.core/lib/package/SfpPackage';
-import SfpPackageBuilder from '@dxatscale/sfpowerscripts.core/lib/package/SfpPackageBuilder';
+import { COLOR_SUCCESS, ConsoleLogger } from '@flxblio/sfp-logger';
+import SfpPackage from '../../../core/package/SfpPackage';
+import SfpPackageBuilder from '../../../core/package/SfpPackageBuilder';
import { loglevel, targetdevhubusername } from '../../../flags/sfdxflags';
import { Flags } from '@oclif/core';
@@ -11,7 +11,7 @@ Messages.importMessagesDirectory(__dirname);
// Load the specific messages for this file. Messages from @salesforce/command, @salesforce/core,
// or any library that is using the messages framework can also be loaded this way.
-const messages = Messages.loadMessages('@dxatscale/sfpowerscripts', 'create_unlocked_package');
+const messages = Messages.loadMessages('@flxblio/sfp', 'create_unlocked_package');
export default class CreateUnlockedPackage extends PackageCreateCommand {
public static description = messages.getMessage('commandDescription');
diff --git a/packages/sfpowerscripts-cli/src/commands/package/unlocked/install.ts b/packages/sfp-cli/src/commands/package/unlocked/install.ts
similarity index 89%
rename from packages/sfpowerscripts-cli/src/commands/package/unlocked/install.ts
rename to packages/sfp-cli/src/commands/package/unlocked/install.ts
index e41fdb666..001e06743 100644
--- a/packages/sfpowerscripts-cli/src/commands/package/unlocked/install.ts
+++ b/packages/sfp-cli/src/commands/package/unlocked/install.ts
@@ -1,9 +1,9 @@
import { Messages } from '@salesforce/core';
import InstallPackageCommand from '../../../InstallPackageCommand';
-import { PackageInstallationStatus } from '@dxatscale/sfpowerscripts.core/lib/package/packageInstallers/PackageInstallationResult';
-import SFPLogger, { ConsoleLogger, LoggerLevel } from '@dxatscale/sfp-logger';
-import { SfpPackageInstallationOptions } from '@dxatscale/sfpowerscripts.core/lib/package/packageInstallers/InstallPackage';
-import SfpPackageInstaller from '@dxatscale/sfpowerscripts.core/lib/package/SfpPackageInstaller';
+import { PackageInstallationStatus } from '../../../core/package/packageInstallers/PackageInstallationResult';
+import SFPLogger, { ConsoleLogger, LoggerLevel } from '@flxblio/sfp-logger';
+import { SfpPackageInstallationOptions } from '../../../core/package/packageInstallers/InstallPackage';
+import SfpPackageInstaller from '../../../core/package/SfpPackageInstaller';
import { Flags } from '@oclif/core';
import { loglevel, requiredUserNameFlag } from '../../../flags/sfdxflags';
@@ -13,7 +13,7 @@ Messages.importMessagesDirectory(__dirname);
// Load the specific messages for this file. Messages from @salesforce/command, @salesforce/core,
// or any library that is using the messages framework can also be loaded this way.
-const messages = Messages.loadMessages('@dxatscale/sfpowerscripts', 'install_unlocked_package');
+const messages = Messages.loadMessages('@flxblio/sfp', 'install_unlocked_package');
export default class InstallUnlockedPackage extends InstallPackageCommand {
public static description = messages.getMessage('commandDescription');
diff --git a/packages/sfpowerscripts-cli/src/commands/pool/delete.ts b/packages/sfp-cli/src/commands/pool/delete.ts
similarity index 84%
rename from packages/sfpowerscripts-cli/src/commands/pool/delete.ts
rename to packages/sfp-cli/src/commands/pool/delete.ts
index eb049636e..440744645 100644
--- a/packages/sfpowerscripts-cli/src/commands/pool/delete.ts
+++ b/packages/sfp-cli/src/commands/pool/delete.ts
@@ -1,12 +1,12 @@
import { Messages } from '@salesforce/core';
-import PoolDeleteImpl from '@dxatscale/sfpowerscripts.core/lib/scratchorg/pool/PoolDeleteImpl';
-import OrphanedOrgsDeleteImpl from '@dxatscale/sfpowerscripts.core/lib/scratchorg/pool/OrphanedOrgsDeleteImpl';
-import ScratchOrg from '@dxatscale/sfpowerscripts.core/lib/scratchorg/ScratchOrg';
-import SfpowerscriptsCommand from '../../SfpowerscriptsCommand';
+import PoolDeleteImpl from '../../core/scratchorg/pool/PoolDeleteImpl';
+import OrphanedOrgsDeleteImpl from '../../core/scratchorg/pool/OrphanedOrgsDeleteImpl';
+import ScratchOrg from '../../core/scratchorg/ScratchOrg';
+import SfpCommand from '../../SfpCommand';
import { ZERO_BORDER_TABLE } from '../../ui/TableConstants';
-import SFPLogger, { ConsoleLogger, LoggerLevel } from '@dxatscale/sfp-logger';
-import { COLOR_KEY_MESSAGE } from '@dxatscale/sfp-logger';
-import { COLOR_WARNING } from '@dxatscale/sfp-logger';
+import SFPLogger, { ConsoleLogger, LoggerLevel } from '@flxblio/sfp-logger';
+import { COLOR_KEY_MESSAGE } from '@flxblio/sfp-logger';
+import { COLOR_WARNING } from '@flxblio/sfp-logger';
import { Flags } from '@oclif/core';
import { loglevel, orgApiVersionFlagSfdxStyle, targetdevhubusername } from '../../flags/sfdxflags';
const Table = require('cli-table');
@@ -16,17 +16,17 @@ Messages.importMessagesDirectory(__dirname);
// Load the specific messages for this file. Messages from @salesforce/command, @salesforce/core,
// or any library that is using the messages framework can also be loaded this way.
-const messages = Messages.loadMessages('@dxatscale/sfpowerscripts', 'pool_delete');
+const messages = Messages.loadMessages('@flxblio/sfp', 'pool_delete');
-export default class Delete extends SfpowerscriptsCommand {
+export default class Delete extends SfpCommand {
public static description = messages.getMessage('commandDescription');
protected static requiresDevhubUsername = true;
public static examples = [
- `$ sfpowerscripts pool:delete -t core `,
- `$ sfpowerscripts pool:delete -t core -v devhub`,
- `$ sfpowerscripts pool:delete --orphans -v devhub`,
+ `$ sfp pool:delete -t core `,
+ `$ sfp pool:delete -t core -v devhub`,
+ `$ sfp pool:delete --orphans -v devhub`,
];
public static flags = {
diff --git a/packages/sfpowerscripts-cli/src/commands/pool/fetch.ts b/packages/sfp-cli/src/commands/pool/fetch.ts
similarity index 83%
rename from packages/sfpowerscripts-cli/src/commands/pool/fetch.ts
rename to packages/sfp-cli/src/commands/pool/fetch.ts
index c96fe9472..cfc522a1b 100644
--- a/packages/sfpowerscripts-cli/src/commands/pool/fetch.ts
+++ b/packages/sfp-cli/src/commands/pool/fetch.ts
@@ -1,18 +1,18 @@
import { Messages } from '@salesforce/core';
-import ScratchOrg from '@dxatscale/sfpowerscripts.core/lib/scratchorg/ScratchOrg';
+import ScratchOrg from '../../core/scratchorg/ScratchOrg';
import { AnyJson } from '@salesforce/ts-types';
-import PoolFetchImpl from '@dxatscale/sfpowerscripts.core/lib/scratchorg/pool/PoolFetchImpl';
+import PoolFetchImpl from '../../core/scratchorg/pool/PoolFetchImpl';
import * as fs from 'fs-extra';
-import SFPLogger, { LoggerLevel } from '@dxatscale/sfp-logger';
-import InstalledArtifactsDisplayer from '@dxatscale/sfpowerscripts.core/lib/display/InstalledArtifactsDisplayer';
-import InstalledPackageDisplayer from '@dxatscale/sfpowerscripts.core/lib/display/InstalledPackagesDisplayer';
-import { COLOR_KEY_MESSAGE } from '@dxatscale/sfp-logger';
-import SFPOrg from '@dxatscale/sfpowerscripts.core/lib/org/SFPOrg';
-import { COLOR_HEADER } from '@dxatscale/sfp-logger';
-import { COLOR_SUCCESS } from '@dxatscale/sfp-logger';
-import { COLOR_TIME } from '@dxatscale/sfp-logger';
-import getFormattedTime from '@dxatscale/sfpowerscripts.core/lib/utils/GetFormattedTime';
-import SfpowerscriptsCommand from '../../SfpowerscriptsCommand';
+import SFPLogger, { LoggerLevel } from '@flxblio/sfp-logger';
+import InstalledArtifactsDisplayer from '../../core/display/InstalledArtifactsDisplayer';
+import InstalledPackageDisplayer from '../../core/display/InstalledPackagesDisplayer';
+import { COLOR_KEY_MESSAGE } from '@flxblio/sfp-logger';
+import SFPOrg from '../../core/org/SFPOrg';
+import { COLOR_HEADER } from '@flxblio/sfp-logger';
+import { COLOR_SUCCESS } from '@flxblio/sfp-logger';
+import { COLOR_TIME } from '@flxblio/sfp-logger';
+import getFormattedTime from '../../core/utils/GetFormattedTime';
+import SfpCommand from '../../SfpCommand';
import { Flags, ux } from '@oclif/core';
import { loglevel, orgApiVersionFlagSfdxStyle, targetdevhubusername } from '../../flags/sfdxflags';
@@ -21,9 +21,9 @@ Messages.importMessagesDirectory(__dirname);
// Load the specific messages for this file. Messages from @salesforce/command, @salesforce/core,
// or any library that is using the messages framework can also be loaded this way.
-const messages = Messages.loadMessages('@dxatscale/sfpowerscripts', 'scratchorg_poolFetch');
+const messages = Messages.loadMessages('@flxblio/sfp', 'scratchorg_poolFetch');
-export default class Fetch extends SfpowerscriptsCommand {
+export default class Fetch extends SfpCommand {
public static description = messages.getMessage('commandDescription');
protected static requiresDevhubUsername = true;
diff --git a/packages/sfpowerscripts-cli/src/commands/pool/list.ts b/packages/sfp-cli/src/commands/pool/list.ts
similarity index 86%
rename from packages/sfpowerscripts-cli/src/commands/pool/list.ts
rename to packages/sfp-cli/src/commands/pool/list.ts
index 3d24d8c36..2e597f821 100644
--- a/packages/sfpowerscripts-cli/src/commands/pool/list.ts
+++ b/packages/sfp-cli/src/commands/pool/list.ts
@@ -1,10 +1,10 @@
import { AnyJson } from '@salesforce/ts-types';
-import poolListImpl from '@dxatscale/sfpowerscripts.core/lib/scratchorg/pool/PoolListImpl';
-import ScratchOrg from '@dxatscale/sfpowerscripts.core/lib/scratchorg/ScratchOrg';
-import SFPLogger, { LoggerLevel } from '@dxatscale/sfp-logger';
+import poolListImpl from '../../core/scratchorg/pool/PoolListImpl';
+import ScratchOrg from '../../core/scratchorg/ScratchOrg';
+import SFPLogger, { LoggerLevel } from '@flxblio/sfp-logger';
import { Messages } from '@salesforce/core';
-import SfpowerscriptsCommand from '../../SfpowerscriptsCommand';
+import SfpCommand from '../../SfpCommand';
import { Flags, ux } from '@oclif/core';
import { loglevel, orgApiVersionFlagSfdxStyle, targetdevhubusername } from '../../flags/sfdxflags';
@@ -13,19 +13,19 @@ Messages.importMessagesDirectory(__dirname);
// Load the specific messages for this file. Messages from @salesforce/command, @salesforce/core,
// or any library that is using the messages framework can also be loaded this way.
-const messages = Messages.loadMessages('@dxatscale/sfpowerscripts', 'scratchorg_poollist');
+const messages = Messages.loadMessages('@flxblio/sfp', 'scratchorg_poollist');
-export default class List extends SfpowerscriptsCommand {
+export default class List extends SfpCommand {
public static description = messages.getMessage('commandDescription');
protected static requiresDevhubUsername = true;
public static enableJsonFlag = true
public static examples = [
- `$ sfpowerscripts pool:list -t core `,
- `$ sfpowerscripts pool:list -t core -v devhub`,
- `$ sfpowerscripts pool:list -t core -v devhub -m`,
- `$ sfpowerscripts pool:list -t core -v devhub -m -a`,
+ `$ sfp pool:list -t core `,
+ `$ sfp pool:list -t core -v devhub`,
+ `$ sfp pool:list -t core -v devhub -m`,
+ `$ sfp pool:list -t core -v devhub -m -a`,
];
public static flags = {
diff --git a/packages/sfpowerscripts-cli/src/commands/pool/metrics/publish.ts b/packages/sfp-cli/src/commands/pool/metrics/publish.ts
similarity index 77%
rename from packages/sfpowerscripts-cli/src/commands/pool/metrics/publish.ts
rename to packages/sfp-cli/src/commands/pool/metrics/publish.ts
index 2466c76a7..56485c937 100644
--- a/packages/sfpowerscripts-cli/src/commands/pool/metrics/publish.ts
+++ b/packages/sfp-cli/src/commands/pool/metrics/publish.ts
@@ -1,10 +1,10 @@
-import SfpowerscriptsCommand from '../../../SfpowerscriptsCommand';
-import SFPStatsSender from '@dxatscale/sfpowerscripts.core/lib/stats/SFPStatsSender';
-import PoolListImpl from '@dxatscale/sfpowerscripts.core/lib/scratchorg/pool/PoolListImpl';
-import ScratchOrg from '@dxatscale/sfpowerscripts.core/lib/scratchorg/ScratchOrg';
-import LimitsFetcher from '@dxatscale/sfpowerscripts.core/lib/limits/LimitsFetcher';
+import SfpCommand from '../../../SfpCommand';
+import SFPStatsSender from '../../../core/stats/SFPStatsSender';
+import PoolListImpl from '../../../core/scratchorg/pool/PoolListImpl';
+import ScratchOrg from '../../../core/scratchorg/ScratchOrg';
+import LimitsFetcher from '../../../core/limits/LimitsFetcher';
const Table = require('cli-table');
-import SFPLogger, { LoggerLevel, COLOR_KEY_MESSAGE } from '@dxatscale/sfp-logger';
+import SFPLogger, { LoggerLevel, COLOR_KEY_MESSAGE } from '@flxblio/sfp-logger';
import { Messages } from '@salesforce/core';
import { loglevel, targetdevhubusername } from '../../../flags/sfdxflags';
@@ -13,9 +13,9 @@ Messages.importMessagesDirectory(__dirname);
// Load the specific messages for this file. Messages from @salesforce/command, @salesforce/core,
// or any library that is using the messages framework can also be loaded this way.
-const messages = Messages.loadMessages('@dxatscale/sfpowerscripts', 'scratchorg_pool_metrics_publish');
+const messages = Messages.loadMessages('@flxblio/sfp', 'scratchorg_pool_metrics_publish');
-export default class Publish extends SfpowerscriptsCommand {
+export default class Publish extends SfpCommand {
public static description = messages.getMessage('commandDescription');
protected static requiresDevhubUsername = true;
@@ -58,11 +58,11 @@ export default class Publish extends SfpowerscriptsCommand {
SFPStatsSender.logGauge(`scratchorgs.active.remaining`, remainingActiveScratchOrgs, {target_org: devhubUserName});
SFPStatsSender.logGauge(`scratchorgs.daily.remaining`, remainingDailyScratchOrgs, {target_org: devhubUserName});
- table.push(['sfpowerscripts.scratchorgs.active.remaining', remainingActiveScratchOrgs, devhubUserName]);
- table.push(['sfpowerscripts.scratchorgs.daily.remaining', remainingDailyScratchOrgs, devhubUserName]);
+ table.push(['sfp.scratchorgs.active.remaining', remainingActiveScratchOrgs, devhubUserName]);
+ table.push(['sfp.scratchorgs.daily.remaining', remainingDailyScratchOrgs, devhubUserName]);
SFPStatsSender.logGauge(`pool.footprint`, nPooledScratchOrgs);
- table.push(['sfpowerscripts.pool.footprint', nPooledScratchOrgs, '']);
+ table.push(['sfp.pool.footprint', nPooledScratchOrgs, '']);
if (pools) {
for (let pool of Object.entries(pools)) {
@@ -71,10 +71,10 @@ export default class Publish extends SfpowerscriptsCommand {
SFPStatsSender.logGauge('pool.inuse', pool[1].nInUse, { poolName: pool[0] });
SFPStatsSender.logGauge('pool.provisioning', pool[1].nProvisioningInProgress, { poolName: pool[0] });
- table.push(['sfpowerscripts.pool.total', pool[1].nTotal, pool[0]]);
- table.push(['sfpowerscripts.pool.available', pool[1].nAvailable, pool[0]]);
- table.push(['sfpowerscripts.pool.inuse', pool[1].nInUse, pool[0]]);
- table.push(['sfpowerscripts.pool.provisioning', pool[1].nProvisioningInProgress, pool[0]]);
+ table.push(['sfp.pool.total', pool[1].nTotal, pool[0]]);
+ table.push(['sfp.pool.available', pool[1].nAvailable, pool[0]]);
+ table.push(['sfp.pool.inuse', pool[1].nInUse, pool[0]]);
+ table.push(['sfp.pool.provisioning', pool[1].nProvisioningInProgress, pool[0]]);
}
}
diff --git a/packages/sfpowerscripts-cli/src/commands/pool/org/delete.ts b/packages/sfp-cli/src/commands/pool/org/delete.ts
similarity index 83%
rename from packages/sfpowerscripts-cli/src/commands/pool/org/delete.ts
rename to packages/sfp-cli/src/commands/pool/org/delete.ts
index 8b1c06573..2292e22cc 100644
--- a/packages/sfpowerscripts-cli/src/commands/pool/org/delete.ts
+++ b/packages/sfp-cli/src/commands/pool/org/delete.ts
@@ -1,7 +1,7 @@
import { AnyJson } from '@salesforce/ts-types';
-import SfpowerscriptsCommand from '../../../SfpowerscriptsCommand';
-import PoolOrgDeleteImpl from '@dxatscale/sfpowerscripts.core/lib/scratchorg/pool/PoolOrgDeleteImpl';
-import SFPLogger from '@dxatscale/sfp-logger';
+import SfpCommand from '../../../SfpCommand';
+import PoolOrgDeleteImpl from '../../../core/scratchorg/pool/PoolOrgDeleteImpl';
+import SFPLogger from '@flxblio/sfp-logger';
import { Messages } from '@salesforce/core';
import {
loglevel,
@@ -9,16 +9,17 @@ import {
targetdevhubusername,
requiredUserNameFlag,
} from '../../../flags/sfdxflags';
-import { AliasAccessor } from '@salesforce/core/lib/stateAggregator';
+import { AliasAccessor } from '@salesforce/core/lib/stateAggregator/accessors/aliasAccessor';
+
// Initialize Messages with the current plugin directory
Messages.importMessagesDirectory(__dirname);
// Load the specific messages for this file. Messages from @salesforce/command, @salesforce/core,
// or any library that is using the messages framework can also be loaded this way.
-const messages = Messages.loadMessages('@dxatscale/sfpowerscripts', 'scratchorg_pool_org_delete');
+const messages = Messages.loadMessages('@flxblio/sfp', 'scratchorg_pool_org_delete');
-export default class Delete extends SfpowerscriptsCommand {
+export default class Delete extends SfpCommand {
public static description = messages.getMessage('commandDescription');
protected static requiresDevhubUsername = true;
diff --git a/packages/sfpowerscripts-cli/src/commands/profile/merge.ts b/packages/sfp-cli/src/commands/profile/merge.ts
similarity index 90%
rename from packages/sfpowerscripts-cli/src/commands/profile/merge.ts
rename to packages/sfp-cli/src/commands/profile/merge.ts
index 01d93482d..5513ff2d0 100644
--- a/packages/sfpowerscripts-cli/src/commands/profile/merge.ts
+++ b/packages/sfp-cli/src/commands/profile/merge.ts
@@ -1,10 +1,10 @@
import { Messages, Org } from '@salesforce/core';
import { isNil } from 'lodash';
-import { Sfpowerkit } from '@dxatscale/sfprofiles/lib/utils/sfpowerkit';
-import SFPLogger, { LoggerLevel } from '@dxatscale/sfp-logger';
-import ProfileRetriever from '@dxatscale/sfprofiles/lib/impl/metadata/retriever/profileRetriever';
-import ProfileMerge from '@dxatscale/sfprofiles/lib/impl/source/profileMerge';
-import SfpowerscriptsCommand from '../../SfpowerscriptsCommand';
+import { Sfpowerkit } from '@flxblio/sfprofiles/lib/utils/sfpowerkit';
+import SFPLogger, { LoggerLevel } from '@flxblio/sfp-logger';
+import ProfileRetriever from '@flxblio/sfprofiles/lib/impl/metadata/retriever/profileRetriever';
+import ProfileMerge from '@flxblio/sfprofiles/lib/impl/source/profileMerge';
+import SfpCommand from '../../SfpCommand';
import Table from 'cli-table';
import { ZERO_BORDER_TABLE } from '../../ui/TableConstants';
import { arrayFlagSfdxStyle, loglevel, orgApiVersionFlagSfdxStyle, requiredUserNameFlag } from '../../flags/sfdxflags';
@@ -12,9 +12,9 @@ import { Flags } from '@oclif/core';
Messages.importMessagesDirectory(__dirname);
-const messages = Messages.loadMessages('@dxatscale/sfpowerscripts', 'profile_merge');
+const messages = Messages.loadMessages('@flxblio/sfp', 'profile_merge');
-export default class Merge extends SfpowerscriptsCommand {
+export default class Merge extends SfpCommand {
public static description = messages.getMessage('commandDescription');
public static examples = [
diff --git a/packages/sfpowerscripts-cli/src/commands/profile/reconcile.ts b/packages/sfp-cli/src/commands/profile/reconcile.ts
similarity index 86%
rename from packages/sfpowerscripts-cli/src/commands/profile/reconcile.ts
rename to packages/sfp-cli/src/commands/profile/reconcile.ts
index cb9e85402..58b2d24fd 100644
--- a/packages/sfpowerscripts-cli/src/commands/profile/reconcile.ts
+++ b/packages/sfp-cli/src/commands/profile/reconcile.ts
@@ -1,12 +1,12 @@
import { Messages, Org } from '@salesforce/core';
import * as _ from 'lodash';
-import { Sfpowerkit } from '@dxatscale/sfprofiles/lib/utils/sfpowerkit';
-import SFPLogger, { LoggerLevel } from '@dxatscale/sfp-logger';
-import { METADATA_INFO } from '@dxatscale/sfprofiles/lib/impl/metadata/metadataInfo';
+import { Sfpowerkit } from '@flxblio/sfprofiles/lib/utils/sfpowerkit';
+import SFPLogger, { LoggerLevel } from '@flxblio/sfp-logger';
+import { METADATA_INFO } from '@flxblio/sfprofiles/lib/impl/metadata/metadataInfo';
import * as path from 'path';
-import ProfileReconcile from '@dxatscale/sfprofiles/lib/impl/source/profileReconcile';
-import MetadataFiles from '@dxatscale/sfprofiles/lib/impl/metadata/metadataFiles';
-import SfpowerscriptsCommand from '../../SfpowerscriptsCommand';
+import ProfileReconcile from '@flxblio/sfprofiles/lib/impl/source/profileReconcile';
+import MetadataFiles from '@flxblio/sfprofiles/lib/impl/metadata/metadataFiles';
+import SfpCommand from '../../SfpCommand';
const Table = require('cli-table');
import { ZERO_BORDER_TABLE } from '../../ui/TableConstants';
import { Flags } from '@oclif/core';
@@ -15,9 +15,9 @@ import { arrayFlagSfdxStyle, loglevel, orgApiVersionFlagSfdxStyle, requiredUserN
Messages.importMessagesDirectory(__dirname);
-const messages = Messages.loadMessages('@dxatscale/sfpowerscripts', 'profile_reconcile');
+const messages = Messages.loadMessages('@flxblio/sfp', 'profile_reconcile');
-export default class Reconcile extends SfpowerscriptsCommand {
+export default class Reconcile extends SfpCommand {
public static description = messages.getMessage('commandDescription');
public static examples = [
diff --git a/packages/sfpowerscripts-cli/src/commands/profile/retrieve.ts b/packages/sfp-cli/src/commands/profile/retrieve.ts
similarity index 91%
rename from packages/sfpowerscripts-cli/src/commands/profile/retrieve.ts
rename to packages/sfp-cli/src/commands/profile/retrieve.ts
index 0f55d6be9..106a5914a 100644
--- a/packages/sfpowerscripts-cli/src/commands/profile/retrieve.ts
+++ b/packages/sfp-cli/src/commands/profile/retrieve.ts
@@ -1,20 +1,20 @@
import { Messages, Org } from '@salesforce/core';
import * as fs from 'fs-extra';
import { isNil } from 'lodash';
-import { Sfpowerkit } from '@dxatscale/sfprofiles/lib/utils/sfpowerkit';
-import ProfileSync from '@dxatscale/sfprofiles/lib/impl/source/profileSync';
-import SfpowerscriptsCommand from '../../SfpowerscriptsCommand';
+import { Sfpowerkit } from '@flxblio/sfprofiles/lib/utils/sfpowerkit';
+import ProfileSync from '@flxblio/sfprofiles/lib/impl/source/profileSync';
+import SfpCommand from '../../SfpCommand';
import Table from 'cli-table';
import { ZERO_BORDER_TABLE } from '../../ui/TableConstants';
import { arrayFlagSfdxStyle, loglevel, orgApiVersionFlagSfdxStyle, requiredUserNameFlag } from '../../flags/sfdxflags';
import { Flags } from '@oclif/core';
-import SFPLogger, { COLOR_KEY_MESSAGE, COLOR_WARNING, LoggerLevel } from '@dxatscale/sfp-logger';
+import SFPLogger, { COLOR_KEY_MESSAGE, COLOR_WARNING, LoggerLevel } from '@flxblio/sfp-logger';
Messages.importMessagesDirectory(__dirname);
-const messages = Messages.loadMessages('@dxatscale/sfpowerscripts', 'profile_retrieve');
+const messages = Messages.loadMessages('@flxblio/sfp', 'profile_retrieve');
-export default class Retrieve extends SfpowerscriptsCommand {
+export default class Retrieve extends SfpCommand {
public static description = messages.getMessage('commandDescription');
public static examples = [
diff --git a/packages/sfpowerscripts-cli/src/commands/releasedefinition/generate.ts b/packages/sfp-cli/src/commands/releasedefinition/generate.ts
similarity index 86%
rename from packages/sfpowerscripts-cli/src/commands/releasedefinition/generate.ts
rename to packages/sfp-cli/src/commands/releasedefinition/generate.ts
index ab8928011..5d67be13e 100644
--- a/packages/sfpowerscripts-cli/src/commands/releasedefinition/generate.ts
+++ b/packages/sfp-cli/src/commands/releasedefinition/generate.ts
@@ -1,14 +1,14 @@
-import { ConsoleLogger } from '@dxatscale/sfp-logger';
+import { ConsoleLogger } from '@flxblio/sfp-logger';
import { Messages } from '@salesforce/core';
import ReleaseDefinitionGenerator from '../../impl/release/ReleaseDefinitionGenerator';
-import SfpowerscriptsCommand from '../../SfpowerscriptsCommand';
+import SfpCommand from '../../SfpCommand';
import { Flags } from '@oclif/core';
import { loglevel } from '../../flags/sfdxflags';
Messages.importMessagesDirectory(__dirname);
-const messages = Messages.loadMessages('@dxatscale/sfpowerscripts', 'releasedefinition_generate');
+const messages = Messages.loadMessages('@flxblio/sfp', 'releasedefinition_generate');
-export default class Generate extends SfpowerscriptsCommand {
+export default class Generate extends SfpCommand {
public static description = messages.getMessage('commandDescription');
public static examples = [
@@ -50,6 +50,10 @@ export default class Generate extends SfpowerscriptsCommand {
description: messages.getMessage('forcePushFlagDescription'),
dependsOn: ['push'],
}),
+ metadata: Flags.string({
+ char: 'm',
+ description: messages.getMessage('metadataFlagDescription'),
+ }),
loglevel
};
@@ -61,6 +65,7 @@ export default class Generate extends SfpowerscriptsCommand {
this.flags.configfile,
this.flags.releasename,
this.flags.branchname,
+ this.flags.metadata,
this.flags.directory,
this.flags.nopush,
this.flags.forcepush
diff --git a/packages/sfpowerscripts-cli/src/commands/repo/patch.ts b/packages/sfp-cli/src/commands/repo/patch.ts
similarity index 89%
rename from packages/sfpowerscripts-cli/src/commands/repo/patch.ts
rename to packages/sfp-cli/src/commands/repo/patch.ts
index 4eea2d5b4..a440066a1 100644
--- a/packages/sfpowerscripts-cli/src/commands/repo/patch.ts
+++ b/packages/sfp-cli/src/commands/repo/patch.ts
@@ -1,29 +1,29 @@
import { Messages } from '@salesforce/core';
-import SfpowerscriptsCommand from '../../SfpowerscriptsCommand';
-import ReleaseDefinition from '../../impl/release/ReleaseDefinition';
-import ProjectConfig from '@dxatscale/sfpowerscripts.core/lib/project/ProjectConfig';
+import SfpCommand from '../../SfpCommand';
+import ReleaseDefinitionLoader from '../../impl/release/ReleaseDefinitionLoader';
+import ProjectConfig from '../../core/project/ProjectConfig';
import GroupConsoleLogs from '../../ui/GroupConsoleLogs';
import FetchImpl from '../../impl/artifacts/FetchImpl';
-import ReleaseDefinitionSchema from '../../impl/release/ReleaseDefinitionSchema';
+import ReleaseDefinition from '../../impl/release/ReleaseDefinition';
import path = require('path');
-import ArtifactFetcher, { Artifact } from '@dxatscale/sfpowerscripts.core/lib/artifacts/ArtifactFetcher';
-import SfpPackage, { PackageType } from '@dxatscale/sfpowerscripts.core/lib/package/SfpPackage';
-import SfpPackageBuilder from '@dxatscale/sfpowerscripts.core/lib/package/SfpPackageBuilder';
-import SFPLogger, { ConsoleLogger, Logger, LoggerLevel } from '@dxatscale/sfp-logger';
-import SfpPackageInquirer from '@dxatscale/sfpowerscripts.core/lib/package/SfpPackageInquirer';
-import Git from '@dxatscale/sfpowerscripts.core/lib/git/Git';
+import ArtifactFetcher, { Artifact } from '../../core/artifacts/ArtifactFetcher';
+import SfpPackage, { PackageType } from '../../core/package/SfpPackage';
+import SfpPackageBuilder from '../../core/package/SfpPackageBuilder';
+import SFPLogger, { ConsoleLogger, Logger, LoggerLevel } from '@flxblio/sfp-logger';
+import SfpPackageInquirer from '../../core/package/SfpPackageInquirer';
+import Git from '../../core/git/Git';
import * as fs from 'fs-extra';
-import { COLOR_KEY_MESSAGE } from '@dxatscale/sfp-logger';
+import { COLOR_KEY_MESSAGE } from '@flxblio/sfp-logger';
import { EOL } from 'os';
-import { COLOR_WARNING } from '@dxatscale/sfp-logger';
-import { COLOR_HEADER } from '@dxatscale/sfp-logger';
+import { COLOR_WARNING } from '@flxblio/sfp-logger';
+import { COLOR_HEADER } from '@flxblio/sfp-logger';
import { Flags } from '@oclif/core';
import { arrayFlagSfdxStyle, loglevel, logsgroupsymbol } from '../../flags/sfdxflags';
Messages.importMessagesDirectory(__dirname);
-const messages = Messages.loadMessages('@dxatscale/sfpowerscripts', 'patch');
+const messages = Messages.loadMessages('@flxblio/sfp', 'patch');
-export default class Patch extends SfpowerscriptsCommand {
+export default class Patch extends SfpCommand {
public static description = messages.getMessage('commandDescription');
public static examples = [`$ sfp repo:patch -n `];
@@ -127,7 +127,7 @@ export default class Patch extends SfpowerscriptsCommand {
private async fetchArtifacts(
- releaseDefintions: ReleaseDefinitionSchema[],
+ releaseDefintions: ReleaseDefinition[],
fetchArtifactScript: string,
scope: string,
npmrcPath: string,
@@ -140,17 +140,16 @@ export default class Patch extends SfpowerscriptsCommand {
groupSection.end();
}
- private async loadReleaseDefintions(releaseDefinitionPaths: []): Promise {
- let releaseDefinitions: ReleaseDefinitionSchema[] = [];
+ private async loadReleaseDefintions(releaseDefinitionPaths: []): Promise {
+ let releaseDefinitions: ReleaseDefinition[] = [];
for (const pathToReleaseDefintion of releaseDefinitionPaths) {
- let releaseDefinition = (await ReleaseDefinition.loadReleaseDefinition(pathToReleaseDefintion))
- .releaseDefinition;
+ let releaseDefinition = await ReleaseDefinitionLoader.loadReleaseDefinition(pathToReleaseDefintion);
releaseDefinitions.push(releaseDefinition);
}
return releaseDefinitions;
}
- private async overwriteModules(releaseDefinitions: ReleaseDefinitionSchema[], git: Git, logger: Logger) {
+ private async overwriteModules(releaseDefinitions: ReleaseDefinition[], git: Git, logger: Logger) {
let temporaryWorkingDirectory = git.getRepositoryPath();
let revisedProjectConfig = ProjectConfig.getSFDXProjectConfig(temporaryWorkingDirectory);
for (const releaseDefinition of releaseDefinitions) {
diff --git a/packages/core/src/apex/ApexClassFetcher.ts b/packages/sfp-cli/src/core/apex/ApexClassFetcher.ts
similarity index 100%
rename from packages/core/src/apex/ApexClassFetcher.ts
rename to packages/sfp-cli/src/core/apex/ApexClassFetcher.ts
diff --git a/packages/core/src/apex/ApexTriggerFetcher.ts b/packages/sfp-cli/src/core/apex/ApexTriggerFetcher.ts
similarity index 100%
rename from packages/core/src/apex/ApexTriggerFetcher.ts
rename to packages/sfp-cli/src/core/apex/ApexTriggerFetcher.ts
diff --git a/packages/core/src/apex/coverage/ApexCodeCoverageAggregateFetcher.ts b/packages/sfp-cli/src/core/apex/coverage/ApexCodeCoverageAggregateFetcher.ts
similarity index 100%
rename from packages/core/src/apex/coverage/ApexCodeCoverageAggregateFetcher.ts
rename to packages/sfp-cli/src/core/apex/coverage/ApexCodeCoverageAggregateFetcher.ts
diff --git a/packages/core/src/apex/coverage/IndividualClassCoverage.ts b/packages/sfp-cli/src/core/apex/coverage/IndividualClassCoverage.ts
similarity index 97%
rename from packages/core/src/apex/coverage/IndividualClassCoverage.ts
rename to packages/sfp-cli/src/core/apex/coverage/IndividualClassCoverage.ts
index 004299a6c..978361887 100644
--- a/packages/core/src/apex/coverage/IndividualClassCoverage.ts
+++ b/packages/sfp-cli/src/core/apex/coverage/IndividualClassCoverage.ts
@@ -1,4 +1,4 @@
-import SFPLogger, { Logger, LoggerLevel } from "@dxatscale/sfp-logger"
+import SFPLogger, { Logger, LoggerLevel } from "@flxblio/sfp-logger"
export default class IndividualClassCoverage {
public constructor(private codeCoverage: any, private logger: Logger) {}
diff --git a/packages/core/src/apex/parser/ApexTypeFetcher.ts b/packages/sfp-cli/src/core/apex/parser/ApexTypeFetcher.ts
similarity index 98%
rename from packages/core/src/apex/parser/ApexTypeFetcher.ts
rename to packages/sfp-cli/src/core/apex/parser/ApexTypeFetcher.ts
index 3dff890f1..a4d7eb57e 100644
--- a/packages/core/src/apex/parser/ApexTypeFetcher.ts
+++ b/packages/sfp-cli/src/core/apex/parser/ApexTypeFetcher.ts
@@ -13,7 +13,7 @@ import {
CommonTokenStream,
ParseTreeWalker,
} from 'apex-parser';
-import SFPLogger, { LoggerLevel } from '@dxatscale/sfp-logger';
+import SFPLogger, { LoggerLevel } from '@flxblio/sfp-logger';
import { ApexClasses } from '../../package/SfpPackage';
/**
diff --git a/packages/core/src/apex/parser/listeners/ApexTypeListener.ts b/packages/sfp-cli/src/core/apex/parser/listeners/ApexTypeListener.ts
similarity index 100%
rename from packages/core/src/apex/parser/listeners/ApexTypeListener.ts
rename to packages/sfp-cli/src/core/apex/parser/listeners/ApexTypeListener.ts
diff --git a/packages/core/src/apextest/ApexTestSuite.ts b/packages/sfp-cli/src/core/apextest/ApexTestSuite.ts
similarity index 100%
rename from packages/core/src/apextest/ApexTestSuite.ts
rename to packages/sfp-cli/src/core/apextest/ApexTestSuite.ts
diff --git a/packages/core/src/apextest/ClearCodeCoverage.ts b/packages/sfp-cli/src/core/apextest/ClearCodeCoverage.ts
similarity index 96%
rename from packages/core/src/apextest/ClearCodeCoverage.ts
rename to packages/sfp-cli/src/core/apextest/ClearCodeCoverage.ts
index 611f31670..bd6fb7712 100644
--- a/packages/core/src/apextest/ClearCodeCoverage.ts
+++ b/packages/sfp-cli/src/core/apextest/ClearCodeCoverage.ts
@@ -1,5 +1,5 @@
import { Connection, Org } from '@salesforce/core';
-import SFPLogger, { Logger, LoggerLevel } from '@dxatscale/sfp-logger';
+import SFPLogger, { Logger, LoggerLevel } from '@flxblio/sfp-logger';
import QueryHelper from '../queryHelper/QueryHelper';
import { chunkArray } from '../utils/ChunkArray';
const CODECOV_AGGREGATE_QUERY = `SELECT Id FROM ApexCodeCoverageAggregate`;
diff --git a/packages/core/src/apextest/ImpactedApexTestClassFetcher.ts b/packages/sfp-cli/src/core/apextest/ImpactedApexTestClassFetcher.ts
similarity index 97%
rename from packages/core/src/apextest/ImpactedApexTestClassFetcher.ts
rename to packages/sfp-cli/src/core/apextest/ImpactedApexTestClassFetcher.ts
index 1181a82b7..a271a79b7 100644
--- a/packages/core/src/apextest/ImpactedApexTestClassFetcher.ts
+++ b/packages/sfp-cli/src/core/apextest/ImpactedApexTestClassFetcher.ts
@@ -1,7 +1,7 @@
import * as _ from 'lodash';
-import ApexDepedencyCheckImpl from "@dxatscale/apexlink/lib/ApexDepedencyCheckImpl"
+import ApexDepedencyCheckImpl from "@flxblio/apexlink/lib/ApexDepedencyCheckImpl"
import Component from '../dependency/Component';
-import SFPLogger, { COLOR_KEY_MESSAGE, COLOR_WARNING, Logger, LoggerLevel } from '@dxatscale/sfp-logger';
+import SFPLogger, { COLOR_KEY_MESSAGE, COLOR_WARNING, Logger, LoggerLevel } from '@flxblio/sfp-logger';
import SfpPackage, { PackageType } from '../package/SfpPackage';
import path from 'path';
diff --git a/packages/core/src/apextest/JSONReporter.ts b/packages/sfp-cli/src/core/apextest/JSONReporter.ts
similarity index 100%
rename from packages/core/src/apextest/JSONReporter.ts
rename to packages/sfp-cli/src/core/apextest/JSONReporter.ts
diff --git a/packages/core/src/apextest/TestOptions.ts b/packages/sfp-cli/src/core/apextest/TestOptions.ts
similarity index 100%
rename from packages/core/src/apextest/TestOptions.ts
rename to packages/sfp-cli/src/core/apextest/TestOptions.ts
diff --git a/packages/core/src/apextest/TestReportDisplayer.ts b/packages/sfp-cli/src/core/apextest/TestReportDisplayer.ts
similarity index 99%
rename from packages/core/src/apextest/TestReportDisplayer.ts
rename to packages/sfp-cli/src/core/apextest/TestReportDisplayer.ts
index 598fd15f0..a66e55dc3 100644
--- a/packages/core/src/apextest/TestReportDisplayer.ts
+++ b/packages/sfp-cli/src/core/apextest/TestReportDisplayer.ts
@@ -1,5 +1,5 @@
import { RunAllTestsInPackageOptions, RunApexTestSuitesOption, TestOptions } from './TestOptions';
-import SFPLogger, { COLOR_ERROR, COLOR_SUCCESS, LoggerLevel } from '@dxatscale/sfp-logger';
+import SFPLogger, { COLOR_ERROR, COLOR_SUCCESS, LoggerLevel } from '@flxblio/sfp-logger';
import { ZERO_BORDER_TABLE } from '../display/TableConstants';
const Table = require('cli-table');
diff --git a/packages/core/src/apextest/TriggerApexTests.ts b/packages/sfp-cli/src/core/apextest/TriggerApexTests.ts
similarity index 99%
rename from packages/core/src/apextest/TriggerApexTests.ts
rename to packages/sfp-cli/src/core/apextest/TriggerApexTests.ts
index d521c7733..18c45aff5 100644
--- a/packages/core/src/apextest/TriggerApexTests.ts
+++ b/packages/sfp-cli/src/core/apextest/TriggerApexTests.ts
@@ -11,7 +11,7 @@ import {
import IndividualClassCoverage, { CoverageOptions } from '../apex/coverage/IndividualClassCoverage';
import { TestReportDisplayer } from './TestReportDisplayer';
import PackageTestCoverage from '../package/coverage/PackageTestCoverage';
-import SFPLogger, { COLOR_KEY_MESSAGE, Logger, LoggerLevel, COLOR_ERROR } from '@dxatscale/sfp-logger';
+import SFPLogger, { COLOR_KEY_MESSAGE, Logger, LoggerLevel, COLOR_ERROR } from '@flxblio/sfp-logger';
import SFPStatsSender from '../stats/SFPStatsSender';
import { Connection, Org } from '@salesforce/core';
import {
diff --git a/packages/core/src/artifacts/ArtifactFetcher.ts b/packages/sfp-cli/src/core/artifacts/ArtifactFetcher.ts
similarity index 99%
rename from packages/core/src/artifacts/ArtifactFetcher.ts
rename to packages/sfp-cli/src/core/artifacts/ArtifactFetcher.ts
index e56641278..292998355 100644
--- a/packages/core/src/artifacts/ArtifactFetcher.ts
+++ b/packages/sfp-cli/src/core/artifacts/ArtifactFetcher.ts
@@ -1,6 +1,6 @@
import path = require('path');
import * as fs from 'fs-extra';
-import SFPLogger, { Logger, LoggerLevel } from '@dxatscale/sfp-logger';
+import SFPLogger, { Logger, LoggerLevel } from '@flxblio/sfp-logger';
import { globSync } from 'glob';
import AdmZip = require('adm-zip');
import semver = require('semver');
diff --git a/packages/core/src/artifacts/generators/ArtifactGenerator.ts b/packages/sfp-cli/src/core/artifacts/generators/ArtifactGenerator.ts
similarity index 97%
rename from packages/core/src/artifacts/generators/ArtifactGenerator.ts
rename to packages/sfp-cli/src/core/artifacts/generators/ArtifactGenerator.ts
index 4e9be0f15..a50bfcfac 100644
--- a/packages/core/src/artifacts/generators/ArtifactGenerator.ts
+++ b/packages/sfp-cli/src/core/artifacts/generators/ArtifactGenerator.ts
@@ -3,7 +3,7 @@ import * as fs from 'fs-extra';
import GeneratePackageChangelog from '../../changelog/GeneratePackageChangelog';
import { Changelog } from '../../changelog/interfaces/GenericChangelogInterfaces';
import * as rimraf from 'rimraf';
-import SFPLogger, { LoggerLevel } from '@dxatscale/sfp-logger';
+import SFPLogger, { LoggerLevel } from '@flxblio/sfp-logger';
import AdmZip = require('adm-zip');
import SfpPackage from '../../package/SfpPackage';
@@ -33,8 +33,8 @@ export default class ArtifactGenerator {
fs.mkdirpSync(sourcePackage);
//Clean up temp directory
- if (fs.existsSync(path.join(sfpPackage.workingDirectory, '.sfpowerscripts')))
- rimraf.sync(path.join(sfpPackage.workingDirectory, '.sfpowerscripts'));
+ if (fs.existsSync(path.join(sfpPackage.workingDirectory, '.sfp')))
+ rimraf.sync(path.join(sfpPackage.workingDirectory, '.sfp'));
if (fs.existsSync(path.join(sfpPackage.workingDirectory, '.sfdx')))
rimraf.sync(path.join(sfpPackage.workingDirectory, '.sfdx'));
diff --git a/packages/core/src/changelog/GeneratePackageChangelog.ts b/packages/sfp-cli/src/core/changelog/GeneratePackageChangelog.ts
similarity index 97%
rename from packages/core/src/changelog/GeneratePackageChangelog.ts
rename to packages/sfp-cli/src/core/changelog/GeneratePackageChangelog.ts
index d8d77081c..d4c04424d 100644
--- a/packages/core/src/changelog/GeneratePackageChangelog.ts
+++ b/packages/sfp-cli/src/core/changelog/GeneratePackageChangelog.ts
@@ -1,7 +1,7 @@
import ProjectConfig from '../project/ProjectConfig';
import simplegit, { SimpleGit, LogOptions } from 'simple-git';
import { Changelog } from './interfaces/GenericChangelogInterfaces';
-import SFPLogger, { LoggerLevel } from '@dxatscale/sfp-logger';
+import SFPLogger, { LoggerLevel } from '@flxblio/sfp-logger';
/**
* A class for generating a changelog between two commits
diff --git a/packages/core/src/changelog/interfaces/GenericChangelogInterfaces.ts b/packages/sfp-cli/src/core/changelog/interfaces/GenericChangelogInterfaces.ts
similarity index 100%
rename from packages/core/src/changelog/interfaces/GenericChangelogInterfaces.ts
rename to packages/sfp-cli/src/core/changelog/interfaces/GenericChangelogInterfaces.ts
diff --git a/packages/core/src/dependency/ChangedComponentsFetcher.ts b/packages/sfp-cli/src/core/dependency/ChangedComponentsFetcher.ts
similarity index 98%
rename from packages/core/src/dependency/ChangedComponentsFetcher.ts
rename to packages/sfp-cli/src/core/dependency/ChangedComponentsFetcher.ts
index ee227524a..ebf654909 100644
--- a/packages/core/src/dependency/ChangedComponentsFetcher.ts
+++ b/packages/sfp-cli/src/core/dependency/ChangedComponentsFetcher.ts
@@ -5,7 +5,7 @@ import MetadataFiles from '../metadata/MetadataFiles';
import Component from './Component';
import * as fs from 'fs-extra';
import path = require('path');
-import SFPLogger, { LoggerLevel } from '@dxatscale/sfp-logger';
+import SFPLogger, { LoggerLevel } from '@flxblio/sfp-logger';
export default class ChangedComponentsFetcher {
constructor(private baseBranch: string) {}
diff --git a/packages/core/src/dependency/Component.ts b/packages/sfp-cli/src/core/dependency/Component.ts
similarity index 100%
rename from packages/core/src/dependency/Component.ts
rename to packages/sfp-cli/src/core/dependency/Component.ts
diff --git a/packages/core/src/dependency/DependencyViolation.ts b/packages/sfp-cli/src/core/dependency/DependencyViolation.ts
similarity index 100%
rename from packages/core/src/dependency/DependencyViolation.ts
rename to packages/sfp-cli/src/core/dependency/DependencyViolation.ts
diff --git a/packages/core/src/dependency/Entrypoint.ts b/packages/sfp-cli/src/core/dependency/Entrypoint.ts
similarity index 100%
rename from packages/core/src/dependency/Entrypoint.ts
rename to packages/sfp-cli/src/core/dependency/Entrypoint.ts
diff --git a/packages/core/src/deployers/DeploySourceToOrgImpl.ts b/packages/sfp-cli/src/core/deployers/DeploySourceToOrgImpl.ts
similarity index 99%
rename from packages/core/src/deployers/DeploySourceToOrgImpl.ts
rename to packages/sfp-cli/src/core/deployers/DeploySourceToOrgImpl.ts
index 69810d1f3..92c46f0ee 100644
--- a/packages/core/src/deployers/DeploySourceToOrgImpl.ts
+++ b/packages/sfp-cli/src/core/deployers/DeploySourceToOrgImpl.ts
@@ -5,7 +5,7 @@ import SFPLogger, {
COLOR_SUCCESS,
Logger,
LoggerLevel,
-} from '@dxatscale/sfp-logger';
+} from '@flxblio/sfp-logger';
import { Duration } from '@salesforce/kit';
import DeploymentExecutor, { DeploySourceResult } from './DeploymentExecutor';
diff --git a/packages/core/src/deployers/DeploymentExecutor.ts b/packages/sfp-cli/src/core/deployers/DeploymentExecutor.ts
similarity index 100%
rename from packages/core/src/deployers/DeploymentExecutor.ts
rename to packages/sfp-cli/src/core/deployers/DeploymentExecutor.ts
diff --git a/packages/core/src/deployers/DeploymentSettingsService.ts b/packages/sfp-cli/src/core/deployers/DeploymentSettingsService.ts
similarity index 98%
rename from packages/core/src/deployers/DeploymentSettingsService.ts
rename to packages/sfp-cli/src/core/deployers/DeploymentSettingsService.ts
index ac468f7ee..2f8c0b0f6 100644
--- a/packages/core/src/deployers/DeploymentSettingsService.ts
+++ b/packages/sfp-cli/src/core/deployers/DeploymentSettingsService.ts
@@ -1,4 +1,4 @@
-import SFPLogger, { COLOR_KEY_MESSAGE, Logger, LoggerLevel } from '@dxatscale/sfp-logger';
+import SFPLogger, { COLOR_KEY_MESSAGE, Logger, LoggerLevel } from '@flxblio/sfp-logger';
import { Connection } from '@salesforce/core';
import { IpRange, SecuritySettings } from 'jsforce/lib/api/metadata';
diff --git a/packages/core/src/display/DependencyViolationDisplayer.ts b/packages/sfp-cli/src/core/display/DependencyViolationDisplayer.ts
similarity index 95%
rename from packages/core/src/display/DependencyViolationDisplayer.ts
rename to packages/sfp-cli/src/core/display/DependencyViolationDisplayer.ts
index c0e12ed1b..09c6e54ca 100644
--- a/packages/core/src/display/DependencyViolationDisplayer.ts
+++ b/packages/sfp-cli/src/core/display/DependencyViolationDisplayer.ts
@@ -1,6 +1,6 @@
const Table = require('cli-table');
import DependencyViolation from '../dependency/DependencyViolation';
-import SFPLogger from '@dxatscale/sfp-logger';
+import SFPLogger from '@flxblio/sfp-logger';
import { ZERO_BORDER_TABLE } from './TableConstants';
export default class DependencyViolationDisplayer {
diff --git a/packages/core/src/display/DeployErrorDisplayer.ts b/packages/sfp-cli/src/core/display/DeployErrorDisplayer.ts
similarity index 98%
rename from packages/core/src/display/DeployErrorDisplayer.ts
rename to packages/sfp-cli/src/core/display/DeployErrorDisplayer.ts
index e6c0b6480..8a0ea62d3 100644
--- a/packages/core/src/display/DeployErrorDisplayer.ts
+++ b/packages/sfp-cli/src/core/display/DeployErrorDisplayer.ts
@@ -1,6 +1,6 @@
const Table = require('cli-table');
import { CodeCoverageWarnings, DeployMessage, Failures, MetadataApiDeployStatus } from '@salesforce/source-deploy-retrieve';
-import SFPLogger, { Logger, LoggerLevel } from '@dxatscale/sfp-logger';
+import SFPLogger, { Logger, LoggerLevel } from '@flxblio/sfp-logger';
import { ZERO_BORDER_TABLE } from './TableConstants';
export default class DeployErrorDisplayer {
diff --git a/packages/core/src/display/DeploymentOptionDisplayer.ts b/packages/sfp-cli/src/core/display/DeploymentOptionDisplayer.ts
similarity index 98%
rename from packages/core/src/display/DeploymentOptionDisplayer.ts
rename to packages/sfp-cli/src/core/display/DeploymentOptionDisplayer.ts
index 0aabca641..e484e0724 100644
--- a/packages/core/src/display/DeploymentOptionDisplayer.ts
+++ b/packages/sfp-cli/src/core/display/DeploymentOptionDisplayer.ts
@@ -1,4 +1,4 @@
-import SFPLogger, { COLOR_HEADER, COLOR_KEY_MESSAGE, Logger, LoggerLevel } from '@dxatscale/sfp-logger';
+import SFPLogger, { COLOR_HEADER, COLOR_KEY_MESSAGE, Logger, LoggerLevel } from '@flxblio/sfp-logger';
import { TestLevel } from '../apextest/TestOptions';
import { DeploymentOptions } from '../deployers/DeploySourceToOrgImpl';
diff --git a/packages/core/src/display/ExternalDependencyDisplayer.ts b/packages/sfp-cli/src/core/display/ExternalDependencyDisplayer.ts
similarity index 98%
rename from packages/core/src/display/ExternalDependencyDisplayer.ts
rename to packages/sfp-cli/src/core/display/ExternalDependencyDisplayer.ts
index 8dd63b12b..3227b8695 100644
--- a/packages/core/src/display/ExternalDependencyDisplayer.ts
+++ b/packages/sfp-cli/src/core/display/ExternalDependencyDisplayer.ts
@@ -1,4 +1,4 @@
-import SFPLogger, { COLOR_KEY_MESSAGE, Logger, LoggerLevel } from '@dxatscale/sfp-logger';
+import SFPLogger, { COLOR_KEY_MESSAGE, Logger, LoggerLevel } from '@flxblio/sfp-logger';
import { EOL } from 'os';
import Package2Detail from '../package/Package2Detail';
import { ZERO_BORDER_TABLE } from './TableConstants';
diff --git a/packages/core/src/display/InstalledArtifactsDisplayer.ts b/packages/sfp-cli/src/core/display/InstalledArtifactsDisplayer.ts
similarity index 96%
rename from packages/core/src/display/InstalledArtifactsDisplayer.ts
rename to packages/sfp-cli/src/core/display/InstalledArtifactsDisplayer.ts
index 9d1c905fa..d0ef5f96f 100644
--- a/packages/core/src/display/InstalledArtifactsDisplayer.ts
+++ b/packages/sfp-cli/src/core/display/InstalledArtifactsDisplayer.ts
@@ -1,5 +1,5 @@
const Table = require('cli-table');
-import SFPLogger, { Logger, LoggerLevel, COLOR_KEY_MESSAGE } from '@dxatscale/sfp-logger';
+import SFPLogger, { Logger, LoggerLevel, COLOR_KEY_MESSAGE } from '@flxblio/sfp-logger';
import { ZERO_BORDER_TABLE } from './TableConstants';
export default class InstalledArtifactsDisplayer {
diff --git a/packages/core/src/display/InstalledPackagesDisplayer.ts b/packages/sfp-cli/src/core/display/InstalledPackagesDisplayer.ts
similarity index 96%
rename from packages/core/src/display/InstalledPackagesDisplayer.ts
rename to packages/sfp-cli/src/core/display/InstalledPackagesDisplayer.ts
index 456bb9d47..32460d356 100644
--- a/packages/core/src/display/InstalledPackagesDisplayer.ts
+++ b/packages/sfp-cli/src/core/display/InstalledPackagesDisplayer.ts
@@ -1,5 +1,5 @@
const Table = require('cli-table');
-import SFPLogger, { Logger, LoggerLevel, COLOR_KEY_MESSAGE } from '@dxatscale/sfp-logger';
+import SFPLogger, { Logger, LoggerLevel, COLOR_KEY_MESSAGE } from '@flxblio/sfp-logger';
import Package2Detail from '../package/Package2Detail';
import { ZERO_BORDER_TABLE } from './TableConstants';
diff --git a/packages/core/src/display/PackageComponentPrinter.ts b/packages/sfp-cli/src/core/display/PackageComponentPrinter.ts
similarity index 93%
rename from packages/core/src/display/PackageComponentPrinter.ts
rename to packages/sfp-cli/src/core/display/PackageComponentPrinter.ts
index 7956658df..ca2806cc4 100644
--- a/packages/core/src/display/PackageComponentPrinter.ts
+++ b/packages/sfp-cli/src/core/display/PackageComponentPrinter.ts
@@ -1,6 +1,6 @@
const Table = require('cli-table');
import { LazyCollection, SourceComponent } from '@salesforce/source-deploy-retrieve';
-import SFPLogger, { Logger, LoggerLevel } from '@dxatscale/sfp-logger';
+import SFPLogger, { Logger, LoggerLevel } from '@flxblio/sfp-logger';
import { ZERO_BORDER_TABLE } from './TableConstants';
export default class PackageComponentPrinter {
diff --git a/packages/core/src/display/PackageDependencyDisplayer.ts b/packages/sfp-cli/src/core/display/PackageDependencyDisplayer.ts
similarity index 94%
rename from packages/core/src/display/PackageDependencyDisplayer.ts
rename to packages/sfp-cli/src/core/display/PackageDependencyDisplayer.ts
index ecd64d6b4..e2540aeb9 100644
--- a/packages/core/src/display/PackageDependencyDisplayer.ts
+++ b/packages/sfp-cli/src/core/display/PackageDependencyDisplayer.ts
@@ -1,4 +1,4 @@
-import SFPLogger, { Logger, LoggerLevel } from '@dxatscale/sfp-logger';
+import SFPLogger, { Logger, LoggerLevel } from '@flxblio/sfp-logger';
import { ZERO_BORDER_TABLE } from './TableConstants';
const Table = require('cli-table');
diff --git a/packages/core/src/display/PackageMetadataPrinter.ts b/packages/sfp-cli/src/core/display/PackageMetadataPrinter.ts
similarity index 94%
rename from packages/core/src/display/PackageMetadataPrinter.ts
rename to packages/sfp-cli/src/core/display/PackageMetadataPrinter.ts
index 9d7f2b574..7703c9cc2 100644
--- a/packages/core/src/display/PackageMetadataPrinter.ts
+++ b/packages/sfp-cli/src/core/display/PackageMetadataPrinter.ts
@@ -1,5 +1,5 @@
const Table = require('cli-table');
-import SFPLogger, { Logger, LoggerLevel } from '@dxatscale/sfp-logger';
+import SFPLogger, { Logger, LoggerLevel } from '@flxblio/sfp-logger';
import { ZERO_BORDER_TABLE } from './TableConstants';
export default class PackageMetadataPrinter {
diff --git a/packages/core/src/display/PushErrorDisplayer.ts b/packages/sfp-cli/src/core/display/PushErrorDisplayer.ts
similarity index 97%
rename from packages/core/src/display/PushErrorDisplayer.ts
rename to packages/sfp-cli/src/core/display/PushErrorDisplayer.ts
index a99bc5f8a..3cfc6cf16 100644
--- a/packages/core/src/display/PushErrorDisplayer.ts
+++ b/packages/sfp-cli/src/core/display/PushErrorDisplayer.ts
@@ -1,5 +1,5 @@
const Table = require('cli-table');
-import SFPLogger, { Logger, LoggerLevel } from '@dxatscale/sfp-logger';
+import SFPLogger, { Logger, LoggerLevel } from '@flxblio/sfp-logger';
import { ZERO_BORDER_TABLE } from './TableConstants';
export default class PushErrorDisplayer {
diff --git a/packages/core/src/display/TableConstants.ts b/packages/sfp-cli/src/core/display/TableConstants.ts
similarity index 100%
rename from packages/core/src/display/TableConstants.ts
rename to packages/sfp-cli/src/core/display/TableConstants.ts
diff --git a/packages/sfp-cli/src/core/flows/FlowOperations.ts b/packages/sfp-cli/src/core/flows/FlowOperations.ts
new file mode 100644
index 000000000..9bb9e1357
--- /dev/null
+++ b/packages/sfp-cli/src/core/flows/FlowOperations.ts
@@ -0,0 +1,118 @@
+import { Query, SaveResult } from 'jsforce';
+import SFPOrg from '../org/SFPOrg';
+import SFPLogger, { Logger, LoggerLevel } from '@flxblio/sfp-logger';
+import QueryHelper from '../queryHelper/QueryHelper';
+const retry = require('async-retry');
+
+export async function getFlowDefinition(opts: FlowOptions, org: SFPOrg, logger?: Logger): Promise {
+ const { developername, namespaceprefix } = opts;
+ const conn = org.getConnection();
+
+ let flowDefinitionQuery = `Select Id, ActiveVersionId, DeveloperName, NamespacePrefix, LatestVersionId, LatestVersion.VersionNumber from FlowDefinition where DeveloperName = '${developername}'`;
+
+ if (namespaceprefix) {
+ flowDefinitionQuery += ` AND NamespacePrefix = '${namespaceprefix}'`;
+ }
+ // Query the org
+ const records = await QueryHelper.query(flowDefinitionQuery, conn, true);
+
+ if (!records || records.length <= 0) {
+ throw new Error(`Could not find a definition for flow ${[developername]} in the org.`);
+ }
+
+ return records[0] as FlowDefinition;
+}
+
+export async function getFlowsByDefinition(
+ flowdefinition: FlowDefinition,
+ org: SFPOrg,
+ logger: Logger
+): Promise {
+ const conn = org.getConnection();
+ let flowQuery = `Select Id, VersionNumber, MasterLabel from Flow where DefinitionId = '${flowdefinition.Id}'`;
+ if (flowdefinition.NamespacePrefix) {
+ flowQuery += ` AND Definition.NamespacePrefix = '${flowdefinition.NamespacePrefix}'`;
+ }
+ // Query the org
+
+ const records = await QueryHelper.query(flowQuery, conn, true);
+
+ if (!records || records.length <= 0) {
+ throw new Error(`Could not find a definition for flow ${[[flowdefinition.DeveloperName]]} in the org.`);
+ }
+ return records as Flow[];
+}
+
+export async function deleteFlows(flows: Flow[], org: SFPOrg, logger: Logger): Promise {
+ const flowIds = flows.map((flow) => flow.Id);
+ const conn = org.getConnection();
+ const succeededFlows = [];
+ for (let id of flowIds) {
+ await retry(
+ async (bail) => {
+ const results = await conn.tooling.sobject('Flow').del(id);
+ if (results.success) {
+ SFPLogger.log('Deleted flow version with id: ' + id, LoggerLevel.INFO);
+ succeededFlows.push(id);
+ } else {
+ throw new Error(`Unable to delete flow version with id: ${id},retrying in 5 seconds...`)
+ }
+ },
+ { retries: 3, minTimeout: 5000 }
+ );
+ }
+ return succeededFlows;
+}
+
+export async function deactivate(flow: FlowDefinition, org: SFPOrg): Promise {
+ const conn = org.getConnection();
+ const flowResult = await conn.tooling.sobject('FlowDefinition').update({
+ Id: flow.Id,
+ Metadata: {
+ activeVersionNumber: '',
+ },
+ });
+
+ if (!flowResult || !flowResult.success) {
+ throw new Error(`Unable to deactivate flow ${[flow.DeveloperName]}.`);
+ }
+ return flowResult;
+}
+
+export async function activate(flow: FlowDefinition, org: SFPOrg): Promise {
+ const conn = org.getConnection();
+ const flowResult = await conn.tooling.sobject('FlowDefinition').update({
+ Id: flow.Id,
+ Metadata: {
+ activeVersionNumber: flow.LatestVersion.VersionNumber,
+ },
+ });
+
+ if (!flowResult || !flowResult.success) {
+ throw new Error(`Unable to activate flow ${[flow.DeveloperName]}.`);
+ }
+ return flowResult;
+}
+
+export interface Flow {
+ Id: string;
+ VersionNumber: number;
+ FullName: string;
+ MasterLabel: string;
+ RecordCount: number;
+}
+
+export interface FlowDefinition {
+ Id: string;
+ ActiveVersion: Flow;
+ ActiveVersionId: string;
+ DeveloperName: string;
+ LatestVersion: Flow;
+ LatestVersionId: string;
+ NamespacePrefix?: string;
+}
+
+export interface FlowOptions {
+ developername: string;
+ namespaceprefix: string;
+}
diff --git a/packages/core/src/git/Git.ts b/packages/sfp-cli/src/core/git/Git.ts
similarity index 97%
rename from packages/core/src/git/Git.ts
rename to packages/sfp-cli/src/core/git/Git.ts
index 9d2e60e71..b40fea1ce 100644
--- a/packages/core/src/git/Git.ts
+++ b/packages/sfp-cli/src/core/git/Git.ts
@@ -1,4 +1,4 @@
-import SFPLogger, { Logger, LoggerLevel } from '@dxatscale/sfp-logger';
+import SFPLogger, { Logger, LoggerLevel } from '@flxblio/sfp-logger';
import simplegit, { SimpleGit } from 'simple-git';
import fs = require('fs-extra');
import GitIdentity from './GitIdentity';
@@ -72,7 +72,7 @@ export default class Git {
return remoteOriginURL;
}
- public async commitFile(pathToFiles: string[], message = `[skip ci] Autogenerated commit by sfpowerscripts`) {
+ public async commitFile(pathToFiles: string[], message = `[skip ci] Autogenerated commit by sfp`) {
try {
await new GitIdentity(this._git).setUsernameAndEmail();
await this._git.add(pathToFiles);
@@ -166,6 +166,10 @@ export default class Git {
return git;
}
+ public raw(commands: string[]) {
+ return this._git.raw(commands);
+ }
+
public getRepositoryPath() {
return this.repositoryLocation;
}
diff --git a/packages/core/src/git/GitDiffUtil.ts b/packages/sfp-cli/src/core/git/GitDiffUtil.ts
similarity index 99%
rename from packages/core/src/git/GitDiffUtil.ts
rename to packages/sfp-cli/src/core/git/GitDiffUtil.ts
index a153d2035..ce904bf9b 100644
--- a/packages/core/src/git/GitDiffUtil.ts
+++ b/packages/sfp-cli/src/core/git/GitDiffUtil.ts
@@ -4,7 +4,7 @@ import * as _ from 'lodash';
import { LoggerLevel } from '@salesforce/core';
import simplegit, { SimpleGit } from 'simple-git';
-import SFPLogger, { Logger } from '@dxatscale/sfp-logger';
+import SFPLogger, { Logger } from '@flxblio/sfp-logger';
const SEP = /\/|\\/;
export interface DiffFileStatus {
diff --git a/packages/core/src/git/GitIdentity.ts b/packages/sfp-cli/src/core/git/GitIdentity.ts
similarity index 89%
rename from packages/core/src/git/GitIdentity.ts
rename to packages/sfp-cli/src/core/git/GitIdentity.ts
index 101fff86f..16c1a6d1c 100644
--- a/packages/core/src/git/GitIdentity.ts
+++ b/packages/sfp-cli/src/core/git/GitIdentity.ts
@@ -14,7 +14,7 @@ export default class GitIdentity {
if (process.env.SFPOWERSCRIPTS_GIT_USERNAME) {
username = process.env.SFPOWERSCRIPTS_GIT_USERNAME;
} else {
- username = 'sfpowerscripts';
+ username = 'sfp';
}
await this.git.addConfig('user.name', username);
@@ -26,7 +26,7 @@ export default class GitIdentity {
if (process.env.SFPOWERSCRIPTS_GIT_EMAIL) {
email = process.env.SFPOWERSCRIPTS_GIT_EMAIL;
} else {
- email = 'sfpowerscripts@dxatscale.io';
+ email = 'sfp@flxblio.io';
}
await this.git.addConfig('user.email', email);
diff --git a/packages/core/src/git/GitTags.ts b/packages/sfp-cli/src/core/git/GitTags.ts
similarity index 94%
rename from packages/core/src/git/GitTags.ts
rename to packages/sfp-cli/src/core/git/GitTags.ts
index 846585451..845806c6d 100644
--- a/packages/core/src/git/GitTags.ts
+++ b/packages/sfp-cli/src/core/git/GitTags.ts
@@ -45,12 +45,13 @@ export default class GitTags {
let refTagsPointingToBranch: string[] = refTags.filter((refTag) => commits.includes(refTag.substring(0, 40)));
// Only match the name of the tags pointing to the branch
- refTagsPointingToBranch = refTagsPointingToBranch.map(
- (refTagPointingToBranch) => refTagPointingToBranch.match(/(?:refs\/tags\/)(.*)((?:-ALIGN)|(?:\^{}))/)[1]
- );
+ refTagsPointingToBranch = refTagsPointingToBranch.map((refTagPointingToBranch) => {
+ const match = refTagPointingToBranch.match(/(?:refs\/tags\/)(.*)((?:-ALIGN)|(?:\^{}))/);
+ return match ? match[1] : null;
+ });
// Filter the sorted tags - only including tags that point to the branch
- let tagsPointingToBranch: string[] = tags.filter((tag) => refTagsPointingToBranch.includes(tag));
+ let tagsPointingToBranch: string[] = tags.filter((tag) => refTagsPointingToBranch?.includes(tag));
return tagsPointingToBranch;
}
diff --git a/packages/core/src/ignore/IgnoreFiles.ts b/packages/sfp-cli/src/core/ignore/IgnoreFiles.ts
similarity index 100%
rename from packages/core/src/ignore/IgnoreFiles.ts
rename to packages/sfp-cli/src/core/ignore/IgnoreFiles.ts
diff --git a/packages/core/src/limits/LimitsFetcher.ts b/packages/sfp-cli/src/core/limits/LimitsFetcher.ts
similarity index 100%
rename from packages/core/src/limits/LimitsFetcher.ts
rename to packages/sfp-cli/src/core/limits/LimitsFetcher.ts
diff --git a/packages/core/src/metadata/CustomFieldFetcher.ts b/packages/sfp-cli/src/core/metadata/CustomFieldFetcher.ts
similarity index 96%
rename from packages/core/src/metadata/CustomFieldFetcher.ts
rename to packages/sfp-cli/src/core/metadata/CustomFieldFetcher.ts
index b6905fced..063dbbbd3 100644
--- a/packages/core/src/metadata/CustomFieldFetcher.ts
+++ b/packages/sfp-cli/src/core/metadata/CustomFieldFetcher.ts
@@ -1,4 +1,4 @@
-import SFPLogger, { Logger, LoggerLevel } from '@dxatscale/sfp-logger';
+import SFPLogger, { Logger, LoggerLevel } from '@flxblio/sfp-logger';
import SFPOrg from '../org/SFPOrg';
const fs = require('fs-extra');
import { XMLParser } from 'fast-xml-parser';
diff --git a/packages/core/src/metadata/MetadataFetcher.ts b/packages/sfp-cli/src/core/metadata/MetadataFetcher.ts
similarity index 97%
rename from packages/core/src/metadata/MetadataFetcher.ts
rename to packages/sfp-cli/src/core/metadata/MetadataFetcher.ts
index db652353f..b8af4a5ba 100644
--- a/packages/core/src/metadata/MetadataFetcher.ts
+++ b/packages/sfp-cli/src/core/metadata/MetadataFetcher.ts
@@ -1,4 +1,4 @@
-import SFPLogger, { Logger, LoggerLevel } from '@dxatscale/sfp-logger';
+import SFPLogger, { Logger, LoggerLevel } from '@flxblio/sfp-logger';
import SFPOrg from '../org/SFPOrg';
import { delay } from '../utils/Delay';
const fs = require('fs-extra');
diff --git a/packages/core/src/metadata/MetadataFiles.ts b/packages/sfp-cli/src/core/metadata/MetadataFiles.ts
similarity index 100%
rename from packages/core/src/metadata/MetadataFiles.ts
rename to packages/sfp-cli/src/core/metadata/MetadataFiles.ts
diff --git a/packages/core/src/metadata/MetadataInfo.ts b/packages/sfp-cli/src/core/metadata/MetadataInfo.ts
similarity index 98%
rename from packages/core/src/metadata/MetadataInfo.ts
rename to packages/sfp-cli/src/core/metadata/MetadataInfo.ts
index 2b045612f..b3a888cce 100644
--- a/packages/core/src/metadata/MetadataInfo.ts
+++ b/packages/sfp-cli/src/core/metadata/MetadataInfo.ts
@@ -101,7 +101,7 @@ export interface MetadataInfo {
export class MetadataInfo {
static loadMetadataInfo(): MetadataInfo {
let metadataInfo: MetadataInfo = {};
- let resourcePath = path.join(__dirname, '..', '..', 'resources', 'metadatainfo.json');
+ let resourcePath = path.join(__dirname, '..', '..', '..', 'resources', 'metadatainfo.json');
const fileData = fs.readFileSync(resourcePath, 'utf8');
let metadataInfoJSON = JSON.parse(fileData);
metadataInfoJSON.metadataObjects.forEach((metadata) => {
diff --git a/packages/core/src/metadata/SettingsFetcher.ts b/packages/sfp-cli/src/core/metadata/SettingsFetcher.ts
similarity index 92%
rename from packages/core/src/metadata/SettingsFetcher.ts
rename to packages/sfp-cli/src/core/metadata/SettingsFetcher.ts
index 0c47e9116..971717dbe 100644
--- a/packages/core/src/metadata/SettingsFetcher.ts
+++ b/packages/sfp-cli/src/core/metadata/SettingsFetcher.ts
@@ -1,4 +1,4 @@
-import SFPLogger, { Logger, LoggerLevel } from '@dxatscale/sfp-logger';
+import SFPLogger, { Logger, LoggerLevel } from '@flxblio/sfp-logger';
import SFPOrg from '../org/SFPOrg';
const fs = require('fs-extra');
import { XMLParser } from 'fast-xml-parser';
diff --git a/packages/core/src/org/OrgDetailsFetcher.ts b/packages/sfp-cli/src/core/org/OrgDetailsFetcher.ts
similarity index 98%
rename from packages/core/src/org/OrgDetailsFetcher.ts
rename to packages/sfp-cli/src/core/org/OrgDetailsFetcher.ts
index 10ce08e8b..7ded33399 100644
--- a/packages/core/src/org/OrgDetailsFetcher.ts
+++ b/packages/sfp-cli/src/core/org/OrgDetailsFetcher.ts
@@ -1,6 +1,6 @@
import extractDomainFromUrl from '../utils/extractDomainFromUrl';
import { convertAliasToUsername } from '../utils/AliasList';
-import SFPLogger, { LoggerLevel } from '@dxatscale/sfp-logger';
+import SFPLogger, { LoggerLevel } from '@flxblio/sfp-logger';
import ScratchOrgInfoFetcher from './ScratchOrgInfoFetcher';
import OrganizationFetcher from './OrganizationFetcher';
import { AuthInfo, Connection, Org, trimTo15 } from '@salesforce/core';
diff --git a/packages/core/src/org/OrganizationFetcher.ts b/packages/sfp-cli/src/core/org/OrganizationFetcher.ts
similarity index 100%
rename from packages/core/src/org/OrganizationFetcher.ts
rename to packages/sfp-cli/src/core/org/OrganizationFetcher.ts
diff --git a/packages/core/src/org/SFPOrg.ts b/packages/sfp-cli/src/core/org/SFPOrg.ts
similarity index 94%
rename from packages/core/src/org/SFPOrg.ts
rename to packages/sfp-cli/src/core/org/SFPOrg.ts
index 9e499203f..270702e0d 100644
--- a/packages/core/src/org/SFPOrg.ts
+++ b/packages/sfp-cli/src/core/org/SFPOrg.ts
@@ -1,5 +1,5 @@
import { Org } from '@salesforce/core';
-import SFPLogger, { COLOR_KEY_MESSAGE, Logger, LoggerLevel } from '@dxatscale/sfp-logger';
+import SFPLogger, { COLOR_KEY_MESSAGE, Logger, LoggerLevel } from '@flxblio/sfp-logger';
import Package2Detail from '../package/Package2Detail';
import SfpPackage from '../package/SfpPackage';
import QueryHelper from '../queryHelper/QueryHelper';
@@ -22,8 +22,8 @@ export default class SFPOrg extends Org {
return records;
} catch (error) {
SFPLogger.log(
- 'Unable to fetch any sfpowerscripts artifacts in the org\n' +
- '1. sfpowerscripts package is not installed in the org\n' +
+ 'Unable to fetch any sfp artifacts in the org\n' +
+ '1. sfpowerscripts artifact package is not installed in the org\n' +
'2. The required prerequisite object is not deployed to this org\n',
LoggerLevel.WARN,
logger
@@ -59,8 +59,8 @@ export default class SFPOrg extends Org {
}
} catch (error) {
SFPLogger.log(
- 'Unable to fetch any sfpowerscripts artifacts in the org\n' +
- '1. sfpowerscripts package is not installed in the org\n' +
+ 'Unable to fetch any sfp artifacts in the org\n' +
+ '1. sfp package is not installed in the org\n' +
'2. The required prerequisite object is not deployed to this org\n',
LoggerLevel.WARN,
logger
@@ -190,7 +190,7 @@ export default class SFPOrg extends Org {
}
/**
- * Return all artifacts including sfpowerscripts as well as external unlocked/managed
+ * Return all artifacts including sfp as well as external unlocked/managed
*/
public async getAllInstalledArtifacts():Promise {
let artifacts = await this.getInstalledArtifacts(`Name`);
@@ -202,7 +202,7 @@ export default class SFPOrg extends Org {
name: artifact.Name,
version: artifact.Version__c,
commitId:artifact.CommitId__c,
- isInstalledBySfpowerscripts: true,
+ isInstalledBysfp: true,
};
let packageFound = installed2GPPackages.find((elem) => elem.name == artifact.Name);
if (packageFound) {
@@ -229,7 +229,7 @@ export default class SFPOrg extends Org {
else installedArtifact.type = `Unlocked`;
installedArtifact.subscriberVersion = installed2GPPackage.subscriberPackageVersionId;
- installedArtifact.isInstalledBySfpowerscripts = false;
+ installedArtifact.isInstalledBysfp = false;
installedArtifacts.push(installedArtifact);
}
});
@@ -250,7 +250,7 @@ export interface InstalledArtifact {
commitId?: string;
subscriberVersion?: string;
type?: string;
- isInstalledBySfpowerscripts?: boolean;
+ isInstalledBysfp?: boolean;
}
export interface SfpowerscriptsArtifact2__c {
diff --git a/packages/core/src/org/ScratchOrgInfoFetcher.ts b/packages/sfp-cli/src/core/org/ScratchOrgInfoFetcher.ts
similarity index 100%
rename from packages/core/src/org/ScratchOrgInfoFetcher.ts
rename to packages/sfp-cli/src/core/org/ScratchOrgInfoFetcher.ts
diff --git a/packages/core/src/org/packageQuery/InstalledPackagesQueryExecutor.ts b/packages/sfp-cli/src/core/org/packageQuery/InstalledPackagesQueryExecutor.ts
similarity index 100%
rename from packages/core/src/org/packageQuery/InstalledPackagesQueryExecutor.ts
rename to packages/sfp-cli/src/core/org/packageQuery/InstalledPackagesQueryExecutor.ts
diff --git a/packages/core/src/package/Package2Detail.ts b/packages/sfp-cli/src/core/package/Package2Detail.ts
similarity index 100%
rename from packages/core/src/package/Package2Detail.ts
rename to packages/sfp-cli/src/core/package/Package2Detail.ts
diff --git a/packages/core/src/package/SfpPackage.ts b/packages/sfp-cli/src/core/package/SfpPackage.ts
similarity index 100%
rename from packages/core/src/package/SfpPackage.ts
rename to packages/sfp-cli/src/core/package/SfpPackage.ts
diff --git a/packages/core/src/package/SfpPackageBuilder.ts b/packages/sfp-cli/src/core/package/SfpPackageBuilder.ts
similarity index 98%
rename from packages/core/src/package/SfpPackageBuilder.ts
rename to packages/sfp-cli/src/core/package/SfpPackageBuilder.ts
index fb35dd914..e394099a1 100644
--- a/packages/core/src/package/SfpPackageBuilder.ts
+++ b/packages/sfp-cli/src/core/package/SfpPackageBuilder.ts
@@ -4,7 +4,7 @@ import SfpPackageContentGenerator from './generators/SfpPackageContentGenerator'
import SourceToMDAPIConvertor from './packageFormatConvertors/SourceToMDAPIConvertor';
import PackageManifest from './components/PackageManifest';
import MetadataCount from './components/MetadataCount';
-import SFPLogger, { Logger, LoggerLevel } from '@dxatscale/sfp-logger';
+import SFPLogger, { Logger, LoggerLevel } from '@flxblio/sfp-logger';
import * as fs from 'fs-extra';
import path from 'path';
import { Artifact } from '../artifacts/ArtifactFetcher';
@@ -22,7 +22,7 @@ import PackageVersionUpdater from './version/PackageVersionUpdater';
import { AnalyzerRegistry } from './analyser/AnalyzerRegistry';
import { ComponentSet } from '@salesforce/source-deploy-retrieve';
import CreateDiffPackageImp from './packageCreators/CreateDiffPackageImpl';
-import { COLOR_WARNING } from '@dxatscale/sfp-logger';
+import { COLOR_WARNING } from '@flxblio/sfp-logger';
export default class SfpPackageBuilder {
public static async buildPackageFromProjectDirectory(
@@ -68,7 +68,7 @@ export default class SfpPackageBuilder {
else sfpPackage.configFilePath = params?.configFilePath;
for (const propertyFetcher of propertyFetchers) {
- await propertyFetcher.getSfpowerscriptsProperties(sfpPackage, logger);
+ await propertyFetcher.getsfpProperties(sfpPackage, logger);
}
//Get Package Type
diff --git a/packages/core/src/package/SfpPackageInquirer.ts b/packages/sfp-cli/src/core/package/SfpPackageInquirer.ts
similarity index 98%
rename from packages/core/src/package/SfpPackageInquirer.ts
rename to packages/sfp-cli/src/core/package/SfpPackageInquirer.ts
index 7395560fd..ba0e6a4d3 100644
--- a/packages/core/src/package/SfpPackageInquirer.ts
+++ b/packages/sfp-cli/src/core/package/SfpPackageInquirer.ts
@@ -1,4 +1,4 @@
-import SFPLogger, { Logger, LoggerLevel } from '@dxatscale/sfp-logger';
+import SFPLogger, { Logger, LoggerLevel } from '@flxblio/sfp-logger';
import * as fs from 'fs-extra';
import path = require('path');
import lodash = require('lodash');
diff --git a/packages/core/src/package/SfpPackageInstaller.ts b/packages/sfp-cli/src/core/package/SfpPackageInstaller.ts
similarity index 98%
rename from packages/core/src/package/SfpPackageInstaller.ts
rename to packages/sfp-cli/src/core/package/SfpPackageInstaller.ts
index d475e17dd..711db5442 100644
--- a/packages/core/src/package/SfpPackageInstaller.ts
+++ b/packages/sfp-cli/src/core/package/SfpPackageInstaller.ts
@@ -1,5 +1,5 @@
import path from 'path';
-import { Logger } from '@dxatscale/sfp-logger';
+import { Logger } from '@flxblio/sfp-logger';
import SFPOrg from '../org/SFPOrg';
import InstallDataPackageImpl from './packageInstallers/InstallDataPackageImpl';
import { SfpPackageInstallationOptions } from './packageInstallers/InstallPackage';
diff --git a/packages/core/src/package/analyser/AnalyzerRegistry.ts b/packages/sfp-cli/src/core/package/analyser/AnalyzerRegistry.ts
similarity index 100%
rename from packages/core/src/package/analyser/AnalyzerRegistry.ts
rename to packages/sfp-cli/src/core/package/analyser/AnalyzerRegistry.ts
diff --git a/packages/core/src/package/analyser/FHTAnalyzer.ts b/packages/sfp-cli/src/core/package/analyser/FHTAnalyzer.ts
similarity index 97%
rename from packages/core/src/package/analyser/FHTAnalyzer.ts
rename to packages/sfp-cli/src/core/package/analyser/FHTAnalyzer.ts
index 04dc2b1e5..3d71504e6 100644
--- a/packages/core/src/package/analyser/FHTAnalyzer.ts
+++ b/packages/sfp-cli/src/core/package/analyser/FHTAnalyzer.ts
@@ -4,7 +4,7 @@ import * as yaml from 'js-yaml';
import { ComponentSet, registry } from '@salesforce/source-deploy-retrieve';
import SfpPackage, { PackageType } from '../SfpPackage';
import { PackageAnalyzer } from './PackageAnalyzer';
-import SFPLogger, { Logger, LoggerLevel } from '@dxatscale/sfp-logger';
+import SFPLogger, { Logger, LoggerLevel } from '@flxblio/sfp-logger';
export default class FHTAnalyser implements PackageAnalyzer {
diff --git a/packages/core/src/package/analyser/FTAnalyzer.ts b/packages/sfp-cli/src/core/package/analyser/FTAnalyzer.ts
similarity index 97%
rename from packages/core/src/package/analyser/FTAnalyzer.ts
rename to packages/sfp-cli/src/core/package/analyser/FTAnalyzer.ts
index 9734043cf..911e1e356 100644
--- a/packages/core/src/package/analyser/FTAnalyzer.ts
+++ b/packages/sfp-cli/src/core/package/analyser/FTAnalyzer.ts
@@ -4,7 +4,7 @@ import * as yaml from 'js-yaml';
import { ComponentSet, registry } from '@salesforce/source-deploy-retrieve';
import SfpPackage, { PackageType } from '../SfpPackage';
import { PackageAnalyzer } from './PackageAnalyzer';
-import SFPLogger, { Logger, LoggerLevel } from '@dxatscale/sfp-logger';
+import SFPLogger, { Logger, LoggerLevel } from '@flxblio/sfp-logger';
export default class FTAnalyser implements PackageAnalyzer {
diff --git a/packages/core/src/package/analyser/PackageAnalyzer.ts b/packages/sfp-cli/src/core/package/analyser/PackageAnalyzer.ts
similarity index 87%
rename from packages/core/src/package/analyser/PackageAnalyzer.ts
rename to packages/sfp-cli/src/core/package/analyser/PackageAnalyzer.ts
index cc51b44ec..3072da027 100644
--- a/packages/core/src/package/analyser/PackageAnalyzer.ts
+++ b/packages/sfp-cli/src/core/package/analyser/PackageAnalyzer.ts
@@ -1,4 +1,4 @@
-import { Logger } from "@dxatscale/sfp-logger";
+import { Logger } from "@flxblio/sfp-logger";
import { ComponentSet } from "@salesforce/source-deploy-retrieve";
import SfpPackage from "../SfpPackage";
diff --git a/packages/core/src/package/analyser/PicklistAnalyzer.ts b/packages/sfp-cli/src/core/package/analyser/PicklistAnalyzer.ts
similarity index 96%
rename from packages/core/src/package/analyser/PicklistAnalyzer.ts
rename to packages/sfp-cli/src/core/package/analyser/PicklistAnalyzer.ts
index 80db81f54..35f24476c 100644
--- a/packages/core/src/package/analyser/PicklistAnalyzer.ts
+++ b/packages/sfp-cli/src/core/package/analyser/PicklistAnalyzer.ts
@@ -1,7 +1,7 @@
import { ComponentSet, registry } from '@salesforce/source-deploy-retrieve';
import SfpPackage, { PackageType } from '../SfpPackage';
import { PackageAnalyzer } from './PackageAnalyzer';
-import SFPLogger, { Logger, LoggerLevel } from '@dxatscale/sfp-logger';
+import SFPLogger, { Logger, LoggerLevel } from '@flxblio/sfp-logger';
export default class PicklistAnalyzer implements PackageAnalyzer {
diff --git a/packages/core/src/package/components/DeployDestructiveManifestToOrgImpl.ts b/packages/sfp-cli/src/core/package/components/DeployDestructiveManifestToOrgImpl.ts
similarity index 97%
rename from packages/core/src/package/components/DeployDestructiveManifestToOrgImpl.ts
rename to packages/sfp-cli/src/core/package/components/DeployDestructiveManifestToOrgImpl.ts
index 15a8607ff..5edac57a7 100644
--- a/packages/core/src/package/components/DeployDestructiveManifestToOrgImpl.ts
+++ b/packages/sfp-cli/src/core/package/components/DeployDestructiveManifestToOrgImpl.ts
@@ -1,8 +1,8 @@
-import SFPLogger from '@dxatscale/sfp-logger';
+import SFPLogger from '@flxblio/sfp-logger';
import { Connection } from '@salesforce/core';
import * as fs from 'fs-extra';
import { delay } from '../../utils/Delay';
-import { LoggerLevel } from '@dxatscale/sfp-logger';
+import { LoggerLevel } from '@flxblio/sfp-logger';
import SFPOrg from '../../org/SFPOrg';
import AdmZip from "adm-zip"
import path from 'path';
diff --git a/packages/core/src/package/components/MetadataCount.ts b/packages/sfp-cli/src/core/package/components/MetadataCount.ts
similarity index 100%
rename from packages/core/src/package/components/MetadataCount.ts
rename to packages/sfp-cli/src/core/package/components/MetadataCount.ts
diff --git a/packages/core/src/package/components/PackageManifest.ts b/packages/sfp-cli/src/core/package/components/PackageManifest.ts
similarity index 100%
rename from packages/core/src/package/components/PackageManifest.ts
rename to packages/sfp-cli/src/core/package/components/PackageManifest.ts
diff --git a/packages/core/src/package/components/PackageToComponent.ts b/packages/sfp-cli/src/core/package/components/PackageToComponent.ts
similarity index 100%
rename from packages/core/src/package/components/PackageToComponent.ts
rename to packages/sfp-cli/src/core/package/components/PackageToComponent.ts
diff --git a/packages/core/src/package/components/ReconcileProfileAgainstOrgImpl.ts b/packages/sfp-cli/src/core/package/components/ReconcileProfileAgainstOrgImpl.ts
similarity index 91%
rename from packages/core/src/package/components/ReconcileProfileAgainstOrgImpl.ts
rename to packages/sfp-cli/src/core/package/components/ReconcileProfileAgainstOrgImpl.ts
index 1d9736118..209c95b29 100644
--- a/packages/core/src/package/components/ReconcileProfileAgainstOrgImpl.ts
+++ b/packages/sfp-cli/src/core/package/components/ReconcileProfileAgainstOrgImpl.ts
@@ -1,7 +1,7 @@
-import SFPLogger, { Logger, LoggerLevel } from '@dxatscale/sfp-logger';
+import SFPLogger, { Logger, LoggerLevel } from '@flxblio/sfp-logger';
import { ZERO_BORDER_TABLE } from '../../display/TableConstants';
const Table = require('cli-table');
-import ProfileReconcile from '@dxatscale/sfprofiles/lib/impl/source/profileReconcile';
+import ProfileReconcile from '@flxblio/sfprofiles/lib/impl/source/profileReconcile';
import SFPOrg from '../../org/SFPOrg';
import path from 'path';
import { METADATA_INFO } from '../../metadata/MetadataInfo';
diff --git a/packages/core/src/package/coverage/PackageTestCoverage.ts b/packages/sfp-cli/src/core/package/coverage/PackageTestCoverage.ts
similarity index 99%
rename from packages/core/src/package/coverage/PackageTestCoverage.ts
rename to packages/sfp-cli/src/core/package/coverage/PackageTestCoverage.ts
index b88d79cd6..b2d37496e 100644
--- a/packages/core/src/package/coverage/PackageTestCoverage.ts
+++ b/packages/sfp-cli/src/core/package/coverage/PackageTestCoverage.ts
@@ -1,4 +1,4 @@
-import SFPLogger, { COLOR_WARNING, Logger } from '@dxatscale/sfp-logger';
+import SFPLogger, { COLOR_WARNING, Logger } from '@flxblio/sfp-logger';
import IndividualClassCoverage from '../../apex/coverage/IndividualClassCoverage';
import SfpPackage, { PackageType } from '../SfpPackage';
import { Connection } from '@salesforce/core';
diff --git a/packages/core/src/package/coverage/PackageVersionCoverage.ts b/packages/sfp-cli/src/core/package/coverage/PackageVersionCoverage.ts
similarity index 96%
rename from packages/core/src/package/coverage/PackageVersionCoverage.ts
rename to packages/sfp-cli/src/core/package/coverage/PackageVersionCoverage.ts
index 590863d2c..bee874e13 100644
--- a/packages/core/src/package/coverage/PackageVersionCoverage.ts
+++ b/packages/sfp-cli/src/core/package/coverage/PackageVersionCoverage.ts
@@ -1,5 +1,5 @@
import { Connection } from '@salesforce/core';
-import SFPLogger, { Logger, LoggerLevel } from '@dxatscale/sfp-logger';
+import SFPLogger, { Logger, LoggerLevel } from '@flxblio/sfp-logger';
import Package2VersionFetcher from '../version/Package2VersionFetcher';
export default class PackageVersionCoverage {
diff --git a/packages/core/src/package/dependencies/ExternalPackage2DependencyResolver.ts b/packages/sfp-cli/src/core/package/dependencies/ExternalPackage2DependencyResolver.ts
similarity index 100%
rename from packages/core/src/package/dependencies/ExternalPackage2DependencyResolver.ts
rename to packages/sfp-cli/src/core/package/dependencies/ExternalPackage2DependencyResolver.ts
diff --git a/packages/core/src/package/dependencies/PackageDependencyResolver.ts b/packages/sfp-cli/src/core/package/dependencies/PackageDependencyResolver.ts
similarity index 96%
rename from packages/core/src/package/dependencies/PackageDependencyResolver.ts
rename to packages/sfp-cli/src/core/package/dependencies/PackageDependencyResolver.ts
index b72db34a9..6a8836f9d 100644
--- a/packages/core/src/package/dependencies/PackageDependencyResolver.ts
+++ b/packages/sfp-cli/src/core/package/dependencies/PackageDependencyResolver.ts
@@ -3,7 +3,7 @@ import lodash = require('lodash');
import Git from '../../git/Git';
import GitTags from '../../git/GitTags';
import Package2VersionFetcher, { Package2Version } from '../version/Package2VersionFetcher';
-import SFPLogger, { LoggerLevel } from '@dxatscale/sfp-logger';
+import SFPLogger, { LoggerLevel } from '@flxblio/sfp-logger';
/**
@@ -46,7 +46,7 @@ export default class PackageDependencyResolver {
let dependency = packageDirectory.dependencies[i];
if (this.projectConfig.packageAliases[dependency.package] === undefined && !this.isSubscriberPackageVersionId(dependency.package)) {
- throw new Error(`Can't find package id for dependency: ` + dependency.package);
+ throw new Error(`Can't find package id for dependency: ${dependency.package}, Please ensure that the package is added to sfdx-project.json in your packageAliases`);
}
let packageVersionId = this.isSubscriberPackageVersionId(dependency.package)?dependency.package:this.projectConfig.packageAliases[dependency.package]
@@ -211,7 +211,8 @@ export default class PackageDependencyResolver {
if (!package2VersionOnCurrentBranch) {
throw new Error(
- `Failed to find validated Package2 version for dependency ${dependency.package} with version ${dependency.versionNumber} created from the current branch`
+ `Failed to find validated Package2 version for dependency ${dependency.package} with version ${dependency.versionNumber} created from the current branch,
+ You will need to create a new version of the package on the current branch to resolve this dependency.`
);
}
diff --git a/packages/core/src/package/dependencies/TransitiveDependencyResolver.ts b/packages/sfp-cli/src/core/package/dependencies/TransitiveDependencyResolver.ts
similarity index 97%
rename from packages/core/src/package/dependencies/TransitiveDependencyResolver.ts
rename to packages/sfp-cli/src/core/package/dependencies/TransitiveDependencyResolver.ts
index 23c5bd01c..d91c91f27 100644
--- a/packages/core/src/package/dependencies/TransitiveDependencyResolver.ts
+++ b/packages/sfp-cli/src/core/package/dependencies/TransitiveDependencyResolver.ts
@@ -1,6 +1,6 @@
import ProjectConfig from '../../project/ProjectConfig';
-import { COLOR_HEADER, COLOR_KEY_MESSAGE, COLOR_SUCCESS, COLOR_ERROR } from '@dxatscale/sfp-logger';
-import SFPLogger, { LoggerLevel, Logger } from '@dxatscale/sfp-logger';
+import { COLOR_HEADER, COLOR_KEY_MESSAGE, COLOR_SUCCESS, COLOR_ERROR } from '@flxblio/sfp-logger';
+import SFPLogger, { LoggerLevel, Logger } from '@flxblio/sfp-logger';
import _, { uniq } from 'lodash';
import semver = require('semver');
import convertBuildNumDotDelimToHyphen from '../../utils/VersionNumberConverter';
diff --git a/packages/core/src/package/deploymentCustomizers/DeploymentCustomizer.ts b/packages/sfp-cli/src/core/package/deploymentCustomizers/DeploymentCustomizer.ts
similarity index 95%
rename from packages/core/src/package/deploymentCustomizers/DeploymentCustomizer.ts
rename to packages/sfp-cli/src/core/package/deploymentCustomizers/DeploymentCustomizer.ts
index 5425d01e8..c7a74f82e 100644
--- a/packages/core/src/package/deploymentCustomizers/DeploymentCustomizer.ts
+++ b/packages/sfp-cli/src/core/package/deploymentCustomizers/DeploymentCustomizer.ts
@@ -1,4 +1,4 @@
-import { Logger } from "@dxatscale/sfp-logger";
+import { Logger } from "@flxblio/sfp-logger";
import { Connection } from "@salesforce/core";
import { ComponentSet } from "@salesforce/source-deploy-retrieve";
import { DeploymentOptions } from "../../deployers/DeploySourceToOrgImpl";
diff --git a/packages/core/src/package/deploymentCustomizers/FHTEnabler.ts b/packages/sfp-cli/src/core/package/deploymentCustomizers/FHTEnabler.ts
similarity index 98%
rename from packages/core/src/package/deploymentCustomizers/FHTEnabler.ts
rename to packages/sfp-cli/src/core/package/deploymentCustomizers/FHTEnabler.ts
index f365decb9..709ce227f 100644
--- a/packages/core/src/package/deploymentCustomizers/FHTEnabler.ts
+++ b/packages/sfp-cli/src/core/package/deploymentCustomizers/FHTEnabler.ts
@@ -1,4 +1,4 @@
-import SFPLogger, { Logger, LoggerLevel } from '@dxatscale/sfp-logger';
+import SFPLogger, { Logger, LoggerLevel } from '@flxblio/sfp-logger';
import { ComponentSet, registry } from '@salesforce/source-deploy-retrieve';
import * as fs from 'fs-extra';
import QueryHelper from '../../queryHelper/QueryHelper';
diff --git a/packages/core/src/package/deploymentCustomizers/FTEnabler.ts b/packages/sfp-cli/src/core/package/deploymentCustomizers/FTEnabler.ts
similarity index 98%
rename from packages/core/src/package/deploymentCustomizers/FTEnabler.ts
rename to packages/sfp-cli/src/core/package/deploymentCustomizers/FTEnabler.ts
index f97f6169a..3daa6708b 100644
--- a/packages/core/src/package/deploymentCustomizers/FTEnabler.ts
+++ b/packages/sfp-cli/src/core/package/deploymentCustomizers/FTEnabler.ts
@@ -1,4 +1,4 @@
-import SFPLogger, { Logger, LoggerLevel } from '@dxatscale/sfp-logger';
+import SFPLogger, { Logger, LoggerLevel } from '@flxblio/sfp-logger';
import { ComponentSet } from '@salesforce/source-deploy-retrieve';
import * as fs from 'fs-extra';
import QueryHelper from '../../queryHelper/QueryHelper';
diff --git a/packages/sfp-cli/src/core/package/deploymentCustomizers/FlowActivator.ts b/packages/sfp-cli/src/core/package/deploymentCustomizers/FlowActivator.ts
new file mode 100644
index 000000000..11e8d133a
--- /dev/null
+++ b/packages/sfp-cli/src/core/package/deploymentCustomizers/FlowActivator.ts
@@ -0,0 +1,208 @@
+import { ComponentSet, registry } from '@salesforce/source-deploy-retrieve';
+import SFPOrg from '../../org/SFPOrg';
+import QueryHelper from '../../queryHelper/QueryHelper';
+import SFPLogger, { Logger, LoggerLevel } from '@flxblio/sfp-logger';
+import { activate, deactivate, deleteFlows, Flow, FlowDefinition, getFlowDefinition } from '../../flows/FlowOperations';
+import SfpPackage, { PackageType } from '../SfpPackage';
+import { Connection } from '@salesforce/core';
+import OrgDetailsFetcher from '../../org/OrgDetailsFetcher';
+import { Schema } from 'jsforce';
+import { DeploymentOptions } from '../../deployers/DeploySourceToOrgImpl';
+import { DeploymentContext, DeploymentCustomizer } from './DeploymentCustomizer';
+import { DeploySourceResult } from '../../deployers/DeploymentExecutor';
+import { ZERO_BORDER_TABLE } from '../../display/TableConstants';
+const Table = require('cli-table');
+
+export default class FlowActivator implements DeploymentCustomizer {
+ async execute(
+ sfpPackage: SfpPackage,
+ componentSet: ComponentSet,
+ sfpOrg: SFPOrg,
+ logger: Logger,
+ deploymentContext: DeploymentContext
+ ): Promise {
+ let sourceComponents = componentSet.getSourceComponents().toArray();
+ let masterLabelsOfAllFlowsInPackage = [];
+ let flowsToBeActivated = [];
+ let flowsToBeDeactivated = [];
+
+ for (const sourceComponent of sourceComponents) {
+ if (sourceComponent.type.name === registry.types.flow.name) {
+ //Parse Flows
+ //Determining the flow to be activated
+ let flowAsJSON = sourceComponent.parseXmlSync();
+ masterLabelsOfAllFlowsInPackage.push(flowAsJSON['Flow']['label']);
+ if (flowAsJSON['Flow']['status'] == 'Active') {
+ flowsToBeActivated.push(sourceComponent.fullName);
+ } else {
+ flowsToBeDeactivated.push(sourceComponent.fullName);
+ }
+ }
+ }
+
+ try {
+ if (masterLabelsOfAllFlowsInPackage.length > 0) {
+ // Need to move this to a seperate pre deployment process
+ // await this.cleanupOldestFlowVersion(masterLabelsOfAllFlowsInPackage, sfpOrg, logger);
+
+ if (flowsToBeActivated.length > 0) {
+ SFPLogger.log(
+ `Active flows found in the package, attempting to activate latest versions`,
+ LoggerLevel.INFO,
+ logger
+ );
+ await this.activateLatestVersionOfFlows(flowsToBeActivated, sfpOrg, logger);
+ }
+ if (flowsToBeDeactivated.length > 0) {
+ SFPLogger.log(
+ `Obsolete/Draft/InvalidDraft flows found in the package, attempting to inactivate the flow`,
+ LoggerLevel.INFO,
+ logger
+ );
+ await this.deactivateFlow(flowsToBeDeactivated, sfpOrg, logger);
+ }
+ }
+
+ return {
+ deploy_id: `000000`,
+ result: true,
+ message: `Activated/Inactivated Flows`,
+ };
+ } catch (error) {
+ SFPLogger.log(`Unable to activate flow, skipping activation`, LoggerLevel.ERROR, logger);
+ console.log(error);
+ SFPLogger.log(`Error Details : ${error.stack}`, LoggerLevel.TRACE);
+ }
+ }
+ private async activateLatestVersionOfFlows(flowsToBeActivated: string[], sfpOrg: SFPOrg, logger: Logger) {
+ let query = `SELECT DeveloperName, ActiveVersion.FullName, ActiveVersion.VersionNumber, NamespacePrefix, LatestVersionId FROM FlowDefinition WHERE DeveloperName IN ('${flowsToBeActivated.join(
+ "','"
+ )}')`;
+ let flowVersionsInOrg = await QueryHelper.query(query, sfpOrg.getConnection(), true);
+ //activate the latest version of the flow
+ for (const flowVersion of flowVersionsInOrg) {
+ if (flowVersion.ActiveVersion == null) {
+ await activate(flowVersion, sfpOrg);
+ SFPLogger.log(
+ `Flow ${flowVersion.DeveloperName} is activated in the org sucessfully`,
+ LoggerLevel.INFO,
+ logger
+ );
+ } else {
+ SFPLogger.log(
+ `Flow ${flowVersion.DeveloperName}'s latest version is already active, skipping activation`,
+ LoggerLevel.INFO,
+ logger
+ );
+ }
+ }
+ }
+
+ private async deactivateFlow(flowsToBeDeactivated: string[], sfpOrg: SFPOrg, logger: Logger) {
+ for (const flow of flowsToBeDeactivated) {
+ try {
+ const flowdefinition = await getFlowDefinition(
+ {
+ developername: flow,
+ namespaceprefix: '',
+ },
+ sfpOrg
+ );
+
+ await deactivate(flowdefinition, sfpOrg);
+ SFPLogger.log(`Flow ${flow} is marked as inactive in the org sucessfully`, LoggerLevel.INFO, logger);
+ } catch (error) {
+ SFPLogger.log(`Unable to deactive flow ${flow}, skipping deactivation`, LoggerLevel.ERROR, logger);
+ SFPLogger.log(`Error Details : ${error.stack}`, LoggerLevel.TRACE);
+ }
+ }
+ }
+
+ public async isEnabled(sfpPackage: SfpPackage, conn: Connection, logger: Logger): Promise {
+ if(sfpPackage.packageDescriptor.package_type == PackageType.Data)
+ return false;
+ if (
+ sfpPackage.packageDescriptor.enableFlowActivation == undefined ||
+ sfpPackage.packageDescriptor.enableFlowActivation == true
+ ) {
+ return true;
+ }
+ return false;
+ }
+
+ gatherComponentsToBeDeployed(
+ sfpPackage: SfpPackage,
+ componentSet: ComponentSet,
+ conn: Connection,
+ logger: Logger
+ ): Promise<{ location: string; componentSet: ComponentSet }> {
+ throw new Error('Method not implemented.');
+ }
+ getDeploymentOptions(target_org: string, waitTime: string, apiVersion: string): Promise {
+ throw new Error('Method not implemented.');
+ }
+
+ public getName(): string {
+ return 'Flow Activator';
+ }
+
+ private async cleanupOldestFlowVersion(masterLabelsOfAllFlowsInPackage: string[], sfpOrg: SFPOrg, logger: Logger) {
+ try {
+ //count flow versions of each flow definition in the org
+ SFPLogger.log(`Checking current versions of flows`, LoggerLevel.INFO, logger);
+
+ let query = `SELECT MasterLabel, COUNT(id) RecordCount FROM Flow GROUP BY MasterLabel`;
+ let isFlowVersionPurgeDetected = false;
+
+ let flowVersionsInOrg = await QueryHelper.query(query, sfpOrg.getConnection(), true);
+ let tableHead = ['Flow', 'Versions Count', 'Action'];
+ let table = new Table({
+ head: tableHead,
+ chars: ZERO_BORDER_TABLE,
+ });
+ for (const flowVersion of flowVersionsInOrg) {
+ try {
+ if (
+ flowVersion.RecordCount == 50 &&
+ masterLabelsOfAllFlowsInPackage.includes(flowVersion.MasterLabel)
+ ) {
+ isFlowVersionPurgeDetected = true;
+ SFPLogger.log(
+ `Flow ${flowVersion.MasterLabel} has ${flowVersion.RecordCount} versions, deleting the oldest versions`,
+ LoggerLevel.INFO,
+ logger
+ );
+ let flows = await QueryHelper.query(
+ `SELECT Id, VersionNumber, FullName, MasterLabel FROM Flow WHERE MasterLabel = '${flowVersion.MasterLabel}' ORDER BY VersionNumber DESC`,
+ sfpOrg.getConnection(),
+ true
+ );
+ let flowsToDelete = flows.slice(49);
+ await deleteFlows(flowsToDelete, sfpOrg, logger);
+ table.push([flowVersion.MasterLabel, flowVersion.RecordCount, 'Deleted 1 version']);
+ }
+ } catch (error) {
+ SFPLogger.log(
+ `Unable to purge flow versions for ${flowVersion.MasterLabel}, skipping`,
+ LoggerLevel.ERROR,
+ logger
+ );
+ table.push([flowVersion.MasterLabel, flowVersion.RecordCount, 'Unable to delete versions']);
+ SFPLogger.log(`Error Details : ${error.stack}`, LoggerLevel.TRACE);
+ }
+ }
+ if (table.length > 1 && isFlowVersionPurgeDetected) {
+ SFPLogger.log(table.toString());
+ } else {
+ SFPLogger.log(
+ `All flows in the package have less than 50 versions, skipping version cleanup`,
+ LoggerLevel.INFO,
+ logger
+ );
+ }
+ } catch (error) {
+ SFPLogger.log(`Unable to cleanup flow versions`, LoggerLevel.ERROR, logger);
+ SFPLogger.log(`Error Details : ${error.stack}`, LoggerLevel.TRACE);
+ }
+ }
+}
diff --git a/packages/core/src/package/deploymentCustomizers/MetadataDeploymentCustomizer.ts b/packages/sfp-cli/src/core/package/deploymentCustomizers/MetadataDeploymentCustomizer.ts
similarity index 97%
rename from packages/core/src/package/deploymentCustomizers/MetadataDeploymentCustomizer.ts
rename to packages/sfp-cli/src/core/package/deploymentCustomizers/MetadataDeploymentCustomizer.ts
index 04dc9533c..1c524e287 100644
--- a/packages/core/src/package/deploymentCustomizers/MetadataDeploymentCustomizer.ts
+++ b/packages/sfp-cli/src/core/package/deploymentCustomizers/MetadataDeploymentCustomizer.ts
@@ -2,7 +2,7 @@ import { Connection } from "@salesforce/core";
import DeploySourceToOrgImpl, { DeploymentOptions } from "../../deployers/DeploySourceToOrgImpl";
import SfpPackage from "../SfpPackage";
import { DeploymentContext, DeploymentCustomizer } from "./DeploymentCustomizer";
-import SFPLogger,{COLOR_KEY_MESSAGE,Logger,LoggerLevel} from "@dxatscale/sfp-logger"
+import SFPLogger,{COLOR_KEY_MESSAGE,Logger,LoggerLevel} from "@flxblio/sfp-logger"
import { ComponentSet } from "@salesforce/source-deploy-retrieve";
import SFPOrg from "../../org/SFPOrg";
import DeploymentExecutor, { DeploySourceResult } from "../../deployers/DeploymentExecutor";
diff --git a/packages/core/src/package/deploymentCustomizers/PicklistEnabler.ts b/packages/sfp-cli/src/core/package/deploymentCustomizers/PicklistEnabler.ts
similarity index 77%
rename from packages/core/src/package/deploymentCustomizers/PicklistEnabler.ts
rename to packages/sfp-cli/src/core/package/deploymentCustomizers/PicklistEnabler.ts
index e2aebca93..b37b44ab9 100644
--- a/packages/core/src/package/deploymentCustomizers/PicklistEnabler.ts
+++ b/packages/sfp-cli/src/core/package/deploymentCustomizers/PicklistEnabler.ts
@@ -1,4 +1,4 @@
-import SFPLogger, { Logger, LoggerLevel } from '@dxatscale/sfp-logger';
+import SFPLogger, { Logger, LoggerLevel } from '@flxblio/sfp-logger';
import { ComponentSet, registry } from '@salesforce/source-deploy-retrieve';
import SfpPackage, { PackageType } from '../SfpPackage';
import { Connection } from '@salesforce/core';
@@ -8,6 +8,7 @@ import { DeploySourceResult } from '../../deployers/DeploymentExecutor';
import SFPOrg from '../../org/SFPOrg';
import { Schema } from 'jsforce';
import { DeploymentOptions } from '../../deployers/DeploySourceToOrgImpl';
+import Bottleneck from "bottleneck";
const QUERY_BODY = 'SELECT Id FROM FieldDefinition WHERE EntityDefinition.QualifiedApiName = ';
@@ -68,7 +69,7 @@ export default class PicklistEnabler implements DeploymentCustomizer {
SFPLogger.log(
`Fetching picklist for custom field ${picklistName} on object ${objName}`,
- LoggerLevel.INFO,
+ LoggerLevel.TRACE,
logger
);
@@ -76,15 +77,14 @@ export default class PicklistEnabler implements DeploymentCustomizer {
//check for empty picklists on org and fix first deployment issue
if (!picklistInOrg?.Metadata?.valueSet?.valueSetDefinition) {
- SFPLogger.log(
+ SFPLogger.log(
`Picklist field ${objName}.${picklistName} not in target Org. Skipping`,
LoggerLevel.TRACE,
logger
);
- continue;
+ continue;
}
-
let picklistValueInOrg = [];
for (const value of picklistInOrg.Metadata.valueSet.valueSetDefinition.value) {
@@ -104,12 +104,31 @@ export default class PicklistEnabler implements DeploymentCustomizer {
let isPickListIdentical = this.arePicklistsIdentical(picklistValueInOrg, picklistValueSource);
+ const limiter = new Bottleneck({maxConcurrent: 1});
+
+ limiter.on("failed", async (error, jobInfo) => {
+
+ if (jobInfo.retryCount < 5 && error.message.includes('background')) {
+ return 30000;
+ } else if (jobInfo.retryCount >= 5 && error.message.includes('background')) {
+ throw new Error(`Retry limit exceeded (3 minutes). Unable to process Picklist update.`);
+ } else {
+ throw new Error(`Unable to update picklist for custom field ${objName}.${picklistName} due to ${error.message}`);
+ }
+ });
+
+ limiter.on("retry", (error, jobInfo) => SFPLogger.log(
+ `Background job is beeing executed. Retrying (${jobInfo.retryCount + 1}/5) after 30 seconds...`,
+ LoggerLevel.WARN,
+ logger
+ ));
+
if (!isPickListIdentical) {
- this.deployPicklist(picklistInOrg, picklistValueSource, sfpOrg.getConnection(), logger);
+ await limiter.schedule(() => this.deployPicklist(picklistInOrg, picklistValueSource, sfpOrg.getConnection(), logger));
} else {
SFPLogger.log(
`Picklist for custom field ${objName}.${picklistName} is identical to the source.No deployment`,
- LoggerLevel.INFO,
+ LoggerLevel.TRACE,
logger
);
}
@@ -122,8 +141,7 @@ export default class PicklistEnabler implements DeploymentCustomizer {
};
}
} catch (error) {
- SFPLogger.log(`Unable to process Picklist update due to ${error.message}`, LoggerLevel.WARN, logger);
- SFPLogger.log(`Error Details : ${error.stack}`, LoggerLevel.TRACE);
+ throw new Error(`Unable to process Picklist update due to ${error.message}`);
}
}
@@ -160,15 +178,23 @@ export default class PicklistEnabler implements DeploymentCustomizer {
if (Array.isArray(values)) {
for (const value of values) {
//ignore inactive values from source
- if(!value?.isActive || value?.isActive == 'true'){
- picklistValueSet.push({fullName: value['fullName'] ? decodeURI(value['fullName']) : value['fullName'] , default: value.default, label: value['label'] ? decodeURI(value['label']) : value['label']});
+ if (!value?.isActive || value?.isActive == 'true') {
+ picklistValueSet.push({
+ fullName: value['fullName'] ? decodeURI(value['fullName']) : value['fullName'],
+ default: value.default,
+ label: value['label'] ? decodeURI(value['label']) : value['label'],
+ });
}
}
} else if (typeof values === 'object' && 'fullName' in values) {
//ignore inactive values from source
- if(!values?.isActive || values?.isActive == 'true'){
- picklistValueSet.push({fullName: values['fullName'] ? decodeURI(values['fullName']) : values['fullName'] , default: values.default, label: values['label'] ? decodeURI(values['label']) : values['label']});
- }
+ if (!values?.isActive || values?.isActive == 'true') {
+ picklistValueSet.push({
+ fullName: values['fullName'] ? decodeURI(values['fullName']) : values['fullName'],
+ default: values.default,
+ label: values['label'] ? decodeURI(values['label']) : values['label'],
+ });
+ }
}
return picklistValueSet;
}
@@ -203,13 +229,8 @@ export default class PicklistEnabler implements DeploymentCustomizer {
FullName: picklistInOrg.FullName,
};
SFPLogger.log(`Update picklist for custom field ${picklistToDeploy.FullName}`, LoggerLevel.INFO, logger);
- try {
- await conn.tooling.sobject('CustomField').update(picklistToDeploy);
- } catch (error) {
- throw new Error(
- `Unable to update picklist for custom field ${picklistToDeploy.FullName} due to ${error.message}`
- );
- }
+ await conn.tooling.sobject('CustomField').update(picklistToDeploy);
+
}
public getName(): string {
diff --git a/packages/core/src/package/deploymentCustomizers/PostDeployersRegistry.ts b/packages/sfp-cli/src/core/package/deploymentCustomizers/PostDeployersRegistry.ts
similarity index 79%
rename from packages/core/src/package/deploymentCustomizers/PostDeployersRegistry.ts
rename to packages/sfp-cli/src/core/package/deploymentCustomizers/PostDeployersRegistry.ts
index d2ac675f6..5c60239d8 100644
--- a/packages/core/src/package/deploymentCustomizers/PostDeployersRegistry.ts
+++ b/packages/sfp-cli/src/core/package/deploymentCustomizers/PostDeployersRegistry.ts
@@ -1,6 +1,7 @@
import { DeploymentCustomizer } from './DeploymentCustomizer';
import FHTEnabler from './FHTEnabler';
import FTEnabler from './FTEnabler';
+import FlowActivator from './FlowActivator';
export class PostDeployersRegistry {
@@ -10,8 +11,10 @@ export class PostDeployersRegistry {
//TODO: Make dynamic
let fhtEnabler = new FHTEnabler();
let ftEnabler = new FTEnabler();
+ let flowActivator = new FlowActivator();
postDeployers.push(fhtEnabler);
postDeployers.push(ftEnabler);
+ postDeployers.push(flowActivator);
return postDeployers;
}
diff --git a/packages/core/src/package/deploymentCustomizers/PreDeployersRegistry.ts b/packages/sfp-cli/src/core/package/deploymentCustomizers/PreDeployersRegistry.ts
similarity index 100%
rename from packages/core/src/package/deploymentCustomizers/PreDeployersRegistry.ts
rename to packages/sfp-cli/src/core/package/deploymentCustomizers/PreDeployersRegistry.ts
diff --git a/packages/core/src/package/deploymentFilters/DeploymentFilter.ts b/packages/sfp-cli/src/core/package/deploymentFilters/DeploymentFilter.ts
similarity index 87%
rename from packages/core/src/package/deploymentFilters/DeploymentFilter.ts
rename to packages/sfp-cli/src/core/package/deploymentFilters/DeploymentFilter.ts
index 3f42ac693..47290e189 100644
--- a/packages/core/src/package/deploymentFilters/DeploymentFilter.ts
+++ b/packages/sfp-cli/src/core/package/deploymentFilters/DeploymentFilter.ts
@@ -1,5 +1,5 @@
import { ComponentSet } from "@salesforce/source-deploy-retrieve";
-import { Logger } from "@dxatscale/sfp-logger";
+import { Logger } from "@flxblio/sfp-logger";
import SFPOrg from "../../org/SFPOrg";
import { PackageType } from "../SfpPackage";
diff --git a/packages/core/src/package/deploymentFilters/DeploymentFilterRegistry.ts b/packages/sfp-cli/src/core/package/deploymentFilters/DeploymentFilterRegistry.ts
similarity index 96%
rename from packages/core/src/package/deploymentFilters/DeploymentFilterRegistry.ts
rename to packages/sfp-cli/src/core/package/deploymentFilters/DeploymentFilterRegistry.ts
index 4e5721e2f..1b22a645b 100644
--- a/packages/core/src/package/deploymentFilters/DeploymentFilterRegistry.ts
+++ b/packages/sfp-cli/src/core/package/deploymentFilters/DeploymentFilterRegistry.ts
@@ -11,8 +11,7 @@ export class DeploymentFilterRegistry {
//TODO: Make dynamic
let entitlementVersionFilter = new EntitlementVersionFilter();
deploymentFilterImpls.push(entitlementVersionFilter);
-
-
+
return deploymentFilterImpls;
}
}
diff --git a/packages/core/src/package/deploymentFilters/EntitlementVersionFilter.ts b/packages/sfp-cli/src/core/package/deploymentFilters/EntitlementVersionFilter.ts
similarity index 96%
rename from packages/core/src/package/deploymentFilters/EntitlementVersionFilter.ts
rename to packages/sfp-cli/src/core/package/deploymentFilters/EntitlementVersionFilter.ts
index dac20fefa..47d9399c8 100644
--- a/packages/core/src/package/deploymentFilters/EntitlementVersionFilter.ts
+++ b/packages/sfp-cli/src/core/package/deploymentFilters/EntitlementVersionFilter.ts
@@ -1,7 +1,7 @@
import { ComponentSet, registry } from '@salesforce/source-deploy-retrieve';
import SFPOrg from '../../org/SFPOrg';
import QueryHelper from '../../queryHelper/QueryHelper';
-import SFPLogger, { Logger, LoggerLevel } from '@dxatscale/sfp-logger';
+import SFPLogger, { Logger, LoggerLevel } from '@flxblio/sfp-logger';
import { DeploymentFilter } from './DeploymentFilter';
import * as fs from 'fs-extra';
import SettingsFetcher from '../../metadata/SettingsFetcher';
@@ -93,7 +93,7 @@ export default class EntitlementVersionFilter implements DeploymentFilter {
public isToApply(projectConfig: any, packageType: string): boolean {
if (packageType != PackageType.Source) return false;
- if (projectConfig?.plugins?.sfpowerscripts?.disableEntitlementFilter) return false;
+ if (projectConfig?.plugins?.sfp?.disableEntitlementFilter) return false;
else return true;
}
diff --git a/packages/core/src/package/diff/PackageComponentDiff.ts b/packages/sfp-cli/src/core/package/diff/PackageComponentDiff.ts
similarity index 99%
rename from packages/core/src/package/diff/PackageComponentDiff.ts
rename to packages/sfp-cli/src/core/package/diff/PackageComponentDiff.ts
index a41bb16c8..10bd597bd 100644
--- a/packages/core/src/package/diff/PackageComponentDiff.ts
+++ b/packages/sfp-cli/src/core/package/diff/PackageComponentDiff.ts
@@ -4,7 +4,7 @@ import * as fs from 'fs-extra';
import * as rimraf from 'rimraf';
import * as _ from 'lodash';
import simplegit from 'simple-git';
-import SFPLogger, { Logger, LoggerLevel } from '@dxatscale/sfp-logger';
+import SFPLogger, { Logger, LoggerLevel } from '@flxblio/sfp-logger';
import ProjectConfig from '../../project/ProjectConfig';
import MetadataFiles from '../../metadata/MetadataFiles';
import { SOURCE_EXTENSION_REGEX, MetadataInfo, METADATA_INFO } from '../../metadata/MetadataInfo';
diff --git a/packages/core/src/package/diff/PackageDiffImpl.ts b/packages/sfp-cli/src/core/package/diff/PackageDiffImpl.ts
similarity index 76%
rename from packages/core/src/package/diff/PackageDiffImpl.ts
rename to packages/sfp-cli/src/core/package/diff/PackageDiffImpl.ts
index 356d9f3f8..0db86d634 100644
--- a/packages/core/src/package/diff/PackageDiffImpl.ts
+++ b/packages/sfp-cli/src/core/package/diff/PackageDiffImpl.ts
@@ -2,7 +2,7 @@ const fs = require('fs');
const path = require('path');
import Git from '../../git/Git';
import IgnoreFiles from '../../ignore/IgnoreFiles';
-import SFPLogger, { COLOR_ERROR, COLOR_KEY_MESSAGE, Logger, LoggerLevel } from '@dxatscale/sfp-logger';
+import SFPLogger, { COLOR_ERROR, COLOR_KEY_MESSAGE, Logger, LoggerLevel } from '@flxblio/sfp-logger';
import ProjectConfig from '../../project/ProjectConfig';
import GitTags from '../../git/GitTags';
import lodash = require('lodash');
@@ -15,6 +15,9 @@ export class PackageDiffOptions {
useLatestGitTags?:boolean=true;
packagesMappedToLastKnownCommitId?: { [p: string]: string };
pathToReplacementForceIgnore?: string;
+ useBranchCompare?: boolean = false;
+ branch?: string;
+ baseBranch?: string;
}
export default class PackageDiffImpl {
@@ -52,7 +55,15 @@ export default class PackageDiffImpl {
// Get the list of modified files between the tag and HEAD refs
let modified_files: string[];
try {
- modified_files = await git.diff([`${tag}`, `HEAD`, `--no-renames`, `--name-only`]);
+ if(this.diffOptions?.useBranchCompare)
+ {
+ const mergeBase = await git.raw(['merge-base', this.diffOptions.branch, this.diffOptions.baseBranch]);
+ modified_files = await git.diff(['--no-renames','--name-only', this.diffOptions.branch, mergeBase.trim()]);
+ }
+ else
+ {
+ modified_files = await git.diff([`${tag}`, `HEAD`, `--no-renames`, `--name-only`]);
+ }
} catch (error) {
SFPLogger.log(COLOR_ERROR(`Unable to compute diff, The head of the branch is not reachable from the commit id ${tag}`));
SFPLogger.log(COLOR_ERROR(`Check your current branch (in case of build) or the scratch org in case of validate command`));
@@ -97,12 +108,36 @@ export default class PackageDiffImpl {
return { isToBeBuilt: false, reason: `No changes found`, tag: tag };
} else {
- SFPLogger.log(
- `Tag missing for ${this.sfdx_package}...marking package for build anyways`,
- LoggerLevel.TRACE,
- this.logger
- );
- return { isToBeBuilt: true, reason: `Previous version not found` };
+
+ if(this.diffOptions?.useBranchCompare)
+ {
+ const mergeBase = await git.raw(['merge-base', this.diffOptions.branch, this.diffOptions.baseBranch]);
+ let modified_files = await git.diff(['--no-renames','--name-only', this.diffOptions.branch, mergeBase.trim()]);
+
+ // Check whether the package has been modified
+ for (let filename of modified_files) {
+
+ let normalizedPkgPath = path.normalize(pkgDescriptor.path);
+ let normalizedFilename = path.normalize(filename);
+
+ let relativePath = path.relative(normalizedPkgPath, normalizedFilename);
+
+ if (!relativePath.startsWith('..')) {
+ SFPLogger.log(`Found change(s) in ${filename}`, LoggerLevel.TRACE, this.logger);
+ return { isToBeBuilt: true, reason: `Found change(s) in package`, tag: tag };
+ }
+ }
+ return { isToBeBuilt: false, reason: `No changes found`, tag: tag };
+
+ }
+ else {
+ SFPLogger.log(
+ `Tag missing for ${this.sfdx_package}...marking package for build anyways`,
+ LoggerLevel.TRACE,
+ this.logger
+ );
+ return { isToBeBuilt: true, reason: `Previous version not found` };
+ }
}
}
diff --git a/packages/core/src/package/generators/SfpPackageContentGenerator.ts b/packages/sfp-cli/src/core/package/generators/SfpPackageContentGenerator.ts
similarity index 98%
rename from packages/core/src/package/generators/SfpPackageContentGenerator.ts
rename to packages/sfp-cli/src/core/package/generators/SfpPackageContentGenerator.ts
index ab4875b31..2ee30b326 100644
--- a/packages/core/src/package/generators/SfpPackageContentGenerator.ts
+++ b/packages/sfp-cli/src/core/package/generators/SfpPackageContentGenerator.ts
@@ -1,6 +1,6 @@
import ProjectConfig from '../../project/ProjectConfig';
import * as rimraf from 'rimraf';
-import SFPLogger, { Logger, LoggerLevel } from '@dxatscale/sfp-logger';
+import SFPLogger, { Logger, LoggerLevel } from '@flxblio/sfp-logger';
import { mkdirpSync } from 'fs-extra';
import * as fs from 'fs-extra';
import PackageComponentDiff from '../diff/PackageComponentDiff';
@@ -190,7 +190,7 @@ export default class SfpPackageContentGenerator {
mkdirpSync(forceIgnoresDir);
let projectConfig = ProjectConfig.getSFDXProjectConfig(projectDirectory);
- let ignoreFiles = projectConfig.plugins?.sfpowerscripts?.ignoreFiles;
+ let ignoreFiles = projectConfig.plugins?.sfp?.ignoreFiles;
//TODO: Make this readable
//This is a fix when sfppackage is used in stages where build is not involved
diff --git a/packages/core/src/package/packageCreators/CreateDataPackageImpl.ts b/packages/sfp-cli/src/core/package/packageCreators/CreateDataPackageImpl.ts
similarity index 94%
rename from packages/core/src/package/packageCreators/CreateDataPackageImpl.ts
rename to packages/sfp-cli/src/core/package/packageCreators/CreateDataPackageImpl.ts
index 24998370d..5d59eadba 100644
--- a/packages/core/src/package/packageCreators/CreateDataPackageImpl.ts
+++ b/packages/sfp-cli/src/core/package/packageCreators/CreateDataPackageImpl.ts
@@ -1,4 +1,4 @@
-import SFPLogger, { LoggerLevel, Logger } from '@dxatscale/sfp-logger';
+import SFPLogger, { LoggerLevel, Logger } from '@flxblio/sfp-logger';
import path from 'path';
import FileSystem from '../../utils/FileSystem';
import { CreatePackage } from './CreatePackage';
@@ -79,7 +79,7 @@ export default class CreateDataPackageImpl extends CreatePackage {
);
} else {
throw new Error(
- `Could not find export.json or VlocityComponents.yaml in ${packageDirectory}. sfpowerscripts only support vlocity or sfdmu based data packages`
+ `Could not find export.json or VlocityComponents.yaml in ${packageDirectory}. sfp only support vlocity or sfdmu based data packages`
);
}
}
diff --git a/packages/core/src/package/packageCreators/CreateDiffPackageImpl.ts b/packages/sfp-cli/src/core/package/packageCreators/CreateDiffPackageImpl.ts
similarity index 98%
rename from packages/core/src/package/packageCreators/CreateDiffPackageImpl.ts
rename to packages/sfp-cli/src/core/package/packageCreators/CreateDiffPackageImpl.ts
index a0bacd531..e94b293ab 100644
--- a/packages/core/src/package/packageCreators/CreateDiffPackageImpl.ts
+++ b/packages/sfp-cli/src/core/package/packageCreators/CreateDiffPackageImpl.ts
@@ -1,4 +1,4 @@
-import SFPLogger, { LoggerLevel, Logger } from '@dxatscale/sfp-logger';
+import SFPLogger, { LoggerLevel, Logger } from '@flxblio/sfp-logger';
import { ApexSortedByType } from '../../apex/parser/ApexTypeFetcher';
import SFPStatsSender from '../../stats/SFPStatsSender';
import PackageEmptyChecker from '../validators/PackageEmptyChecker';
@@ -135,7 +135,7 @@ export default class CreateDiffPackageImp extends CreateSourcePackageImpl {
}
//remove diffSrcDir
if (fs.pathExistsSync(path.join(workingDirectory, 'diff')))
- fs.rmSync(path.join(workingDirectory, 'diff'), { recursive: true, force: true });
+ fs.removeSync(path.join(workingDirectory, 'diff'));
}
async mapInstalledArtifactstoPkgAndCommits(installedArtifacts: any) {
diff --git a/packages/core/src/package/packageCreators/CreatePackage.ts b/packages/sfp-cli/src/core/package/packageCreators/CreatePackage.ts
similarity index 99%
rename from packages/core/src/package/packageCreators/CreatePackage.ts
rename to packages/sfp-cli/src/core/package/packageCreators/CreatePackage.ts
index 8d9133dcd..4f5225b8d 100644
--- a/packages/core/src/package/packageCreators/CreatePackage.ts
+++ b/packages/sfp-cli/src/core/package/packageCreators/CreatePackage.ts
@@ -1,4 +1,4 @@
-import SFPLogger, { COLOR_HEADER, COLOR_KEY_MESSAGE, COLOR_WARNING, Logger, LoggerLevel } from '@dxatscale/sfp-logger';
+import SFPLogger, { COLOR_HEADER, COLOR_KEY_MESSAGE, COLOR_WARNING, Logger, LoggerLevel } from '@flxblio/sfp-logger';
import SFPStatsSender from '../../stats/SFPStatsSender';
import SfpPackage, { PackageType, SfpPackageParams } from '../SfpPackage';
import { PackageCreationParams } from '../SfpPackageBuilder';
diff --git a/packages/core/src/package/packageCreators/CreateSourcePackageImpl.ts b/packages/sfp-cli/src/core/package/packageCreators/CreateSourcePackageImpl.ts
similarity index 95%
rename from packages/core/src/package/packageCreators/CreateSourcePackageImpl.ts
rename to packages/sfp-cli/src/core/package/packageCreators/CreateSourcePackageImpl.ts
index 0d9afb51a..bbef35a16 100644
--- a/packages/core/src/package/packageCreators/CreateSourcePackageImpl.ts
+++ b/packages/sfp-cli/src/core/package/packageCreators/CreateSourcePackageImpl.ts
@@ -1,4 +1,4 @@
-import SFPLogger, { LoggerLevel, Logger } from '@dxatscale/sfp-logger';
+import SFPLogger, { LoggerLevel, Logger } from '@flxblio/sfp-logger';
import { EOL } from 'os';
import { ApexSortedByType, FileDescriptor } from '../../apex/parser/ApexTypeFetcher';
import SFPStatsSender from '../../stats/SFPStatsSender';
@@ -7,9 +7,9 @@ import SfpPackage, { PackageType, SfpPackageParams } from '../SfpPackage';
import { CreatePackage } from './CreatePackage';
import { PackageCreationParams } from '../SfpPackageBuilder';
import { ZERO_BORDER_TABLE } from '../../display/TableConstants';
-import { COLOR_INFO } from '@dxatscale/sfp-logger';
-import { COLOR_HEADER } from '@dxatscale/sfp-logger';
-import { COLOR_WARNING } from '@dxatscale/sfp-logger';
+import { COLOR_INFO } from '@flxblio/sfp-logger';
+import { COLOR_HEADER } from '@flxblio/sfp-logger';
+import { COLOR_WARNING } from '@flxblio/sfp-logger';
const Table = require('cli-table');
export default class CreateSourcePackageImpl extends CreatePackage {
diff --git a/packages/core/src/package/packageCreators/CreateUnlockedPackageImpl.ts b/packages/sfp-cli/src/core/package/packageCreators/CreateUnlockedPackageImpl.ts
similarity index 96%
rename from packages/core/src/package/packageCreators/CreateUnlockedPackageImpl.ts
rename to packages/sfp-cli/src/core/package/packageCreators/CreateUnlockedPackageImpl.ts
index c70e44967..3d15823b1 100644
--- a/packages/core/src/package/packageCreators/CreateUnlockedPackageImpl.ts
+++ b/packages/sfp-cli/src/core/package/packageCreators/CreateUnlockedPackageImpl.ts
@@ -1,5 +1,5 @@
import ProjectConfig from '../../project/ProjectConfig';
-import SFPLogger, { LoggerLevel, Logger, COLOR_KEY_MESSAGE } from '@dxatscale/sfp-logger';
+import SFPLogger, { LoggerLevel, Logger, COLOR_KEY_MESSAGE } from '@flxblio/sfp-logger';
import * as fs from 'fs-extra';
import { delay } from '../../utils/Delay';
import SfpPackage, { PackageType, SfpPackageParams } from '../SfpPackage';
@@ -70,8 +70,8 @@ export default class CreateUnlockedPackageImpl extends CreatePackage {
SFPLogger.log(`Package Id ${packageTypeInfo.Id}`, LoggerLevel.INFO, this.logger);
SFPLogger.log('-------------------------', LoggerLevel.INFO, this.logger);
- //cleanup sfpowerscripts constructs in working directory
- this.deleteSFPowerscriptsAdditionsToProjectConfig(this.workingDirectory);
+ //cleanup sfp constructs in working directory
+ this.deletesfpAdditionsToProjectConfig(this.workingDirectory);
//Resolve the package dependencies
if (this.isOrgDependentPackage) {
@@ -163,7 +163,7 @@ export default class CreateUnlockedPackageImpl extends CreatePackage {
throw new Error(
`The build for ${this.sfpPackage.packageName} was not completed in the wait time ${this.packageCreationParams.waitTime} provided.${EOL}
You might want to increase the wait time or better check the dependencies or convert to different package type ${EOL}
- Read more about it here https://docs.dxatscale.io/development-practices/types-of-packaging/unlocked-packages#build-options-with-unlocked-packages`
+ Read more about it here https://docs.flxblio.io/development-practices/types-of-packaging/unlocked-packages#build-options-with-unlocked-packages`
);
}
@@ -195,7 +195,7 @@ export default class CreateUnlockedPackageImpl extends CreatePackage {
printAdditionalPackageSpecificHeaders() {}
- private deleteSFPowerscriptsAdditionsToProjectConfig(workingDirectory: string) {
+ private deletesfpAdditionsToProjectConfig(workingDirectory: string) {
let projectManifestFromWorkingDirectory = ProjectConfig.getSFDXProjectConfig(workingDirectory);
let packageDescriptorInWorkingDirectory = ProjectConfig.getPackageDescriptorFromConfig(
this.sfpPackage.packageName,
@@ -204,7 +204,7 @@ export default class CreateUnlockedPackageImpl extends CreatePackage {
fs.writeJsonSync(path.join(workingDirectory, 'sfdx-project-bak.json'), projectManifestFromWorkingDirectory);
- //Cleanup sfpowerscripts constructs
+ //Cleanup sfp constructs
if (this.isOrgDependentPackage) delete packageDescriptorInWorkingDirectory['dependencies'];
delete packageDescriptorInWorkingDirectory['type'];
diff --git a/packages/core/src/package/packageFormatConvertors/SourceToMDAPIConvertor.ts b/packages/sfp-cli/src/core/package/packageFormatConvertors/SourceToMDAPIConvertor.ts
similarity index 96%
rename from packages/core/src/package/packageFormatConvertors/SourceToMDAPIConvertor.ts
rename to packages/sfp-cli/src/core/package/packageFormatConvertors/SourceToMDAPIConvertor.ts
index 1ff72b860..102fc7161 100644
--- a/packages/core/src/package/packageFormatConvertors/SourceToMDAPIConvertor.ts
+++ b/packages/sfp-cli/src/core/package/packageFormatConvertors/SourceToMDAPIConvertor.ts
@@ -1,6 +1,6 @@
import { ComponentSet, MetadataConverter } from '@salesforce/source-deploy-retrieve';
import path from 'path';
-import SFPLogger, { Logger, LoggerLevel } from '@dxatscale/sfp-logger';
+import SFPLogger, { Logger, LoggerLevel } from '@flxblio/sfp-logger';
export default class SourceToMDAPIConvertor {
public constructor(
diff --git a/packages/core/src/package/packageInstallers/InstallDataPackageImpl.ts b/packages/sfp-cli/src/core/package/packageInstallers/InstallDataPackageImpl.ts
similarity index 94%
rename from packages/core/src/package/packageInstallers/InstallDataPackageImpl.ts
rename to packages/sfp-cli/src/core/package/packageInstallers/InstallDataPackageImpl.ts
index 7e488f0d9..9d4af0579 100644
--- a/packages/core/src/package/packageInstallers/InstallDataPackageImpl.ts
+++ b/packages/sfp-cli/src/core/package/packageInstallers/InstallDataPackageImpl.ts
@@ -1,8 +1,8 @@
const fs = require('fs-extra');
-import SFPLogger, { Logger, LoggerLevel } from '@dxatscale/sfp-logger';
+import SFPLogger, { Logger, LoggerLevel } from '@flxblio/sfp-logger';
import SFDMURunImpl from '../../sfdmuwrapper/SFDMURunImpl';
import VlocityPackDeployImpl from '../../vlocitywrapper/VlocityPackDeployImpl';
-import { SFDXCommand } from '@dxatscale/sfdx-process-wrapper/lib/SFDXCommand';
+import { SFDXCommand } from '@flxblio/sfdx-process-wrapper/lib/SFDXCommand';
const path = require('path');
import OrgDetailsFetcher from '../../org/OrgDetailsFetcher';
import { InstallPackage, SfpPackageInstallationOptions } from './InstallPackage';
@@ -97,7 +97,7 @@ export default class InstallDataPackageImpl extends InstallPackage {
return 'vlocity';
} else {
throw new Error(
- `Could not find export.json or VlocityComponents.yaml in ${packageDirectory}. sfpowerscripts only support vlocity or sfdmu based data packages`
+ `Could not find export.json or VlocityComponents.yaml in ${packageDirectory}. sfp only support vlocity or sfdmu based data packages`
);
}
}
diff --git a/packages/core/src/package/packageInstallers/InstallPackage.ts b/packages/sfp-cli/src/core/package/packageInstallers/InstallPackage.ts
similarity index 99%
rename from packages/core/src/package/packageInstallers/InstallPackage.ts
rename to packages/sfp-cli/src/core/package/packageInstallers/InstallPackage.ts
index 830fb5f4e..c501f872b 100644
--- a/packages/core/src/package/packageInstallers/InstallPackage.ts
+++ b/packages/sfp-cli/src/core/package/packageInstallers/InstallPackage.ts
@@ -1,4 +1,4 @@
-import SFPLogger, { COLOR_KEY_MESSAGE, Logger, LoggerLevel } from '@dxatscale/sfp-logger';
+import SFPLogger, { COLOR_KEY_MESSAGE, Logger, LoggerLevel } from '@flxblio/sfp-logger';
import { PackageInstallationResult, PackageInstallationStatus } from './PackageInstallationResult';
import ProjectConfig from '../../project/ProjectConfig';
import SFPStatsSender from '../../stats/SFPStatsSender';
@@ -21,7 +21,7 @@ import { ComponentSet } from '@salesforce/source-deploy-retrieve';
import PackageComponentPrinter from '../../display/PackageComponentPrinter';
import DeployErrorDisplayer from '../../display/DeployErrorDisplayer';
import { PreDeployersRegistry } from '../deploymentCustomizers/PreDeployersRegistry';
-import { AnalyzerRegistry } from '../../package/analyser/AnalyzerRegistry';
+import { AnalyzerRegistry } from '../analyser/AnalyzerRegistry';
export class SfpPackageInstallationOptions {
installationkey?: string;
@@ -318,7 +318,7 @@ export abstract class InstallPackage {
try {
if (await postDeployer.isEnabled(this.sfpPackage, this.connection, this.logger)) {
SFPLogger.log(
- `Executing Pre Deployer ${COLOR_KEY_MESSAGE(postDeployer.getName())}`,
+ `Executing Post Deployer ${COLOR_KEY_MESSAGE(postDeployer.getName())}`,
LoggerLevel.INFO,
this.logger
);
diff --git a/packages/core/src/package/packageInstallers/InstallSourcePackageImpl.ts b/packages/sfp-cli/src/core/package/packageInstallers/InstallSourcePackageImpl.ts
similarity index 99%
rename from packages/core/src/package/packageInstallers/InstallSourcePackageImpl.ts
rename to packages/sfp-cli/src/core/package/packageInstallers/InstallSourcePackageImpl.ts
index b154c7e38..dee64cf99 100644
--- a/packages/core/src/package/packageInstallers/InstallSourcePackageImpl.ts
+++ b/packages/sfp-cli/src/core/package/packageInstallers/InstallSourcePackageImpl.ts
@@ -1,7 +1,7 @@
import DeploymentExecutor, { DeploySourceResult, DeploymentType } from '../../deployers/DeploymentExecutor';
import ReconcileProfileAgainstOrgImpl from '../components/ReconcileProfileAgainstOrgImpl';
import DeployDestructiveManifestToOrgImpl from '../components/DeployDestructiveManifestToOrgImpl';
-import SFPLogger, { COLOR_SUCCESS, COLOR_WARNING, Logger, LoggerLevel } from '@dxatscale/sfp-logger';
+import SFPLogger, { COLOR_SUCCESS, COLOR_WARNING, Logger, LoggerLevel } from '@flxblio/sfp-logger';
import * as fs from 'fs-extra';
const path = require('path');
const tmp = require('tmp');
@@ -17,7 +17,7 @@ import { DeploymentFilterRegistry } from '../deploymentFilters/DeploymentFilterR
import DeploymentOptionDisplayer from '../../display/DeploymentOptionDisplayer';
import PackageComponentPrinter from '../../display/PackageComponentPrinter';
import DeployErrorDisplayer from '../../display/DeployErrorDisplayer';
-import { COLOR_ERROR } from '@dxatscale/sfp-logger';
+import { COLOR_ERROR } from '@flxblio/sfp-logger';
import { globSync } from 'glob';
export default class InstallSourcePackageImpl extends InstallPackage {
diff --git a/packages/core/src/package/packageInstallers/InstallUnlockedPackage.ts b/packages/sfp-cli/src/core/package/packageInstallers/InstallUnlockedPackage.ts
similarity index 96%
rename from packages/core/src/package/packageInstallers/InstallUnlockedPackage.ts
rename to packages/sfp-cli/src/core/package/packageInstallers/InstallUnlockedPackage.ts
index 517f55c21..6635b61e8 100644
--- a/packages/core/src/package/packageInstallers/InstallUnlockedPackage.ts
+++ b/packages/sfp-cli/src/core/package/packageInstallers/InstallUnlockedPackage.ts
@@ -1,10 +1,10 @@
-import SFPLogger, { Logger, LoggerLevel } from '@dxatscale/sfp-logger';
+import SFPLogger, { Logger, LoggerLevel } from '@flxblio/sfp-logger';
import PackageMetadataPrinter from '../../display/PackageMetadataPrinter';
import { InstallPackage, SfpPackageInstallationOptions } from './InstallPackage';
import SfpPackage from '../SfpPackage';
import SFPOrg from '../../org/SFPOrg';
import InstallUnlockedPackageImpl from './InstallUnlockedPackageImpl';
-import { COLOR_KEY_MESSAGE } from '@dxatscale/sfp-logger';
+import { COLOR_KEY_MESSAGE } from '@flxblio/sfp-logger';
import { EOL } from 'os';
export default class InstallUnlockedPackage extends InstallPackage {
diff --git a/packages/core/src/package/packageInstallers/InstallUnlockedPackageCollection.ts b/packages/sfp-cli/src/core/package/packageInstallers/InstallUnlockedPackageCollection.ts
similarity index 97%
rename from packages/core/src/package/packageInstallers/InstallUnlockedPackageCollection.ts
rename to packages/sfp-cli/src/core/package/packageInstallers/InstallUnlockedPackageCollection.ts
index 5f99a2723..34af33f68 100644
--- a/packages/core/src/package/packageInstallers/InstallUnlockedPackageCollection.ts
+++ b/packages/sfp-cli/src/core/package/packageInstallers/InstallUnlockedPackageCollection.ts
@@ -1,9 +1,9 @@
-import SFPLogger, { Logger, LoggerLevel } from '@dxatscale/sfp-logger';
+import SFPLogger, { Logger, LoggerLevel } from '@flxblio/sfp-logger';
import Package2Detail from '../Package2Detail';
import InstallUnlockedPackageImpl from './InstallUnlockedPackageImpl';
import SFPOrg from '../../org/SFPOrg';
import { SfpPackageInstallationOptions } from './InstallPackage';
-import { COLOR_KEY_MESSAGE } from '@dxatscale/sfp-logger';
+import { COLOR_KEY_MESSAGE } from '@flxblio/sfp-logger';
import { EOL } from 'os';
export default class InstallUnlockedPackageCollection {
diff --git a/packages/core/src/package/packageInstallers/InstallUnlockedPackageImpl.ts b/packages/sfp-cli/src/core/package/packageInstallers/InstallUnlockedPackageImpl.ts
similarity index 98%
rename from packages/core/src/package/packageInstallers/InstallUnlockedPackageImpl.ts
rename to packages/sfp-cli/src/core/package/packageInstallers/InstallUnlockedPackageImpl.ts
index fac5e2abf..41574d826 100644
--- a/packages/core/src/package/packageInstallers/InstallUnlockedPackageImpl.ts
+++ b/packages/sfp-cli/src/core/package/packageInstallers/InstallUnlockedPackageImpl.ts
@@ -1,4 +1,4 @@
-import SFPLogger, { COLOR_KEY_MESSAGE, COLOR_SUCCESS, Logger, LoggerLevel } from '@dxatscale/sfp-logger';
+import SFPLogger, { COLOR_KEY_MESSAGE, COLOR_SUCCESS, Logger, LoggerLevel } from '@flxblio/sfp-logger';
import PackageMetadataPrinter from '../../display/PackageMetadataPrinter';
import SFPOrg from '../../org/SFPOrg';
import { PackageInstallCreateRequest, PackagingSObjects, SubscriberPackageVersion } from '@salesforce/packaging';
diff --git a/packages/core/src/package/packageInstallers/PackageInstallationResult.ts b/packages/sfp-cli/src/core/package/packageInstallers/PackageInstallationResult.ts
similarity index 100%
rename from packages/core/src/package/packageInstallers/PackageInstallationResult.ts
rename to packages/sfp-cli/src/core/package/packageInstallers/PackageInstallationResult.ts
diff --git a/packages/core/src/package/packageMerger/PackageMergeManager.ts b/packages/sfp-cli/src/core/package/packageMerger/PackageMergeManager.ts
similarity index 97%
rename from packages/core/src/package/packageMerger/PackageMergeManager.ts
rename to packages/sfp-cli/src/core/package/packageMerger/PackageMergeManager.ts
index f06c97f2e..a8cb955e9 100644
--- a/packages/core/src/package/packageMerger/PackageMergeManager.ts
+++ b/packages/sfp-cli/src/core/package/packageMerger/PackageMergeManager.ts
@@ -1,10 +1,10 @@
import SfpPackage, { PackageType } from '../SfpPackage';
-import SfpPackageBuilder from '../../package/SfpPackageBuilder';
+import SfpPackageBuilder from '../SfpPackageBuilder';
const tmp = require('tmp');
import * as fs from 'fs-extra';
const path = require('path');
import { ComponentSet, MetadataConverter } from '@salesforce/source-deploy-retrieve';
-import { Logger } from '@dxatscale/sfp-logger';
+import { Logger } from '@flxblio/sfp-logger';
export default class PackageMergeManager {
public constructor(private sfpPackages: SfpPackage[], private logger?: Logger) {}
@@ -17,7 +17,7 @@ export default class PackageMergeManager {
mergeResult.requestedMergeOrder = this.sfpPackages;
- //Use the .sfpowerscripts directory
+ //Use the .sfp directory
let tmpDir = tmp.dirSync({ unsafeCleanup: true });
let locationOfCopiedDirectory = tmpDir.name;
//Create a temporary folder
diff --git a/packages/core/src/package/promote/PromoteUnlockedPackageImpl.ts b/packages/sfp-cli/src/core/package/promote/PromoteUnlockedPackageImpl.ts
similarity index 96%
rename from packages/core/src/package/promote/PromoteUnlockedPackageImpl.ts
rename to packages/sfp-cli/src/core/package/promote/PromoteUnlockedPackageImpl.ts
index 4ca8b05be..91ea99cef 100644
--- a/packages/core/src/package/promote/PromoteUnlockedPackageImpl.ts
+++ b/packages/sfp-cli/src/core/package/promote/PromoteUnlockedPackageImpl.ts
@@ -1,4 +1,4 @@
-import SFPLogger from '@dxatscale/sfp-logger';
+import SFPLogger from '@flxblio/sfp-logger';
import { SfProject } from '@salesforce/core';
import { PackageSaveResult, PackageVersion } from '@salesforce/packaging';
import SFPOrg from '../../org/SFPOrg';
diff --git a/packages/core/src/package/propertyFetchers/AssignPermissionSetFetcher.ts b/packages/sfp-cli/src/core/package/propertyFetchers/AssignPermissionSetFetcher.ts
similarity index 88%
rename from packages/core/src/package/propertyFetchers/AssignPermissionSetFetcher.ts
rename to packages/sfp-cli/src/core/package/propertyFetchers/AssignPermissionSetFetcher.ts
index b6c00bdcd..079f78469 100644
--- a/packages/core/src/package/propertyFetchers/AssignPermissionSetFetcher.ts
+++ b/packages/sfp-cli/src/core/package/propertyFetchers/AssignPermissionSetFetcher.ts
@@ -1,9 +1,9 @@
-import { Logger } from '@dxatscale/sfp-logger';
+import { Logger } from '@flxblio/sfp-logger';
import SfpPackage from '../SfpPackage';
import PropertyFetcher from './PropertyFetcher';
export default class AssignPermissionSetFetcher implements PropertyFetcher {
- public getSfpowerscriptsProperties(packageContents: SfpPackage, packageLogger?: Logger) {
+ public getsfpProperties(packageContents: SfpPackage, packageLogger?: Logger) {
if (packageContents.packageDescriptor.assignPermSetsPreDeployment) {
if (packageContents.packageDescriptor.assignPermSetsPreDeployment instanceof Array) {
packageContents.assignPermSetsPreDeployment =
diff --git a/packages/core/src/package/propertyFetchers/DestructiveManifestPathFetcher.ts b/packages/sfp-cli/src/core/package/propertyFetchers/DestructiveManifestPathFetcher.ts
similarity index 88%
rename from packages/core/src/package/propertyFetchers/DestructiveManifestPathFetcher.ts
rename to packages/sfp-cli/src/core/package/propertyFetchers/DestructiveManifestPathFetcher.ts
index d9c224278..c4b05c5de 100644
--- a/packages/core/src/package/propertyFetchers/DestructiveManifestPathFetcher.ts
+++ b/packages/sfp-cli/src/core/package/propertyFetchers/DestructiveManifestPathFetcher.ts
@@ -2,10 +2,10 @@ import * as fs from 'fs-extra';
import SfpPackage from '../SfpPackage';
import PropertyFetcher from './PropertyFetcher';
import xml2json from '../../utils/xml2json';
-import { Logger } from '@dxatscale/sfp-logger';
+import { Logger } from '@flxblio/sfp-logger';
export default class DestructiveManifestPathFetcher implements PropertyFetcher {
- public async getSfpowerscriptsProperties(packageContents: SfpPackage, packageLogger?: Logger) {
+ public async getsfpProperties(packageContents: SfpPackage, packageLogger?: Logger) {
let destructiveChangesPath: string;
if (packageContents.packageDescriptor === null || packageContents.packageDescriptor === undefined) {
diff --git a/packages/core/src/package/propertyFetchers/PropertyFetcher.ts b/packages/sfp-cli/src/core/package/propertyFetchers/PropertyFetcher.ts
similarity index 65%
rename from packages/core/src/package/propertyFetchers/PropertyFetcher.ts
rename to packages/sfp-cli/src/core/package/propertyFetchers/PropertyFetcher.ts
index 49465d8c2..fbe6c4f8e 100644
--- a/packages/core/src/package/propertyFetchers/PropertyFetcher.ts
+++ b/packages/sfp-cli/src/core/package/propertyFetchers/PropertyFetcher.ts
@@ -1,4 +1,4 @@
-import { Logger } from '@dxatscale/sfp-logger';
+import { Logger } from '@flxblio/sfp-logger';
import SfpPackage from '../SfpPackage';
export default interface PropertyFetcher {
@@ -7,5 +7,5 @@ export default interface PropertyFetcher {
* @param packageContents
* @param packageLogger
*/
- getSfpowerscriptsProperties(packageContents: SfpPackage, packageLogger?: Logger);
+ getsfpProperties(packageContents: SfpPackage, packageLogger?: Logger);
}
diff --git a/packages/core/src/package/propertyFetchers/ReconcileProfilePropertyFetcher.ts b/packages/sfp-cli/src/core/package/propertyFetchers/ReconcileProfilePropertyFetcher.ts
similarity index 81%
rename from packages/core/src/package/propertyFetchers/ReconcileProfilePropertyFetcher.ts
rename to packages/sfp-cli/src/core/package/propertyFetchers/ReconcileProfilePropertyFetcher.ts
index 39920307a..0e2bc06a0 100644
--- a/packages/core/src/package/propertyFetchers/ReconcileProfilePropertyFetcher.ts
+++ b/packages/sfp-cli/src/core/package/propertyFetchers/ReconcileProfilePropertyFetcher.ts
@@ -2,7 +2,7 @@ import SfpPackage from '../SfpPackage';
import PropertyFetcher from './PropertyFetcher';
export default class ReconcilePropertyFetcher implements PropertyFetcher {
- getSfpowerscriptsProperties(packageContents: SfpPackage, packageLogger?: any) {
+ getsfpProperties(packageContents: SfpPackage, packageLogger?: any) {
if (packageContents.packageDescriptor.hasOwnProperty('reconcileProfiles')) {
packageContents.reconcileProfiles = packageContents.packageDescriptor.reconcileProfiles;
}
diff --git a/packages/core/src/package/validators/PackageEmptyChecker.ts b/packages/sfp-cli/src/core/package/validators/PackageEmptyChecker.ts
similarity index 100%
rename from packages/core/src/package/validators/PackageEmptyChecker.ts
rename to packages/sfp-cli/src/core/package/validators/PackageEmptyChecker.ts
diff --git a/packages/core/src/package/version/Package2VersionFetcher.ts b/packages/sfp-cli/src/core/package/version/Package2VersionFetcher.ts
similarity index 100%
rename from packages/core/src/package/version/Package2VersionFetcher.ts
rename to packages/sfp-cli/src/core/package/version/Package2VersionFetcher.ts
diff --git a/packages/core/src/package/version/Package2VersionInstaller.ts b/packages/sfp-cli/src/core/package/version/Package2VersionInstaller.ts
similarity index 91%
rename from packages/core/src/package/version/Package2VersionInstaller.ts
rename to packages/sfp-cli/src/core/package/version/Package2VersionInstaller.ts
index 94c57a5a9..906bb37d0 100644
--- a/packages/core/src/package/version/Package2VersionInstaller.ts
+++ b/packages/sfp-cli/src/core/package/version/Package2VersionInstaller.ts
@@ -1,4 +1,4 @@
-import { Logger, LoggerLevel } from '@dxatscale/sfp-logger';
+import { Logger, LoggerLevel } from '@flxblio/sfp-logger';
export default class Package2VersionInstaller {
public constructor(
diff --git a/packages/core/src/package/version/PackageVersionLister.ts b/packages/sfp-cli/src/core/package/version/PackageVersionLister.ts
similarity index 100%
rename from packages/core/src/package/version/PackageVersionLister.ts
rename to packages/sfp-cli/src/core/package/version/PackageVersionLister.ts
diff --git a/packages/core/src/package/version/PackageVersionUpdater.ts b/packages/sfp-cli/src/core/package/version/PackageVersionUpdater.ts
similarity index 100%
rename from packages/core/src/package/version/PackageVersionUpdater.ts
rename to packages/sfp-cli/src/core/package/version/PackageVersionUpdater.ts
diff --git a/packages/core/src/permsets/AssignPermissionSets.ts b/packages/sfp-cli/src/core/permsets/AssignPermissionSets.ts
similarity index 92%
rename from packages/core/src/permsets/AssignPermissionSets.ts
rename to packages/sfp-cli/src/core/permsets/AssignPermissionSets.ts
index b4d7e2255..2ff6a45e1 100644
--- a/packages/core/src/permsets/AssignPermissionSets.ts
+++ b/packages/sfp-cli/src/core/permsets/AssignPermissionSets.ts
@@ -1,5 +1,5 @@
import { Connection } from '@salesforce/core';
-import { Logger } from '@dxatscale/sfp-logger';
+import { Logger } from '@flxblio/sfp-logger';
import AssignPermissionSetsImpl from './AssignPermissionSetsImpl';
export default class AssignPermissionSets {
diff --git a/packages/core/src/permsets/AssignPermissionSetsImpl.ts b/packages/sfp-cli/src/core/permsets/AssignPermissionSetsImpl.ts
similarity index 97%
rename from packages/core/src/permsets/AssignPermissionSetsImpl.ts
rename to packages/sfp-cli/src/core/permsets/AssignPermissionSetsImpl.ts
index b8c7322ce..ba0049e0f 100644
--- a/packages/core/src/permsets/AssignPermissionSetsImpl.ts
+++ b/packages/sfp-cli/src/core/permsets/AssignPermissionSetsImpl.ts
@@ -1,6 +1,6 @@
import { Connection } from '@salesforce/core';
import child_process = require('child_process');
-import SFPLogger, { Logger, LoggerLevel } from '@dxatscale/sfp-logger';
+import SFPLogger, { Logger, LoggerLevel } from '@flxblio/sfp-logger';
import PermissionSetFetcher from './PermissionSetFetcher';
import { ZERO_BORDER_TABLE } from '../display/TableConstants';
const Table = require('cli-table');
diff --git a/packages/core/src/permsets/PermissionSetFetcher.ts b/packages/sfp-cli/src/core/permsets/PermissionSetFetcher.ts
similarity index 100%
rename from packages/core/src/permsets/PermissionSetFetcher.ts
rename to packages/sfp-cli/src/core/permsets/PermissionSetFetcher.ts
diff --git a/packages/core/src/permsets/PermissionSetGroupUpdateAwaiter.ts b/packages/sfp-cli/src/core/permsets/PermissionSetGroupUpdateAwaiter.ts
similarity index 96%
rename from packages/core/src/permsets/PermissionSetGroupUpdateAwaiter.ts
rename to packages/sfp-cli/src/core/permsets/PermissionSetGroupUpdateAwaiter.ts
index daddae0b9..87d04b6d7 100644
--- a/packages/core/src/permsets/PermissionSetGroupUpdateAwaiter.ts
+++ b/packages/sfp-cli/src/core/permsets/PermissionSetGroupUpdateAwaiter.ts
@@ -1,5 +1,5 @@
import { Connection } from '@salesforce/core';
-import SFPLogger, { Logger, LoggerLevel } from '@dxatscale/sfp-logger';
+import SFPLogger, { Logger, LoggerLevel } from '@flxblio/sfp-logger';
import QueryHelper from '../queryHelper/QueryHelper';
import { delay } from '../utils/Delay';
diff --git a/packages/core/src/project/ProjectConfig.ts b/packages/sfp-cli/src/core/project/ProjectConfig.ts
similarity index 98%
rename from packages/core/src/project/ProjectConfig.ts
rename to packages/sfp-cli/src/core/project/ProjectConfig.ts
index e9a03d559..b9d918460 100644
--- a/packages/core/src/project/ProjectConfig.ts
+++ b/packages/sfp-cli/src/core/project/ProjectConfig.ts
@@ -1,5 +1,5 @@
const fs = require('fs-extra');
-import SFPLogger, { LoggerLevel } from '@dxatscale/sfp-logger';
+import SFPLogger, { LoggerLevel } from '@flxblio/sfp-logger';
import _ from 'lodash';
import { PackageType } from '../package/SfpPackage';
let path = require('path');
@@ -244,7 +244,7 @@ export default class ProjectConfig {
let originalPackageDirectory = projectConfig['packageDirectories'];
for (let pkg of originalPackageDirectory) {
for (const sfdxPackage of sfdxPackages) {
- if (pkg.name == sfdxPackage) {
+ if (pkg.package == sfdxPackage) {
pkg.default = false;
revisedPackageDirectory.push(pkg);
}
diff --git a/packages/core/src/project/UserDefinedExternalDependency.ts b/packages/sfp-cli/src/core/project/UserDefinedExternalDependency.ts
similarity index 86%
rename from packages/core/src/project/UserDefinedExternalDependency.ts
rename to packages/sfp-cli/src/core/project/UserDefinedExternalDependency.ts
index 64a8f2f75..a56301ad5 100644
--- a/packages/core/src/project/UserDefinedExternalDependency.ts
+++ b/packages/sfp-cli/src/core/project/UserDefinedExternalDependency.ts
@@ -1,4 +1,4 @@
-import SFPLogger from '@dxatscale/sfp-logger';
+import SFPLogger from '@flxblio/sfp-logger';
import { Connection, LoggerLevel } from '@salesforce/core';
import _ from 'lodash';
import ExternalPackage2DependencyResolver from '../package/dependencies/ExternalPackage2DependencyResolver';
@@ -11,8 +11,8 @@ export default class UserDefinedExternalDependencyMap {
public fetchDependencyEntries(projectConfig: any) {
- if (projectConfig.plugins?.sfpowerscripts?.externalDependencyMap) {
- let externalDependencyMap = projectConfig.plugins.sfpowerscripts.externalDependencyMap;
+ if (projectConfig.plugins?.sfp?.externalDependencyMap) {
+ let externalDependencyMap = projectConfig.plugins.sfp.externalDependencyMap;
SFPLogger.log(JSON.stringify(externalDependencyMap), LoggerLevel.DEBUG);
return externalDependencyMap;
}
@@ -37,14 +37,14 @@ export default class UserDefinedExternalDependencyMap {
externalDependencyMap[dependency] = [{ package: '', versionNumber: '' }];
}
}
- updatedProjectConfig.plugins.sfpowerscripts.externalDependencyMap = externalDependencyMap;
+ updatedProjectConfig.plugins.sfp.externalDependencyMap = externalDependencyMap;
return updatedProjectConfig;
}
public async cleanupEntries(projectConfig: any) {
let updatedProjectConfig = await _.cloneDeep(projectConfig);
- if (updatedProjectConfig?.plugins?.sfpowerscripts?.externalDependencyMap) {
- const externalDependencyMap = updatedProjectConfig.plugins.sfpowerscripts.externalDependencyMap;
+ if (updatedProjectConfig?.plugins?.sfp?.externalDependencyMap) {
+ const externalDependencyMap = updatedProjectConfig.plugins.sfp.externalDependencyMap;
for (let externalPackage of Object.keys(externalDependencyMap)) {
if (externalDependencyMap[externalPackage][0].package == '') {
delete externalDependencyMap[externalPackage];
diff --git a/packages/core/src/queryHelper/ChunkCollection.ts b/packages/sfp-cli/src/core/queryHelper/ChunkCollection.ts
similarity index 100%
rename from packages/core/src/queryHelper/ChunkCollection.ts
rename to packages/sfp-cli/src/core/queryHelper/ChunkCollection.ts
diff --git a/packages/core/src/queryHelper/QueryHelper.ts b/packages/sfp-cli/src/core/queryHelper/QueryHelper.ts
similarity index 100%
rename from packages/core/src/queryHelper/QueryHelper.ts
rename to packages/sfp-cli/src/core/queryHelper/QueryHelper.ts
diff --git a/packages/core/src/scratchorg/PasswordGenerator.ts b/packages/sfp-cli/src/core/scratchorg/PasswordGenerator.ts
similarity index 97%
rename from packages/core/src/scratchorg/PasswordGenerator.ts
rename to packages/sfp-cli/src/core/scratchorg/PasswordGenerator.ts
index 785389967..482d5d529 100644
--- a/packages/core/src/scratchorg/PasswordGenerator.ts
+++ b/packages/sfp-cli/src/core/scratchorg/PasswordGenerator.ts
@@ -1,5 +1,5 @@
import { Connection, User, AuthInfo, LoggerLevel } from '@salesforce/core';
-import SFPLogger from '@dxatscale/sfp-logger';
+import SFPLogger from '@flxblio/sfp-logger';
export default class PasswordGenerator {
public async exec(userName: string) {
diff --git a/packages/core/src/scratchorg/ScratchOrg.ts b/packages/sfp-cli/src/core/scratchorg/ScratchOrg.ts
similarity index 100%
rename from packages/core/src/scratchorg/ScratchOrg.ts
rename to packages/sfp-cli/src/core/scratchorg/ScratchOrg.ts
diff --git a/packages/core/src/scratchorg/ScratchOrgOperator.ts b/packages/sfp-cli/src/core/scratchorg/ScratchOrgOperator.ts
similarity index 92%
rename from packages/core/src/scratchorg/ScratchOrgOperator.ts
rename to packages/sfp-cli/src/core/scratchorg/ScratchOrgOperator.ts
index 0864e8cd2..f8caee807 100644
--- a/packages/core/src/scratchorg/ScratchOrgOperator.ts
+++ b/packages/sfp-cli/src/core/scratchorg/ScratchOrgOperator.ts
@@ -1,12 +1,13 @@
import { AuthInfo, Org, StateAggregator } from '@salesforce/core';
import ScratchOrg from './ScratchOrg';
import PasswordGenerator from './PasswordGenerator';
-import SFPLogger, { LoggerLevel } from '@dxatscale/sfp-logger';
+import SFPLogger, { LoggerLevel } from '@flxblio/sfp-logger';
import { Duration } from '@salesforce/kit';
import { ScratchOrgRequest } from '@salesforce/core';
-import { COLOR_KEY_MESSAGE } from '@dxatscale/sfp-logger';
+import { COLOR_KEY_MESSAGE } from '@flxblio/sfp-logger';
import getFormattedTime from '../utils/GetFormattedTime';
import SFPStatsSender from '../stats/SFPStatsSender';
+import { PoolConfig } from './pool/PoolConfig';
const retry = require('async-retry');
export default class ScratchOrgOperator {
@@ -16,7 +17,8 @@ export default class ScratchOrgOperator {
alias: string,
config_file_path: string,
expiry: number,
- waitTime: number = 6
+ waitTime: number = 6,
+ poolConfig: Partial
): Promise {
SFPLogger.log('Parameters: ' + alias + ' ' + config_file_path + ' ' + expiry + ' ', LoggerLevel.TRACE);
@@ -26,7 +28,8 @@ export default class ScratchOrgOperator {
alias,
config_file_path,
Duration.days(expiry),
- Duration.minutes(waitTime)
+ Duration.minutes(waitTime),
+ poolConfig
);
SFPLogger.log(JSON.stringify(scatchOrgResult), LoggerLevel.TRACE);
@@ -81,11 +84,11 @@ export default class ScratchOrgOperator {
);
}
- private async requestAScratchOrg(alias: string, definitionFile: string, expireIn: Duration, waitTime: Duration) {
+ private async requestAScratchOrg(alias: string, definitionFile: string, expireIn: Duration, waitTime: Duration, poolConfig: Partial) {
const createCommandOptions: ScratchOrgRequest = {
durationDays: expireIn.days,
nonamespace: false,
- noancestors: false,
+ noancestors: poolConfig.noAnchestors || false,
wait: waitTime,
retry: 3,
definitionfile: definitionFile,
diff --git a/packages/core/src/scratchorg/pool/ClientSourceTracking.ts b/packages/sfp-cli/src/core/scratchorg/pool/ClientSourceTracking.ts
similarity index 91%
rename from packages/core/src/scratchorg/pool/ClientSourceTracking.ts
rename to packages/sfp-cli/src/core/scratchorg/pool/ClientSourceTracking.ts
index b0bad5b97..806dd2de1 100644
--- a/packages/core/src/scratchorg/pool/ClientSourceTracking.ts
+++ b/packages/sfp-cli/src/core/scratchorg/pool/ClientSourceTracking.ts
@@ -1,6 +1,6 @@
const path = require('path');
import * as fs from 'fs-extra';
-import SFPLogger, { COLOR_HEADER, COLOR_KEY_MESSAGE, Logger, LoggerLevel } from '@dxatscale/sfp-logger';
+import SFPLogger, { COLOR_HEADER, COLOR_KEY_MESSAGE, Logger, LoggerLevel } from '@flxblio/sfp-logger';
import { Connection, SfProject } from '@salesforce/core';
import SFPOrg from '../../org/SFPOrg';
import { SourceTracking } from '@salesforce/source-tracking';
@@ -50,7 +50,7 @@ export default class ClientSourceTracking {
}
/**
- * Create local source tracking from sfpowerscripts artifacts installed in scratch org
+ * Create local source tracking from sfp artifacts installed in scratch org
*/
private async createLocalSourceTracking() {
@@ -58,14 +58,14 @@ export default class ClientSourceTracking {
try {
git = await Git.initiateRepoAtTempLocation(this.logger);
- const sfpowerscriptsArtifacts = await this.org.getInstalledArtifacts();
+ const sfpArtifacts = await this.org.getInstalledArtifacts();
- if(sfpowerscriptsArtifacts.length==0)
+ if(sfpArtifacts.length==0)
throw new Error(`Unable to find any artifacts in the org`);
//clean up MPD to just one package, so that source tracking lib
//does do a full scan and break
- this.cleanupSFDXProjectJsonTonOnePackage(git.getRepositoryPath(), sfpowerscriptsArtifacts[0].Name);
+ this.cleanupSFDXProjectJsonTonOnePackage(git.getRepositoryPath(), sfpArtifacts[0].Name);
const project = await SfProject.resolve(git.getRepositoryPath());
@@ -78,16 +78,16 @@ export default class ClientSourceTracking {
SFPLogger.log(
- `Total Artifacts to Analyze: ${sfpowerscriptsArtifacts.length}`,
+ `Total Artifacts to Analyze: ${sfpArtifacts.length}`,
LoggerLevel.INFO,
this.logger
);
let count = 1;
- for (const artifact of sfpowerscriptsArtifacts) {
+ for (const artifact of sfpArtifacts) {
SFPLogger.log(EOL, LoggerLevel.INFO, this.logger);
SFPLogger.log(
- COLOR_HEADER(`Package ${count} of ${sfpowerscriptsArtifacts.length}`),
+ COLOR_HEADER(`Package ${count} of ${sfpArtifacts.length}`),
LoggerLevel.INFO,
this.logger
);
@@ -141,7 +141,7 @@ export default class ClientSourceTracking {
if(error.message.includes)
{
SFPLogger.log(
- ` sfpowerscripts is unable to sync the package ${artifact.name}${EOL},
+ ` sfp is unable to sync the package ${artifact.name}${EOL},
as it not able to find the find equivalent git references`,
LoggerLevel.ERROR,
this.logger);
@@ -170,7 +170,7 @@ export default class ClientSourceTracking {
if(error.message.includes(`reference is not a tree`))
{
SFPLogger.log(
- `sfpowerscripts is unable to sync this repository,
+ `sfp is unable to sync this repository,
as it not able to find the matching git references${EOL}
Are you sure this pool was created from the same repository?`,
LoggerLevel.ERROR,
diff --git a/packages/core/src/scratchorg/pool/OrphanedOrgsDeleteImpl.ts b/packages/sfp-cli/src/core/scratchorg/pool/OrphanedOrgsDeleteImpl.ts
similarity index 95%
rename from packages/core/src/scratchorg/pool/OrphanedOrgsDeleteImpl.ts
rename to packages/sfp-cli/src/core/scratchorg/pool/OrphanedOrgsDeleteImpl.ts
index 24f8078bd..d21987759 100644
--- a/packages/core/src/scratchorg/pool/OrphanedOrgsDeleteImpl.ts
+++ b/packages/sfp-cli/src/core/scratchorg/pool/OrphanedOrgsDeleteImpl.ts
@@ -1,4 +1,4 @@
-import SFPLogger, { Logger, LoggerLevel } from '@dxatscale/sfp-logger';
+import SFPLogger, { Logger, LoggerLevel } from '@flxblio/sfp-logger';
import { Org } from '@salesforce/core';
import { PoolBaseImpl } from './PoolBaseImpl';
import ScratchOrg from '../ScratchOrg';
@@ -18,7 +18,7 @@ export default class OrphanedOrgsDeleteImpl extends PoolBaseImpl {
if (results.records.length > 0) {
let scrathOrgIds: string[] = [];
for (let element of results.records) {
- if (element.Description?.includes(`"requestedBy":"sfpowerscripts"`)) {
+ if (element.Description?.includes(`"requestedBy":"sfp"`)) {
let soDetail: ScratchOrg = {};
soDetail.orgId = element.ScratchOrg;
soDetail.username = element.SignupUsername;
diff --git a/packages/core/src/scratchorg/pool/PoolBaseImpl.ts b/packages/sfp-cli/src/core/scratchorg/pool/PoolBaseImpl.ts
similarity index 100%
rename from packages/core/src/scratchorg/pool/PoolBaseImpl.ts
rename to packages/sfp-cli/src/core/scratchorg/pool/PoolBaseImpl.ts
diff --git a/packages/core/src/scratchorg/pool/PoolConfig.ts b/packages/sfp-cli/src/core/scratchorg/pool/PoolConfig.ts
similarity index 97%
rename from packages/core/src/scratchorg/pool/PoolConfig.ts
rename to packages/sfp-cli/src/core/scratchorg/pool/PoolConfig.ts
index b18fc05f2..39996186e 100644
--- a/packages/core/src/scratchorg/pool/PoolConfig.ts
+++ b/packages/sfp-cli/src/core/scratchorg/pool/PoolConfig.ts
@@ -35,6 +35,5 @@ export interface PoolConfig {
scratchOrgs?: ScratchOrg[];
failedToCreate?: number;
maxRetryCount?:number;
-
-
+ noAnchestors?:boolean;
}
diff --git a/packages/core/src/scratchorg/pool/PoolCreateImpl.ts b/packages/sfp-cli/src/core/scratchorg/pool/PoolCreateImpl.ts
similarity index 97%
rename from packages/core/src/scratchorg/pool/PoolCreateImpl.ts
rename to packages/sfp-cli/src/core/scratchorg/pool/PoolCreateImpl.ts
index f50df6b41..84671d6b2 100644
--- a/packages/core/src/scratchorg/pool/PoolCreateImpl.ts
+++ b/packages/sfp-cli/src/core/scratchorg/pool/PoolCreateImpl.ts
@@ -10,17 +10,16 @@ import * as rimraf from 'rimraf';
import * as fs from 'fs-extra';
import PoolJobExecutor, { ScriptExecutionResult } from './PoolJobExecutor';
import { PoolError, PoolErrorCodes } from './PoolError';
-import SFPLogger, { COLOR_KEY_MESSAGE, LoggerLevel } from '@dxatscale/sfp-logger';
+import SFPLogger, { COLOR_KEY_MESSAGE, LoggerLevel } from '@flxblio/sfp-logger';
import { Result, ok, err } from 'neverthrow';
import SFPStatsSender from '../../stats/SFPStatsSender';
import { EOL } from 'os';
import OrgDetailsFetcher from '../../org/OrgDetailsFetcher';
import ScratchOrgOperator from '../ScratchOrgOperator';
import PoolFetchImpl from './PoolFetchImpl';
-import { COLOR_SUCCESS } from '@dxatscale/sfp-logger';
-import { COLOR_ERROR } from '@dxatscale/sfp-logger';
+import { COLOR_SUCCESS } from '@flxblio/sfp-logger';
+import { COLOR_ERROR } from '@flxblio/sfp-logger';
import getFormattedTime from '../../utils/GetFormattedTime';
-import OrphanedOrgsDeleteImpl from './OrphanedOrgsDeleteImpl';
import path from 'path';
export default class PoolCreateImpl extends PoolBaseImpl {
@@ -146,7 +145,7 @@ export default class PoolCreateImpl extends PoolBaseImpl {
}
return ok(this.pool);
-
+
}
private async computeAllocation(): Promise {
@@ -199,7 +198,7 @@ export default class PoolCreateImpl extends PoolBaseImpl {
const startTime = Date.now();
for (let i = 1; i <= pool.to_allocate; i++) {
const scratchOrgPromise: Promise = scratchOrgCreationLimiter.schedule(() =>
- scratchOrgOperator.create(`SO` + i, this.pool.configFilePath, this.pool.expiry, this.pool.waitTime)
+ scratchOrgOperator.create(`SO` + i, this.pool.configFilePath, this.pool.expiry, this.pool.waitTime, this.pool)
);
scratchOrgPromises.push(scratchOrgPromise);
}
@@ -281,7 +280,7 @@ export default class PoolCreateImpl extends PoolBaseImpl {
const scratchOrgDefn = fs.readJSONSync(configClonePath);
if (!scratchOrgDefn.description)
scratchOrgDefn.description = JSON.stringify({
- requestedBy: 'sfpowerscripts',
+ requestedBy: 'sfp',
pool: pool.tag,
requestedAt: new Date().toISOString(),
});
@@ -289,7 +288,7 @@ export default class PoolCreateImpl extends PoolBaseImpl {
scratchOrgDefn.description = scratchOrgDefn.description.concat(
' ',
JSON.stringify({
- requestedBy: 'sfpowerscripts',
+ requestedBy: 'sfp',
pool: pool.tag,
requestedAt: new Date().toISOString(),
})
diff --git a/packages/core/src/scratchorg/pool/PoolDeleteImpl.ts b/packages/sfp-cli/src/core/scratchorg/pool/PoolDeleteImpl.ts
similarity index 94%
rename from packages/core/src/scratchorg/pool/PoolDeleteImpl.ts
rename to packages/sfp-cli/src/core/scratchorg/pool/PoolDeleteImpl.ts
index ecc496643..1a6768542 100644
--- a/packages/core/src/scratchorg/pool/PoolDeleteImpl.ts
+++ b/packages/sfp-cli/src/core/scratchorg/pool/PoolDeleteImpl.ts
@@ -1,11 +1,11 @@
-import SFPLogger from '@dxatscale/sfp-logger';
+import SFPLogger from '@flxblio/sfp-logger';
import { Org } from '@salesforce/core';
import { PoolBaseImpl } from './PoolBaseImpl';
import ScratchOrg from '../ScratchOrg';
import ScratchOrgInfoFetcher from './services/fetchers/ScratchOrgInfoFetcher';
import ScratchOrgOperator from '../ScratchOrgOperator';
-import { Logger } from '@dxatscale/sfp-logger';
-import { LoggerLevel } from '@dxatscale/sfp-logger';
+import { Logger } from '@flxblio/sfp-logger';
+import { LoggerLevel } from '@flxblio/sfp-logger';
export default class PoolDeleteImpl extends PoolBaseImpl {
private tag: string;
diff --git a/packages/core/src/scratchorg/pool/PoolError.ts b/packages/sfp-cli/src/core/scratchorg/pool/PoolError.ts
similarity index 100%
rename from packages/core/src/scratchorg/pool/PoolError.ts
rename to packages/sfp-cli/src/core/scratchorg/pool/PoolError.ts
diff --git a/packages/core/src/scratchorg/pool/PoolFetchImpl.ts b/packages/sfp-cli/src/core/scratchorg/pool/PoolFetchImpl.ts
similarity index 96%
rename from packages/core/src/scratchorg/pool/PoolFetchImpl.ts
rename to packages/sfp-cli/src/core/scratchorg/pool/PoolFetchImpl.ts
index 654a1d3a1..2dd8671f7 100644
--- a/packages/core/src/scratchorg/pool/PoolFetchImpl.ts
+++ b/packages/sfp-cli/src/core/scratchorg/pool/PoolFetchImpl.ts
@@ -1,4 +1,4 @@
-import SFPLogger from '@dxatscale/sfp-logger';
+import SFPLogger from '@flxblio/sfp-logger';
import { AuthInfo, LoggerLevel, Org } from '@salesforce/core';
import { PoolBaseImpl } from './PoolBaseImpl';
import ScratchOrg from '../ScratchOrg';
@@ -225,10 +225,8 @@ export default class PoolFetchImpl extends PoolBaseImpl {
setDefaultDevHub: false,
});
- const result = authInfo.getFields(true);
- // ensure the clientSecret field... even if it is empty
- // as per https://github.com/salesforcecli/plugin-auth/blob/main/src/commands/auth/sfdxurl/store.ts
- result.clientSecret = result.clientSecret ?? '';
+ //https://github.com/salesforcecli/plugin-auth/blob/main/src/commands/org/login/sfdx-url.ts
+ const result = { clientSecret: '', ...authInfo.getFields(true) };
await AuthInfo.identifyPossibleScratchOrgs(result, authInfo);
return true;
diff --git a/packages/core/src/scratchorg/pool/PoolJobExecutor.ts b/packages/sfp-cli/src/core/scratchorg/pool/PoolJobExecutor.ts
similarity index 89%
rename from packages/core/src/scratchorg/pool/PoolJobExecutor.ts
rename to packages/sfp-cli/src/core/scratchorg/pool/PoolJobExecutor.ts
index 79786a790..57c853ada 100644
--- a/packages/core/src/scratchorg/pool/PoolJobExecutor.ts
+++ b/packages/sfp-cli/src/core/scratchorg/pool/PoolJobExecutor.ts
@@ -4,7 +4,7 @@ import ScratchOrg from '../ScratchOrg';
import { Result } from 'neverthrow';
import * as fs from 'fs-extra';
import { EOL } from 'os';
-import SFPLogger, { LoggerLevel } from '@dxatscale/sfp-logger';
+import SFPLogger, { LoggerLevel } from '@flxblio/sfp-logger';
export default abstract class PoolJobExecutor {
protected logToFilePath: string;
@@ -18,7 +18,7 @@ export default abstract class PoolJobExecutor {
): Promise> {
this.logToFilePath = `.sfpowerscripts/prepare_logs/${scratchOrg.alias}.log`;
//Create file logger
- fs.outputFileSync(this.logToFilePath, `sfpowerscripts--log${EOL}`);
+ fs.outputFileSync(this.logToFilePath, `sfp--log${EOL}`);
SFPLogger.log(`Preparation Log files for ${scratchOrg.username} written to ${this.logToFilePath}`);
return this.executeJob(scratchOrg, hubOrg, this.logToFilePath, logLevel);
}
diff --git a/packages/core/src/scratchorg/pool/PoolListImpl.ts b/packages/sfp-cli/src/core/scratchorg/pool/PoolListImpl.ts
similarity index 100%
rename from packages/core/src/scratchorg/pool/PoolListImpl.ts
rename to packages/sfp-cli/src/core/scratchorg/pool/PoolListImpl.ts
diff --git a/packages/core/src/scratchorg/pool/PoolOrgDeleteImpl.ts b/packages/sfp-cli/src/core/scratchorg/pool/PoolOrgDeleteImpl.ts
similarity index 100%
rename from packages/core/src/scratchorg/pool/PoolOrgDeleteImpl.ts
rename to packages/sfp-cli/src/core/scratchorg/pool/PoolOrgDeleteImpl.ts
diff --git a/packages/core/src/scratchorg/pool/prequisitecheck/IsValidSfdxAuthUrl.ts b/packages/sfp-cli/src/core/scratchorg/pool/prequisitecheck/IsValidSfdxAuthUrl.ts
similarity index 100%
rename from packages/core/src/scratchorg/pool/prequisitecheck/IsValidSfdxAuthUrl.ts
rename to packages/sfp-cli/src/core/scratchorg/pool/prequisitecheck/IsValidSfdxAuthUrl.ts
diff --git a/packages/core/src/scratchorg/pool/prequisitecheck/PreRequisiteCheck.ts b/packages/sfp-cli/src/core/scratchorg/pool/prequisitecheck/PreRequisiteCheck.ts
similarity index 97%
rename from packages/core/src/scratchorg/pool/prequisitecheck/PreRequisiteCheck.ts
rename to packages/sfp-cli/src/core/scratchorg/pool/prequisitecheck/PreRequisiteCheck.ts
index a08d9db81..18da896a9 100644
--- a/packages/core/src/scratchorg/pool/prequisitecheck/PreRequisiteCheck.ts
+++ b/packages/sfp-cli/src/core/scratchorg/pool/prequisitecheck/PreRequisiteCheck.ts
@@ -57,7 +57,7 @@ export default class PreRequisiteCheck {
if (!PreRequisiteCheck.isPrerequisiteMet) {
throw new Error( `Required Prerequisite values in ScratchOrgInfo is missing in the DevHub` +
- `For more information Please refer https://sfpowerscripts.dxatscale.io/getting-started/prerequisites \n`);
+ `For more information Please refer https://sfp.flxblio.io/getting-started/prerequisites \n`);
}
}
}
diff --git a/packages/core/src/scratchorg/pool/services/fetchers/GetUserEmail.ts b/packages/sfp-cli/src/core/scratchorg/pool/services/fetchers/GetUserEmail.ts
similarity index 94%
rename from packages/core/src/scratchorg/pool/services/fetchers/GetUserEmail.ts
rename to packages/sfp-cli/src/core/scratchorg/pool/services/fetchers/GetUserEmail.ts
index 397b46ea6..e0c34bf9e 100644
--- a/packages/core/src/scratchorg/pool/services/fetchers/GetUserEmail.ts
+++ b/packages/sfp-cli/src/core/scratchorg/pool/services/fetchers/GetUserEmail.ts
@@ -1,7 +1,7 @@
import { LoggerLevel, Org } from '@salesforce/core';
let retry = require('async-retry');
-import SFPLogger from '@dxatscale/sfp-logger';
+import SFPLogger from '@flxblio/sfp-logger';
export async function getUserEmail(username: string, hubOrg: Org) {
let hubConn = hubOrg.getConnection();
diff --git a/packages/core/src/scratchorg/pool/services/fetchers/ScratchOrgInfoFetcher.ts b/packages/sfp-cli/src/core/scratchorg/pool/services/fetchers/ScratchOrgInfoFetcher.ts
similarity index 99%
rename from packages/core/src/scratchorg/pool/services/fetchers/ScratchOrgInfoFetcher.ts
rename to packages/sfp-cli/src/core/scratchorg/pool/services/fetchers/ScratchOrgInfoFetcher.ts
index 112fcbc67..a89ad737a 100644
--- a/packages/core/src/scratchorg/pool/services/fetchers/ScratchOrgInfoFetcher.ts
+++ b/packages/sfp-cli/src/core/scratchorg/pool/services/fetchers/ScratchOrgInfoFetcher.ts
@@ -1,4 +1,4 @@
-import SFPLogger, { LoggerLevel } from '@dxatscale/sfp-logger';
+import SFPLogger, { LoggerLevel } from '@flxblio/sfp-logger';
import { Org } from '@salesforce/core';
import ScratchOrg from '../../../ScratchOrg';
const retry = require('async-retry');
diff --git a/packages/core/src/scratchorg/pool/services/fetchers/ScratchOrgLimitsFetcher.ts b/packages/sfp-cli/src/core/scratchorg/pool/services/fetchers/ScratchOrgLimitsFetcher.ts
similarity index 100%
rename from packages/core/src/scratchorg/pool/services/fetchers/ScratchOrgLimitsFetcher.ts
rename to packages/sfp-cli/src/core/scratchorg/pool/services/fetchers/ScratchOrgLimitsFetcher.ts
diff --git a/packages/core/src/scratchorg/pool/services/updaters/ScratchOrgInfoAssigner.ts b/packages/sfp-cli/src/core/scratchorg/pool/services/updaters/ScratchOrgInfoAssigner.ts
similarity index 95%
rename from packages/core/src/scratchorg/pool/services/updaters/ScratchOrgInfoAssigner.ts
rename to packages/sfp-cli/src/core/scratchorg/pool/services/updaters/ScratchOrgInfoAssigner.ts
index b45d8d0a3..5055b8cc3 100644
--- a/packages/core/src/scratchorg/pool/services/updaters/ScratchOrgInfoAssigner.ts
+++ b/packages/sfp-cli/src/core/scratchorg/pool/services/updaters/ScratchOrgInfoAssigner.ts
@@ -1,6 +1,6 @@
import { LoggerLevel, Org } from '@salesforce/core';
let retry = require('async-retry');
-import SFPLogger from '@dxatscale/sfp-logger';
+import SFPLogger from '@flxblio/sfp-logger';
import ScratchOrgInfoFetcher from '../fetchers/ScratchOrgInfoFetcher';
import ObjectCRUDHelper from '../../../../utils/ObjectCRUDHelper';
diff --git a/packages/core/src/scriptExecutor/ScriptExecutorHelpers.ts b/packages/sfp-cli/src/core/scriptExecutor/ScriptExecutorHelpers.ts
similarity index 79%
rename from packages/core/src/scriptExecutor/ScriptExecutorHelpers.ts
rename to packages/sfp-cli/src/core/scriptExecutor/ScriptExecutorHelpers.ts
index 7cd66415b..0c7f92965 100644
--- a/packages/core/src/scriptExecutor/ScriptExecutorHelpers.ts
+++ b/packages/sfp-cli/src/core/scriptExecutor/ScriptExecutorHelpers.ts
@@ -1,5 +1,5 @@
-import ExecuteCommand from '@dxatscale/sfdx-process-wrapper/lib/commandExecutor/ExecuteCommand';
-import SFPLogger, { Logger, LoggerLevel } from '@dxatscale/sfp-logger';
+import ExecuteCommand from '@flxblio/sfdx-process-wrapper/lib/commandExecutor/ExecuteCommand';
+import SFPLogger, { Logger, LoggerLevel } from '@flxblio/sfp-logger';
import defaultShell from '../utils/DefaultShell';
export default class scriptExecutorHelpers {
diff --git a/packages/core/src/sfdmuwrapper/SFDMURunImpl.ts b/packages/sfp-cli/src/core/sfdmuwrapper/SFDMURunImpl.ts
similarity index 84%
rename from packages/core/src/sfdmuwrapper/SFDMURunImpl.ts
rename to packages/sfp-cli/src/core/sfdmuwrapper/SFDMURunImpl.ts
index 3c44ed4fd..4df46887d 100644
--- a/packages/core/src/sfdmuwrapper/SFDMURunImpl.ts
+++ b/packages/sfp-cli/src/core/sfdmuwrapper/SFDMURunImpl.ts
@@ -1,5 +1,5 @@
-import { SFDXCommand } from '@dxatscale/sfdx-process-wrapper/lib/SFDXCommand';
-import { Logger, LoggerLevel } from '@dxatscale/sfp-logger';
+import { SFDXCommand } from '@flxblio/sfdx-process-wrapper/lib/SFDXCommand';
+import { Logger, LoggerLevel } from '@flxblio/sfp-logger';
export default class SFDMURunImpl extends SFDXCommand {
public constructor(
diff --git a/packages/core/src/stats/NativeMetricSender.ts b/packages/sfp-cli/src/core/stats/NativeMetricSender.ts
similarity index 94%
rename from packages/core/src/stats/NativeMetricSender.ts
rename to packages/sfp-cli/src/core/stats/NativeMetricSender.ts
index bd08c59f8..b68631635 100644
--- a/packages/core/src/stats/NativeMetricSender.ts
+++ b/packages/sfp-cli/src/core/stats/NativeMetricSender.ts
@@ -1,4 +1,4 @@
-import { Logger } from '@dxatscale/sfp-logger';
+import { Logger } from '@flxblio/sfp-logger';
export abstract class NativeMetricSender {
constructor(protected logger: Logger) {}
diff --git a/packages/core/src/stats/SFPStatsSender.ts b/packages/sfp-cli/src/core/stats/SFPStatsSender.ts
similarity index 98%
rename from packages/core/src/stats/SFPStatsSender.ts
rename to packages/sfp-cli/src/core/stats/SFPStatsSender.ts
index 629f57d27..62dd344b2 100644
--- a/packages/core/src/stats/SFPStatsSender.ts
+++ b/packages/sfp-cli/src/core/stats/SFPStatsSender.ts
@@ -3,7 +3,7 @@ import * as fs from 'fs-extra';
import { EOL } from 'os';
import { NativeMetricSender } from './NativeMetricSender';
import { DataDogMetricsSender } from './nativeMetricSenderImpl/DataDogMetricSender';
-import { Logger } from '@dxatscale/sfp-logger';
+import { Logger } from '@flxblio/sfp-logger';
import { NewRelicMetricSender } from './nativeMetricSenderImpl/NewRelicMetricSender';
import { SplunkMetricSender } from './nativeMetricSenderImpl/SplunkMetricSender';
diff --git a/packages/core/src/stats/nativeMetricSenderImpl/DataDogMetricSender.ts b/packages/sfp-cli/src/core/stats/nativeMetricSenderImpl/DataDogMetricSender.ts
similarity index 96%
rename from packages/core/src/stats/nativeMetricSenderImpl/DataDogMetricSender.ts
rename to packages/sfp-cli/src/core/stats/nativeMetricSenderImpl/DataDogMetricSender.ts
index c2d0bf892..bec060661 100644
--- a/packages/core/src/stats/nativeMetricSenderImpl/DataDogMetricSender.ts
+++ b/packages/sfp-cli/src/core/stats/nativeMetricSenderImpl/DataDogMetricSender.ts
@@ -1,5 +1,5 @@
import { BufferedMetricsLogger } from 'datadog-metrics';
-import SFPLogger, { Logger, LoggerLevel } from '@dxatscale/sfp-logger';
+import SFPLogger, { Logger, LoggerLevel } from '@flxblio/sfp-logger';
import { NativeMetricSender } from '../NativeMetricSender';
export class DataDogMetricsSender extends NativeMetricSender {
diff --git a/packages/core/src/stats/nativeMetricSenderImpl/NewRelicMetricSender.ts b/packages/sfp-cli/src/core/stats/nativeMetricSenderImpl/NewRelicMetricSender.ts
similarity index 97%
rename from packages/core/src/stats/nativeMetricSenderImpl/NewRelicMetricSender.ts
rename to packages/sfp-cli/src/core/stats/nativeMetricSenderImpl/NewRelicMetricSender.ts
index ff43eaaf8..7e1e83d1b 100644
--- a/packages/core/src/stats/nativeMetricSenderImpl/NewRelicMetricSender.ts
+++ b/packages/sfp-cli/src/core/stats/nativeMetricSenderImpl/NewRelicMetricSender.ts
@@ -6,7 +6,7 @@ import {
MetricBatch,
MetricClient,
} from '@newrelic/telemetry-sdk/dist/src/telemetry/metrics';
-import SFPLogger, { Logger, LoggerLevel } from '@dxatscale/sfp-logger';
+import SFPLogger, { Logger, LoggerLevel } from '@flxblio/sfp-logger';
export class NewRelicMetricSender extends NativeMetricSender {
constructor(logger: Logger) {
diff --git a/packages/core/src/stats/nativeMetricSenderImpl/SplunkMetricSender.ts b/packages/sfp-cli/src/core/stats/nativeMetricSenderImpl/SplunkMetricSender.ts
similarity index 74%
rename from packages/core/src/stats/nativeMetricSenderImpl/SplunkMetricSender.ts
rename to packages/sfp-cli/src/core/stats/nativeMetricSenderImpl/SplunkMetricSender.ts
index 1c163c076..f92a5f5d8 100644
--- a/packages/core/src/stats/nativeMetricSenderImpl/SplunkMetricSender.ts
+++ b/packages/sfp-cli/src/core/stats/nativeMetricSenderImpl/SplunkMetricSender.ts
@@ -1,4 +1,4 @@
-import SFPLogger, { Logger, LoggerLevel } from '@dxatscale/sfp-logger';
+import SFPLogger, { Logger, LoggerLevel } from '@flxblio/sfp-logger';
import { NativeMetricSender } from '../NativeMetricSender';
import axios ,{AxiosInstance} from 'axios';
@@ -19,8 +19,8 @@ export class SplunkMetricSender extends NativeMetricSender {
}
public sendGaugeMetric(metric: string, value: number, tags: string[] | { [key: string]: string }) {
- metric = `sfpowerscripts.${metric}`;
- const payload = {source: "sfpowerscripts",sourcetype: "metrics",event: {metric: metric, type: 'guage', value: value,tags: tags as { [key: string]: string },timestamp: Date.now()}};
+ metric = `sfp.${metric}`;
+ const payload = {source: "sfp",sourcetype: "metrics",event: {metric: metric, type: 'guage', value: value,tags: tags as { [key: string]: string },timestamp: Date.now()}};
this.instance.post('', JSON.stringify(payload))
.then((response) => {SFPLogger.log(`Transmitted metric ${metric} ${response.status}`, LoggerLevel.TRACE, this.logger)})
.catch((error) => {
@@ -33,8 +33,8 @@ export class SplunkMetricSender extends NativeMetricSender {
}
public sendCountMetric(metric: string, tags: string[] | { [key: string]: string }) {
- metric = `sfpowerscripts.${metric}`;
- const payload = {source: "sfpowerscripts",sourcetype: "metrics",event: {metric: metric, type: 'count', tags: tags as { [key: string]: string },timestamp: Date.now()}};
+ metric = `sfp.${metric}`;
+ const payload = {source: "sfp",sourcetype: "metrics",event: {metric: metric, type: 'count', tags: tags as { [key: string]: string },timestamp: Date.now()}};
this.instance.post('', JSON.stringify(payload))
.then((response) => {SFPLogger.log(`Transmitted metric ${metric} ${response.status}`, LoggerLevel.TRACE, this.logger)})
.catch((error) => {
diff --git a/packages/core/src/utils/AliasList.ts b/packages/sfp-cli/src/core/utils/AliasList.ts
similarity index 100%
rename from packages/core/src/utils/AliasList.ts
rename to packages/sfp-cli/src/core/utils/AliasList.ts
diff --git a/packages/core/src/utils/ChunkArray.ts b/packages/sfp-cli/src/core/utils/ChunkArray.ts
similarity index 100%
rename from packages/core/src/utils/ChunkArray.ts
rename to packages/sfp-cli/src/core/utils/ChunkArray.ts
diff --git a/packages/core/src/utils/DefaultShell.ts b/packages/sfp-cli/src/core/utils/DefaultShell.ts
similarity index 100%
rename from packages/core/src/utils/DefaultShell.ts
rename to packages/sfp-cli/src/core/utils/DefaultShell.ts
diff --git a/packages/core/src/utils/Delay.ts b/packages/sfp-cli/src/core/utils/Delay.ts
similarity index 100%
rename from packages/core/src/utils/Delay.ts
rename to packages/sfp-cli/src/core/utils/Delay.ts
diff --git a/packages/core/src/utils/FileSystem.ts b/packages/sfp-cli/src/core/utils/FileSystem.ts
similarity index 100%
rename from packages/core/src/utils/FileSystem.ts
rename to packages/sfp-cli/src/core/utils/FileSystem.ts
diff --git a/packages/core/src/utils/Fileutils.ts b/packages/sfp-cli/src/core/utils/Fileutils.ts
similarity index 100%
rename from packages/core/src/utils/Fileutils.ts
rename to packages/sfp-cli/src/core/utils/Fileutils.ts
diff --git a/packages/core/src/utils/GetFormattedTime.ts b/packages/sfp-cli/src/core/utils/GetFormattedTime.ts
similarity index 100%
rename from packages/core/src/utils/GetFormattedTime.ts
rename to packages/sfp-cli/src/core/utils/GetFormattedTime.ts
diff --git a/packages/core/src/utils/ObjectCRUDHelper.ts b/packages/sfp-cli/src/core/utils/ObjectCRUDHelper.ts
similarity index 100%
rename from packages/core/src/utils/ObjectCRUDHelper.ts
rename to packages/sfp-cli/src/core/utils/ObjectCRUDHelper.ts
diff --git a/packages/core/src/utils/OnExit.ts b/packages/sfp-cli/src/core/utils/OnExit.ts
similarity index 100%
rename from packages/core/src/utils/OnExit.ts
rename to packages/sfp-cli/src/core/utils/OnExit.ts
diff --git a/packages/core/src/utils/RandomId.ts b/packages/sfp-cli/src/core/utils/RandomId.ts
similarity index 100%
rename from packages/core/src/utils/RandomId.ts
rename to packages/sfp-cli/src/core/utils/RandomId.ts
diff --git a/packages/core/src/utils/VersionNumberConverter.ts b/packages/sfp-cli/src/core/utils/VersionNumberConverter.ts
similarity index 100%
rename from packages/core/src/utils/VersionNumberConverter.ts
rename to packages/sfp-cli/src/core/utils/VersionNumberConverter.ts
diff --git a/packages/core/src/utils/extractDomainFromUrl.ts b/packages/sfp-cli/src/core/utils/extractDomainFromUrl.ts
similarity index 100%
rename from packages/core/src/utils/extractDomainFromUrl.ts
rename to packages/sfp-cli/src/core/utils/extractDomainFromUrl.ts
diff --git a/packages/core/src/utils/xml2json.ts b/packages/sfp-cli/src/core/utils/xml2json.ts
similarity index 100%
rename from packages/core/src/utils/xml2json.ts
rename to packages/sfp-cli/src/core/utils/xml2json.ts
diff --git a/packages/core/src/vlocitywrapper/VlocityInitialInstall.ts b/packages/sfp-cli/src/core/vlocitywrapper/VlocityInitialInstall.ts
similarity index 81%
rename from packages/core/src/vlocitywrapper/VlocityInitialInstall.ts
rename to packages/sfp-cli/src/core/vlocitywrapper/VlocityInitialInstall.ts
index 19c2ef9cb..981f942a5 100644
--- a/packages/core/src/vlocitywrapper/VlocityInitialInstall.ts
+++ b/packages/sfp-cli/src/core/vlocitywrapper/VlocityInitialInstall.ts
@@ -1,5 +1,5 @@
-import { SFDXCommand } from '@dxatscale/sfdx-process-wrapper/lib/SFDXCommand';
-import { Logger, LoggerLevel } from '@dxatscale/sfp-logger';
+import { SFDXCommand } from '@flxblio/sfdx-process-wrapper/lib/SFDXCommand';
+import { Logger, LoggerLevel } from '@flxblio/sfp-logger';
export default class VlocityInitialInstall extends SFDXCommand {
public constructor(project_directory: string, target_org: string, logger: Logger, logLevel: LoggerLevel) {
diff --git a/packages/core/src/vlocitywrapper/VlocityPackDeployImpl.ts b/packages/sfp-cli/src/core/vlocitywrapper/VlocityPackDeployImpl.ts
similarity index 84%
rename from packages/core/src/vlocitywrapper/VlocityPackDeployImpl.ts
rename to packages/sfp-cli/src/core/vlocitywrapper/VlocityPackDeployImpl.ts
index bd411c6a9..2cdc70087 100644
--- a/packages/core/src/vlocitywrapper/VlocityPackDeployImpl.ts
+++ b/packages/sfp-cli/src/core/vlocitywrapper/VlocityPackDeployImpl.ts
@@ -1,6 +1,6 @@
import path from 'path';
-import { SFDXCommand } from '@dxatscale/sfdx-process-wrapper/lib/SFDXCommand';
-import { Logger, LoggerLevel } from '@dxatscale/sfp-logger';
+import { SFDXCommand } from '@flxblio/sfdx-process-wrapper/lib/SFDXCommand';
+import { Logger, LoggerLevel } from '@flxblio/sfp-logger';
export default class VlocityPackDeployImpl extends SFDXCommand {
public constructor(
diff --git a/packages/core/src/vlocitywrapper/VlocityPackUpdateSettings.ts b/packages/sfp-cli/src/core/vlocitywrapper/VlocityPackUpdateSettings.ts
similarity index 81%
rename from packages/core/src/vlocitywrapper/VlocityPackUpdateSettings.ts
rename to packages/sfp-cli/src/core/vlocitywrapper/VlocityPackUpdateSettings.ts
index d09c5101d..6d4f6584c 100644
--- a/packages/core/src/vlocitywrapper/VlocityPackUpdateSettings.ts
+++ b/packages/sfp-cli/src/core/vlocitywrapper/VlocityPackUpdateSettings.ts
@@ -1,5 +1,5 @@
-import { SFDXCommand } from '@dxatscale/sfdx-process-wrapper/lib/SFDXCommand';
-import { Logger, LoggerLevel } from '@dxatscale/sfp-logger';
+import { SFDXCommand } from '@flxblio/sfdx-process-wrapper/lib/SFDXCommand';
+import { Logger, LoggerLevel } from '@flxblio/sfp-logger';
export default class VlocityPackUpdateSettings extends SFDXCommand {
public constructor(project_directory: string, target_org: string, logger: Logger, logLevel: LoggerLevel) {
diff --git a/packages/core/src/vlocitywrapper/VlocityRefreshBase.ts b/packages/sfp-cli/src/core/vlocitywrapper/VlocityRefreshBase.ts
similarity index 85%
rename from packages/core/src/vlocitywrapper/VlocityRefreshBase.ts
rename to packages/sfp-cli/src/core/vlocitywrapper/VlocityRefreshBase.ts
index 9deae7966..b31df3640 100644
--- a/packages/core/src/vlocitywrapper/VlocityRefreshBase.ts
+++ b/packages/sfp-cli/src/core/vlocitywrapper/VlocityRefreshBase.ts
@@ -1,6 +1,6 @@
import path from 'path';
-import { SFDXCommand } from '@dxatscale/sfdx-process-wrapper/lib/SFDXCommand';
-import { Logger, LoggerLevel } from '@dxatscale/sfp-logger';
+import { SFDXCommand } from '@flxblio/sfdx-process-wrapper/lib/SFDXCommand';
+import { Logger, LoggerLevel } from '@flxblio/sfp-logger';
export default class VlocityRefreshBase extends SFDXCommand {
public constructor(
diff --git a/packages/sfpowerscripts-cli/src/errors/ReleaseError.ts b/packages/sfp-cli/src/errors/ReleaseError.ts
similarity index 77%
rename from packages/sfpowerscripts-cli/src/errors/ReleaseError.ts
rename to packages/sfp-cli/src/errors/ReleaseError.ts
index 4381e1070..334f3c552 100644
--- a/packages/sfpowerscripts-cli/src/errors/ReleaseError.ts
+++ b/packages/sfp-cli/src/errors/ReleaseError.ts
@@ -1,8 +1,8 @@
-import SfpowerscriptsError from './SfpowerscriptsError';
+import SfpError from './SfpError';
import { ReleaseResult } from '../impl/release/ReleaseImpl';
-export default class ReleaseError extends SfpowerscriptsError {
+export default class ReleaseError extends SfpError {
/**
* Payload for the results of the release
*/
diff --git a/packages/sfpowerscripts-cli/src/errors/SfpowerscriptsError.ts b/packages/sfp-cli/src/errors/SfpError.ts
similarity index 86%
rename from packages/sfpowerscripts-cli/src/errors/SfpowerscriptsError.ts
rename to packages/sfp-cli/src/errors/SfpError.ts
index 7463428c0..2665ed5c3 100644
--- a/packages/sfpowerscripts-cli/src/errors/SfpowerscriptsError.ts
+++ b/packages/sfp-cli/src/errors/SfpError.ts
@@ -1,4 +1,4 @@
-export default abstract class SfpowerscriptsError extends Error {
+export default abstract class SfpError extends Error {
readonly message: string;
readonly code: string;
/**
diff --git a/packages/sfpowerscripts-cli/src/errors/ValidateError.ts b/packages/sfp-cli/src/errors/ValidateError.ts
similarity index 77%
rename from packages/sfpowerscripts-cli/src/errors/ValidateError.ts
rename to packages/sfp-cli/src/errors/ValidateError.ts
index a8aa5e5ae..5890a1ec6 100644
--- a/packages/sfpowerscripts-cli/src/errors/ValidateError.ts
+++ b/packages/sfp-cli/src/errors/ValidateError.ts
@@ -1,7 +1,7 @@
-import SfpowerscriptsError from './SfpowerscriptsError';
+import SfpError from './SfpError';
import ValidateResult from '../impl/validate/ValidateResult';
-export default class ValidateError extends SfpowerscriptsError {
+export default class ValidateError extends SfpError {
/**
* Payload for the results of the release
*/
diff --git a/packages/sfpowerscripts-cli/src/flags/duration.ts b/packages/sfp-cli/src/flags/duration.ts
similarity index 96%
rename from packages/sfpowerscripts-cli/src/flags/duration.ts
rename to packages/sfp-cli/src/flags/duration.ts
index ee3984a55..af0994e29 100644
--- a/packages/sfpowerscripts-cli/src/flags/duration.ts
+++ b/packages/sfp-cli/src/flags/duration.ts
@@ -9,7 +9,7 @@ import { Messages } from '@salesforce/core';
import { Duration } from '@salesforce/kit';
Messages.importMessagesDirectory(__dirname);
-const messages = Messages.loadMessages('@dxatscale/sfpowerscripts', 'core-messages');
+const messages = Messages.loadMessages('@flxblio/sfp', 'core-messages');
type DurationUnit = Lowercase;
diff --git a/packages/sfpowerscripts-cli/src/flags/orgApiVersion.ts b/packages/sfp-cli/src/flags/orgApiVersion.ts
similarity index 93%
rename from packages/sfpowerscripts-cli/src/flags/orgApiVersion.ts
rename to packages/sfp-cli/src/flags/orgApiVersion.ts
index cb0ffd8c2..92ca9ac74 100644
--- a/packages/sfpowerscripts-cli/src/flags/orgApiVersion.ts
+++ b/packages/sfp-cli/src/flags/orgApiVersion.ts
@@ -8,7 +8,7 @@ import { Flags } from '@oclif/core';
import { Messages, Lifecycle, OrgConfigProperties, validateApiVersion } from '@salesforce/core';
Messages.importMessagesDirectory(__dirname);
-const messages = Messages.loadMessages('@dxatscale/sfpowerscripts', 'core-messages');
+const messages = Messages.loadMessages('@flxblio/sfp', 'core-messages');
// versions below this are retired
export const minValidApiVersion = 21;
@@ -16,7 +16,7 @@ export const minValidApiVersion = 21;
export const maxDeprecated = 30;
export const maxDeprecatedUrl = 'https://help.salesforce.com/s/articleView?id=000354473&type=1;';
-/**const messages = Messages.loadMessages('@dxatscale/sfpowerscripts', 'core-messages');
+/**const messages = Messages.loadMessages('@flxblio/sfp', 'core-messages');
* apiVersion for a salesforce org's rest api.
* Will validate format and that the api version is still supported.
* Will default to the version specified in Config, if it exists (and will provide an override warning)
diff --git a/packages/sfpowerscripts-cli/src/flags/salesforceId.ts b/packages/sfp-cli/src/flags/salesforceId.ts
similarity index 100%
rename from packages/sfpowerscripts-cli/src/flags/salesforceId.ts
rename to packages/sfp-cli/src/flags/salesforceId.ts
diff --git a/packages/sfpowerscripts-cli/src/flags/sfdxflags.ts b/packages/sfp-cli/src/flags/sfdxflags.ts
similarity index 94%
rename from packages/sfpowerscripts-cli/src/flags/sfdxflags.ts
rename to packages/sfp-cli/src/flags/sfdxflags.ts
index 54694ac7f..12e60f655 100644
--- a/packages/sfpowerscripts-cli/src/flags/sfdxflags.ts
+++ b/packages/sfp-cli/src/flags/sfdxflags.ts
@@ -1,6 +1,6 @@
/*
- * Modified from sfdx-plugins-core to meet sfpowerscripts requirment
- * sfpowerscripts is not moving to the new style immediately
+ * Modified from sfdx-plugins-core to meet sfp requirment
+ * sfp is not moving to the new style immediately
* to reduce migration efforts in pipelines
*
*
@@ -14,7 +14,8 @@
import { Flags } from '@oclif/core';
import { Lifecycle, Messages, Org, OrgConfigProperties } from '@salesforce/core';
import { orgApiVersionFlag } from './orgApiVersion';
-import { AliasAccessor } from '@salesforce/core/lib/stateAggregator';
+import { AliasAccessor } from '@salesforce/core/lib/stateAggregator/accessors/aliasAccessor';
+
/**
* Adds an alias for the orgApiVersionFlag
@@ -25,7 +26,7 @@ export const orgApiVersionFlagSfdxStyle = orgApiVersionFlag({
});
Messages.importMessagesDirectory(__dirname);
-const messages = Messages.loadMessages('@dxatscale/sfpowerscripts', 'core-messages');
+const messages = Messages.loadMessages('@flxblio/sfp', 'core-messages');
export const loglevel = Flags.string({
description: 'logging level for this command invocation',
diff --git a/packages/sfpowerscripts-cli/src/impl/Stage.ts b/packages/sfp-cli/src/impl/Stage.ts
similarity index 100%
rename from packages/sfpowerscripts-cli/src/impl/Stage.ts
rename to packages/sfp-cli/src/impl/Stage.ts
diff --git a/packages/sfpowerscripts-cli/src/impl/artifacts/FetchAnArtifact.ts b/packages/sfp-cli/src/impl/artifacts/FetchAnArtifact.ts
similarity index 100%
rename from packages/sfpowerscripts-cli/src/impl/artifacts/FetchAnArtifact.ts
rename to packages/sfp-cli/src/impl/artifacts/FetchAnArtifact.ts
diff --git a/packages/sfpowerscripts-cli/src/impl/artifacts/FetchAnArtifactFromNPM.ts b/packages/sfp-cli/src/impl/artifacts/FetchAnArtifactFromNPM.ts
similarity index 73%
rename from packages/sfpowerscripts-cli/src/impl/artifacts/FetchAnArtifactFromNPM.ts
rename to packages/sfp-cli/src/impl/artifacts/FetchAnArtifactFromNPM.ts
index 5185af3b9..8d2f5fc87 100644
--- a/packages/sfpowerscripts-cli/src/impl/artifacts/FetchAnArtifactFromNPM.ts
+++ b/packages/sfp-cli/src/impl/artifacts/FetchAnArtifactFromNPM.ts
@@ -2,14 +2,12 @@ import * as fs from 'fs-extra';
import child_process = require('child_process');
import path = require('path');
import FetchAnArtifact from './FetchAnArtifact';
-import SFPLogger, { COLOR_WARNING } from '@dxatscale/sfp-logger';
+import SFPLogger, { COLOR_WARNING, LoggerLevel } from '@flxblio/sfp-logger';
export class FetchAnArtifactFromNPM implements FetchAnArtifact {
constructor(private scope: string, private npmrcPath: string) {
-
//Check whether the user has already passed in @, and remove it
- this.scope= this.scope.replace(/@/g, '').toLowerCase();
-
+ this.scope = this.scope.replace(/@/g, '').toLowerCase();
if (this.npmrcPath) {
try {
@@ -45,20 +43,27 @@ export class FetchAnArtifactFromNPM implements FetchAnArtifact {
cmd += `@${version}`;
- console.log(`Fetching ${packageName} using ${cmd}`);
+ SFPLogger.log(`Fetching ${packageName} using ${cmd}`,LoggerLevel.INFO);
child_process.execSync(cmd, {
cwd: artifactDirectory,
stdio: 'pipe',
});
} catch (error) {
+ SFPLogger.log(
+ COLOR_WARNING(
+ `Artifact for ${packageName} not found in the NPM Registry provided, This might result in deployment failures, Try running with trace log level for more information`
+ ),
+ LoggerLevel.INFO
+ );
+
+ SFPLogger.log(
+ error,
+ LoggerLevel.TRACE
+ );
+
+
if (!isToContinueOnMissingArtifact) throw error;
- else
- SFPLogger.log(
- COLOR_WARNING(
- `Artifact for ${packageName} missing in NPM Registry provided, This might result in deployment failures`
- )
- );
}
}
}
diff --git a/packages/sfpowerscripts-cli/src/impl/artifacts/FetchAnArtifactUsingScript.ts b/packages/sfp-cli/src/impl/artifacts/FetchAnArtifactUsingScript.ts
similarity index 92%
rename from packages/sfpowerscripts-cli/src/impl/artifacts/FetchAnArtifactUsingScript.ts
rename to packages/sfp-cli/src/impl/artifacts/FetchAnArtifactUsingScript.ts
index 56563dc67..abd9fd714 100644
--- a/packages/sfpowerscripts-cli/src/impl/artifacts/FetchAnArtifactUsingScript.ts
+++ b/packages/sfp-cli/src/impl/artifacts/FetchAnArtifactUsingScript.ts
@@ -1,8 +1,8 @@
-import SFPLogger, { COLOR_WARNING, LoggerLevel } from '@dxatscale/sfp-logger';
+import SFPLogger, { COLOR_WARNING, LoggerLevel } from '@flxblio/sfp-logger';
const fs = require('fs-extra');
import child_process = require('child_process');
import FetchAnArtifact from './FetchAnArtifact';
-import defaultShell from '@dxatscale/sfpowerscripts.core/lib/utils/DefaultShell';
+import defaultShell from '../../core/utils/DefaultShell';
export class FetchAnArtifactUsingScript implements FetchAnArtifact {
constructor(private scriptPath: string) {}
diff --git a/packages/sfpowerscripts-cli/src/impl/artifacts/FetchArtifactSelector.ts b/packages/sfp-cli/src/impl/artifacts/FetchArtifactSelector.ts
similarity index 100%
rename from packages/sfpowerscripts-cli/src/impl/artifacts/FetchArtifactSelector.ts
rename to packages/sfp-cli/src/impl/artifacts/FetchArtifactSelector.ts
diff --git a/packages/sfpowerscripts-cli/src/impl/artifacts/FetchArtifactsError.ts b/packages/sfp-cli/src/impl/artifacts/FetchArtifactsError.ts
similarity index 79%
rename from packages/sfpowerscripts-cli/src/impl/artifacts/FetchArtifactsError.ts
rename to packages/sfp-cli/src/impl/artifacts/FetchArtifactsError.ts
index 5a9a392ff..dcf60ac28 100644
--- a/packages/sfpowerscripts-cli/src/impl/artifacts/FetchArtifactsError.ts
+++ b/packages/sfp-cli/src/impl/artifacts/FetchArtifactsError.ts
@@ -1,9 +1,9 @@
-import SfpowerscriptsError from '../../errors/SfpowerscriptsError';
+import SfpError from '../../errors/SfpError';
import { ArtifactVersion } from './FetchImpl';
-export default class FetchArtifactsError extends SfpowerscriptsError {
+export default class FetchArtifactsError extends SfpError {
/**
* Payload consisting of artifacts that succeeded and failed to fetch
*/
diff --git a/packages/sfpowerscripts-cli/src/impl/artifacts/FetchImpl.ts b/packages/sfp-cli/src/impl/artifacts/FetchImpl.ts
similarity index 87%
rename from packages/sfpowerscripts-cli/src/impl/artifacts/FetchImpl.ts
rename to packages/sfp-cli/src/impl/artifacts/FetchImpl.ts
index f32b11960..c6ec486ee 100644
--- a/packages/sfpowerscripts-cli/src/impl/artifacts/FetchImpl.ts
+++ b/packages/sfp-cli/src/impl/artifacts/FetchImpl.ts
@@ -1,14 +1,14 @@
import * as fs from 'fs-extra';
-import Git from '@dxatscale/sfpowerscripts.core/lib/git/Git';
-import GitTags from '@dxatscale/sfpowerscripts.core/lib/git/GitTags';
-import ReleaseDefinitionSchema from '../release/ReleaseDefinitionSchema';
+import Git from '../../core/git/Git';
+import GitTags from '../../core/git/GitTags';
+import ReleaseDefinition from '../release/ReleaseDefinition';
import FetchArtifactsError from './FetchArtifactsError';
import * as rimraf from 'rimraf';
import FetchArtifactSelector from './FetchArtifactSelector';
import _ from 'lodash';
import path from 'path';
-import FileUtils from '@dxatscale/sfpowerscripts.core/lib/utils/Fileutils';
-import SFPLogger, { Logger, LoggerLevel } from '@dxatscale/sfp-logger';
+import FileUtils from '../../core/utils/Fileutils';
+import SFPLogger, { Logger, LoggerLevel } from '@flxblio/sfp-logger';
export default class FetchImpl {
constructor(
@@ -22,7 +22,7 @@ export default class FetchImpl {
}
public async fetchArtifacts(
- releaseDefinitions: ReleaseDefinitionSchema[]
+ releaseDefinitions: ReleaseDefinition[]
): Promise<{
success: ArtifactVersion[];
failed: ArtifactVersion[];
@@ -40,10 +40,19 @@ export default class FetchImpl {
for (const releaseDefinition of releaseDefinitions) {
//Each release will be downloaded to specific subfolder inside the provided artifact directory
//As each release is a collection of artifacts
+
let revisedArtifactDirectory = path.join(
this.artifactDirectory,
releaseDefinition.release.replace(/[/\\?%*:|"<>]/g, '-')
);
+ if(releaseDefinition.releaseConfigName)
+ {
+ revisedArtifactDirectory = path.join(
+ this.artifactDirectory,
+ releaseDefinition.releaseConfigName.replace(/[/\\?%*:|"<>]/g, '-'),
+ releaseDefinition.release.replace(/[/\\?%*:|"<>]/g, '-')
+ );
+ }
rimraf.sync(revisedArtifactDirectory);
fs.mkdirpSync(revisedArtifactDirectory);
diff --git a/packages/sfpowerscripts-cli/src/impl/changelog/ChangelogImpl.ts b/packages/sfp-cli/src/impl/changelog/ChangelogImpl.ts
similarity index 90%
rename from packages/sfpowerscripts-cli/src/impl/changelog/ChangelogImpl.ts
rename to packages/sfp-cli/src/impl/changelog/ChangelogImpl.ts
index 4923e3222..63b8e6be7 100644
--- a/packages/sfpowerscripts-cli/src/impl/changelog/ChangelogImpl.ts
+++ b/packages/sfp-cli/src/impl/changelog/ChangelogImpl.ts
@@ -1,4 +1,4 @@
-import ArtifactFetcher, { Artifact } from '@dxatscale/sfpowerscripts.core/lib/artifacts/ArtifactFetcher';
+import ArtifactFetcher, { Artifact } from '../../core/artifacts/ArtifactFetcher';
import { ReleaseChangelog } from './ReleaseChangelog';
import ChangelogMarkdownGenerator from './ChangelogMarkdownGenerator';
import ReleaseChangelogUpdater from './ReleaseChangelogUpdater';
@@ -8,10 +8,10 @@ import { marked } from 'marked';
const TerminalRenderer = require('marked-terminal');
const retry = require('async-retry');
import { GitError } from 'simple-git';
-import SfpPackage from '@dxatscale/sfpowerscripts.core/lib/package/SfpPackage';
-import SFPLogger, { LoggerLevel, ConsoleLogger, Logger } from '@dxatscale/sfp-logger';
-import SfpPackageBuilder from '@dxatscale/sfpowerscripts.core/lib/package/SfpPackageBuilder';
-import Git from '@dxatscale/sfpowerscripts.core/lib/git/Git';
+import SfpPackage from '../../core/package/SfpPackage';
+import SFPLogger, { LoggerLevel, ConsoleLogger, Logger } from '@flxblio/sfp-logger';
+import SfpPackageBuilder from '../../core/package/SfpPackageBuilder';
+import Git from '../../core/git/Git';
import FileOutputHandler from '../../outputs/FileOutputHandler';
@@ -35,6 +35,7 @@ export default class ChangelogImpl {
private branch: string,
private nopush:boolean,
private isDryRun: boolean,
+ private releaseConfigName:string,
private org?: string
) {
this.org = org?.toLowerCase();
@@ -97,7 +98,7 @@ export default class ChangelogImpl {
} else {
console.log(`${sfpPackage.packageName} artifact is missing branch information`);
console.log(
- `This will cause an error in the future. Re-create the artifact using the latest version of sfpowerscripts to maintain compatibility.`
+ `This will cause an error in the future. Re-create the artifact using the latest version of sfp to maintain compatibility.`
);
}
}
@@ -145,7 +146,10 @@ export default class ChangelogImpl {
if(this.isDryRun)
{
const outputHandler:FileOutputHandler = FileOutputHandler.getInstance();
- outputHandler.writeOutput('release-changelog.md',marked(new ChangelogMarkdownGenerator(releaseChangelog, this.workItemUrl, 1, false,true).generate()));
+ if(this.releaseConfigName){
+ outputHandler.appendOutput('release-changelog.md',`# ReleaseConfig: ${this.releaseConfigName}`);
+ }
+ outputHandler.appendOutput('release-changelog.md',new ChangelogMarkdownGenerator(releaseChangelog, this.workItemUrl, 1, false,false).generate());
}
diff --git a/packages/sfpowerscripts-cli/src/impl/changelog/ChangelogMarkdownGenerator.ts b/packages/sfp-cli/src/impl/changelog/ChangelogMarkdownGenerator.ts
similarity index 88%
rename from packages/sfpowerscripts-cli/src/impl/changelog/ChangelogMarkdownGenerator.ts
rename to packages/sfp-cli/src/impl/changelog/ChangelogMarkdownGenerator.ts
index 4c1b487e3..c308794c3 100644
--- a/packages/sfpowerscripts-cli/src/impl/changelog/ChangelogMarkdownGenerator.ts
+++ b/packages/sfp-cli/src/impl/changelog/ChangelogMarkdownGenerator.ts
@@ -40,10 +40,10 @@ export default class ChangelogMarkdownGenerator {
if (!release.names) {
payload += `\n\n `; // Create anchor from release hash Id
- payload += `# ${release['name']}\n`;
+ payload += `## ${release['name']}\n`;
} else {
payload += `\n\n`; // Create anchor from release hash Id
- payload += `# ${release.names.join(`/`)}\n `;
+ payload += `## ${release.names.join(`/`)}\n `;
payload += `Cumulative Release Number: ${release.buildNumber} \n\n`;
if(release.date && !this.isForWorkItemOnlyOutput)
payload += `Matching defintion first created or deployed to an org on: ${release.date}\n `
@@ -96,10 +96,23 @@ export default class ChangelogMarkdownGenerator {
let tableOfCommits = [['Date', 'Time', 'Commit ID', 'Commit Message']];
for (let commit of artifact.commits) {
let commitDate: Date = new Date(commit.date);
+ let specificCommitURL: string;
+ if (artifact.repoUrl != null) {
+ if(artifact.repoUrl.startsWith("git"))
+ {
+ specificCommitURL=""; //no http url available
+ }
+ else if (artifact.repoUrl.includes("github.com")) {
+ let repoUrl = artifact.repoUrl.split('.git')[0];
+ specificCommitURL = `${repoUrl}/commit/${commit.commitId}`;
+ } else {
+ specificCommitURL=""; //other git providers are not supported
+ }
+ }
tableOfCommits.push([
this.getDate(commitDate),
this.getTime(commitDate),
- commit.commitId,
+ artifact.repoUrl?`[${commit.commitId}](${specificCommitURL})`:commit.commitId,
commit.message,
]);
}
diff --git a/packages/sfpowerscripts-cli/src/impl/changelog/CommitUpdater.ts b/packages/sfp-cli/src/impl/changelog/CommitUpdater.ts
similarity index 94%
rename from packages/sfpowerscripts-cli/src/impl/changelog/CommitUpdater.ts
rename to packages/sfp-cli/src/impl/changelog/CommitUpdater.ts
index d17e50a37..e20879963 100644
--- a/packages/sfpowerscripts-cli/src/impl/changelog/CommitUpdater.ts
+++ b/packages/sfp-cli/src/impl/changelog/CommitUpdater.ts
@@ -1,5 +1,5 @@
import { Release } from './ReleaseChangelog';
-import { Changelog as PackageChangelog } from '@dxatscale/sfpowerscripts.core/lib/changelog/interfaces/GenericChangelogInterfaces';
+import { Changelog as PackageChangelog } from '../../core/changelog/interfaces/GenericChangelogInterfaces';
import ReadPackageChangelog from './ReadPackageChangelog';
export default class CommitUpdater {
diff --git a/packages/sfpowerscripts-cli/src/impl/changelog/OrgsUpdater.ts b/packages/sfp-cli/src/impl/changelog/OrgsUpdater.ts
similarity index 100%
rename from packages/sfpowerscripts-cli/src/impl/changelog/OrgsUpdater.ts
rename to packages/sfp-cli/src/impl/changelog/OrgsUpdater.ts
diff --git a/packages/sfp-cli/src/impl/changelog/ReadPackageChangelog.ts b/packages/sfp-cli/src/impl/changelog/ReadPackageChangelog.ts
new file mode 100644
index 000000000..2fa69ae3c
--- /dev/null
+++ b/packages/sfp-cli/src/impl/changelog/ReadPackageChangelog.ts
@@ -0,0 +1,5 @@
+import { Changelog as PackageChangelog } from '../../core/changelog/interfaces/GenericChangelogInterfaces';
+
+export default interface ReadPackageChangelog {
+ (changelogFilePath: string): PackageChangelog;
+}
diff --git a/packages/sfpowerscripts-cli/src/impl/changelog/ReleaseChangelog.ts b/packages/sfp-cli/src/impl/changelog/ReleaseChangelog.ts
similarity index 86%
rename from packages/sfpowerscripts-cli/src/impl/changelog/ReleaseChangelog.ts
rename to packages/sfp-cli/src/impl/changelog/ReleaseChangelog.ts
index 8851d9d32..1042e919c 100644
--- a/packages/sfpowerscripts-cli/src/impl/changelog/ReleaseChangelog.ts
+++ b/packages/sfp-cli/src/impl/changelog/ReleaseChangelog.ts
@@ -1,4 +1,4 @@
-import { Changelog, Commit } from '@dxatscale/sfpowerscripts.core/lib/changelog/interfaces/GenericChangelogInterfaces';
+import { Changelog, Commit } from '../../core/changelog/interfaces/GenericChangelogInterfaces';
export class ReleaseChangelog {
releases: Release[];
@@ -65,6 +65,11 @@ export interface Artifact extends Changelog {
*/
latestCommitId: string;
+ /**
+ * Repository URL where the artifact was generated
+ */
+ repoUrl?: string;
+
/**
* Commits between previous artifact's package changelog and current artifact's package changelog
*/
diff --git a/packages/sfpowerscripts-cli/src/impl/changelog/ReleaseChangelogUpdater.ts b/packages/sfp-cli/src/impl/changelog/ReleaseChangelogUpdater.ts
similarity index 98%
rename from packages/sfpowerscripts-cli/src/impl/changelog/ReleaseChangelogUpdater.ts
rename to packages/sfp-cli/src/impl/changelog/ReleaseChangelogUpdater.ts
index 2b3fe3850..2e2505f8b 100644
--- a/packages/sfpowerscripts-cli/src/impl/changelog/ReleaseChangelogUpdater.ts
+++ b/packages/sfp-cli/src/impl/changelog/ReleaseChangelogUpdater.ts
@@ -4,7 +4,7 @@ import WorkItemUpdater from './WorkItemUpdater';
import OrgsUpdater from './OrgsUpdater';
import ReadPackageChangelog from './ReadPackageChangelog';
import * as fs from 'fs-extra';
-import SfpPackage from '@dxatscale/sfpowerscripts.core/lib/package/SfpPackage';
+import SfpPackage from '../../core/package/SfpPackage';
var hash = require('object-hash');
export default class ReleaseChangelogUpdater {
@@ -168,6 +168,7 @@ export default class ReleaseChangelogUpdater {
from: undefined,
to: sfpPackage.sourceVersion?.slice(0, 8),
version: sfpPackage.package_version_number,
+ repoUrl: sfpPackage.repository_url,
latestCommitId: undefined,
commits: undefined,
};
diff --git a/packages/sfpowerscripts-cli/src/impl/changelog/WorkItemUpdater.ts b/packages/sfp-cli/src/impl/changelog/WorkItemUpdater.ts
similarity index 95%
rename from packages/sfpowerscripts-cli/src/impl/changelog/WorkItemUpdater.ts
rename to packages/sfp-cli/src/impl/changelog/WorkItemUpdater.ts
index 7faef8fbd..71c9eec7e 100644
--- a/packages/sfpowerscripts-cli/src/impl/changelog/WorkItemUpdater.ts
+++ b/packages/sfp-cli/src/impl/changelog/WorkItemUpdater.ts
@@ -1,4 +1,4 @@
-import SFPLogger, { Logger, LoggerLevel } from '@dxatscale/sfp-logger';
+import SFPLogger, { Logger, LoggerLevel } from '@flxblio/sfp-logger';
import { Release } from './ReleaseChangelog';
diff --git a/packages/sfpowerscripts-cli/src/impl/demoreelplayer/DemoReelPlayer.ts b/packages/sfp-cli/src/impl/demoreelplayer/DemoReelPlayer.ts
similarity index 96%
rename from packages/sfpowerscripts-cli/src/impl/demoreelplayer/DemoReelPlayer.ts
rename to packages/sfp-cli/src/impl/demoreelplayer/DemoReelPlayer.ts
index 9428f9f9b..daf033582 100644
--- a/packages/sfpowerscripts-cli/src/impl/demoreelplayer/DemoReelPlayer.ts
+++ b/packages/sfp-cli/src/impl/demoreelplayer/DemoReelPlayer.ts
@@ -2,7 +2,7 @@ import path = require('path');
import * as fs from 'fs-extra';
import { marked } from 'marked';
const TerminalRenderer = require('marked-terminal');
-import { delay } from '@dxatscale/sfpowerscripts.core/lib/utils/Delay';
+import { delay } from '../../core/utils/Delay';
export default class DemoReelPlayer {
public async execute(demoReelFolderPath: string) {
diff --git a/packages/sfpowerscripts-cli/src/impl/dependency/ShrinkImpl.ts b/packages/sfp-cli/src/impl/dependency/ShrinkImpl.ts
similarity index 89%
rename from packages/sfpowerscripts-cli/src/impl/dependency/ShrinkImpl.ts
rename to packages/sfp-cli/src/impl/dependency/ShrinkImpl.ts
index 7df3bf7b1..cf58a7187 100644
--- a/packages/sfpowerscripts-cli/src/impl/dependency/ShrinkImpl.ts
+++ b/packages/sfp-cli/src/impl/dependency/ShrinkImpl.ts
@@ -1,10 +1,10 @@
-import TransitiveDependencyResolver from '@dxatscale/sfpowerscripts.core/lib/package/dependencies/TransitiveDependencyResolver';
-import { COLOR_HEADER, COLOR_KEY_MESSAGE, COLOR_SUCCESS, COLOR_ERROR } from '@dxatscale/sfp-logger';
-import SFPLogger, { LoggerLevel, Logger } from '@dxatscale/sfp-logger';
+import TransitiveDependencyResolver from '../../core/package/dependencies/TransitiveDependencyResolver';
+import { COLOR_HEADER, COLOR_KEY_MESSAGE, COLOR_SUCCESS, COLOR_ERROR } from '@flxblio/sfp-logger';
+import SFPLogger, { LoggerLevel, Logger } from '@flxblio/sfp-logger';
import _ from 'lodash';
import { Connection } from '@salesforce/core';
const Table = require('cli-table');
-import UserDefinedExternalDependency from '@dxatscale/sfpowerscripts.core/lib/project/UserDefinedExternalDependency';
+import UserDefinedExternalDependency from '../../core/project/UserDefinedExternalDependency';
export default class ShrinkImpl {
private dependencyMap;
diff --git a/packages/sfpowerscripts-cli/src/impl/deploy/DeployImpl.ts b/packages/sfp-cli/src/impl/deploy/DeployImpl.ts
similarity index 95%
rename from packages/sfpowerscripts-cli/src/impl/deploy/DeployImpl.ts
rename to packages/sfp-cli/src/impl/deploy/DeployImpl.ts
index 4e83da473..6d335d9a6 100644
--- a/packages/sfpowerscripts-cli/src/impl/deploy/DeployImpl.ts
+++ b/packages/sfp-cli/src/impl/deploy/DeployImpl.ts
@@ -1,29 +1,29 @@
-import ArtifactFetcher, { Artifact } from '@dxatscale/sfpowerscripts.core/lib/artifacts/ArtifactFetcher';
-import SFPLogger, { COLOR_ERROR, COLOR_SUCCESS, FileLogger, Logger, LoggerLevel } from '@dxatscale/sfp-logger';
+import ArtifactFetcher, { Artifact } from '../../core/artifacts/ArtifactFetcher';
+import SFPLogger, { COLOR_ERROR, COLOR_SUCCESS, FileLogger, Logger, LoggerLevel } from '@flxblio/sfp-logger';
import { EOL } from 'os';
import { Stage } from '../Stage';
-import ProjectConfig from '@dxatscale/sfpowerscripts.core/lib/project/ProjectConfig';
+import ProjectConfig from '../../core/project/ProjectConfig';
import semver = require('semver');
-import PromoteUnlockedPackageImpl from '@dxatscale/sfpowerscripts.core/lib/package/promote/PromoteUnlockedPackageImpl';
-import { DeploymentType } from '@dxatscale/sfpowerscripts.core/lib/deployers/DeploymentExecutor';
-import { COLOR_KEY_MESSAGE,COLOR_KEY_VALUE,COLOR_HEADER } from '@dxatscale/sfp-logger';
+import PromoteUnlockedPackageImpl from '../../core/package/promote/PromoteUnlockedPackageImpl';
+import { DeploymentType } from '../../core/deployers/DeploymentExecutor';
+import { COLOR_KEY_MESSAGE,COLOR_KEY_VALUE,COLOR_HEADER } from '@flxblio/sfp-logger';
import {
PackageInstallationResult,
PackageInstallationStatus,
-} from '@dxatscale/sfpowerscripts.core/lib/package/packageInstallers/PackageInstallationResult';
-import SFPOrg from '@dxatscale/sfpowerscripts.core/lib/org/SFPOrg';
-import SfpPackage, { PackageType } from '@dxatscale/sfpowerscripts.core/lib/package/SfpPackage';
-import SfpPackageInquirer from '@dxatscale/sfpowerscripts.core/lib/package/SfpPackageInquirer';
+} from '../../core/package/packageInstallers/PackageInstallationResult';
+import SFPOrg from '../../core/org/SFPOrg';
+import SfpPackage, { PackageType } from '../../core/package/SfpPackage';
+import SfpPackageInquirer from '../../core/package/SfpPackageInquirer';
import { PostDeployHook } from './PostDeployHook';
import { PreDeployHook } from './PreDeployHook';
-import SfpPackageBuilder from '@dxatscale/sfpowerscripts.core/lib/package/SfpPackageBuilder';
-import SfpPackageInstaller from '@dxatscale/sfpowerscripts.core/lib/package/SfpPackageInstaller';
-import { SfpPackageInstallationOptions } from '@dxatscale/sfpowerscripts.core/lib/package/packageInstallers/InstallPackage';
+import SfpPackageBuilder from '../../core/package/SfpPackageBuilder';
+import SfpPackageInstaller from '../../core/package/SfpPackageInstaller';
+import { SfpPackageInstallationOptions } from '../../core/package/packageInstallers/InstallPackage';
import * as _ from 'lodash';
import GroupConsoleLogs from '../../ui/GroupConsoleLogs';
import { ZERO_BORDER_TABLE } from '../../ui/TableConstants';
-import convertBuildNumDotDelimToHyphen from '@dxatscale/sfpowerscripts.core/lib/utils/VersionNumberConverter';
-import ReleaseConfig from '../release/ReleaseConfig';
+import convertBuildNumDotDelimToHyphen from '../../core/utils/VersionNumberConverter';
+import ReleaseConfigLoader from '../release/ReleaseConfigLoader';
import fs from 'fs-extra';
import { Align, getMarkdownTable } from 'markdown-table-ts';
import FileOutputHandler from '../../outputs/FileOutputHandler';
@@ -327,8 +327,8 @@ export default class DeployImpl {
else
{
SFPLogger.log(COLOR_KEY_MESSAGE(`Filtering packages to be deployed based on release config ${COLOR_KEY_VALUE(releaseConfigPath)}`),LoggerLevel.INFO,logger);
- let releaseConfig:ReleaseConfig = new ReleaseConfig(logger,releaseConfigPath);
- let packages = releaseConfig.getPackagesAsPerReleaseConfig();
+ let releaseConfigLoader:ReleaseConfigLoader = new ReleaseConfigLoader(logger,releaseConfigPath);
+ let packages = releaseConfigLoader.getPackagesAsPerReleaseConfig();
//Filter artifacts based on packages
let filteredSfPPackages:SfpPackage[] = [];
@@ -373,9 +373,9 @@ export default class DeployImpl {
private displayRetryHeader(isRetryOnFailure: boolean, count: number) {
if (isRetryOnFailure && count > 1) {
- SFPLogger.printHeaderLine('',COLOR_HEADER,LoggerLevel.INFO);
+ SFPLogger.printHeaderLine('',COLOR_HEADER,LoggerLevel.INFO,this.props.logger);
SFPLogger.log(`Retrying On Failure Attempt: ${count}`, LoggerLevel.INFO, this.props.logger);
- SFPLogger.printHeaderLine('',COLOR_HEADER,LoggerLevel.INFO);
+ SFPLogger.printHeaderLine('',COLOR_HEADER,LoggerLevel.INFO,this.props.logger);
}
}
@@ -388,7 +388,7 @@ export default class DeployImpl {
} else alwaysDeployMessage = undefined;
//Display header
- SFPLogger.printHeaderLine('Installing Package',COLOR_HEADER,LoggerLevel.INFO);
+ SFPLogger.printHeaderLine('Installing Package',COLOR_HEADER,LoggerLevel.INFO,this.props.logger);
SFPLogger.log(COLOR_HEADER(`Name: ${COLOR_KEY_MESSAGE(pkg)}`), LoggerLevel.INFO, this.props.logger);
SFPLogger.log(`Type: ${COLOR_KEY_MESSAGE(sfpPackage.packageType)}`, LoggerLevel.INFO, this.props.logger);
SFPLogger.log(
@@ -428,7 +428,7 @@ export default class DeployImpl {
}
if (alwaysDeployMessage) SFPLogger.log(alwaysDeployMessage, LoggerLevel.INFO, this.props.logger);
- SFPLogger.printHeaderLine('',COLOR_HEADER,LoggerLevel.INFO);
+ SFPLogger.printHeaderLine('',COLOR_HEADER,LoggerLevel.INFO,this.props.logger);
}
private displayTestInfoHeader(sfpPackage: SfpPackage) {
@@ -524,7 +524,7 @@ export default class DeployImpl {
}
const table = getMarkdownTable(tableData);
const outputHandler:FileOutputHandler = FileOutputHandler.getInstance();
- outputHandler.writeOutput('deployment-breakdown.md',table) ;
+ outputHandler.appendOutput('deployment-breakdown.md',table) ;
}
function processColoursForAllPackages(pkg) {
diff --git a/packages/sfpowerscripts-cli/src/impl/deploy/PostDeployHook.ts b/packages/sfp-cli/src/impl/deploy/PostDeployHook.ts
similarity index 57%
rename from packages/sfpowerscripts-cli/src/impl/deploy/PostDeployHook.ts
rename to packages/sfp-cli/src/impl/deploy/PostDeployHook.ts
index 2b6e3e324..7f73cf3ba 100644
--- a/packages/sfpowerscripts-cli/src/impl/deploy/PostDeployHook.ts
+++ b/packages/sfp-cli/src/impl/deploy/PostDeployHook.ts
@@ -1,6 +1,6 @@
-import { Logger } from '@dxatscale/sfp-logger';
-import { PackageInstallationResult } from '@dxatscale/sfpowerscripts.core/lib/package/packageInstallers/PackageInstallationResult';
-import SfpPackage from '@dxatscale/sfpowerscripts.core/lib/package/SfpPackage';
+import { Logger } from '@flxblio/sfp-logger';
+import { PackageInstallationResult } from '../../core/package/packageInstallers/PackageInstallationResult';
+import SfpPackage from '../../core/package/SfpPackage';
export interface PostDeployHook {
postDeployPackage(
diff --git a/packages/sfpowerscripts-cli/src/impl/deploy/PreDeployHook.ts b/packages/sfp-cli/src/impl/deploy/PreDeployHook.ts
similarity index 69%
rename from packages/sfpowerscripts-cli/src/impl/deploy/PreDeployHook.ts
rename to packages/sfp-cli/src/impl/deploy/PreDeployHook.ts
index 5f94ca2b1..58294b363 100644
--- a/packages/sfpowerscripts-cli/src/impl/deploy/PreDeployHook.ts
+++ b/packages/sfp-cli/src/impl/deploy/PreDeployHook.ts
@@ -1,5 +1,5 @@
-import { Logger } from '@dxatscale/sfp-logger';
-import SfpPackage from '@dxatscale/sfpowerscripts.core/lib/package/SfpPackage';
+import { Logger } from '@flxblio/sfp-logger';
+import SfpPackage from '../../core/package/SfpPackage';
export interface PreDeployHook {
preDeployPackage(
diff --git a/packages/sfpowerscripts-cli/src/impl/impact/ImpactedPackagesResolver.ts b/packages/sfp-cli/src/impl/impact/ImpactedPackagesResolver.ts
similarity index 92%
rename from packages/sfpowerscripts-cli/src/impl/impact/ImpactedPackagesResolver.ts
rename to packages/sfp-cli/src/impl/impact/ImpactedPackagesResolver.ts
index a3640b6c9..0d00338bb 100644
--- a/packages/sfpowerscripts-cli/src/impl/impact/ImpactedPackagesResolver.ts
+++ b/packages/sfp-cli/src/impl/impact/ImpactedPackagesResolver.ts
@@ -1,9 +1,9 @@
-import PackageDiffImpl, { PackageDiffOptions } from '@dxatscale/sfpowerscripts.core/lib/package/diff/PackageDiffImpl';
+import PackageDiffImpl, { PackageDiffOptions } from '../../core/package/diff/PackageDiffImpl';
import { Stage } from '../Stage';
-import ProjectConfig from '@dxatscale/sfpowerscripts.core/lib/project/ProjectConfig';
-import { PackageType } from '@dxatscale/sfpowerscripts.core/lib/package/SfpPackage';
+import ProjectConfig from '../../core/project/ProjectConfig';
+import { PackageType } from '../../core/package/SfpPackage';
import * as fs from 'fs-extra';
-import { Logger } from '@dxatscale/sfp-logger';
+import { Logger } from '@flxblio/sfp-logger';
import BuildCollections from '../parallelBuilder/BuildCollections';
export interface ImpactedPackageProps {
@@ -44,7 +44,7 @@ export default class ImpactedPackageResolver {
private getPathToForceIgnoreForCurrentStage(projectConfig: any, currentStage: Stage): string {
let stageForceIgnorePath: string;
- let ignoreFiles: { [key in Stage]: string } = projectConfig.plugins?.sfpowerscripts?.ignoreFiles;
+ let ignoreFiles: { [key in Stage]: string } = projectConfig.plugins?.sfp?.ignoreFiles;
if (ignoreFiles) {
Object.keys(ignoreFiles).forEach((key) => {
if (key.toLowerCase() == currentStage) {
diff --git a/packages/sfpowerscripts-cli/src/impl/impact/ImpactedReleaseConfig.ts b/packages/sfp-cli/src/impl/impact/ImpactedReleaseConfig.ts
similarity index 88%
rename from packages/sfpowerscripts-cli/src/impl/impact/ImpactedReleaseConfig.ts
rename to packages/sfp-cli/src/impl/impact/ImpactedReleaseConfig.ts
index 1af8798bc..fdfbcc7d7 100644
--- a/packages/sfpowerscripts-cli/src/impl/impact/ImpactedReleaseConfig.ts
+++ b/packages/sfp-cli/src/impl/impact/ImpactedReleaseConfig.ts
@@ -5,7 +5,7 @@ import path from 'path';
export default class ImpactedRelaseConfigResolver {
public getImpactedReleaseConfigs(impactedPackages, configDir,isExplicitDependencyCheckEnabled:boolean=false, filterBy?: string) {
- const impactedReleaseDefs = [];
+ const impactedReleaseConfigs = [];
fs.readdirSync(configDir).forEach((file) => {
const filePath = path.join(configDir, file);
@@ -28,16 +28,17 @@ export default class ImpactedRelaseConfigResolver {
// handle dependencyOn, only do impact if there is atleast one package that is impacted
if (releaseImpactedPackages.length>0 && isExplicitDependencyCheckEnabled && releaseConfig.dependencyOn) {
- releaseImpactedPackages = releaseConfig.dependencyOn.filter((artifact) =>
+ let dependencyImpactedPackages = releaseConfig.dependencyOn.filter((artifact) =>
impactedPackages.includes(artifact)
);
+ releaseImpactedPackages.push(dependencyImpactedPackages);
}
if (releaseImpactedPackages.length > 0) {
if (filterBy) {
if (releaseConfig.releaseName.includes(filterBy)) {
- impactedReleaseDefs.push({
+ impactedReleaseConfigs.push({
releaseName: releaseConfig.releaseName,
pool: releaseConfig.pool
? releaseConfig.pool
@@ -47,7 +48,7 @@ export default class ImpactedRelaseConfigResolver {
});
}
} else {
- impactedReleaseDefs.push({
+ impactedReleaseConfigs.push({
releaseName: releaseConfig.releaseName,
pool: releaseConfig.pool
? releaseConfig.pool
@@ -60,7 +61,7 @@ export default class ImpactedRelaseConfigResolver {
}
});
- const sortedImpactedReleaseDefs = impactedReleaseDefs.sort((a, b) => {
+ const sortedImpactedReleaseConfigs = impactedReleaseConfigs.sort((a, b) => {
if (!a.impactedPackages.length && !b.impactedPackages.length) return 0;
if (!a.impactedPackages.length) return 1; // Move releases with no impacted packages to the end
if (!b.impactedPackages.length) return -1; // Same as above
@@ -76,7 +77,7 @@ export default class ImpactedRelaseConfigResolver {
});
const output = {
- include: sortedImpactedReleaseDefs,
+ include: sortedImpactedReleaseConfigs,
};
return output;
}
diff --git a/packages/sfpowerscripts-cli/src/impl/parallelBuilder/BatchingTopoSort.ts b/packages/sfp-cli/src/impl/parallelBuilder/BatchingTopoSort.ts
similarity index 100%
rename from packages/sfpowerscripts-cli/src/impl/parallelBuilder/BatchingTopoSort.ts
rename to packages/sfp-cli/src/impl/parallelBuilder/BatchingTopoSort.ts
diff --git a/packages/sfpowerscripts-cli/src/impl/parallelBuilder/BuildCollections.ts b/packages/sfp-cli/src/impl/parallelBuilder/BuildCollections.ts
similarity index 96%
rename from packages/sfpowerscripts-cli/src/impl/parallelBuilder/BuildCollections.ts
rename to packages/sfp-cli/src/impl/parallelBuilder/BuildCollections.ts
index 7962ef12f..7d3e3b5dc 100644
--- a/packages/sfpowerscripts-cli/src/impl/parallelBuilder/BuildCollections.ts
+++ b/packages/sfp-cli/src/impl/parallelBuilder/BuildCollections.ts
@@ -1,5 +1,5 @@
import UndirectedGraph from './UndirectedGraph';
-import ProjectConfig from '@dxatscale/sfpowerscripts.core/lib/project/ProjectConfig';
+import ProjectConfig from '../../core/project/ProjectConfig';
/**
* Class for the manipulation of package build collections
diff --git a/packages/sfpowerscripts-cli/src/impl/parallelBuilder/BuildImpl.ts b/packages/sfp-cli/src/impl/parallelBuilder/BuildImpl.ts
similarity index 94%
rename from packages/sfpowerscripts-cli/src/impl/parallelBuilder/BuildImpl.ts
rename to packages/sfp-cli/src/impl/parallelBuilder/BuildImpl.ts
index aa11d3f68..e2895b696 100644
--- a/packages/sfpowerscripts-cli/src/impl/parallelBuilder/BuildImpl.ts
+++ b/packages/sfp-cli/src/impl/parallelBuilder/BuildImpl.ts
@@ -3,12 +3,12 @@ import DependencyHelper from "./DependencyHelper";
import Bottleneck from "bottleneck";
import PackageDiffImpl, {
PackageDiffOptions,
-} from "@dxatscale/sfpowerscripts.core/lib/package/diff/PackageDiffImpl";
+} from "../../core/package/diff/PackageDiffImpl";
import { EOL } from "os";
-import SFPStatsSender from "@dxatscale/sfpowerscripts.core/lib/stats/SFPStatsSender";
+import SFPStatsSender from "../../core/stats/SFPStatsSender";
import { Stage } from "../Stage";
import * as fs from "fs-extra";
-import ProjectConfig from "@dxatscale/sfpowerscripts.core/lib/project/ProjectConfig";
+import ProjectConfig from "../../core/project/ProjectConfig";
import BuildCollections from "./BuildCollections";
const Table = require("cli-table");
import SFPLogger, {
@@ -17,26 +17,26 @@ import SFPLogger, {
FileLogger,
LoggerLevel,
VoidLogger,
-} from "@dxatscale/sfp-logger";
-import { COLOR_KEY_MESSAGE } from "@dxatscale/sfp-logger";
-import { COLOR_HEADER } from "@dxatscale/sfp-logger";
-import { COLOR_ERROR } from "@dxatscale/sfp-logger";
+} from "@flxblio/sfp-logger";
+import { COLOR_KEY_MESSAGE } from "@flxblio/sfp-logger";
+import { COLOR_HEADER } from "@flxblio/sfp-logger";
+import { COLOR_ERROR } from "@flxblio/sfp-logger";
import SfpPackage, {
PackageType,
-} from "@dxatscale/sfpowerscripts.core/lib/package/SfpPackage";
-import SfpPackageBuilder from "@dxatscale/sfpowerscripts.core/lib/package/SfpPackageBuilder";
-import getFormattedTime from "@dxatscale/sfpowerscripts.core/lib/utils/GetFormattedTime";
+} from "../../core/package/SfpPackage";
+import SfpPackageBuilder from "../../core/package/SfpPackageBuilder";
+import getFormattedTime from "../../core/utils/GetFormattedTime";
import {
COLON_MIDDLE_BORDER_TABLE,
ZERO_BORDER_TABLE,
} from "../../ui/TableConstants";
-import PackageDependencyResolver from "@dxatscale/sfpowerscripts.core/lib/package/dependencies/PackageDependencyResolver";
-import SFPOrg from "@dxatscale/sfpowerscripts.core/lib/org/SFPOrg";
-import Git from "@dxatscale/sfpowerscripts.core/lib/git/Git";
-import TransitiveDependencyResolver from "@dxatscale/sfpowerscripts.core/lib/package/dependencies/TransitiveDependencyResolver";
+import PackageDependencyResolver from "../../core/package/dependencies/PackageDependencyResolver";
+import SFPOrg from "../../core/org/SFPOrg";
+import Git from "../../core/git/Git";
+import TransitiveDependencyResolver from "../../core/package/dependencies/TransitiveDependencyResolver";
import GroupConsoleLogs from "../../ui/GroupConsoleLogs";
-import UserDefinedExternalDependency from "@dxatscale/sfpowerscripts.core/lib/project/UserDefinedExternalDependency";
-import PackageDependencyDisplayer from "@dxatscale/sfpowerscripts.core/lib/display/PackageDependencyDisplayer";
+import UserDefinedExternalDependency from "../../core/project/UserDefinedExternalDependency";
+import PackageDependencyDisplayer from "../../core/display/PackageDependencyDisplayer";
const PRIORITY_UNLOCKED_PKG_WITH_DEPENDENCY = 1;
const PRIORITY_UNLOCKED_PKG_WITHOUT_DEPENDENCY = 3;
@@ -800,7 +800,7 @@ export default class BuildImpl {
let stageForceIgnorePath: string;
let ignoreFiles: { [key in Stage]: string } =
- projectConfig.plugins?.sfpowerscripts?.ignoreFiles;
+ projectConfig.plugins?.sfp?.ignoreFiles;
if (ignoreFiles) {
Object.keys(ignoreFiles).forEach((key) => {
if (key.toLowerCase() == currentStage) {
@@ -823,11 +823,11 @@ export default class BuildImpl {
projectConfig: any,
): { [key: string]: any }[] {
this.isMultiConfigFilesEnabled =
- this.projectConfig?.plugins?.sfpowerscripts?.scratchOrgDefFilePaths?.enableMultiDefinitionFiles;
+ this.projectConfig?.plugins?.sfp?.scratchOrgDefFilePaths?.enableMultiDefinitionFiles;
let configFiles: { [key: string]: any }[];
if (this.isMultiConfigFilesEnabled) {
configFiles =
- this.projectConfig?.plugins?.sfpowerscripts?.scratchOrgDefFilePaths
+ this.projectConfig?.plugins?.sfp?.scratchOrgDefFilePaths
?.packages;
}
return configFiles;
@@ -835,7 +835,7 @@ export default class BuildImpl {
private async resolvePackageDependencies(projectConfig: any) {
let isDependencyResolverEnabled =
- !projectConfig?.plugins?.sfpowerscripts
+ !projectConfig?.plugins?.sfp
?.disableTransitiveDependencyResolver;
if (isDependencyResolverEnabled) {
diff --git a/packages/sfpowerscripts-cli/src/impl/parallelBuilder/DependencyHelper.ts b/packages/sfp-cli/src/impl/parallelBuilder/DependencyHelper.ts
similarity index 97%
rename from packages/sfpowerscripts-cli/src/impl/parallelBuilder/DependencyHelper.ts
rename to packages/sfp-cli/src/impl/parallelBuilder/DependencyHelper.ts
index 7549e809e..9e2164912 100644
--- a/packages/sfpowerscripts-cli/src/impl/parallelBuilder/DependencyHelper.ts
+++ b/packages/sfp-cli/src/impl/parallelBuilder/DependencyHelper.ts
@@ -1,4 +1,4 @@
-import ProjectConfig from '@dxatscale/sfpowerscripts.core/lib/project/ProjectConfig';
+import ProjectConfig from '../../core/project/ProjectConfig';
export default class DependencyHelper {
static getParentsToBeFullFilled(packagesWithParents: AdjacentList, packages: string[]): any {
for (let [pkgName, parents] of Object.entries(packagesWithParents)) {
diff --git a/packages/sfpowerscripts-cli/src/impl/parallelBuilder/UndirectedGraph.ts b/packages/sfp-cli/src/impl/parallelBuilder/UndirectedGraph.ts
similarity index 100%
rename from packages/sfpowerscripts-cli/src/impl/parallelBuilder/UndirectedGraph.ts
rename to packages/sfp-cli/src/impl/parallelBuilder/UndirectedGraph.ts
diff --git a/packages/sfpowerscripts-cli/src/impl/prepare/PrepareImpl.ts b/packages/sfp-cli/src/impl/prepare/PrepareImpl.ts
similarity index 88%
rename from packages/sfpowerscripts-cli/src/impl/prepare/PrepareImpl.ts
rename to packages/sfp-cli/src/impl/prepare/PrepareImpl.ts
index 98b976b19..9eb11ed76 100644
--- a/packages/sfpowerscripts-cli/src/impl/prepare/PrepareImpl.ts
+++ b/packages/sfp-cli/src/impl/prepare/PrepareImpl.ts
@@ -1,33 +1,33 @@
import { Org } from '@salesforce/core';
-import { PoolConfig } from '@dxatscale/sfpowerscripts.core/lib/scratchorg/pool/PoolConfig';
-import isValidSfdxAuthUrl from '@dxatscale/sfpowerscripts.core/lib/scratchorg/pool/prequisitecheck/IsValidSfdxAuthUrl';
-import SFPLogger, { COLOR_KEY_MESSAGE, COLOR_WARNING, ConsoleLogger, Logger, LoggerLevel } from '@dxatscale/sfp-logger';
-import ArtifactGenerator from '@dxatscale/sfpowerscripts.core/lib/artifacts/generators/ArtifactGenerator';
-import ProjectConfig from '@dxatscale/sfpowerscripts.core/lib/project/ProjectConfig';
+import { PoolConfig } from '../../core/scratchorg/pool/PoolConfig';
+import isValidSfdxAuthUrl from '../../core/scratchorg/pool/prequisitecheck/IsValidSfdxAuthUrl';
+import SFPLogger, { COLOR_KEY_MESSAGE, COLOR_WARNING, ConsoleLogger, Logger, LoggerLevel } from '@flxblio/sfp-logger';
+import ArtifactGenerator from '../../core/artifacts/generators/ArtifactGenerator';
+import ProjectConfig from '../../core/project/ProjectConfig';
import { Result } from 'neverthrow';
import FetchAnArtifact from '../artifacts/FetchAnArtifact';
import FetchArtifactSelector from '../artifacts/FetchArtifactSelector';
import BuildImpl, { BuildProps } from '../parallelBuilder/BuildImpl';
-import PoolCreateImpl from '@dxatscale/sfpowerscripts.core/lib/scratchorg/pool/PoolCreateImpl';
-import { PoolError } from '@dxatscale/sfpowerscripts.core/lib/scratchorg/pool/PoolError';
+import PoolCreateImpl from '../../core/scratchorg/pool/PoolCreateImpl';
+import { PoolError } from '../../core/scratchorg/pool/PoolError';
import { Stage } from '../Stage';
import PrepareOrgJob from './PrepareOrgJob';
import * as rimraf from 'rimraf';
import * as fs from 'fs-extra';
-import Git from '@dxatscale/sfpowerscripts.core/lib/git/Git';
-import GitTags from '@dxatscale/sfpowerscripts.core/lib/git/GitTags';
-import OrgDetailsFetcher from '@dxatscale/sfpowerscripts.core/lib/org/OrgDetailsFetcher';
-import SFPOrg from '@dxatscale/sfpowerscripts.core/lib/org/SFPOrg';
+import Git from '../../core/git/Git';
+import GitTags from '../../core/git/GitTags';
+import OrgDetailsFetcher from '../../core/org/OrgDetailsFetcher';
+import SFPOrg from '../../core/org/SFPOrg';
import { EOL } from 'os';
-import SFPStatsSender from '@dxatscale/sfpowerscripts.core/lib/stats/SFPStatsSender';
-import ExternalPackage2DependencyResolver from '@dxatscale/sfpowerscripts.core/lib/package/dependencies/ExternalPackage2DependencyResolver';
-import ExternalDependencyDisplayer from '@dxatscale/sfpowerscripts.core/lib/display/ExternalDependencyDisplayer';
+import SFPStatsSender from '../../core/stats/SFPStatsSender';
+import ExternalPackage2DependencyResolver from '../../core/package/dependencies/ExternalPackage2DependencyResolver';
+import ExternalDependencyDisplayer from '../../core/display/ExternalDependencyDisplayer';
import ReleaseDefinitionGenerator from '../release/ReleaseDefinitionGenerator';
-import ReleaseDefinitionSchema from '../release/ReleaseDefinitionSchema';
+import ReleaseDefinition from '../release/ReleaseDefinition';
import { ZERO_BORDER_TABLE } from '../../ui/TableConstants';
import GroupConsoleLogs from '../../ui/GroupConsoleLogs';
-import ReleaseConfig from '../release/ReleaseConfig';
-import { COLOR_KEY_VALUE } from '@dxatscale/sfp-logger';
+import ReleaseConfigLoader from '../release/ReleaseConfigLoader';
+import { COLOR_KEY_VALUE } from '@flxblio/sfp-logger';
const Table = require('cli-table');
@@ -69,6 +69,7 @@ export default class PrepareImpl {
if (this.pool.releaseConfigFile) {
restrictedPackages = await getArtifactsByGeneratingReleaseDefinitionFromConfig(this.pool.releaseConfigFile);
+ SFPLogger.log(`Restricted Packages: ${restrictedPackages}`, LoggerLevel.INFO);
projectConfig = ProjectConfig.cleanupPackagesFromProjectDirectory(null, restrictedPackages);
}
@@ -113,11 +114,12 @@ export default class PrepareImpl {
'prepare',
'test',
undefined,
+ undefined,
true,
false,
true
);
- let releaseDefinition = (await releaseDefinitionGenerator.exec()) as ReleaseDefinitionSchema;
+ let releaseDefinition = (await releaseDefinitionGenerator.exec()) as ReleaseDefinition;
return Object.keys(releaseDefinition.artifacts);
}
}
@@ -287,8 +289,8 @@ export default class PrepareImpl {
function includeOnlyPackagesAsPerReleaseConfig(releaseConfigFilePath:string,buildProps: BuildProps,logger?:Logger): BuildProps {
if (releaseConfigFilePath) {
- let releaseConfig:ReleaseConfig = new ReleaseConfig(logger, releaseConfigFilePath);
- buildProps.includeOnlyPackages = releaseConfig.getPackagesAsPerReleaseConfig();
+ let releaseConfigLoader:ReleaseConfigLoader = new ReleaseConfigLoader(logger, releaseConfigFilePath);
+ buildProps.includeOnlyPackages = releaseConfigLoader.getPackagesAsPerReleaseConfig();
printIncludeOnlyPackages(buildProps.includeOnlyPackages);
}
return buildProps;
diff --git a/packages/sfpowerscripts-cli/src/impl/prepare/PrepareOrgJob.ts b/packages/sfp-cli/src/impl/prepare/PrepareOrgJob.ts
similarity index 88%
rename from packages/sfpowerscripts-cli/src/impl/prepare/PrepareOrgJob.ts
rename to packages/sfp-cli/src/impl/prepare/PrepareOrgJob.ts
index 2a38eb9b9..052f47308 100644
--- a/packages/sfpowerscripts-cli/src/impl/prepare/PrepareOrgJob.ts
+++ b/packages/sfp-cli/src/impl/prepare/PrepareOrgJob.ts
@@ -1,28 +1,28 @@
import DeployImpl, { DeploymentMode, DeployProps, DeploymentResult } from '../deploy/DeployImpl';
-import SFPLogger, { LoggerLevel, Logger, COLOR_KEY_MESSAGE, ConsoleLogger } from '@dxatscale/sfp-logger';
+import SFPLogger, { LoggerLevel, Logger, COLOR_KEY_MESSAGE, ConsoleLogger } from '@flxblio/sfp-logger';
import { Stage } from '../Stage';
-import SFPStatsSender from '@dxatscale/sfpowerscripts.core/lib/stats/SFPStatsSender';
-import ScratchOrg from '@dxatscale/sfpowerscripts.core/lib/scratchorg/ScratchOrg';
+import SFPStatsSender from '../../core/stats/SFPStatsSender';
+import ScratchOrg from '../../core/scratchorg/ScratchOrg';
import { Result, ok, err } from 'neverthrow';
import PoolJobExecutor, {
JobError,
ScriptExecutionResult,
-} from '@dxatscale/sfpowerscripts.core/lib/scratchorg/pool/PoolJobExecutor';
+} from '../../core/scratchorg/pool/PoolJobExecutor';
import { Connection, Org } from '@salesforce/core';
-import { PoolConfig } from '@dxatscale/sfpowerscripts.core/lib/scratchorg/pool/PoolConfig';
-import VlocityPackUpdateSettings from '@dxatscale/sfpowerscripts.core/lib/vlocitywrapper/VlocityPackUpdateSettings';
-import VlocityInitialInstall from '@dxatscale/sfpowerscripts.core/lib/vlocitywrapper/VlocityInitialInstall';
-import ScriptExecutor from '@dxatscale/sfpowerscripts.core/lib/scriptExecutor/ScriptExecutorHelpers';
-import DeploymentSettingsService from '@dxatscale/sfpowerscripts.core/lib/deployers/DeploymentSettingsService';
-import PackageDetails from '@dxatscale/sfpowerscripts.core/lib/package/Package2Detail';
-import InstallUnlockedPackageCollection from '@dxatscale/sfpowerscripts.core/lib/package/packageInstallers/InstallUnlockedPackageCollection';
-import SFPOrg from '@dxatscale/sfpowerscripts.core/lib/org/SFPOrg';
+import { PoolConfig } from '../../core/scratchorg/pool/PoolConfig';
+import VlocityPackUpdateSettings from '../../core/vlocitywrapper/VlocityPackUpdateSettings';
+import VlocityInitialInstall from '../../core/vlocitywrapper/VlocityInitialInstall';
+import ScriptExecutor from '../../core/scriptExecutor/ScriptExecutorHelpers';
+import DeploymentSettingsService from '../../core/deployers/DeploymentSettingsService';
+import PackageDetails from '../../core/package/Package2Detail';
+import InstallUnlockedPackageCollection from '../../core/package/packageInstallers/InstallUnlockedPackageCollection';
+import SFPOrg from '../../core/org/SFPOrg';
import { PreDeployHook } from '../deploy/PreDeployHook';
-import SfpPackage from '@dxatscale/sfpowerscripts.core/lib/package/SfpPackage';
-import ExternalPackage2DependencyResolver from '@dxatscale/sfpowerscripts.core/lib/package/dependencies/ExternalPackage2DependencyResolver';
-import ExternalDependencyDisplayer from '@dxatscale/sfpowerscripts.core/lib/display/ExternalDependencyDisplayer';
-import ProjectConfig from '@dxatscale/sfpowerscripts.core/lib/project/ProjectConfig';
-import { FileLogger } from '@dxatscale/sfp-logger';
+import SfpPackage from '../../core/package/SfpPackage';
+import ExternalPackage2DependencyResolver from '../../core/package/dependencies/ExternalPackage2DependencyResolver';
+import ExternalDependencyDisplayer from '../../core/display/ExternalDependencyDisplayer';
+import ProjectConfig from '../../core/project/ProjectConfig';
+import { FileLogger } from '@flxblio/sfp-logger';
const fs = require('fs-extra');
const SFPOWERSCRIPTS_ARTIFACT_PACKAGE = '04t1P000000ka9mQAA';
@@ -57,8 +57,8 @@ export default class PrepareOrgJob extends PoolJobExecutor implements PreDeployH
individualSODeploymentActivityLogger
);
- //Install sfpowerscripts package
- await this.installSfPowerscriptsArtifactPackage(
+ //Install sfp package
+ await this.installsfpArtifactPackage(
scratchOrg,
individualSODeploymentActivityLogger,
packageCollectionInstaller
@@ -140,18 +140,18 @@ export default class PrepareOrgJob extends PoolJobExecutor implements PreDeployH
return deploymentSucceed;
}
- private async installSfPowerscriptsArtifactPackage(
+ private async installsfpArtifactPackage(
scratchOrg: ScratchOrg,
logger: Logger,
packageCollectionInstaller: InstallUnlockedPackageCollection
) {
SFPLogger.log(`Installing sfpowerscripts_artifact package to the ${scratchOrg.alias}`, null, logger);
- //Install sfpowerscripts artifact package
+ //Install sfp artifact package
await packageCollectionInstaller.install(
[
{
- name: 'sfpowerscripts_artifact2',
+ name: 'SFPOWERSCRIPTS_artifact2',
subscriberPackageVersionId: process.env.SFPOWERSCRIPTS_ARTIFACT_PACKAGE
? process.env.SFPOWERSCRIPTS_ARTIFACT_PACKAGE
: SFPOWERSCRIPTS_ARTIFACT_PACKAGE,
@@ -160,7 +160,7 @@ export default class PrepareOrgJob extends PoolJobExecutor implements PreDeployH
true
);
- SFPLogger.log(`Suscessfully Installed sfpowerscripts_artifact package to the ${scratchOrg.alias}`, null, logger);
+ SFPLogger.log(`Suscessfully Installed SFPOWERSCRIPTS_artifact package to the ${scratchOrg.alias}`, null, logger);
}
private async invokeDeployImpl(
diff --git a/packages/sfpowerscripts-cli/src/impl/release/ReleaseDefinitionGeneratorConfigSchema.ts b/packages/sfp-cli/src/impl/release/ReleaseConfig.ts
similarity index 85%
rename from packages/sfpowerscripts-cli/src/impl/release/ReleaseDefinitionGeneratorConfigSchema.ts
rename to packages/sfp-cli/src/impl/release/ReleaseConfig.ts
index 05d3d8ab9..06f4c3fbb 100644
--- a/packages/sfpowerscripts-cli/src/impl/release/ReleaseDefinitionGeneratorConfigSchema.ts
+++ b/packages/sfp-cli/src/impl/release/ReleaseConfig.ts
@@ -1,10 +1,13 @@
-export default interface ReleaseDefinitionGeneratorSchema {
+export default interface ReleaseConfig {
+ releaseName?: string;
+ pool?:string;
includeOnlyArtifacts?: string[];
excludeArtifacts?: string[];
excludeArtifactsWithTag?: string[];
excludeAllPackageDependencies?:boolean;
excludePackageDependencies?: string[];
includeOnlyPackageDependencies?: string[];
+ dependencyOn?: string[];
releasedefinitionProperties?: {
skipIfAlreadyInstalled: boolean;
skipArtifactUpdate:boolean;
diff --git a/packages/sfpowerscripts-cli/src/impl/release/ReleaseConfig.ts b/packages/sfp-cli/src/impl/release/ReleaseConfigLoader.ts
similarity index 61%
rename from packages/sfpowerscripts-cli/src/impl/release/ReleaseConfig.ts
rename to packages/sfp-cli/src/impl/release/ReleaseConfigLoader.ts
index 299152d12..3805f4da4 100644
--- a/packages/sfpowerscripts-cli/src/impl/release/ReleaseConfig.ts
+++ b/packages/sfp-cli/src/impl/release/ReleaseConfigLoader.ts
@@ -1,35 +1,35 @@
import * as fs from 'fs-extra';
-import ProjectConfig from '@dxatscale/sfpowerscripts.core/lib/project/ProjectConfig';
+import ProjectConfig from '../../core/project/ProjectConfig';
import Ajv, { _ } from 'ajv';
-import ReleaseDefinitionGeneratorConfigSchema from './ReleaseDefinitionGeneratorConfigSchema';
+import ReleaseConfig from './ReleaseConfig';
import lodash = require('lodash');
const yaml = require('js-yaml');
-import { Logger } from '@dxatscale/sfp-logger';
+import { Logger } from '@flxblio/sfp-logger';
const path = require('path');
-export default class ReleaseConfig {
- private _releaseDefinitionGeneratorSchema: ReleaseDefinitionGeneratorConfigSchema;
+export default class ReleaseConfigLoader {
+ private _releaseConfig: ReleaseConfig;
- get releaseDefinitionGeneratorConfigSchema() {
+ get releaseConfig() {
// Return clone of releaseDefinition for immutability
- return lodash.cloneDeep(this._releaseDefinitionGeneratorSchema);
+ return lodash.cloneDeep(this._releaseConfig);
}
public constructor(private logger: Logger, pathToReleaseDefinition: string, private isExplicitDependencyCheckEnabled:boolean=false) {
- this._releaseDefinitionGeneratorSchema = yaml.load(fs.readFileSync(pathToReleaseDefinition, 'utf8'));
- this.validateReleaseDefinitionGeneratorConfig(this._releaseDefinitionGeneratorSchema);
+ this._releaseConfig = yaml.load(fs.readFileSync(pathToReleaseDefinition, 'utf8'));
+ this.validateReleaseDefinitionGeneratorConfig(this._releaseConfig);
// Easy to handle here than with schema
if (
- this._releaseDefinitionGeneratorSchema.includeOnlyArtifacts &&
- this.releaseDefinitionGeneratorConfigSchema.excludeArtifacts
+ this._releaseConfig.includeOnlyArtifacts &&
+ this.releaseConfig.excludeArtifacts
) {
throw new Error('Error: Invalid schema: either use includeArtifacts or excludeArtifacts');
}
// Easy to handle here than with schema
if (
- this._releaseDefinitionGeneratorSchema.includeOnlyPackageDependencies &&
- this.releaseDefinitionGeneratorConfigSchema.excludePackageDependencies
+ this._releaseConfig.includeOnlyPackageDependencies &&
+ this.releaseConfig.excludePackageDependencies
) {
throw new Error(
'Error: Invalid schema: either use includePackageDependencies or excludePackageDependencies'
@@ -38,8 +38,8 @@ export default class ReleaseConfig {
// Workaround for jsonschema not supporting validation based on dependency value
if (
- this._releaseDefinitionGeneratorSchema.releasedefinitionProperties?.baselineOrg &&
- !this._releaseDefinitionGeneratorSchema.releasedefinitionProperties?.skipIfAlreadyInstalled
+ this._releaseConfig.releasedefinitionProperties?.baselineOrg &&
+ !this._releaseConfig.releasedefinitionProperties?.skipIfAlreadyInstalled
)
throw new Error("Release option 'skipIfAlreadyInstalled' must be true for 'baselineOrg'");
}
@@ -69,10 +69,10 @@ export default class ReleaseConfig {
}
private validateReleaseDefinitionGeneratorConfig(
- releaseDefinitionGeneratorSchema: ReleaseDefinitionGeneratorConfigSchema
+ releaseDefinitionGeneratorSchema: ReleaseConfig
): void {
let schema = fs.readJSONSync(
- path.join(__dirname, '..', '..', '..', 'resources', 'schemas', 'releasedefinitiongenerator.schema.json'),
+ path.join(__dirname, '..', '..', '..', 'resources', 'schemas', 'release-config.schema.json'),
{ encoding: 'UTF-8' }
);
@@ -97,19 +97,19 @@ export default class ReleaseConfig {
}
private getArtifactPredicate(artifact: string): boolean {
- if (this.releaseDefinitionGeneratorConfigSchema.includeOnlyArtifacts) {
- return this.releaseDefinitionGeneratorConfigSchema.includeOnlyArtifacts?.includes(artifact);
- } else if (this.releaseDefinitionGeneratorConfigSchema.excludeArtifacts) {
- return !this.releaseDefinitionGeneratorConfigSchema.excludeArtifacts?.includes(artifact);
- } else if(this.isExplicitDependencyCheckEnabled && this.releaseDefinitionGeneratorConfigSchema.dependencyOn) {
- return this.releaseDefinitionGeneratorConfigSchema.dependencyOn?.includes(artifact);
+ if (this.releaseConfig.includeOnlyArtifacts) {
+ return this.releaseConfig.includeOnlyArtifacts?.includes(artifact);
+ } else if (this.releaseConfig.excludeArtifacts) {
+ return !this.releaseConfig.excludeArtifacts?.includes(artifact);
+ } else if(this.isExplicitDependencyCheckEnabled && this.releaseConfig.dependencyOn) {
+ return this.releaseConfig.dependencyOn?.includes(artifact);
}
else return true;
}
private getPackageDependencyPredicate(artifact: string): boolean {
- if(this.isExplicitDependencyCheckEnabled && this.releaseDefinitionGeneratorConfigSchema.dependencyOn) {
- return this.releaseDefinitionGeneratorConfigSchema.dependencyOn?.includes(artifact);
+ if(this.isExplicitDependencyCheckEnabled && this.releaseConfig.dependencyOn) {
+ return this.releaseConfig.dependencyOn?.includes(artifact);
}
}
}
diff --git a/packages/sfpowerscripts-cli/src/impl/release/ReleaseDefinitionSchema.ts b/packages/sfp-cli/src/impl/release/ReleaseDefinition.ts
similarity index 83%
rename from packages/sfpowerscripts-cli/src/impl/release/ReleaseDefinitionSchema.ts
rename to packages/sfp-cli/src/impl/release/ReleaseDefinition.ts
index b8f221291..a2983888f 100644
--- a/packages/sfpowerscripts-cli/src/impl/release/ReleaseDefinitionSchema.ts
+++ b/packages/sfp-cli/src/impl/release/ReleaseDefinition.ts
@@ -1,5 +1,7 @@
-export default interface ReleaseDefinitionSchema {
+export default interface ReleaseDefinition {
release: string;
+ releaseConfigName?:string;
+ metadata?: any;
skipIfAlreadyInstalled: boolean;
skipArtifactUpdate:boolean;
baselineOrg?: string;
diff --git a/packages/sfpowerscripts-cli/src/impl/release/ReleaseDefinitionGenerator.ts b/packages/sfp-cli/src/impl/release/ReleaseDefinitionGenerator.ts
similarity index 73%
rename from packages/sfpowerscripts-cli/src/impl/release/ReleaseDefinitionGenerator.ts
rename to packages/sfp-cli/src/impl/release/ReleaseDefinitionGenerator.ts
index 473cfb90a..f64b63f3e 100644
--- a/packages/sfpowerscripts-cli/src/impl/release/ReleaseDefinitionGenerator.ts
+++ b/packages/sfp-cli/src/impl/release/ReleaseDefinitionGenerator.ts
@@ -1,24 +1,24 @@
import { GitError } from 'simple-git';
import * as fs from 'fs-extra';
-import ReleaseDefinitionSchema from './ReleaseDefinitionSchema';
-import ProjectConfig from '@dxatscale/sfpowerscripts.core/lib/project/ProjectConfig';
+import ReleaseDefinition from './ReleaseDefinition';
+import ProjectConfig from '../../core/project/ProjectConfig';
import Ajv, { _ } from 'ajv';
-import SFPLogger, { COLOR_HEADER, COLOR_KEY_MESSAGE, Logger } from '@dxatscale/sfp-logger';
-import ReleaseDefinitionGeneratorConfigSchema from './ReleaseDefinitionGeneratorConfigSchema';
+import SFPLogger, { COLOR_HEADER, COLOR_KEY_MESSAGE, Logger } from '@flxblio/sfp-logger';
+import ReleaseConfig from './ReleaseConfig';
import lodash = require('lodash');
-import { LoggerLevel } from '@dxatscale/sfp-logger';
-import Git from '@dxatscale/sfpowerscripts.core/lib/git/Git';
-import GitTags from '@dxatscale/sfpowerscripts.core/lib/git/GitTags';
+import { LoggerLevel } from '@flxblio/sfp-logger';
+import Git from '../../core/git/Git';
+import GitTags from '../../core/git/GitTags';
const retry = require('async-retry');
const yaml = require('js-yaml');
const path = require('path');
export default class ReleaseDefinitionGenerator {
- private _releaseDefinitionGeneratorSchema: ReleaseDefinitionGeneratorConfigSchema;
+ private _releaseConfiguration: ReleaseConfig;
- get releaseDefinitionGeneratorConfigSchema() {
+ get releaseConfiguration() {
// Return clone of releaseDefinition for immutability
- return lodash.cloneDeep(this._releaseDefinitionGeneratorSchema);
+ return lodash.cloneDeep(this._releaseConfiguration);
}
public constructor(
@@ -27,25 +27,36 @@ export default class ReleaseDefinitionGenerator {
pathToReleaseDefinition: string,
private releaseName: string,
private branch: string,
+ private metadata: any,
private directory?: string,
private noPush: boolean = false,
private forcePush: boolean = false,
private inMemoryMode:boolean = false
) {
- this._releaseDefinitionGeneratorSchema = yaml.load(fs.readFileSync(pathToReleaseDefinition, 'utf8'));
- this.validateReleaseDefinitionGeneratorConfig(this._releaseDefinitionGeneratorSchema);
+ this._releaseConfiguration = yaml.load(fs.readFileSync(pathToReleaseDefinition, 'utf8'));
+ this.validateReleaseDefinitionGeneratorConfig(this._releaseConfiguration);
+
+
+ //Attempt to parse metadata flag into JSON
+ if (this.metadata) {
+ try {
+ this.metadata = JSON.parse(this.metadata);
+ } catch (error) {
+ throw new Error(`Invalid JSON for metadata flag: ${error}`);
+ }
+ }
// Easy to handle here than with schema
if (
- this._releaseDefinitionGeneratorSchema.includeOnlyArtifacts &&
- this.releaseDefinitionGeneratorConfigSchema.excludeArtifacts
+ this._releaseConfiguration.includeOnlyArtifacts &&
+ this.releaseConfiguration.excludeArtifacts
) {
throw new Error('Error: Invalid schema: either use includeArtifacts or excludeArtifacts');
}
// Easy to handle here than with schema
if (
- this._releaseDefinitionGeneratorSchema.includeOnlyPackageDependencies &&
- this.releaseDefinitionGeneratorConfigSchema.excludePackageDependencies
+ this._releaseConfiguration.includeOnlyPackageDependencies &&
+ this.releaseConfiguration.excludePackageDependencies
) {
throw new Error(
'Error: Invalid schema: either use includePackageDependencies or excludePackageDependencies'
@@ -54,13 +65,13 @@ export default class ReleaseDefinitionGenerator {
// Workaround for jsonschema not supporting validation based on dependency value
if (
- this._releaseDefinitionGeneratorSchema.releasedefinitionProperties?.baselineOrg &&
- !this._releaseDefinitionGeneratorSchema.releasedefinitionProperties?.skipIfAlreadyInstalled
+ this._releaseConfiguration.releasedefinitionProperties?.baselineOrg &&
+ !this._releaseConfiguration.releasedefinitionProperties?.skipIfAlreadyInstalled
)
throw new Error("Release option 'skipIfAlreadyInstalled' must be true for 'baselineOrg'");
}
- async exec(): Promise {
@@ -92,7 +103,7 @@ export default class ReleaseDefinitionGenerator {
);
}
- private async execHandler(): Promise {
@@ -146,7 +157,7 @@ export default class ReleaseDefinitionGenerator {
}
}
- if (!this.releaseDefinitionGeneratorConfigSchema.excludeAllPackageDependencies) {
+ if (!this.releaseConfiguration.excludeAllPackageDependencies) {
let allExternalPackages = ProjectConfig.getAllExternalPackages(projectConfig);
for (const externalPackage of allExternalPackages) {
if (
@@ -161,7 +172,7 @@ export default class ReleaseDefinitionGenerator {
return { artifacts, packageDependencies };
}
- private async generateReleaseDefintion(artifacts: any, packageDependencies: any, git: Git): Promise {
@@ -179,8 +190,10 @@ export default class ReleaseDefinitionGenerator {
return obj;
}, {});
- let releaseDefinition: ReleaseDefinitionSchema = {
+ let releaseDefinition: ReleaseDefinition = {
release: this.releaseName,
+ releaseConfigName : this.releaseConfiguration?.releaseName,
+ metadata: this.metadata,
skipIfAlreadyInstalled: true,
skipArtifactUpdate:false,
artifacts: artifacts,
@@ -190,18 +203,18 @@ export default class ReleaseDefinitionGenerator {
if (Object.keys(packageDependencies).length > 0) releaseDefinition.packageDependencies = packageDependencies;
//add promotePackagesBeforeDeploymentToOrg
- releaseDefinition.promotePackagesBeforeDeploymentToOrg = this.releaseDefinitionGeneratorConfigSchema.releasedefinitionProperties?.promotePackagesBeforeDeploymentToOrg;
+ releaseDefinition.promotePackagesBeforeDeploymentToOrg = this.releaseConfiguration.releasedefinitionProperties?.promotePackagesBeforeDeploymentToOrg;
//override skip if already installed
- if(this.releaseDefinitionGeneratorConfigSchema.releasedefinitionProperties?.skipIfAlreadyInstalled)
- releaseDefinition.skipIfAlreadyInstalled = this.releaseDefinitionGeneratorConfigSchema.releasedefinitionProperties?.skipIfAlreadyInstalled;
+ if(this.releaseConfiguration.releasedefinitionProperties?.skipIfAlreadyInstalled)
+ releaseDefinition.skipIfAlreadyInstalled = this.releaseConfiguration.releasedefinitionProperties?.skipIfAlreadyInstalled;
//override skip artifact update
- if(this.releaseDefinitionGeneratorConfigSchema.releasedefinitionProperties?.skipArtifactUpdate)
- releaseDefinition.skipArtifactUpdate = this.releaseDefinitionGeneratorConfigSchema.releasedefinitionProperties?.skipArtifactUpdate;
+ if(this.releaseConfiguration.releasedefinitionProperties?.skipArtifactUpdate)
+ releaseDefinition.skipArtifactUpdate = this.releaseConfiguration.releasedefinitionProperties?.skipArtifactUpdate;
//Add changelog info
- releaseDefinition.changelog = this.releaseDefinitionGeneratorConfigSchema.releasedefinitionProperties?.changelog;
+ releaseDefinition.changelog = this.releaseConfiguration.releasedefinitionProperties?.changelog;
if(this.inMemoryMode)
return releaseDefinition;
@@ -240,10 +253,10 @@ export default class ReleaseDefinitionGenerator {
}
private validateReleaseDefinitionGeneratorConfig(
- releaseDefinitionGeneratorSchema: ReleaseDefinitionGeneratorConfigSchema
+ releaseDefinitionGeneratorSchema: ReleaseConfig
): void {
let schema = fs.readJSONSync(
- path.join(__dirname, '..', '..', '..', 'resources', 'schemas', 'releasedefinitiongenerator.schema.json'),
+ path.join(__dirname, '..', '..', '..', 'resources', 'schemas', 'release-config.schema.json'),
{ encoding: 'UTF-8' }
);
@@ -268,18 +281,18 @@ export default class ReleaseDefinitionGenerator {
}
private getArtifactPredicate(artifact: string): boolean {
- if (this.releaseDefinitionGeneratorConfigSchema.includeOnlyArtifacts) {
- return this.releaseDefinitionGeneratorConfigSchema.includeOnlyArtifacts?.includes(artifact);
- } else if (this.releaseDefinitionGeneratorConfigSchema.excludeArtifacts) {
- return !this.releaseDefinitionGeneratorConfigSchema.excludeArtifacts?.includes(artifact);
+ if (this.releaseConfiguration.includeOnlyArtifacts) {
+ return this.releaseConfiguration.includeOnlyArtifacts?.includes(artifact);
+ } else if (this.releaseConfiguration.excludeArtifacts) {
+ return !this.releaseConfiguration.excludeArtifacts?.includes(artifact);
} else return true;
}
private getDependencyPredicate(artifact: string): boolean {
- if (this.releaseDefinitionGeneratorConfigSchema.includeOnlyPackageDependencies) {
- return this.releaseDefinitionGeneratorConfigSchema.includeOnlyPackageDependencies?.includes(artifact);
- } else if (this.releaseDefinitionGeneratorConfigSchema.excludePackageDependencies) {
- return !this.releaseDefinitionGeneratorConfigSchema.excludePackageDependencies?.includes(artifact);
+ if (this.releaseConfiguration.includeOnlyPackageDependencies) {
+ return this.releaseConfiguration.includeOnlyPackageDependencies?.includes(artifact);
+ } else if (this.releaseConfiguration.excludePackageDependencies) {
+ return !this.releaseConfiguration.excludePackageDependencies?.includes(artifact);
} else return true;
}
}
\ No newline at end of file
diff --git a/packages/sfpowerscripts-cli/src/impl/release/ReleaseDefinition.ts b/packages/sfp-cli/src/impl/release/ReleaseDefinitionLoader.ts
similarity index 67%
rename from packages/sfpowerscripts-cli/src/impl/release/ReleaseDefinition.ts
rename to packages/sfp-cli/src/impl/release/ReleaseDefinitionLoader.ts
index 27e383be1..3c11cd4b8 100644
--- a/packages/sfpowerscripts-cli/src/impl/release/ReleaseDefinition.ts
+++ b/packages/sfp-cli/src/impl/release/ReleaseDefinitionLoader.ts
@@ -1,48 +1,48 @@
-import ReleaseDefinitionSchema from './ReleaseDefinitionSchema';
+import ReleaseDefinition from './ReleaseDefinition';
import Ajv from 'ajv';
const yaml = require('js-yaml');
import lodash = require('lodash');
import get18DigitSalesforceId from '../../utils/Get18DigitSalesforceId';
-import Git from '@dxatscale/sfpowerscripts.core/lib/git/Git';
-import { ConsoleLogger } from '@dxatscale/sfp-logger';
+import Git from '../../core/git/Git';
+import { ConsoleLogger } from '@flxblio/sfp-logger';
const fs = require('fs-extra');
const path = require('path');
-export default class ReleaseDefinition {
+export default class ReleaseDefinitionLoader {
get releaseDefinition() {
// Return clone of releaseDefinition for immutability
- return lodash.cloneDeep(this._releaseDefinitionSchema);
+ return lodash.cloneDeep(this._releaseDefinition);
}
- private constructor(private _releaseDefinitionSchema: ReleaseDefinitionSchema) {
- this.validateReleaseDefinition(this._releaseDefinitionSchema);
+ private constructor(private _releaseDefinition: ReleaseDefinition) {
+ this.validateReleaseDefinition(this._releaseDefinition);
// Workaround for jsonschema not supporting validation based on dependency value
- if (this._releaseDefinitionSchema.baselineOrg && !this._releaseDefinitionSchema.skipIfAlreadyInstalled)
+ if (this._releaseDefinition.baselineOrg && !this._releaseDefinition.skipIfAlreadyInstalled)
throw new Error("Release option 'skipIfAlreadyInstalled' must be true for 'baselineOrg'");
- if (this._releaseDefinitionSchema.packageDependencies) {
- this.convertPackageDependenciesIdTo18Digits(this._releaseDefinitionSchema.packageDependencies);
+ if (this._releaseDefinition.packageDependencies) {
+ this.convertPackageDependenciesIdTo18Digits(this._releaseDefinition.packageDependencies);
}
}
- public static async loadReleaseDefinition(pathToReleaseDefinition: string) {
+ public static async loadReleaseDefinition(pathToReleaseDefinition: string): Promise {
//Check whether path contains gitRef
- let releaseDefinitionSchema: ReleaseDefinitionSchema;
+ let releaseDefinition: ReleaseDefinition;
try {
if (pathToReleaseDefinition.includes(':')) {
let git = await Git.initiateRepo();
await git.fetch();
let releaseFile = await git.show([pathToReleaseDefinition]);
- releaseDefinitionSchema = yaml.load(releaseFile);
+ releaseDefinition = yaml.load(releaseFile);
} else {
- releaseDefinitionSchema = yaml.load(fs.readFileSync(pathToReleaseDefinition, 'UTF8'));
+ releaseDefinition = yaml.load(fs.readFileSync(pathToReleaseDefinition, 'UTF8'));
}
} catch (error) {
throw new Error(`Unable to read the release definition file due to ${JSON.stringify(error)}`);
}
- let releaseDefinition = new ReleaseDefinition(releaseDefinitionSchema);
- return releaseDefinition;
+ let releaseDefinitionLoader = new ReleaseDefinitionLoader(releaseDefinition);
+ return releaseDefinitionLoader.releaseDefinition;
}
private convertPackageDependenciesIdTo18Digits(packageDependencies: { [p: string]: string }) {
@@ -51,9 +51,9 @@ export default class ReleaseDefinition {
}
}
- private validateReleaseDefinition(releaseDefinition: ReleaseDefinitionSchema): void {
+ private validateReleaseDefinition(releaseDefinition: ReleaseDefinition): void {
let schema = fs.readJSONSync(
- path.join(__dirname, '..', '..', '..', 'resources', 'schemas', 'releasedefinition.schema.json'),
+ path.join(__dirname, '..', '..', '..', 'resources', 'schemas', 'release-defn.schema.json'),
{ encoding: 'UTF-8' }
);
diff --git a/packages/sfp-cli/src/impl/release/ReleaseDefinitionSorter.ts b/packages/sfp-cli/src/impl/release/ReleaseDefinitionSorter.ts
new file mode 100644
index 000000000..288f48081
--- /dev/null
+++ b/packages/sfp-cli/src/impl/release/ReleaseDefinitionSorter.ts
@@ -0,0 +1,45 @@
+import { Logger } from '@flxblio/sfp-logger';
+import SfpPackageInquirer from '../../core/package/SfpPackageInquirer';
+import ProjectConfig from '../../core/project/ProjectConfig';
+import ArtifactFetcher, { Artifact } from '../../core/artifacts/ArtifactFetcher';
+import SfpPackage from '../../core/package/SfpPackage';
+import SfpPackageBuilder from '../../core/package/SfpPackageBuilder';
+import ReleaseDefinition from './ReleaseDefinition';
+import _ from 'lodash';
+
+export default class ReleaseDefinitionSorter {
+
+ public sortReleaseDefinitions(
+ releaseDefinitions: ReleaseDefinition[],
+ leadingSfProjectConfig: any,
+ logger: Logger
+ ): ReleaseDefinition[] {
+
+ let clonedReleaseDefintions:ReleaseDefinition[] = _.cloneDeep(releaseDefinitions);
+ const allPackagesInConfig = ProjectConfig.getAllPackagesFromProjectConfig(leadingSfProjectConfig);
+ const packageOccurrenceCount = new Map();
+
+ // Count occurrences of each package across all release definitions
+ clonedReleaseDefintions.forEach((releaseDefinition) => {
+ Object.keys(releaseDefinition.artifacts).forEach((pkg) => {
+ if (allPackagesInConfig.includes(pkg)) {
+ // Only consider packages present in the project config
+ packageOccurrenceCount.set(pkg, (packageOccurrenceCount.get(pkg) || 0) + 1);
+ }
+ });
+ });
+ // Annotate each release definition with the index of its first unique package
+ clonedReleaseDefintions.forEach((releasedefnition) => {
+ releasedefnition['firstUniquePackageIndex'] = allPackagesInConfig.length; // Default to length (i.e., end) if no unique package is found
+ for (const pkg of allPackagesInConfig) {
+ if (releasedefnition.artifacts[pkg] && packageOccurrenceCount.get(pkg) === 1) {
+ // Check if the package is unique
+ releasedefnition['firstUniquePackageIndex'] = allPackagesInConfig.indexOf(pkg);
+ break; // Found the first unique package, no need to continue
+ }
+ }
+ });
+ // Sort based on the first unique package's index, placing those without a unique package at the end
+ return clonedReleaseDefintions.sort((a, b) => a['firstUniquePackageIndex'] - b['firstUniquePackageIndex']);
+ }
+}
diff --git a/packages/sfpowerscripts-cli/src/impl/release/ReleaseImpl.ts b/packages/sfp-cli/src/impl/release/ReleaseImpl.ts
similarity index 56%
rename from packages/sfpowerscripts-cli/src/impl/release/ReleaseImpl.ts
rename to packages/sfp-cli/src/impl/release/ReleaseImpl.ts
index dc7eddbff..0d2f49bd7 100644
--- a/packages/sfpowerscripts-cli/src/impl/release/ReleaseImpl.ts
+++ b/packages/sfp-cli/src/impl/release/ReleaseImpl.ts
@@ -1,21 +1,27 @@
-import ReleaseDefinitionSchema from './ReleaseDefinitionSchema';
+import ReleaseDefinition from './ReleaseDefinition';
import DeployImpl, { DeployProps, DeploymentMode, DeploymentResult } from '../deploy/DeployImpl';
-import SFPLogger, { COLOR_HEADER, COLOR_KEY_MESSAGE, ConsoleLogger, Logger, LoggerLevel } from '@dxatscale/sfp-logger';
+import SFPLogger, { COLOR_HEADER, COLOR_INFO, COLOR_KEY_MESSAGE, ConsoleLogger, Logger, LoggerLevel } from '@flxblio/sfp-logger';
import { Stage } from '../Stage';
import ReleaseError from '../../errors/ReleaseError';
-import ChangelogImpl from '../../impl/changelog/ChangelogImpl';
-import SFPStatsSender from '@dxatscale/sfpowerscripts.core/lib/stats/SFPStatsSender';
+import ChangelogImpl from '../changelog/ChangelogImpl';
+import SFPStatsSender from '../../core/stats/SFPStatsSender';
import { Release } from '../changelog/ReleaseChangelog';
-import SFPOrg from '@dxatscale/sfpowerscripts.core/lib/org/SFPOrg';
+import SFPOrg from '../../core/org/SFPOrg';
import path = require('path');
import { EOL } from 'os';
-import Package2Detail from '@dxatscale/sfpowerscripts.core/lib/package/Package2Detail';
-import InstallUnlockedPackageCollection from '@dxatscale/sfpowerscripts.core/lib/package/packageInstallers/InstallUnlockedPackageCollection';
+import Package2Detail from '../../core/package/Package2Detail';
+import InstallUnlockedPackageCollection from '../../core/package/packageInstallers/InstallUnlockedPackageCollection';
import FetchImpl from '../artifacts/FetchImpl';
-import GroupConsoleLogs from '../../ui/GroupConsoleLogs';
+import GroupConsoleLogs from '../../ui/GroupConsoleLogs';
+import ArtifactFetcher, { Artifact } from '../../core/artifacts/ArtifactFetcher';
+import SfpPackage from '../../core/package/SfpPackage';
+import SfpPackageBuilder from '../../core/package/SfpPackageBuilder';
+import SfpPackageInquirer from '../../core/package/SfpPackageInquirer';
+import ReleaseDefinitionSorter from './ReleaseDefinitionSorter';
+import FileOutputHandler from '../../outputs/FileOutputHandler';
export interface ReleaseProps {
- releaseDefinitions: ReleaseDefinitionSchema[];
+ releaseDefinitions: ReleaseDefinition[];
targetOrg: string;
fetchArtifactScript: string;
isNpm: boolean;
@@ -32,7 +38,16 @@ export interface ReleaseProps {
directory: string;
}
+type DeploymentStatus = {
+ releaseDefinition: ReleaseDefinition;
+ result: DeploymentResult;
+};
+
+
export default class ReleaseImpl {
+
+
+
constructor(private props: ReleaseProps, private logger?: Logger) {}
public async exec(): Promise {
@@ -45,6 +60,13 @@ export default class ReleaseImpl {
this.logger
);
await fetchImpl.fetchArtifacts(this.props.releaseDefinitions);
+
+ SFPLogger.log(COLOR_INFO(`Sorting order of release definitions...`), LoggerLevel.INFO, this.logger);
+ const sortedReleaseDefns = await this.getSortedReleaseDefns('artifacts',this.props.releaseDefinitions, this.logger);
+ const sortedReleaseOrder = sortedReleaseDefns.map((def) => def.release);
+ SFPLogger.log(COLOR_KEY_MESSAGE(`Order of Release Definitions: ${JSON.stringify(sortedReleaseOrder)}`), LoggerLevel.INFO, this.logger);
+
+
groupSection.end();
let installDependenciesResult: InstallDependenciesResult;
@@ -55,11 +77,16 @@ export default class ReleaseImpl {
this.props.waitTime
);
- let deploymentResults = await this.deployArtifacts(this.props.releaseDefinitions);
+ //Clear up the deployment output
+ SFPLogger.log(`Clearing deployment output`, LoggerLevel.TRACE, this.logger);
+ FileOutputHandler.getInstance().deleteOutputFile(`deployment-breakdown.md`);
+ FileOutputHandler.getInstance().deleteOutputFile(`release-changelog.md`);
+
+ let deploymentResults = await this.deployArtifacts(sortedReleaseDefns);
//Get all suceeded deploys
- let succeededDeploymentResults = [];
- let failedDeploymentResults = [];
+ let succeededDeploymentResults: DeploymentStatus[] = [];
+ let failedDeploymentResults: DeploymentStatus[] = [];
for (const deploymentResult of deploymentResults) {
if (deploymentResult.result.failed.length === 0) succeededDeploymentResults.push(deploymentResult);
else failedDeploymentResults.push(deploymentResult);
@@ -76,62 +103,70 @@ export default class ReleaseImpl {
let limit = 30;
let workItemUrl: string;
let showAllArtifacts: boolean = false;
- for (const releaseDefinition of this.props.releaseDefinitions) {
- releaseName = releaseName.concat(releaseDefinition.release, '-');
+
+ //Lets go through all the succeeded deployments and get the changelog
+ for (const succededDeployment of succeededDeploymentResults) {
+ releaseName = succededDeployment.releaseDefinition.release;
+ let releaseDefinition = succededDeployment.releaseDefinition;
if (releaseDefinition.changelog) {
- if(releaseDefinition.changelog.workItemFilters) {
- workitemFilters.push(...releaseDefinition.changelog?.workItemFilters);
+ if (releaseDefinition.changelog.workItemFilters) {
+ workitemFilters.push(...releaseDefinition.changelog?.workItemFilters);
}
if (releaseDefinition.changelog.limit > limit) limit = releaseDefinition.changelog.limit;
workItemUrl = releaseDefinition.changelog.workItemUrl;
showAllArtifacts = releaseDefinition.changelog.showAllArtifacts;
}
- }
- //Remove the last '-' from the name
- releaseName = releaseName.slice(0, -1);
- if (this.props.isGenerateChangelog) {
- let groupSection = new GroupConsoleLogs('Release changelog').begin();
- try {
- let changelogImpl: ChangelogImpl = new ChangelogImpl(
- this.logger,
- 'artifacts',
- releaseName,
- workitemFilters,
- limit,
- workItemUrl,
- showAllArtifacts,
- this.props.directory,
- false,
- this.props.branch,
- false,
- this.props.isDryRun,
- this.props.targetOrg
- );
-
- let releaseChangelog = await changelogImpl.exec();
-
- const aggregatedNumberOfWorkItemsInRelease = this.getAggregatedNumberOfWorkItemsInRelease(
- releaseName,
- releaseChangelog.releases
- );
-
- SFPStatsSender.logGauge('release.workitems', aggregatedNumberOfWorkItemsInRelease, {
- releaseName: releaseName,
- });
-
- const aggregatedNumberOfCommitsInRelease = this.getAggregatedNumberOfCommitsInRelease(
- releaseName,
- releaseChangelog.releases
- );
-
- SFPStatsSender.logGauge('release.commits', aggregatedNumberOfCommitsInRelease, {
- releaseName: releaseName,
- });
- } catch (error) {
- SFPLogger.log(`Unable to push changelog`, LoggerLevel.WARN, this.logger);
- }
- groupSection.end();
+ if (this.props.isGenerateChangelog) {
+ let groupSection = new GroupConsoleLogs('Release changelog').begin();
+ try {
+ let changelogImpl: ChangelogImpl = new ChangelogImpl(
+ this.logger,
+ this.getArtifactDirectory(releaseDefinition),
+ releaseName,
+ workitemFilters,
+ limit,
+ workItemUrl,
+ showAllArtifacts,
+ releaseDefinition.releaseConfigName
+ ? path.join(this.props.directory?this.props.directory:"", releaseDefinition.releaseConfigName)
+ : this.props.directory?this.props.directory:"",
+ false,
+ this.props.branch,
+ false,
+ this.props.isDryRun,
+ releaseDefinition.releaseConfigName,
+ this.props.targetOrg
+ );
+
+ let releaseChangelog = await changelogImpl.exec();
+
+ const aggregatedNumberOfWorkItemsInRelease = this.getAggregatedNumberOfWorkItemsInRelease(
+ releaseName,
+ releaseChangelog.releases
+ );
+
+ SFPStatsSender.logGauge('release.workitems', aggregatedNumberOfWorkItemsInRelease, {
+ releaseName: releaseName,
+ domain: releaseDefinition.releaseConfigName,
+ });
+
+ const aggregatedNumberOfCommitsInRelease = this.getAggregatedNumberOfCommitsInRelease(
+ releaseName,
+ releaseChangelog.releases
+ );
+
+ SFPStatsSender.logGauge('release.commits', aggregatedNumberOfCommitsInRelease, {
+ releaseName: releaseName,
+ domain: releaseDefinition.releaseConfigName,
+ });
+ } catch (error) {
+ SFPLogger.log(`Unable to push changelog`, LoggerLevel.WARN, this.logger);
+ SFPLogger.log(error, LoggerLevel.TRACE, this.logger);
+ }
+
+ groupSection.end();
+ }
}
}
@@ -194,25 +229,20 @@ export default class ReleaseImpl {
return numberOfCommits;
}
- private async deployArtifacts(
- releaseDefinitions: ReleaseDefinitionSchema[]
- ): Promise<{ releaseDefinition: ReleaseDefinitionSchema; result: DeploymentResult }[]> {
- let deploymentResults: { releaseDefinition: ReleaseDefinitionSchema; result: DeploymentResult }[] = [];
+
+
+ private async deployArtifacts(releaseDefinitions: ReleaseDefinition[]): Promise {
+ let deploymentResults: { releaseDefinition: ReleaseDefinition; result: DeploymentResult }[] = [];
for (const releaseDefinition of releaseDefinitions) {
- let groupSection = new GroupConsoleLogs(`Release ${releaseDefinition.release}`).begin();
+ let groupSection = new GroupConsoleLogs(`Release ${releaseDefinition.release} for Release Configuration: ${releaseDefinition.releaseConfigName}`).begin();
SFPLogger.log(EOL);
this.displayReleaseInfo(releaseDefinition, this.props);
- //Each release will be downloaded to specific subfolder inside the provided artifact directory
- //As each release is a collection of artifacts
- let revisedArtifactDirectory = path.join(
- 'artifacts',
- releaseDefinition.release.replace(/[/\\?%*:|"<>]/g, '-')
- );
+
let deployProps: DeployProps = {
targetUsername: this.props.targetOrg,
- artifactDir: revisedArtifactDirectory,
+ artifactDir: this.getArtifactDirectory(releaseDefinition),
waitTime: this.props.waitTime,
tags: this.props.tags,
isTestsToBeTriggered: false,
@@ -222,11 +252,14 @@ export default class ReleaseImpl {
currentStage: Stage.DEPLOY,
baselineOrg: releaseDefinition.baselineOrg,
isDryRun: this.props.isDryRun,
- disableArtifactCommit: releaseDefinition.skipArtifactUpdate?releaseDefinition.skipArtifactUpdate:false,
+ disableArtifactCommit: releaseDefinition.skipArtifactUpdate
+ ? releaseDefinition.skipArtifactUpdate
+ : false,
promotePackagesBeforeDeploymentToOrg: releaseDefinition.promotePackagesBeforeDeploymentToOrg,
devhubUserName: this.props.devhubUserName,
};
+ FileOutputHandler.getInstance().appendOutput(`deployment-breakdown.md`,`## ReleaseConfig: ${releaseDefinition.releaseConfigName?releaseDefinition.releaseConfigName:""}\n`);
let deployImpl: DeployImpl = new DeployImpl(deployProps);
let deploymentResult = await deployImpl.exec();
@@ -239,8 +272,31 @@ export default class ReleaseImpl {
return deploymentResults;
}
+ private async getSortedReleaseDefns(artifactDirectory: string,releaseDefns:ReleaseDefinition[], logger: Logger): Promise {
+ let artifacts = ArtifactFetcher.fetchArtifacts(artifactDirectory, null, logger);
+ if (artifacts.length === 0) throw new Error(`No artifacts to deploy found in ${artifactDirectory}`);
+
+ //Convert artifacts to SfpPackages
+ let sfpPackages = await this.generateSfpPackageFromArtifacts(artifacts, logger);
+
+ let sfpPackageInquirer: SfpPackageInquirer = new SfpPackageInquirer(sfpPackages, logger);
+ let sfdxProjectConfig = sfpPackageInquirer.getLatestProjectConfig();
+
+ let releaseDefinitionSorter = new ReleaseDefinitionSorter();
+ return releaseDefinitionSorter.sortReleaseDefinitions(releaseDefns, sfdxProjectConfig, logger);
+ }
+
+ private async generateSfpPackageFromArtifacts(artifacts: Artifact[], logger: Logger): Promise {
+ let sfpPackages: SfpPackage[] = [];
+ for (const artifact of artifacts) {
+ let sfpPackage = await SfpPackageBuilder.buildPackageFromArtifact(artifact, logger);
+ sfpPackages.push(sfpPackage);
+ }
+ return sfpPackages;
+ }
+
private async installPackageDependencies(
- releaseDefinitions: ReleaseDefinitionSchema[],
+ releaseDefinitions: ReleaseDefinition[],
targetOrg: string,
keys: string,
waitTime: number
@@ -279,7 +335,11 @@ export default class ReleaseImpl {
externalPackage2s.push(dependendentPackage);
}
let sfpOrg = await SFPOrg.create({ aliasOrUsername: targetOrg });
- let packageCollectionInstaller = new InstallUnlockedPackageCollection(sfpOrg, new ConsoleLogger(),this.props.isDryRun);
+ let packageCollectionInstaller = new InstallUnlockedPackageCollection(
+ sfpOrg,
+ new ConsoleLogger(),
+ this.props.isDryRun
+ );
await packageCollectionInstaller.install(externalPackage2s, true, true);
groupSection.end();
@@ -319,10 +379,13 @@ export default class ReleaseImpl {
return output;
}
- private displayReleaseInfo(releaseDefinition: ReleaseDefinitionSchema, props: ReleaseProps) {
- SFPLogger.printHeaderLine('',COLOR_HEADER,LoggerLevel.INFO);
+ private displayReleaseInfo(releaseDefinition: ReleaseDefinition, props: ReleaseProps) {
+ SFPLogger.printHeaderLine('', COLOR_HEADER, LoggerLevel.INFO);
SFPLogger.log(COLOR_KEY_MESSAGE(`Release: ${releaseDefinition.release}`));
+ if (releaseDefinition.releaseConfigName) {
+ SFPLogger.log(COLOR_KEY_MESSAGE(`Release Config Name: ${releaseDefinition.releaseConfigName}`));
+ }
SFPLogger.log(
COLOR_KEY_MESSAGE(
@@ -331,17 +394,32 @@ export default class ReleaseImpl {
);
SFPLogger.log(COLOR_KEY_MESSAGE(`Dry-run: ${props.isDryRun}`));
-
+
if (releaseDefinition.baselineOrg)
SFPLogger.log(COLOR_KEY_MESSAGE(`Baselined Against Org: ${releaseDefinition.baselineOrg}`));
-
+
if (
releaseDefinition.promotePackagesBeforeDeploymentToOrg &&
releaseDefinition.promotePackagesBeforeDeploymentToOrg == props.targetOrg
)
SFPLogger.log(COLOR_KEY_MESSAGE(`Promte Packages Before Deployment Activated?: true`));
- SFPLogger.printHeaderLine('',COLOR_HEADER,LoggerLevel.INFO);
+ SFPLogger.printHeaderLine('', COLOR_HEADER, LoggerLevel.INFO);
+ }
+
+ private getArtifactDirectory(releaseDefinition: ReleaseDefinition) {
+ let revisedArtifactDirectory = path.join(
+ 'artifacts',
+ releaseDefinition.release.replace(/[/\\?%*:|"<>]/g, '-')
+ );
+ if (releaseDefinition.releaseConfigName) {
+ revisedArtifactDirectory = path.join(
+ 'artifacts',
+ releaseDefinition.releaseConfigName.replace(/[/\\?%*:|"<>]/g, '-'),
+ releaseDefinition.release.replace(/[/\\?%*:|"<>]/g, '-')
+ );
+ }
+ return revisedArtifactDirectory;
}
}
@@ -352,7 +430,7 @@ interface InstallDependenciesResult {
}
export interface ReleaseResult {
- succeededDeployments: { releaseDefinition: ReleaseDefinitionSchema; result: DeploymentResult }[];
- failedDeployments: { releaseDefinition: ReleaseDefinitionSchema; result: DeploymentResult }[];
+ succeededDeployments: { releaseDefinition: ReleaseDefinition; result: DeploymentResult }[];
+ failedDeployments: { releaseDefinition: ReleaseDefinition; result: DeploymentResult }[];
installDependenciesResult: InstallDependenciesResult;
}
diff --git a/packages/sfpowerscripts-cli/src/impl/repo/AlignImpl.ts b/packages/sfp-cli/src/impl/repo/AlignImpl.ts
similarity index 85%
rename from packages/sfpowerscripts-cli/src/impl/repo/AlignImpl.ts
rename to packages/sfp-cli/src/impl/repo/AlignImpl.ts
index a8ad16c43..d12cf51fa 100644
--- a/packages/sfpowerscripts-cli/src/impl/repo/AlignImpl.ts
+++ b/packages/sfp-cli/src/impl/repo/AlignImpl.ts
@@ -1,4 +1,4 @@
-import { Logger } from "@dxatscale/sfp-logger";
+import { Logger } from "@flxblio/sfp-logger";
export interface AlignRepoProps {
artifactDirectory: string;
diff --git a/packages/sfpowerscripts-cli/src/impl/validate/Analyzer.ts b/packages/sfp-cli/src/impl/validate/Analyzer.ts
similarity index 69%
rename from packages/sfpowerscripts-cli/src/impl/validate/Analyzer.ts
rename to packages/sfp-cli/src/impl/validate/Analyzer.ts
index c986f644f..09170a45a 100644
--- a/packages/sfpowerscripts-cli/src/impl/validate/Analyzer.ts
+++ b/packages/sfp-cli/src/impl/validate/Analyzer.ts
@@ -1,5 +1,5 @@
-import ChangedComponentsFetcher from "@dxatscale/sfpowerscripts.core/lib/dependency/ChangedComponentsFetcher";
-import Component from "@dxatscale/sfpowerscripts.core/lib/dependency/Component";
+import ChangedComponentsFetcher from "../../core/dependency/ChangedComponentsFetcher";
+import Component from "../../core/dependency/Component";
export class Analyzer {
diff --git a/packages/sfpowerscripts-cli/src/impl/validate/ApexTestValidator.ts b/packages/sfp-cli/src/impl/validate/ApexTestValidator.ts
similarity index 93%
rename from packages/sfpowerscripts-cli/src/impl/validate/ApexTestValidator.ts
rename to packages/sfp-cli/src/impl/validate/ApexTestValidator.ts
index 555af29c7..1b4e650a6 100644
--- a/packages/sfpowerscripts-cli/src/impl/validate/ApexTestValidator.ts
+++ b/packages/sfp-cli/src/impl/validate/ApexTestValidator.ts
@@ -1,8 +1,8 @@
-import SFPLogger, { COLOR_HEADER, Logger } from "@dxatscale/sfp-logger";
-import { CoverageOptions } from "@dxatscale/sfpowerscripts.core/lib/apex/coverage/IndividualClassCoverage";
-import { TestOptions, RunAllTestsInPackageOptions, RunSpecifiedTestsOption } from "@dxatscale/sfpowerscripts.core/lib/apextest/TestOptions";
-import TriggerApexTests from "@dxatscale/sfpowerscripts.core/lib/apextest/TriggerApexTests";
-import SfpPackage, { PackageType } from "@dxatscale/sfpowerscripts.core/lib/package/SfpPackage";
+import SFPLogger, { COLOR_HEADER, Logger } from "@flxblio/sfp-logger";
+import { CoverageOptions } from "../../core/apex/coverage/IndividualClassCoverage";
+import { TestOptions, RunAllTestsInPackageOptions, RunSpecifiedTestsOption } from "../../core/apextest/TestOptions";
+import TriggerApexTests from "../../core/apextest/TriggerApexTests";
+import SfpPackage, { PackageType } from "../../core/package/SfpPackage";
import { LoggerLevel } from "@salesforce/core";
import { ValidationMode } from "./ValidateImpl";
diff --git a/packages/sfpowerscripts-cli/src/impl/validate/ValidateImpl.ts b/packages/sfp-cli/src/impl/validate/ValidateImpl.ts
similarity index 86%
rename from packages/sfpowerscripts-cli/src/impl/validate/ValidateImpl.ts
rename to packages/sfp-cli/src/impl/validate/ValidateImpl.ts
index c01d52f7f..b4df61c6c 100644
--- a/packages/sfpowerscripts-cli/src/impl/validate/ValidateImpl.ts
+++ b/packages/sfp-cli/src/impl/validate/ValidateImpl.ts
@@ -4,7 +4,7 @@ import DeployImpl, {
DeployProps,
DeploymentResult,
} from "../deploy/DeployImpl";
-import ArtifactGenerator from "@dxatscale/sfpowerscripts.core/lib/artifacts/generators/ArtifactGenerator";
+import ArtifactGenerator from "../../core/artifacts/generators/ArtifactGenerator";
import { Stage } from "../Stage";
import SFPLogger, {
COLOR_KEY_VALUE,
@@ -12,43 +12,43 @@ import SFPLogger, {
ConsoleLogger,
Logger,
LoggerLevel,
-} from "@dxatscale/sfp-logger";
+} from "@flxblio/sfp-logger";
import {
PackageInstallationResult,
PackageInstallationStatus,
-} from "@dxatscale/sfpowerscripts.core/lib/package/packageInstallers/PackageInstallationResult";
-import { PackageDiffOptions } from "@dxatscale/sfpowerscripts.core/lib/package/diff/PackageDiffImpl";
-import PoolFetchImpl from "@dxatscale/sfpowerscripts.core/lib/scratchorg/pool/PoolFetchImpl";
+} from "../../core/package/packageInstallers/PackageInstallationResult";
+import { PackageDiffOptions } from "../../core/package/diff/PackageDiffImpl";
+import PoolFetchImpl from "../../core/scratchorg/pool/PoolFetchImpl";
import { Org } from "@salesforce/core";
-import InstalledArtifactsDisplayer from "@dxatscale/sfpowerscripts.core/lib/display/InstalledArtifactsDisplayer";
+import InstalledArtifactsDisplayer from "../../core/display/InstalledArtifactsDisplayer";
import ValidateError from "../../errors/ValidateError";
-import ScratchOrg from "@dxatscale/sfpowerscripts.core/lib/scratchorg/ScratchOrg";
-import { COLOR_KEY_MESSAGE } from "@dxatscale/sfp-logger";
-import { COLOR_WARNING } from "@dxatscale/sfp-logger";
-import { COLOR_ERROR } from "@dxatscale/sfp-logger";
-import { COLOR_HEADER } from "@dxatscale/sfp-logger";
-import { COLOR_SUCCESS } from "@dxatscale/sfp-logger";
-import { COLOR_TIME } from "@dxatscale/sfp-logger";
-import SFPStatsSender from "@dxatscale/sfpowerscripts.core/lib/stats/SFPStatsSender";
-import ScratchOrgInfoFetcher from "@dxatscale/sfpowerscripts.core/lib/scratchorg/pool/services/fetchers/ScratchOrgInfoFetcher";
-import ScratchOrgInfoAssigner from "@dxatscale/sfpowerscripts.core/lib/scratchorg/pool/services/updaters/ScratchOrgInfoAssigner";
+import ScratchOrg from "../../core/scratchorg/ScratchOrg";
+import { COLOR_KEY_MESSAGE } from "@flxblio/sfp-logger";
+import { COLOR_WARNING } from "@flxblio/sfp-logger";
+import { COLOR_ERROR } from "@flxblio/sfp-logger";
+import { COLOR_HEADER } from "@flxblio/sfp-logger";
+import { COLOR_SUCCESS } from "@flxblio/sfp-logger";
+import { COLOR_TIME } from "@flxblio/sfp-logger";
+import SFPStatsSender from "../../core/stats/SFPStatsSender";
+import ScratchOrgInfoFetcher from "../../core/scratchorg/pool/services/fetchers/ScratchOrgInfoFetcher";
+import ScratchOrgInfoAssigner from "../../core/scratchorg/pool/services/updaters/ScratchOrgInfoAssigner";
import ValidateResult from "./ValidateResult";
-import PoolOrgDeleteImpl from "@dxatscale/sfpowerscripts.core/lib/scratchorg/pool/PoolOrgDeleteImpl";
-import SFPOrg from "@dxatscale/sfpowerscripts.core/lib/org/SFPOrg";
+import PoolOrgDeleteImpl from "../../core/scratchorg/pool/PoolOrgDeleteImpl";
+import SFPOrg from "../../core/org/SFPOrg";
import SfpPackage, {
PackageType,
-} from "@dxatscale/sfpowerscripts.core/lib/package/SfpPackage";
+} from "../../core/package/SfpPackage";
-import getFormattedTime from "@dxatscale/sfpowerscripts.core/lib/utils/GetFormattedTime";
+import getFormattedTime from "../../core/utils/GetFormattedTime";
import { PostDeployHook } from "../deploy/PostDeployHook";
import * as rimraf from "rimraf";
-import ProjectConfig from "@dxatscale/sfpowerscripts.core/lib/project/ProjectConfig";
-import InstallUnlockedPackageCollection from "@dxatscale/sfpowerscripts.core/lib/package/packageInstallers/InstallUnlockedPackageCollection";
-import ExternalPackage2DependencyResolver from "@dxatscale/sfpowerscripts.core/lib/package/dependencies/ExternalPackage2DependencyResolver";
-import ExternalDependencyDisplayer from "@dxatscale/sfpowerscripts.core/lib/display/ExternalDependencyDisplayer";
+import ProjectConfig from "../../core/project/ProjectConfig";
+import InstallUnlockedPackageCollection from "../../core/package/packageInstallers/InstallUnlockedPackageCollection";
+import ExternalPackage2DependencyResolver from "../../core/package/dependencies/ExternalPackage2DependencyResolver";
+import ExternalDependencyDisplayer from "../../core/display/ExternalDependencyDisplayer";
import { PreDeployHook } from "../deploy/PreDeployHook";
import GroupConsoleLogs from "../../ui/GroupConsoleLogs";
-import ReleaseConfig from "../release/ReleaseConfig";
+import ReleaseConfigLoader from "../release/ReleaseConfigLoader";
import { mapInstalledArtifactstoPkgAndCommits } from "../../utils/FetchArtifactsFromOrg";
import { ApexTestValidator } from "./ApexTestValidator";
import OrgInfoDisplayer from "../../ui/OrgInfoDisplayer";
@@ -138,7 +138,7 @@ export default class ValidateImpl implements PostDeployHook, PreDeployHook {
let installedArtifacts = await this.orgAsSFPOrg.getInstalledArtifacts();
if (installedArtifacts.length == 0) {
SFPLogger.log(
- COLOR_ERROR("Failed to query org for Sfpowerscripts Artifacts"),
+ COLOR_ERROR("Failed to query org for sfp Artifacts"),
);
}
packagesInstalledInOrgMappedToCommits =
@@ -477,30 +477,27 @@ export default class ValidateImpl implements PostDeployHook, PreDeployHook {
function computePackageOverrides(props: ValidateProps): { [key: string]: PackageType } {
- let overridedPackages: { [key: string]: PackageType } = {};
- const allPackages = ProjectConfig.getAllPackages(null);
- const projectConfig = ProjectConfig.getSFDXProjectConfig(null);
- for (const pkg of allPackages) {
-
- if (ProjectConfig.getPackageType(projectConfig, pkg) !== PackageType.Data) {
- if (
- props.validationMode ===
- ValidationMode.FASTFEEDBACK_LIMITED_BY_RELEASE_CONFIG ||
- props.validationMode ===
- ValidationMode.FAST_FEEDBACK
- ) {
- overridedPackages[pkg] = PackageType.Diff
- }
- else {
- if (!props.disableSourcePackageOverride) {
- if (ProjectConfig.getPackageType(projectConfig, pkg) != PackageType.Data || ProjectConfig.getPackageType(projectConfig, pkg) != PackageType.Diff)
- overridedPackages[pkg] = PackageType.Source
- }
- }
- }
- }
- return overridedPackages;
- }
+ let overridedPackages: { [key: string]: PackageType } = {};
+ const allPackages = ProjectConfig.getAllPackages(null);
+ const projectConfig = ProjectConfig.getSFDXProjectConfig(null);
+ for (const pkg of allPackages) {
+ if (ProjectConfig.getPackageType(projectConfig, pkg) !== PackageType.Data) {
+ if (
+ props.validationMode === ValidationMode.FASTFEEDBACK_LIMITED_BY_RELEASE_CONFIG ||
+ props.validationMode === ValidationMode.FAST_FEEDBACK
+ ) {
+ overridedPackages[pkg] = PackageType.Diff;
+ } else {
+ if (!props.disableSourcePackageOverride) {
+ if (ProjectConfig.getPackageType(projectConfig, pkg) == PackageType.Unlocked) {
+ overridedPackages[pkg] = PackageType.Source;
+ }
+ }
+ }
+ }
+ }
+ return overridedPackages;
+ }
function fetchPackagesAsPerReleaseConfig(
logger: Logger,
@@ -512,12 +509,12 @@ export default class ValidateImpl implements PostDeployHook, PreDeployHook {
props.validationMode ===
ValidationMode.THOROUGH_LIMITED_BY_RELEASE_CONFIG
) {
- let releaseConfig: ReleaseConfig = new ReleaseConfig(
+ let releaseConfigLoader: ReleaseConfigLoader = new ReleaseConfigLoader(
logger,
props.releaseConfigPath,
true
);
- return releaseConfig.getPackagesAsPerReleaseConfig();
+ return releaseConfigLoader.getPackagesAsPerReleaseConfig();
}
}
diff --git a/packages/sfpowerscripts-cli/src/impl/validate/ValidateResult.ts b/packages/sfp-cli/src/impl/validate/ValidateResult.ts
similarity index 70%
rename from packages/sfpowerscripts-cli/src/impl/validate/ValidateResult.ts
rename to packages/sfp-cli/src/impl/validate/ValidateResult.ts
index c25c30cc0..a8c360812 100644
--- a/packages/sfpowerscripts-cli/src/impl/validate/ValidateResult.ts
+++ b/packages/sfp-cli/src/impl/validate/ValidateResult.ts
@@ -1,5 +1,5 @@
import { DeploymentResult, PackageInfo } from '../deploy/DeployImpl';
-import DependencyViolation from '@dxatscale/sfpowerscripts.core/lib/dependency/DependencyViolation';
+import DependencyViolation from '../../core/dependency/DependencyViolation';
export default interface ValidateResult {
deploymentResult?: DeploymentResult;
diff --git a/packages/core/src/index.ts b/packages/sfp-cli/src/index.ts
similarity index 100%
rename from packages/core/src/index.ts
rename to packages/sfp-cli/src/index.ts
diff --git a/packages/sfpowerscripts-cli/src/outputs/FileOutputHandler.ts b/packages/sfp-cli/src/outputs/FileOutputHandler.ts
similarity index 85%
rename from packages/sfpowerscripts-cli/src/outputs/FileOutputHandler.ts
rename to packages/sfp-cli/src/outputs/FileOutputHandler.ts
index cba026c60..a9436b092 100644
--- a/packages/sfpowerscripts-cli/src/outputs/FileOutputHandler.ts
+++ b/packages/sfp-cli/src/outputs/FileOutputHandler.ts
@@ -32,4 +32,10 @@ export default class FileOutputHandler {
fs.appendFileSync(path.join(this.containerFolder, fileName), output);
}
+ public deleteOutputFile(fileName: string) {
+ if (fs.existsSync(path.join(this.containerFolder, fileName))) {
+ fs.unlinkSync(path.join(this.containerFolder, fileName));
+ }
+ }
+
}
\ No newline at end of file
diff --git a/packages/sfpowerscripts-cli/src/ui/GroupConsoleLogs.ts b/packages/sfp-cli/src/ui/GroupConsoleLogs.ts
similarity index 94%
rename from packages/sfpowerscripts-cli/src/ui/GroupConsoleLogs.ts
rename to packages/sfp-cli/src/ui/GroupConsoleLogs.ts
index fee2cb14b..42f284f3c 100644
--- a/packages/sfpowerscripts-cli/src/ui/GroupConsoleLogs.ts
+++ b/packages/sfp-cli/src/ui/GroupConsoleLogs.ts
@@ -1,5 +1,5 @@
-import SFPLogger, { Logger, LoggerLevel } from '@dxatscale/sfp-logger';
-import { COLOR_KEY_MESSAGE } from '@dxatscale/sfp-logger';
+import SFPLogger, { Logger, LoggerLevel } from '@flxblio/sfp-logger';
+import { COLOR_KEY_MESSAGE } from '@flxblio/sfp-logger';
import { EOL } from 'os';
//TODO: Move to sfpconsole package
diff --git a/packages/sfpowerscripts-cli/src/ui/OrgInfoDisplayer.ts b/packages/sfp-cli/src/ui/OrgInfoDisplayer.ts
similarity index 87%
rename from packages/sfpowerscripts-cli/src/ui/OrgInfoDisplayer.ts
rename to packages/sfp-cli/src/ui/OrgInfoDisplayer.ts
index 228aca8b0..e3cb0cbf4 100644
--- a/packages/sfpowerscripts-cli/src/ui/OrgInfoDisplayer.ts
+++ b/packages/sfp-cli/src/ui/OrgInfoDisplayer.ts
@@ -1,10 +1,10 @@
-import SFPLogger, { COLOR_HEADER, COLOR_KEY_VALUE, COLOR_KEY_MESSAGE, COLOR_TRACE } from "@dxatscale/sfp-logger";
-import SFPOrg from "@dxatscale/sfpowerscripts.core/lib/org/SFPOrg";
+import SFPLogger, { COLOR_HEADER, COLOR_KEY_VALUE, COLOR_KEY_MESSAGE, COLOR_TRACE } from "@flxblio/sfp-logger";
+import SFPOrg from "../core/org/SFPOrg";
const Table = require("cli-table");
import { LoggerLevel } from "@salesforce/core";
import GroupConsoleLogs from "./GroupConsoleLogs";
import { COLON_MIDDLE_BORDER_TABLE } from "./TableConstants";
-import ScratchOrg from "@dxatscale/sfpowerscripts.core/lib/scratchorg/ScratchOrg";
+import ScratchOrg from "../core/scratchorg/ScratchOrg";
import { Align, getMarkdownTable } from "markdown-table-ts";
import fs from "fs-extra";
import FileOutputHandler from "../outputs/FileOutputHandler";
@@ -50,21 +50,21 @@ export default class OrgInfoDisplayer {
LoggerLevel.INFO,
);
SFPLogger.log(
- COLOR_TRACE(`cat ${scratchOrg.sfdxAuthUrl} > ./authfile`),
+ COLOR_TRACE(`echo ${scratchOrg.sfdxAuthUrl} > ./authfile`),
LoggerLevel.INFO,
);
SFPLogger.log(
- COLOR_TRACE(`sfdx auth sfdxurl store --sfdxurlfile authfile`),
+ COLOR_TRACE(`sf org login sfdx-url --sfdx-url-file=authfile`),
LoggerLevel.INFO,
);
SFPLogger.log(
- COLOR_TRACE(`sfdx force org open --u ${scratchOrg.username}`),
+ COLOR_TRACE(`sf org open --target-org=${scratchOrg.username}`),
LoggerLevel.INFO,
);
SFPLogger.printHeaderLine('', COLOR_HEADER, LoggerLevel.INFO);
-
+
groupSection.end();
@@ -93,11 +93,11 @@ export default class OrgInfoDisplayer {
fileOutputHandler.appendOutput(pathToMarkDownFile,
`\n\nYou may use the following commands to authenticate to the org`,);
- fileOutputHandler.appendOutput(pathToMarkDownFile, `\`\`\``);
- fileOutputHandler.appendOutput(pathToMarkDownFile, `cat ${scratchOrg.sfdxAuthUrl} > ./authfile`);
- fileOutputHandler.appendOutput(pathToMarkDownFile, `sfdx auth sfdxurl store --sfdxurlfile authfile`);
- fileOutputHandler.appendOutput(pathToMarkDownFile, `sfdx force org open --u ${scratchOrg.username}`);
- fileOutputHandler.appendOutput(pathToMarkDownFile, `\`\`\``);
+ fileOutputHandler.appendOutput(pathToMarkDownFile, `\`\`\``);
+ fileOutputHandler.appendOutput(pathToMarkDownFile, `echo ${scratchOrg.sfdxAuthUrl} > ./authfile`);
+ fileOutputHandler.appendOutput(pathToMarkDownFile, `sf org login sfdx-url --sfdx-url-file=authfile`);
+ fileOutputHandler.appendOutput(pathToMarkDownFile, `sf org open --target-org=${scratchOrg.username}`);
+ fileOutputHandler.appendOutput(pathToMarkDownFile, `\`\`\``);
}
@@ -153,4 +153,4 @@ export default class OrgInfoDisplayer {
}
-}
\ No newline at end of file
+}
diff --git a/packages/sfpowerscripts-cli/src/ui/TableConstants.ts b/packages/sfp-cli/src/ui/TableConstants.ts
similarity index 100%
rename from packages/sfpowerscripts-cli/src/ui/TableConstants.ts
rename to packages/sfp-cli/src/ui/TableConstants.ts
diff --git a/packages/sfpowerscripts-cli/src/utils/FetchArtifactsFromOrg.ts b/packages/sfp-cli/src/utils/FetchArtifactsFromOrg.ts
similarity index 100%
rename from packages/sfpowerscripts-cli/src/utils/FetchArtifactsFromOrg.ts
rename to packages/sfp-cli/src/utils/FetchArtifactsFromOrg.ts
diff --git a/packages/sfpowerscripts-cli/src/utils/Get18DigitSalesforceId.ts b/packages/sfp-cli/src/utils/Get18DigitSalesforceId.ts
similarity index 100%
rename from packages/sfpowerscripts-cli/src/utils/Get18DigitSalesforceId.ts
rename to packages/sfp-cli/src/utils/Get18DigitSalesforceId.ts
diff --git a/packages/sfpowerscripts-cli/tests/ProjectValidation.test.ts b/packages/sfp-cli/tests/ProjectValidation.test.ts
similarity index 98%
rename from packages/sfpowerscripts-cli/tests/ProjectValidation.test.ts
rename to packages/sfp-cli/tests/ProjectValidation.test.ts
index 3f131d071..a3a2f6da0 100644
--- a/packages/sfpowerscripts-cli/tests/ProjectValidation.test.ts
+++ b/packages/sfp-cli/tests/ProjectValidation.test.ts
@@ -1,9 +1,9 @@
-import ProjectConfig from '@dxatscale/sfpowerscripts.core/lib/project/ProjectConfig';
+import ProjectConfig from '../src/core/project/ProjectConfig';
import { jest, expect } from '@jest/globals';
import ProjectValidation from '../src/ProjectValidation';
describe('Given a sfdx-project.json, it should be validated against the scehma', () => {
- it('should not throw an error for a valid sfdx-project.json without any sfpowerscripts decorators', () => {
+ it('should not throw an error for a valid sfdx-project.json without any sfp decorators', () => {
let sfdx_project = {
packageDirectories: [
{
@@ -108,7 +108,7 @@ describe('Given a sfdx-project.json, it should be validated against the scehma',
}).not.toThrow();
});
- it('should not throw an error for a sfdx-project.json where various sfpowerscripts orchestrator properties are used', () => {
+ it('should not throw an error for a sfdx-project.json where various sfp orchestrator properties are used', () => {
let sfdx_project = {
packageDirectories: [
{
@@ -184,7 +184,7 @@ describe('Given a sfdx-project.json, it should be validated against the scehma',
}).not.toThrow();
});
- it('should not throw an error for a sfdx-project.json where various sfpowerscripts orchestrator properties are incorrectly used', () => {
+ it('should not throw an error for a sfdx-project.json where various sfp orchestrator properties are incorrectly used', () => {
//As the errors are moved to warning, it will not throw an error
let sfdx_project = {
packageDirectories: [
diff --git a/packages/core/tests/apextest/ApexTestSuite.test.ts b/packages/sfp-cli/tests/core/apextest/ApexTestSuite.test.ts
similarity index 97%
rename from packages/core/tests/apextest/ApexTestSuite.test.ts
rename to packages/sfp-cli/tests/core/apextest/ApexTestSuite.test.ts
index d3192e4fd..ac9e026b3 100644
--- a/packages/core/tests/apextest/ApexTestSuite.test.ts
+++ b/packages/sfp-cli/tests/core/apextest/ApexTestSuite.test.ts
@@ -1,6 +1,6 @@
import { jest, expect } from '@jest/globals';
const fs = require('fs-extra');
-import ApexTestSuite from '../../src/apextest/ApexTestSuite';
+import ApexTestSuite from '../../../src/core/apextest/ApexTestSuite';
import * as globSync from 'glob';
diff --git a/packages/core/tests/artifacts/ArtifactsFromFileSystem.test.ts b/packages/sfp-cli/tests/core/artifacts/ArtifactsFromFileSystem.test.ts
similarity index 96%
rename from packages/core/tests/artifacts/ArtifactsFromFileSystem.test.ts
rename to packages/sfp-cli/tests/core/artifacts/ArtifactsFromFileSystem.test.ts
index 374ae8145..5e201822e 100644
--- a/packages/core/tests/artifacts/ArtifactsFromFileSystem.test.ts
+++ b/packages/sfp-cli/tests/core/artifacts/ArtifactsFromFileSystem.test.ts
@@ -1,8 +1,8 @@
import { jest, expect } from '@jest/globals';
-import ArtifactFetcher from '../../src/artifacts/ArtifactFetcher';
+import ArtifactFetcher from '../../../src/core/artifacts/ArtifactFetcher';
import * as globSync from 'glob';
-describe('Provided a path to the artifacts folder containing sfpowerscripts artifact', () => {
+describe('Provided a path to the artifacts folder containing sfp artifact', () => {
it('should return all the artifacts, if a package name is not provided', () => {
jest.spyOn(globSync, 'globSync').mockImplementationOnce((pattern: string | string[], options: any) => {
diff --git a/packages/core/tests/coverage/IndividualClassCoverage.test.ts b/packages/sfp-cli/tests/core/coverage/IndividualClassCoverage.test.ts
similarity index 96%
rename from packages/core/tests/coverage/IndividualClassCoverage.test.ts
rename to packages/sfp-cli/tests/core/coverage/IndividualClassCoverage.test.ts
index 6337b484b..f2be12f57 100644
--- a/packages/core/tests/coverage/IndividualClassCoverage.test.ts
+++ b/packages/sfp-cli/tests/core/coverage/IndividualClassCoverage.test.ts
@@ -1,6 +1,6 @@
-import IndividualClassCoverage from '../../src/apex/coverage/IndividualClassCoverage';
+import IndividualClassCoverage from '../../../src/core/apex/coverage/IndividualClassCoverage';
import { expect } from '@jest/globals';
-import { ConsoleLogger } from '@dxatscale/sfp-logger';
+import { ConsoleLogger } from '@flxblio/sfp-logger';
describe('Given a test coverage report', () => {
it('should be able to get a list of all classes and its test coverage', () => {
diff --git a/packages/core/tests/git/GitTags.test.ts b/packages/sfp-cli/tests/core/git/GitTags.test.ts
similarity index 95%
rename from packages/core/tests/git/GitTags.test.ts
rename to packages/sfp-cli/tests/core/git/GitTags.test.ts
index fb10c4f87..e87764aaa 100644
--- a/packages/core/tests/git/GitTags.test.ts
+++ b/packages/sfp-cli/tests/core/git/GitTags.test.ts
@@ -1,11 +1,11 @@
import { jest, expect } from '@jest/globals';
-import GitTags from '../../src/git/GitTags';
-import Git from '../../src/git/Git';
+import GitTags from '../../../src/core/git/GitTags';
+import Git from '../../../src/core/git/Git';
import child_process = require('child_process');
let tags: string[];
-jest.mock('../../src/git/Git', () => {
+jest.mock('../../../src/core/git/Git', () => {
class Git {
tag = jest.fn().mockReturnValue(tags);
log = jest.fn().mockReturnValue(gitLog);
diff --git a/packages/core/tests/org/ArtifactsToOrg.test.ts b/packages/sfp-cli/tests/core/org/ArtifactsToOrg.test.ts
similarity index 87%
rename from packages/core/tests/org/ArtifactsToOrg.test.ts
rename to packages/sfp-cli/tests/core/org/ArtifactsToOrg.test.ts
index 8176b7d77..d4b739399 100644
--- a/packages/core/tests/org/ArtifactsToOrg.test.ts
+++ b/packages/sfp-cli/tests/core/org/ArtifactsToOrg.test.ts
@@ -1,9 +1,9 @@
import { expect } from '@jest/globals';
import { MockTestOrgData, TestContext } from '@salesforce/core/lib/testSetup';
-import { ConsoleLogger, VoidLogger } from '@dxatscale/sfp-logger';
+import { ConsoleLogger, VoidLogger } from '@flxblio/sfp-logger';
import { AnyJson, ensureJsonMap, JsonMap, ensureString } from '@salesforce/ts-types';
-import SFPOrg from '../../src/org/SFPOrg';
-import SfpPackage from '../../src/package/SfpPackage';
+import SFPOrg from '../../../src/core/org/SFPOrg';
+import SfpPackage from '../../../src/core/package/SfpPackage';
const $$ = new TestContext();
@@ -19,8 +19,8 @@ const createOrg = async () => {
return await SFPOrg.create({ aliasOrUsername: testData.username });
};
-describe('Fetch a list of sfpowerscripts artifacts from an org', () => {
- it('Return a blank list of sfpowerscripts artifact, if there are no previously installed artifacts ', async () => {
+describe('Fetch a list of sfp artifacts from an org', () => {
+ it('Return a blank list of sfp artifact, if there are no previously installed artifacts ', async () => {
let org = await createOrg();
let records = { records: [] };
@@ -32,13 +32,13 @@ describe('Fetch a list of sfpowerscripts artifacts from an org', () => {
expect(artifacts).toEqual([]);
});
- it('Return a list of sfpowerscripts artifact, if there are previously installed artifacts ', async () => {
+ it('Return a list of sfp artifact, if there are previously installed artifacts ', async () => {
let org = await createOrg();
let records = { records:[
{
Id: 'a0zR0000003F1FuIAK',
- Name: 'sfpowerscripts-package',
+ Name: 'sfp-package',
CommitId__c: '0a516404aa92f02866f9d2725bda5b1b3f23547e',
Version__c: '1.0.0.NEXT',
Tag__c: 'undefined',
@@ -52,7 +52,7 @@ describe('Fetch a list of sfpowerscripts artifacts from an org', () => {
let artifacts = await org.getInstalledArtifacts();
let expectedpackage = {
Id: 'a0zR0000003F1FuIAK',
- Name: 'sfpowerscripts-package',
+ Name: 'sfp-package',
CommitId__c: '0a516404aa92f02866f9d2725bda5b1b3f23547e',
Version__c: '1.0.0.NEXT',
Tag__c: 'undefined',
@@ -72,8 +72,8 @@ describe('Fetch a list of sfpowerscripts artifacts from an org', () => {
},45000);
});
-describe('Update a sfpowerscripts artifact to an org', () => {
- it('Update a sfpowerscripts artifact, installing it the first time', async () => {
+describe('Update a sfp artifact to an org', () => {
+ it('Update a sfp artifact, installing it the first time', async () => {
let org = await createOrg();
let records = { records: [] };
@@ -113,7 +113,7 @@ describe('Update a sfpowerscripts artifact to an org', () => {
expect(result).toEqual(pushResult.id);
});
- it('Update a sfpowerscripts artifact, installing a newer version of it', async () => {
+ it('Update a sfp artifact, installing a newer version of it', async () => {
let org = await createOrg();
let records = { records : [
@@ -162,7 +162,7 @@ describe('Update a sfpowerscripts artifact to an org', () => {
expect(result).toEqual(pushResult.id);
});
- it('Update a sfpowerscripts artifact and resulting an error,should throw an exception', async () => {
+ it('Update a sfp artifact and resulting an error,should throw an exception', async () => {
let org = await createOrg();
let records={ records : [
diff --git a/packages/core/tests/org/ListAllPackages.test.ts b/packages/sfp-cli/tests/core/org/ListAllPackages.test.ts
similarity index 97%
rename from packages/core/tests/org/ListAllPackages.test.ts
rename to packages/sfp-cli/tests/core/org/ListAllPackages.test.ts
index 5a5888ed2..0c6af8b2b 100644
--- a/packages/core/tests/org/ListAllPackages.test.ts
+++ b/packages/sfp-cli/tests/core/org/ListAllPackages.test.ts
@@ -1,7 +1,7 @@
import { expect } from '@jest/globals';
import { MockTestOrgData, TestContext } from '@salesforce/core/lib/testSetup';
import { AnyJson } from '@salesforce/ts-types';
-import SFPOrg from '../../lib/org/SFPOrg';
+import SFPOrg from '../../../src/core/org/SFPOrg';
import { OrgConfigProperties } from '@salesforce/core';
const $$ = new TestContext();
diff --git a/packages/core/tests/package/Package2VersionFetcher.test.ts b/packages/sfp-cli/tests/core/package/Package2VersionFetcher.test.ts
similarity index 96%
rename from packages/core/tests/package/Package2VersionFetcher.test.ts
rename to packages/sfp-cli/tests/core/package/Package2VersionFetcher.test.ts
index 7eaffe1df..2b7589393 100644
--- a/packages/core/tests/package/Package2VersionFetcher.test.ts
+++ b/packages/sfp-cli/tests/core/package/Package2VersionFetcher.test.ts
@@ -1,7 +1,7 @@
import { expect } from '@jest/globals';
import { MockTestOrgData, TestContext } from '@salesforce/core/lib/testSetup';
import { Connection, AuthInfo } from '@salesforce/core';
-import Package2VersionFetcher from '../../src/package/version/Package2VersionFetcher';
+import Package2VersionFetcher from '../../../src/core/package/version/Package2VersionFetcher';
import { AnyJson } from '@salesforce/ts-types';
const $$ = new TestContext();
diff --git a/packages/core/tests/package/PackageDiffImpl.test.ts b/packages/sfp-cli/tests/core/package/PackageDiffImpl.test.ts
similarity index 95%
rename from packages/core/tests/package/PackageDiffImpl.test.ts
rename to packages/sfp-cli/tests/core/package/PackageDiffImpl.test.ts
index 69a44d44a..75a8ed5e4 100644
--- a/packages/core/tests/package/PackageDiffImpl.test.ts
+++ b/packages/sfp-cli/tests/core/package/PackageDiffImpl.test.ts
@@ -1,14 +1,14 @@
import { jest, expect } from '@jest/globals';
const fs = require('fs');
-import { ConsoleLogger } from '@dxatscale/sfp-logger';
-import PackageDiffImpl, { PackageDiffOptions } from '../../src/package/diff/PackageDiffImpl';
-import ProjectConfig from '../../src/project/ProjectConfig';
+import { ConsoleLogger } from '@flxblio/sfp-logger';
+import PackageDiffImpl, { PackageDiffOptions } from '../../../src/core/package/diff/PackageDiffImpl';
+import ProjectConfig from '../../../src/core/project/ProjectConfig';
let gitTags: string[] = [];
let gitDiff: string[] = [];
let gitShow: string = '';
-jest.mock('../../src/git/Git', () => {
+jest.mock('../../../src/core/git/Git', () => {
class Git {
diff = jest.fn().mockReturnValue(gitDiff);
show = jest.fn().mockReturnValue(gitShow);
@@ -20,7 +20,7 @@ jest.mock('../../src/git/Git', () => {
return Git;
});
-jest.mock('../../src/git/GitTags', () => {
+jest.mock('../../../src/core/git/GitTags', () => {
class GitTags {
async listTagsOnBranch(): Promise {
return gitTags;
@@ -31,7 +31,7 @@ jest.mock('../../src/git/GitTags', () => {
});
let ignoreFilterResult: string[] = [];
-jest.mock('../../src/ignore/IgnoreFiles', () => {
+jest.mock('../../../src/core/ignore/IgnoreFiles', () => {
class IgnoreFiles {
filter = jest.fn().mockReturnValue(ignoreFilterResult);
}
diff --git a/packages/core/tests/package/PackageManifest.test.ts b/packages/sfp-cli/tests/core/package/PackageManifest.test.ts
similarity index 99%
rename from packages/core/tests/package/PackageManifest.test.ts
rename to packages/sfp-cli/tests/core/package/PackageManifest.test.ts
index 39bc07eda..e9acf2b69 100644
--- a/packages/core/tests/package/PackageManifest.test.ts
+++ b/packages/sfp-cli/tests/core/package/PackageManifest.test.ts
@@ -1,6 +1,6 @@
import fs from 'fs-extra';
import { jest, expect } from '@jest/globals';
-import PackageManifest from '../../src/package/components/PackageManifest';
+import PackageManifest from '../../../src/core/package/components/PackageManifest';
describe('Given a mdapi directory that contains manifest file', () => {
beforeEach(() => {
diff --git a/packages/core/tests/package/SFPackageBuilder.test.ts b/packages/sfp-cli/tests/core/package/SFPackageBuilder.test.ts
similarity index 93%
rename from packages/core/tests/package/SFPackageBuilder.test.ts
rename to packages/sfp-cli/tests/core/package/SFPackageBuilder.test.ts
index dd617810c..b66eb824f 100644
--- a/packages/core/tests/package/SFPackageBuilder.test.ts
+++ b/packages/sfp-cli/tests/core/package/SFPackageBuilder.test.ts
@@ -1,12 +1,12 @@
import { jest, expect } from '@jest/globals';
-import SfpPackage, { PackageType, SfpPackageParams } from '../../src/package/SfpPackage';
-import SfpPackageBuilder, { PackageCreationParams } from '../../src/package/SfpPackageBuilder';
+import SfpPackage, { PackageType, SfpPackageParams } from '../../../src/core/package/SfpPackage';
+import SfpPackageBuilder, { PackageCreationParams } from '../../../src/core/package/SfpPackageBuilder';
import * as fs from "fs-extra";
-import { Logger } from '@dxatscale/sfp-logger';
+import { Logger } from '@flxblio/sfp-logger';
let packageType = PackageType.Source;
-jest.mock('../../src/project/ProjectConfig', () => {
+jest.mock('../../../src/core/project/ProjectConfig', () => {
class ProjectConfig {
static getSFDXPackageDescriptor(projectDirectory, sfdx_package) {
return {
@@ -41,7 +41,7 @@ jest.mock('../../src/project/ProjectConfig', () => {
return ProjectConfig;
});
-jest.mock('../../src/package/generators/SfpPackageContentGenerator', () => {
+jest.mock('../../../src/core/package/generators/SfpPackageContentGenerator', () => {
class SfpPackageContentGenerator {
static async generateSfpPackageDirectory(
projectDirectory: string,
@@ -59,21 +59,21 @@ jest.mock('../../src/package/generators/SfpPackageContentGenerator', () => {
return SfpPackageContentGenerator;
});
-jest.mock('../../src/package/packageFormatConvertors/SourceToMDAPIConvertor', () => {
+jest.mock('../../../src/core/package/packageFormatConvertors/SourceToMDAPIConvertor', () => {
class SourceToMDAPIConvertor {
convert = jest.fn().mockReturnValueOnce(Promise.resolve({ packagePath: 'mdapidir' }));
}
return SourceToMDAPIConvertor;
});
-jest.mock('../../src/package/components/MetadataCount', () => {
+jest.mock('../../../src/core/package/components/MetadataCount', () => {
class MetadataCount {
static getMetadataCount = jest.fn().mockReturnValue(Promise.resolve(20));
}
return MetadataCount;
});
-jest.mock('../../src/apex/parser/ApexTypeFetcher', () => {
+jest.mock('../../../src/core/apex/parser/ApexTypeFetcher', () => {
class ApexTypeFetcher {
getClassesClassifiedByType = jest.fn();
getTestClasses = jest
@@ -111,7 +111,7 @@ jest.mock('../../src/apex/parser/ApexTypeFetcher', () => {
return ApexTypeFetcher;
});
-jest.mock('../../src/package/packageCreators/CreateUnlockedPackageImpl', () => {
+jest.mock('../../../src/core/package/packageCreators/CreateUnlockedPackageImpl', () => {
class CreateUnlockedPackageImpl {
public constructor(
protected projectDirectory: string,
@@ -141,7 +141,7 @@ jest.mock('../../src/package/packageCreators/CreateUnlockedPackageImpl', () => {
// return CreatePackage;
// });
-jest.mock('../../src/package/packageCreators/CreateSourcePackageImpl', () => {
+jest.mock('../../../src/core/package/packageCreators/CreateSourcePackageImpl', () => {
class CreateSourcePackageImpl {
@@ -169,8 +169,8 @@ jest.mock('../../src/package/packageCreators/CreateSourcePackageImpl', () => {
return CreateSourcePackageImpl;
});
-describe.skip('Given a sfdx package, build a sfpowerscripts package', () => {
- it('should build a sfpowerscripts package', async () => {
+describe.skip('Given a sfdx package, build a sfp package', () => {
+ it('should build a sfp package', async () => {
const fsextraMock = jest.spyOn(fs, 'readFileSync');
fsextraMock.mockImplementation((path: any, options: string | { encoding?: string; flag?: string }) => {
return packageManifestXML;
@@ -222,7 +222,7 @@ describe.skip('Given a sfdx package, build a sfpowerscripts package', () => {
);
});
- it('should build a sfpowerscripts package when there is only one type', async () => {
+ it('should build a sfp package when there is only one type', async () => {
const fsextraMock = jest.spyOn(fs, 'readFileSync');
fsextraMock.mockImplementation((path: any, options: string | { encoding?: string; flag?: string }) => {
return packageManifestXML2;
diff --git a/packages/core/tests/package/analysers/FHTAnalyzer.test.ts b/packages/sfp-cli/tests/core/package/analysers/FHTAnalyzer.test.ts
similarity index 98%
rename from packages/core/tests/package/analysers/FHTAnalyzer.test.ts
rename to packages/sfp-cli/tests/core/package/analysers/FHTAnalyzer.test.ts
index 7babd5eda..437c055d5 100644
--- a/packages/core/tests/package/analysers/FHTAnalyzer.test.ts
+++ b/packages/sfp-cli/tests/core/package/analysers/FHTAnalyzer.test.ts
@@ -1,9 +1,9 @@
import { jest, expect } from '@jest/globals';
-import FHTAnalyser from '../../../src/package/analyser/FHTAnalyzer';
-import SfpPackage, { PackageType } from '../../../src/package/SfpPackage';
+import FHTAnalyser from '../../../../src/core/package/analyser/FHTAnalyzer';
+import SfpPackage, { PackageType } from '../../../../src/core/package/SfpPackage';
const fs = require('fs-extra');
import { ComponentSet, SourceComponent, registry, VirtualDirectory } from '@salesforce/source-deploy-retrieve';
-import { VoidLogger } from '@dxatscale/sfp-logger';
+import { VoidLogger } from '@flxblio/sfp-logger';
let isYamlFileFound: boolean = true;
diff --git a/packages/core/tests/package/analysers/FTAnalyzer.test.ts b/packages/sfp-cli/tests/core/package/analysers/FTAnalyzer.test.ts
similarity index 98%
rename from packages/core/tests/package/analysers/FTAnalyzer.test.ts
rename to packages/sfp-cli/tests/core/package/analysers/FTAnalyzer.test.ts
index 190530589..bc78d22b0 100644
--- a/packages/core/tests/package/analysers/FTAnalyzer.test.ts
+++ b/packages/sfp-cli/tests/core/package/analysers/FTAnalyzer.test.ts
@@ -1,9 +1,9 @@
import { jest, expect } from '@jest/globals';
-import FTAnalyser from '../../../src/package/analyser/FTAnalyzer';
-import SfpPackage, { PackageType } from '../../../src/package/SfpPackage';
+import FTAnalyser from '../../../../src/core/package/analyser/FTAnalyzer';
+import SfpPackage, { PackageType } from '../../../../src/core/package/SfpPackage';
const fs = require('fs-extra');
import { ComponentSet, SourceComponent, registry, VirtualDirectory } from '@salesforce/source-deploy-retrieve';
-import { VoidLogger } from '@dxatscale/sfp-logger';
+import { VoidLogger } from '@flxblio/sfp-logger';
let isYamlFileFound: boolean = true;
diff --git a/packages/core/tests/package/coverage/PackageTestCoverage.test.ts b/packages/sfp-cli/tests/core/package/coverage/PackageTestCoverage.test.ts
similarity index 93%
rename from packages/core/tests/package/coverage/PackageTestCoverage.test.ts
rename to packages/sfp-cli/tests/core/package/coverage/PackageTestCoverage.test.ts
index d7e19ed6c..fa3ab1d6e 100644
--- a/packages/core/tests/package/coverage/PackageTestCoverage.test.ts
+++ b/packages/sfp-cli/tests/core/package/coverage/PackageTestCoverage.test.ts
@@ -1,21 +1,21 @@
-import PackageTestCoverage from '../../../src/package/coverage/PackageTestCoverage';
+import PackageTestCoverage from '../../../../src/core/package/coverage/PackageTestCoverage';
import { jest, expect } from '@jest/globals';
-import { ConsoleLogger, Logger } from '@dxatscale/sfp-logger';
-import ApexClassFetcher from '../../../src/apex/ApexClassFetcher';
-import ApexTriggerFetcher from '../../../src/apex/ApexTriggerFetcher';
-import ApexCodeCoverageAggregateFetcher from '../../../src/apex/coverage/ApexCodeCoverageAggregateFetcher';
+import { ConsoleLogger, Logger } from '@flxblio/sfp-logger';
+import ApexClassFetcher from '../../../../src/core/apex/ApexClassFetcher';
+import ApexTriggerFetcher from '../../../../src/core/apex/ApexTriggerFetcher';
+import ApexCodeCoverageAggregateFetcher from '../../../../src/core/apex/coverage/ApexCodeCoverageAggregateFetcher';
import { AuthInfo, ConfigAggregator, Connection, Org, OrgConfigProperties } from '@salesforce/core';
import { MockTestOrgData, TestContext } from '@salesforce/core/lib/testSetup';
-import SfpPackage, { PackageType } from '../../../src/package/SfpPackage';
-import SfpPackageBuilder from '../../../src/package/SfpPackageBuilder';
+import SfpPackage, { PackageType } from '../../../../src/core/package/SfpPackage';
+import SfpPackageBuilder from '../../../../src/core/package/SfpPackageBuilder';
const $$ = new TestContext();
let packageType = PackageType.Unlocked;
-jest.mock('../../../src/package/SfpPackageBuilder', () => {
+jest.mock('../../../../src/core/package/SfpPackageBuilder', () => {
class SfpPackageBuilder {
public assignPermSetsPreDeployment?: string[];
@@ -58,7 +58,7 @@ const setupConnection = async () => {
-describe('Given a sfpowerscripts package and code coverage report, a package coverage calculator', () => {
+describe('Given a sfp package and code coverage report, a package coverage calculator', () => {
it('should be able to provide the coverage of a provided unlocked package', async () => {
const conn = await setupConnection();
diff --git a/packages/core/tests/package/dependencies/PackageDependencyResolver.test.ts b/packages/sfp-cli/tests/core/package/dependencies/PackageDependencyResolver.test.ts
similarity index 98%
rename from packages/core/tests/package/dependencies/PackageDependencyResolver.test.ts
rename to packages/sfp-cli/tests/core/package/dependencies/PackageDependencyResolver.test.ts
index 20a4fd870..0a27c92a1 100644
--- a/packages/core/tests/package/dependencies/PackageDependencyResolver.test.ts
+++ b/packages/sfp-cli/tests/core/package/dependencies/PackageDependencyResolver.test.ts
@@ -1,7 +1,7 @@
import { jest, expect } from '@jest/globals';
import { MockTestOrgData, TestContext } from '@salesforce/core/lib/testSetup';
import { Connection, AuthInfo, OrgConfigProperties, ConfigAggregator } from '@salesforce/core';
-import PackageDependencyResolver from '../../../src/package/dependencies/PackageDependencyResolver';
+import PackageDependencyResolver from '../../../../src/core/package/dependencies/PackageDependencyResolver';
const $$ = new TestContext();
const setupFakeConnection = async () => {
@@ -22,7 +22,7 @@ const setupFakeConnection = async () => {
return conn;
}
-jest.mock('../../../../core/src/git/Git', () => {
+jest.mock('../../../../src/core/git/Git', () => {
class Git {
static async initiateRepo()
{
@@ -33,7 +33,7 @@ jest.mock('../../../../core/src/git/Git', () => {
return Git;
});
-jest.mock('../../../../core/src/git/GitTags', () => {
+jest.mock('../../../../src/core/git/GitTags', () => {
class GitTags {
async listTagsOnBranch(): Promise {
return gitTags;
diff --git a/packages/core/tests/package/dependencies/TransitiveDependencyResolver.test.ts b/packages/sfp-cli/tests/core/package/dependencies/TransitiveDependencyResolver.test.ts
similarity index 96%
rename from packages/core/tests/package/dependencies/TransitiveDependencyResolver.test.ts
rename to packages/sfp-cli/tests/core/package/dependencies/TransitiveDependencyResolver.test.ts
index 6c47df882..ff8343eb2 100644
--- a/packages/core/tests/package/dependencies/TransitiveDependencyResolver.test.ts
+++ b/packages/sfp-cli/tests/core/package/dependencies/TransitiveDependencyResolver.test.ts
@@ -1,7 +1,7 @@
import { jest, expect } from '@jest/globals';
import { MockTestOrgData, TestContext } from '@salesforce/core/lib/testSetup';
import { Connection, AuthInfo, OrgConfigProperties, ConfigAggregator } from '@salesforce/core';
-import TransitiveDependencyResolver from '../../../src/package/dependencies/TransitiveDependencyResolver';
+import TransitiveDependencyResolver from '../../../../src/core/package/dependencies/TransitiveDependencyResolver';
const $$ = new TestContext();
const setupFakeConnection = async () => {
@@ -22,7 +22,7 @@ const setupFakeConnection = async () => {
return conn;
}
-jest.mock('../../../../core/src/git/Git', () => {
+jest.mock('../../../../src/core/git/Git', () => {
class Git {
static async initiateRepo()
{
@@ -33,7 +33,7 @@ jest.mock('../../../../core/src/git/Git', () => {
return Git;
});
-jest.mock('../../../../core/src/git/GitTags', () => {
+jest.mock('../../../../src/core/git/GitTags', () => {
class GitTags {
async listTagsOnBranch(): Promise {
return gitTags;
@@ -220,7 +220,7 @@ const projectConfig = {
"sfdc-framework":"04t1000x00x00x"
},
"plugins": {
- "sfpowerscripts": {
+ "sfp": {
"disableTransitiveDependencyResolver": false,
"externalDependencyMap": {
"tech-framework@2.0.0.38": [
diff --git a/packages/core/tests/package/deploymentFilters/EntitlementVersionFilter.test.ts b/packages/sfp-cli/tests/core/package/deploymentFilters/EntitlementVersionFilter.test.ts
similarity index 98%
rename from packages/core/tests/package/deploymentFilters/EntitlementVersionFilter.test.ts
rename to packages/sfp-cli/tests/core/package/deploymentFilters/EntitlementVersionFilter.test.ts
index 8373e209a..cce32d2ff 100644
--- a/packages/core/tests/package/deploymentFilters/EntitlementVersionFilter.test.ts
+++ b/packages/sfp-cli/tests/core/package/deploymentFilters/EntitlementVersionFilter.test.ts
@@ -1,10 +1,10 @@
import { jest, expect } from '@jest/globals';
import { MockTestOrgData, TestContext, } from '@salesforce/core/lib/testSetup';
-import { ConsoleLogger } from '@dxatscale/sfp-logger';
+import { ConsoleLogger } from '@flxblio/sfp-logger';
import { AnyJson } from '@salesforce/ts-types';
-import SFPOrg from '../../../src/org/SFPOrg';
+import SFPOrg from '../../../../src/core/org/SFPOrg';
import { ComponentSet, VirtualDirectory, VirtualTreeContainer } from '@salesforce/source-deploy-retrieve';
-import EntitlementVersionFilter from '../../../src/package/deploymentFilters/EntitlementVersionFilter';
+import EntitlementVersionFilter from '../../../../src/core/package/deploymentFilters/EntitlementVersionFilter';
import { OrgConfigProperties } from '@salesforce/core';
const fs = require('fs-extra');
@@ -22,7 +22,7 @@ const createOrg = async () => {
};
let entitlementSetting:any={};
-jest.mock('../../../src/metadata/MetadataFetcher', () => {
+jest.mock('../../../../src/core/metadata/MetadataFetcher', () => {
class MetadataFetcher {
getSetttingMetadata= jest.fn().mockReturnValue(entitlementSetting)
}
diff --git a/packages/core/tests/package/packageMerger/PackageMergeManager.test.ts b/packages/sfp-cli/tests/core/package/packageMerger/PackageMergeManager.test.ts
similarity index 79%
rename from packages/core/tests/package/packageMerger/PackageMergeManager.test.ts
rename to packages/sfp-cli/tests/core/package/packageMerger/PackageMergeManager.test.ts
index 06927ae56..5bfa5628e 100644
--- a/packages/core/tests/package/packageMerger/PackageMergeManager.test.ts
+++ b/packages/sfp-cli/tests/core/package/packageMerger/PackageMergeManager.test.ts
@@ -1,8 +1,8 @@
-import ArtifactFetcher from '../../../src/artifacts/ArtifactFetcher';
-import SfpPackage from '../../../src/package/SfpPackage';
-import SfpPackageBuilder from '../../../src/package/SfpPackageBuilder';
-import PackageMergeManager from '../../../src/package/packageMerger/PackageMergeManager'
-import { ConsoleLogger } from '@dxatscale/sfp-logger';
+import ArtifactFetcher from '../../../../src/core/artifacts/ArtifactFetcher';
+import SfpPackage from '../../../../src/core/package/SfpPackage';
+import SfpPackageBuilder from '../../../../src/core/package/SfpPackageBuilder';
+import PackageMergeManager from '../../../../src/core/package/packageMerger/PackageMergeManager'
+import { ConsoleLogger } from '@flxblio/sfp-logger';
import { ComponentSet } from '@salesforce/source-deploy-retrieve';
import { jest, expect } from '@jest/globals';
diff --git a/packages/core/tests/package/packageMerger/artifacts1/core2_sfpowerscripts_artifact_1.0.4-1.zip b/packages/sfp-cli/tests/core/package/packageMerger/artifacts1/core2_sfpowerscripts_artifact_1.0.4-1.zip
similarity index 100%
rename from packages/core/tests/package/packageMerger/artifacts1/core2_sfpowerscripts_artifact_1.0.4-1.zip
rename to packages/sfp-cli/tests/core/package/packageMerger/artifacts1/core2_sfpowerscripts_artifact_1.0.4-1.zip
diff --git a/packages/core/tests/package/packageMerger/artifacts1/feature-mgmt3_sfpowerscripts_artifact_1.0.6-1.zip b/packages/sfp-cli/tests/core/package/packageMerger/artifacts1/feature-mgmt3_sfpowerscripts_artifact_1.0.6-1.zip
similarity index 100%
rename from packages/core/tests/package/packageMerger/artifacts1/feature-mgmt3_sfpowerscripts_artifact_1.0.6-1.zip
rename to packages/sfp-cli/tests/core/package/packageMerger/artifacts1/feature-mgmt3_sfpowerscripts_artifact_1.0.6-1.zip
diff --git a/packages/core/tests/package/propertyFetchers/AssignPermissionSetFetcher.test.ts b/packages/sfp-cli/tests/core/package/propertyFetchers/AssignPermissionSetFetcher.test.ts
similarity index 73%
rename from packages/core/tests/package/propertyFetchers/AssignPermissionSetFetcher.test.ts
rename to packages/sfp-cli/tests/core/package/propertyFetchers/AssignPermissionSetFetcher.test.ts
index 6b4f6a4f2..dd2c050fe 100644
--- a/packages/core/tests/package/propertyFetchers/AssignPermissionSetFetcher.test.ts
+++ b/packages/sfp-cli/tests/core/package/propertyFetchers/AssignPermissionSetFetcher.test.ts
@@ -1,11 +1,11 @@
import { jest, expect } from '@jest/globals';
-import { Logger } from '@dxatscale/sfp-logger';
-import AssignPermissionSetFetcher from '../../../src/package/propertyFetchers/AssignPermissionSetFetcher';
-import PropertyFetcher from '../../../src/package/propertyFetchers/PropertyFetcher';
-import SfpPackage from '../../../src/package/SfpPackage';
-import SfpPackageBuilder from '../../../src/package/SfpPackageBuilder';
+import { Logger } from '@flxblio/sfp-logger';
+import AssignPermissionSetFetcher from '../../../../src/core/package/propertyFetchers/AssignPermissionSetFetcher';
+import PropertyFetcher from '../../../../src/core/package/propertyFetchers/PropertyFetcher';
+import SfpPackage from '../../../../src/core/package/SfpPackage';
+import SfpPackageBuilder from '../../../../src/core/package/SfpPackageBuilder';
-jest.mock('../../../src/package/SfpPackageBuilder', () => {
+jest.mock('../../../../src/core/package/SfpPackageBuilder', () => {
class SfpPackageBuilder {
public assignPermSetsPreDeployment?: string[];
@@ -21,7 +21,7 @@ jest.mock('../../../src/package/SfpPackageBuilder', () => {
let sfpPackage: SfpPackage = new SfpPackage();
sfpPackage.packageDescriptor = packageDescriptor;
for (const propertyFetcher of propertyFetchers) {
- await propertyFetcher.getSfpowerscriptsProperties(sfpPackage, logger);
+ await propertyFetcher.getsfpProperties(sfpPackage, logger);
}
return sfpPackage;
}
@@ -34,14 +34,14 @@ describe('Given a package descriptor with assignPermSetsPreDeployment or assignP
it('Should set assignPermSetsPreDeployment property in SfpPackage', async () => {
let assignPermissionSetFetcher: AssignPermissionSetFetcher = new AssignPermissionSetFetcher();
let sfpPackage: SfpPackage = await SfpPackageBuilder.buildPackageFromProjectDirectory(null, null, null);
- assignPermissionSetFetcher.getSfpowerscriptsProperties(sfpPackage);
+ assignPermissionSetFetcher.getsfpProperties(sfpPackage);
expect(sfpPackage.assignPermSetsPreDeployment).toStrictEqual(['PermSetB']);
});
it('Should set assignPermSetsPostDeployment property in SfpPackage', async () => {
let assignPermissionSetFetcher: AssignPermissionSetFetcher = new AssignPermissionSetFetcher();
let sfpPackage: SfpPackage = await SfpPackageBuilder.buildPackageFromProjectDirectory(null, null, null);
- assignPermissionSetFetcher.getSfpowerscriptsProperties(sfpPackage);
+ assignPermissionSetFetcher.getsfpProperties(sfpPackage);
expect(sfpPackage.assignPermSetsPostDeployment).toStrictEqual(['PermSetA']);
});
});
diff --git a/packages/core/tests/package/propertyFetchers/DestructiveManifestPathFetcher.test.ts b/packages/sfp-cli/tests/core/package/propertyFetchers/DestructiveManifestPathFetcher.test.ts
similarity index 77%
rename from packages/core/tests/package/propertyFetchers/DestructiveManifestPathFetcher.test.ts
rename to packages/sfp-cli/tests/core/package/propertyFetchers/DestructiveManifestPathFetcher.test.ts
index 62160366c..9f8d33dd4 100644
--- a/packages/core/tests/package/propertyFetchers/DestructiveManifestPathFetcher.test.ts
+++ b/packages/sfp-cli/tests/core/package/propertyFetchers/DestructiveManifestPathFetcher.test.ts
@@ -1,13 +1,13 @@
import { jest, expect } from '@jest/globals';
-import DestructiveManifestPathFetcher from '../../../src/package/propertyFetchers/DestructiveManifestPathFetcher';
-import SfpPackage from '../../../src/package/SfpPackage';
+import DestructiveManifestPathFetcher from '../../../../src/core/package/propertyFetchers/DestructiveManifestPathFetcher';
+import SfpPackage from '../../../../src/core/package/SfpPackage';
const fs = require('fs-extra');
-import { Logger } from '@dxatscale/sfp-logger';
-import PropertyFetcher from '../../../src/package/propertyFetchers/PropertyFetcher';
-import SfpPackageBuilder from '../../../src/package/SfpPackageBuilder';
+import { Logger } from '@flxblio/sfp-logger';
+import PropertyFetcher from '../../../../src/core/package/propertyFetchers/PropertyFetcher';
+import SfpPackageBuilder from '../../../../src/core/package/SfpPackageBuilder';
-jest.mock('../../../src/package/SfpPackageBuilder', () => {
+jest.mock('../../../../src/core/package/SfpPackageBuilder', () => {
class SfpPackageBuilder {
public assignPermSetsPreDeployment?: string[];
@@ -23,7 +23,7 @@ jest.mock('../../../src/package/SfpPackageBuilder', () => {
let sfpPackage: SfpPackage = new SfpPackage();
sfpPackage.packageDescriptor = packageDescriptor;
for (const propertyFetcher of propertyFetchers) {
- await propertyFetcher.getSfpowerscriptsProperties(sfpPackage, logger);
+ await propertyFetcher.getsfpProperties(sfpPackage, logger);
}
return sfpPackage;
@@ -44,14 +44,14 @@ describe('Given a package descriptor with a destructiveChangePath', () => {
it('Should set destructiveChangesPath property in SfpPackage', async () => {
let destructiveManifestPathFetcher: DestructiveManifestPathFetcher = new DestructiveManifestPathFetcher();
let sfpPackage: SfpPackage = await SfpPackageBuilder.buildPackageFromProjectDirectory(null, null, null);
- await destructiveManifestPathFetcher.getSfpowerscriptsProperties(sfpPackage);
+ await destructiveManifestPathFetcher.getsfpProperties(sfpPackage);
expect(sfpPackage.destructiveChangesPath).toBe('destructiveChanges.xml');
});
it('Should set destructiveChanges property in SfpPackage', async () => {
let destructiveManifestPathFetcher: DestructiveManifestPathFetcher = new DestructiveManifestPathFetcher();
let sfpPackage: SfpPackage = await SfpPackageBuilder.buildPackageFromProjectDirectory(null, null, null);
- await destructiveManifestPathFetcher.getSfpowerscriptsProperties(sfpPackage);
+ await destructiveManifestPathFetcher.getsfpProperties(sfpPackage);
expect(sfpPackage.destructiveChanges).toEqual(destructiveChanges);
});
});
diff --git a/packages/core/tests/package/propertyFetchers/ReconcileProfilePropertyFetcher.test.ts b/packages/sfp-cli/tests/core/package/propertyFetchers/ReconcileProfilePropertyFetcher.test.ts
similarity index 68%
rename from packages/core/tests/package/propertyFetchers/ReconcileProfilePropertyFetcher.test.ts
rename to packages/sfp-cli/tests/core/package/propertyFetchers/ReconcileProfilePropertyFetcher.test.ts
index 546b58ee3..d7b7a5c22 100644
--- a/packages/core/tests/package/propertyFetchers/ReconcileProfilePropertyFetcher.test.ts
+++ b/packages/sfp-cli/tests/core/package/propertyFetchers/ReconcileProfilePropertyFetcher.test.ts
@@ -1,11 +1,11 @@
import { jest, expect } from '@jest/globals';
-import { Logger } from '@dxatscale/sfp-logger';
-import PropertyFetcher from '../../../src/package/propertyFetchers/PropertyFetcher';
-import ReconcileProfilePropertyFetcher from '../../../src/package/propertyFetchers/ReconcileProfilePropertyFetcher';
-import SfpPackage from '../../../src/package/SfpPackage';
-import SfpPackageBuilder from '../../../src/package/SfpPackageBuilder';
+import { Logger } from '@flxblio/sfp-logger';
+import PropertyFetcher from '../../../../src/core/package/propertyFetchers/PropertyFetcher';
+import ReconcileProfilePropertyFetcher from '../../../../src/core/package/propertyFetchers/ReconcileProfilePropertyFetcher';
+import SfpPackage from '../../../../src/core/package/SfpPackage';
+import SfpPackageBuilder from '../../../../src/core/package/SfpPackageBuilder';
-jest.mock('../../../src/package/SfpPackageBuilder', () => {
+jest.mock('../../../../src/core/package/SfpPackageBuilder', () => {
class SfpPackageBuilder {
public assignPermSetsPreDeployment?: string[];
@@ -21,7 +21,7 @@ jest.mock('../../../src/package/SfpPackageBuilder', () => {
let sfpPackage: SfpPackage = new SfpPackage();
sfpPackage.packageDescriptor = packageDescriptor;
for (const propertyFetcher of propertyFetchers) {
- await propertyFetcher.getSfpowerscriptsProperties(sfpPackage, logger);
+ await propertyFetcher.getsfpProperties(sfpPackage, logger);
}
return sfpPackage;
@@ -35,7 +35,7 @@ describe('Given a package descriptor with reconcileProfiles', () => {
it('Should set reconcileProfiles property in SfpPackage', async () => {
let reconcileProfilePropertyFetcher: ReconcileProfilePropertyFetcher = new ReconcileProfilePropertyFetcher();
let sfpPackage: SfpPackage = await SfpPackageBuilder.buildPackageFromProjectDirectory(null, null, null);
- reconcileProfilePropertyFetcher.getSfpowerscriptsProperties(sfpPackage);
+ reconcileProfilePropertyFetcher.getsfpProperties(sfpPackage);
expect(sfpPackage.reconcileProfiles).toBe(false);
});
});
diff --git a/packages/core/tests/permsets/AssignPermissionSets.test.ts b/packages/sfp-cli/tests/core/permsets/AssignPermissionSets.test.ts
similarity index 97%
rename from packages/core/tests/permsets/AssignPermissionSets.test.ts
rename to packages/sfp-cli/tests/core/permsets/AssignPermissionSets.test.ts
index 0afa66ede..8c8660ca4 100644
--- a/packages/core/tests/permsets/AssignPermissionSets.test.ts
+++ b/packages/sfp-cli/tests/core/permsets/AssignPermissionSets.test.ts
@@ -1,13 +1,13 @@
const child_process = require('child_process');
-import AssignPermissionSetsImpl from '../../src/permsets/AssignPermissionSetsImpl';
+import AssignPermissionSetsImpl from '../../../src/core/permsets/AssignPermissionSetsImpl';
import { jest, expect } from '@jest/globals';
-import { VoidLogger } from '@dxatscale/sfp-logger';
+import { VoidLogger } from '@flxblio/sfp-logger';
import { AuthInfo, Connection, OrgConfigProperties } from '@salesforce/core';
import { MockTestOrgData, TestContext } from '@salesforce/core/lib/testSetup';
const $$ = new TestContext();
-jest.mock('../../src/permsets/PermissionSetFetcher', () => {
+jest.mock('../../../src/core/permsets/PermissionSetFetcher', () => {
class PermissionSetFetcher {
constructor(private username: string, private conn: Connection) {}
fetchAllPermsetAssignment(): any[] {
diff --git a/packages/core/tests/permsets/PermissionSetFetcher.test.ts b/packages/sfp-cli/tests/core/permsets/PermissionSetFetcher.test.ts
similarity index 98%
rename from packages/core/tests/permsets/PermissionSetFetcher.test.ts
rename to packages/sfp-cli/tests/core/permsets/PermissionSetFetcher.test.ts
index 6d96d2779..cc8bffb51 100644
--- a/packages/core/tests/permsets/PermissionSetFetcher.test.ts
+++ b/packages/sfp-cli/tests/core/permsets/PermissionSetFetcher.test.ts
@@ -1,5 +1,5 @@
import { expect } from '@jest/globals';
-import PermissionSetFetcher from '../../src/permsets/PermissionSetFetcher';
+import PermissionSetFetcher from '../../../src/core/permsets/PermissionSetFetcher';
import { MockTestOrgData, TestContext } from '@salesforce/core/lib/testSetup';
import { AnyJson } from '@salesforce/ts-types';
import { AuthInfo, Connection, OrgConfigProperties } from '@salesforce/core';
diff --git a/packages/core/tests/permsets/PermissionSetGroupUpdateAwaiter.test.ts b/packages/sfp-cli/tests/core/permsets/PermissionSetGroupUpdateAwaiter.test.ts
similarity index 92%
rename from packages/core/tests/permsets/PermissionSetGroupUpdateAwaiter.test.ts
rename to packages/sfp-cli/tests/core/permsets/PermissionSetGroupUpdateAwaiter.test.ts
index 07e796a5c..6afcb47cd 100644
--- a/packages/core/tests/permsets/PermissionSetGroupUpdateAwaiter.test.ts
+++ b/packages/sfp-cli/tests/core/permsets/PermissionSetGroupUpdateAwaiter.test.ts
@@ -2,7 +2,7 @@ import { MockTestOrgData, TestContext } from '@salesforce/core/lib/testSetup';
import { AuthInfo, Connection, OrgConfigProperties } from '@salesforce/core';
import { AnyJson } from '@salesforce/ts-types';
const $$ = new TestContext();
-import PermissionSetGroupUpdateAwaiter from '../../src/permsets/PermissionSetGroupUpdateAwaiter';
+import PermissionSetGroupUpdateAwaiter from '../../../src/core/permsets/PermissionSetGroupUpdateAwaiter';
import { expect } from '@jest/globals';
describe('Await till permissionsets groups are updated', () => {
diff --git a/packages/core/tests/project/ProjectConfig.test.ts b/packages/sfp-cli/tests/core/project/ProjectConfig.test.ts
similarity index 98%
rename from packages/core/tests/project/ProjectConfig.test.ts
rename to packages/sfp-cli/tests/core/project/ProjectConfig.test.ts
index da08c8ecd..2bb7616a2 100644
--- a/packages/core/tests/project/ProjectConfig.test.ts
+++ b/packages/sfp-cli/tests/core/project/ProjectConfig.test.ts
@@ -1,7 +1,7 @@
const fs = require("fs-extra");
import { jest, expect } from '@jest/globals';
-import { PackageType } from '../../src/package/SfpPackage';
-import ProjectConfig from '../../src/project/ProjectConfig';
+import { PackageType } from '../../../src/core/package/SfpPackage';
+import ProjectConfig from '../../../src/core/project/ProjectConfig';
describe('Given a project directory or sfdx-project.json with multiple packages', () => {
//given the below sfdx-project.json
diff --git a/packages/core/tests/queryHelper/ChunkCollection.test.ts b/packages/sfp-cli/tests/core/queryHelper/ChunkCollection.test.ts
similarity index 93%
rename from packages/core/tests/queryHelper/ChunkCollection.test.ts
rename to packages/sfp-cli/tests/core/queryHelper/ChunkCollection.test.ts
index 74f5e370d..85c598341 100644
--- a/packages/core/tests/queryHelper/ChunkCollection.test.ts
+++ b/packages/sfp-cli/tests/core/queryHelper/ChunkCollection.test.ts
@@ -1,5 +1,5 @@
import { expect } from '@jest/globals';
-import chunkCollection from '../../src/queryHelper/ChunkCollection';
+import chunkCollection from '../../../src/core/queryHelper/ChunkCollection';
describe('Given a collection', () => {
diff --git a/packages/core/tests/utils/ChunkArray.test.ts b/packages/sfp-cli/tests/core/utils/ChunkArray.test.ts
similarity index 90%
rename from packages/core/tests/utils/ChunkArray.test.ts
rename to packages/sfp-cli/tests/core/utils/ChunkArray.test.ts
index 8fdde04b8..15d92cd24 100644
--- a/packages/core/tests/utils/ChunkArray.test.ts
+++ b/packages/sfp-cli/tests/core/utils/ChunkArray.test.ts
@@ -1,5 +1,5 @@
import { expect } from '@jest/globals';
-import { chunkArray } from '../../src/utils/ChunkArray';
+import { chunkArray } from '../../../src/core/utils/ChunkArray';
describe('Given an input array', () => {
const input = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10];
diff --git a/packages/core/tests/utils/FileSystem.test.ts b/packages/sfp-cli/tests/core/utils/FileSystem.test.ts
similarity index 95%
rename from packages/core/tests/utils/FileSystem.test.ts
rename to packages/sfp-cli/tests/core/utils/FileSystem.test.ts
index d76ffadf9..8686ef38c 100644
--- a/packages/core/tests/utils/FileSystem.test.ts
+++ b/packages/sfp-cli/tests/core/utils/FileSystem.test.ts
@@ -1,5 +1,5 @@
import { expect } from '@jest/globals';
-import FileSystem from '../../src/utils/FileSystem';
+import FileSystem from '../../../src/core/utils/FileSystem';
const path = require('path');
describe('Given a search directory', () => {
diff --git a/packages/core/tests/utils/extractDomainFromUrl.test.ts b/packages/sfp-cli/tests/core/utils/extractDomainFromUrl.test.ts
similarity index 93%
rename from packages/core/tests/utils/extractDomainFromUrl.test.ts
rename to packages/sfp-cli/tests/core/utils/extractDomainFromUrl.test.ts
index f751b2d45..a0fa39e73 100644
--- a/packages/core/tests/utils/extractDomainFromUrl.test.ts
+++ b/packages/sfp-cli/tests/core/utils/extractDomainFromUrl.test.ts
@@ -1,5 +1,5 @@
import { expect } from '@jest/globals';
-import extractDomainFromUrl from '../../src/utils/extractDomainFromUrl';
+import extractDomainFromUrl from '../../../src/core/utils/extractDomainFromUrl';
describe('Given a URL', () => {
it('should extract the domain name for https', () => {
diff --git a/packages/core/tests/utils/resources/a/b/b1.file b/packages/sfp-cli/tests/core/utils/resources/a/b/b1.file
similarity index 100%
rename from packages/core/tests/utils/resources/a/b/b1.file
rename to packages/sfp-cli/tests/core/utils/resources/a/b/b1.file
diff --git a/packages/core/tests/utils/resources/a/b/c/c1.file b/packages/sfp-cli/tests/core/utils/resources/a/b/c/c1.file
similarity index 100%
rename from packages/core/tests/utils/resources/a/b/c/c1.file
rename to packages/sfp-cli/tests/core/utils/resources/a/b/c/c1.file
diff --git a/packages/core/tests/utils/resources/a/b/c/c2.file b/packages/sfp-cli/tests/core/utils/resources/a/b/c/c2.file
similarity index 100%
rename from packages/core/tests/utils/resources/a/b/c/c2.file
rename to packages/sfp-cli/tests/core/utils/resources/a/b/c/c2.file
diff --git a/packages/core/tests/utils/resources/a/b/d/d1.file b/packages/sfp-cli/tests/core/utils/resources/a/b/d/d1.file
similarity index 100%
rename from packages/core/tests/utils/resources/a/b/d/d1.file
rename to packages/sfp-cli/tests/core/utils/resources/a/b/d/d1.file
diff --git a/packages/core/tests/utils/resources/a/b/d/x/x1.file b/packages/sfp-cli/tests/core/utils/resources/a/b/d/x/x1.file
similarity index 100%
rename from packages/core/tests/utils/resources/a/b/d/x/x1.file
rename to packages/sfp-cli/tests/core/utils/resources/a/b/d/x/x1.file
diff --git a/packages/core/tests/utils/resources/a/b/e/e1.file b/packages/sfp-cli/tests/core/utils/resources/a/b/e/e1.file
similarity index 100%
rename from packages/core/tests/utils/resources/a/b/e/e1.file
rename to packages/sfp-cli/tests/core/utils/resources/a/b/e/e1.file
diff --git a/packages/sfpowerscripts-cli/tests/impl/changelog/CommitUpdater.test.ts b/packages/sfp-cli/tests/impl/changelog/CommitUpdater.test.ts
similarity index 98%
rename from packages/sfpowerscripts-cli/tests/impl/changelog/CommitUpdater.test.ts
rename to packages/sfp-cli/tests/impl/changelog/CommitUpdater.test.ts
index 854d187e7..ce1ba2f70 100644
--- a/packages/sfpowerscripts-cli/tests/impl/changelog/CommitUpdater.test.ts
+++ b/packages/sfp-cli/tests/impl/changelog/CommitUpdater.test.ts
@@ -1,7 +1,7 @@
import { expect } from '@jest/globals';
import CommitUpdater from '../../../src/impl/changelog/CommitUpdater';
import ReadPackageChangelog from '../../../src/impl/changelog/ReadPackageChangelog';
-import { Changelog as PackageChangelog } from '@dxatscale/sfpowerscripts.core/lib/changelog/interfaces/GenericChangelogInterfaces';
+import { Changelog as PackageChangelog } from '../../../src/core/changelog/interfaces/GenericChangelogInterfaces';
import { Release } from '../../../src/impl/changelog/ReleaseChangelog';
const path = require('path');
import * as fs from 'fs-extra';
diff --git a/packages/sfpowerscripts-cli/tests/impl/changelog/OrgUpdater.test.ts b/packages/sfp-cli/tests/impl/changelog/OrgUpdater.test.ts
similarity index 98%
rename from packages/sfpowerscripts-cli/tests/impl/changelog/OrgUpdater.test.ts
rename to packages/sfp-cli/tests/impl/changelog/OrgUpdater.test.ts
index b34314cbb..712f4a477 100644
--- a/packages/sfpowerscripts-cli/tests/impl/changelog/OrgUpdater.test.ts
+++ b/packages/sfp-cli/tests/impl/changelog/OrgUpdater.test.ts
@@ -204,7 +204,7 @@ const referenceReleaseChangelog: ReleaseChangelog = {
author: 'Azlam',
message: 'Add persist credential to PR (#6)',
body:
- '* Add persist credential to PR\r\n\r\n* switch to alpha\r\n\r\n* Increment versions\r\n\r\n* Revert "Increment versions"\r\n\r\nThis reverts commit 39a68617d8e92de46604b883b6681e8022d2e403.\r\n\r\n* Test abs path\r\n\r\n* Revert "Test abs path"\r\n\r\nThis reverts commit 5ab30a8b52eddf16025acf6aec57d1bb9262549d.\r\n\r\n* Cleanup and switch to prod version of sfpowerscripts\r\n\r\nCo-authored-by: sfpowerscripts \r\nCo-authored-by: Alan Ly ',
+ '* Add persist credential to PR\r\n\r\n* switch to alpha\r\n\r\n* Increment versions\r\n\r\n* Revert "Increment versions"\r\n\r\nThis reverts commit 39a68617d8e92de46604b883b6681e8022d2e403.\r\n\r\n* Test abs path\r\n\r\n* Revert "Test abs path"\r\n\r\nThis reverts commit 5ab30a8b52eddf16025acf6aec57d1bb9262549d.\r\n\r\n* Cleanup and switch to prod version of sfp\r\n\r\nCo-authored-by: sfp \r\nCo-authored-by: Alan Ly ',
},
],
},
diff --git a/packages/sfpowerscripts-cli/tests/impl/changelog/WorkItemUpdater.test.ts b/packages/sfp-cli/tests/impl/changelog/WorkItemUpdater.test.ts
similarity index 99%
rename from packages/sfpowerscripts-cli/tests/impl/changelog/WorkItemUpdater.test.ts
rename to packages/sfp-cli/tests/impl/changelog/WorkItemUpdater.test.ts
index d4bba472e..c49c64934 100644
--- a/packages/sfpowerscripts-cli/tests/impl/changelog/WorkItemUpdater.test.ts
+++ b/packages/sfp-cli/tests/impl/changelog/WorkItemUpdater.test.ts
@@ -36,7 +36,7 @@ describe('Given a WorkItemUpdater', () => {
author: 'Azlam',
message: 'NGV-626 Add persist credential to PR (#6)',
body:
- '* Add persist credential to PR\r\n\r\n* switch to alpha\r\n\r\n* Increment versions\r\n\r\n* Revert "Increment versions"\r\n\r\nThis reverts commit 39a68617d8e92de46604b883b6681e8022d2e403.\r\n\r\n* Test abs path\r\n\r\n* Revert "Test abs path"\r\n\r\nThis reverts commit 5ab30a8b52eddf16025acf6aec57d1bb9262549d.\r\n\r\n* Cleanup and switch to prod version of sfpowerscripts\r\n\r\nCo-authored-by: sfpowerscripts \r\nCo-authored-by: Alan Ly ',
+ '* Add persist credential to PR\r\n\r\n* switch to alpha\r\n\r\n* Increment versions\r\n\r\n* Revert "Increment versions"\r\n\r\nThis reverts commit 39a68617d8e92de46604b883b6681e8022d2e403.\r\n\r\n* Test abs path\r\n\r\n* Revert "Test abs path"\r\n\r\nThis reverts commit 5ab30a8b52eddf16025acf6aec57d1bb9262549d.\r\n\r\n* Cleanup and switch to prod version of sfp\r\n\r\nCo-authored-by: sfp \r\nCo-authored-by: Alan Ly ',
},
{
commitId: 'd7124579',
diff --git a/packages/sfpowerscripts-cli/tests/impl/changelog/resources/ESBaseCodeLWCChangelog.json b/packages/sfp-cli/tests/impl/changelog/resources/ESBaseCodeLWCChangelog.json
similarity index 99%
rename from packages/sfpowerscripts-cli/tests/impl/changelog/resources/ESBaseCodeLWCChangelog.json
rename to packages/sfp-cli/tests/impl/changelog/resources/ESBaseCodeLWCChangelog.json
index 0270de439..2fa66c2ed 100644
--- a/packages/sfpowerscripts-cli/tests/impl/changelog/resources/ESBaseCodeLWCChangelog.json
+++ b/packages/sfp-cli/tests/impl/changelog/resources/ESBaseCodeLWCChangelog.json
@@ -7,7 +7,7 @@
"date": "2021-01-25T11:01:55+11:00",
"author": "Azlam",
"message": "Add persist credential to PR (#6)",
- "body": "* Add persist credential to PR\r\n\r\n* switch to alpha\r\n\r\n* Increment versions\r\n\r\n* Revert \"Increment versions\"\r\n\r\nThis reverts commit 39a68617d8e92de46604b883b6681e8022d2e403.\r\n\r\n* Test abs path\r\n\r\n* Revert \"Test abs path\"\r\n\r\nThis reverts commit 5ab30a8b52eddf16025acf6aec57d1bb9262549d.\r\n\r\n* Cleanup and switch to prod version of sfpowerscripts\r\n\r\nCo-authored-by: sfpowerscripts \r\nCo-authored-by: Alan Ly "
+ "body": "* Add persist credential to PR\r\n\r\n* switch to alpha\r\n\r\n* Increment versions\r\n\r\n* Revert \"Increment versions\"\r\n\r\nThis reverts commit 39a68617d8e92de46604b883b6681e8022d2e403.\r\n\r\n* Test abs path\r\n\r\n* Revert \"Test abs path\"\r\n\r\nThis reverts commit 5ab30a8b52eddf16025acf6aec57d1bb9262549d.\r\n\r\n* Cleanup and switch to prod version of sfp\r\n\r\nCo-authored-by: sfp \r\nCo-authored-by: Alan Ly "
},
{
"commitId": "d7124579",
diff --git a/packages/sfpowerscripts-cli/tests/impl/changelog/resources/ESBaseStylesLWCChangelog.json b/packages/sfp-cli/tests/impl/changelog/resources/ESBaseStylesLWCChangelog.json
similarity index 100%
rename from packages/sfpowerscripts-cli/tests/impl/changelog/resources/ESBaseStylesLWCChangelog.json
rename to packages/sfp-cli/tests/impl/changelog/resources/ESBaseStylesLWCChangelog.json
diff --git a/packages/sfpowerscripts-cli/tests/impl/changelog/resources/ESObjectsChangelog.json b/packages/sfp-cli/tests/impl/changelog/resources/ESObjectsChangelog.json
similarity index 100%
rename from packages/sfpowerscripts-cli/tests/impl/changelog/resources/ESObjectsChangelog.json
rename to packages/sfp-cli/tests/impl/changelog/resources/ESObjectsChangelog.json
diff --git a/packages/sfpowerscripts-cli/tests/impl/changelog/resources/ESSpaceMgmtLWCChangelog.json b/packages/sfp-cli/tests/impl/changelog/resources/ESSpaceMgmtLWCChangelog.json
similarity index 100%
rename from packages/sfpowerscripts-cli/tests/impl/changelog/resources/ESSpaceMgmtLWCChangelog.json
rename to packages/sfp-cli/tests/impl/changelog/resources/ESSpaceMgmtLWCChangelog.json
diff --git a/packages/sfpowerscripts-cli/tests/impl/changelog/resources/ExpectedResults/should_update_latestRelease_with_all_commits.json b/packages/sfp-cli/tests/impl/changelog/resources/ExpectedResults/should_update_latestRelease_with_all_commits.json
similarity index 99%
rename from packages/sfpowerscripts-cli/tests/impl/changelog/resources/ExpectedResults/should_update_latestRelease_with_all_commits.json
rename to packages/sfp-cli/tests/impl/changelog/resources/ExpectedResults/should_update_latestRelease_with_all_commits.json
index d88712474..070bcd232 100644
--- a/packages/sfpowerscripts-cli/tests/impl/changelog/resources/ExpectedResults/should_update_latestRelease_with_all_commits.json
+++ b/packages/sfp-cli/tests/impl/changelog/resources/ExpectedResults/should_update_latestRelease_with_all_commits.json
@@ -14,7 +14,7 @@
"date": "2021-01-25T11:01:55+11:00",
"author": "Azlam",
"message": "Add persist credential to PR (#6)",
- "body": "* Add persist credential to PR\r\n\r\n* switch to alpha\r\n\r\n* Increment versions\r\n\r\n* Revert \"Increment versions\"\r\n\r\nThis reverts commit 39a68617d8e92de46604b883b6681e8022d2e403.\r\n\r\n* Test abs path\r\n\r\n* Revert \"Test abs path\"\r\n\r\nThis reverts commit 5ab30a8b52eddf16025acf6aec57d1bb9262549d.\r\n\r\n* Cleanup and switch to prod version of sfpowerscripts\r\n\r\nCo-authored-by: sfpowerscripts \r\nCo-authored-by: Alan Ly "
+ "body": "* Add persist credential to PR\r\n\r\n* switch to alpha\r\n\r\n* Increment versions\r\n\r\n* Revert \"Increment versions\"\r\n\r\nThis reverts commit 39a68617d8e92de46604b883b6681e8022d2e403.\r\n\r\n* Test abs path\r\n\r\n* Revert \"Test abs path\"\r\n\r\nThis reverts commit 5ab30a8b52eddf16025acf6aec57d1bb9262549d.\r\n\r\n* Cleanup and switch to prod version of sfp\r\n\r\nCo-authored-by: sfp \r\nCo-authored-by: Alan Ly "
},
{
"commitId": "d7124579",
diff --git a/packages/sfpowerscripts-cli/tests/impl/changelog/resources/ExpectedResults/should_update_latestRelease_with_subset_of_commits.json b/packages/sfp-cli/tests/impl/changelog/resources/ExpectedResults/should_update_latestRelease_with_subset_of_commits.json
similarity index 99%
rename from packages/sfpowerscripts-cli/tests/impl/changelog/resources/ExpectedResults/should_update_latestRelease_with_subset_of_commits.json
rename to packages/sfp-cli/tests/impl/changelog/resources/ExpectedResults/should_update_latestRelease_with_subset_of_commits.json
index 3b3e51726..62ea88528 100644
--- a/packages/sfpowerscripts-cli/tests/impl/changelog/resources/ExpectedResults/should_update_latestRelease_with_subset_of_commits.json
+++ b/packages/sfp-cli/tests/impl/changelog/resources/ExpectedResults/should_update_latestRelease_with_subset_of_commits.json
@@ -15,7 +15,7 @@
"date": "2021-01-25T11:01:55+11:00",
"author": "Azlam",
"message": "Add persist credential to PR (#6)",
- "body": "* Add persist credential to PR\r\n\r\n* switch to alpha\r\n\r\n* Increment versions\r\n\r\n* Revert \"Increment versions\"\r\n\r\nThis reverts commit 39a68617d8e92de46604b883b6681e8022d2e403.\r\n\r\n* Test abs path\r\n\r\n* Revert \"Test abs path\"\r\n\r\nThis reverts commit 5ab30a8b52eddf16025acf6aec57d1bb9262549d.\r\n\r\n* Cleanup and switch to prod version of sfpowerscripts\r\n\r\nCo-authored-by: sfpowerscripts \r\nCo-authored-by: Alan Ly "
+ "body": "* Add persist credential to PR\r\n\r\n* switch to alpha\r\n\r\n* Increment versions\r\n\r\n* Revert \"Increment versions\"\r\n\r\nThis reverts commit 39a68617d8e92de46604b883b6681e8022d2e403.\r\n\r\n* Test abs path\r\n\r\n* Revert \"Test abs path\"\r\n\r\nThis reverts commit 5ab30a8b52eddf16025acf6aec57d1bb9262549d.\r\n\r\n* Cleanup and switch to prod version of sfp\r\n\r\nCo-authored-by: sfp \r\nCo-authored-by: Alan Ly "
},
{
"commitId": "d7124579",
diff --git a/packages/sfpowerscripts-cli/tests/impl/changelog/resources/ExpectedResults/should_update_latestRelease_with_work_items.json b/packages/sfp-cli/tests/impl/changelog/resources/ExpectedResults/should_update_latestRelease_with_work_items.json
similarity index 99%
rename from packages/sfpowerscripts-cli/tests/impl/changelog/resources/ExpectedResults/should_update_latestRelease_with_work_items.json
rename to packages/sfp-cli/tests/impl/changelog/resources/ExpectedResults/should_update_latestRelease_with_work_items.json
index 32b27072b..0af6bd844 100644
--- a/packages/sfpowerscripts-cli/tests/impl/changelog/resources/ExpectedResults/should_update_latestRelease_with_work_items.json
+++ b/packages/sfp-cli/tests/impl/changelog/resources/ExpectedResults/should_update_latestRelease_with_work_items.json
@@ -19,7 +19,7 @@
"date": "2021-01-25T11:01:55+11:00",
"author": "Azlam",
"message": "NGV-626 Add persist credential to PR (#6)",
- "body": "* Add persist credential to PR\r\n\r\n* switch to alpha\r\n\r\n* Increment versions\r\n\r\n* Revert \"Increment versions\"\r\n\r\nThis reverts commit 39a68617d8e92de46604b883b6681e8022d2e403.\r\n\r\n* Test abs path\r\n\r\n* Revert \"Test abs path\"\r\n\r\nThis reverts commit 5ab30a8b52eddf16025acf6aec57d1bb9262549d.\r\n\r\n* Cleanup and switch to prod version of sfpowerscripts\r\n\r\nCo-authored-by: sfpowerscripts \r\nCo-authored-by: Alan Ly "
+ "body": "* Add persist credential to PR\r\n\r\n* switch to alpha\r\n\r\n* Increment versions\r\n\r\n* Revert \"Increment versions\"\r\n\r\nThis reverts commit 39a68617d8e92de46604b883b6681e8022d2e403.\r\n\r\n* Test abs path\r\n\r\n* Revert \"Test abs path\"\r\n\r\nThis reverts commit 5ab30a8b52eddf16025acf6aec57d1bb9262549d.\r\n\r\n* Cleanup and switch to prod version of sfp\r\n\r\nCo-authored-by: sfp \r\nCo-authored-by: Alan Ly "
},
{
"commitId": "d7124579",
diff --git a/packages/sfpowerscripts-cli/tests/impl/dependency/ShrinkImpl.test.ts b/packages/sfp-cli/tests/impl/dependency/ShrinkImpl.test.ts
similarity index 97%
rename from packages/sfpowerscripts-cli/tests/impl/dependency/ShrinkImpl.test.ts
rename to packages/sfp-cli/tests/impl/dependency/ShrinkImpl.test.ts
index 9cb9834f6..7a6d6879a 100644
--- a/packages/sfpowerscripts-cli/tests/impl/dependency/ShrinkImpl.test.ts
+++ b/packages/sfp-cli/tests/impl/dependency/ShrinkImpl.test.ts
@@ -23,7 +23,7 @@ const setupFakeConnection = async () => {
return conn;
}
-jest.mock('../../../../core/src/git/Git', () => {
+jest.mock('../../../src/core/git/Git', () => {
class Git {
static async initiateRepo()
{
@@ -34,7 +34,7 @@ jest.mock('../../../../core/src/git/Git', () => {
return Git;
});
-jest.mock('../../../../core/src/git/GitTags', () => {
+jest.mock('../../../src/core/git/GitTags', () => {
class GitTags {
async listTagsOnBranch(): Promise {
return gitTags;
@@ -205,7 +205,7 @@ const projectConfig = {
"sfdc-framework":"04t1000x00x00x"
},
"plugins": {
- "sfpowerscripts": {
+ "sfp": {
"disableShrinkImpl": false,
"externalDependencyMap": {
"tech-framework@2.0.0.38": [
diff --git a/packages/sfpowerscripts-cli/tests/impl/parallelBuilder/BuildCollections.test.ts b/packages/sfp-cli/tests/impl/parallelBuilder/BuildCollections.test.ts
similarity index 98%
rename from packages/sfpowerscripts-cli/tests/impl/parallelBuilder/BuildCollections.test.ts
rename to packages/sfp-cli/tests/impl/parallelBuilder/BuildCollections.test.ts
index 0fca1bad2..876858d10 100644
--- a/packages/sfpowerscripts-cli/tests/impl/parallelBuilder/BuildCollections.test.ts
+++ b/packages/sfp-cli/tests/impl/parallelBuilder/BuildCollections.test.ts
@@ -2,7 +2,7 @@ import { jest, expect } from '@jest/globals';
import BuildCollections from '../../../src/impl/parallelBuilder/BuildCollections';
let packageManifest = null;
-jest.mock('../../../../core/lib/project/ProjectConfig', () => {
+jest.mock('../../../src/core/project/ProjectConfig', () => {
class ProjectConfig {
static getSFDXProjectConfig(projectDirectory: string) {
return packageManifest;
diff --git a/packages/sfpowerscripts-cli/tests/impl/parallelBuilder/UndirectedGraph.test.ts b/packages/sfp-cli/tests/impl/parallelBuilder/UndirectedGraph.test.ts
similarity index 100%
rename from packages/sfpowerscripts-cli/tests/impl/parallelBuilder/UndirectedGraph.test.ts
rename to packages/sfp-cli/tests/impl/parallelBuilder/UndirectedGraph.test.ts
diff --git a/packages/sfpowerscripts-cli/tests/impl/release/ReleaseDefinition.test.ts b/packages/sfp-cli/tests/impl/release/ReleaseDefinition.test.ts
similarity index 81%
rename from packages/sfpowerscripts-cli/tests/impl/release/ReleaseDefinition.test.ts
rename to packages/sfp-cli/tests/impl/release/ReleaseDefinition.test.ts
index a4820edba..55655cc83 100644
--- a/packages/sfpowerscripts-cli/tests/impl/release/ReleaseDefinition.test.ts
+++ b/packages/sfp-cli/tests/impl/release/ReleaseDefinition.test.ts
@@ -1,6 +1,6 @@
import { jest, expect } from '@jest/globals';
const fs = require('fs-extra');
-import ReleaseDefinition from '../../../src/impl/release/ReleaseDefinition';
+import ReleaseDefinitionLoader from '../../../src/impl/release/ReleaseDefinitionLoader';
describe('Given a release definition, validateReleaseDefinition', () => {
let releaseDefinitionYaml: string;
@@ -18,7 +18,7 @@ describe('Given a release definition, validateReleaseDefinition', () => {
`;
expect(async () => {
- await ReleaseDefinition.loadReleaseDefinition('path');
+ await ReleaseDefinitionLoader.loadReleaseDefinition('path');
}).rejects.toThrowError();
});
@@ -29,7 +29,7 @@ describe('Given a release definition, validateReleaseDefinition', () => {
`;
expect(async () => {
- await ReleaseDefinition.loadReleaseDefinition('path');
+ await ReleaseDefinitionLoader.loadReleaseDefinition('path');
}).rejects.toThrowError();
});
@@ -43,7 +43,7 @@ describe('Given a release definition, validateReleaseDefinition', () => {
`;
expect(async () => {
- await ReleaseDefinition.loadReleaseDefinition('path');
+ await ReleaseDefinitionLoader.loadReleaseDefinition('path');
}).toBeDefined();
});
@@ -57,7 +57,7 @@ describe('Given a release definition, validateReleaseDefinition', () => {
`;
expect(async () => {
- await ReleaseDefinition.loadReleaseDefinition('path');
+ await ReleaseDefinitionLoader.loadReleaseDefinition('path');
}).rejects.toThrowError();
});
@@ -71,7 +71,7 @@ describe('Given a release definition, validateReleaseDefinition', () => {
`;
expect(async () => {
- await ReleaseDefinition.loadReleaseDefinition('path');
+ await ReleaseDefinitionLoader.loadReleaseDefinition('path');
}).toBeDefined();
});
@@ -85,7 +85,7 @@ describe('Given a release definition, validateReleaseDefinition', () => {
`;
expect(async () => {
- await ReleaseDefinition.loadReleaseDefinition('path');
+ await ReleaseDefinitionLoader.loadReleaseDefinition('path');
}).rejects.toThrowError();
});
@@ -103,7 +103,7 @@ describe('Given a release definition, validateReleaseDefinition', () => {
`;
expect(async () => {
- await ReleaseDefinition.loadReleaseDefinition('path');
+ await ReleaseDefinitionLoader.loadReleaseDefinition('path');
}).toBeDefined();
});
@@ -119,7 +119,7 @@ describe('Given a release definition, validateReleaseDefinition', () => {
`;
expect(async () => {
- await ReleaseDefinition.loadReleaseDefinition('path');
+ await ReleaseDefinitionLoader.loadReleaseDefinition('path');
}).rejects.toThrow();
});
});
diff --git a/packages/sfp-cli/tests/impl/release/ReleaseDefinitionSorter.test.ts b/packages/sfp-cli/tests/impl/release/ReleaseDefinitionSorter.test.ts
new file mode 100644
index 000000000..995c956ed
--- /dev/null
+++ b/packages/sfp-cli/tests/impl/release/ReleaseDefinitionSorter.test.ts
@@ -0,0 +1,169 @@
+import { ConsoleLogger } from '@flxblio/sfp-logger';
+import ReleaseDefinitionSorter from '../../../src/impl/release/ReleaseDefinitionSorter'; // Adjust the import path to where your function is defined
+import { expect } from '@jest/globals';
+
+describe('Sort Release Definitions by leading project config', () => {
+ it('should sort release definitions when packages are shared', async () => {
+ // Mock input data
+ const releaseDefinitions = [
+ {
+ release: 'Release1',
+ artifacts: { PackageB: '1.0.0', PackageC: '1.0.0' },
+ skipIfAlreadyInstalled: false,
+ skipArtifactUpdate: false,
+ },
+ {
+ release: 'Release2',
+ artifacts: { PackageA: '1.0.0', PackageB: '1.0.0', PackageD: '1.0.0' },
+ skipIfAlreadyInstalled: false,
+ skipArtifactUpdate: false,
+ },
+ {
+ release: 'Release3',
+ artifacts: { PackageE: '1.0.0' },
+ skipIfAlreadyInstalled: false,
+ skipArtifactUpdate: false,
+ },
+ ];
+ const leadingSfProjectConfig = {
+ packageDirectories: [
+ { package: 'PackageA', versionNumber: '1.0.0' },
+ { package: 'PackageB', versionNumber: '1.0.0' },
+ { package: 'PackageC', versionNumber: '1.0.0' },
+ { package: 'PackageD', versionNumber: '1.0.0' },
+ { package: 'PackageE', versionNumber: '1.0.0' },
+ ],
+ };
+
+ // Call the function to test
+ const sortedReleaseDefinitions = await new ReleaseDefinitionSorter().sortReleaseDefinitions(
+ releaseDefinitions,
+ leadingSfProjectConfig,
+ new ConsoleLogger()
+ );
+
+ const sortedReleaseOrder = sortedReleaseDefinitions.map((def) => def.release);
+ const expectedReleaseOrder = ['Release2', 'Release1', 'Release3'];
+ expect(sortedReleaseOrder).toEqual(expectedReleaseOrder);
+ });
+
+ it('should sort release definitions when the first release definition has the last package and packages are shared', async () => {
+ // Mock input data
+ const releaseDefinitions = [
+ {
+ release: 'Release3',
+ artifacts: { PackageE: '1.0.0' },
+ skipIfAlreadyInstalled: false,
+ skipArtifactUpdate: false,
+ },
+ {
+ release: 'Release2',
+ artifacts: { PackageA: '1.0.0', PackageB: '1.0.0', PackageC: '1.0.0' },
+ skipIfAlreadyInstalled: false,
+ skipArtifactUpdate: false,
+ },
+ {
+ release: 'Release1',
+ artifacts: { PackageB: '1.0.0' },
+ skipIfAlreadyInstalled: false,
+ skipArtifactUpdate: false,
+ },
+ ];
+ const leadingSfProjectConfig = {
+ packageDirectories: [
+ { package: 'PackageA', versionNumber: '1.0.0' },
+ { package: 'PackageB', versionNumber: '1.0.0' },
+ { package: 'PackageC', versionNumber: '1.0.0' },
+ { package: 'PackageD', versionNumber: '1.0.0' },
+ { package: 'PackageE', versionNumber: '1.0.0' },
+ ],
+ };
+
+ // Call the function to test
+ const sortedReleaseDefinitions = await new ReleaseDefinitionSorter().sortReleaseDefinitions(
+ releaseDefinitions,
+ leadingSfProjectConfig,
+ new ConsoleLogger()
+ );
+
+ const sortedReleaseOrder = sortedReleaseDefinitions.map((def) => def.release);
+ const expectedReleaseOrder = ['Release2', 'Release3', 'Release1'];
+ expect(sortedReleaseOrder).toEqual(expectedReleaseOrder);
+ });
+
+ it('should return the same definition when only one is provided', async () => {
+ // Mock input data
+ const releaseDefinitions = [
+ {
+ release: 'Release3',
+ artifacts: { PackageE: '1.0.0' },
+ skipIfAlreadyInstalled: false,
+ skipArtifactUpdate: false,
+ }
+ ];
+ const leadingSfProjectConfig = {
+ packageDirectories: [
+ { package: 'PackageA', versionNumber: '1.0.0' },
+ { package: 'PackageB', versionNumber: '1.0.0' },
+ { package: 'PackageC', versionNumber: '1.0.0' },
+ { package: 'PackageD', versionNumber: '1.0.0' },
+ { package: 'PackageE', versionNumber: '1.0.0' },
+ ],
+ };
+
+ // Call the function to test
+ const sortedReleaseDefinitions = await new ReleaseDefinitionSorter().sortReleaseDefinitions(
+ releaseDefinitions,
+ leadingSfProjectConfig,
+ new ConsoleLogger()
+ );
+
+ const sortedReleaseOrder = sortedReleaseDefinitions.map((def) => def.release);
+ const expectedReleaseOrder = ['Release3'];
+ expect(sortedReleaseOrder).toEqual(expectedReleaseOrder);
+ });
+
+ it('should sort release definitions when no packages are shared', async () => {
+ // Mock input data
+ const releaseDefinitions = [
+ {
+ release: 'Release3',
+ artifacts: { PackageE: '1.0.0' },
+ skipIfAlreadyInstalled: false,
+ skipArtifactUpdate: false,
+ },
+ {
+ release: 'Release2',
+ artifacts: { PackageA: '1.0.0', PackageB: '1.0.0' },
+ skipIfAlreadyInstalled: false,
+ skipArtifactUpdate: false,
+ },
+ {
+ release: 'Release1',
+ artifacts: { PackageC: '1.0.0' },
+ skipIfAlreadyInstalled: false,
+ skipArtifactUpdate: false,
+ },
+ ];
+ const leadingSfProjectConfig = {
+ packageDirectories: [
+ { package: 'PackageA', versionNumber: '1.0.0' },
+ { package: 'PackageB', versionNumber: '1.0.0' },
+ { package: 'PackageC', versionNumber: '1.0.0' },
+ { package: 'PackageD', versionNumber: '1.0.0' },
+ { package: 'PackageE', versionNumber: '1.0.0' },
+ ],
+ };
+
+ // Call the function to test
+ const sortedReleaseDefinitions = await new ReleaseDefinitionSorter().sortReleaseDefinitions(
+ releaseDefinitions,
+ leadingSfProjectConfig,
+ new ConsoleLogger()
+ );
+
+ const sortedReleaseOrder = sortedReleaseDefinitions.map((def) => def.release);
+ const expectedReleaseOrder = ['Release2', 'Release1', 'Release3'];
+ expect(sortedReleaseOrder).toEqual(expectedReleaseOrder);
+ });
+});
diff --git a/packages/sfpowerscripts-cli/tsconfig.json b/packages/sfp-cli/tsconfig.json
similarity index 76%
rename from packages/sfpowerscripts-cli/tsconfig.json
rename to packages/sfp-cli/tsconfig.json
index 35a048a99..2c64cb84e 100644
--- a/packages/sfpowerscripts-cli/tsconfig.json
+++ b/packages/sfp-cli/tsconfig.json
@@ -3,7 +3,8 @@
"compilerOptions": {
"outDir": "./lib",
"rootDir": "./src",
- "skipLibCheck": true
+ "skipLibCheck": true,
+ "lib": ["ES2020"]
},
"exclude": ["node_modules", "dist", "tests"]
}
diff --git a/packages/sfplogger/package.json b/packages/sfplogger/package.json
index e87a1e032..4fa39c493 100644
--- a/packages/sfplogger/package.json
+++ b/packages/sfplogger/package.json
@@ -1,6 +1,6 @@
{
- "name": "@dxatscale/sfp-logger",
- "version": "2.1.2",
+ "name": "@flxblio/sfp-logger",
+ "version": "2.1.3",
"description": "sfp logger library",
"main": "lib/SFPLogger.js",
"types": "lib/SFPLogger.d.ts",
@@ -12,6 +12,9 @@
"clean": "rimraf ./lib && rimraf tsconfig.tsbuildinfo",
"compile": "tsc -b tsconfig.json"
},
+ "publishConfig": {
+ "access": "public"
+ },
"dependencies": {
"chalk": "^4.1.2",
"fs-extra": "^9.1.0",
@@ -26,14 +29,14 @@
},
"repository": {
"type": "git",
- "url": "git+https://github.com/dxatscale/sfpowerscripts.git"
+ "url": "git+https://github.com/flxbl-io/sfp.git"
},
- "author": "dxatscale",
+ "author": "flxblio",
"license": "MIT",
"bugs": {
- "url": "https://github.com/dxatscale/sfpowerscripts/issues"
+ "url": "https://github.com/flxbl-io/sfp/issues"
},
- "homepage": "https://github.com/dxatscale/sfpowerscripts/tree/main/packages/sfplogger#readme",
+ "homepage": "https://github.com/flxbl-io/sfp/tree/main/packages/sfplogger#readme",
"keywords": [
"logger",
"sfp",
diff --git a/packages/sfpowerscripts-cli/.snyk b/packages/sfpowerscripts-cli/.snyk
deleted file mode 100644
index d9970733e..000000000
--- a/packages/sfpowerscripts-cli/.snyk
+++ /dev/null
@@ -1,76 +0,0 @@
-# Snyk (https://snyk.io) policy file, patches or ignores known vulnerabilities.
-version: v1.19.0
-ignore: {}
-# patches apply the minimum changes required to fix a vulnerability
-patch:
- SNYK-JS-LODASH-567746:
- - '@salesforce/core > jsforce > lodash':
- patched: '2021-01-21T01:54:07.552Z'
- - salesforce-alm > jsforce > lodash:
- patched: '2021-01-21T01:54:07.552Z'
- - '@salesforce/command > cli-ux > lodash':
- patched: '2021-01-21T01:54:07.552Z'
- - salesforce-alm > archiver > lodash:
- patched: '2021-01-21T01:54:07.552Z'
- - salesforce-alm > heroku-cli-util > lodash:
- patched: '2021-01-21T01:54:07.552Z'
- - '@salesforce/command > @oclif/test > fancy-test > lodash':
- patched: '2021-01-21T01:54:07.552Z'
- - '@salesforce/command > @salesforce/core > jsforce > lodash':
- patched: '2021-01-21T01:54:07.552Z'
- - salesforce-alm > archiver > async > lodash:
- patched: '2021-01-21T01:54:07.552Z'
- - salesforce-alm > archiver > archiver-utils > lodash:
- patched: '2021-01-21T01:54:07.552Z'
- - salesforce-alm > archiver > zip-stream > lodash:
- patched: '2021-01-21T01:54:07.552Z'
- - salesforce-alm > @salesforce/command > @oclif/test > fancy-test > lodash:
- patched: '2021-01-21T01:54:07.552Z'
- - salesforce-alm > @salesforce/plugin-analytics > @salesforce/core > jsforce > lodash:
- patched: '2021-01-21T01:54:07.552Z'
- - salesforce-alm > @salesforce/source-deploy-retrieve > @salesforce/core > jsforce > lodash:
- patched: '2021-01-21T01:54:07.552Z'
- - salesforce-alm > @salesforce/plugin-analytics > @salesforce/command > cli-ux > lodash:
- patched: '2021-01-21T01:54:07.552Z'
- - salesforce-alm > @salesforce/source-deploy-retrieve > archiver > async > lodash:
- patched: '2021-01-21T01:54:07.552Z'
- - salesforce-alm > archiver > zip-stream > archiver-utils > lodash:
- patched: '2021-01-21T01:54:07.552Z'
- - salesforce-alm > @salesforce/plugin-analytics > @salesforce/command > @oclif/test > fancy-test > lodash:
- patched: '2021-01-21T01:54:07.552Z'
- - '@salesforce/core > @salesforce/ts-sinon > sinon > nise > @sinonjs/formatio > @sinonjs/samsam > lodash':
- patched: '2021-01-21T01:54:07.552Z'
- - '@salesforce/command > @salesforce/core > @salesforce/ts-sinon > sinon > nise > @sinonjs/formatio > @sinonjs/samsam > lodash':
- patched: '2021-01-21T01:54:07.552Z'
- - salesforce-alm > @salesforce/plugin-analytics > @salesforce/core > @salesforce/ts-sinon > sinon > nise > @sinonjs/formatio > @sinonjs/samsam > lodash:
- patched: '2021-01-21T01:54:07.552Z'
- - snyk > graphlib > lodash:
- patched: '2021-01-21T02:20:34.238Z'
- - snyk > @snyk/dep-graph > graphlib > lodash:
- patched: '2021-01-21T02:20:34.238Z'
- - snyk > snyk-nodejs-lockfile-parser > graphlib > lodash:
- patched: '2021-01-21T02:20:34.238Z'
- - snyk > snyk-go-plugin > graphlib > lodash:
- patched: '2021-01-21T02:20:34.238Z'
- - snyk > @snyk/snyk-cocoapods-plugin > @snyk/dep-graph > graphlib > lodash:
- patched: '2021-01-21T02:20:34.238Z'
- - snyk > snyk-cpp-plugin > @snyk/dep-graph > graphlib > lodash:
- patched: '2021-01-21T02:20:34.238Z'
- - snyk > snyk-docker-plugin > @snyk/dep-graph > graphlib > lodash:
- patched: '2021-01-21T02:20:34.238Z'
- - snyk > snyk-go-plugin > @snyk/dep-graph > graphlib > lodash:
- patched: '2021-01-21T02:20:34.238Z'
- - snyk > snyk-gradle-plugin > @snyk/java-call-graph-builder > graphlib > lodash:
- patched: '2021-01-21T02:20:34.238Z'
- - snyk > snyk-docker-plugin > snyk-nodejs-lockfile-parser > graphlib > lodash:
- patched: '2021-01-21T02:20:34.238Z'
- - snyk > snyk-mvn-plugin > @snyk/java-call-graph-builder > graphlib > lodash:
- patched: '2021-01-21T02:20:34.238Z'
- - snyk > @snyk/snyk-cocoapods-plugin > @snyk/cocoapods-lockfile-parser > @snyk/dep-graph > graphlib > lodash:
- patched: '2021-01-21T02:20:34.238Z'
- - snyk > snyk-gradle-plugin > @snyk/cli-interface > @snyk/dep-graph > graphlib > lodash:
- patched: '2021-01-21T02:20:34.238Z'
- - snyk > snyk-mvn-plugin > @snyk/cli-interface > @snyk/dep-graph > graphlib > lodash:
- patched: '2021-01-21T02:20:34.238Z'
- - snyk > snyk-python-plugin > snyk-poetry-lockfile-parser > @snyk/dep-graph > graphlib > lodash:
- patched: '2021-01-21T02:20:34.238Z'
diff --git a/packages/sfpowerscripts-cli/CHANGELOG.md b/packages/sfpowerscripts-cli/CHANGELOG.md
deleted file mode 100644
index 375e5c6f2..000000000
--- a/packages/sfpowerscripts-cli/CHANGELOG.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# Change Log
-
-All notable changes to this project will be documented in this file.
-See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
-
-# [20.30.0](https://github.com/dxatscale/sfpowerscripts/compare/@dxatscale/sfpowerscripts@20.29.0...@dxatscale/sfpowerscripts@20.30.0) (2023-03-22)
-
-
-### Features
-
-* **publish:** Add new flag to delete Git tags by age and limit ([#1275](https://github.com/dxatscale/sfpowerscripts/issues/1275)) ([aae62d6](https://github.com/dxatscale/sfpowerscripts/commit/aae62d6d3e7eb390dddcf2ca46b99b44ca4cc933))
diff --git a/packages/sfpowerscripts-cli/messages/metrics_report.json b/packages/sfpowerscripts-cli/messages/metrics_report.json
deleted file mode 100644
index 77853e3af..000000000
--- a/packages/sfpowerscripts-cli/messages/metrics_report.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
- "commandDescription": "Report a custom metric to any sfpowerscripts supported metric provider"
-}
diff --git a/packages/sfpowerscripts-cli/src/impl/changelog/ReadPackageChangelog.ts b/packages/sfpowerscripts-cli/src/impl/changelog/ReadPackageChangelog.ts
deleted file mode 100644
index 64090d316..000000000
--- a/packages/sfpowerscripts-cli/src/impl/changelog/ReadPackageChangelog.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-import { Changelog as PackageChangelog } from '@dxatscale/sfpowerscripts.core/lib/changelog/interfaces/GenericChangelogInterfaces';
-
-export default interface ReadPackageChangelog {
- (changelogFilePath: string): PackageChangelog;
-}
diff --git a/packages/sfpowerscripts-cli/src/index.ts b/packages/sfpowerscripts-cli/src/index.ts
deleted file mode 100644
index ff8b4c563..000000000
--- a/packages/sfpowerscripts-cli/src/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export default {};
diff --git a/packages/sfprofiles/package.json b/packages/sfprofiles/package.json
index 72fdcf59a..fd267def1 100644
--- a/packages/sfprofiles/package.json
+++ b/packages/sfprofiles/package.json
@@ -1,6 +1,6 @@
{
- "name": "@dxatscale/sfprofiles",
- "version": "2.0.8",
+ "name": "@flxblio/sfprofiles",
+ "version": "3.0.0",
"description": "Salesforce Profile management",
"keywords": [
"sfdx-plugin",
@@ -8,8 +8,8 @@
"profiles",
"permissions"
],
- "author": "dxatscale",
- "homepage": "https://github.com/dxatscale/sfpowerscripts",
+ "author": "flxblio",
+ "homepage": "https://github.com/flxbl-io/sfp",
"license": "MIT",
"main": "lib/sfprofiles",
"types": "lib/sfprofiles",
@@ -22,7 +22,7 @@
},
"repository": {
"type": "git",
- "url": "git+https://github.com/dxatscale/sfpowerscripts.git"
+ "url": "git+https://github.com/flxbl-io/sfp.git"
},
"scripts": {
"build": "pnpm run clean && pnpm run compile",
@@ -32,7 +32,7 @@
"clearCache": "jest --clearCache"
},
"bugs": {
- "url": "https://github.com/dxatscale/sfpowerscripts/issues"
+ "url": "https://github.com/flxbl-io/sfp/issues"
},
"devDependencies": {
"@babel/core": "7.18.2",
@@ -59,9 +59,9 @@
"typescript": "^5"
},
"dependencies": {
- "@dxatscale/sfp-logger": "^2.1.2",
- "@salesforce/core": "5.3.9",
- "@salesforce/source-deploy-retrieve": "9.7.24",
+ "@flxblio/sfp-logger": "^2.1.3",
+ "@salesforce/core": "6.5.1",
+ "@salesforce/source-deploy-retrieve": "10.2.13",
"async-retry": "^1.3.3",
"better-sqlite3": "8.4.0",
"chalk": "^4.1.0",
@@ -69,7 +69,7 @@
"fs-extra": "^11.1.0",
"glob": "10.3.3",
"ignore": "^5.1.8",
- "jsforce": "^2.0.0-beta.27",
+ "jsforce": "^2.0.0-beta.29",
"node-cache": "^5.1.2",
"rimraf": "^5.0.1",
"simple-git": "^3.16.0",
diff --git a/packages/sfprofiles/src/impl/diff/diffImpl.ts b/packages/sfprofiles/src/impl/diff/diffImpl.ts
index 0c08a3777..f51cb06e1 100644
--- a/packages/sfprofiles/src/impl/diff/diffImpl.ts
+++ b/packages/sfprofiles/src/impl/diff/diffImpl.ts
@@ -21,7 +21,7 @@ import SharingRuleDiff from './sharingRuleDiff';
import CustomLabelsDiff from './customLabelsDiff';
import DiffUtil, { DiffFile, DiffFileStatus } from './diffUtil';
import { Sfpowerkit } from '@utils/sfpowerkit';
-import SFPLogger, {LoggerLevel } from '@dxatscale/sfp-logger';
+import SFPLogger, {LoggerLevel } from '@flxblio/sfp-logger';
import { DXProjectManifestUtils } from '@utils/dxProjectManifestUtils';
import simplegit from 'simple-git';
import { Messages } from '@salesforce/core';
diff --git a/packages/sfprofiles/src/impl/diff/diffUtil.ts b/packages/sfprofiles/src/impl/diff/diffUtil.ts
index 89f342954..901457b68 100644
--- a/packages/sfprofiles/src/impl/diff/diffUtil.ts
+++ b/packages/sfprofiles/src/impl/diff/diffUtil.ts
@@ -5,7 +5,7 @@ import * as _ from 'lodash';
import MetadataFiles from '@impl/metadata/metadataFiles';
import { SOURCE_EXTENSION_REGEX } from '@impl/metadata/metadataInfo';
import { METADATA_INFO } from '@impl/metadata/metadataInfo';
-import SFPLogger, {LoggerLevel } from '@dxatscale/sfp-logger';
+import SFPLogger, {LoggerLevel } from '@flxblio/sfp-logger';
import simplegit, { SimpleGit } from 'simple-git';
const SEP = /\/|\\/;
diff --git a/packages/sfprofiles/src/impl/metadata/metadataFiles.ts b/packages/sfprofiles/src/impl/metadata/metadataFiles.ts
index 7cdf12cf0..272f93bd1 100644
--- a/packages/sfprofiles/src/impl/metadata/metadataFiles.ts
+++ b/packages/sfprofiles/src/impl/metadata/metadataFiles.ts
@@ -5,7 +5,7 @@ import _ from 'lodash';
import ignore from 'ignore';
import * as fs from 'fs-extra';
import { Sfpowerkit } from 'utils/sfpowerkit';
-import SFPLogger, {LoggerLevel } from '@dxatscale/sfp-logger';
+import SFPLogger, {LoggerLevel } from '@flxblio/sfp-logger';
import { globSync } from 'glob';
const SEP = /\/|\\/;
diff --git a/packages/sfprofiles/src/impl/metadata/packageBuilder.ts b/packages/sfprofiles/src/impl/metadata/packageBuilder.ts
index 674deaaf6..7ccf0d423 100644
--- a/packages/sfprofiles/src/impl/metadata/packageBuilder.ts
+++ b/packages/sfprofiles/src/impl/metadata/packageBuilder.ts
@@ -5,7 +5,7 @@ import * as fs from 'fs-extra';
import * as path from 'path';
import FileUtils from 'utils/fileutils';
import { FileProperties } from 'jsforce/lib/api/metadata';
-import SFPLogger, {LoggerLevel } from '@dxatscale/sfp-logger';
+import SFPLogger, {LoggerLevel } from '@flxblio/sfp-logger';
if (Symbol['asyncIterator'] === undefined) {
diff --git a/packages/sfprofiles/src/impl/metadata/retriever/metadataRetriever.ts b/packages/sfprofiles/src/impl/metadata/retriever/metadataRetriever.ts
index 86145a360..8cff0045b 100644
--- a/packages/sfprofiles/src/impl/metadata/retriever/metadataRetriever.ts
+++ b/packages/sfprofiles/src/impl/metadata/retriever/metadataRetriever.ts
@@ -4,7 +4,7 @@ import { Connection } from 'jsforce';
import QueryExecutor from '@utils/queryExecutor';
import MetadataOperation from '@utils/metadataOperation';
import { registry } from '@salesforce/source-deploy-retrieve';
-import SFPLogger, {LoggerLevel } from '@dxatscale/sfp-logger';
+import SFPLogger, {LoggerLevel } from '@flxblio/sfp-logger';
export default class MetadataRetriever {
protected _componentType;
diff --git a/packages/sfprofiles/src/impl/metadata/retriever/metadataSummaryInfoFetcher.ts b/packages/sfprofiles/src/impl/metadata/retriever/metadataSummaryInfoFetcher.ts
index f0e8f57a0..0ac652102 100644
--- a/packages/sfprofiles/src/impl/metadata/retriever/metadataSummaryInfoFetcher.ts
+++ b/packages/sfprofiles/src/impl/metadata/retriever/metadataSummaryInfoFetcher.ts
@@ -1,6 +1,6 @@
/* eslint-disable @typescript-eslint/no-unused-vars */
import getDefaults from '@utils/getDefaults';
-import SFPLogger, {LoggerLevel } from '@dxatscale/sfp-logger';
+import SFPLogger, {LoggerLevel } from '@flxblio/sfp-logger';
import { FileProperties, DescribeMetadataResult } from 'jsforce/lib/api/metadata';
import { Connection } from 'jsforce';
import { chunkArray } from '@utils/chunkArray';
diff --git a/packages/sfprofiles/src/impl/source/profileActions.ts b/packages/sfprofiles/src/impl/source/profileActions.ts
index a68dca869..7d2aed9ee 100644
--- a/packages/sfprofiles/src/impl/source/profileActions.ts
+++ b/packages/sfprofiles/src/impl/source/profileActions.ts
@@ -1,5 +1,5 @@
import { Sfpowerkit } from '@utils/sfpowerkit';
-import SFPLogger, {LoggerLevel } from '@dxatscale/sfp-logger';
+import SFPLogger, {LoggerLevel } from '@flxblio/sfp-logger';
import * as path from 'path';
import FileUtils from '@utils/fileutils';
import { retrieveMetadata } from '@utils/retrieveMetadata';
diff --git a/packages/sfprofiles/src/impl/source/profileComponentReconciler.ts b/packages/sfprofiles/src/impl/source/profileComponentReconciler.ts
index 272942a2d..ab53ac8b8 100644
--- a/packages/sfprofiles/src/impl/source/profileComponentReconciler.ts
+++ b/packages/sfprofiles/src/impl/source/profileComponentReconciler.ts
@@ -1,7 +1,7 @@
import { Connection } from '@salesforce/core';
import { registry } from '@salesforce/source-deploy-retrieve';
import MetadataFiles from '@impl/metadata/metadataFiles';
-import SFPLogger, {LoggerLevel } from '@dxatscale/sfp-logger';
+import SFPLogger, {LoggerLevel } from '@flxblio/sfp-logger';
import { Sfpowerkit } from '@utils/sfpowerkit';
import UserPermissionBuilder from '@impl/metadata/builder/userPermissionBuilder';
import MetadataRetriever from '@impl/metadata/retriever/metadataRetriever';
diff --git a/packages/sfprofiles/src/impl/source/profileDiff.ts b/packages/sfprofiles/src/impl/source/profileDiff.ts
index dda358a2a..e59633df6 100644
--- a/packages/sfprofiles/src/impl/source/profileDiff.ts
+++ b/packages/sfprofiles/src/impl/source/profileDiff.ts
@@ -8,7 +8,7 @@ import ProfileWriter from '@impl/metadata/writer/profileWriter';
import Profile from '@impl/metadata/schema';
import { Sfpowerkit } from '@utils/sfpowerkit';
import MetadataFiles from '@impl/metadata/metadataFiles';
-import SFPLogger, {LoggerLevel } from '@dxatscale/sfp-logger';
+import SFPLogger, {LoggerLevel } from '@flxblio/sfp-logger';
import { diff_match_patch } from 'diff-match-patch';
import 'diff-match-patch-line-and-word'; // import globally to enhanse the class
diff --git a/packages/sfprofiles/src/impl/source/profileMerge.ts b/packages/sfprofiles/src/impl/source/profileMerge.ts
index da2103c5c..b95a48e25 100644
--- a/packages/sfprofiles/src/impl/source/profileMerge.ts
+++ b/packages/sfprofiles/src/impl/source/profileMerge.ts
@@ -24,7 +24,7 @@ import Profile, {
import * as util from 'util';
import ProfileActions, { ProfileStatus } from './profileActions';
import ProfileWriter from '@impl/metadata/writer/profileWriter';
-import SFPLogger, {LoggerLevel } from '@dxatscale/sfp-logger';
+import SFPLogger, {LoggerLevel } from '@flxblio/sfp-logger';
const unsupportedprofiles = [];
diff --git a/packages/sfprofiles/src/impl/source/profileReconcile.ts b/packages/sfprofiles/src/impl/source/profileReconcile.ts
index 37f9faf15..443223673 100644
--- a/packages/sfprofiles/src/impl/source/profileReconcile.ts
+++ b/packages/sfprofiles/src/impl/source/profileReconcile.ts
@@ -5,7 +5,7 @@ import ProfileActions, { ProfileSourceFile } from './profileActions';
import FileUtils from '@utils/fileutils';
import * as fs from 'fs-extra';
import { Worker } from 'worker_threads';
-import SFPLogger, { LoggerLevel } from '@dxatscale/sfp-logger';
+import SFPLogger, { LoggerLevel } from '@flxblio/sfp-logger';
import MetadataFiles from '@impl/metadata/metadataFiles';
export default class ProfileReconcile extends ProfileActions {
diff --git a/packages/sfprofiles/src/impl/source/profileSync.ts b/packages/sfprofiles/src/impl/source/profileSync.ts
index fefedd17c..bb41a5f6c 100644
--- a/packages/sfprofiles/src/impl/source/profileSync.ts
+++ b/packages/sfprofiles/src/impl/source/profileSync.ts
@@ -1,4 +1,4 @@
-import SFPLogger, { LoggerLevel } from '@dxatscale/sfp-logger';
+import SFPLogger, { LoggerLevel } from '@flxblio/sfp-logger';
import * as fs from 'fs-extra';
import Profile from '@impl/metadata/schema';
import * as _ from 'lodash';
diff --git a/packages/sfprofiles/src/impl/source/reconcileWorker.ts b/packages/sfprofiles/src/impl/source/reconcileWorker.ts
index 5252e3073..e0af61daf 100644
--- a/packages/sfprofiles/src/impl/source/reconcileWorker.ts
+++ b/packages/sfprofiles/src/impl/source/reconcileWorker.ts
@@ -1,6 +1,6 @@
import { Connection, Org, SfProject } from '@salesforce/core';
import { Sfpowerkit } from '@utils/sfpowerkit';
-import SFPLogger, {LoggerLevel } from '@dxatscale/sfp-logger';
+import SFPLogger, {LoggerLevel } from '@flxblio/sfp-logger';
import { parentPort, workerData } from 'worker_threads';
import * as fs from 'fs-extra';
import * as path from 'path';
diff --git a/packages/sfprofiles/src/impl/user/passwordgenerateimpl.ts b/packages/sfprofiles/src/impl/user/passwordgenerateimpl.ts
index e0894d8b0..bf0a14fab 100644
--- a/packages/sfprofiles/src/impl/user/passwordgenerateimpl.ts
+++ b/packages/sfprofiles/src/impl/user/passwordgenerateimpl.ts
@@ -2,7 +2,7 @@
// eslint-disable-next-line no-useless-escape
import { Connection, User, AuthInfo } from '@salesforce/core';
import queryApi from '../../utils/queryExecutor';
-import SFPLogger, {LoggerLevel } from '@dxatscale/sfp-logger';
+import SFPLogger, {LoggerLevel } from '@flxblio/sfp-logger';
export default class Passwordgenerateimpl {
public static async run(userName: string) {
diff --git a/packages/sfprofiles/src/utils/checkDeploymentStatus.ts b/packages/sfprofiles/src/utils/checkDeploymentStatus.ts
index d12a2d729..9ff43425a 100644
--- a/packages/sfprofiles/src/utils/checkDeploymentStatus.ts
+++ b/packages/sfprofiles/src/utils/checkDeploymentStatus.ts
@@ -1,7 +1,7 @@
import { Connection } from 'jsforce';
import { DeployResult } from 'jsforce/lib/api/metadata';
import { delay } from './delay';
-import SFPLogger, {LoggerLevel } from '@dxatscale/sfp-logger';
+import SFPLogger, {LoggerLevel } from '@flxblio/sfp-logger';
export async function checkDeploymentStatus(conn: Connection, retrievedId: string): Promise {
let metadata_result;
diff --git a/packages/sfprofiles/src/utils/checkRetrievalStatus.ts b/packages/sfprofiles/src/utils/checkRetrievalStatus.ts
index ac018f593..a5fcbee25 100644
--- a/packages/sfprofiles/src/utils/checkRetrievalStatus.ts
+++ b/packages/sfprofiles/src/utils/checkRetrievalStatus.ts
@@ -1,7 +1,7 @@
import { Connection } from 'jsforce';
import { RetrieveResult } from 'jsforce/lib/api/metadata';
import { delay } from './delay';
-import SFPLogger, {LoggerLevel } from '@dxatscale/sfp-logger';
+import SFPLogger, {LoggerLevel } from '@flxblio/sfp-logger';
export async function checkRetrievalStatus(conn: Connection, retrievedId: string, isToBeLoggedToConsole = true): Promise {
diff --git a/packages/sfprofiles/src/utils/fileutils.ts b/packages/sfprofiles/src/utils/fileutils.ts
index 9eac17c81..136316bd9 100644
--- a/packages/sfprofiles/src/utils/fileutils.ts
+++ b/packages/sfprofiles/src/utils/fileutils.ts
@@ -1,4 +1,4 @@
-import SFPLogger, {LoggerLevel } from '@dxatscale/sfp-logger';
+import SFPLogger, {LoggerLevel } from '@flxblio/sfp-logger';
import * as fs from 'fs-extra'
const path = require('path');
const _ = require('lodash');
diff --git a/packages/sfprofiles/src/utils/metadataOperation.ts b/packages/sfprofiles/src/utils/metadataOperation.ts
index e25c5bb89..a3c687bc3 100644
--- a/packages/sfprofiles/src/utils/metadataOperation.ts
+++ b/packages/sfprofiles/src/utils/metadataOperation.ts
@@ -1,6 +1,6 @@
import { Connection } from 'jsforce';
import { Sfpowerkit } from '@utils/sfpowerkit';
-import SFPLogger, {LoggerLevel } from '@dxatscale/sfp-logger';
+import SFPLogger, {LoggerLevel } from '@flxblio/sfp-logger';
import retry from 'async-retry';
export default class MetadataOperation {
diff --git a/packages/sfprofiles/src/utils/queryExecutor.ts b/packages/sfprofiles/src/utils/queryExecutor.ts
index 6b318c121..c97a3b62e 100644
--- a/packages/sfprofiles/src/utils/queryExecutor.ts
+++ b/packages/sfprofiles/src/utils/queryExecutor.ts
@@ -1,6 +1,6 @@
/* eslint-disable @typescript-eslint/no-unused-vars */
import { Connection } from 'jsforce';
-import SFPLogger, {LoggerLevel } from '@dxatscale/sfp-logger';
+import SFPLogger, {LoggerLevel } from '@flxblio/sfp-logger';
import retry from 'async-retry';
export default class QueryExecutor {
diff --git a/packages/sfprofiles/src/utils/searchFilesInDirectory.ts b/packages/sfprofiles/src/utils/searchFilesInDirectory.ts
index 506e0af12..4e96f7de5 100644
--- a/packages/sfprofiles/src/utils/searchFilesInDirectory.ts
+++ b/packages/sfprofiles/src/utils/searchFilesInDirectory.ts
@@ -1,4 +1,4 @@
-import SFPLogger from '@dxatscale/sfp-logger';
+import SFPLogger from '@flxblio/sfp-logger';
import * as fs from 'fs-extra';
import * as path from 'path';
diff --git a/packages/sfprofiles/src/utils/sfpowerkit.ts b/packages/sfprofiles/src/utils/sfpowerkit.ts
index 9d0b4afdd..184659e9c 100644
--- a/packages/sfprofiles/src/utils/sfpowerkit.ts
+++ b/packages/sfprofiles/src/utils/sfpowerkit.ts
@@ -3,7 +3,7 @@ import chalk from 'chalk';
import * as fs from 'fs-extra';
import SQLITEKeyValue from './sqlitekv';
import FileUtils from './fileutils';
-import SFPLogger, {LoggerLevel } from '@dxatscale/sfp-logger';
+import SFPLogger, {LoggerLevel } from '@flxblio/sfp-logger';
import NodeCache from 'node-cache';
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 4403be2d5..0d98176ba 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -39,11 +39,8 @@ importers:
specifier: ^0.4.5
version: 0.4.5
lerna:
- specifier: ^7.1.4
- version: 7.1.4
- lerna-update-wizard:
- specifier: ^1.1.0
- version: 1.1.0
+ specifier: 8.0.2
+ version: 8.0.2
prettier:
specifier: ^2.0.5
version: 2.0.5
@@ -54,22 +51,22 @@ importers:
specifier: 7.5.2
version: 7.5.2
ts-loader:
- specifier: ~9.4.2
- version: 9.4.2(typescript@5.0.2)(webpack@5.88.2)
+ specifier: ~9.5.1
+ version: 9.5.1(typescript@5.0.2)(webpack@5.88.2)
ts-node:
- specifier: ^9
- version: 9.1.1(typescript@5.0.2)
+ specifier: 10.9.2
+ version: 10.9.2(@types/node@10.0.0)(typescript@5.0.2)
typescript:
specifier: ^5
version: 5.0.2
packages/apexlink:
dependencies:
- '@dxatscale/sfdx-process-wrapper':
- specifier: ^1.0.2
+ '@flxblio/sfdx-process-wrapper':
+ specifier: ^1.0.3
version: link:../sfdx-process-wrapper
- '@dxatscale/sfp-logger':
- specifier: ^2.1.2
+ '@flxblio/sfp-logger':
+ specifier: ^2.1.3
version: link:../sfplogger
find-java-home:
specifier: 2.0.0
@@ -81,12 +78,6 @@ importers:
'@babel/core':
specifier: 7.18.2
version: 7.18.2
- '@babel/plugin-proposal-nullish-coalescing-operator':
- specifier: ^7.17.12
- version: 7.17.12(@babel/core@7.18.2)
- '@babel/plugin-proposal-optional-chaining':
- specifier: 7.17.12
- version: 7.17.12(@babel/core@7.18.2)
'@jest/globals':
specifier: ^29.6.1
version: 29.6.1
@@ -109,176 +100,16 @@ importers:
specifier: ^5
version: 5.0.2
- packages/core:
- dependencies:
- '@dxatscale/apexlink':
- specifier: ^1.0.2
- version: link:../apexlink
- '@dxatscale/sfdx-process-wrapper':
- specifier: ^1.0.2
- version: link:../sfdx-process-wrapper
- '@dxatscale/sfp-logger':
- specifier: ^2.1.2
- version: link:../sfplogger
- '@dxatscale/sfprofiles':
- specifier: ^2.0.8
- version: link:../sfprofiles
- '@newrelic/telemetry-sdk':
- specifier: ^0.6.0
- version: 0.6.0
- '@salesforce/apex-node':
- specifier: 2.1.0
- version: 2.1.0
- '@salesforce/core':
- specifier: 5.3.9
- version: 5.3.9
- '@salesforce/kit':
- specifier: 3.0.13
- version: 3.0.13
- '@salesforce/packaging':
- specifier: 2.3.3
- version: 2.3.3(@types/node@20.4.4)(typescript@5.0.2)
- '@salesforce/source-deploy-retrieve':
- specifier: 9.7.24
- version: 9.7.24
- '@salesforce/source-tracking':
- specifier: 4.2.16
- version: 4.2.16
- adm-zip:
- specifier: ^0.5.6
- version: 0.5.6
- apex-parser:
- specifier: 2.13.0
- version: 2.13.0
- async-retry:
- specifier: ^1.3.3
- version: 1.3.3
- axios:
- specifier: ^1.4.0
- version: 1.4.0
- bottleneck:
- specifier: ^2.19.5
- version: 2.19.5
- chalk:
- specifier: ^4.1.2
- version: 4.1.2
- cli-table:
- specifier: 0.3.11
- version: 0.3.11
- datadog-metrics:
- specifier: ^0.9.3
- version: 0.9.3
- fast-xml-parser:
- specifier: 4.2.7
- version: 4.2.7
- fs-extra:
- specifier: 11.1.1
- version: 11.1.1
- glob:
- specifier: ^10.3.3
- version: 10.3.3
- hot-shots:
- specifier: ^8.5.0
- version: 8.5.0
- ignore:
- specifier: ^5.1.6
- version: 5.1.6
- js-yaml:
- specifier: 4.1.0
- version: 4.1.0
- jsforce:
- specifier: ^2.0.0-beta.27
- version: 2.0.0-beta.27
- lodash:
- specifier: ^4.17.21
- version: 4.17.21
- neverthrow:
- specifier: 4.4.2
- version: 4.4.2
- rimraf:
- specifier: ^3.0.2
- version: 3.0.2
- semver:
- specifier: 7.5.2
- version: 7.5.2
- simple-git:
- specifier: 3.16.0
- version: 3.16.0
- tar:
- specifier: ^6.1.9
- version: 6.1.9
- tmp:
- specifier: ^0.2.1
- version: 0.2.1
- xml2js:
- specifier: ^0.6.0
- version: 0.6.0
- devDependencies:
- '@babel/core':
- specifier: 7.18.2
- version: 7.18.2
- '@babel/plugin-proposal-nullish-coalescing-operator':
- specifier: ^7.17.12
- version: 7.17.12(@babel/core@7.18.2)
- '@babel/plugin-proposal-optional-chaining':
- specifier: 7.17.12
- version: 7.17.12(@babel/core@7.18.2)
- '@jest/globals':
- specifier: ^29.6.1
- version: 29.6.1
- '@salesforce/ts-sinon':
- specifier: ^1.3.21
- version: 1.3.21
- '@salesforce/ts-types':
- specifier: 2.0.7
- version: 2.0.7
- '@types/adm-zip':
- specifier: ^0.5.0
- version: 0.5.0
- '@types/async-retry':
- specifier: ^1.4.2
- version: 1.4.2
- '@types/datadog-metrics':
- specifier: ^0.6.1
- version: 0.6.1
- '@types/jest':
- specifier: ^29.5.3
- version: 29.5.3
- '@types/mocha':
- specifier: 9.1.0
- version: 9.1.0
- '@types/node':
- specifier: 20.4.4
- version: 20.4.4
- '@types/splunk-logging':
- specifier: ^0.11.1
- version: 0.11.1
- '@types/tmp':
- specifier: ^0.2.3
- version: 0.2.3
- jest:
- specifier: ^29.5.3
- version: 29.6.0(@types/node@20.4.4)(ts-node@10.7.0)
- ts-jest:
- specifier: ^29.1.1
- version: 29.1.1(@babel/core@7.18.2)(jest@29.6.0)(typescript@5.0.2)
- ts-node:
- specifier: 10.7.0
- version: 10.7.0(@types/node@20.4.4)(typescript@5.0.2)
- typescript:
- specifier: ^5
- version: 5.0.2
-
packages/forcemula:
devDependencies:
jest:
specifier: ^29.6.1
- version: 29.6.1(@types/node@10.0.0)(ts-node@9.1.1)
+ version: 29.6.1(@types/node@10.0.0)(ts-node@10.9.2)
packages/sfdx-process-wrapper:
dependencies:
- '@dxatscale/sfp-logger':
- specifier: ^2.1.2
+ '@flxblio/sfp-logger':
+ specifier: ^2.1.3
version: link:../sfplogger
fs-extra:
specifier: ^9.1.0
@@ -294,39 +125,23 @@ importers:
specifier: ^5
version: 5.0.2
- packages/sfplogger:
- dependencies:
- chalk:
- specifier: ^4.1.2
- version: 4.1.2
- fs-extra:
- specifier: ^9.1.0
- version: 9.1.0
- strip-ansi:
- specifier: ^6.0.0
- version: 6.0.1
- devDependencies:
- '@types/node':
- specifier: ^14.14.7
- version: 14.14.7
- typescript:
- specifier: ^5
- version: 5.0.2
-
- packages/sfpowerscripts-cli:
+ packages/sfp-cli:
dependencies:
- '@dxatscale/sfdx-process-wrapper':
- specifier: ^1.0.2
+ '@flxblio/apexlink':
+ specifier: ^2.0.0
+ version: link:../apexlink
+ '@flxblio/sfdx-process-wrapper':
+ specifier: ^1.0.3
version: link:../sfdx-process-wrapper
- '@dxatscale/sfp-logger':
- specifier: ^2.1.2
+ '@flxblio/sfp-logger':
+ specifier: ^2.1.3
version: link:../sfplogger
- '@dxatscale/sfpowerscripts.core':
- specifier: ^36.5.3
- version: link:../core
- '@dxatscale/sfprofiles':
- specifier: ^2.0.8
+ '@flxblio/sfprofiles':
+ specifier: ^3.0.0
version: link:../sfprofiles
+ '@newrelic/telemetry-sdk':
+ specifier: ^0.6.0
+ version: 0.6.0
'@oclif/core':
specifier: 2.11.8
version: 2.11.8(@types/node@14.14.7)(typescript@5.0.2)
@@ -336,21 +151,39 @@ importers:
'@oclif/plugin-help':
specifier: 5.2.17
version: 5.2.17(@types/node@14.14.7)(typescript@5.0.2)
+ '@salesforce/apex-node':
+ specifier: 3.0.2
+ version: 3.0.2
'@salesforce/core':
- specifier: 5.3.9
- version: 5.3.9
+ specifier: 6.5.1
+ version: 6.5.1
'@salesforce/kit':
- specifier: 3.0.13
- version: 3.0.13
+ specifier: 3.0.15
+ version: 3.0.15
+ '@salesforce/packaging':
+ specifier: 3.2.5
+ version: 3.2.5
+ '@salesforce/source-deploy-retrieve':
+ specifier: 10.2.13
+ version: 10.2.13
+ '@salesforce/source-tracking':
+ specifier: 5.1.7
+ version: 5.1.7
adm-zip:
specifier: ^0.5.10
version: 0.5.10
ajv:
specifier: 8.11.0
version: 8.11.0
+ apex-parser:
+ specifier: 2.13.0
+ version: 2.13.0
async-retry:
specifier: ^1.3.1
- version: 1.3.1
+ version: 1.3.3
+ axios:
+ specifier: ^1.4.0
+ version: 1.4.0
bottleneck:
specifier: ^2.19.5
version: 2.19.5
@@ -360,9 +193,15 @@ importers:
cli-table:
specifier: 0.3.11
version: 0.3.11
+ datadog-metrics:
+ specifier: ^0.9.3
+ version: 0.9.3
dotenv:
specifier: 16.3.1
version: 16.3.1
+ fast-xml-parser:
+ specifier: 4.2.7
+ version: 4.2.7
fs-extra:
specifier: ^11.1.1
version: 11.1.1
@@ -372,9 +211,15 @@ importers:
handlebars:
specifier: ^4.7.7
version: 4.7.7
+ hot-shots:
+ specifier: ^8.5.0
+ version: 8.5.0
+ ignore:
+ specifier: ^5.1.6
+ version: 5.2.4
js-yaml:
specifier: ^4.0.0
- version: 4.0.0
+ version: 4.1.0
jsforce:
specifier: 2.0.0-beta.27
version: 2.0.0-beta.27
@@ -408,6 +253,15 @@ importers:
simple-git:
specifier: 3.19.1
version: 3.19.1
+ tar:
+ specifier: ^6.1.9
+ version: 6.1.15
+ tmp:
+ specifier: ^0.2.1
+ version: 0.2.1
+ xml2js:
+ specifier: ^0.6.0
+ version: 0.6.0
devDependencies:
'@babel/core':
specifier: 7.18.2
@@ -439,6 +293,9 @@ importers:
'@types/adm-zip':
specifier: ^0.4.33
version: 0.4.33
+ '@types/fs-extra':
+ specifier: 11.0.4
+ version: 11.0.4
'@types/jest':
specifier: ^29.5.3
version: 29.5.3
@@ -464,17 +321,36 @@ importers:
specifier: ^5
version: 5.0.2
+ packages/sfplogger:
+ dependencies:
+ chalk:
+ specifier: ^4.1.2
+ version: 4.1.2
+ fs-extra:
+ specifier: ^9.1.0
+ version: 9.1.0
+ strip-ansi:
+ specifier: ^6.0.0
+ version: 6.0.1
+ devDependencies:
+ '@types/node':
+ specifier: ^14.14.7
+ version: 14.14.7
+ typescript:
+ specifier: ^5
+ version: 5.0.2
+
packages/sfprofiles:
dependencies:
- '@dxatscale/sfp-logger':
- specifier: ^2.1.2
+ '@flxblio/sfp-logger':
+ specifier: ^2.1.3
version: link:../sfplogger
'@salesforce/core':
- specifier: 5.3.9
- version: 5.3.9
+ specifier: 6.5.1
+ version: 6.5.1
'@salesforce/source-deploy-retrieve':
- specifier: 9.7.24
- version: 9.7.24
+ specifier: 10.2.13
+ version: 10.2.13
async-retry:
specifier: ^1.3.3
version: 1.3.3
@@ -497,8 +373,8 @@ importers:
specifier: ^5.1.8
version: 5.2.4
jsforce:
- specifier: ^2.0.0-beta.27
- version: 2.0.0-beta.27
+ specifier: ^2.0.0-beta.29
+ version: 2.0.0-beta.29
node-cache:
specifier: ^5.1.2
version: 5.1.2
@@ -854,6 +730,7 @@ packages:
integrity: sha512-7wigcOs/Z4YWlK7xxjkvaIw84vGhDv/P1dFGQap0nHkc8gFKY/r+hXc8Qzf5k1gY7CvGIcHqAnOagVKJJ1wVOQ==,
}
engines: { node: '>=6.9.0' }
+ deprecated: This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-optional-chaining instead.
peerDependencies:
'@babel/core': ^7.0.0-0
dependencies:
@@ -1517,6 +1394,51 @@ packages:
- ts-node
dev: true
+ /@jest/core@29.6.1(ts-node@10.9.2):
+ resolution:
+ {
+ integrity: sha512-CcowHypRSm5oYQ1obz1wfvkjZZ2qoQlrKKvlfPwh5jUXVU12TWr2qMeH8chLMuTFzHh5a1g2yaqlqDICbr+ukQ==,
+ }
+ engines: { node: ^14.15.0 || ^16.10.0 || >=18.0.0 }
+ peerDependencies:
+ node-notifier: ^8.0.1 || ^9.0.0 || ^10.0.0
+ peerDependenciesMeta:
+ node-notifier:
+ optional: true
+ dependencies:
+ '@jest/console': 29.6.1
+ '@jest/reporters': 29.6.1
+ '@jest/test-result': 29.6.1
+ '@jest/transform': 29.6.1
+ '@jest/types': 29.6.1
+ '@types/node': 14.14.7
+ ansi-escapes: 4.3.2
+ chalk: 4.1.2
+ ci-info: 3.8.0
+ exit: 0.1.2
+ graceful-fs: 4.2.11
+ jest-changed-files: 29.5.0
+ jest-config: 29.6.1(@types/node@14.14.7)(ts-node@10.9.2)
+ jest-haste-map: 29.6.1
+ jest-message-util: 29.6.1
+ jest-regex-util: 29.4.3
+ jest-resolve: 29.6.1
+ jest-resolve-dependencies: 29.6.1
+ jest-runner: 29.6.1
+ jest-runtime: 29.6.1
+ jest-snapshot: 29.6.1
+ jest-util: 29.6.1
+ jest-validate: 29.6.1
+ jest-watcher: 29.6.1
+ micromatch: 4.0.5
+ pretty-format: 29.6.1
+ slash: 3.0.0
+ strip-ansi: 6.0.1
+ transitivePeerDependencies:
+ - supports-color
+ - ts-node
+ dev: true
+
/@jest/core@29.6.1(ts-node@9.1.1):
resolution:
{
@@ -1654,9 +1576,9 @@ packages:
graceful-fs: 4.2.11
istanbul-lib-coverage: 3.2.0
istanbul-lib-instrument: 5.2.1
- istanbul-lib-report: 3.0.0
+ istanbul-lib-report: 3.0.1
istanbul-lib-source-maps: 4.0.1
- istanbul-reports: 3.1.5
+ istanbul-reports: 3.1.6
jest-message-util: 29.6.1
jest-util: 29.6.1
jest-worker: 29.6.1
@@ -1852,40 +1774,83 @@ packages:
}
dev: false
- /@lerna/child-process@7.1.4:
- resolution:
- {
- integrity: sha512-cSiMDx9oI9vvVT+V/WHcbqrksNoc9PIPFiks1lPS7zrVWkEbgA6REQyYmRd2H71kihzqhX5TJ20f2dWv6oEPdA==,
- }
- engines: { node: ^14.17.0 || >=16.0.0 }
- dependencies:
- chalk: 4.1.2
- execa: 5.1.1
- strong-log-transformer: 2.1.0
- dev: true
-
- /@lerna/create@7.1.4:
+ /@lerna/create@8.0.2:
resolution:
{
- integrity: sha512-D5YWXsXIxWb1aGqcbtttczg86zMzkNhcs00/BleFNxdNYlTRdjLIReELOGBGrq3Hij05UN+7Dv9EKnPFJVbqAw==,
+ integrity: sha512-AueSlfiYXqEmy9/EIc17mjlaHFuv734dfgVBegyoefIA7hdeoExtsXnACWf8Tw5af6gwyTL3KAp6QQyc1sTuZQ==,
}
- engines: { node: ^14.17.0 || >=16.0.0 }
+ engines: { node: '>=18.0.0' }
dependencies:
- '@lerna/child-process': 7.1.4
+ '@npmcli/run-script': 7.0.2
+ '@nx/devkit': 17.3.0(nx@17.3.0)
+ '@octokit/plugin-enterprise-rest': 6.0.1
+ '@octokit/rest': 19.0.11
+ byte-size: 8.1.1
+ chalk: 4.1.0
+ clone-deep: 4.0.1
+ cmd-shim: 6.0.1
+ columnify: 1.6.0
+ conventional-changelog-core: 5.0.1
+ conventional-recommended-bump: 7.0.1
+ cosmiconfig: 8.2.0
dedent: 0.7.0
+ execa: 5.0.0
fs-extra: 11.1.1
+ get-stream: 6.0.0
+ git-url-parse: 13.1.0
+ glob-parent: 5.1.2
+ globby: 11.1.0
+ graceful-fs: 4.2.11
+ has-unicode: 2.0.1
+ ini: 1.3.8
init-package-json: 5.0.0
+ inquirer: 8.2.5
+ is-ci: 3.0.1
+ is-stream: 2.0.0
+ js-yaml: 4.1.0
+ libnpmpublish: 7.3.0
+ load-json-file: 6.2.0
+ lodash: 4.17.21
+ make-dir: 4.0.0
+ minimatch: 3.0.5
+ multimatch: 5.0.0
+ node-fetch: 2.6.7
npm-package-arg: 8.1.1
+ npm-packlist: 5.1.1
+ npm-registry-fetch: 14.0.5
+ npmlog: 6.0.2
+ nx: 17.3.0
+ p-map: 4.0.0
+ p-map-series: 2.1.0
+ p-queue: 6.6.2
p-reduce: 2.1.0
- pacote: 15.2.0
+ pacote: 17.0.6
pify: 5.0.0
+ read-cmd-shim: 4.0.0
+ read-package-json: 6.0.4
+ resolve-from: 5.0.0
+ rimraf: 4.4.1
semver: 7.5.2
+ signal-exit: 3.0.7
slash: 3.0.0
+ ssri: 9.0.1
+ strong-log-transformer: 2.1.0
+ tar: 6.1.11
+ temp-dir: 1.0.0
+ upath: 2.0.1
+ uuid: 9.0.0
validate-npm-package-license: 3.0.4
validate-npm-package-name: 5.0.0
- yargs-parser: 20.2.4
+ write-file-atomic: 5.0.1
+ write-pkg: 4.0.0
+ yargs: 17.7.2
+ yargs-parser: 21.1.1
transitivePeerDependencies:
+ - '@swc-node/register'
+ - '@swc/core'
- bluebird
+ - debug
+ - encoding
- supports-color
dev: true
@@ -1923,6 +1888,22 @@ packages:
'@nodelib/fs.scandir': 2.1.5
fastq: 1.15.0
+ /@npmcli/agent@2.2.0:
+ resolution:
+ {
+ integrity: sha512-2yThA1Es98orMkpSLVqlDZAMPK3jHJhifP2gnNUdk1754uZ8yI5c+ulCoVG+WlntQA6MzhrURMXjSd9Z7dJ2/Q==,
+ }
+ engines: { node: ^16.14.0 || >=18.0.0 }
+ dependencies:
+ agent-base: 7.1.0
+ http-proxy-agent: 7.0.0
+ https-proxy-agent: 7.0.2
+ lru-cache: 10.2.0
+ socks-proxy-agent: 8.0.2
+ transitivePeerDependencies:
+ - supports-color
+ dev: true
+
/@npmcli/arborist@4.3.1:
resolution:
{
@@ -2036,6 +2017,25 @@ packages:
- bluebird
dev: true
+ /@npmcli/git@5.0.4:
+ resolution:
+ {
+ integrity: sha512-nr6/WezNzuYUppzXRaYu/W4aT5rLxdXqEFupbh6e/ovlYFQ8hpu1UUPV3Ir/YTl+74iXl2ZOMlGzudh9ZPUchQ==,
+ }
+ engines: { node: ^16.14.0 || >=18.0.0 }
+ dependencies:
+ '@npmcli/promise-spawn': 7.0.1
+ lru-cache: 10.2.0
+ npm-pick-manifest: 9.0.0
+ proc-log: 3.0.0
+ promise-inflight: 1.0.1
+ promise-retry: 2.0.1
+ semver: 7.5.2
+ which: 4.0.0
+ transitivePeerDependencies:
+ - bluebird
+ dev: true
+
/@npmcli/installed-package-contents@1.0.7:
resolution:
{
@@ -2163,6 +2163,16 @@ packages:
which: 3.0.1
dev: true
+ /@npmcli/promise-spawn@7.0.1:
+ resolution:
+ {
+ integrity: sha512-P4KkF9jX3y+7yFUxgcUdDtLy+t4OlDGuEBLNs57AZsfSfg+uV6MLndqGpnl4831ggaEdXwR50XFoZP4VFtHolg==,
+ }
+ engines: { node: ^16.14.0 || >=18.0.0 }
+ dependencies:
+ which: 4.0.0
+ dev: true
+
/@npmcli/run-script@2.0.0:
resolution:
{
@@ -2194,52 +2204,71 @@ packages:
- supports-color
dev: true
- /@nrwl/devkit@16.5.5(nx@16.5.5):
+ /@npmcli/run-script@7.0.2:
+ resolution:
+ {
+ integrity: sha512-Omu0rpA8WXvcGeY6DDzyRoY1i5DkCBkzyJ+m2u7PD6quzb0TvSqdIPOkTn8ZBOj7LbbcbMfZ3c5skwSu6m8y2w==,
+ }
+ engines: { node: ^16.14.0 || >=18.0.0 }
+ dependencies:
+ '@npmcli/node-gyp': 3.0.0
+ '@npmcli/promise-spawn': 7.0.1
+ node-gyp: 10.0.1
+ read-package-json-fast: 3.0.2
+ which: 4.0.0
+ transitivePeerDependencies:
+ - supports-color
+ dev: true
+
+ /@nrwl/devkit@17.3.0(nx@17.3.0):
resolution:
{
- integrity: sha512-4ho9Vfg1YzRYZ4SMygYI9Yz1avpujd81gy/Um2Z0q8Q7Twp6Q/uG1KY9Hb7EzVXgrRcgGWdIPXuw41DpmnfWug==,
+ integrity: sha512-3QUCvRisp0Iwwl7VEFQPQUU7wpqGEv9kJBNBtgmhe68ydusdNPk+d0npwkvH23BYPuswTI2MUJyLkdeiB58Ovw==,
}
dependencies:
- '@nx/devkit': 16.5.5(nx@16.5.5)
+ '@nx/devkit': 17.3.0(nx@17.3.0)
transitivePeerDependencies:
- nx
dev: true
- /@nrwl/tao@16.5.5:
+ /@nrwl/tao@17.3.0:
resolution:
{
- integrity: sha512-6SYG3rlKkYvy/wauPwoUXQuN0PTJi95hCEC7lGfCEGye2Y/61UwJQf2xixMxafUM2X84WdEStEz3Jty85gVqkQ==,
+ integrity: sha512-Bhz+MvAk8CjQtclpEOagGiKzgoziwe+35SlHtvFqzZClAuB8BAx+3ZDNJZcEpDRNfodKqodMUy2OEf6pbzw/LA==,
}
hasBin: true
dependencies:
- nx: 16.5.5
+ nx: 17.3.0
+ tslib: 2.6.2
transitivePeerDependencies:
- '@swc-node/register'
- '@swc/core'
- debug
dev: true
- /@nx/devkit@16.5.5(nx@16.5.5):
+ /@nx/devkit@17.3.0(nx@17.3.0):
resolution:
{
- integrity: sha512-9YaQ3s5VMgTXo5cEuaVc2b6btZU2REmHsgn/V4Gi3nSmwBHvIn86gtlh4BoBFinHpqge1chG/dC+B7yoXioQmQ==,
+ integrity: sha512-KPUkEwkGYrg5hDqqXc7sdv4PNXHyWtGwzkBZA3p/RjPieKcQSsTcUwTxQ+taOE4v877n0HuC7hcuLueLSbYGiQ==,
}
peerDependencies:
- nx: '>= 15 <= 17'
+ nx: '>= 16 <= 18'
dependencies:
- '@nrwl/devkit': 16.5.5(nx@16.5.5)
+ '@nrwl/devkit': 17.3.0(nx@17.3.0)
ejs: 3.1.9
- ignore: 5.2.4
- nx: 16.5.5
+ enquirer: 2.3.6
+ ignore: 5.3.0
+ nx: 17.3.0
semver: 7.5.3
tmp: 0.2.1
tslib: 2.6.2
+ yargs-parser: 21.1.1
dev: true
- /@nx/nx-darwin-arm64@16.5.5:
+ /@nx/nx-darwin-arm64@17.3.0:
resolution:
{
- integrity: sha512-Zzwy7pkSDFTiWcBk78qDe4VzygO9kemtz/kbbLvpisZkUlZX9nIQnLHT80Ms++iqA0enIQAwdTcJiaIHLVd5JQ==,
+ integrity: sha512-NDR/HjahhNLx9Q4TjR5/W3IedSkdtK+kUZ09EceVeX33HNdeLjkFA26QtVVmGbhnogLcywAX0KELn7oGv2nO+A==,
}
engines: { node: '>= 10' }
cpu: [arm64]
@@ -2248,10 +2277,10 @@ packages:
dev: true
optional: true
- /@nx/nx-darwin-x64@16.5.5:
+ /@nx/nx-darwin-x64@17.3.0:
resolution:
{
- integrity: sha512-d5O8BD5HFI2hJnMgVVV1pl2A+hlUmn4GxCZTmx2Tr329TYGdpvyXm8NnDFEAigZ77QVMHwFN6vqS07HARu+uVA==,
+ integrity: sha512-3qxOZnHTPTUXAH8WGCtllAXE2jodStDNSkGVeEcDuIK4NO5tFfF4oVCLKKYcnqKsJOVNTS9B/aJG2bVGbaWYVQ==,
}
engines: { node: '>= 10' }
cpu: [x64]
@@ -2260,10 +2289,10 @@ packages:
dev: true
optional: true
- /@nx/nx-freebsd-x64@16.5.5:
+ /@nx/nx-freebsd-x64@17.3.0:
resolution:
{
- integrity: sha512-SqTvbz21iUc8DHKgisX9pPuXc7/DngbiZxInlEHPXi8zUtyUOqZI3yQk4NVj3dqLBMLwEOZDgvXs0XxzB5nn+g==,
+ integrity: sha512-kVGK/wSbRRWqL3sAXlR5diI29kDisutUMaxs5dWxzRzY0U/+Kwon6ayLU1/HGwEykXFhCJE7r9vSqCrnn67dzg==,
}
engines: { node: '>= 10' }
cpu: [x64]
@@ -2272,10 +2301,10 @@ packages:
dev: true
optional: true
- /@nx/nx-linux-arm-gnueabihf@16.5.5:
+ /@nx/nx-linux-arm-gnueabihf@17.3.0:
resolution:
{
- integrity: sha512-8C2KVFHqcyGViEgUicYo1frEgQARbD+CicIos6A5WRYLaxS+upb9FDblKU0eGYIwDp8oCagVjUjNX8d1WHLX7w==,
+ integrity: sha512-nb+jsh7zDkXjHEaAM5qmJR0X0wQ1yPbAYJuZSf8oZkllVYXcAofiAf21EqgKHq7vr4sZiCmlDaT16DheM3jyVA==,
}
engines: { node: '>= 10' }
cpu: [arm]
@@ -2284,10 +2313,10 @@ packages:
dev: true
optional: true
- /@nx/nx-linux-arm64-gnu@16.5.5:
+ /@nx/nx-linux-arm64-gnu@17.3.0:
resolution:
{
- integrity: sha512-AGq4wp3Wn8bE0h2c7/bHj2wQWfp08DYJemwTNLkwLcoJWkUidLOBQePRvLxqPeo42Zmt3GYMi+fi5XtKCmvcjg==,
+ integrity: sha512-9LkGk2paZn5Ehg/rya8GCISr+CgMz3MZ5PTOO/yEGk6cv6kQSmhZdjUi3wMOQidIqpolRK0MrhSL9DUz8Htl4A==,
}
engines: { node: '>= 10' }
cpu: [arm64]
@@ -2296,10 +2325,10 @@ packages:
dev: true
optional: true
- /@nx/nx-linux-arm64-musl@16.5.5:
+ /@nx/nx-linux-arm64-musl@17.3.0:
resolution:
{
- integrity: sha512-xPTYjDCPnXLPXZThAzugiithZaIHk42rTxussMZA00Cx0iEkh5zohqtC0vGBnaAPNcMv0uyCiWABhL4RRUVp2w==,
+ integrity: sha512-bMykIGtziR90xLOCdzVDzaLgMXDvCf2Y7KpAj/EqJXpC0j9RmQdkm7VyO3//xN6rpcWjMcn1wgHQ1rPV65vETg==,
}
engines: { node: '>= 10' }
cpu: [arm64]
@@ -2308,10 +2337,10 @@ packages:
dev: true
optional: true
- /@nx/nx-linux-x64-gnu@16.5.5:
+ /@nx/nx-linux-x64-gnu@17.3.0:
resolution:
{
- integrity: sha512-Rq55OWD4SObfo4sWpjvaijWg33dm+cOf8e2cO06t2EmLMdOyyVnpNdtpjXh6A9tSi3EU5xPfYiy3I9O6gWOnuw==,
+ integrity: sha512-Y3KbMhVcgvVvplyVlWzHaSKqGKqWLPTcuXnnNzuWSqLC9q+UdaDE/6+7SryHbJABM2juMHbo9JNp5LlKp3bkEg==,
}
engines: { node: '>= 10' }
cpu: [x64]
@@ -2320,10 +2349,10 @@ packages:
dev: true
optional: true
- /@nx/nx-linux-x64-musl@16.5.5:
+ /@nx/nx-linux-x64-musl@17.3.0:
resolution:
{
- integrity: sha512-fnkSPv+VIKmQQOEQxFrGx5DlkHGxeH9Fzme6jwuDwmsvs+8Vv/uUnfcxkDZfJxKK+p27w37q3PQCfZGrFXE1cw==,
+ integrity: sha512-QvAIZPqvrqI+s2Ddpkb0TE4yRJgXAlL8I+rIA8U+6y266rT5sVJZFPUWubkFWe/PSmqv3l4KqPcsvHTiIzldFA==,
}
engines: { node: '>= 10' }
cpu: [x64]
@@ -2332,10 +2361,10 @@ packages:
dev: true
optional: true
- /@nx/nx-win32-arm64-msvc@16.5.5:
+ /@nx/nx-win32-arm64-msvc@17.3.0:
resolution:
{
- integrity: sha512-9nWm+d+tlbxFMLvTLJqIfpTLDuSVDXfSBCSBampyeoI1mUALvq/6CVvWVBDlNqjmrZsYm0sudNqI4Ss7w3BUCQ==,
+ integrity: sha512-uoG3g0eZ9lYWZi4CpEVd04fIs+4lqpmU/FAaB3/K+Tfj9daSEIB6j57EX81ECDRB16k74VUdcI32qLAtD8KIMw==,
}
engines: { node: '>= 10' }
cpu: [arm64]
@@ -2344,10 +2373,10 @@ packages:
dev: true
optional: true
- /@nx/nx-win32-x64-msvc@16.5.5:
+ /@nx/nx-win32-x64-msvc@17.3.0:
resolution:
{
- integrity: sha512-fB8miPr887GIGBDhyT6VX7MWX5aC40izEi+4GGSk38oh5dOUK9TLwjAEW/3vBE01fj5Hjcy0CPN7RA45fh/WUw==,
+ integrity: sha512-ekoejj7ZXMSNYrgQwd/7thCNTHbDRggsqPw5LlTa/jPonsQ4TAPzmLBJUF8hCKn43xXLXaFufK4V1OMxlP1Hfg==,
}
engines: { node: '>= 10' }
cpu: [x64]
@@ -2362,6 +2391,7 @@ packages:
integrity: sha512-ntc/fZwuf4NRfYbXVoUNFyMB9IxVx/ls/WbSLKbkD9UpsmwY1I3J4DJKKRFRpenmTuxGQW8Lyzm7X3vhzHpDQA==,
}
engines: { node: '>=12.0.0' }
+ deprecated: Package no longer supported. Contact Support at https://www.npmjs.com/support for more info.
dependencies:
ansi-styles: 4.3.0
chalk: 4.1.2
@@ -2376,6 +2406,7 @@ packages:
integrity: sha512-x1evrqQ2bAEuoqkveOCYgIqkj43SntoM02C45gfYNrdvrX8nsne+uzzXzwKcJ0p94qnQRX7PmyxOaRDF7f77xw==,
}
engines: { node: '>=12.0.0' }
+ deprecated: Package no longer supported. Contact Support at https://www.npmjs.com/support for more info.
peerDependencies:
'@oclif/config': ^1
dependencies:
@@ -2395,6 +2426,7 @@ packages:
integrity: sha512-cLT/deFDm6A69LjAfV5ZZMMvMDlPt7sjMHYBrsOgQ5Upq5kDMgbaZM3hEbw74DmYIsuhq2E2wYrPD+Ax2qAfkA==,
}
engines: { node: '>=8.0.0' }
+ deprecated: Package no longer supported. Contact Support at https://www.npmjs.com/support for more info.
dependencies:
'@oclif/errors': 1.3.6
'@oclif/parser': 3.8.15
@@ -2496,23 +2528,23 @@ packages:
- '@types/node'
- typescript
- /@oclif/core@2.11.8(@types/node@20.4.4)(typescript@5.0.2):
+ /@oclif/core@3.18.1:
resolution:
{
- integrity: sha512-GILmztcHBzze45GvxRpUvqQI5nM26kSE/Q21Y+6DtMR+C8etM/hFW26D3uqIAbGlGtg5QEZZ6pjA/Fqgz+gl3A==,
+ integrity: sha512-l0LsjzGcqjbUEdeSBX6bdZieVmEv82Q0W3StiyaDMEnPZ9KLH28HrLpcZg6d50mCYW9CUZNzmRo6qrCHWrgLKw==,
}
- engines: { node: '>=14.0.0' }
+ engines: { node: '>=18.0.0' }
dependencies:
- '@types/cli-progress': 3.11.0
+ '@types/cli-progress': 3.11.5
ansi-escapes: 4.3.2
ansi-styles: 4.3.0
cardinal: 2.1.1
chalk: 4.1.2
clean-stack: 3.0.1
cli-progress: 3.12.0
+ color: 4.2.3
debug: 4.3.4(supports-color@8.1.1)
ejs: 3.1.9
- fs-extra: 9.1.0
get-package-type: 0.1.0
globby: 11.1.0
hyperlinker: 1.0.0
@@ -2521,23 +2553,15 @@ packages:
js-yaml: 3.14.1
natural-orderby: 2.0.3
object-treeify: 1.1.33
- password-prompt: 1.1.2
- semver: 7.5.4
+ password-prompt: 1.1.3
slice-ansi: 4.0.0
string-width: 4.2.3
strip-ansi: 6.0.1
supports-color: 8.1.1
supports-hyperlinks: 2.3.0
- ts-node: 10.9.1(@types/node@20.4.4)(typescript@5.0.2)
- tslib: 2.6.2
widest-line: 3.1.0
wordwrap: 1.0.0
wrap-ansi: 7.0.0
- transitivePeerDependencies:
- - '@swc/core'
- - '@swc/wasm'
- - '@types/node'
- - typescript
dev: false
/@oclif/core@3.3.2:
@@ -2580,6 +2604,7 @@ packages:
integrity: sha512-fYaU4aDceETd89KXP+3cLyg9EHZsLD3RxF2IU9yxahhBpspWjkWi3Dy3bTgcwZ3V47BgxQaGapzJWDM33XIVDQ==,
}
engines: { node: '>=8.0.0' }
+ deprecated: Package no longer supported. Contact Support at https://www.npmjs.com/support for more info.
dependencies:
clean-stack: 3.0.1
fs-extra: 8.1.0
@@ -2594,6 +2619,7 @@ packages:
integrity: sha512-/DWgI7umEG3mmTKweKlCJ2a4iS3QIdVYXUltmpFvgfZ6YHPy1DrLRN/l8j9yqawPlPMPn8DfCbINJ9atZ+4Kcw==,
}
engines: { node: '>=8.0.0' }
+ deprecated: Package no longer supported. Contact Support at https://www.npmjs.com/support for more info.
dependencies:
'@oclif/config': 1.18.14(supports-color@8.1.1)
'@oclif/errors': 1.3.6
@@ -2621,6 +2647,7 @@ packages:
integrity: sha512-M7ljUexkyJkR2efqG+PL31fAWyWDW1dczaMKoY+sOVqk78sm23iDMOJj/1vkfUrhO+W8dhseoPFnpSB6Hewfyw==,
}
engines: { node: '>=8.0.0' }
+ deprecated: Package no longer supported. Contact Support at https://www.npmjs.com/support for more info.
dependencies:
'@oclif/errors': 1.3.6
'@oclif/linewrap': 1.0.0
@@ -2641,7 +2668,7 @@ packages:
semver: 7.5.2
sinon: 11.1.2
ts-json-schema-generator: 0.93.0
- tslib: 2.6.1
+ tslib: 2.1.0
transitivePeerDependencies:
- '@oclif/config'
- supports-color
@@ -3051,18 +3078,6 @@ packages:
'@octokit/openapi-types': 18.0.0
dev: true
- /@parcel/watcher@2.0.4:
- resolution:
- {
- integrity: sha512-cTDi+FUDBIUOBKEtj+nhiJ71AZVlkAsQFuGQTun5tV9mwQBQgZvhCzG+URPQc8myeN32yRVZEfVAPCs1RW+Jvg==,
- }
- engines: { node: '>= 10.0.0' }
- requiresBuild: true
- dependencies:
- node-addon-api: 3.2.1
- node-gyp-build: 4.6.0
- dev: true
-
/@pkgjs/parseargs@0.11.0:
resolution:
{
@@ -3072,47 +3087,49 @@ packages:
requiresBuild: true
optional: true
- /@salesforce/apex-node@2.1.0:
+ /@salesforce/apex-node@3.0.2:
resolution:
{
- integrity: sha512-W7OcqcBNHhf2wQMiPWOx/MED7ao1ZlML4vX5+A6hMDZTCZ5g34rj5wwVUQFOOAxHnS5F8jQUU5VpxpKo01jrTQ==,
+ integrity: sha512-lHa7XnQCivuwTtO0RBTqw+nZ4Qm4ymodqpNJwefFLk6KBEva9sMV9Ksj2x6kBGGbLyO6ZiJiUMSAN6Gcny60zg==,
}
- engines: { node: '>=16.13.0' }
+ engines: { node: '>=18.18.2' }
dependencies:
- '@salesforce/core': 5.3.9
- '@types/istanbul-reports': 3.0.1
+ '@salesforce/core': 6.5.1
+ '@salesforce/kit': 3.0.15
+ '@types/istanbul-reports': 3.0.4
faye: 1.4.0
- glob: 8.1.0
- istanbul-lib-coverage: 3.2.0
+ glob: 10.3.10
+ istanbul-lib-coverage: 3.2.2
istanbul-lib-report: 3.0.1
istanbul-reports: 3.1.6
+ jsforce: 2.0.0-beta.29
transitivePeerDependencies:
- encoding
- supports-color
dev: false
- /@salesforce/core@5.3.9:
+ /@salesforce/core@6.5.1:
resolution:
{
- integrity: sha512-/HX0PiXq3Sjc5eVJ0EaYetcDGsKU9O9Nj8jFGw5qYlITx8zogfxc0j07liH67tQXS1KbTysYoj/MQ2zbHSNkPA==,
+ integrity: sha512-u/R82JGdbJCMY0EN3UY5hQUxn0gPN+ParNQIm9YPB9lDpBQv82nKeZJuH6j2LsaaF6ygY3bm79kftPxpdKbggQ==,
}
- engines: { node: '>=16.0.0' }
+ engines: { node: '>=18.0.0' }
dependencies:
- '@salesforce/kit': 3.0.13
- '@salesforce/schemas': 1.6.0
- '@salesforce/ts-types': 2.0.8
- '@types/semver': 7.5.3
+ '@salesforce/kit': 3.0.15
+ '@salesforce/schemas': 1.6.1
+ '@salesforce/ts-types': 2.0.9
+ '@types/semver': 7.5.6
ajv: 8.12.0
change-case: 4.1.2
faye: 1.4.0
form-data: 4.0.0
js2xmlparser: 4.0.2
- jsforce: 2.0.0-beta.27
+ jsforce: 2.0.0-beta.29
jsonwebtoken: 9.0.2
jszip: 3.10.1
- pino: 8.16.0
+ pino: 8.17.2
pino-abstract-transport: 1.1.0
- pino-pretty: 10.2.3
+ pino-pretty: 10.3.1
proper-lockfile: 4.1.2
semver: 7.5.4
ts-retry-promise: 0.7.1
@@ -3128,92 +3145,89 @@ packages:
}
dev: true
- /@salesforce/kit@3.0.13:
+ /@salesforce/kit@3.0.15:
resolution:
{
- integrity: sha512-HLQ5L5bBi0tsMeH5ZHJAhHUpvNUNPQoNJt2O82Jf6C60GGsrlzwzQ5ONAHGNBgKSZ7HLr0UGL5xaA+hE9uOcgw==,
+ integrity: sha512-XkA8jsuLvVnyP460dAbU3pBFP2IkmmmsVxMQVifcKKbNWaIBbZBzAfj+vdaQfnvZyflLhsrFT3q2xkb0vHouPg==,
}
dependencies:
- '@salesforce/ts-types': 2.0.8
+ '@salesforce/ts-types': 2.0.9
tslib: 2.6.2
dev: false
- /@salesforce/packaging@2.3.3(@types/node@20.4.4)(typescript@5.0.2):
+ /@salesforce/packaging@3.2.5:
resolution:
{
- integrity: sha512-gGxN4FA5mX85B6960sUOrUz9KYAC7Iw5GXPYV/0YoBSU4M42I0V4pgWcOQOiRwW8gbe8wpSKB/Ccv6NSjNCuBQ==,
+ integrity: sha512-vEydpa7gjr8vn35MezRPxoJE3b7f/fzIU9uBwgONf8THCJ7PMhj9PPfWOXfNp+/7qorqmYIVCJxMFWpJrMStlQ==,
}
- engines: { node: '>=16.0.0' }
+ engines: { node: '>=18.0.0' }
dependencies:
- '@oclif/core': 2.11.8(@types/node@20.4.4)(typescript@5.0.2)
- '@salesforce/core': 5.3.9
- '@salesforce/kit': 3.0.13
- '@salesforce/schemas': 1.6.0
- '@salesforce/source-deploy-retrieve': 9.7.24
- '@salesforce/ts-types': 2.0.7
- fast-xml-parser: 4.2.7
+ '@oclif/core': 3.3.2
+ '@salesforce/core': 6.5.1
+ '@salesforce/kit': 3.0.15
+ '@salesforce/schemas': 1.6.1
+ '@salesforce/source-deploy-retrieve': 10.2.13
+ '@salesforce/ts-types': 2.0.9
+ fast-xml-parser: 4.3.3
globby: 11.1.0
graphology: 0.25.4(graphology-types@0.24.7)
graphology-traversal: 0.3.1(graphology-types@0.24.7)
graphology-types: 0.24.7
- jsforce: 2.0.0-beta.27
+ jsforce: 2.0.0-beta.29
jszip: 3.10.1
transitivePeerDependencies:
- - '@swc/core'
- - '@swc/wasm'
- - '@types/node'
- encoding
- supports-color
- - typescript
dev: false
- /@salesforce/schemas@1.6.0:
+ /@salesforce/schemas@1.6.1:
resolution:
{
- integrity: sha512-SwhDTLucj/GRbPpxlEoDZeqlX22o+G6fiebTXTu1cZKmd1oE0W2L7SlTTgJnWck8bhTeBIgQi9cpD8c2t5ISKA==,
+ integrity: sha512-eVy947ZMxCJReKJdgfddUIsBIbPTa/i8RwQGwxq4/ss38H5sLOAeSTaun9V7HpJ1hkpDznWKfgzYvjsst9K6ig==,
}
dev: false
- /@salesforce/source-deploy-retrieve@9.7.24:
+ /@salesforce/source-deploy-retrieve@10.2.13:
resolution:
{
- integrity: sha512-nkP9KgzuCoV6LtdDxgxt7KRnoQ6ZS12DJgXErCBXm7Swmr0dnbo1LhxrH05C4UFFe0JuvSta+u+Oor8jxSGaCQ==,
+ integrity: sha512-KreSALl+mr+Yd7AoG+e6CjtD0/2FT4IS6Zvs4R0bbK/blixONycwl+zGaLia2b0X2pvitUOszMouW6aM0SAgvQ==,
}
- engines: { node: '>=16.0.0' }
+ engines: { node: '>=18.0.0' }
dependencies:
- '@salesforce/core': 5.3.9
- '@salesforce/kit': 3.0.13
- '@salesforce/ts-types': 2.0.7
+ '@salesforce/core': 6.5.1
+ '@salesforce/kit': 3.0.15
+ '@salesforce/ts-types': 2.0.9
fast-levenshtein: 3.0.0
- fast-xml-parser: 4.3.2
+ fast-xml-parser: 4.3.3
got: 11.8.6
graceful-fs: 4.2.11
- ignore: 5.2.4
+ ignore: 5.3.0
jszip: 3.10.1
mime: 2.6.0
minimatch: 5.1.6
proxy-agent: 6.3.1
- unzipper: 0.10.14
+ ts-retry-promise: 0.7.1
transitivePeerDependencies:
- encoding
- supports-color
dev: false
- /@salesforce/source-tracking@4.2.16:
+ /@salesforce/source-tracking@5.1.7:
resolution:
{
- integrity: sha512-HAuLaY+RrdKvWjx9FVYMrYlIUW4JyQtF/TA5hbDpy4Rw8IUOgrYyt+IaoiAAtMyRqU8En8fJBUqiq4qFvhdpCA==,
+ integrity: sha512-kkXWt4X+wxmYsLqG1OIWKgo3aFEg1f+1X6MBIHIrmjEmfMXIRiGX0dRyY+IjFl54w+CnOffNDQNsGSmnPImEYg==,
}
- engines: { node: '>=16.0.0' }
+ engines: { node: '>=18.0.0' }
dependencies:
- '@salesforce/core': 5.3.9
- '@salesforce/kit': 3.0.13
- '@salesforce/source-deploy-retrieve': 9.7.24
- '@salesforce/ts-types': 2.0.8
+ '@oclif/core': 3.18.1
+ '@salesforce/core': 6.5.1
+ '@salesforce/kit': 3.0.15
+ '@salesforce/source-deploy-retrieve': 10.2.13
+ '@salesforce/ts-types': 2.0.9
fast-xml-parser: 4.2.7
graceful-fs: 4.2.11
isomorphic-git: 1.23.0
- ts-retry-promise: 0.7.1
+ ts-retry-promise: 0.8.0
transitivePeerDependencies:
- encoding
- supports-color
@@ -3227,7 +3241,7 @@ packages:
dependencies:
'@salesforce/ts-types': 1.7.3
sinon: 5.1.1
- tslib: 2.6.1
+ tslib: 2.6.2
dev: true
/@salesforce/ts-types@1.7.3:
@@ -3246,7 +3260,7 @@ packages:
}
engines: { node: '>=16.0.0' }
dependencies:
- tslib: 2.6.1
+ tslib: 2.6.2
dev: true
/@salesforce/ts-types@2.0.7:
@@ -3257,11 +3271,12 @@ packages:
engines: { node: '>=16.0.0' }
dependencies:
tslib: 2.6.2
+ dev: true
- /@salesforce/ts-types@2.0.8:
+ /@salesforce/ts-types@2.0.9:
resolution:
{
- integrity: sha512-vuzLcxtThBhpuhmnoh8GFrVU8XjdoNyQm9gPtmcjUyUD/9nQIBTAX8oGoUvCiiq93c4LFEmSua+xm3yu0bbNfg==,
+ integrity: sha512-boUD9jw5vQpTCPCCmK/NFTWjSuuW+lsaxOynkyNXLW+zxOc4GDjhtKc4j0vWZJQvolpafbyS8ZLFHZJvs12gYA==,
}
engines: { node: '>=16.0.0' }
dependencies:
@@ -3278,6 +3293,24 @@ packages:
'@sigstore/protobuf-specs': 0.2.0
dev: true
+ /@sigstore/bundle@2.1.1:
+ resolution:
+ {
+ integrity: sha512-v3/iS+1nufZdKQ5iAlQKcCsoh0jffQyABvYIxKsZQFWc4ubuGjwZklFHpDgV6O6T7vvV78SW5NHI91HFKEcxKg==,
+ }
+ engines: { node: ^16.14.0 || >=18.0.0 }
+ dependencies:
+ '@sigstore/protobuf-specs': 0.2.1
+ dev: true
+
+ /@sigstore/core@0.2.0:
+ resolution:
+ {
+ integrity: sha512-THobAPPZR9pDH2CAvDLpkrYedt7BlZnsyxDe+Isq4ZmGfPy5juOFZq487vCU2EgKD7aHSiTfE/i7sN7aEdzQnA==,
+ }
+ engines: { node: ^16.14.0 || >=18.0.0 }
+ dev: true
+
/@sigstore/protobuf-specs@0.2.0:
resolution:
{
@@ -3286,6 +3319,29 @@ packages:
engines: { node: ^14.17.0 || ^16.13.0 || >=18.0.0 }
dev: true
+ /@sigstore/protobuf-specs@0.2.1:
+ resolution:
+ {
+ integrity: sha512-XTWVxnWJu+c1oCshMLwnKvz8ZQJJDVOlciMfgpJBQbThVjKTCG8dwyhgLngBD2KN0ap9F/gOV8rFDEx8uh7R2A==,
+ }
+ engines: { node: ^14.17.0 || ^16.13.0 || >=18.0.0 }
+ dev: true
+
+ /@sigstore/sign@2.2.1:
+ resolution:
+ {
+ integrity: sha512-U5sKQEj+faE1MsnLou1f4DQQHeFZay+V9s9768lw48J4pKykPj34rWyI1lsMOGJ3Mae47Ye6q3HAJvgXO21rkQ==,
+ }
+ engines: { node: ^16.14.0 || >=18.0.0 }
+ dependencies:
+ '@sigstore/bundle': 2.1.1
+ '@sigstore/core': 0.2.0
+ '@sigstore/protobuf-specs': 0.2.1
+ make-fetch-happen: 13.0.0
+ transitivePeerDependencies:
+ - supports-color
+ dev: true
+
/@sigstore/tuf@1.0.3:
resolution:
{
@@ -3299,6 +3355,31 @@ packages:
- supports-color
dev: true
+ /@sigstore/tuf@2.3.0:
+ resolution:
+ {
+ integrity: sha512-S98jo9cpJwO1mtQ+2zY7bOdcYyfVYCUaofCG6wWRzk3pxKHVAkSfshkfecto2+LKsx7Ovtqbgb2LS8zTRhxJ9Q==,
+ }
+ engines: { node: ^16.14.0 || >=18.0.0 }
+ dependencies:
+ '@sigstore/protobuf-specs': 0.2.1
+ tuf-js: 2.2.0
+ transitivePeerDependencies:
+ - supports-color
+ dev: true
+
+ /@sigstore/verify@0.1.0:
+ resolution:
+ {
+ integrity: sha512-2UzMNYAa/uaz11NhvgRnIQf4gpLTJ59bhb8ESXaoSS5sxedfS+eLak8bsdMc+qpNQfITUTFoSKFx5h8umlRRiA==,
+ }
+ engines: { node: ^16.14.0 || >=18.0.0 }
+ dependencies:
+ '@sigstore/bundle': 2.1.1
+ '@sigstore/core': 0.2.0
+ '@sigstore/protobuf-specs': 0.2.1
+ dev: true
+
/@sinclair/typebox@0.27.8:
resolution:
{
@@ -3470,6 +3551,14 @@ packages:
engines: { node: ^14.17.0 || ^16.13.0 || >=18.0.0 }
dev: true
+ /@tufjs/canonical-json@2.0.0:
+ resolution:
+ {
+ integrity: sha512-yVtV8zsdo8qFHe+/3kw81dSLyF7D576A5cCFCi4X7B39tWT7SekaEFUnvnWJHz+9qO7qJTah1JbrDjWKqFtdWA==,
+ }
+ engines: { node: ^16.14.0 || >=18.0.0 }
+ dev: true
+
/@tufjs/models@1.0.4:
resolution:
{
@@ -3481,19 +3570,21 @@ packages:
minimatch: 9.0.3
dev: true
- /@types/adm-zip@0.4.33:
+ /@tufjs/models@2.0.0:
resolution:
{
- integrity: sha512-WM0DCWFLjXtddl0fu0+iN2ZF+qz8RF9RddG5OSy/S90AQz01Fu8lHn/3oTIZDxvG8gVcnBLAHMHOdBLbV6m6Mw==,
+ integrity: sha512-c8nj8BaOExmZKO2DXhDfegyhSGcG9E/mPN3U13L+/PsoWm1uaGiHHjxqSHQiasDBQwDA3aHuw9+9spYAP1qvvg==,
}
+ engines: { node: ^16.14.0 || >=18.0.0 }
dependencies:
- '@types/node': 14.14.7
+ '@tufjs/canonical-json': 2.0.0
+ minimatch: 9.0.3
dev: true
- /@types/adm-zip@0.5.0:
+ /@types/adm-zip@0.4.33:
resolution:
{
- integrity: sha512-FCJBJq9ODsQZUNURo5ILAQueuA8WJhRvuihS3ke2iI25mJlfV2LK8jG2Qj2z2AWg8U0FtWWqBHVRetceLskSaw==,
+ integrity: sha512-WM0DCWFLjXtddl0fu0+iN2ZF+qz8RF9RddG5OSy/S90AQz01Fu8lHn/3oTIZDxvG8gVcnBLAHMHOdBLbV6m6Mw==,
}
dependencies:
'@types/node': 14.14.7
@@ -3569,13 +3660,6 @@ packages:
'@types/node': 14.14.7
'@types/responselike': 1.0.0
- /@types/caseless@0.12.2:
- resolution:
- {
- integrity: sha512-6ckxMjBBD8URvjB6J3NcnuAn5Pkl7t3TizAg+xdlzzQGSPSmBcXf8KoIH0ua/i+tio+ZRUHEXp0HEmvaR4kt0w==,
- }
- dev: true
-
/@types/chai@4.3.5:
resolution:
{
@@ -3591,6 +3675,15 @@ packages:
dependencies:
'@types/node': 14.14.7
+ /@types/cli-progress@3.11.5:
+ resolution:
+ {
+ integrity: sha512-D4PbNRbviKyppS5ivBGyFO29POlySLmA2HyUFE4p5QGazAMM3CwkKWcvTl8gvElSuxRh6FPKL8XmidX873ou4g==,
+ }
+ dependencies:
+ '@types/node': 14.14.7
+ dev: false
+
/@types/datadog-metrics@0.6.1:
resolution:
{
@@ -3639,6 +3732,16 @@ packages:
}
dev: true
+ /@types/fs-extra@11.0.4:
+ resolution:
+ {
+ integrity: sha512-yTbItCNreRooED33qjunPthRcSjERP1r4MqCZc7wv0u2sUkzTFp45tgUfS5+r7FrZPdmCCNflLhVSP/o+SemsQ==,
+ }
+ dependencies:
+ '@types/jsonfile': 6.1.4
+ '@types/node': 14.14.7
+ dev: true
+
/@types/fs-extra@9.0.11:
resolution:
{
@@ -3694,6 +3797,16 @@ packages:
}
dependencies:
'@types/istanbul-lib-report': 3.0.0
+ dev: true
+
+ /@types/istanbul-reports@3.0.4:
+ resolution:
+ {
+ integrity: sha512-pk2B1NWalF9toCRu6gjBzR69syFjP4Od8WRAX+0mmf9lAjCRicLOWc+ZrxZHx/0XRjotgkF9t6iaMJ+aXcOdZQ==,
+ }
+ dependencies:
+ '@types/istanbul-lib-report': 3.0.0
+ dev: false
/@types/jest@29.5.3:
resolution:
@@ -3719,6 +3832,15 @@ packages:
}
dev: true
+ /@types/jsonfile@6.1.4:
+ resolution:
+ {
+ integrity: sha512-D5qGUYwjvnNNextdU59/+fI+spnwtTFmyQP0h+PfIOSkNfpU6AOICUOkm4i0OnSk+NyjdPJrxCDro0sJsWlRpQ==,
+ }
+ dependencies:
+ '@types/node': 14.14.7
+ dev: true
+
/@types/keyv@3.1.4:
resolution:
{
@@ -3815,6 +3937,7 @@ packages:
{
integrity: sha512-CukZhumInROvLq3+b5gLev+vgpsIqC2D0deQr/yS1WnxvmYLlJXZpaQrQiseMY+6xusl79E04UjWoqyr+t1/Ew==,
}
+ dev: true
/@types/normalize-package-data@2.4.1:
resolution:
@@ -3844,18 +3967,6 @@ packages:
}
dev: true
- /@types/request@2.48.8:
- resolution:
- {
- integrity: sha512-whjk1EDJPcAR2kYHRbFl/lKeeKYTi05A15K9bnLInCVroNDCtXce57xKdI0/rQaA3K+6q0eFyUBPmqfSndUZdQ==,
- }
- dependencies:
- '@types/caseless': 0.12.2
- '@types/node': 14.14.7
- '@types/tough-cookie': 4.0.2
- form-data: 2.5.1
- dev: true
-
/@types/responselike@1.0.0:
resolution:
{
@@ -3888,10 +3999,10 @@ packages:
}
dev: true
- /@types/semver@7.5.3:
+ /@types/semver@7.5.6:
resolution:
{
- integrity: sha512-OxepLK9EuNEIPxWNME+C6WwbRAOOI2o2BaQEGzz5Lu2e4Z5eDnEo+/aVEDMIXywoJitJ7xWd641wrGLZdtwRyw==,
+ integrity: sha512-dn1l8LaMea/IjDoHNd9J52uBbInB796CDffS6VdIxvqYCPSG0V0DzHp76GpaWnlhg88uYyPbXCDIowa86ybd5A==,
}
dev: false
@@ -3911,15 +4022,6 @@ packages:
}
dev: true
- /@types/splunk-logging@0.11.1:
- resolution:
- {
- integrity: sha512-XA1klgOlalLzZERNTuB8rpwCDZno4GV7M7eOEdJPnBNAVoOft9BoPdYgn+I3Ke7aY6gBGajebkSNCBzf6DJljQ==,
- }
- dependencies:
- '@types/request': 2.48.8
- dev: true
-
/@types/stack-utils@2.0.1:
resolution:
{
@@ -3927,20 +4029,6 @@ packages:
}
dev: true
- /@types/tmp@0.2.3:
- resolution:
- {
- integrity: sha512-dDZH/tXzwjutnuk4UacGgFRwV+JSLaXL1ikvidfJprkb7L9Nx1njcRHHmi3Dsvt7pgqqTEeucQuOrWHPFgzVHA==,
- }
- dev: true
-
- /@types/tough-cookie@4.0.2:
- resolution:
- {
- integrity: sha512-Q5vtl1W5ue16D+nIaW8JWebSSraJVlK+EthKn7e7UcD4KWsaSJ8BqGPXNaPghgtcn/fhvrN17Tv8ksUsQpiplw==,
- }
- dev: true
-
/@types/vinyl@2.0.7:
resolution:
{
@@ -4000,7 +4088,7 @@ packages:
ignore: 5.2.4
natural-compare-lite: 1.4.0
regexpp: 3.2.0
- semver: 7.5.4
+ semver: 7.5.2
tsutils: 3.21.0(typescript@5.0.2)
typescript: 5.0.2
transitivePeerDependencies:
@@ -4341,6 +4429,14 @@ packages:
}
dev: true
+ /abbrev@2.0.0:
+ resolution:
+ {
+ integrity: sha512-6/mh1E2u2YgEsCHdY0Yx5oW+61gZU+1vXaoiHHrpKeuRNNgFvS+/jrwHiQhB5apAf5oB7UB7E19ol2R2LKH8hQ==,
+ }
+ engines: { node: ^14.17.0 || ^16.13.0 || >=18.0.0 }
+ dev: true
+
/abort-controller@3.0.0:
resolution:
{
@@ -4402,14 +4498,6 @@ packages:
engines: { node: '>=6.0' }
dev: false
- /adm-zip@0.5.6:
- resolution:
- {
- integrity: sha512-nUeYhBHLG08VFOkVwai0pLXge6NNlahH+ccwxXodvl+SLa5l9mXHjg40jRVzofRPz29goiTGze7vIKmCltKtSA==,
- }
- engines: { node: '>=6.0' }
- dev: false
-
/agent-base@6.0.2:
resolution:
{
@@ -4431,7 +4519,6 @@ packages:
debug: 4.3.4(supports-color@8.1.1)
transitivePeerDependencies:
- supports-color
- dev: false
/agentkeepalive@4.3.0:
resolution:
@@ -4770,15 +4857,6 @@ packages:
}
dev: false
- /async-retry@1.3.1:
- resolution:
- {
- integrity: sha512-aiieFW/7h3hY0Bq5d+ktDBejxuwR78vRu9hDUdR8rNhSaQ29VzPL4AoIRG7D/c7tdenwOcKvgPM6tIxB3cB6HA==,
- }
- dependencies:
- retry: 0.12.0
- dev: false
-
/async-retry@1.3.3:
resolution:
{
@@ -4853,6 +4931,20 @@ packages:
proxy-from-env: 1.1.0
transitivePeerDependencies:
- debug
+ dev: false
+
+ /axios@1.6.7:
+ resolution:
+ {
+ integrity: sha512-/hDJGff6/c7u0hDkvkGxR/oy6CbCs8ziCsC7SqmhjfozqiJGc8Z11wrv9z9lYfY4K8l+H9TpjcMDX0xOZmx+RA==,
+ }
+ dependencies:
+ follow-redirects: 1.15.5
+ form-data: 4.0.0
+ proxy-from-env: 1.1.0
+ transitivePeerDependencies:
+ - debug
+ dev: true
/babel-jest@29.6.1(@babel/core@7.18.2):
resolution:
@@ -4987,14 +5079,6 @@ packages:
prebuild-install: 7.1.1
dev: false
- /big-integer@1.6.51:
- resolution:
- {
- integrity: sha512-GPEid2Y9QU1Exl1rpO9B2IPJGHPSupF5GnVIP0blYvNOMer2bTvSWs1jGOUg04hTmu67nmLsQ9TBo1puaotBHg==,
- }
- engines: { node: '>=0.6' }
- dev: false
-
/bignumber.js@9.1.1:
resolution:
{
@@ -5025,16 +5109,6 @@ packages:
engines: { node: '>=8' }
dev: true
- /binary@0.3.0:
- resolution:
- {
- integrity: sha512-D4H1y5KYwpJgK8wk1Cue5LLPgmwHKYSChkbspQg5JtVuR5ulGckxfR62H3AE9UDkdMC8yyXlqYihuz3Aqg2XZg==,
- }
- dependencies:
- buffers: 0.1.1
- chainsaw: 0.1.0
- dev: false
-
/binaryextensions@4.18.0:
resolution:
{
@@ -5058,16 +5132,9 @@ packages:
integrity: sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==,
}
dependencies:
- buffer: 5.7.1
- inherits: 2.0.4
- readable-stream: 3.6.2
-
- /bluebird@3.4.7:
- resolution:
- {
- integrity: sha512-iD3898SR7sWVRHbiQv+sHUtHnMvC1o3nW5rAcqnq3uOn07DSAppZYUkIGslDz6gXC7HfunPe7YVBgoEJASPcHA==,
- }
- dev: false
+ buffer: 5.7.1
+ inherits: 2.0.4
+ readable-stream: 3.6.2
/bottleneck@2.19.5:
resolution:
@@ -5149,14 +5216,6 @@ packages:
}
dev: true
- /buffer-indexof-polyfill@1.0.2:
- resolution:
- {
- integrity: sha512-I7wzHwA3t1/lwXQh+A5PbNvJxgfo5r3xulgpYDB5zckTu/Z9oUK9biouBKQUjEqzaz3HnAT6TYoovmE+GqSf7A==,
- }
- engines: { node: '>=0.10' }
- dev: false
-
/buffer@4.9.2:
resolution:
{
@@ -5186,14 +5245,6 @@ packages:
base64-js: 1.5.1
ieee754: 1.2.1
- /buffers@0.1.1:
- resolution:
- {
- integrity: sha512-9q/rDEGSb/Qsvv2qvzIzdluL5k7AaJOTrw23z9reQthrbF7is4CtlT0DXyO1oei2DCp4uojjzQ7igaSHp1kAEQ==,
- }
- engines: { node: '>=0.2.0' }
- dev: false
-
/builtins@1.0.3:
resolution:
{
@@ -5297,6 +5348,27 @@ packages:
unique-filename: 3.0.0
dev: true
+ /cacache@18.0.2:
+ resolution:
+ {
+ integrity: sha512-r3NU8h/P+4lVUHfeRw1dtgQYar3DZMm4/cm2bZgOvrFC/su7budSOeqh52VJIC4U4iG1WWwV6vRW0znqBvxNuw==,
+ }
+ engines: { node: ^16.14.0 || >=18.0.0 }
+ dependencies:
+ '@npmcli/fs': 3.1.0
+ fs-minipass: 3.0.2
+ glob: 10.3.3
+ lru-cache: 10.2.0
+ minipass: 7.0.4
+ minipass-collect: 2.0.1
+ minipass-flush: 1.0.5
+ minipass-pipeline: 1.2.4
+ p-map: 4.0.0
+ ssri: 10.0.4
+ tar: 6.1.15
+ unique-filename: 3.0.0
+ dev: true
+
/cacheable-lookup@5.0.4:
resolution:
{
@@ -5403,15 +5475,6 @@ packages:
ansicolors: 0.3.2
redeyed: 2.1.1
- /chainsaw@0.1.0:
- resolution:
- {
- integrity: sha512-75kWfWt6MEKNC8xYXIdRpDehRYY/tNSgwKaJq+dbbDcxORuVrrQ+SEHoWsniVn9XPYfP4gmdWIeDk/4YNp1rNQ==,
- }
- dependencies:
- traverse: 0.3.9
- dev: false
-
/chalk@1.1.3:
resolution:
{
@@ -5587,16 +5650,6 @@ packages:
engines: { node: '>=0.10.0' }
dev: true
- /cli-cursor@2.1.0:
- resolution:
- {
- integrity: sha512-8lgKz8LmCRYZZQDpRyT2m5rKJ08TnU4tR9FFFW2rxpxR1FzWi4PQ/NfyODchAatHaUgnSPVcx/R5w6NuTBzFiw==,
- }
- engines: { node: '>=4' }
- dependencies:
- restore-cursor: 2.0.0
- dev: true
-
/cli-cursor@3.1.0:
resolution:
{
@@ -5853,6 +5906,16 @@ packages:
integrity: sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==,
}
+ /color-string@1.9.1:
+ resolution:
+ {
+ integrity: sha512-shrVawQFojnZv6xM40anx4CkoDP+fZsw/ZerEMsW/pyzsRbElpsL/DBVW7q3ExxwusdNXI3lXpuhEZkzs8p5Eg==,
+ }
+ dependencies:
+ color-name: 1.1.4
+ simple-swizzle: 0.2.2
+ dev: false
+
/color-support@1.1.3:
resolution:
{
@@ -5861,6 +5924,17 @@ packages:
hasBin: true
dev: true
+ /color@4.2.3:
+ resolution:
+ {
+ integrity: sha512-1rXeuUUiGGrykh+CeBdu5Ie7OJwinCgQY0bc7GCRxy5xVHy+moaqkpL/jqQq0MtQOeYcrqEz4abc5f0KtU7W4A==,
+ }
+ engines: { node: '>=12.5.0' }
+ dependencies:
+ color-convert: 2.0.1
+ color-string: 1.9.1
+ dev: false
+
/colorette@2.0.20:
resolution:
{
@@ -6034,12 +6108,12 @@ packages:
q: 1.5.1
dev: true
- /conventional-changelog-angular@6.0.0:
+ /conventional-changelog-angular@7.0.0:
resolution:
{
- integrity: sha512-6qLgrBF4gueoC7AFVHu51nHL9pF9FRjXrH+ceVf7WmAfH3gs+gEYOkvxhjMPjZu57I4AGUGoNTY8V7Hrgf1uqg==,
+ integrity: sha512-ROjNchA9LgfNMTTFSIWPzebCwOGFdgkEq45EnvvrmSLvCtAw0HSmrCs7/ty+wAeYUZyNay0YMUNYFTRL72PkBQ==,
}
- engines: { node: '>=14' }
+ engines: { node: '>=16' }
dependencies:
compare-func: 2.0.0
dev: true
@@ -6627,12 +6701,12 @@ packages:
is-obj: 2.0.0
dev: true
- /dotenv@10.0.0:
+ /dotenv-expand@10.0.0:
resolution:
{
- integrity: sha512-rlBi9d8jpv9Sf1klPjNfFAuWDjKLwTIJJ/VxtoTwIR6hnZxcEOQCZg2oIL3MWBYw5GpUDKOEnND7LXTbIpQ03Q==,
+ integrity: sha512-GopVGCpVS1UKH75VKHGuQFqS1Gusej0z4FyQkPdwjil2gNIv+LNsqBlboOzpJFZKVT95GkCyWJbBSdFEFUWI2A==,
}
- engines: { node: '>=10' }
+ engines: { node: '>=12' }
dev: true
/dotenv@16.3.1:
@@ -6641,16 +6715,6 @@ packages:
integrity: sha512-IPzF4w4/Rd94bA9imS68tZBaYyBWSCE47V1RGuMrB94iyTOIEwRmVL2x/4An+6mETpLrKJ5hQkB8W4kFAadeIQ==,
}
engines: { node: '>=12' }
- dev: false
-
- /duplexer2@0.1.4:
- resolution:
- {
- integrity: sha512-asLFVfWWtJ90ZyOUHMqk7/S2w2guQKxUI2itj3d92ADHhxUSbCMGi1f1cBcJ7xM1To+pE/Khbwo1yuNbMEPKeA==,
- }
- dependencies:
- readable-stream: 2.3.8
- dev: false
/duplexer@0.1.2:
resolution:
@@ -7072,15 +7136,6 @@ packages:
strip-final-newline: 2.0.0
dev: true
- /execution-time@1.4.1:
- resolution:
- {
- integrity: sha512-4t9svrTtsXxAEzAs9/tm1R/Voj5AYHqxd72BiLEbGQWJq2PD3tAmW8bXI7Pp0yorjaKshT1+NyKy0ytHlKW4Pg==,
- }
- dependencies:
- pretty-hrtime: 1.0.3
- dev: true
-
/exit@0.1.2:
resolution:
{
@@ -7177,20 +7232,6 @@ packages:
integrity: sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==,
}
- /fast-glob@3.2.7:
- resolution:
- {
- integrity: sha512-rYGMRwip6lUMvYD3BTScMwT1HtAs2d71SMv66Vrxs0IekGZEjhM0pcMfjQPnknBt2zeCwQMEupiN02ZP4DiT1Q==,
- }
- engines: { node: '>=8' }
- dependencies:
- '@nodelib/fs.stat': 2.0.5
- '@nodelib/fs.walk': 1.2.8
- glob-parent: 5.1.2
- merge2: 1.4.1
- micromatch: 4.0.5
- dev: true
-
/fast-glob@3.3.1:
resolution:
{
@@ -7251,10 +7292,10 @@ packages:
strnum: 1.0.5
dev: false
- /fast-xml-parser@4.3.2:
+ /fast-xml-parser@4.3.3:
resolution:
{
- integrity: sha512-rmrXUXwbJedoXkStenj1kkljNF7ugn5ZjR9FJcwmCfcCbtOMDghPajbc+Tck6vE6F5XsDmx+Pr2le9fw8+pXBg==,
+ integrity: sha512-coV/D1MhrShMvU6D0I+VAK3umz6hUaxxhL0yp/9RjfiYUfAv14rDhGQL+PLForhMdr0wq3PiV07WtkkNjJjNHg==,
}
hasBin: true
dependencies:
@@ -7461,6 +7502,20 @@ packages:
peerDependenciesMeta:
debug:
optional: true
+ dev: false
+
+ /follow-redirects@1.15.5:
+ resolution:
+ {
+ integrity: sha512-vSFWUON1B+yAw1VN4xMfxgn5fTUiaOzAJCKBwIIgT/+7CuGy9+r+5gITvP62j3RmaD5Ph65UaERdOSRGUzZtgw==,
+ }
+ engines: { node: '>=4.0' }
+ peerDependencies:
+ debug: '*'
+ peerDependenciesMeta:
+ debug:
+ optional: true
+ dev: true
/for-each@0.3.3:
resolution:
@@ -7481,18 +7536,6 @@ packages:
cross-spawn: 7.0.3
signal-exit: 4.0.2
- /form-data@2.5.1:
- resolution:
- {
- integrity: sha512-m21N3WOmEEURgk6B9GLOE4RuWOFf28Lhh9qGYeNlGq4VDXUlJy2th2slBNU8Gp8EzloYZOibZJ7t5ecIrFSjVA==,
- }
- engines: { node: '>= 0.12' }
- dependencies:
- asynckit: 0.4.0
- combined-stream: 1.0.8
- mime-types: 2.1.35
- dev: true
-
/form-data@4.0.0:
resolution:
{
@@ -7545,18 +7588,6 @@ packages:
jsonfile: 6.1.0
universalify: 2.0.0
- /fs-extra@7.0.1:
- resolution:
- {
- integrity: sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==,
- }
- engines: { node: '>=6 <7 || >=8' }
- dependencies:
- graceful-fs: 4.2.11
- jsonfile: 4.0.0
- universalify: 0.1.2
- dev: true
-
/fs-extra@8.1.0:
resolution:
{
@@ -7616,19 +7647,6 @@ packages:
dev: true
optional: true
- /fstream@1.0.12:
- resolution:
- {
- integrity: sha512-WvJ193OHa0GHPEL+AycEJgxvBEwyfRkN1vhjca23OaPVMCaLCXTd5qAu82AjTcgP1UJmytkOKb63Ypde7raDIg==,
- }
- engines: { node: '>=0.6' }
- dependencies:
- graceful-fs: 4.2.11
- inherits: 2.0.4
- mkdirp: 0.5.6
- rimraf: 2.7.1
- dev: false
-
/function-bind@1.1.1:
resolution:
{
@@ -7907,33 +7925,33 @@ packages:
}
dev: true
- /glob@10.3.3:
+ /glob@10.3.10:
resolution:
{
- integrity: sha512-92vPiMb/iqpmEgsOoIDvTjc50wf9CCCvMzsi6W0JLPeUKE8TWP1a73PgqSrqy7iAZxaSD1YdzU7QZR5LF51MJw==,
+ integrity: sha512-fa46+tv1Ak0UPK1TOy/pZrIybNNt4HCv7SDzwyfiOZkvZLEbjsZkJBPtDHVshZjbecAoAGSC20MjLDG/qr679g==,
}
engines: { node: '>=16 || 14 >=14.17' }
hasBin: true
dependencies:
foreground-child: 3.1.1
- jackspeak: 2.2.2
+ jackspeak: 2.3.6
minimatch: 9.0.3
minipass: 7.0.2
path-scurry: 1.10.1
- /glob@7.1.4:
+ /glob@10.3.3:
resolution:
{
- integrity: sha512-hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A==,
+ integrity: sha512-92vPiMb/iqpmEgsOoIDvTjc50wf9CCCvMzsi6W0JLPeUKE8TWP1a73PgqSrqy7iAZxaSD1YdzU7QZR5LF51MJw==,
}
+ engines: { node: '>=16 || 14 >=14.17' }
+ hasBin: true
dependencies:
- fs.realpath: 1.0.0
- inflight: 1.0.6
- inherits: 2.0.4
- minimatch: 3.1.2
- once: 1.4.0
- path-is-absolute: 1.0.1
- dev: true
+ foreground-child: 3.1.1
+ jackspeak: 2.2.2
+ minimatch: 9.0.3
+ minipass: 7.0.2
+ path-scurry: 1.10.1
/glob@7.2.3:
resolution:
@@ -7960,6 +7978,7 @@ packages:
inherits: 2.0.4
minimatch: 5.1.6
once: 1.4.0
+ dev: true
/glob@9.3.5:
resolution:
@@ -8012,7 +8031,7 @@ packages:
array-union: 2.1.0
dir-glob: 3.0.1
fast-glob: 3.3.1
- ignore: 5.2.4
+ ignore: 5.3.0
merge2: 1.4.1
slash: 3.0.0
@@ -8223,14 +8242,11 @@ packages:
tslib: 2.1.0
dev: false
- /help-me@4.2.0:
+ /help-me@5.0.0:
resolution:
{
- integrity: sha512-TAOnTB8Tz5Dw8penUuzHVrKNKlCIbwwbHnXraNJxPwf8LRtE2HlM84RYuezMFcwOJmoYOCWVDyJ8TQGxn9PgxA==,
+ integrity: sha512-7xgomUX6ADmcYzFik0HzAxh/73YlKR9bmFzf51CZwR+b6YtzU2m0u49hQCqV6SvlqIqsaxovfwdvbnsw3b/zpg==,
}
- dependencies:
- glob: 8.1.0
- readable-stream: 3.6.2
dev: false
/hosted-git-info@2.8.9:
@@ -8270,6 +8286,16 @@ packages:
lru-cache: 7.18.3
dev: true
+ /hosted-git-info@7.0.1:
+ resolution:
+ {
+ integrity: sha512-+K84LB1DYwMHoHSgaOY/Jfhw3ucPmSET5v98Ke/HdNSw4a0UktWzyW1mjhjpuxxTqOOsfWT/7iVshHmVZ4IpOA==,
+ }
+ engines: { node: ^16.14.0 || >=18.0.0 }
+ dependencies:
+ lru-cache: 10.2.0
+ dev: true
+
/hot-shots@8.5.0:
resolution:
{
@@ -8355,7 +8381,6 @@ packages:
debug: 4.3.4(supports-color@8.1.1)
transitivePeerDependencies:
- supports-color
- dev: false
/http2-wrapper@1.0.3:
resolution:
@@ -8390,7 +8415,6 @@ packages:
debug: 4.3.4(supports-color@8.1.1)
transitivePeerDependencies:
- supports-color
- dev: false
/human-signals@2.1.0:
resolution:
@@ -8480,13 +8504,15 @@ packages:
minimatch: 9.0.3
dev: true
- /ignore@5.1.6:
+ /ignore-walk@6.0.4:
resolution:
{
- integrity: sha512-cgXgkypZBcCnOgSihyeqbo6gjIaIyDqPQB7Ra4vhE9m6kigdGoQDMHjviFhRZo3IMlRy6yElosoviMs5YxZXUA==,
+ integrity: sha512-t7sv42WkwFkyKbivUCglsQW5YWMskWtbEf4MNKX5u/CCWHKSPzN4FtBQGsQZgCLbxOzpVlcbWVK5KB3auIOjSw==,
}
- engines: { node: '>= 4' }
- dev: false
+ engines: { node: ^14.17.0 || ^16.13.0 || >=18.0.0 }
+ dependencies:
+ minimatch: 9.0.3
+ dev: true
/ignore@5.2.4:
resolution:
@@ -8495,6 +8521,13 @@ packages:
}
engines: { node: '>= 4' }
+ /ignore@5.3.0:
+ resolution:
+ {
+ integrity: sha512-g7dmpshy+gD7mh88OC9NwSGTKoc3kyLAZQRU1mt53Aw/vnvfXnbC+F/7F7QoYVKbV+KNvJx8wArewKy1vXMtlg==,
+ }
+ engines: { node: '>= 4' }
+
/immediate@3.0.6:
resolution:
{
@@ -8584,23 +8617,6 @@ packages:
validate-npm-package-name: 5.0.0
dev: true
- /inquirer-autocomplete-prompt@1.4.0(inquirer@7.3.3):
- resolution:
- {
- integrity: sha512-qHgHyJmbULt4hI+kCmwX92MnSxDs/Yhdt4wPA30qnoa01OF6uTXV8yvH4hKXgdaTNmkZ9D01MHjqKYEuJN+ONw==,
- }
- engines: { node: '>=10' }
- peerDependencies:
- inquirer: ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0
- dependencies:
- ansi-escapes: 4.3.2
- chalk: 4.1.2
- figures: 3.2.0
- inquirer: 7.3.3
- run-async: 2.4.1
- rxjs: 6.6.7
- dev: true
-
/inquirer@7.3.3:
resolution:
{
@@ -8621,6 +8637,7 @@ packages:
string-width: 4.2.3
strip-ansi: 6.0.1
through: 2.3.8
+ dev: false
/inquirer@8.2.5:
resolution:
@@ -8685,6 +8702,13 @@ packages:
}
dev: true
+ /is-arrayish@0.3.2:
+ resolution:
+ {
+ integrity: sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ==,
+ }
+ dev: false
+
/is-binary-path@2.1.0:
resolution:
{
@@ -8983,6 +9007,14 @@ packages:
integrity: sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==,
}
+ /isexe@3.1.1:
+ resolution:
+ {
+ integrity: sha512-LpB/54B+/2J5hqQ7imZHfdU31OlgQqx7ZicVlkm9kzg9/w8GKLEcFfJl/t7DCEDueOyBAD6zCCwTO6Fzs0NoEQ==,
+ }
+ engines: { node: '>=16' }
+ dev: true
+
/isobject@3.0.1:
resolution:
{
@@ -9018,6 +9050,14 @@ packages:
integrity: sha512-eOeJ5BHCmHYvQK7xt9GkdHuzuCGS1Y6g9Gvnx3Ym33fz/HpLRYxiS0wHNr+m/MBC8B647Xt608vCDEvhl9c6Mw==,
}
engines: { node: '>=8' }
+ dev: true
+
+ /istanbul-lib-coverage@3.2.2:
+ resolution:
+ {
+ integrity: sha512-O8dpsF+r0WV/8MNRKfnmrtCWhuKjxrq2w+jpzBL5UZKTi2LeVWnWOmWRxFlesJONmc+wLAGvKQZEOanko0LFTg==,
+ }
+ engines: { node: '>=8' }
/istanbul-lib-instrument@5.2.1:
resolution:
@@ -9035,18 +9075,6 @@ packages:
- supports-color
dev: true
- /istanbul-lib-report@3.0.0:
- resolution:
- {
- integrity: sha512-wcdi+uAKzfiGT2abPpKZ0hSU1rGQjUQnLvtY5MpQ7QCTahD3VODhcu4wcfY1YtkGaDD5yuydOLINXsfbus9ROw==,
- }
- engines: { node: '>=8' }
- dependencies:
- istanbul-lib-coverage: 3.2.0
- make-dir: 3.1.0
- supports-color: 7.2.0
- dev: true
-
/istanbul-lib-report@3.0.1:
resolution:
{
@@ -9054,10 +9082,9 @@ packages:
}
engines: { node: '>=10' }
dependencies:
- istanbul-lib-coverage: 3.2.0
+ istanbul-lib-coverage: 3.2.2
make-dir: 4.0.0
supports-color: 7.2.0
- dev: false
/istanbul-lib-source-maps@4.0.1:
resolution:
@@ -9073,17 +9100,6 @@ packages:
- supports-color
dev: true
- /istanbul-reports@3.1.5:
- resolution:
- {
- integrity: sha512-nUsEMa9pBt/NOHqbcbeJEgqIlY/K7rVWUX6Lql2orY5e9roQOthbR3vtY4zzf2orPELg80fnxxk9zUyPlgwD1w==,
- }
- engines: { node: '>=8' }
- dependencies:
- html-escaper: 2.0.2
- istanbul-lib-report: 3.0.0
- dev: true
-
/istanbul-reports@3.1.6:
resolution:
{
@@ -9093,7 +9109,6 @@ packages:
dependencies:
html-escaper: 2.0.2
istanbul-lib-report: 3.0.1
- dev: false
/jackspeak@2.2.2:
resolution:
@@ -9106,6 +9121,17 @@ packages:
optionalDependencies:
'@pkgjs/parseargs': 0.11.0
+ /jackspeak@2.3.6:
+ resolution:
+ {
+ integrity: sha512-N3yCS/NegsOBokc8GAdM8UcmfsKiSS8cipheD/nivzr700H+nsMOxJjQnvwOcRYVuFkdH0wGUvW2WbXGmrZGbQ==,
+ }
+ engines: { node: '>=14' }
+ dependencies:
+ '@isaacs/cliui': 8.0.2
+ optionalDependencies:
+ '@pkgjs/parseargs': 0.11.0
+
/jake@10.8.7:
resolution:
{
@@ -9155,44 +9181,13 @@ packages:
p-limit: 3.1.0
pretty-format: 29.6.1
pure-rand: 6.0.2
- slash: 3.0.0
- stack-utils: 2.0.6
- transitivePeerDependencies:
- - supports-color
- dev: true
-
- /jest-cli@29.6.1(@types/node@10.0.0)(ts-node@9.1.1):
- resolution:
- {
- integrity: sha512-607dSgTA4ODIN6go9w6xY3EYkyPFGicx51a69H7yfvt7lN53xNswEVLovq+E77VsTRi5fWprLH0yl4DJgE8Ing==,
- }
- engines: { node: ^14.15.0 || ^16.10.0 || >=18.0.0 }
- hasBin: true
- peerDependencies:
- node-notifier: ^8.0.1 || ^9.0.0 || ^10.0.0
- peerDependenciesMeta:
- node-notifier:
- optional: true
- dependencies:
- '@jest/core': 29.6.1(ts-node@9.1.1)
- '@jest/test-result': 29.6.1
- '@jest/types': 29.6.1
- chalk: 4.1.2
- exit: 0.1.2
- graceful-fs: 4.2.11
- import-local: 3.1.0
- jest-config: 29.6.1(@types/node@10.0.0)(ts-node@9.1.1)
- jest-util: 29.6.1
- jest-validate: 29.6.1
- prompts: 2.4.2
- yargs: 17.7.2
+ slash: 3.0.0
+ stack-utils: 2.0.6
transitivePeerDependencies:
- - '@types/node'
- supports-color
- - ts-node
dev: true
- /jest-cli@29.6.1(@types/node@14.14.7)(ts-node@10.7.0):
+ /jest-cli@29.6.1(@types/node@10.0.0)(ts-node@10.9.2):
resolution:
{
integrity: sha512-607dSgTA4ODIN6go9w6xY3EYkyPFGicx51a69H7yfvt7lN53xNswEVLovq+E77VsTRi5fWprLH0yl4DJgE8Ing==,
@@ -9205,14 +9200,14 @@ packages:
node-notifier:
optional: true
dependencies:
- '@jest/core': 29.6.1(ts-node@10.7.0)
+ '@jest/core': 29.6.1(ts-node@10.9.2)
'@jest/test-result': 29.6.1
'@jest/types': 29.6.1
chalk: 4.1.2
exit: 0.1.2
graceful-fs: 4.2.11
import-local: 3.1.0
- jest-config: 29.6.1(@types/node@14.14.7)(ts-node@10.7.0)
+ jest-config: 29.6.1(@types/node@10.0.0)(ts-node@10.9.2)
jest-util: 29.6.1
jest-validate: 29.6.1
prompts: 2.4.2
@@ -9223,7 +9218,7 @@ packages:
- ts-node
dev: true
- /jest-cli@29.6.1(@types/node@20.4.4)(ts-node@10.7.0):
+ /jest-cli@29.6.1(@types/node@14.14.7)(ts-node@10.7.0):
resolution:
{
integrity: sha512-607dSgTA4ODIN6go9w6xY3EYkyPFGicx51a69H7yfvt7lN53xNswEVLovq+E77VsTRi5fWprLH0yl4DJgE8Ing==,
@@ -9243,7 +9238,7 @@ packages:
exit: 0.1.2
graceful-fs: 4.2.11
import-local: 3.1.0
- jest-config: 29.6.1(@types/node@20.4.4)(ts-node@10.7.0)
+ jest-config: 29.6.1(@types/node@14.14.7)(ts-node@10.7.0)
jest-util: 29.6.1
jest-validate: 29.6.1
prompts: 2.4.2
@@ -9285,7 +9280,7 @@ packages:
- ts-node
dev: true
- /jest-config@29.6.1(@types/node@10.0.0)(ts-node@9.1.1):
+ /jest-config@29.6.1(@types/node@10.0.0)(ts-node@10.9.2):
resolution:
{
integrity: sha512-XdjYV2fy2xYixUiV2Wc54t3Z4oxYPAELUzWnV6+mcbq0rh742X2p52pii5A3oeRzYjLnQxCsZmp0qpI6klE2cQ==,
@@ -9323,7 +9318,7 @@ packages:
pretty-format: 29.6.1
slash: 3.0.0
strip-json-comments: 3.1.1
- ts-node: 9.1.1(typescript@5.0.2)
+ ts-node: 10.9.2(@types/node@10.0.0)(typescript@5.0.2)
transitivePeerDependencies:
- supports-color
dev: true
@@ -9371,7 +9366,7 @@ packages:
- supports-color
dev: true
- /jest-config@29.6.1(@types/node@14.14.7)(ts-node@9.1.1):
+ /jest-config@29.6.1(@types/node@14.14.7)(ts-node@10.9.2):
resolution:
{
integrity: sha512-XdjYV2fy2xYixUiV2Wc54t3Z4oxYPAELUzWnV6+mcbq0rh742X2p52pii5A3oeRzYjLnQxCsZmp0qpI6klE2cQ==,
@@ -9409,12 +9404,12 @@ packages:
pretty-format: 29.6.1
slash: 3.0.0
strip-json-comments: 3.1.1
- ts-node: 9.1.1(typescript@5.0.2)
+ ts-node: 10.9.2(@types/node@10.0.0)(typescript@5.0.2)
transitivePeerDependencies:
- supports-color
dev: true
- /jest-config@29.6.1(@types/node@20.4.4)(ts-node@10.7.0):
+ /jest-config@29.6.1(@types/node@14.14.7)(ts-node@9.1.1):
resolution:
{
integrity: sha512-XdjYV2fy2xYixUiV2Wc54t3Z4oxYPAELUzWnV6+mcbq0rh742X2p52pii5A3oeRzYjLnQxCsZmp0qpI6klE2cQ==,
@@ -9432,7 +9427,7 @@ packages:
'@babel/core': 7.18.2
'@jest/test-sequencer': 29.6.1
'@jest/types': 29.6.1
- '@types/node': 20.4.4
+ '@types/node': 14.14.7
babel-jest: 29.6.1(@babel/core@7.18.2)
chalk: 4.1.2
ci-info: 3.8.0
@@ -9452,7 +9447,7 @@ packages:
pretty-format: 29.6.1
slash: 3.0.0
strip-json-comments: 3.1.1
- ts-node: 10.7.0(@types/node@20.4.4)(typescript@5.0.2)
+ ts-node: 9.1.1(typescript@5.0.2)
transitivePeerDependencies:
- supports-color
dev: true
@@ -9859,30 +9854,7 @@ packages:
supports-color: 8.1.1
dev: true
- /jest@29.6.0(@types/node@20.4.4)(ts-node@10.7.0):
- resolution:
- {
- integrity: sha512-do1J9gGrQ68E4UfMz/4OM71p9qCqQxu32N/9ZfeYFSSlx0uUOuxeyZxtJZNaUTW12ZA11ERhmBjBhy1Ho96R4g==,
- }
- engines: { node: ^14.15.0 || ^16.10.0 || >=18.0.0 }
- hasBin: true
- peerDependencies:
- node-notifier: ^8.0.1 || ^9.0.0 || ^10.0.0
- peerDependenciesMeta:
- node-notifier:
- optional: true
- dependencies:
- '@jest/core': 29.6.1(ts-node@10.7.0)
- '@jest/types': 29.6.1
- import-local: 3.1.0
- jest-cli: 29.6.1(@types/node@20.4.4)(ts-node@10.7.0)
- transitivePeerDependencies:
- - '@types/node'
- - supports-color
- - ts-node
- dev: true
-
- /jest@29.6.1(@types/node@10.0.0)(ts-node@9.1.1):
+ /jest@29.6.1(@types/node@10.0.0)(ts-node@10.9.2):
resolution:
{
integrity: sha512-Nirw5B4nn69rVUZtemCQhwxOBhm0nsp3hmtF4rzCeWD7BkjAXRIji7xWQfnTNbz9g0aVsBX6aZK3n+23LM6uDw==,
@@ -9895,10 +9867,10 @@ packages:
node-notifier:
optional: true
dependencies:
- '@jest/core': 29.6.1(ts-node@9.1.1)
+ '@jest/core': 29.6.1(ts-node@10.9.2)
'@jest/types': 29.6.1
import-local: 3.1.0
- jest-cli: 29.6.1(@types/node@10.0.0)(ts-node@9.1.1)
+ jest-cli: 29.6.1(@types/node@10.0.0)(ts-node@10.9.2)
transitivePeerDependencies:
- '@types/node'
- supports-color
@@ -9991,16 +9963,6 @@ packages:
argparse: 1.0.10
esprima: 4.0.1
- /js-yaml@4.0.0:
- resolution:
- {
- integrity: sha512-pqon0s+4ScYUvX30wxQi3PogGFAlUyH0awepWvwkj4jD4v+ova3RiYw8bmA6x2rDrEaj8i/oWKoRxpVNW+Re8Q==,
- }
- hasBin: true
- dependencies:
- argparse: 2.0.1
- dev: false
-
/js-yaml@4.1.0:
resolution:
{
@@ -10061,6 +10023,39 @@ packages:
- supports-color
dev: false
+ /jsforce@2.0.0-beta.29:
+ resolution:
+ {
+ integrity: sha512-Fq7xjOYOikyozZZDQNTfzsAdhcO0rUXwtavsjM+cCYUFiCMVOJJavgco303zOsJk3v8sdAYnGgHyKckLIhnyAg==,
+ }
+ engines: { node: '>=8.0' }
+ hasBin: true
+ dependencies:
+ '@babel/runtime': 7.22.6
+ '@babel/runtime-corejs3': 7.22.6
+ '@types/node': 12.20.55
+ abort-controller: 3.0.0
+ base64url: 3.0.1
+ commander: 4.1.1
+ core-js: 3.31.1
+ csv-parse: 4.16.3
+ csv-stringify: 5.6.5
+ faye: 1.4.0
+ form-data: 4.0.0
+ fs-extra: 8.1.0
+ https-proxy-agent: 5.0.1
+ inquirer: 7.3.3
+ multistream: 3.1.0
+ node-fetch: 2.6.12
+ open: 7.4.2
+ regenerator-runtime: 0.13.11
+ strip-ansi: 6.0.1
+ xml2js: 0.5.0
+ transitivePeerDependencies:
+ - encoding
+ - supports-color
+ dev: false
+
/json-bigint@1.0.0:
resolution:
{
@@ -10295,39 +10290,17 @@ packages:
engines: { node: '>=6' }
dev: true
- /lerna-update-wizard@1.1.0:
- resolution:
- {
- integrity: sha512-V6VtJFbt4BS1HKsNDsyBMeAU86CYRoQSikZsJyEMVc2x/yqH/hX+Z79fI0J3gSiWFkkIKrLj/vPUf6Zvn/79jw==,
- }
- engines: { node: '>=12' }
- hasBin: true
- dependencies:
- chalk: 4.1.2
- cli-cursor: 2.1.0
- execution-time: 1.4.1
- fs-extra: 7.0.1
- globby: 11.1.0
- inquirer: 7.3.3
- inquirer-autocomplete-prompt: 1.4.0(inquirer@7.3.3)
- lodash: 4.17.21
- meow: 9.0.0
- minimist: 1.2.8
- semver-compare: 1.0.0
- dev: true
-
- /lerna@7.1.4:
+ /lerna@8.0.2:
resolution:
{
- integrity: sha512-/cabvmTTkmayyALIZx7OpHRex72i8xSOkiJchEkrKxAZHoLNaGSwqwKkj+x6WtmchhWl/gLlqwQXGRuxrJKiBw==,
+ integrity: sha512-nnOIGI5V5Af9gfraNcMVoV1Fry/y7/h3nCQYk0/CMzBYDD+xbNL3DH8+c82AJkNR5ABslmpXjW4DLJ11/1b3CQ==,
}
- engines: { node: ^14.17.0 || >=16.0.0 }
+ engines: { node: '>=18.0.0' }
hasBin: true
dependencies:
- '@lerna/child-process': 7.1.4
- '@lerna/create': 7.1.4
- '@npmcli/run-script': 6.0.2
- '@nx/devkit': 16.5.5(nx@16.5.5)
+ '@lerna/create': 8.0.2
+ '@npmcli/run-script': 7.0.2
+ '@nx/devkit': 17.3.0(nx@17.3.0)
'@octokit/plugin-enterprise-rest': 6.0.1
'@octokit/rest': 19.0.11
byte-size: 8.1.1
@@ -10335,7 +10308,7 @@ packages:
clone-deep: 4.0.1
cmd-shim: 6.0.1
columnify: 1.6.0
- conventional-changelog-angular: 6.0.0
+ conventional-changelog-angular: 7.0.0
conventional-changelog-core: 5.0.1
conventional-recommended-bump: 7.0.1
cosmiconfig: 8.2.0
@@ -10362,7 +10335,7 @@ packages:
libnpmpublish: 7.3.0
load-json-file: 6.2.0
lodash: 4.17.21
- make-dir: 3.1.0
+ make-dir: 4.0.0
minimatch: 3.0.5
multimatch: 5.0.0
node-fetch: 2.6.7
@@ -10370,14 +10343,14 @@ packages:
npm-packlist: 5.1.1
npm-registry-fetch: 14.0.5
npmlog: 6.0.2
- nx: 16.5.5
+ nx: 17.3.0
p-map: 4.0.0
p-map-series: 2.1.0
p-pipe: 3.1.0
p-queue: 6.6.2
p-reduce: 2.1.0
p-waterfall: 2.1.1
- pacote: 15.2.0
+ pacote: 17.0.6
pify: 5.0.0
read-cmd-shim: 4.0.0
read-package-json: 6.0.4
@@ -10397,8 +10370,8 @@ packages:
validate-npm-package-name: 5.0.0
write-file-atomic: 5.0.1
write-pkg: 4.0.0
- yargs: 16.2.0
- yargs-parser: 20.2.4
+ yargs: 17.7.2
+ yargs-parser: 21.1.1
transitivePeerDependencies:
- '@swc-node/register'
- '@swc/core'
@@ -10483,13 +10456,6 @@ packages:
engines: { node: ^12.20.0 || ^14.13.1 || >=16.0.0 }
dev: true
- /listenercount@1.0.1:
- resolution:
- {
- integrity: sha512-3mk/Zag0+IJxeDrxSgaDPy4zZ3w05PRZeJNnlWhzFz5OkX49J4krc+A8X2d2M69vGMBEX0uyl8M+W+8gH+kBqQ==,
- }
- dev: false
-
/load-json-file@4.0.0:
resolution:
{
@@ -10745,6 +10711,14 @@ packages:
}
engines: { node: 14 || >=16.14 }
+ /lru-cache@10.2.0:
+ resolution:
+ {
+ integrity: sha512-2bIM8x+VAf6JT4bKAljS1qUWgMsqZRPGJS6FSahIMPVvctcNhyVp7AJu7quxOW9jwkryBReKZY5tY5JYv2n/7Q==,
+ }
+ engines: { node: 14 || >=16.14 }
+ dev: true
+
/lru-cache@5.1.1:
resolution:
{
@@ -10781,16 +10755,6 @@ packages:
semver: 5.7.2
dev: true
- /make-dir@3.1.0:
- resolution:
- {
- integrity: sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==,
- }
- engines: { node: '>=8' }
- dependencies:
- semver: 6.3.1
- dev: true
-
/make-dir@4.0.0:
resolution:
{
@@ -10799,7 +10763,6 @@ packages:
engines: { node: '>=10' }
dependencies:
semver: 7.5.4
- dev: false
/make-error@1.3.6:
resolution:
@@ -10861,6 +10824,28 @@ packages:
- supports-color
dev: true
+ /make-fetch-happen@13.0.0:
+ resolution:
+ {
+ integrity: sha512-7ThobcL8brtGo9CavByQrQi+23aIfgYU++wg4B87AIS8Rb2ZBt/MEaDqzA00Xwv/jUjAjYkLHjVolYuTLKda2A==,
+ }
+ engines: { node: ^16.14.0 || >=18.0.0 }
+ dependencies:
+ '@npmcli/agent': 2.2.0
+ cacache: 18.0.2
+ http-cache-semantics: 4.1.1
+ is-lambda: 1.0.1
+ minipass: 7.0.2
+ minipass-fetch: 3.0.3
+ minipass-flush: 1.0.5
+ minipass-pipeline: 1.2.4
+ negotiator: 0.6.3
+ promise-retry: 2.0.1
+ ssri: 10.0.4
+ transitivePeerDependencies:
+ - supports-color
+ dev: true
+
/make-fetch-happen@9.1.0:
resolution:
{
@@ -11015,27 +11000,6 @@ packages:
yargs-parser: 20.2.9
dev: true
- /meow@9.0.0:
- resolution:
- {
- integrity: sha512-+obSblOQmRhcyBt62furQqRAQpNyWXo8BuQ5bN7dG8wmwQ+vwHKp/rCFD4CrTP8CsDQD1sjoZ94K417XEUk8IQ==,
- }
- engines: { node: '>=10' }
- dependencies:
- '@types/minimist': 1.2.2
- camelcase-keys: 6.2.2
- decamelize: 1.2.0
- decamelize-keys: 1.1.1
- hard-rejection: 2.1.0
- minimist-options: 4.1.0
- normalize-package-data: 3.0.3
- read-pkg-up: 7.0.1
- redent: 3.0.0
- trim-newlines: 3.0.1
- type-fest: 0.18.1
- yargs-parser: 20.2.9
- dev: true
-
/merge-stream@2.0.0:
resolution:
{
@@ -11085,14 +11049,6 @@ packages:
hasBin: true
dev: false
- /mimic-fn@1.2.0:
- resolution:
- {
- integrity: sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==,
- }
- engines: { node: '>=4' }
- dev: true
-
/mimic-fn@2.1.0:
resolution:
{
@@ -11214,6 +11170,16 @@ packages:
minipass: 3.3.6
dev: true
+ /minipass-collect@2.0.1:
+ resolution:
+ {
+ integrity: sha512-D7V8PO9oaz7PWGLbCACuI1qEOsq7UKfLotx/C0Aet43fCUB/wfQ7DYeq2oR/svFJGYDHPr38SHATeaj/ZoKHKw==,
+ }
+ engines: { node: '>=16 || 14 >=14.17' }
+ dependencies:
+ minipass: 7.0.4
+ dev: true
+
/minipass-fetch@1.4.1:
resolution:
{
@@ -11319,7 +11285,6 @@ packages:
integrity: sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==,
}
engines: { node: '>=8' }
- dev: true
/minipass@7.0.2:
resolution:
@@ -11328,6 +11293,14 @@ packages:
}
engines: { node: '>=16 || 14 >=14.17' }
+ /minipass@7.0.4:
+ resolution:
+ {
+ integrity: sha512-jYofLM5Dam9279rdkWzqHozUo4ybjdZmCsDHePy5V/PbBcVMiSZR97gmAy45aqi8CK1lG2ECd356FU86avfwUQ==,
+ }
+ engines: { node: '>=16 || 14 >=14.17' }
+ dev: true
+
/minizlib@2.1.2:
resolution:
{
@@ -11357,16 +11330,6 @@ packages:
mkdirp: 1.0.4
dev: true
- /mkdirp@0.5.6:
- resolution:
- {
- integrity: sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==,
- }
- hasBin: true
- dependencies:
- minimist: 1.2.8
- dev: false
-
/mkdirp@1.0.4:
resolution:
{
@@ -11603,13 +11566,6 @@ packages:
semver: 7.5.2
dev: false
- /node-addon-api@3.2.1:
- resolution:
- {
- integrity: sha512-mmcei9JghVNDYydghQmeDX8KoAm0FAiYyIcUt/N4nhyAipB17pllZQDOJD2fotxABnt4Mdz+dKTO7eftLg4d0A==,
- }
- dev: true
-
/node-cache@5.1.2:
resolution:
{
@@ -11668,12 +11624,26 @@ packages:
whatwg-url: 5.0.0
dev: true
- /node-gyp-build@4.6.0:
+ /node-gyp@10.0.1:
resolution:
{
- integrity: sha512-NTZVKn9IylLwUzaKjkas1e4u2DLNcV4rdYagA4PWdPwW87Bi7z+BznyKSRwS/761tV/lzCGXplWsiaMjLqP2zQ==,
+ integrity: sha512-gg3/bHehQfZivQVfqIyy8wTdSymF9yTyP4CJifK73imyNMU8AIGQE2pUa7dNWfmMeG9cDVF2eehiRMv0LC1iAg==,
}
+ engines: { node: ^16.14.0 || >=18.0.0 }
hasBin: true
+ dependencies:
+ env-paths: 2.2.1
+ exponential-backoff: 3.1.1
+ glob: 10.3.10
+ graceful-fs: 4.2.11
+ make-fetch-happen: 13.0.0
+ nopt: 7.2.0
+ proc-log: 3.0.0
+ semver: 7.5.2
+ tar: 6.1.15
+ which: 4.0.0
+ transitivePeerDependencies:
+ - supports-color
dev: true
/node-gyp@8.4.1:
@@ -11729,6 +11699,13 @@ packages:
}
dev: true
+ /node-machine-id@1.1.12:
+ resolution:
+ {
+ integrity: sha512-QNABxbrPa3qEIfrE6GOJ7BYIuignnJw7iQ2YPbc3Nla1HzRJjXzZOiikfF8m7eAMfichLt3M4VgLOetqgDmgGQ==,
+ }
+ dev: true
+
/node-releases@2.0.13:
resolution:
{
@@ -11758,6 +11735,17 @@ packages:
abbrev: 1.1.1
dev: true
+ /nopt@7.2.0:
+ resolution:
+ {
+ integrity: sha512-CVDtwCdhYIvnAzFoJ6NJ6dX3oga9/HyciQDnG1vQDjSLMeKLJ4A93ZqYKDrgYSr1FBY5/hMYC+2VCi24pgpkGA==,
+ }
+ engines: { node: ^14.17.0 || ^16.13.0 || >=18.0.0 }
+ hasBin: true
+ dependencies:
+ abbrev: 2.0.0
+ dev: true
+
/normalize-package-data@2.5.0:
resolution:
{
@@ -11796,6 +11784,19 @@ packages:
validate-npm-package-license: 3.0.4
dev: true
+ /normalize-package-data@6.0.0:
+ resolution:
+ {
+ integrity: sha512-UL7ELRVxYBHBgYEtZCXjxuD5vPxnmvMGq0jp/dGPKKrN7tfsBh2IY7TlJ15WWwdjRWD3RJbnsygUurTK3xkPkg==,
+ }
+ engines: { node: ^16.14.0 || >=18.0.0 }
+ dependencies:
+ hosted-git-info: 7.0.1
+ is-core-module: 2.12.1
+ semver: 7.5.2
+ validate-npm-package-license: 3.0.4
+ dev: true
+
/normalize-path@3.0.0:
resolution:
{
@@ -11886,6 +11887,19 @@ packages:
validate-npm-package-name: 5.0.0
dev: true
+ /npm-package-arg@11.0.1:
+ resolution:
+ {
+ integrity: sha512-M7s1BD4NxdAvBKUPqqRW957Xwcl/4Zvo8Aj+ANrzvIPzGJZElrH7Z//rSaec2ORcND6FHHLnZeY8qgTpXDMFQQ==,
+ }
+ engines: { node: ^16.14.0 || >=18.0.0 }
+ dependencies:
+ hosted-git-info: 7.0.1
+ proc-log: 3.0.0
+ semver: 7.5.2
+ validate-npm-package-name: 5.0.0
+ dev: true
+
/npm-package-arg@8.1.1:
resolution:
{
@@ -11948,6 +11962,16 @@ packages:
ignore-walk: 6.0.3
dev: true
+ /npm-packlist@8.0.2:
+ resolution:
+ {
+ integrity: sha512-shYrPFIS/JLP4oQmAwDyk5HcyysKW8/JLTEA32S0Z5TzvpaeeX2yMFfoK1fjEBnCBvVyIB/Jj/GBFdm0wsgzbA==,
+ }
+ engines: { node: ^14.17.0 || ^16.13.0 || >=18.0.0 }
+ dependencies:
+ ignore-walk: 6.0.4
+ dev: true
+
/npm-pick-manifest@6.1.1:
resolution:
{
@@ -11973,6 +11997,19 @@ packages:
semver: 7.5.2
dev: true
+ /npm-pick-manifest@9.0.0:
+ resolution:
+ {
+ integrity: sha512-VfvRSs/b6n9ol4Qb+bDwNGUXutpy76x6MARw/XssevE0TnctIKcmklJZM5Z7nqs5z5aW+0S63pgCNbpkUNNXBg==,
+ }
+ engines: { node: ^16.14.0 || >=18.0.0 }
+ dependencies:
+ npm-install-checks: 6.1.1
+ npm-normalize-package-bin: 3.0.1
+ npm-package-arg: 11.0.1
+ semver: 7.5.2
+ dev: true
+
/npm-registry-fetch@12.0.2:
resolution:
{
@@ -11998,12 +12035,30 @@ packages:
}
engines: { node: ^14.17.0 || ^16.13.0 || >=18.0.0 }
dependencies:
- make-fetch-happen: 11.1.1
- minipass: 5.0.0
+ make-fetch-happen: 11.1.1
+ minipass: 5.0.0
+ minipass-fetch: 3.0.3
+ minipass-json-stream: 1.0.1
+ minizlib: 2.1.2
+ npm-package-arg: 10.1.0
+ proc-log: 3.0.0
+ transitivePeerDependencies:
+ - supports-color
+ dev: true
+
+ /npm-registry-fetch@16.1.0:
+ resolution:
+ {
+ integrity: sha512-PQCELXKt8Azvxnt5Y85GseQDJJlglTFM9L9U9gkv2y4e9s0k3GVDdOx3YoB6gm2Do0hlkzC39iCGXby+Wve1Bw==,
+ }
+ engines: { node: ^16.14.0 || >=18.0.0 }
+ dependencies:
+ make-fetch-happen: 13.0.0
+ minipass: 7.0.2
minipass-fetch: 3.0.3
minipass-json-stream: 1.0.1
minizlib: 2.1.2
- npm-package-arg: 10.1.0
+ npm-package-arg: 11.0.1
proc-log: 3.0.0
transitivePeerDependencies:
- supports-color
@@ -12052,46 +12107,47 @@ packages:
engines: { node: '>=0.10.0' }
dev: true
- /nx@16.5.5:
+ /nx@17.3.0:
resolution:
{
- integrity: sha512-DHwoUtkirI52JIlCtRK78UI/Ik/VgCtM6FlkfPnFsy8PVyTYMQ40KoG6aZLHjqj5qxoGG2CUjcsbFjGXYrjDbw==,
+ integrity: sha512-CoY0qUrO8xErbA/v/bbfDGs+KaD9MCO7PReqmIeyrtDNwFl6vnb+U2MpBxCsRP+YH2Oa8hI8Lu+kcnPktx2v6A==,
}
hasBin: true
requiresBuild: true
peerDependencies:
- '@swc-node/register': ^1.4.2
- '@swc/core': ^1.2.173
+ '@swc-node/register': ^1.6.7
+ '@swc/core': ^1.3.85
peerDependenciesMeta:
'@swc-node/register':
optional: true
'@swc/core':
optional: true
dependencies:
- '@nrwl/tao': 16.5.5
- '@parcel/watcher': 2.0.4
+ '@nrwl/tao': 17.3.0
'@yarnpkg/lockfile': 1.1.0
'@yarnpkg/parsers': 3.0.0-rc.46
'@zkochan/js-yaml': 0.0.6
- axios: 1.4.0
+ axios: 1.6.7
chalk: 4.1.2
cli-cursor: 3.1.0
cli-spinners: 2.6.1
- cliui: 7.0.4
- dotenv: 10.0.0
+ cliui: 8.0.1
+ dotenv: 16.3.1
+ dotenv-expand: 10.0.0
enquirer: 2.3.6
- fast-glob: 3.2.7
figures: 3.2.0
flat: 5.0.2
fs-extra: 11.1.1
- glob: 7.1.4
- ignore: 5.2.4
+ ignore: 5.3.0
+ jest-diff: 29.6.1
js-yaml: 4.1.0
jsonc-parser: 3.2.0
lines-and-columns: 2.0.3
- minimatch: 3.0.5
+ minimatch: 9.0.3
+ node-machine-id: 1.1.12
npm-run-path: 4.0.1
open: 8.4.2
+ ora: 5.3.0
semver: 7.5.3
string-width: 4.2.3
strong-log-transformer: 2.1.0
@@ -12099,20 +12155,19 @@ packages:
tmp: 0.2.1
tsconfig-paths: 4.2.0
tslib: 2.6.2
- v8-compile-cache: 2.3.0
yargs: 17.7.2
yargs-parser: 21.1.1
optionalDependencies:
- '@nx/nx-darwin-arm64': 16.5.5
- '@nx/nx-darwin-x64': 16.5.5
- '@nx/nx-freebsd-x64': 16.5.5
- '@nx/nx-linux-arm-gnueabihf': 16.5.5
- '@nx/nx-linux-arm64-gnu': 16.5.5
- '@nx/nx-linux-arm64-musl': 16.5.5
- '@nx/nx-linux-x64-gnu': 16.5.5
- '@nx/nx-linux-x64-musl': 16.5.5
- '@nx/nx-win32-arm64-msvc': 16.5.5
- '@nx/nx-win32-x64-msvc': 16.5.5
+ '@nx/nx-darwin-arm64': 17.3.0
+ '@nx/nx-darwin-x64': 17.3.0
+ '@nx/nx-freebsd-x64': 17.3.0
+ '@nx/nx-linux-arm-gnueabihf': 17.3.0
+ '@nx/nx-linux-arm64-gnu': 17.3.0
+ '@nx/nx-linux-arm64-musl': 17.3.0
+ '@nx/nx-linux-x64-gnu': 17.3.0
+ '@nx/nx-linux-x64-musl': 17.3.0
+ '@nx/nx-win32-arm64-msvc': 17.3.0
+ '@nx/nx-win32-x64-msvc': 17.3.0
transitivePeerDependencies:
- debug
dev: true
@@ -12170,7 +12225,7 @@ packages:
normalize-package-data: 3.0.3
semver: 7.5.2
shelljs: 0.8.5
- tslib: 2.6.1
+ tslib: 2.6.2
yeoman-environment: 3.19.3
yeoman-generator: 5.9.0(yeoman-environment@3.19.3)
yosay: 2.0.2
@@ -12200,16 +12255,6 @@ packages:
dependencies:
wrappy: 1.0.2
- /onetime@2.0.1:
- resolution:
- {
- integrity: sha512-oyyPpiMaKARvvcgip+JV+7zci5L8D1W9RZIz2l1o08AM3pfspitVWnPt3mzHcBPp12oYMTy0pqrFs/C+m3EwsQ==,
- }
- engines: { node: '>=4' }
- dependencies:
- mimic-fn: 1.2.0
- dev: true
-
/onetime@5.1.2:
resolution:
{
@@ -12257,6 +12302,23 @@ packages:
type-check: 0.4.0
dev: true
+ /ora@5.3.0:
+ resolution:
+ {
+ integrity: sha512-zAKMgGXUim0Jyd6CXK9lraBnD3H5yPGBPPOkC23a2BG6hsm4Zu6OQSjQuEtV0BHDf4aKHcUFvJiGRrFuW3MG8g==,
+ }
+ engines: { node: '>=10' }
+ dependencies:
+ bl: 4.1.0
+ chalk: 4.1.2
+ cli-cursor: 3.1.0
+ cli-spinners: 2.9.0
+ is-interactive: 1.0.0
+ log-symbols: 4.1.0
+ strip-ansi: 6.0.1
+ wcwidth: 1.0.1
+ dev: true
+
/ora@5.4.1:
resolution:
{
@@ -12545,6 +12607,37 @@ packages:
- supports-color
dev: true
+ /pacote@17.0.6:
+ resolution:
+ {
+ integrity: sha512-cJKrW21VRE8vVTRskJo78c/RCvwJCn1f4qgfxL4w77SOWrTCRcmfkYHlHtS0gqpgjv3zhXflRtgsrUCX5xwNnQ==,
+ }
+ engines: { node: ^16.14.0 || >=18.0.0 }
+ hasBin: true
+ dependencies:
+ '@npmcli/git': 5.0.4
+ '@npmcli/installed-package-contents': 2.0.2
+ '@npmcli/promise-spawn': 7.0.1
+ '@npmcli/run-script': 7.0.2
+ cacache: 18.0.2
+ fs-minipass: 3.0.2
+ minipass: 7.0.2
+ npm-package-arg: 11.0.1
+ npm-packlist: 8.0.2
+ npm-pick-manifest: 9.0.0
+ npm-registry-fetch: 16.1.0
+ proc-log: 3.0.0
+ promise-retry: 2.0.1
+ read-package-json: 7.0.0
+ read-package-json-fast: 3.0.2
+ sigstore: 2.2.0
+ ssri: 10.0.4
+ tar: 6.1.15
+ transitivePeerDependencies:
+ - bluebird
+ - supports-color
+ dev: true
+
/pad-component@0.0.1:
resolution:
{
@@ -12652,6 +12745,16 @@ packages:
ansi-escapes: 3.2.0
cross-spawn: 6.0.5
+ /password-prompt@1.1.3:
+ resolution:
+ {
+ integrity: sha512-HkrjG2aJlvF0t2BMH0e2LB/EHf3Lcq3fNMzy4GYHcQblAvOl+QQji1Lx7WRBMqpVK8p+KR7bCg7oqAMXtdgqyw==,
+ }
+ dependencies:
+ ansi-escapes: 4.3.2
+ cross-spawn: 7.0.3
+ dev: false
+
/path-case@3.0.4:
resolution:
{
@@ -12797,10 +12900,10 @@ packages:
split2: 4.2.0
dev: false
- /pino-pretty@10.2.3:
+ /pino-pretty@10.3.1:
resolution:
{
- integrity: sha512-4jfIUc8TC1GPUfDyMSlW1STeORqkoxec71yhxIpLDQapUu8WOuoz2TTCoidrIssyz78LZC69whBMPIKCMbi3cw==,
+ integrity: sha512-az8JbIYeN/1iLj2t0jR9DV48/LQ3RC6hZPpapKPkb84Q+yTidMCpgWxIT3N0flnBDilyBQ1luWNpOeJptjdp/g==,
}
hasBin: true
dependencies:
@@ -12808,7 +12911,7 @@ packages:
dateformat: 4.6.3
fast-copy: 3.0.1
fast-safe-stringify: 2.1.1
- help-me: 4.2.0
+ help-me: 5.0.0
joycon: 3.1.1
minimist: 1.2.8
on-exit-leak-free: 2.1.0
@@ -12827,10 +12930,10 @@ packages:
}
dev: false
- /pino@8.16.0:
+ /pino@8.17.2:
resolution:
{
- integrity: sha512-UUmvQ/7KTZt/vHjhRrnyS7h+J7qPBQnpG80V56xmIC+o9IqYmQOw/UIny9S9zYDfRBR0ClouCr464EkBMIT7Fw==,
+ integrity: sha512-LA6qKgeDMLr2ux2y/YiUt47EfgQ+S9LznBWOJdN3q1dx2sv0ziDLUBeVpyVv17TEcGCBuWf0zNtg3M5m1NhhWQ==,
}
hasBin: true
dependencies:
@@ -12839,7 +12942,7 @@ packages:
on-exit-leak-free: 2.1.0
pino-abstract-transport: 1.1.0
pino-std-serializers: 6.2.2
- process-warning: 2.2.0
+ process-warning: 3.0.0
quick-format-unescaped: 4.0.4
real-require: 0.2.0
safe-stable-stringify: 2.4.3
@@ -12946,14 +13049,6 @@ packages:
react-is: 18.2.0
dev: true
- /pretty-hrtime@1.0.3:
- resolution:
- {
- integrity: sha512-66hKPCr+72mlfiSjlEB1+45IjXSqvVAIy6mocupoww4tBFE9R9IhwwUGoI4G++Tc9Aq+2rxOt0RFU6gPcrte0A==,
- }
- engines: { node: '>= 0.8' }
- dev: true
-
/proc-log@1.0.0:
resolution:
{
@@ -12975,10 +13070,10 @@ packages:
integrity: sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==,
}
- /process-warning@2.2.0:
+ /process-warning@3.0.0:
resolution:
{
- integrity: sha512-/1WZ8+VQjR6avWOgHeEPd7SDQmFQ1B5mC1eRXsCm5TarlNmx/wCsa5GEaxGm05BORRtyG/Ex/3xq3TuRvq57qg==,
+ integrity: sha512-mqn0kFRl0EoqhnL0GQ0veqFHyIN1yig9RHh/InzORTUiZHFRAur+aMtRkELNwGs9aNwKS6tg/An4NYBPGwvtzQ==,
}
dev: false
@@ -13274,6 +13369,19 @@ packages:
npm-normalize-package-bin: 3.0.1
dev: true
+ /read-package-json@7.0.0:
+ resolution:
+ {
+ integrity: sha512-uL4Z10OKV4p6vbdvIXB+OzhInYtIozl/VxUBPgNkBuUi2DeRonnuspmaVAMcrkmfjKGNmRndyQAbE7/AmzGwFg==,
+ }
+ engines: { node: ^16.14.0 || >=18.0.0 }
+ dependencies:
+ glob: 10.3.3
+ json-parse-even-better-errors: 3.0.0
+ normalize-package-data: 6.0.0
+ npm-normalize-package-bin: 3.0.1
+ dev: true
+
/read-pkg-up@3.0.0:
resolution:
{
@@ -13560,17 +13668,6 @@ packages:
dependencies:
lowercase-keys: 2.0.0
- /restore-cursor@2.0.0:
- resolution:
- {
- integrity: sha512-6IzJLuGi4+R14vwagDHX+JrXmPVtPpn4mffDJ1UdR7/Edm87fl6yi8mMBIVvFtJaNTUvjughmW4hwLhRG7gC1Q==,
- }
- engines: { node: '>=4' }
- dependencies:
- onetime: 2.0.1
- signal-exit: 3.0.7
- dev: true
-
/restore-cursor@3.1.0:
resolution:
{
@@ -13603,16 +13700,6 @@ packages:
}
engines: { iojs: '>=1.0.0', node: '>=0.10.0' }
- /rimraf@2.7.1:
- resolution:
- {
- integrity: sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==,
- }
- hasBin: true
- dependencies:
- glob: 7.2.3
- dev: false
-
/rimraf@3.0.2:
resolution:
{
@@ -13667,6 +13754,7 @@ packages:
engines: { npm: '>=2.0.0' }
dependencies:
tslib: 1.14.1
+ dev: false
/rxjs@7.8.1:
resolution:
@@ -13751,13 +13839,6 @@ packages:
}
dev: false
- /semver-compare@1.0.0:
- resolution:
- {
- integrity: sha512-YM3/ITh2MJ5MtzaM429anh+x2jiLVjqILF4m4oyQB18W7Ggea7BfqdH/wGMK7dDiMghv/6WG7znWMwUDzJiXow==,
- }
- dev: true
-
/semver@5.7.2:
resolution:
{
@@ -13959,6 +14040,23 @@ packages:
- supports-color
dev: true
+ /sigstore@2.2.0:
+ resolution:
+ {
+ integrity: sha512-fcU9clHwEss2/M/11FFM8Jwc4PjBgbhXoNskoK5guoK0qGQBSeUbQZRJ+B2fDFIvhyf0gqCaPrel9mszbhAxug==,
+ }
+ engines: { node: ^16.14.0 || >=18.0.0 }
+ dependencies:
+ '@sigstore/bundle': 2.1.1
+ '@sigstore/core': 0.2.0
+ '@sigstore/protobuf-specs': 0.2.1
+ '@sigstore/sign': 2.2.1
+ '@sigstore/tuf': 2.3.0
+ '@sigstore/verify': 0.1.0
+ transitivePeerDependencies:
+ - supports-color
+ dev: true
+
/simple-concat@1.0.1:
resolution:
{
@@ -14003,11 +14101,21 @@ packages:
- supports-color
dev: false
+ /simple-swizzle@0.2.2:
+ resolution:
+ {
+ integrity: sha512-JA//kQgZtbuY83m+xT+tXJkmJncGMTFT+C+g2h2R9uxkYIrE2yy9sgmcLhCnw57/WSD+Eh3J97FPEDFnbXnDUg==,
+ }
+ dependencies:
+ is-arrayish: 0.3.2
+ dev: false
+
/sinon@11.1.2:
resolution:
{
integrity: sha512-59237HChms4kg7/sXhiRcUzdSkKuydDeTiamT/jesUVHshBgL8XAmhgFo0GfK6RruMDM/iRSij1EybmMog9cJw==,
}
+ deprecated: 16.1.1
dependencies:
'@sinonjs/commons': 1.8.6
'@sinonjs/fake-timers': 7.1.2
@@ -14114,7 +14222,6 @@ packages:
socks: 2.7.1
transitivePeerDependencies:
- supports-color
- dev: false
/socks@2.7.1:
resolution:
@@ -14182,6 +14289,14 @@ packages:
}
engines: { node: '>=0.10.0' }
+ /source-map@0.7.4:
+ resolution:
+ {
+ integrity: sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA==,
+ }
+ engines: { node: '>= 8' }
+ dev: true
+
/spawn-command@0.0.2-1:
resolution:
{
@@ -14643,22 +14758,6 @@ packages:
minizlib: 2.1.2
mkdirp: 1.0.4
yallist: 4.0.0
- dev: true
-
- /tar@6.1.9:
- resolution:
- {
- integrity: sha512-XjLaMNl76o07zqZC/aW4lwegdY07baOH1T8w3AEfrHAdyg/oYO4ctjzEBq9Gy9fEP9oHqLIgvx6zuGDGe+bc8Q==,
- }
- engines: { node: '>= 10' }
- dependencies:
- chownr: 2.0.0
- fs-minipass: 2.1.0
- minipass: 3.3.6
- minizlib: 2.1.2
- mkdirp: 1.0.4
- yallist: 4.0.0
- dev: false
/temp-dir@1.0.0:
resolution:
@@ -14839,13 +14938,6 @@ packages:
integrity: sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==,
}
- /traverse@0.3.9:
- resolution:
- {
- integrity: sha512-iawgk0hLP3SxGKDfnDJf8wTz4p2qImnyihM5Hh/sGvQ3K37dPi/w8sRhdNIxYA1TwFwc5mDhIJq+O0RsvXBKdQ==,
- }
- dev: false
-
/tree-kill@1.2.2:
resolution:
{
@@ -14869,43 +14961,6 @@ packages:
engines: { node: '>=8' }
dev: true
- /ts-jest@29.1.1(@babel/core@7.18.2)(jest@29.6.0)(typescript@5.0.2):
- resolution:
- {
- integrity: sha512-D6xjnnbP17cC85nliwGiL+tpoKN0StpgE0TeOjXQTU6MVCfsB4v7aW05CgQ/1OywGb0x/oy9hHFnN+sczTiRaA==,
- }
- engines: { node: ^14.15.0 || ^16.10.0 || >=18.0.0 }
- hasBin: true
- peerDependencies:
- '@babel/core': '>=7.0.0-beta.0 <8'
- '@jest/types': ^29.0.0
- babel-jest: ^29.0.0
- esbuild: '*'
- jest: ^29.0.0
- typescript: '>=4.3 <6'
- peerDependenciesMeta:
- '@babel/core':
- optional: true
- '@jest/types':
- optional: true
- babel-jest:
- optional: true
- esbuild:
- optional: true
- dependencies:
- '@babel/core': 7.18.2
- bs-logger: 0.2.6
- fast-json-stable-stringify: 2.1.0
- jest: 29.6.0(@types/node@20.4.4)(ts-node@10.7.0)
- jest-util: 29.6.1
- json5: 2.2.3
- lodash.memoize: 4.1.2
- make-error: 1.3.6
- semver: 7.5.4
- typescript: 5.0.2
- yargs-parser: 21.1.1
- dev: true
-
/ts-jest@29.1.1(@babel/core@7.18.2)(jest@29.6.1)(typescript@5.0.2):
resolution:
{
@@ -14959,10 +15014,10 @@ packages:
typescript: 4.3.5
dev: true
- /ts-loader@9.4.2(typescript@5.0.2)(webpack@5.88.2):
+ /ts-loader@9.5.1(typescript@5.0.2)(webpack@5.88.2):
resolution:
{
- integrity: sha512-OmlC4WVmFv5I0PpaxYb+qGeGOdm5giHU7HwDDUjw59emP2UYMHy9fFSDcYgSNoH8sXcj4hGCSEhlDZ9ULeDraA==,
+ integrity: sha512-rNH3sK9kGZcH9dYzC7CewQm4NtxJTjSEVRJ2DyBZR7f8/wcta+iV44UPCXc5+nzDzivKtlzV6c9P4e+oFhDLYg==,
}
engines: { node: '>=12.0.0' }
peerDependencies:
@@ -14973,6 +15028,7 @@ packages:
enhanced-resolve: 5.15.0
micromatch: 4.0.5
semver: 7.5.2
+ source-map: 0.7.4
typescript: 5.0.2
webpack: 5.88.2
dev: true
@@ -15011,40 +15067,6 @@ packages:
yn: 3.1.1
dev: true
- /ts-node@10.7.0(@types/node@20.4.4)(typescript@5.0.2):
- resolution:
- {
- integrity: sha512-TbIGS4xgJoX2i3do417KSaep1uRAW/Lu+WAL2doDHC0D6ummjirVOXU5/7aiZotbQ5p1Zp9tP7U6cYhA0O7M8A==,
- }
- hasBin: true
- peerDependencies:
- '@swc/core': '>=1.2.50'
- '@swc/wasm': '>=1.2.50'
- '@types/node': '*'
- typescript: '>=2.7'
- peerDependenciesMeta:
- '@swc/core':
- optional: true
- '@swc/wasm':
- optional: true
- dependencies:
- '@cspotcode/source-map-support': 0.7.0
- '@tsconfig/node10': 1.0.9
- '@tsconfig/node12': 1.0.11
- '@tsconfig/node14': 1.0.3
- '@tsconfig/node16': 1.0.4
- '@types/node': 20.4.4
- acorn: 8.10.0
- acorn-walk: 8.2.0
- arg: 4.1.3
- create-require: 1.1.1
- diff: 4.0.2
- make-error: 1.3.6
- typescript: 5.0.2
- v8-compile-cache-lib: 3.0.1
- yn: 3.1.1
- dev: true
-
/ts-node@10.9.1(@types/node@14.14.7)(typescript@5.0.2):
resolution:
{
@@ -15078,10 +15100,10 @@ packages:
v8-compile-cache-lib: 3.0.1
yn: 3.1.1
- /ts-node@10.9.1(@types/node@20.4.4)(typescript@5.0.2):
+ /ts-node@10.9.2(@types/node@10.0.0)(typescript@5.0.2):
resolution:
{
- integrity: sha512-NtVysVPkxxrwFGUUxGYhfux8k78pQB3JqYBXlLRZgdGUqTO5wU/UyHop5p70iEbGhB7q5KmiZiU0Y3KlJrScEw==,
+ integrity: sha512-f0FFpIdcHgn8zcPSbf1dRevwt047YMnaiJM3u2w2RewrB+fob/zePZcrOyQoLMMO7aBIddLcQIEK5dYjkLnGrQ==,
}
hasBin: true
peerDependencies:
@@ -15100,7 +15122,7 @@ packages:
'@tsconfig/node12': 1.0.11
'@tsconfig/node14': 1.0.3
'@tsconfig/node16': 1.0.4
- '@types/node': 20.4.4
+ '@types/node': 10.0.0
acorn: 8.10.0
acorn-walk: 8.2.0
arg: 4.1.3
@@ -15110,7 +15132,7 @@ packages:
typescript: 5.0.2
v8-compile-cache-lib: 3.0.1
yn: 3.1.1
- dev: false
+ dev: true
/ts-node@9.1.1(typescript@4.9.5):
resolution:
@@ -15158,6 +15180,14 @@ packages:
engines: { node: '>=6' }
dev: false
+ /ts-retry-promise@0.8.0:
+ resolution:
+ {
+ integrity: sha512-elI/GkojPANBikPaMWQnk4T/bOJ6tq/hqXyQRmhfC9PAD6MoHmXIXK7KilJrlpx47VAKCGcmBrTeK5dHk6YAYg==,
+ }
+ engines: { node: '>=6' }
+ dev: false
+
/tsc-alias@1.8.3:
resolution:
{
@@ -15197,13 +15227,6 @@ packages:
integrity: sha512-hcVC3wYEziELGGmEEXue7D75zbwIIVUMWAVbHItGPx0ziyXxrOMQx4rQEVEV45Ut/1IotuEvwqPopzIOkDMf0A==,
}
- /tslib@2.6.1:
- resolution:
- {
- integrity: sha512-t0hLfiEKfMUoqhG+U1oid7Pva4bbDPHYfJNiB7BiIjRkj1pyC++4N3huJfqY6aRH6VTB0rvtzQwjM4K6qpfOig==,
- }
- dev: true
-
/tslib@2.6.2:
resolution:
{
@@ -15237,6 +15260,20 @@ packages:
- supports-color
dev: true
+ /tuf-js@2.2.0:
+ resolution:
+ {
+ integrity: sha512-ZSDngmP1z6zw+FIkIBjvOp/II/mIub/O7Pp12j1WNsiCpg5R5wAc//i555bBQsE44O94btLt0xM/Zr2LQjwdCg==,
+ }
+ engines: { node: ^16.14.0 || >=18.0.0 }
+ dependencies:
+ '@tufjs/models': 2.0.0
+ debug: 4.3.4(supports-color@8.1.1)
+ make-fetch-happen: 13.0.0
+ transitivePeerDependencies:
+ - supports-color
+ dev: true
+
/tunnel-agent@0.6.0:
resolution:
{
@@ -15469,24 +15506,6 @@ packages:
engines: { node: '>=8' }
dev: true
- /unzipper@0.10.14:
- resolution:
- {
- integrity: sha512-ti4wZj+0bQTiX2KmKWuwj7lhV+2n//uXEotUmGuQqrbVZSEGFMbI68+c6JCQ8aAmUWYvtHEz2A8K6wXvueR/6g==,
- }
- dependencies:
- big-integer: 1.6.51
- binary: 0.3.0
- bluebird: 3.4.7
- buffer-indexof-polyfill: 1.0.2
- duplexer2: 0.1.4
- fstream: 1.0.12
- graceful-fs: 4.2.11
- listenercount: 1.0.1
- readable-stream: 2.3.8
- setimmediate: 1.0.5
- dev: false
-
/upath@2.0.1:
resolution:
{
@@ -15596,13 +15615,6 @@ packages:
integrity: sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg==,
}
- /v8-compile-cache@2.3.0:
- resolution:
- {
- integrity: sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==,
- }
- dev: true
-
/v8-to-istanbul@9.1.0:
resolution:
{
@@ -15858,6 +15870,17 @@ packages:
isexe: 2.0.0
dev: true
+ /which@4.0.0:
+ resolution:
+ {
+ integrity: sha512-GlaYyEb07DPxYCKhKzplCWBJtvxZcZMrL+4UkrTSJHHPyZU4mYYTv3qaOe77H7EODLSSopAUFAc6W8U4yqvscg==,
+ }
+ engines: { node: ^16.13.0 || >=18.0.0 }
+ hasBin: true
+ dependencies:
+ isexe: 3.1.1
+ dev: true
+
/wide-align@1.1.5:
resolution:
{
@@ -16100,14 +16123,6 @@ packages:
engines: { node: '>= 6' }
dev: true
- /yargs-parser@20.2.4:
- resolution:
- {
- integrity: sha512-WOkpgNhPTlE73h4VFAFsOnomJVaovO8VqLDzy5saChRBFQFBoMYirowyW+Q9HB4HFF4Z7VZTiG3iSzJJA29yRA==,
- }
- engines: { node: '>=10' }
- dev: true
-
/yargs-parser@20.2.9:
resolution:
{