Skip to content

Commit 9d75d07

Browse files
authored
Merge pull request #970 from salesforcecli/devScripts2024-02-25
refactor: devScripts update
2 parents 312dcb7 + 7ed4b12 commit 9d75d07

File tree

3 files changed

+33
-61
lines changed

3 files changed

+33
-61
lines changed

.gitignore

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,11 @@ docs
3030
*.sig
3131
package.json.bak.
3232

33+
34+
npm-shrinkwrap.json
35+
oclif.manifest.json
36+
oclif.lock
37+
3338
# -- CLEAN ALL
3439
*.tsbuildinfo
3540
.eslintcache
@@ -42,7 +47,3 @@ node_modules
4247
# os specific files
4348
.DS_Store
4449
.idea
45-
46-
oclif.manifest.json
47-
48-
oclif.lock

package.json

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,14 @@
1818
"devDependencies": {
1919
"@oclif/plugin-command-snapshot": "^5.0.6",
2020
"@salesforce/cli-plugins-testkit": "^5.1.9",
21-
"@salesforce/dev-scripts": "^8.3.0",
21+
"@salesforce/dev-scripts": "^8.4.0",
2222
"@salesforce/plugin-command-reference": "^3.0.65",
2323
"@salesforce/ts-sinon": "1.4.19",
2424
"@types/shelljs": "^0.8.14",
2525
"eslint-plugin-sf-plugin": "^1.17.3",
2626
"moment": "^2.30.1",
2727
"oclif": "^4.4.12",
2828
"shelljs": "^0.8.5",
29-
"shx": "0.3.4",
3029
"ts-node": "^10.9.2",
3130
"typescript": "^5.3.3"
3231
},
@@ -36,8 +35,9 @@
3635
"files": [
3736
"/lib",
3837
"/messages",
39-
"/oclif.manifest.json",
40-
"/oclif.lock"
38+
"/npm-shrinkwrap.json",
39+
"/oclif.lock",
40+
"/oclif.manifest.json"
4141
],
4242
"homepage": "https://github.com/salesforcecli/plugin-org",
4343
"keywords": [
@@ -100,13 +100,12 @@
100100
"build": "wireit",
101101
"clean": "sf-clean",
102102
"clean-all": "sf-clean all",
103-
"clean:lib": "shx rm -rf lib && shx rm -rf coverage && shx rm -rf .nyc_output && shx rm -f oclif.manifest.json oclif.lock",
104103
"compile": "wireit",
105104
"docs": "sf-docs",
106105
"format": "wireit",
107106
"link-check": "wireit",
108107
"lint": "wireit",
109-
"postpack": "shx rm -f oclif.manifest.json oclif.lock",
108+
"postpack": "sf-clean",
110109
"prepack": "sf-prepack",
111110
"prepare": "sf-install",
112111
"test": "wireit",

yarn.lock

Lines changed: 23 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -606,22 +606,14 @@
606606
"@smithy/types" "^2.9.1"
607607
tslib "^2.5.0"
608608

609-
"@aws-sdk/[email protected]":
609+
"@aws-sdk/[email protected]", "@aws-sdk/types@^3.222.0":
610610
version "3.515.0"
611611
resolved "https://registry.yarnpkg.com/@aws-sdk/types/-/types-3.515.0.tgz#ee97c887293211f1891bc1d8f0aaf354072b6002"
612612
integrity sha512-B3gUpiMlpT6ERaLvZZ61D0RyrQPsFYDkCncLPVkZOKkCOoFU46zi1o6T5JcYiz8vkx1q9RGloQ5exh79s5pU/w==
613613
dependencies:
614614
"@smithy/types" "^2.9.1"
615615
tslib "^2.5.0"
616616

617-
"@aws-sdk/types@^3.222.0":
618-
version "3.496.0"
619-
resolved "https://registry.yarnpkg.com/@aws-sdk/types/-/types-3.496.0.tgz#cdde44a94a57cf8f97cf05e4d0bdce2f56ce4eeb"
620-
integrity sha512-umkGadK4QuNQaMoDICMm7NKRI/mYSXiyPjcn3d53BhsuArYU/52CebGQKdt4At7SwwsiVJZw9RNBHyN5Mm0HVw==
621-
dependencies:
622-
"@smithy/types" "^2.9.1"
623-
tslib "^2.5.0"
624-
625617
"@aws-sdk/[email protected]":
626618
version "3.495.0"
627619
resolved "https://registry.yarnpkg.com/@aws-sdk/util-arn-parser/-/util-arn-parser-3.495.0.tgz#539f2d6dfef343a80324348f1f9a1b7eed2390f3"
@@ -1682,10 +1674,10 @@
16821674
resolved "https://registry.yarnpkg.com/@salesforce/dev-config/-/dev-config-4.1.0.tgz#e529576466d074e7a5f1441236510fef123da01e"
16831675
integrity sha512-2iDDepiIwjXHS5IVY7pwv8jMo4xWosJ7p/UTj+lllpB/gnJiYLhjJPE4Z3FCGFKyvfg5jGaimCd8Ca6bLGsCQA==
16841676

1685-
"@salesforce/dev-scripts@^8.3.0":
1686-
version "8.3.0"
1687-
resolved "https://registry.yarnpkg.com/@salesforce/dev-scripts/-/dev-scripts-8.3.0.tgz#8fcf223edc57dbdeb11397bf7db1f07a8a5e7720"
1688-
integrity sha512-NoaGfTtyIYed5lGXtLM7QsyGbZvPVa5uflbmIQdeFOefrvAv48k0+RbJzOl7nuj58EmvULzqrZHL6B7w5u4T5Q==
1677+
"@salesforce/dev-scripts@^8.4.0":
1678+
version "8.4.0"
1679+
resolved "https://registry.yarnpkg.com/@salesforce/dev-scripts/-/dev-scripts-8.4.0.tgz#bdf48878d1f12ce31f8f4ef9989eb1e5382656c7"
1680+
integrity sha512-Gn/OvBYUrr0bGd5e3Z+UyeHJ18ub0fwALJWPAZ54JEHNkcTWajek9BO/YER9a7/N2eU0/TDP9IfDdgVQrMAyWg==
16891681
dependencies:
16901682
"@commitlint/cli" "^17.1.2"
16911683
"@commitlint/config-conventional" "^17.8.1"
@@ -1700,7 +1692,7 @@
17001692
cosmiconfig "^7.0.0"
17011693
eslint-config-salesforce-typescript "^3.0.5"
17021694
husky "^7.0.4"
1703-
linkinator "^6.0.3"
1695+
linkinator "^6.0.4"
17041696
mocha "^10.2.0"
17051697
nyc "^15.1.0"
17061698
prettier "^2.8.8"
@@ -2501,10 +2493,10 @@
25012493
dependencies:
25022494
"@types/node" "*"
25032495

2504-
"@types/node@*":
2505-
version "20.10.6"
2506-
resolved "https://registry.yarnpkg.com/@types/node/-/node-20.10.6.tgz#a3ec84c22965802bf763da55b2394424f22bfbb5"
2507-
integrity sha512-Vac8H+NlRNNlAmDfGUP7b5h/KA+AtWIzuXy0E6OyP8f1tCLYAtPvKRRDJjAPqhpCb0t6U2j7/xqAuLEebW2kiw==
2496+
"@types/node@*", "@types/node@^20.10.7":
2497+
version "20.11.19"
2498+
resolved "https://registry.yarnpkg.com/@types/node/-/node-20.11.19.tgz#b466de054e9cb5b3831bee38938de64ac7f81195"
2499+
integrity sha512-7xMnVEcZFu0DikYjWOlRq7NTPETrm7teqUT2WkQjrTIkEgUyyGdWsj/Zg8bEJt5TNklzbPD1X3fqfsHw3SpapQ==
25082500
dependencies:
25092501
undici-types "~5.26.4"
25102502

@@ -2530,13 +2522,6 @@
25302522
dependencies:
25312523
undici-types "~5.26.4"
25322524

2533-
"@types/node@^20.10.7":
2534-
version "20.11.19"
2535-
resolved "https://registry.yarnpkg.com/@types/node/-/node-20.11.19.tgz#b466de054e9cb5b3831bee38938de64ac7f81195"
2536-
integrity sha512-7xMnVEcZFu0DikYjWOlRq7NTPETrm7teqUT2WkQjrTIkEgUyyGdWsj/Zg8bEJt5TNklzbPD1X3fqfsHw3SpapQ==
2537-
dependencies:
2538-
undici-types "~5.26.4"
2539-
25402525
"@types/normalize-package-data@^2.4.0":
25412526
version "2.4.1"
25422527
resolved "https://registry.yarnpkg.com/@types/normalize-package-data/-/normalize-package-data-2.4.1.tgz#d3357479a0fdfdd5907fe67e17e0a85c906e1301"
@@ -2554,12 +2539,7 @@
25542539
dependencies:
25552540
"@types/node" "*"
25562541

2557-
"@types/semver@^7.5.0":
2558-
version "7.5.6"
2559-
resolved "https://registry.yarnpkg.com/@types/semver/-/semver-7.5.6.tgz#c65b2bfce1bec346582c07724e3f8c1017a20339"
2560-
integrity sha512-dn1l8LaMea/IjDoHNd9J52uBbInB796CDffS6VdIxvqYCPSG0V0DzHp76GpaWnlhg88uYyPbXCDIowa86ybd5A==
2561-
2562-
"@types/semver@^7.5.8":
2542+
"@types/semver@^7.5.0", "@types/semver@^7.5.8":
25632543
version "7.5.8"
25642544
resolved "https://registry.yarnpkg.com/@types/semver/-/semver-7.5.8.tgz#8268a8c57a3e4abd25c165ecd36237db7948a55e"
25652545
integrity sha512-I8EUhyrgfLrcTkzV3TSsGyl1tSuPrEDzr0yd5m90UgNxQkyDXULk3b6MlQqTCpZpNtWe1K0hzclnZkTcLBe2UQ==
@@ -6088,10 +6068,10 @@ lines-and-columns@^1.1.6:
60886068
resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.2.4.tgz#eca284f75d2965079309dc0ad9255abb2ebc1632"
60896069
integrity sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==
60906070

6091-
linkinator@^6.0.3:
6092-
version "6.0.3"
6093-
resolved "https://registry.yarnpkg.com/linkinator/-/linkinator-6.0.3.tgz#552965bafb37a8747858b2c02a70b3c148b68909"
6094-
integrity sha512-QAcefOkkumXa5NciVhICPkSR5SMk6LFISe/FIX8vvPdLHLUqdXU06Dq/nuOPA5V89iv2gV9FDufYA7adxIcvOw==
6071+
linkinator@^6.0.4:
6072+
version "6.0.4"
6073+
resolved "https://registry.yarnpkg.com/linkinator/-/linkinator-6.0.4.tgz#2a4a9f76732b0f8968abf35ed09d57a3a8be3427"
6074+
integrity sha512-gxZ9ePUBeoaCk29p+2gAwrRIVnKOqAV8ZVCEM8N7MvpwbccDBQiKjXFyS6nQx56K1CCZLboan2i5iJfpWCsnSQ==
60956075
dependencies:
60966076
chalk "^5.0.0"
60976077
escape-html "^1.0.3"
@@ -6100,7 +6080,7 @@ linkinator@^6.0.3:
61006080
htmlparser2 "^9.0.0"
61016081
marked "^10.0.0"
61026082
meow "^13.0.0"
6103-
mime "^3.0.0"
6083+
mime "^4.0.0"
61046084
server-destroy "^1.0.1"
61056085
srcset "^5.0.0"
61066086

@@ -6508,10 +6488,10 @@ [email protected]:
65086488
resolved "https://registry.yarnpkg.com/mime/-/mime-2.6.0.tgz#a2a682a95cd4d0cb1d6257e28f83da7e35800367"
65096489
integrity sha512-USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg==
65106490

6511-
mime@^3.0.0:
6512-
version "3.0.0"
6513-
resolved "https://registry.yarnpkg.com/mime/-/mime-3.0.0.tgz#b374550dca3a0c18443b0c950a6a58f1931cf7a7"
6514-
integrity sha512-jSCU7/VB1loIWBZe14aEYHU/+1UMEHoaO7qxCOVJOw9GgH72VAWppxNcjU+x9a2k3GSIBXNKxXQFqRvvZ7vr3A==
6491+
mime@^4.0.0:
6492+
version "4.0.1"
6493+
resolved "https://registry.yarnpkg.com/mime/-/mime-4.0.1.tgz#ad7563d1bfe30253ad97dedfae2b1009d01b9470"
6494+
integrity sha512-5lZ5tyrIfliMXzFtkYyekWbtRXObT9OWa8IwQ5uxTBDHucNNwniRqo0yInflj+iYi5CBa6qxadGzGarDfuEOxA==
65156495

65166496
mimic-fn@^2.1.0:
65176497
version "2.1.0"
@@ -6577,7 +6557,7 @@ [email protected]:
65776557
is-plain-obj "^1.1.0"
65786558
kind-of "^6.0.3"
65796559

6580-
minimist@^1.2.0, minimist@^1.2.3, minimist@^1.2.5, minimist@^1.2.6:
6560+
minimist@^1.2.0, minimist@^1.2.5, minimist@^1.2.6:
65816561
version "1.2.8"
65826562
resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.8.tgz#c1a464e7693302e082a075cee0c057741ac4772c"
65836563
integrity sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==
@@ -8166,7 +8146,7 @@ secure-json-parse@^2.4.0:
81668146
resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.2.tgz#48d55db737c3287cd4835e17fa13feace1c41ef8"
81678147
integrity sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==
81688148

8169-
[email protected], semver@^7.0.0, semver@^7.1.1, semver@^7.1.3, semver@^7.2.1, semver@^7.3.2, semver@^7.3.4, semver@^7.3.5, semver@^7.3.8, semver@^7.5.3, semver@^7.5.4:
8149+
81708150
version "7.5.4"
81718151
resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.4.tgz#483986ec4ed38e1c6c48c34894a9182dbff68a6e"
81728152
integrity sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==
@@ -8178,7 +8158,7 @@ semver@^6.0.0, semver@^6.3.0, semver@^6.3.1:
81788158
resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4"
81798159
integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==
81808160

8181-
semver@^7.6.0:
8161+
semver@^7.0.0, semver@^7.1.1, semver@^7.1.3, semver@^7.2.1, semver@^7.3.2, semver@^7.3.4, semver@^7.3.5, semver@^7.3.8, semver@^7.5.3, semver@^7.5.4, semver@^7.6.0:
81828162
version "7.6.0"
81838163
resolved "https://registry.yarnpkg.com/semver/-/semver-7.6.0.tgz#1a46a4db4bffcccd97b743b5005c8325f23d4e2d"
81848164
integrity sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==
@@ -8271,14 +8251,6 @@ shiki@^0.14.1:
82718251
vscode-oniguruma "^1.7.0"
82728252
vscode-textmate "^8.0.0"
82738253

8274-
8275-
version "0.3.4"
8276-
resolved "https://registry.yarnpkg.com/shx/-/shx-0.3.4.tgz#74289230b4b663979167f94e1935901406e40f02"
8277-
integrity sha512-N6A9MLVqjxZYcVn8hLmtneQWIJtp8IKzMP4eMnx+nqkvXoqinUPCbUFLp2UcWTEIUONhlk0ewxr/jaVGlc+J+g==
8278-
dependencies:
8279-
minimist "^1.2.3"
8280-
shelljs "^0.8.5"
8281-
82828254
side-channel@^1.0.4:
82838255
version "1.0.4"
82848256
resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.4.tgz#efce5c8fdc104ee751b25c58d4290011fa5ea2cf"

0 commit comments

Comments
 (0)