Skip to content

Commit 8b49131

Browse files
authored
ci: fix scripts to support monorepo with no packages (#9)
* remove @ts-bridge/cli dep * update `lint-teams-json.ts` and `update-readme-content.ts` * update README.md * add `ts-jest` to root `package.json` * add `ts-jest` to `.depcheckrc.yml` * fix `update-readme-content.ts` empty line markers
1 parent 14a19f2 commit 8b49131

6 files changed

Lines changed: 131 additions & 45 deletions

File tree

.depcheckrc.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ ignores:
1414
- 'eslint-interactive'
1515
- 'rimraf'
1616
- 'simple-git-hooks'
17+
- 'ts-jest'
1718
- 'ts-node'
1819
- 'typedoc'
1920
# Ignore plugins for tools

README.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,4 @@ Each snap in this repository has its own README with installation and usage inst
1010

1111
<!-- start package list -->
1212

13-
_No published packages yet._
14-
1513
<!-- end package list -->

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@
5151
"@metamask/eslint-config-nodejs": "^15.0.0",
5252
"@metamask/eslint-config-typescript": "^15.0.0",
5353
"@metamask/utils": "^11.9.0",
54-
"@ts-bridge/cli": "^0.6.4",
5554
"@types/jest": "^29.5.14",
5655
"@types/lodash": "^4.14.191",
5756
"@types/node": "^16.18.54",
@@ -82,6 +81,7 @@
8281
"rimraf": "^5.0.5",
8382
"semver": "^7.6.3",
8483
"simple-git-hooks": "^2.8.0",
84+
"ts-jest": "^29.2.5",
8585
"tsx": "^4.20.5",
8686
"typescript": "~5.3.3",
8787
"typescript-eslint": "^8.48.0",

scripts/lint-teams-json.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,5 +65,5 @@ async function getPublicWorkspaces(): Promise<Workspace[]> {
6565
'--no-private',
6666
]);
6767

68-
return stdout.split('\n').map((line) => JSON.parse(line));
68+
return stdout ? stdout.split('\n').map((line) => JSON.parse(line)) : [];
6969
}

scripts/update-readme-content.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ async function retrieveWorkspaces(): Promise<Workspace[]> {
8787
'--verbose',
8888
]);
8989

90-
return stdout.split('\n').map((line) => JSON.parse(line));
90+
return stdout ? stdout.split('\n').map((line) => JSON.parse(line)) : [];
9191
}
9292

9393
/**
@@ -204,7 +204,7 @@ async function generateNewReadmeContent(
204204
'su',
205205
),
206206
(_match, startMarker, endMarker) =>
207-
[startMarker, '', newPackageList, '', endMarker].join('\n'),
207+
[startMarker, newPackageList, endMarker].join('\n'),
208208
);
209209

210210
newReadmeContent = newReadmeContent.replace(
@@ -213,7 +213,7 @@ async function generateNewReadmeContent(
213213
'su',
214214
),
215215
(_match, startMarker, endMarker) =>
216-
[startMarker, '', newDependencyGraph, '', endMarker].join('\n'),
216+
[startMarker, newDependencyGraph, endMarker].join('\n'),
217217
);
218218

219219
return newReadmeContent;

yarn.lock

Lines changed: 125 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1238,7 +1238,6 @@ __metadata:
12381238
"@metamask/eslint-config-nodejs": "npm:^15.0.0"
12391239
"@metamask/eslint-config-typescript": "npm:^15.0.0"
12401240
"@metamask/utils": "npm:^11.9.0"
1241-
"@ts-bridge/cli": "npm:^0.6.4"
12421241
"@types/jest": "npm:^29.5.14"
12431242
"@types/lodash": "npm:^4.14.191"
12441243
"@types/node": "npm:^16.18.54"
@@ -1269,6 +1268,7 @@ __metadata:
12691268
rimraf: "npm:^5.0.5"
12701269
semver: "npm:^7.6.3"
12711270
simple-git-hooks: "npm:^2.8.0"
1271+
ts-jest: "npm:^29.2.5"
12721272
tsx: "npm:^4.20.5"
12731273
typescript: "npm:~5.3.3"
12741274
typescript-eslint: "npm:^8.48.0"
@@ -1793,30 +1793,6 @@ __metadata:
17931793
languageName: node
17941794
linkType: hard
17951795

1796-
"@ts-bridge/cli@npm:^0.6.4":
1797-
version: 0.6.4
1798-
resolution: "@ts-bridge/cli@npm:0.6.4"
1799-
dependencies:
1800-
"@ts-bridge/resolver": "npm:^0.2.0"
1801-
chalk: "npm:^5.3.0"
1802-
cjs-module-lexer: "npm:^1.3.1"
1803-
yargs: "npm:^17.7.2"
1804-
peerDependencies:
1805-
typescript: ">=4.8.0"
1806-
bin:
1807-
ts-bridge: ./dist/index.js
1808-
tsbridge: ./dist/index.js
1809-
checksum: 10/257ee0cacec71c1b3cc018825088e06b4bd554ba5fe95bdb98c4c82edd6cd4bcff1054d351e6c7cdfdd3bd2145a055b5d14fa453a6ece761645e42b48b88e9a0
1810-
languageName: node
1811-
linkType: hard
1812-
1813-
"@ts-bridge/resolver@npm:^0.2.0":
1814-
version: 0.2.0
1815-
resolution: "@ts-bridge/resolver@npm:0.2.0"
1816-
checksum: 10/d4cfd1f47e9648a5f9c893b1b076adabde3a57cbe81ef823bcbbcc77a122fb6f06d99f40ff48198f8dc766bfc4b3b351d4e87cfcf2db64f7e6db924eb82a5db1
1817-
languageName: node
1818-
linkType: hard
1819-
18201796
"@types/babel__core@npm:^7.1.14":
18211797
version: 7.20.5
18221798
resolution: "@types/babel__core@npm:7.20.5"
@@ -2587,6 +2563,15 @@ __metadata:
25872563
languageName: node
25882564
linkType: hard
25892565

2566+
"bs-logger@npm:^0.2.6":
2567+
version: 0.2.6
2568+
resolution: "bs-logger@npm:0.2.6"
2569+
dependencies:
2570+
fast-json-stable-stringify: "npm:2.x"
2571+
checksum: 10/e6d3ff82698bb3f20ce64fb85355c5716a3cf267f3977abe93bf9c32a2e46186b253f48a028ae5b96ab42bacd2c826766d9ae8cf6892f9b944656be9113cf212
2572+
languageName: node
2573+
linkType: hard
2574+
25902575
"bser@npm:2.1.1":
25912576
version: 2.1.1
25922577
resolution: "bser@npm:2.1.1"
@@ -2704,13 +2689,6 @@ __metadata:
27042689
languageName: node
27052690
linkType: hard
27062691

2707-
"chalk@npm:^5.3.0":
2708-
version: 5.6.2
2709-
resolution: "chalk@npm:5.6.2"
2710-
checksum: 10/1b2f48f6fba1370670d5610f9cd54c391d6ede28f4b7062dd38244ea5768777af72e5be6b74fb6c6d54cb84c4a2dff3f3afa9b7cb5948f7f022cfd3d087989e0
2711-
languageName: node
2712-
linkType: hard
2713-
27142692
"char-regex@npm:^1.0.2":
27152693
version: 1.0.2
27162694
resolution: "char-regex@npm:1.0.2"
@@ -2739,7 +2717,7 @@ __metadata:
27392717
languageName: node
27402718
linkType: hard
27412719

2742-
"cjs-module-lexer@npm:^1.0.0, cjs-module-lexer@npm:^1.3.1":
2720+
"cjs-module-lexer@npm:^1.0.0":
27432721
version: 1.4.0
27442722
resolution: "cjs-module-lexer@npm:1.4.0"
27452723
checksum: 10/b041096749792526120d8b8756929f8ef5dd4596502a0e1013f857e3027acd6091915fea77037921d70ee1a99988a100d994d3d3c2e323b04dd4c5ffd516cf13
@@ -3835,7 +3813,7 @@ __metadata:
38353813
languageName: node
38363814
linkType: hard
38373815

3838-
"fast-json-stable-stringify@npm:^2.0.0, fast-json-stable-stringify@npm:^2.1.0":
3816+
"fast-json-stable-stringify@npm:2.x, fast-json-stable-stringify@npm:^2.0.0, fast-json-stable-stringify@npm:^2.1.0":
38393817
version: 2.1.0
38403818
resolution: "fast-json-stable-stringify@npm:2.1.0"
38413819
checksum: 10/2c20055c1fa43c922428f16ca8bb29f2807de63e5c851f665f7ac9790176c01c3b40335257736b299764a8d383388dabc73c8083b8e1bc3d99f0a941444ec60e
@@ -4218,6 +4196,24 @@ __metadata:
42184196
languageName: node
42194197
linkType: hard
42204198

4199+
"handlebars@npm:^4.7.9":
4200+
version: 4.7.9
4201+
resolution: "handlebars@npm:4.7.9"
4202+
dependencies:
4203+
minimist: "npm:^1.2.5"
4204+
neo-async: "npm:^2.6.2"
4205+
source-map: "npm:^0.6.1"
4206+
uglify-js: "npm:^3.1.4"
4207+
wordwrap: "npm:^1.0.0"
4208+
dependenciesMeta:
4209+
uglify-js:
4210+
optional: true
4211+
bin:
4212+
handlebars: bin/handlebars
4213+
checksum: 10/e755433d652e8a15fc02f83d7478e652359e7a4d354c4328818853ed4f8a39d4a09e1d22dad3c7213c5240864a65b3c840970b8b181745575dd957dd258f2b8d
4214+
languageName: node
4215+
linkType: hard
4216+
42214217
"has-flag@npm:^4.0.0":
42224218
version: 4.0.0
42234219
resolution: "has-flag@npm:4.0.0"
@@ -5293,6 +5289,13 @@ __metadata:
52935289
languageName: node
52945290
linkType: hard
52955291

5292+
"lodash.memoize@npm:^4.1.2":
5293+
version: 4.1.2
5294+
resolution: "lodash.memoize@npm:4.1.2"
5295+
checksum: 10/192b2168f310c86f303580b53acf81ab029761b9bd9caa9506a019ffea5f3363ea98d7e39e7e11e6b9917066c9d36a09a11f6fe16f812326390d8f3a54a1a6da
5296+
languageName: node
5297+
linkType: hard
5298+
52965299
"lodash.merge@npm:^4.6.2":
52975300
version: 4.6.2
52985301
resolution: "lodash.merge@npm:4.6.2"
@@ -5341,6 +5344,13 @@ __metadata:
53415344
languageName: node
53425345
linkType: hard
53435346

5347+
"make-error@npm:^1.3.6":
5348+
version: 1.3.6
5349+
resolution: "make-error@npm:1.3.6"
5350+
checksum: 10/b86e5e0e25f7f777b77fabd8e2cbf15737972869d852a22b7e73c17623928fccb826d8e46b9951501d3f20e51ad74ba8c59ed584f610526a48f8ccf88aaec402
5351+
languageName: node
5352+
linkType: hard
5353+
53445354
"make-fetch-happen@npm:^13.0.0":
53455355
version: 13.0.1
53465356
resolution: "make-fetch-happen@npm:13.0.1"
@@ -5495,6 +5505,13 @@ __metadata:
54955505
languageName: node
54965506
linkType: hard
54975507

5508+
"minimist@npm:^1.2.5":
5509+
version: 1.2.8
5510+
resolution: "minimist@npm:1.2.8"
5511+
checksum: 10/908491b6cc15a6c440ba5b22780a0ba89b9810e1aea684e253e43c4e3b8d56ec1dcdd7ea96dde119c29df59c936cde16062159eae4225c691e19c70b432b6e6f
5512+
languageName: node
5513+
linkType: hard
5514+
54985515
"minipass-collect@npm:^2.0.1":
54995516
version: 2.0.1
55005517
resolution: "minipass-collect@npm:2.0.1"
@@ -5645,6 +5662,13 @@ __metadata:
56455662
languageName: node
56465663
linkType: hard
56475664

5665+
"neo-async@npm:^2.6.2":
5666+
version: 2.6.2
5667+
resolution: "neo-async@npm:2.6.2"
5668+
checksum: 10/1a7948fea86f2b33ec766bc899c88796a51ba76a4afc9026764aedc6e7cde692a09067031e4a1bf6db4f978ccd99e7f5b6c03fe47ad9865c3d4f99050d67e002
5669+
languageName: node
5670+
linkType: hard
5671+
56485672
"nock@npm:^13.3.1":
56495673
version: 13.5.5
56505674
resolution: "nock@npm:13.5.5"
@@ -6510,12 +6534,12 @@ __metadata:
65106534
languageName: node
65116535
linkType: hard
65126536

6513-
"semver@npm:^7.1.1, semver@npm:^7.3.5, semver@npm:^7.5.3, semver@npm:^7.5.4, semver@npm:^7.6.3, semver@npm:^7.7.3":
6514-
version: 7.8.1
6515-
resolution: "semver@npm:7.8.1"
6537+
"semver@npm:^7.1.1, semver@npm:^7.3.5, semver@npm:^7.5.3, semver@npm:^7.5.4, semver@npm:^7.6.3, semver@npm:^7.7.3, semver@npm:^7.8.0":
6538+
version: 7.8.2
6539+
resolution: "semver@npm:7.8.2"
65166540
bin:
65176541
semver: bin/semver.js
6518-
checksum: 10/3244f6c4cb3f8126fea0426d353829ed4967e41e1f4696337c6fdcad87426466fe2badaf49d7dc85849acfc496ea0599432a4aecc33802d2d774e723acfa30e6
6542+
checksum: 10/52221d8f1cadacda3cc3f0a2e7f7146e0442c7f4219acb25970bed055f5d0a6afbba5f22e293b078c2e93fca3dce0a08b088485e8b75d32a165f16c3627091c8
65196543
languageName: node
65206544
linkType: hard
65216545

@@ -7010,6 +7034,46 @@ __metadata:
70107034
languageName: node
70117035
linkType: hard
70127036

7037+
"ts-jest@npm:^29.2.5":
7038+
version: 29.4.11
7039+
resolution: "ts-jest@npm:29.4.11"
7040+
dependencies:
7041+
bs-logger: "npm:^0.2.6"
7042+
fast-json-stable-stringify: "npm:^2.1.0"
7043+
handlebars: "npm:^4.7.9"
7044+
json5: "npm:^2.2.3"
7045+
lodash.memoize: "npm:^4.1.2"
7046+
make-error: "npm:^1.3.6"
7047+
semver: "npm:^7.8.0"
7048+
type-fest: "npm:^4.41.0"
7049+
yargs-parser: "npm:^21.1.1"
7050+
peerDependencies:
7051+
"@babel/core": ">=7.0.0-beta.0 <8"
7052+
"@jest/transform": ^29.0.0 || ^30.0.0
7053+
"@jest/types": ^29.0.0 || ^30.0.0
7054+
babel-jest: ^29.0.0 || ^30.0.0
7055+
jest: ^29.0.0 || ^30.0.0
7056+
jest-util: ^29.0.0 || ^30.0.0
7057+
typescript: ">=4.3 <7"
7058+
peerDependenciesMeta:
7059+
"@babel/core":
7060+
optional: true
7061+
"@jest/transform":
7062+
optional: true
7063+
"@jest/types":
7064+
optional: true
7065+
babel-jest:
7066+
optional: true
7067+
esbuild:
7068+
optional: true
7069+
jest-util:
7070+
optional: true
7071+
bin:
7072+
ts-jest: cli.js
7073+
checksum: 10/8a76800cac1c102c789429a82655adde1d540d7ff025fc888006f4f458afe07ca4d3f73622a10a604edea06aa12c298605cd1a208a6380c0e3d591a3daed8af6
7074+
languageName: node
7075+
linkType: hard
7076+
70137077
"tslib@npm:^2.4.0, tslib@npm:^2.6.2, tslib@npm:^2.6.3":
70147078
version: 2.8.1
70157079
resolution: "tslib@npm:2.8.1"
@@ -7056,6 +7120,13 @@ __metadata:
70567120
languageName: node
70577121
linkType: hard
70587122

7123+
"type-fest@npm:^4.41.0":
7124+
version: 4.41.0
7125+
resolution: "type-fest@npm:4.41.0"
7126+
checksum: 10/617ace794ac0893c2986912d28b3065ad1afb484cad59297835a0807dc63286c39e8675d65f7de08fafa339afcb8fe06a36e9a188b9857756ae1e92ee8bda212
7127+
languageName: node
7128+
linkType: hard
7129+
70597130
"type-is@npm:~1.6.18":
70607131
version: 1.6.18
70617132
resolution: "type-is@npm:1.6.18"
@@ -7101,6 +7172,15 @@ __metadata:
71017172
languageName: node
71027173
linkType: hard
71037174

7175+
"uglify-js@npm:^3.1.4":
7176+
version: 3.19.3
7177+
resolution: "uglify-js@npm:3.19.3"
7178+
bin:
7179+
uglifyjs: bin/uglifyjs
7180+
checksum: 10/6b9639c1985d24580b01bb0ab68e78de310d38eeba7db45bec7850ab4093d8ee464d80ccfaceda9c68d1c366efbee28573b52f95e69ac792354c145acd380b11
7181+
languageName: node
7182+
linkType: hard
7183+
71047184
"undici-types@npm:~6.19.2":
71057185
version: 6.19.8
71067186
resolution: "undici-types@npm:6.19.8"
@@ -7307,6 +7387,13 @@ __metadata:
73077387
languageName: node
73087388
linkType: hard
73097389

7390+
"wordwrap@npm:^1.0.0":
7391+
version: 1.0.0
7392+
resolution: "wordwrap@npm:1.0.0"
7393+
checksum: 10/497d40beb2bdb08e6d38754faa17ce20b0bf1306327f80cb777927edb23f461ee1f6bc659b3c3c93f26b08e1cf4b46acc5bae8fda1f0be3b5ab9a1a0211034cd
7394+
languageName: node
7395+
linkType: hard
7396+
73107397
"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0, wrap-ansi@npm:^7.0.0":
73117398
version: 7.0.0
73127399
resolution: "wrap-ansi@npm:7.0.0"

0 commit comments

Comments
 (0)