From 16f9c84b8220a04b2f417606ba62c05d6504f24f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Gorej?= Date: Fri, 8 Nov 2024 12:39:33 +0100 Subject: [PATCH] chore(ns-openapi-3-0): consolidate tsconfig files (#4466) Refs #4385 --- packages/apidom-core/test/tsconfig.json | 3 +-- .../check-types-test.tsconfig.json | 9 --------- .../apidom-ns-openapi-3-0/check-types.tsconfig.json | 11 ----------- packages/apidom-ns-openapi-3-0/package.json | 4 ++-- packages/apidom-ns-openapi-3-0/test/tsconfig.json | 10 ++++++++++ ...ration.tsconfig.json => tsconfig.declaration.json} | 3 --- packages/apidom-ns-openapi-3-0/tsconfig.json | 1 - 7 files changed, 13 insertions(+), 28 deletions(-) delete mode 100644 packages/apidom-ns-openapi-3-0/check-types-test.tsconfig.json delete mode 100644 packages/apidom-ns-openapi-3-0/check-types.tsconfig.json create mode 100644 packages/apidom-ns-openapi-3-0/test/tsconfig.json rename packages/apidom-ns-openapi-3-0/{declaration.tsconfig.json => tsconfig.declaration.json} (82%) diff --git a/packages/apidom-core/test/tsconfig.json b/packages/apidom-core/test/tsconfig.json index 70da9ed9ab..405aae2d2f 100644 --- a/packages/apidom-core/test/tsconfig.json +++ b/packages/apidom-core/test/tsconfig.json @@ -2,8 +2,7 @@ "extends": "../tsconfig.json", "compilerOptions": { "module": "esnext", - "moduleResolution": "node", - "allowImportingTsExtensions": true, + "moduleResolution": "node" }, "include": [ "." diff --git a/packages/apidom-ns-openapi-3-0/check-types-test.tsconfig.json b/packages/apidom-ns-openapi-3-0/check-types-test.tsconfig.json deleted file mode 100644 index d031802e04..0000000000 --- a/packages/apidom-ns-openapi-3-0/check-types-test.tsconfig.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "extends": "../../tsconfig.json", - "compilerOptions": { - "allowImportingTsExtensions": true - }, - "include": [ - "test/**/*" - ] -} diff --git a/packages/apidom-ns-openapi-3-0/check-types.tsconfig.json b/packages/apidom-ns-openapi-3-0/check-types.tsconfig.json deleted file mode 100644 index 501a41d3f2..0000000000 --- a/packages/apidom-ns-openapi-3-0/check-types.tsconfig.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "extends": "../../tsconfig.json", - "compilerOptions": { - "module": "nodenext", - "moduleResolution": "nodenext", - "allowImportingTsExtensions": true - }, - "include": [ - "src/**/*" - ] -} diff --git a/packages/apidom-ns-openapi-3-0/package.json b/packages/apidom-ns-openapi-3-0/package.json index 8479cbbf9e..1207c81fdf 100644 --- a/packages/apidom-ns-openapi-3-0/package.json +++ b/packages/apidom-ns-openapi-3-0/package.json @@ -29,8 +29,8 @@ "clean": "rimraf --glob 'src/**/*.mjs' 'src/**/*.cjs' 'test/**/*.mjs' ./dist ./types", "test": "npm run build:es && cross-env BABEL_ENV=es babel test --out-dir test --extensions '.ts' --out-file-extension '.mjs' --root-mode 'upward' && cross-env NODE_ENV=test mocha", "test:update-snapshots": "cross-env UPDATE_SNAPSHOT=1 mocha", - "typescript:check-types": "tsc -p check-types.tsconfig.json --noEmit && tsc -p check-types-test.tsconfig.json --noEmit", - "typescript:declaration": "tsc -p declaration.tsconfig.json && rollup -c config/rollup/types.dist.js", + "typescript:check-types": "tsc --noEmit && tsc -p ./test/tsconfig.json --noEmit", + "typescript:declaration": "tsc -p tsconfig.declaration.json && rollup -c config/rollup/types.dist.js", "prepack": "copyfiles -u 3 ../../LICENSES/* LICENSES && copyfiles -u 2 ../../NOTICE .", "postpack": "rimraf NOTICE LICENSES" }, diff --git a/packages/apidom-ns-openapi-3-0/test/tsconfig.json b/packages/apidom-ns-openapi-3-0/test/tsconfig.json new file mode 100644 index 0000000000..405aae2d2f --- /dev/null +++ b/packages/apidom-ns-openapi-3-0/test/tsconfig.json @@ -0,0 +1,10 @@ +{ + "extends": "../tsconfig.json", + "compilerOptions": { + "module": "esnext", + "moduleResolution": "node" + }, + "include": [ + "." + ] +} diff --git a/packages/apidom-ns-openapi-3-0/declaration.tsconfig.json b/packages/apidom-ns-openapi-3-0/tsconfig.declaration.json similarity index 82% rename from packages/apidom-ns-openapi-3-0/declaration.tsconfig.json rename to packages/apidom-ns-openapi-3-0/tsconfig.declaration.json index 5697fa3e89..82d128fa80 100644 --- a/packages/apidom-ns-openapi-3-0/declaration.tsconfig.json +++ b/packages/apidom-ns-openapi-3-0/tsconfig.declaration.json @@ -1,8 +1,5 @@ { "extends": "./tsconfig.json", - "exclude": [ - "test/**/*" - ], "compilerOptions": { "declaration": true, "declarationDir": "types", diff --git a/packages/apidom-ns-openapi-3-0/tsconfig.json b/packages/apidom-ns-openapi-3-0/tsconfig.json index a86c615aaa..e1f8436f14 100644 --- a/packages/apidom-ns-openapi-3-0/tsconfig.json +++ b/packages/apidom-ns-openapi-3-0/tsconfig.json @@ -7,6 +7,5 @@ }, "include": [ "src/**/*", - "test/**/*" ] }