Skip to content

Commit 2bb51e3

Browse files
svc-cli-botmshanemc
svc-cli-bot
and
mshanemc
authored
refactor: devScripts update (#513)
* chore: updates from devScripts * fix(deps): bump deps * test: more jobs on smaller boxes * chore: bump cmd-ref * chore: bump more dev-deps * chore: bump testkit and source-testkit --------- Co-authored-by: mshanemc <[email protected]>
1 parent f8e1361 commit 2bb51e3

File tree

4 files changed

+616
-766
lines changed

4 files changed

+616
-766
lines changed

‎.github/workflows/test.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
secrets: inherit
2121
strategy:
2222
matrix:
23-
os: [ubuntu-20-8core, windows-2022-16core]
23+
os: [ubuntu-latest, windows-latest]
2424
command:
2525
- 'yarn test:nuts:deploy:metadata:manifest'
2626
- 'yarn test:nuts:deploy:metadata:metadata-dir'

‎.gitignore‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,9 @@ docs
3131
package.json.bak.
3232

3333
# -- CLEAN ALL
34+
*.tsbuildinfo
35+
.eslintcache
36+
.wireit
3437
node_modules
3538

3639
# --

‎package.json‎

Lines changed: 137 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -5,30 +5,30 @@
55
"author": "Salesforce",
66
"bugs": "https://github.com/forcedotcom/cli/issues",
77
"dependencies": {
8-
"@oclif/core": "^2.0.7",
9-
"@salesforce/core": "^3.32.12",
10-
"@salesforce/kit": "^1.8.2",
11-
"@salesforce/sf-plugins-core": "^2.0.1",
12-
"@salesforce/source-deploy-retrieve": "^7.6.0",
13-
"@salesforce/source-tracking": "^2.2.19",
8+
"@oclif/core": "^2.3.1",
9+
"@salesforce/core": "^3.33.5",
10+
"@salesforce/kit": "^1.9.0",
11+
"@salesforce/sf-plugins-core": "^2.2.3",
12+
"@salesforce/source-deploy-retrieve": "^7.10.1",
13+
"@salesforce/source-tracking": "^2.2.22",
1414
"chalk": "^4.1.2",
1515
"fs-extra": "^10.0.1",
1616
"shelljs": "^0.8.5",
1717
"tslib": "^2"
1818
},
1919
"devDependencies": {
2020
"@oclif/plugin-command-snapshot": "^3.2.16",
21-
"@salesforce/cli-plugins-testkit": "^3.2.18",
21+
"@salesforce/cli-plugins-testkit": "^3.2.23",
2222
"@salesforce/dev-config": "^3.1.0",
23-
"@salesforce/dev-scripts": "^3.1.0",
24-
"@salesforce/plugin-command-reference": "^2.2.10",
25-
"@salesforce/plugin-config": "^2.3.0",
23+
"@salesforce/dev-scripts": "^4.1.1",
24+
"@salesforce/plugin-command-reference": "^2.4.1",
25+
"@salesforce/plugin-config": "^2.3.3",
2626
"@salesforce/plugin-functions": "^1.17.4",
27-
"@salesforce/plugin-source": "^2.3.16",
28-
"@salesforce/plugin-templates": "^55.1.0",
29-
"@salesforce/plugin-user": "^2.1.23",
27+
"@salesforce/plugin-source": "^2.5.4",
28+
"@salesforce/plugin-templates": "^55.4.4",
29+
"@salesforce/plugin-user": "^2.3.2",
3030
"@salesforce/prettier-config": "^0.0.2",
31-
"@salesforce/source-testkit": "^2.0.35",
31+
"@salesforce/source-testkit": "^2.0.40",
3232
"@salesforce/ts-sinon": "1.4.4",
3333
"@salesforce/ts-types": "^1.5.20",
3434
"@swc/core": "^1.3.14",
@@ -48,17 +48,18 @@
4848
"eslint-plugin-header": "^3.1.1",
4949
"eslint-plugin-import": "^2.26.0",
5050
"eslint-plugin-jsdoc": "^39.6.7",
51-
"eslint-plugin-sf-plugin": "^1.8.0",
51+
"eslint-plugin-sf-plugin": "^1.9.2",
5252
"husky": "^7.0.4",
5353
"mocha": "^10.1.0",
5454
"nyc": "^15.1.0",
55-
"oclif": "^3.6.1",
55+
"oclif": "^3.7.0",
5656
"prettier": "^2.7.1",
5757
"pretty-quick": "^3.1.3",
5858
"shx": "0.3.4",
5959
"sinon": "11.1.2",
6060
"ts-node": "^10.9.1",
61-
"typescript": "^4.9.4"
61+
"typescript": "^4.9.5",
62+
"wireit": "^0.9.5"
6263
},
6364
"config": {},
6465
"engines": {
@@ -119,35 +120,134 @@
119120
},
120121
"repository": "salesforcecli/plugin-deploy-retrieve",
121122
"scripts": {
122-
"build": "sf-build",
123+
"build": "wireit",
123124
"clean": "sf-clean",
124125
"clean-all": "sf-clean all",
125126
"clean:lib": "shx rm -rf lib && shx rm -rf coverage && shx rm -rf .nyc_output && shx rm -f oclif.manifest.json",
126-
"compile": "sf-compile",
127+
"compile": "wireit",
127128
"docs": "sf-docs",
128-
"format": "sf-format",
129-
"lint": "sf-lint",
129+
"format": "wireit",
130+
"lint": "wireit",
130131
"postpack": "shx rm -f oclif.manifest.json",
131-
"posttest": "yarn lint && yarn test:deprecation-policy && yarn test:json-schema && yarn test:command-reference",
132132
"prepack": "sf-prepack",
133133
"prepare": "sf-install",
134-
"pretest": "sf-compile-test",
135-
"test": "sf-test",
136-
"test:command-reference": "./bin/dev commandreference:generate --erroronwarnings",
137-
"test:deprecation-policy": "./bin/dev snapshot:compare",
138-
"test:json-schema": "./bin/dev schema:compare",
139-
"test:nuts": "ts-node ./test/nuts/generateNuts.ts && nyc mocha \"**/*.nut.ts\" --slow 4500 --timeout 1200000 --parallel --retries 0",
140-
"test:nuts:tracking": "nyc mocha \"test/nuts/tracking/*.nut.ts\" --slow 4500 --timeout 1200000 --parallel --retries 0",
141-
"test:nuts:deploy:metadata:manifest": "cross-env PLUGIN_DEPLOY_RETRIEVE_SEED_FILTER=deploy.metadata.manifest ts-node ./test/nuts/generateNuts.ts && mocha \"test/nuts/generated/*.nut.ts\" --slow 4500 --timeout 1200000 --parallel --retries 0",
142-
"test:nuts:deploy:metadata:metadata-dir": "cross-env PLUGIN_DEPLOY_RETRIEVE_SEED_FILTER=deploy.metadata.metadata-dir ts-node ./test/nuts/generateNuts.ts && mocha \"test/nuts/generated/*.nut.ts\" --slow 4500 --timeout 1200000 --parallel --retries 0",
143-
"test:nuts:deploy:metadata:metadata": "cross-env PLUGIN_DEPLOY_RETRIEVE_SEED_FILTER=deploy.metadata.metadata ts-node ./test/nuts/generateNuts.ts && mocha \"test/nuts/generated/*.nut.ts\" --slow 4500 --timeout 1200000 --parallel --retries 0",
144-
"test:nuts:deploy:metadata:source-dir": "cross-env PLUGIN_DEPLOY_RETRIEVE_SEED_FILTER=deploy.metadata.source-dir ts-node ./test/nuts/generateNuts.ts && mocha \"test/nuts/generated/*.nut.ts\" --slow 4500 --timeout 1200000 --parallel --retries 0",
145-
"test:nuts:deploy:metadata:test-level": "cross-env PLUGIN_DEPLOY_RETRIEVE_SEED_FILTER=deploy.metadata.test-level ts-node ./test/nuts/generateNuts.ts && mocha \"test/nuts/generated/*.nut.ts\" --slow 4500 --timeout 1200000 --parallel --retries 0",
146-
"test:nuts:static": "nyc mocha \"test/commands/**/*.nut.ts\" --slow 4500 --timeout 1200000 --parallel --retries 0",
134+
"test": "wireit",
135+
"test:nuts": "ts-node ./test/nuts/generateNuts.ts && nyc mocha \"**/*.nut.ts\" --slow 4500 --timeout 1200000 --parallel --retries 0 --jobs 10",
136+
"test:nuts:deploy:metadata:manifest": "cross-env PLUGIN_DEPLOY_RETRIEVE_SEED_FILTER=deploy.metadata.manifest ts-node ./test/nuts/generateNuts.ts && mocha \"test/nuts/generated/*.nut.ts\" --slow 4500 --timeout 1200000 --parallel --retries 0 --jobs 20",
137+
"test:nuts:deploy:metadata:metadata": "cross-env PLUGIN_DEPLOY_RETRIEVE_SEED_FILTER=deploy.metadata.metadata ts-node ./test/nuts/generateNuts.ts && mocha \"test/nuts/generated/*.nut.ts\" --slow 4500 --timeout 1200000 --parallel --retries 0 --jobs 20",
138+
"test:nuts:deploy:metadata:metadata-dir": "cross-env PLUGIN_DEPLOY_RETRIEVE_SEED_FILTER=deploy.metadata.metadata-dir ts-node ./test/nuts/generateNuts.ts && mocha \"test/nuts/generated/*.nut.ts\" --slow 4500 --timeout 1200000 --parallel --retries 0 --jobs 20",
139+
"test:nuts:deploy:metadata:source-dir": "cross-env PLUGIN_DEPLOY_RETRIEVE_SEED_FILTER=deploy.metadata.source-dir ts-node ./test/nuts/generateNuts.ts && mocha \"test/nuts/generated/*.nut.ts\" --slow 4500 --timeout 1200000 --parallel --retries 0 --jobs 20",
140+
"test:nuts:deploy:metadata:test-level": "cross-env PLUGIN_DEPLOY_RETRIEVE_SEED_FILTER=deploy.metadata.test-level ts-node ./test/nuts/generateNuts.ts && mocha \"test/nuts/generated/*.nut.ts\" --slow 4500 --timeout 1200000 --parallel --retries 0 --jobs 20",
141+
"test:nuts:static": "nyc mocha \"test/commands/**/*.nut.ts\" --slow 4500 --timeout 1200000 --parallel --retries 0 --jobs 20",
142+
"test:nuts:tracking": "nyc mocha \"test/nuts/tracking/*.nut.ts\" --slow 4500 --timeout 1200000 --parallel --retries 0 --jobs 20",
143+
"test:only": "wireit",
147144
"version": "oclif readme"
148145
},
149146
"publishConfig": {
150147
"access": "public"
151148
},
152-
"main": "lib/index.js"
153-
}
149+
"main": "lib/index.js",
150+
"wireit": {
151+
"build": {
152+
"dependencies": [
153+
"compile",
154+
"lint"
155+
]
156+
},
157+
"compile": {
158+
"command": "tsc -p . --pretty --incremental",
159+
"files": [
160+
"src/**/*.ts",
161+
"tsconfig.json",
162+
"messages/**"
163+
],
164+
"output": [
165+
"lib/**",
166+
"*.tsbuildinfo"
167+
],
168+
"clean": "if-file-deleted"
169+
},
170+
"format": {
171+
"command": "prettier --write \"+(src|test|schemas)/**/*.+(ts|js|json)|command-snapshot.json\"",
172+
"files": [
173+
"src/**/*.ts",
174+
"test/**/*.ts",
175+
"schemas/**/*.json",
176+
"command-snapshot.json",
177+
".prettier*"
178+
],
179+
"output": []
180+
},
181+
"lint": {
182+
"command": "eslint src test --color --cache --cache-location .eslintcache",
183+
"files": [
184+
"src/**/*.ts",
185+
"test/**/*.ts",
186+
"messages/**",
187+
".eslint*"
188+
],
189+
"output": []
190+
},
191+
"test:compile": {
192+
"command": "tsc -p \"./test\" --pretty",
193+
"files": [
194+
"test/**/*.ts",
195+
"tsconfig.json",
196+
"test/tsconfig.json"
197+
],
198+
"output": []
199+
},
200+
"test": {
201+
"dependencies": [
202+
"test:compile",
203+
"test:only",
204+
"test:command-reference",
205+
"test:deprecation-policy",
206+
"lint",
207+
"test:json-schema"
208+
]
209+
},
210+
"test:only": {
211+
"command": "nyc mocha \"test/**/*.test.ts\"",
212+
"files": [
213+
"test/**/*.ts",
214+
"src/**/*.ts",
215+
"tsconfig.json",
216+
".mocha*",
217+
"test/tsconfig.json",
218+
"!*.nut.ts",
219+
".nycrc"
220+
],
221+
"output": []
222+
},
223+
"test:command-reference": {
224+
"command": "\"./bin/dev\" commandreference:generate --erroronwarnings",
225+
"files": [
226+
"src/**/*.ts",
227+
"messages/**",
228+
"package.json"
229+
],
230+
"output": [
231+
"tmp/root"
232+
]
233+
},
234+
"test:deprecation-policy": {
235+
"command": "\"./bin/dev\" snapshot:compare",
236+
"files": [
237+
"src/**/*.ts"
238+
],
239+
"output": [],
240+
"dependencies": [
241+
"compile"
242+
]
243+
},
244+
"test:json-schema": {
245+
"command": "\"./bin/dev\" schema:compare",
246+
"files": [
247+
"src/**/*.ts",
248+
"schemas"
249+
],
250+
"output": []
251+
}
252+
}
253+
}

0 commit comments

Comments
 (0)