Merge pull request #338 from salesforcecli/phale/revert-242

fix: revert 2.4.2
salesforcecli · May 8, 2023 · 3d7f80f · 3d7f80f
2 parents 616abf5 + c0f845c
commit 3d7f80f
Show file tree

Hide file tree

Showing 22 changed files with 1,317 additions and 1,133 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -7,7 +7,16 @@
 module.exports = {
   extends: ['eslint-config-salesforce-typescript', 'eslint-config-salesforce-license'],
   rules: {
+    '@typescript-eslint/restrict-template-expressions': 'off',
+    '@typescript-eslint/explicit-function-return-type': 'off',
+    '@typescript-eslint/no-unsafe-assignment': 'off',
+    '@typescript-eslint/no-unsafe-member-access': 'off',
+    '@typescript-eslint/no-unsafe-call': 'off',
+    '@typescript-eslint/no-unsafe-return': 'off',
+    '@typescript-eslint/member-ordering': 'off',
     'no-underscore-dangle': 'off',
-    'jsdoc/newline-after-description': 'off',
+    '@typescript-eslint/explicit-module-boundary-types': 'off',
+    'no-empty': 'off',
+    '@typescript-eslint/no-explicit-any': 'off',
   },
 };
diff --git a/.gitignore b/.gitignore
@@ -10,6 +10,7 @@ package-lock.json
 npm-error.log
 yarn-error.log
 lerna-debug.log
+*.tsbuildinfo
 
 # compile source
 lib
@@ -25,9 +26,6 @@ coverage
 docs
 
 # -- CLEAN ALL
-*.tsbuildinfo
-.eslintcache
-.wireit
 node_modules
 
 # --

diff --git a/.sfdevrc.json b/.sfdevrc.json
@@ -2,24 +2,5 @@
   "test": {
     "testsPath": "test/**/*.test.ts"
   },
-  "exclude-scripts": ["pretest"],
-  "wireit": {
-    "test": {
-      "dependencies": ["test:only", "lint"]
-    },
-    "test:only": {
-      "command": "nyc mocha \"test/**/*.test.ts\"",
-      "env": {
-        "FORCE_COLOR": "2"
-      },
-      "dependencies": ["test:compile", "test:command-reference"],
-      "files": ["test/**/*.ts", "src/**/*.ts", "**/tsconfig.json", ".mocha*", "!*.nut.ts", ".nycrc", "tmp/test/**"],
-      "output": []
-    },
-    "test:command-reference": {
-      "command": "\"./bin/dev\" commandreference:generate --plugins auth --outputdir ./tmp/test",
-      "files": ["src/**/*.ts", "messages/**", "package.json"],
-      "output": ["tmp/test/**"]
-    }
-  }
+  "exclude-scripts": ["pretest"]
 }
diff --git a/package.json b/package.json
@@ -1,52 +1,52 @@
 {
   "name": "@salesforce/plugin-command-reference",
   "description": "Generate the Salesforce CLI command reference guide",
-  "version": "2.4.2",
+  "version": "2.4.3",
   "author": "Salesforce",
   "bugs": "https://github.com/salesforcecli/plugin-command-reference/issues",
   "dependencies": {
-    "@oclif/core": "^2.8.2",
-    "@salesforce/core": "^3.34.7",
-    "@salesforce/kit": "^1.9.2",
-    "@salesforce/sf-plugins-core": "^2.2.9",
+    "@oclif/core": "^2.0.7",
+    "@salesforce/core": "^3.32.12",
+    "@salesforce/kit": "^1.8.2",
+    "@salesforce/sf-plugins-core": "^2.0.1",
     "@salesforce/ts-types": "^1.7.1",
     "chalk": "^3.0.0",
+    "fs-extra": "^10.0.1",
     "handlebars": "^4.7.7",
     "lodash.uniqby": "^4.7.0",
     "mkdirp": "^1.0.4",
     "tslib": "^2"
   },
   "devDependencies": {
-    "@oclif/plugin-help": "^5.2.9",
+    "@oclif/plugin-help": "^5.1.1",
     "@salesforce/dev-config": "^3.1.0",
-    "@salesforce/dev-scripts": "^4.3.0",
-    "@salesforce/plugin-auth": "^2.7.12",
+    "@salesforce/dev-scripts": "^2.0.4",
+    "@salesforce/plugin-login": "^1.1.15",
     "@salesforce/prettier-config": "^0.0.2",
-    "@types/debug": "^4.1.7",
     "@types/fs-extra": "^9.0.13",
     "@types/lodash.uniqby": "^4.7.6",
-    "@typescript-eslint/eslint-plugin": "^5.59.0",
-    "@typescript-eslint/parser": "^5.59.0",
+    "@typescript-eslint/eslint-plugin": "^4.2.0",
+    "@typescript-eslint/parser": "^4.2.0",
     "chai": "^4.2.0",
-    "eslint": "^8.38.0",
-    "eslint-config-prettier": "^8.8.0",
-    "eslint-config-salesforce": "^1.2.0",
-    "eslint-config-salesforce-license": "^0.2.0",
-    "eslint-config-salesforce-typescript": "^1.1.1",
+    "eslint": "^7.27.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.8",
     "eslint-plugin-header": "^3.0.0",
-    "eslint-plugin-import": "^2.27.5",
-    "eslint-plugin-jsdoc": "^43.0.7",
+    "eslint-plugin-import": "2.24.2",
+    "eslint-plugin-jsdoc": "^35.1.2",
+    "eslint-plugin-prettier": "^3.1.3",
     "husky": "^7.0.4",
-    "mocha": "^10.2.0",
+    "mocha": "^9.1.3",
     "nyc": "^15.1.0",
-    "oclif": "^3.8.1",
-    "prettier": "^2.8.7",
+    "oclif": "^3.6.1",
+    "prettier": "^2.0.5",
     "pretty-quick": "^3.1.0",
     "shx": "^0.3.3",
     "sinon": "10.0.0",
     "ts-node": "^10.0.0",
-    "typescript": "^4.9.5",
-    "wireit": "^0.9.5"
+    "typescript": "^4.1.3"
   },
   "engines": {
     "node": ">=14.0.0"
@@ -78,134 +78,30 @@
     },
     "devPlugins": [
       "@oclif/plugin-help",
-      "@salesforce/plugin-auth"
+      "@salesforce/plugin-login"
     ]
   },
   "repository": "salesforcecli/plugin-command-reference",
   "scripts": {
-    "build": "wireit",
+    "build": "sf-build",
     "clean": "sf-clean",
     "clean-all": "sf-clean all",
-    "clean:lib": "shx rm -rf lib && shx rm -rf coverage && shx rm -rf .nyc_output && shx rm -rf test/tmp && shx rm -f oclif.manifest.json",
-    "compile": "wireit",
+    "clean:lib": "shx rm -rf lib && shx rm -rf coverage && shx rm -rf .nyc_output && shx rm -f oclif.manifest.json",
+    "command-reference": "./bin/dev commandreference:generate --plugins login --outputdir test/tmp",
+    "compile": "sf-compile",
     "docs": "sf-docs",
-    "format": "wireit",
-    "lint": "wireit",
+    "format": "sf-format",
+    "lint": "sf-lint",
     "postpack": "shx rm -f oclif.manifest.json",
+    "posttest": "yarn lint",
     "prepack": "sf-prepack",
     "prepare": "sf-install",
-    "test": "wireit",
-    "test:only": "wireit",
+    "pretest": "sf-compile-test && yarn command-reference",
+    "test": "sf-test",
     "version": "oclif readme"
   },
   "publishConfig": {
     "access": "public"
   },
-  "main": "lib/index.js",
-  "wireit": {
-    "build": {
-      "dependencies": [
-        "compile",
-        "lint"
-      ]
-    },
-    "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*",
-        "**/tsconfig.json"
-      ],
-      "output": []
-    },
-    "test:compile": {
-      "command": "tsc -p \"./test\" --pretty",
-      "files": [
-        "test/**/*.ts",
-        "**/tsconfig.json"
-      ],
-      "output": []
-    },
-    "test": {
-      "dependencies": [
-        "test:only",
-        "lint"
-      ]
-    },
-    "test:only": {
-      "command": "nyc mocha \"test/**/*.test.ts\"",
-      "env": {
-        "FORCE_COLOR": "2"
-      },
-      "dependencies": [
-        "test:compile",
-        "test:command-reference"
-      ],
-      "files": [
-        "test/**/*.ts",
-        "src/**/*.ts",
-        "**/tsconfig.json",
-        ".mocha*",
-        "!*.nut.ts",
-        ".nycrc",
-        "tmp/test/**"
-      ],
-      "output": []
-    },
-    "test:command-reference": {
-      "command": "\"./bin/dev\" commandreference:generate --plugins auth --outputdir ./tmp/test",
-      "files": [
-        "src/**/*.ts",
-        "messages/**",
-        "package.json"
-      ],
-      "output": [
-        "tmp/test/**"
-      ]
-    },
-    "test:deprecation-policy": {
-      "command": "\"./bin/dev\" snapshot:compare",
-      "files": [
-        "src/**/*.ts"
-      ],
-      "output": [],
-      "dependencies": [
-        "compile"
-      ]
-    },
-    "test:json-schema": {
-      "command": "\"./bin/dev\" schema:compare",
-      "files": [
-        "src/**/*.ts",
-        "schemas"
-      ],
-      "output": []
-    }
-  }
-}
+  "main": "lib/index.js"
+}