Skip to content

Commit

Permalink
feat(deps): update to v6 of salesforce dependencies (#3)
Browse files Browse the repository at this point in the history
Update to v6 of salesforce dependencies
  • Loading branch information
azlam-abdulsalam authored Jan 29, 2024
1 parent 45a73ed commit 9e71429
Show file tree
Hide file tree
Showing 13 changed files with 11,954 additions and 15,806 deletions.
6 changes: 2 additions & 4 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
@@ -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?

7 changes: 5 additions & 2 deletions .github/workflows/buildPackages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}'
Expand Down
8 changes: 6 additions & 2 deletions .github/workflows/review.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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 }}


1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -23,3 +23,4 @@ packages/apexlink/coverage
packages/sfp-cli/oclif.manifest.json
packages/apexlink/tests/resources/core-crm/apexlink.json
packages/apexlink/tests/resources/feature-mgmt/apexlink.json
.nx
12 changes: 6 additions & 6 deletions dockerfiles/sfp.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ 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

Expand All @@ -13,9 +13,9 @@ LABEL org.opencontainers.image.licenses "MIT"
LABEL org.opencontainers.image.url "https://github.com/flxbl-io/sfp"
LABEL org.opencontainers.image.documentation "https://docs.flxbl.io"
LABEL org.opencontainers.image.revision $GIT_COMMIT
LABEL org.opencontainers.image.vendor "DX@Scale"
LABEL org.opencontainers.image.vendor "Flxbl"
LABEL org.opencontainers.image.source "https://github.com/flxbl-io/sfp"
LABEL org.opencontainers.image.title "DX@Scale sfpowercripts docker image - January 24"
LABEL org.opencontainers.image.title "Flxbl sfp docker image - January 24"


ENV DEBIAN_FRONTEND=noninteractive
Expand Down Expand Up @@ -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/[email protected] \
&& echo 'y' | sf plugins:install @salesforce/[email protected] \
Expand Down
7 changes: 3 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
2 changes: 0 additions & 2 deletions packages/apexlink/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,6 @@
},
"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",
Expand Down
14 changes: 7 additions & 7 deletions packages/sfp-cli/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,12 @@
"@oclif/core": "2.11.8",
"@oclif/plugin-commands": "^3.0.3",
"@oclif/plugin-help": "5.2.17",
"@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",
"@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",
Expand Down Expand Up @@ -82,7 +82,7 @@
"typescript": "^5"
},
"engines": {
"node": ">=16.0.0"
"node": ">=18.0.0"
},
"files": [
"/lib",
Expand Down
3 changes: 2 additions & 1 deletion packages/sfp-cli/src/commands/pool/org/delete.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@ 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);
Expand Down
6 changes: 2 additions & 4 deletions packages/sfp-cli/src/core/scratchorg/pool/PoolFetchImpl.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
3 changes: 2 additions & 1 deletion packages/sfp-cli/src/flags/sfdxflags.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions packages/sfprofiles/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -60,16 +60,16 @@
},
"dependencies": {
"@flxblio/sfp-logger": "^2.1.3",
"@salesforce/core": "5.3.9",
"@salesforce/source-deploy-retrieve": "9.7.24",
"@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",
"diff-match-patch": "^1.0.5",
"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",
Expand Down
Loading

0 comments on commit 9e71429

Please sign in to comment.