From 69bdf9b2707e35549b4b6b44df5844cc5d4437e8 Mon Sep 17 00:00:00 2001 From: Alex McKinney Date: Mon, 2 Dec 2024 09:24:20 -0500 Subject: [PATCH] chore(cli): Move @fern-api/source-resolver directory (#5312) --- .../cli/cli-source-resolver/tsconfig.json | 2 +- .../source-resolver/.depcheckrc.json | 0 .../source-resolver/.prettierrc.cjs | 2 + .../source-resolver/package.json | 2 +- .../source-resolver/src/NopSourceResolver.ts | 0 .../source-resolver/src/ResolvedSource.ts | 0 .../source-resolver/src/SourceResolver.ts | 0 .../source-resolver/src/index.ts | 0 .../generation/source-resolver/tsconfig.json | 16 +++++ .../source-resolver/vitest.config.ts | 1 + packages/cli/source-resolver/.prettierrc.cjs | 1 - packages/cli/source-resolver/tsconfig.json | 6 -- packages/cli/source-resolver/vitest.config.ts | 1 - pnpm-lock.yaml | 66 +++++++++---------- 14 files changed, 54 insertions(+), 43 deletions(-) rename packages/cli/{ => generation}/source-resolver/.depcheckrc.json (100%) create mode 100644 packages/cli/generation/source-resolver/.prettierrc.cjs rename packages/cli/{ => generation}/source-resolver/package.json (95%) rename packages/cli/{ => generation}/source-resolver/src/NopSourceResolver.ts (100%) rename packages/cli/{ => generation}/source-resolver/src/ResolvedSource.ts (100%) rename packages/cli/{ => generation}/source-resolver/src/SourceResolver.ts (100%) rename packages/cli/{ => generation}/source-resolver/src/index.ts (100%) create mode 100644 packages/cli/generation/source-resolver/tsconfig.json create mode 100644 packages/cli/generation/source-resolver/vitest.config.ts delete mode 100644 packages/cli/source-resolver/.prettierrc.cjs delete mode 100644 packages/cli/source-resolver/tsconfig.json delete mode 100644 packages/cli/source-resolver/vitest.config.ts diff --git a/packages/cli/cli-source-resolver/tsconfig.json b/packages/cli/cli-source-resolver/tsconfig.json index 8b684f9713a..0f2e6e9fda5 100644 --- a/packages/cli/cli-source-resolver/tsconfig.json +++ b/packages/cli/cli-source-resolver/tsconfig.json @@ -19,7 +19,7 @@ "path": "../fern-definition/schema" }, { - "path": "../source-resolver" + "path": "../generation/source-resolver" }, { "path": "../task-context" diff --git a/packages/cli/source-resolver/.depcheckrc.json b/packages/cli/generation/source-resolver/.depcheckrc.json similarity index 100% rename from packages/cli/source-resolver/.depcheckrc.json rename to packages/cli/generation/source-resolver/.depcheckrc.json diff --git a/packages/cli/generation/source-resolver/.prettierrc.cjs b/packages/cli/generation/source-resolver/.prettierrc.cjs new file mode 100644 index 00000000000..b9df4fdae54 --- /dev/null +++ b/packages/cli/generation/source-resolver/.prettierrc.cjs @@ -0,0 +1,2 @@ +module.exports = require("../../../../.prettierrc.json"); + diff --git a/packages/cli/source-resolver/package.json b/packages/cli/generation/source-resolver/package.json similarity index 95% rename from packages/cli/source-resolver/package.json rename to packages/cli/generation/source-resolver/package.json index 927a089467f..cfeafb4967b 100644 --- a/packages/cli/source-resolver/package.json +++ b/packages/cli/generation/source-resolver/package.json @@ -4,7 +4,7 @@ "repository": { "type": "git", "url": "https://github.com/fern-api/fern.git", - "directory": "packages/cli/source-resolver" + "directory": "packages/cli/generation/source-resolver" }, "private": true, "files": [ diff --git a/packages/cli/source-resolver/src/NopSourceResolver.ts b/packages/cli/generation/source-resolver/src/NopSourceResolver.ts similarity index 100% rename from packages/cli/source-resolver/src/NopSourceResolver.ts rename to packages/cli/generation/source-resolver/src/NopSourceResolver.ts diff --git a/packages/cli/source-resolver/src/ResolvedSource.ts b/packages/cli/generation/source-resolver/src/ResolvedSource.ts similarity index 100% rename from packages/cli/source-resolver/src/ResolvedSource.ts rename to packages/cli/generation/source-resolver/src/ResolvedSource.ts diff --git a/packages/cli/source-resolver/src/SourceResolver.ts b/packages/cli/generation/source-resolver/src/SourceResolver.ts similarity index 100% rename from packages/cli/source-resolver/src/SourceResolver.ts rename to packages/cli/generation/source-resolver/src/SourceResolver.ts diff --git a/packages/cli/source-resolver/src/index.ts b/packages/cli/generation/source-resolver/src/index.ts similarity index 100% rename from packages/cli/source-resolver/src/index.ts rename to packages/cli/generation/source-resolver/src/index.ts diff --git a/packages/cli/generation/source-resolver/tsconfig.json b/packages/cli/generation/source-resolver/tsconfig.json new file mode 100644 index 00000000000..39a3afe4fab --- /dev/null +++ b/packages/cli/generation/source-resolver/tsconfig.json @@ -0,0 +1,16 @@ +{ + "extends": "../../../../shared/tsconfig.shared.json", + "compilerOptions": { + "composite": true, + "outDir": "lib", + "rootDir": "src" + }, + "include": [ + "./src/**/*" + ], + "references": [ + { + "path": "../../../commons/core-utils" + } + ] +} \ No newline at end of file diff --git a/packages/cli/generation/source-resolver/vitest.config.ts b/packages/cli/generation/source-resolver/vitest.config.ts new file mode 100644 index 00000000000..d11017dc676 --- /dev/null +++ b/packages/cli/generation/source-resolver/vitest.config.ts @@ -0,0 +1 @@ +export { default } from "../../../../shared/vitest.config"; diff --git a/packages/cli/source-resolver/.prettierrc.cjs b/packages/cli/source-resolver/.prettierrc.cjs deleted file mode 100644 index 39cf0d0b8c9..00000000000 --- a/packages/cli/source-resolver/.prettierrc.cjs +++ /dev/null @@ -1 +0,0 @@ -module.exports = require("../../../.prettierrc.json"); diff --git a/packages/cli/source-resolver/tsconfig.json b/packages/cli/source-resolver/tsconfig.json deleted file mode 100644 index 5e0cb788d44..00000000000 --- a/packages/cli/source-resolver/tsconfig.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "extends": "../../../shared/tsconfig.shared.json", - "compilerOptions": { "composite": true, "outDir": "lib", "rootDir": "src" }, - "include": ["./src/**/*"], - "references": [{ "path": "../../commons/core-utils" }] -} diff --git a/packages/cli/source-resolver/vitest.config.ts b/packages/cli/source-resolver/vitest.config.ts deleted file mode 100644 index fecc099c58a..00000000000 --- a/packages/cli/source-resolver/vitest.config.ts +++ /dev/null @@ -1 +0,0 @@ -export { default } from "../../../shared/vitest.config"; diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 4e3f89653e0..c50d0fb70ae 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -4123,7 +4123,7 @@ importers: version: link:../../commons/fs-utils '@fern-api/source-resolver': specifier: workspace:* - version: link:../source-resolver + version: link:../generation/source-resolver '@fern-api/task-context': specifier: workspace:* version: link:../task-context @@ -4919,7 +4919,7 @@ importers: version: link:../../../commons/path-utils '@fern-api/source-resolver': specifier: workspace:* - version: link:../../source-resolver + version: link:../source-resolver '@fern-api/task-context': specifier: workspace:* version: link:../../task-context @@ -5497,6 +5497,37 @@ importers: specifier: ^2.0.5 version: 2.0.5(@types/node@18.7.18)(jsdom@20.0.3)(sass@1.72.0)(terser@5.31.5) + packages/cli/generation/source-resolver: + dependencies: + '@fern-api/fern-definition-schema': + specifier: workspace:* + version: link:../../fern-definition/schema + '@fern-api/path-utils': + specifier: workspace:* + version: link:../../../commons/path-utils + devDependencies: + '@types/jest': + specifier: ^29.5.12 + version: 29.5.12 + depcheck: + specifier: ^1.4.6 + version: 1.4.6 + eslint: + specifier: ^8.56.0 + version: 8.56.0 + organize-imports-cli: + specifier: ^0.10.0 + version: 0.10.0 + prettier: + specifier: ^2.7.1 + version: 2.7.1 + typescript: + specifier: 4.6.4 + version: 4.6.4 + vitest: + specifier: ^2.1.4 + version: 2.1.4(@types/node@18.7.18)(jsdom@20.0.3)(sass@1.72.0)(terser@5.31.5) + packages/cli/init: dependencies: '@fern-api/auth': @@ -6034,37 +6065,6 @@ importers: specifier: ^2.1.4 version: 2.1.4(@types/node@18.7.18)(jsdom@20.0.3)(sass@1.72.0)(terser@5.31.5) - packages/cli/source-resolver: - dependencies: - '@fern-api/fern-definition-schema': - specifier: workspace:* - version: link:../fern-definition/schema - '@fern-api/path-utils': - specifier: workspace:* - version: link:../../commons/path-utils - devDependencies: - '@types/jest': - specifier: ^29.5.12 - version: 29.5.12 - depcheck: - specifier: ^1.4.6 - version: 1.4.6 - eslint: - specifier: ^8.56.0 - version: 8.56.0 - organize-imports-cli: - specifier: ^0.10.0 - version: 0.10.0 - prettier: - specifier: ^2.7.1 - version: 2.7.1 - typescript: - specifier: 4.6.4 - version: 4.6.4 - vitest: - specifier: ^2.1.4 - version: 2.1.4(@types/node@18.7.18)(jsdom@20.0.3)(sass@1.72.0)(terser@5.31.5) - packages/cli/task-context: dependencies: '@fern-api/logger':