chore: add rest to deploy options - needs SDR publish

.circleci/config.yml

@@ -17,12 +17,14 @@ workflows:
       - release-management/test-nut:
           name: nuts-on-linux
           node_version: lts
+          size: large
           sfdx_version: latest
           requires:
             - node-latest
       - release-management/test-nut:
           name: nuts-on-windows
           sfdx_version: latest
+          size: large
           node_version: lts
           os: windows
           requires:

.github/dependabot.yml

@@ -1,13 +1,14 @@
 version: 2
 updates:
-  - package-ecosystem: "npm"
-    directory: "/"
+  - package-ecosystem: 'npm'
+    directory: '/'
     schedule:
-      interval: "monthly"
+      interval: 'monthly'
     labels:
-      - "dependencies"
+      - 'dependencies'
     open-pull-requests-limit: 100
     pull-request-branch-name:
-      separator: "-"
+      separator: '-'
     ignore:
-      - dependency-name: "typescript"
+      - dependency-name: 'typescript'
+      - dependency-name: 'sinon'

CHANGELOG.md

@@ -2,6 +2,8 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+### [0.0.17](https://github.com/salesforcecli/plugin-source/compare/v0.0.16...v0.0.17) (2021-06-03)
+
 ### [0.0.16](https://github.com/salesforcecli/plugin-source/compare/v0.0.15...v0.0.16) (2021-05-20)
 
 ### [0.0.15](https://github.com/salesforcecli/plugin-source/compare/v0.0.14...v0.0.15) (2021-05-07)

package.json

@@ -1,57 +1,60 @@
 {
   "name": "@salesforce/plugin-source",
   "description": "Commands to interact with source formatted metadata",
-  "version": "0.0.16",
+  "version": "0.0.17",
   "author": "Salesforce",
   "bugs": "https://github.com/forcedotcom/cli/issues",
   "dependencies": {
     "@oclif/config": "^1",
-    "@salesforce/command": "^3.1.0",
-    "@salesforce/core": "^2.20.8",
-    "@salesforce/source-deploy-retrieve": "^2",
+    "@salesforce/command": "^3.1.3",
+    "@salesforce/core": "^2.23.4",
+    "@salesforce/source-deploy-retrieve": "^2.1.5",
     "chalk": "^4.1.0",
     "cli-ux": "^5.5.1",
     "tslib": "^2"
   },
   "devDependencies": {
     "@oclif/dev-cli": "^1",
     "@oclif/plugin-command-snapshot": "^2.0.0",
-    "@salesforce/cli-plugins-testkit": "^1.1.1",
+    "@salesforce/cli-plugins-testkit": "^1.1.5",
     "@salesforce/dev-config": "^2.1.2",
-    "@salesforce/dev-scripts": "^0.9.11",
-    "@salesforce/plugin-command-reference": "^1.3.0",
-    "@salesforce/plugin-config": "^1.2.6",
+    "@salesforce/dev-scripts": "^0.9.14",
+    "@salesforce/plugin-command-reference": "^1.3.4",
+    "@salesforce/plugin-config": "^1.2.8",
+    "@salesforce/plugin-user": "^1.3.0",
     "@salesforce/prettier-config": "^0.0.2",
-    "@salesforce/ts-sinon": "1.3.5",
+    "@salesforce/source-testkit": "^0.0.5",
+    "@salesforce/ts-sinon": "1.3.16",
     "@types/debug": "^4.1.5",
+    "@types/jsforce": "^1.9.29",
     "@types/shelljs": "^0.8.8",
-    "@typescript-eslint/eslint-plugin": "^4.2.0",
-    "@typescript-eslint/parser": "^4.2.0",
+    "@typescript-eslint/eslint-plugin": "^4.26.0",
+    "@typescript-eslint/parser": "^4.26.0",
     "chai": "^4.2.0",
     "chai-each": "^0.0.1",
     "cz-conventional-changelog": "^3.3.0",
     "debug": "^4.3.1",
-    "eslint": "^6.8.0",
+    "eslint": "^7.28.0",
     "eslint-config-prettier": "^6.11.0",
     "eslint-config-salesforce": "^0.1.6",
     "eslint-config-salesforce-license": "^0.1.6",
     "eslint-config-salesforce-typescript": "^0.2.7",
-    "eslint-plugin-header": "^3.0.0",
-    "eslint-plugin-import": "^2.20.2",
-    "eslint-plugin-jsdoc": "^27.0.3",
-    "eslint-plugin-prettier": "^3.1.3",
+    "eslint-plugin-header": "^3.1.1",
+    "eslint-plugin-import": "^2.23.4",
+    "eslint-plugin-jsdoc": "^35.1.3",
+    "eslint-plugin-prettier": "^3.4.0",
     "fast-glob": "^3.2.5",
-    "husky": "^4.2.5",
-    "lint-staged": "^10.2.2",
-    "mocha": "^8.3.0",
+    "husky": "^4.3.8",
+    "lint-staged": "^11.0.0",
+    "mocha": "^8.4.0",
     "nyc": "^15.1.0",
     "prettier": "^2.0.5",
-    "pretty-quick": "^2.0.1",
+    "pretty-quick": "^3.1.0",
     "salesforcedx-templates": "^49.8.0",
     "shelljs": "^0.8.4",
     "shx": "0.3.3",
-    "sinon": "^9.0.2",
-    "ts-node": "^8.10.2",
+    "sinon": "10.0.0",
+    "ts-node": "^10.0.0",
     "typescript": "^4.1.3"
   },
   "config": {
@@ -84,7 +87,8 @@
       "@oclif/plugin-help",
       "@salesforce/plugin-command-reference",
       "salesforcedx-templates",
-      "@salesforce/plugin-config"
+      "@salesforce/plugin-config",
+      "@salesforce/plugin-user"
     ],
     "topics": {
       "force": {
@@ -120,10 +124,10 @@
     "test": "sf-test",
     "test:command-reference": "./bin/run commandreference:generate --erroronwarnings",
     "test:deprecation-policy": "./bin/run snapshot:compare",
-    "test:nuts": "ts-node ./test/nuts/generateNuts.ts && nyc mocha \"**/retrieve.*.nut.ts\" --slow 3000 --timeout 600000 --retries 0",
+    "test:nuts": "ts-node ./test/nuts/generateNuts.ts && nyc mocha \"**/*.nut.ts\"  --slow 3000 --timeout 600000 --parallel --retries 0",
     "test:nuts:convert": "PLUGIN_SOURCE_SEED_FILTER=\"convert\" ts-node ./test/nuts/generateNuts.ts && nyc mocha \"**/*.nut.ts\" --slow 3000 --timeout 600000 --parallel --retries 0",
-    "test:nuts:retrieve": "PLUGIN_SOURCE_SEED_FILTER=\"retrieve\" ts-node ./test/nuts/generateNuts.ts && nyc mocha \"**/*.nut.ts\" --slow 3000 --timeout 600000 --parallel --retries 0",
     "test:nuts:deploy": "PLUGIN_SOURCE_SEED_FILTER=\"deploy\" ts-node ./test/nuts/generateNuts.ts && nyc mocha \"**/*.nut.ts\" --slow 3000 --timeout 600000 --parallel --retries 0",
+    "test:nuts:retrieve": "PLUGIN_SOURCE_SEED_FILTER=\"retrieve\" ts-node ./test/nuts/generateNuts.ts && nyc mocha \"**/*.nut.ts\" --slow 3000 --timeout 600000 --parallel --retries 0",
     "version": "oclif-dev readme"
   },
   "husky": {

src/commands/force/source/convert.ts

@@ -97,6 +97,7 @@ export class Convert extends SourceCommand {
       type: 'directory',
       outputDirectory: this.getFlag<string>('outputdir'),
       packageName: this.getFlag<string>('packagename'),
+      genUniqueDir: false,
     });
   }
 

src/commands/force/source/deploy.ts

@@ -148,6 +148,7 @@ export class Deploy extends DeployCommand {
           checkOnly: this.getFlag<boolean>('checkonly', false),
           runTests: this.getFlag<string[]>('runtests'),
           testLevel: this.getFlag<TestLevel>('testlevel'),
+          rest: this.isRest,
         },
       });
       this.asyncDeployResult = { id: deploy.id };

src/componentSetBuilder.ts

@@ -66,6 +66,7 @@ export class ComponentSetBuilder {
       const compSet = await ComponentSet.fromManifest({
         manifestPath: manifest.manifestPath,
         resolveSourcePaths: options.manifest.directoryPaths,
+        forceAddWildcards: true,
       });
       csAggregator.push(...compSet);
     }

src/deployCommand.ts

@@ -83,11 +83,12 @@ export abstract class DeployCommand extends SourceCommand {
       return false;
     } else if (restDeployConfig === 'true') {
       this.logger.debug('restDeploy SFDX config === true.  Using REST');
+      return true;
     } else {
-      this.logger.debug('soapdeploy flag unset. restDeploy SFDX config unset.  Defaulting to REST');
+      this.logger.debug('soapdeploy flag unset. restDeploy SFDX config unset.  Defaulting to SOAP');
     }
 
-    return true;
+    return false;
   }
 
   protected async poll(deployId: string, options?: Partial<PollingClient.Options>): Promise<DeployResult> {

test/commands/source/componentSetBuilder.test.ts

@@ -250,6 +250,7 @@ describe('ComponentSetBuilder', () => {
       const compSet = await ComponentSetBuilder.build(options);
       expect(fromManifestStub.calledOnce).to.equal(true);
       expect(fromManifestStub.firstCall.args[0]).to.deep.equal({
+        forceAddWildcards: true,
         manifestPath: options.manifest.manifestPath,
         resolveSourcePaths: [packageDir1],
       });
@@ -276,6 +277,7 @@ describe('ComponentSetBuilder', () => {
       const compSet = await ComponentSetBuilder.build(options);
       expect(fromManifestStub.callCount).to.equal(1);
       expect(fromManifestStub.firstCall.args[0]).to.deep.equal({
+        forceAddWildcards: true,
         manifestPath: options.manifest.manifestPath,
         resolveSourcePaths: [packageDir1, packageDir2],
       });

test/commands/source/deploy.test.ts

@@ -144,6 +144,7 @@ describe('force:source:deploy', () => {
         checkOnly: false,
         runTests: [],
         testLevel: 'NoTestRun',
+        rest: true,
       },
     };
     if (overrides?.apiOptions) {