qfpm 1.1.2 → 1.1.4

package/README.md

@@ -15,11 +15,9 @@ The package mangement methodology intended with qfpm is meant to aid with the de
 
 - Updated the commands for the new sf structure
 
-- The removal of the bin/qfpm script dependancy complete, automated removal doesn't seem to work so feel free to delete them after upgrading
+- Fixed install not deploying dependancies
 
-- Conversion to using native npm bin definition seems stable and opens up better linux support
-
-- WSL support seems to be working though with a big salesforce asterisk down in the AT4DX example
+- Updated github workflow for tests
 
 ## Install
 
@@ -37,6 +35,10 @@ The package mangement methodology intended with qfpm is meant to aid with the de
     ```bash
     npm install qfpm --save --only=prod
     ```
+1. Approve the qfpm tools to use scripts with*
+    ```bash
+    npm approve-scripts qfpm
+    ```
 1. Run setup to create scratch org and deploy dependancies
     ```bash
     npm run setup
@@ -69,6 +71,10 @@ This example demonstates facilitating two layers of dependancies required to get
     ```bash
     npm install --save qfpm
     ```
+1. Approve the qfpm tools to use scripts with*
+    ```bash
+    npm approve-scripts qfpm
+    ```
 1. install the the fflib commons
     ```bash
     npm install --save npm-fflib-common
@@ -100,6 +106,10 @@ This example expands on the previous fflib sample code to satisfy the requirment
     ```bash
     npm install --save qfpm
     ```
+1. Approve the qfpm tools to use scripts with*
+    ```bash
+    npm approve-scripts qfpm
+    ```
 1. install the at4dx libraries
     ```bash
     npm install --save npm-at4dx

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "qfpm",
-    "version": "1.1.2",
+    "version": "1.1.4",
     "description": "Salesforce package management tool set for mananging dependencies between packages",
     "main": "index.js",
     "man": "./README.md",

package/src/build.sh

@@ -12,5 +12,5 @@ if [ "$DXPM_CURRENT_PACKAGE_NAME" = "" ]; then
   DXPM_CURRENT_PACKAGE_NAME="$($DXPM_NODE_MOD/.bin/qgetprojectname)"
 fi
 echo "[+] converting source for $DXPM_CURRENT_PACKAGE_NAME"
-sf force source convert -d "./manifest" -n "$DXPM_CURRENT_PACKAGE_NAME" -p "$($DXPM_NODE_MOD/.bin/qgetsrcfolders)" && wait
+sf project convert source -x "./manifest" -n "$DXPM_CURRENT_PACKAGE_NAME" -p "$($DXPM_NODE_MOD/.bin/qgetsrcfolders)" && wait
 echo "[+] finished converting source for $DXPM_CURRENT_PACKAGE_NAME"

package/src/deploy.sh

@@ -16,5 +16,6 @@ if [ "$DXPM_CURRENT_PACKAGE_NAME" = "" ]; then
 fi
 echo "[+] deploying $DXPM_CURRENT_PACKAGE_NAME metadata to scratch org $DXPM_SETUP_PACKAGE_NAME"
 #todo: read package.json for all folder locations
-sf force source deploy -p "$($DXPM_NODE_MOD/.bin/qgetsrcfolders)" -w 10 -u "$DXPM_SETUP_PACKAGE_NAME" && wait
+sf project deploy start -d "$($DXPM_NODE_MOD/.bin/qgetsrcfolders)" -o "$DXPM_SETUP_PACKAGE_NAME" --ignore-conflicts && wait
+sf project reset tracking -0 "$DXPM_SETUP_PACKAGE_NAME" && wait
 echo "[+] finished deploying $DXPM_CURRENT_PACKAGE_NAME metadata to scratch org $DXPM_SETUP_PACKAGE_NAME"

package/src/isqfpm.js

@@ -1,5 +1,8 @@
 #!/usr/bin/env node
-var packageJSON = require('fs').readFileSync(process.cwd()+'/package.json')
+var location
+if(process.argv[2]==undefined) location=process.cwd()
+else location=process.argv[2]
+var packageJSON = require('fs').readFileSync(location+'/package.json')
 var pack = JSON.parse(packageJSON)
 if(pack['dependencies']!==undefined){    
     if(pack['dependencies'].hasOwnProperty('qfpm')) process.exit()

package/src/isscratched.js

@@ -5,7 +5,7 @@ if(process.argv[2]==undefined){
   var pack = JSON.parse(packageJSON)
   scratchName=pack.name
 }else scratchName=process.argv[2]
-var orgsJSON = require('child_process').execSync('sf force org list --json')
+var orgsJSON = require('child_process').execSync('sf org list --json')
 var orgs = JSON.parse(orgsJSON).result
 orgs.scratchOrgs.forEach(org => {
   if(org.alias==scratchName) process.exit()

package/src/push.sh

@@ -11,5 +11,5 @@ if [ "$DXPM_SETUP_PACKAGE_NAME" = "" ]; then
   DXPM_SETUP_PACKAGE_NAME="$($DXPM_NODE_MOD/.bin/qgetprojectname)"
 fi
 echo "[+] pushing source to scratch org $DXPM_SETUP_PACKAGE_NAME"
-sf force source push -f -w 10 -o "$DXPM_SETUP_PACKAGE_NAME" && wait
+sf project deploy start -o "$DXPM_SETUP_PACKAGE_NAME" --ignore-conflicts && wait
 echo "[+] finished pushing source to scratch org $DXPM_SETUP_PACKAGE_NAME"

package/src/removedepends.sh

@@ -9,5 +9,5 @@ fi
 folders="$(find $DXPM_NODE_MOD/ -name sfdx-project.json)"
 folders="$(echo $folders | sed 's/\/sfdx-project.json//g')"
 for val in $folders; do
-    rm -fr $val
+  $DXPM_NODE_MOD/.bin/qisqfpm "$val" && npm approve-scripts $(basename "$val") && rm -fr $val
 done

package/src/scratch.sh

@@ -11,8 +11,8 @@ if [ "$DXPM_SETUP_PACKAGE_NAME" = "" ]; then
   DXPM_SETUP_PACKAGE_NAME="$($DXPM_NODE_MOD/.bin/qgetprojectname)"
 fi
 echo "[+] setting up scratch org $DXPM_SETUP_PACKAGE_NAME"
-sf force org create -f $PWD/config/project-scratch-def.json -a "$DXPM_SETUP_PACKAGE_NAME" -d 1 -w 5 && wait
+sf org create scratch -f $PWD/config/project-scratch-def.json -a "$DXPM_SETUP_PACKAGE_NAME" -d -y 1 && wait
 echo "[+] finished setting up scratch org $DXPM_SETUP_PACKAGE_NAME"
 echo "[+] setting scratch org $DXPM_SETUP_PACKAGE_NAME as default locally"
-sf force config set target-org $DXPM_SETUP_PACKAGE_NAME
+sf config set target-org $DXPM_SETUP_PACKAGE_NAME
 echo "[+] finished setting scratch org $DXPM_SETUP_PACKAGE_NAME as default username locally"

package/src/setup.sh

@@ -5,8 +5,13 @@ export DXPM_SETUP_PACKAGE_NAME="$($DXPM_NODE_MOD/.bin/qgetprojectname)"
 export DXPM_CURRENT_PACKAGE_NAME="$DXPM_SETUP_PACKAGE_NAME"
 echo "[+] checking if $DXPM_SETUP_PACKAGE_NAME scrach org exists or creating it"
 $DXPM_NODE_MOD/.bin/qisscratched || $DXPM_NODE_MOD/.bin/qscratch && wait
+if [ "$DXPM_SETUP_PACKAGE_NAME" = "$DXPM_CURRENT_PACKAGE_NAME" ]; then
+  echo "[+] removing dependancies for $DXPM_CURRENT_PACKAGE_NAME to force reinstall"
+  $DXPM_NODE_MOD/.bin/qremovedepends
+  echo "[+] finished removing dependancies for $DXPM_CURRENT_PACKAGE_NAME"
+fi
 echo "[+] installing package $DXPM_SETUP_PACKAGE_NAME"
-npm install --only=prod && wait
+npm install --omit=dev && wait
 echo "[+] finished installing package $DXPM_SETUP_PACKAGE_NAME"
 export DXPM_CURRENT_PACKAGE_NAME=""
 export DXPM_SETUP_PACKAGE_NAME=""

package/src/test.sh

@@ -11,5 +11,5 @@ if [ "$DXPM_SETUP_PACKAGE_NAME" = "" ]; then
   DXPM_SETUP_PACKAGE_NAME="$($DXPM_NODE_MOD/.bin/qgetprojectname)"
 fi
 echo "[+] running tests for $DXPM_SETUP_PACKAGE_NAME"
-sf force apex test run -l RunLocalTests -d ./test_results -r json -w 10 -o "$DXPM_SETUP_PACKAGE_NAME" && wait
+sf apex run test -l RunLocalTests -d ./test_results -r json -o "$DXPM_SETUP_PACKAGE_NAME" -w 5 && wait
 echo "[+] finished running tests for $DXPM_SETUP_PACKAGE_NAME"

package/.forceignore

@@ -1,8 +0,0 @@
-# List files or directories below to ignore them when running force:source:push, force:source:pull, and force:source:status
-# More information: https://developer.salesforce.com/docs/atlas.en-us.sfdx_dev.meta/sfdx_dev/sfdx_dev_exclude_source.htm
-#
-
-package.xml
-bin/
-etc/
-src/

package/sfdx-project.json

@@ -1,11 +0,0 @@
-{
-    "packageDirectories": [
-        {
-            "path": "test",
-            "default": true
-        }
-    ],
-    "namespace": "",
-    "sfdcLoginUrl": "https://login.salesforce.com",
-    "sourceApiVersion": "55.0"
-}