diff --git a/package.json b/package.json index 19bb8f3a85..6a21034cae 100644 --- a/package.json +++ b/package.json @@ -73,7 +73,6 @@ "@techdocs/cli": "workspace:*", "@types/node": "^18.17.8", "@types/webpack": "^5.28.0", - "@useoptic/optic": "^0.50.7", "command-exists": "^1.2.9", "concurrently": "^8.0.0", "cross-env": "^7.0.0", diff --git a/packages/repo-tools/package.json b/packages/repo-tools/package.json index 2705f3b589..24a7bc33c1 100644 --- a/packages/repo-tools/package.json +++ b/packages/repo-tools/package.json @@ -66,6 +66,7 @@ "@types/is-glob": "^4.0.2", "@types/mock-fs": "^4.13.0", "@types/node": "^18.17.8", + "@useoptic/optic": "^0.50.7", "mock-fs": "^5.2.0" }, "peerDependencies": { diff --git a/packages/repo-tools/src/commands/openapi/test/index.ts b/packages/repo-tools/src/commands/openapi/test/index.ts index 1d646394d0..3e131e54c8 100644 --- a/packages/repo-tools/src/commands/openapi/test/index.ts +++ b/packages/repo-tools/src/commands/openapi/test/index.ts @@ -36,9 +36,12 @@ async function test( return; } + const opticLocation = ( + await exec(`yarn bin optic`, [], { cwd: cliPaths.ownDir }) + ).stdout as string; try { await exec( - `yarn run -T optic capture`, + `${opticLocation.trim()} capture`, [ YAML_SCHEMA_PATH, '--server-override', diff --git a/yarn.lock b/yarn.lock index c918406c96..ce843df5bf 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9939,6 +9939,7 @@ __metadata: "@types/is-glob": ^4.0.2 "@types/mock-fs": ^4.13.0 "@types/node": ^18.17.8 + "@useoptic/optic": ^0.50.7 chalk: ^4.0.0 codeowners-utils: ^1.0.2 commander: ^9.1.0 @@ -31984,20 +31985,13 @@ __metadata: languageName: node linkType: hard -"jose@npm:^4.14.6": +"jose@npm:^4.14.6, jose@npm:^4.15.1, jose@npm:^4.6.0": version: 4.15.3 resolution: "jose@npm:4.15.3" checksum: b76eeccc1d40d0eaf26dfaadc0f88fc15802c9105ab66a24ee223bd84369f7cb217f4a2cb852f5080ff6996170b3a73db2b2d26878b8905d99c36ca432628134 languageName: node linkType: hard -"jose@npm:^4.15.1, jose@npm:^4.6.0": - version: 4.15.2 - resolution: "jose@npm:4.15.2" - checksum: 8f0cab1eef31243abe14a935b2b330cd95f10f9b69808fd642088ae5000e50e566664934537d2c6413ab2f6b54acd8265a5033da05157aa1260c5f1d7e57fab0 - languageName: node - linkType: hard - "joycon@npm:^3.0.1": version: 3.1.0 resolution: "joycon@npm:3.1.0" @@ -40778,7 +40772,6 @@ __metadata: "@techdocs/cli": "workspace:*" "@types/node": ^18.17.8 "@types/webpack": ^5.28.0 - "@useoptic/optic": ^0.50.7 command-exists: ^1.2.9 concurrently: ^8.0.0 cross-env: ^7.0.0