Skip to content

Commit 51520ca

Browse files
P0lipP0lip
committed
fix(cli): peer dependency incorrectly met
1 parent 9a8436a commit 51520ca

File tree

5 files changed

+53
-94
lines changed

5 files changed

+53
-94
lines changed

‎package.json

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,6 @@
7373
"@swc/jest": "^0.2.21",
7474
"@types/file-entry-cache": "^5.0.2",
7575
"@types/jest": "^28.1.6",
76-
"@types/jest-when": "^2.7.3",
7776
"@types/karma": "^6.3.3",
7877
"@types/lodash": "^4.14.176",
7978
"@types/node": "^15.12.4",
@@ -93,7 +92,6 @@
9392
"husky": "^7.0.4",
9493
"jest": "^28.1.3",
9594
"jest-mock": "^27.5.1",
96-
"jest-when": "^3.4.2",
9795
"karma": "^6.4.0",
9896
"karma-chrome-launcher": "^3.1.1",
9997
"karma-jasmine": "^5.1.0",

‎packages/cli/package.json

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -33,17 +33,16 @@
3333
"release": "semantic-release -e semantic-release-monorepo"
3434
},
3535
"dependencies": {
36-
"@rollup/plugin-commonjs": "^20.0.0",
37-
"@stoplight/json": "3.17.0",
36+
"@stoplight/json": "~3.20.1",
3837
"@stoplight/path": "1.3.2",
39-
"@stoplight/spectral-core": "^1.5.1",
40-
"@stoplight/spectral-parsers": "^1.0.1",
38+
"@stoplight/spectral-core": "^1.14.1",
39+
"@stoplight/spectral-parsers": "^1.0.2",
4140
"@stoplight/spectral-ref-resolver": "1.0.1",
42-
"@stoplight/spectral-ruleset-bundler": "^1.0.0",
43-
"@stoplight/spectral-ruleset-migrator": "^1.5.0",
41+
"@stoplight/spectral-ruleset-bundler": "^1.3.2",
42+
"@stoplight/spectral-ruleset-migrator": "^1.7.4",
4443
"@stoplight/spectral-rulesets": ">=1",
45-
"@stoplight/spectral-runtime": "^1.1.0",
46-
"@stoplight/types": "12.3.0",
44+
"@stoplight/spectral-runtime": "^1.1.2",
45+
"@stoplight/types": "^13.6.0",
4746
"chalk": "4.1.2",
4847
"cliui": "7.0.4",
4948
"eol": "0.9.1",
@@ -63,7 +62,6 @@
6362
"@types/yargs": "^17.0.8",
6463
"copyfiles": "^2.4.1",
6564
"es-aggregate-error": "^1.0.7",
66-
"jest-when": "^3.4.2",
6765
"nock": "^13.1.3",
6866
"node-html-parser": "^4.1.5",
6967
"pkg": "^5.4.1",

‎packages/cli/src/services/linter/utils/__tests__/listFiles.test.ts

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import * as path from '@stoplight/path';
22
import * as fg from 'fast-glob';
3-
import { when } from 'jest-when';
43
import { listFiles } from '../listFiles';
54

65
jest.mock('fast-glob', () => jest.fn(async () => []));
@@ -25,11 +24,13 @@ describe('listFiles CLI util', () => {
2524
it('given disabled ignoredUnmatchedGlobs, reports unmatched patterns', async () => {
2625
const list = [path.join(__dirname, 'foo/a.json'), path.join(__dirname, 'foo/b.json')];
2726

28-
when(fg as unknown as jest.Mock)
29-
.calledWith('./foo/*.json', expect.any(Object))
30-
.mockResolvedValueOnce([...list])
31-
.calledWith('bar/**/baz*.yaml', expect.any(Object))
32-
.mockResolvedValueOnce([]);
27+
(fg as unknown as jest.Mock).mockImplementation(async pattern => {
28+
if (pattern === './foo/*.json') {
29+
return list;
30+
}
31+
32+
return [];
33+
});
3334

3435
expect(await listFiles(['./foo/*.json', 'bar/**/baz*.yaml'], false)).toEqual([list, ['bar/**/baz*.yaml']]);
3536
});

‎packages/cli/src/services/linter/utils/getRuleset.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ import { fetch } from '@stoplight/spectral-runtime';
88
import { migrateRuleset } from '@stoplight/spectral-ruleset-migrator';
99
import { bundleRuleset } from '@stoplight/spectral-ruleset-bundler';
1010
import { node } from '@stoplight/spectral-ruleset-bundler/presets/node';
11+
import { commonjs } from '@stoplight/spectral-ruleset-bundler/plugins/commonjs';
1112
import { stdin } from '@stoplight/spectral-ruleset-bundler/plugins/stdin';
1213
import { builtins } from '@stoplight/spectral-ruleset-bundler/plugins/builtins';
1314
import { isError, isObject } from 'lodash';
14-
import commonjs from '@rollup/plugin-commonjs';
1515
import { CLIError } from '../../../errors';
1616

1717
async function getDefaultRulesetFile(): Promise<Optional<string>> {

‎yarn.lock

Lines changed: 38 additions & 76 deletions
Original file line numberDiff line numberDiff line change
@@ -2218,23 +2218,6 @@ __metadata:
22182218
languageName: node
22192219
linkType: hard
22202220

2221-
"@rollup/plugin-commonjs@npm:^20.0.0":
2222-
version: 20.0.0
2223-
resolution: "@rollup/plugin-commonjs@npm:20.0.0"
2224-
dependencies:
2225-
"@rollup/pluginutils": ^3.1.0
2226-
commondir: ^1.0.1
2227-
estree-walker: ^2.0.1
2228-
glob: ^7.1.6
2229-
is-reference: ^1.2.1
2230-
magic-string: ^0.25.7
2231-
resolve: ^1.17.0
2232-
peerDependencies:
2233-
rollup: ^2.38.3
2234-
checksum: fefc4b5ab1509ff64e26dfee3eca2f23cea204bf20f3dc76c616d3aa3faf4b1035166287518a64ba07faaaea1621a0af5b94b8f8199371ca67db905562e7e619
2235-
languageName: node
2236-
linkType: hard
2237-
22382221
"@rollup/plugin-commonjs@npm:~22.0.2":
22392222
version: 22.0.2
22402223
resolution: "@rollup/plugin-commonjs@npm:22.0.2"
@@ -2463,19 +2446,6 @@ __metadata:
24632446
languageName: node
24642447
linkType: hard
24652448

2466-
"@stoplight/json@npm:3.17.0":
2467-
version: 3.17.0
2468-
resolution: "@stoplight/json@npm:3.17.0"
2469-
dependencies:
2470-
"@stoplight/ordered-object-literal": ^1.0.2
2471-
"@stoplight/types": ^12.3.0
2472-
jsonc-parser: ~2.2.1
2473-
lodash: ^4.17.21
2474-
safe-stable-stringify: ^1.1
2475-
checksum: 452bb6963d35196420d1214320223c38d3c7858a0420ad222d347c6bcaf69a5897add288ae7305f6cf46ff1f078c037f4c9deb42911f8f0907bcfbd97dcfbd62
2476-
languageName: node
2477-
linkType: hard
2478-
24792449
"@stoplight/json@npm:^3.17.0, @stoplight/json@npm:^3.17.1, @stoplight/json@npm:^3.20.1, @stoplight/json@npm:~3.20.1":
24802450
version: 3.20.1
24812451
resolution: "@stoplight/json@npm:3.20.1"
@@ -2499,7 +2469,7 @@ __metadata:
24992469
languageName: node
25002470
linkType: hard
25012471

2502-
"@stoplight/ordered-object-literal@npm:^1.0.1, @stoplight/ordered-object-literal@npm:^1.0.2, @stoplight/ordered-object-literal@npm:^1.0.3, @stoplight/ordered-object-literal@npm:~1.0.4":
2472+
"@stoplight/ordered-object-literal@npm:^1.0.1, @stoplight/ordered-object-literal@npm:^1.0.3, @stoplight/ordered-object-literal@npm:~1.0.4":
25032473
version: 1.0.4
25042474
resolution: "@stoplight/ordered-object-literal@npm:1.0.4"
25052475
checksum: 81afa24943880b0a213af3728a9fe0a28bd01d4840b9583d448f7823ced5b6e673628698b59d201cef50afebcbd89256e133714a174968d11b624d943e0c2c2f
@@ -2517,17 +2487,16 @@ __metadata:
25172487
version: 0.0.0-use.local
25182488
resolution: "@stoplight/spectral-cli@workspace:packages/cli"
25192489
dependencies:
2520-
"@rollup/plugin-commonjs": ^20.0.0
2521-
"@stoplight/json": 3.17.0
2490+
"@stoplight/json": ~3.20.1
25222491
"@stoplight/path": 1.3.2
2523-
"@stoplight/spectral-core": ^1.5.1
2524-
"@stoplight/spectral-parsers": ^1.0.1
2492+
"@stoplight/spectral-core": ^1.14.1
2493+
"@stoplight/spectral-parsers": ^1.0.2
25252494
"@stoplight/spectral-ref-resolver": 1.0.1
2526-
"@stoplight/spectral-ruleset-bundler": ^1.0.0
2527-
"@stoplight/spectral-ruleset-migrator": ^1.5.0
2495+
"@stoplight/spectral-ruleset-bundler": ^1.3.2
2496+
"@stoplight/spectral-ruleset-migrator": ^1.7.4
25282497
"@stoplight/spectral-rulesets": ">=1"
2529-
"@stoplight/spectral-runtime": ^1.1.0
2530-
"@stoplight/types": 12.3.0
2498+
"@stoplight/spectral-runtime": ^1.1.2
2499+
"@stoplight/types": ^13.6.0
25312500
"@types/es-aggregate-error": ^1.0.2
25322501
"@types/xml2js": ^0.4.9
25332502
"@types/yargs": ^17.0.8
@@ -2537,7 +2506,6 @@ __metadata:
25372506
eol: 0.9.1
25382507
es-aggregate-error: ^1.0.7
25392508
fast-glob: 3.2.7
2540-
jest-when: ^3.4.2
25412509
lodash: ~4.17.21
25422510
nock: ^13.1.3
25432511
node-html-parser: ^4.1.5
@@ -2555,7 +2523,7 @@ __metadata:
25552523
languageName: unknown
25562524
linkType: soft
25572525

2558-
"@stoplight/spectral-core@>=1, @stoplight/spectral-core@^1.1.0, @stoplight/spectral-core@^1.5.1, @stoplight/spectral-core@^1.7.0, @stoplight/spectral-core@^1.8.0, @stoplight/spectral-core@^1.8.1, @stoplight/spectral-core@workspace:packages/core":
2526+
"@stoplight/spectral-core@>=1, @stoplight/spectral-core@^1.1.0, @stoplight/spectral-core@^1.14.1, @stoplight/spectral-core@^1.7.0, @stoplight/spectral-core@^1.8.0, @stoplight/spectral-core@^1.8.1, @stoplight/spectral-core@workspace:packages/core":
25592527
version: 0.0.0-use.local
25602528
resolution: "@stoplight/spectral-core@workspace:packages/core"
25612529
dependencies:
@@ -2622,7 +2590,7 @@ __metadata:
26222590
languageName: unknown
26232591
linkType: soft
26242592

2625-
"@stoplight/spectral-parsers@*, @stoplight/spectral-parsers@>=1, @stoplight/spectral-parsers@^1.0.1, @stoplight/spectral-parsers@workspace:packages/parsers":
2593+
"@stoplight/spectral-parsers@*, @stoplight/spectral-parsers@>=1, @stoplight/spectral-parsers@^1.0.2, @stoplight/spectral-parsers@workspace:packages/parsers":
26262594
version: 0.0.0-use.local
26272595
resolution: "@stoplight/spectral-parsers@workspace:packages/parsers"
26282596
dependencies:
@@ -2645,7 +2613,31 @@ __metadata:
26452613
languageName: unknown
26462614
linkType: soft
26472615

2648-
"@stoplight/spectral-ruleset-bundler@^1.0.0, @stoplight/spectral-ruleset-bundler@workspace:packages/ruleset-bundler":
2616+
"@stoplight/spectral-ruleset-bundler@npm:^1.3.2":
2617+
version: 1.3.2
2618+
resolution: "@stoplight/spectral-ruleset-bundler@npm:1.3.2"
2619+
dependencies:
2620+
"@rollup/plugin-commonjs": ~22.0.2
2621+
"@stoplight/path": 1.3.2
2622+
"@stoplight/spectral-core": ">=1"
2623+
"@stoplight/spectral-formats": ">=1"
2624+
"@stoplight/spectral-functions": ">=1"
2625+
"@stoplight/spectral-parsers": ">=1"
2626+
"@stoplight/spectral-ref-resolver": ">=1"
2627+
"@stoplight/spectral-ruleset-migrator": ^1.7.4
2628+
"@stoplight/spectral-rulesets": ">=1"
2629+
"@stoplight/spectral-runtime": ^1.1.0
2630+
"@stoplight/types": ^13.6.0
2631+
"@types/node": "*"
2632+
pony-cause: 1.1.1
2633+
rollup: ~2.79.0
2634+
tslib: ^2.3.1
2635+
validate-npm-package-name: 3.0.0
2636+
checksum: 449d30d2128df33c02d96ba90bc47d7528231ed3db0b6f598c541535d689444bd978eed460497a555a814f62b391d8bb371d2ab2e03a25c95f11d403efa219f7
2637+
languageName: node
2638+
linkType: hard
2639+
2640+
"@stoplight/spectral-ruleset-bundler@workspace:packages/ruleset-bundler":
26492641
version: 0.0.0-use.local
26502642
resolution: "@stoplight/spectral-ruleset-bundler@workspace:packages/ruleset-bundler"
26512643
dependencies:
@@ -2672,7 +2664,7 @@ __metadata:
26722664
languageName: unknown
26732665
linkType: soft
26742666

2675-
"@stoplight/spectral-ruleset-migrator@^1.5.0, @stoplight/spectral-ruleset-migrator@^1.7.4, @stoplight/spectral-ruleset-migrator@workspace:packages/ruleset-migrator":
2667+
"@stoplight/spectral-ruleset-migrator@^1.7.4, @stoplight/spectral-ruleset-migrator@workspace:packages/ruleset-migrator":
26762668
version: 0.0.0-use.local
26772669
resolution: "@stoplight/spectral-ruleset-migrator@workspace:packages/ruleset-migrator"
26782670
dependencies:
@@ -2724,7 +2716,7 @@ __metadata:
27242716
languageName: unknown
27252717
linkType: soft
27262718

2727-
"@stoplight/spectral-runtime@^1.0.0, @stoplight/spectral-runtime@^1.1.0, @stoplight/spectral-runtime@^1.1.1, @stoplight/spectral-runtime@workspace:packages/runtime":
2719+
"@stoplight/spectral-runtime@^1.0.0, @stoplight/spectral-runtime@^1.1.0, @stoplight/spectral-runtime@^1.1.1, @stoplight/spectral-runtime@^1.1.2, @stoplight/spectral-runtime@workspace:packages/runtime":
27282720
version: 0.0.0-use.local
27292721
resolution: "@stoplight/spectral-runtime@workspace:packages/runtime"
27302722
dependencies:
@@ -2738,16 +2730,6 @@ __metadata:
27382730
languageName: unknown
27392731
linkType: soft
27402732

2741-
"@stoplight/types@npm:12.3.0":
2742-
version: 12.3.0
2743-
resolution: "@stoplight/types@npm:12.3.0"
2744-
dependencies:
2745-
"@types/json-schema": ^7.0.4
2746-
utility-types: ^3.10.0
2747-
checksum: 28065540d2d30743bfaa4ab09df3dc1e2a216f14962f78e27d8e53eda7f293f64eba8703be53b8d179dff403f54764e0823baa578fa85f78280d21b0ae22e773
2748-
languageName: node
2749-
linkType: hard
2750-
27512733
"@stoplight/types@npm:^12.3.0":
27522734
version: 12.5.0
27532735
resolution: "@stoplight/types@npm:12.5.0"
@@ -3119,16 +3101,7 @@ __metadata:
31193101
languageName: node
31203102
linkType: hard
31213103

3122-
"@types/jest-when@npm:^2.7.3":
3123-
version: 2.7.4
3124-
resolution: "@types/jest-when@npm:2.7.4"
3125-
dependencies:
3126-
"@types/jest": "*"
3127-
checksum: fea5f5c9b882ee5191ef47dfbbe71ce7935d4ede7ac12c2bf7dbceead3da066930aa492fc534f8b53ef6694f30313b5669b87cb45e36ddbece42c6ff27b01364
3128-
languageName: node
3129-
linkType: hard
3130-
3131-
"@types/jest@npm:*, @types/jest@npm:^28.1.6":
3104+
"@types/jest@npm:^28.1.6":
31323105
version: 28.1.7
31333106
resolution: "@types/jest@npm:28.1.7"
31343107
dependencies:
@@ -8235,15 +8208,6 @@ __metadata:
82358208
languageName: node
82368209
linkType: hard
82378210

8238-
"jest-when@npm:^3.4.2":
8239-
version: 3.5.1
8240-
resolution: "jest-when@npm:3.5.1"
8241-
peerDependencies:
8242-
jest: ">= 25"
8243-
checksum: 1efb9f497f7c846fe8b0f4125d5f449c4a4d78d5d0afa910d134b301ae4c119ea52c9465db38d2146269d42808afe8f3a4328d1d656878a9a69458ee653f6499
8244-
languageName: node
8245-
linkType: hard
8246-
82478211
"jest-worker@npm:^28.1.3":
82488212
version: 28.1.3
82498213
resolution: "jest-worker@npm:28.1.3"
@@ -11573,7 +11537,6 @@ __metadata:
1157311537
"@swc/jest": ^0.2.21
1157411538
"@types/file-entry-cache": ^5.0.2
1157511539
"@types/jest": ^28.1.6
11576-
"@types/jest-when": ^2.7.3
1157711540
"@types/karma": ^6.3.3
1157811541
"@types/lodash": ^4.14.176
1157911542
"@types/node": ^15.12.4
@@ -11593,7 +11556,6 @@ __metadata:
1159311556
husky: ^7.0.4
1159411557
jest: ^28.1.3
1159511558
jest-mock: ^27.5.1
11596-
jest-when: ^3.4.2
1159711559
karma: ^6.4.0
1159811560
karma-chrome-launcher: ^3.1.1
1159911561
karma-jasmine: ^5.1.0

0 commit comments

Comments
 (0)