qfpm 1.1.1 → 1.1.3

package/.forceignore

@@ -0,0 +1,8 @@
+# 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/CONTRIBUTING.md

@@ -0,0 +1,9 @@
+# CONTRIBUTING
+
+If I was to update this I'd likely re-write it into javascript and possibly a sfdx plugin, but if one does want to contribute to this in its frankenstien bash javascript form.
+
+1. Clone
+2. Edit
+3. Submit Pull Request
+4. Wait untill it is looked at it
+5. Repeat as needed

package/README.md

@@ -1,3 +1,8 @@
+[![NPM](https://img.shields.io/npm/v/qfpm.svg)](https://www.npmjs.com/package/qfpm)
+[![Downloads/week](https://img.shields.io/npm/dw/qfpm.svg)](https://npmjs.org/package/qfpm)
+![QFPM Tests](https://github.com/gussamer/qfpm/actions/workflows/qfpmtest.yml/badge.svg)
+[![qfpm](https://snyk.io/advisor/npm-package/qfpm/badge.svg)](https://snyk.io/advisor/npm-package/qfpm)
+[![License](https://img.shields.io/badge/ISC-blue.svg)](https://raw.githubusercontent.com/gussamer/qfpm/master/LICENSE)
 # QFPM
 
 ## QRFDev Package Manager
@@ -8,6 +13,8 @@ The package mangement methodology intended with qfpm is meant to aid with the de
 
 ## Updates
 
+- 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
 
 - Conversion to using native npm bin definition seems stable and opens up better linux support
@@ -20,7 +27,7 @@ The package mangement methodology intended with qfpm is meant to aid with the de
 1. Navigate to folder you want your project
 1. Create a SFDX project with
     ```bash
-    sfdx force:project:create -n newsfdxproject
+    sf force project create -n newsfdxproject
     ```
 1. Move into the project folder with
     ```bash
@@ -35,7 +42,7 @@ The package mangement methodology intended with qfpm is meant to aid with the de
     npm run setup
     ```
 
- \* qfpm has no external dependancies all warnings are due to packages salesforce uses in their default project package.json
+ \* all warnings are due to packages salesforce uses in their default project package.json
 
 ## Use
 
@@ -54,9 +61,9 @@ This example demonstates facilitating two layers of dependancies required to get
     ```bash
     cd fflib-apex-common-samplecode
     ```
-1. init npm and hit enter through all questions
+1. init npm to create package.json
     ```bash
-    npm init
+    npm init -y
     ```
 1. install the qfpm tools
     ```bash
@@ -85,9 +92,9 @@ This example expands on the previous fflib sample code to satisfy the requirment
     ```bash
     cd at4dx-samplecode
     ```
-1. init npm and hit enter through all questions
+1. init npm to create package.json
     ```bash
-    npm init
+    npm init -y
     ```
 1. install the qfpm tools
     ```bash

package/SECURITY.md

@@ -0,0 +1,4 @@
+# Security
+___
+
+Please report any vulnerabilities in the issues here on github as soon as possible. QFPM only depends on SFDX... and NPM and NODE but otherwise has no production dependancies to reduce possible issues but that doesn't preclude the possibility.

package/package.json

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

package/sfdx-project.json

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

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"
-sfdx force:source:convert -d "./manifest" -n "$DXPM_CURRENT_PACKAGE_NAME" -p "$($DXPM_NODE_MOD/.bin/qgetsrcfolders)" && wait
+sf force source convert -d "./manifest" -n "$DXPM_CURRENT_PACKAGE_NAME" -p "$($DXPM_NODE_MOD/.bin/qgetsrcfolders)" && wait
 echo "[+] finished converting source for $DXPM_CURRENT_PACKAGE_NAME"

package/src/clean.sh

@@ -12,5 +12,5 @@ if [ "$DXPM_SETUP_PACKAGE_NAME" = "" ]; then
   DXPM_SETUP_PACKAGE_NAME="$($DXPM_NODE_MOD/.bin/qgetprojectname)"
 fi
 echo "[+] checking if $DXPM_SETUP_PACKAGE_NAME scrach org exists and deleting it"
-$DXPM_NODE_MOD/.bin/qisscratched && sfdx force:org:delete -u "$DXPM_SETUP_PACKAGE_NAME" -p && wait
+$DXPM_NODE_MOD/.bin/qisscratched && sf org delete scratch -o "$DXPM_SETUP_PACKAGE_NAME" -p && wait
 echo "[+] finished cleaning $DXPM_SETUP_PACKAGE_NAME scrach org"

package/src/deploy.sh

@@ -16,5 +16,5 @@ 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
-sfdx force:source:deploy -p "$($DXPM_NODE_MOD/.bin/qgetsrcfolders)" -w 10 -u "$DXPM_SETUP_PACKAGE_NAME" && wait
+sf force source deploy -p "$($DXPM_NODE_MOD/.bin/qgetsrcfolders)" -w 10 -u "$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('sfdx force:org:list --json')
+var orgsJSON = require('child_process').execSync('sf force 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"
-sfdx force:source:push -f -w 10 -u "$DXPM_SETUP_PACKAGE_NAME" && wait
+sf force source push -f -w 10 -o "$DXPM_SETUP_PACKAGE_NAME" && 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" && 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"
-sfdx force:org:create -f $PWD/config/project-scratch-def.json -a "$DXPM_SETUP_PACKAGE_NAME" -d 1 -w 5 && wait
+sf force org create -f $PWD/config/project-scratch-def.json -a "$DXPM_SETUP_PACKAGE_NAME" -d 1 -w 6 && wait
 echo "[+] finished setting up scratch org $DXPM_SETUP_PACKAGE_NAME"
 echo "[+] setting scratch org $DXPM_SETUP_PACKAGE_NAME as default locally"
-sfdx force:config:set defaultusername=$DXPM_SETUP_PACKAGE_NAME
+sf force 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

@@ -6,7 +6,7 @@ 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
 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"
-sfdx force:apex:test:run -l RunLocalTests -d ./test_results -r json -w 10 -u "$DXPM_SETUP_PACKAGE_NAME" && wait
+sf force apex test run -l RunLocalTests -d ./test_results -r json -w 10 -o "$DXPM_SETUP_PACKAGE_NAME" && wait
 echo "[+] finished running tests for $DXPM_SETUP_PACKAGE_NAME"