refactor: devScripts update (#416)

* chore: updates from devScripts * fix: type error for retries default * chore: bump deps, samples from wireit --------- Co-authored-by: mshanemc <[email protected]>
salesforcecli · Feb 28, 2023 · ed57c90 · ed57c90
1 parent d4d8413
commit ed57c90
Show file tree

Hide file tree

Showing 5 changed files with 2,302 additions and 598 deletions.
diff --git a/.gitignore b/.gitignore
@@ -30,6 +30,9 @@ docs
 package.json.bak.
 
 # -- CLEAN ALL
+*.tsbuildinfo
+.eslintcache
+.wireit
 node_modules
 
 # --

diff --git a/.sfdevrc.json b/.sfdevrc.json
@@ -1,6 +1,7 @@
 {
-  "test": {
-    "testsPath": "test/**/*.test.ts"
-  },
-  "exclude-scripts": ["build"]
+  "wireit": {
+    "build": {
+      "dependencies": ["compile", "lint", "samples"]
+    }
+  }
 }
diff --git a/package.json b/package.json
@@ -8,20 +8,19 @@
   "types": "lib/index.d.ts",
   "repository": "salesforcecli/cli-plugins-testkit",
   "scripts": {
-    "build": "sf-build && yarn samples",
+    "build": "wireit",
     "ci-docs": "yarn sf-ci-docs",
     "clean": "sf-clean",
     "clean-all": "sf-clean all",
-    "compile": "sf-compile",
+    "compile": "wireit",
     "docs": "sf-docs",
-    "format": "sf-format",
-    "lint": "sf-lint",
+    "format": "wireit",
+    "lint": "wireit",
     "lint-fix": "yarn sf-lint --fix",
     "prepack": "sf-prepack",
     "prepare": "sf-install",
-    "pretest": "sf-compile-test",
-    "samples": "tsc -p samples && ts-node samples/generateSamplesDoc.ts",
-    "test": "sf-test"
+    "test": "wireit",
+    "test:only": "wireit"
   },
   "keywords": [
     "force",
@@ -42,8 +41,8 @@
     "!lib/**/*.map"
   ],
   "dependencies": {
-    "@salesforce/core": "^3.33.1",
-    "@salesforce/kit": "^1.8.0",
+    "@salesforce/core": "^3.33.5",
+    "@salesforce/kit": "^1.9.0",
     "@salesforce/ts-types": "^1.7.3",
     "@types/shelljs": "^0.8.11",
     "archiver": "^5.2.0",
@@ -54,7 +53,7 @@
   },
   "devDependencies": {
     "@salesforce/dev-config": "^3.0.0",
-    "@salesforce/dev-scripts": "^3.1.1",
+    "@salesforce/dev-scripts": "^4.1.1",
     "@salesforce/prettier-config": "^0.0.2",
     "@salesforce/ts-sinon": "^1.4.5",
     "@types/archiver": "^5.1.0",
@@ -77,10 +76,92 @@
     "pretty-quick": "^3.1.0",
     "sinon": "10.0.0",
     "ts-node": "^10.0.0",
-    "typescript": "^4.9.5"
+    "typescript": "^4.9.5",
+    "wireit": "^0.9.5"
   },
   "config": {},
   "publishConfig": {
     "access": "public"
+  },
+  "wireit": {
+    "samples": {
+      "command": "tsc -p samples && ts-node samples/generateSamplesDoc.ts",
+      "files": [
+        "samples/**/*.ts",
+        "samples/**/*.json"
+      ],
+      "output": [
+        "SAMPLE.md"
+      ]
+    },
+    "build": {
+      "dependencies": [
+        "compile",
+        "lint",
+        "samples"
+      ]
+    },
+    "compile": {
+      "command": "tsc -p . --pretty --incremental",
+      "files": [
+        "src/**/*.ts",
+        "tsconfig.json",
+        "messages/**"
+      ],
+      "output": [
+        "lib/**",
+        "*.tsbuildinfo"
+      ],
+      "clean": "if-file-deleted"
+    },
+    "format": {
+      "command": "prettier --write \"+(src|test|schemas)/**/*.+(ts|js|json)|command-snapshot.json\"",
+      "files": [
+        "src/**/*.ts",
+        "test/**/*.ts",
+        "schemas/**/*.json",
+        "command-snapshot.json",
+        ".prettier*"
+      ],
+      "output": []
+    },
+    "lint": {
+      "command": "eslint src test --color --cache --cache-location .eslintcache",
+      "files": [
+        "src/**/*.ts",
+        "test/**/*.ts",
+        "messages/**",
+        ".eslint*"
+      ],
+      "output": []
+    },
+    "test:compile": {
+      "command": "tsc -p \"./test\" --pretty",
+      "files": [
+        "test/**/*.ts",
+        "tsconfig.json",
+        "test/tsconfig.json"
+      ],
+      "output": []
+    },
+    "test": {
+      "dependencies": [
+        "test:only",
+        "test:compile"
+      ]
+    },
+    "test:only": {
+      "command": "nyc mocha \"test/**/*.test.ts\"",
+      "files": [
+        "test/**/*.ts",
+        "src/**/*.ts",
+        "tsconfig.json",
+        ".mocha*",
+        "test/tsconfig.json",
+        "!*.nut.ts",
+        ".nycrc"
+      ],
+      "output": []
+    }
   }
-}
+}
diff --git a/src/testSession.ts b/src/testSession.ts
@@ -129,7 +129,7 @@ export class TestSession<T extends TestSessionOptions = TestSessionOptions> exte
 
     this.createdDate = new Date();
     this.id = genUniqueString(`${this.createdDate.valueOf()}%s`);
-    this.retries = env.getNumber('TESTKIT_SETUP_RETRIES', this.options.retries) ?? 0;
+    this.retries = env.getNumber('TESTKIT_SETUP_RETRIES', this.options.retries ?? 0);
 
     const shellOverride = env.getString('TESTKIT_EXEC_SHELL');
     if (shellOverride) {