From d570df221a7ebd82ce0dba60daf2a964fe66360b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Gorej?= Date: Fri, 8 Nov 2024 12:52:01 +0100 Subject: [PATCH 1/3] chore(ast): consolidate tsconfig files (#4467) Refs #4385 --- packages/apidom-ast/package.json | 2 +- .../{declaration.tsconfig.json => tsconfig.declaration.json} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename packages/apidom-ast/{declaration.tsconfig.json => tsconfig.declaration.json} (100%) diff --git a/packages/apidom-ast/package.json b/packages/apidom-ast/package.json index 75bc829b37..0c8a294af5 100644 --- a/packages/apidom-ast/package.json +++ b/packages/apidom-ast/package.json @@ -26,7 +26,7 @@ "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", "typescript:check-types": "tsc --noEmit", - "typescript:declaration": "tsc -p declaration.tsconfig.json && rollup -c config/rollup/types.dist.js", + "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-ast/declaration.tsconfig.json b/packages/apidom-ast/tsconfig.declaration.json similarity index 100% rename from packages/apidom-ast/declaration.tsconfig.json rename to packages/apidom-ast/tsconfig.declaration.json From 3018e01c5c8b16d255457df9ac018cd4d0528eca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Gorej?= Date: Fri, 8 Nov 2024 12:59:10 +0100 Subject: [PATCH 2/3] chore(error): consolidate tsconfig files (#4468) Refs #4385 --- packages/apidom-error/package.json | 2 +- .../{declaration.tsconfig.json => tsconfig.declaration.json} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename packages/apidom-error/{declaration.tsconfig.json => tsconfig.declaration.json} (100%) diff --git a/packages/apidom-error/package.json b/packages/apidom-error/package.json index ad8af8f1a2..6d7cd665a9 100644 --- a/packages/apidom-error/package.json +++ b/packages/apidom-error/package.json @@ -25,7 +25,7 @@ "lint:fix": "eslint ./ --fix", "clean": "rimraf --glob 'src/**/*.mjs' 'src/**/*.cjs' 'test/**/*.mjs' ./dist ./types", "typescript:check-types": "tsc --noEmit", - "typescript:declaration": "copyfiles -u 1 'src/**/*.d.ts' ./types && tsc -p declaration.tsconfig.json && api-extractor run -l -c ./config/api-extractor/api-extractor.json", + "typescript:declaration": "copyfiles -u 1 'src/**/*.d.ts' ./types && tsc -p tsconfig.declaration.json && api-extractor run -l -c ./config/api-extractor/api-extractor.json", "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", "prepack": "copyfiles -u 3 ../../LICENSES/* LICENSES && copyfiles -u 2 ../../NOTICE .", "postpack": "rimraf NOTICE LICENSES" diff --git a/packages/apidom-error/declaration.tsconfig.json b/packages/apidom-error/tsconfig.declaration.json similarity index 100% rename from packages/apidom-error/declaration.tsconfig.json rename to packages/apidom-error/tsconfig.declaration.json From 0b5aca7036f0d4ca353121952626d4958eefcc0b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Gorej?= Date: Fri, 8 Nov 2024 13:08:54 +0100 Subject: [PATCH 3/3] chore(ns-json-schema-draft-4): consolidate tsconfig files (#4469) Refs #4385 Co-authored-by: Oliwia Rogala --- .../check-types-test.tsconfig.json | 9 --------- .../check-types.tsconfig.json | 11 ----------- packages/apidom-ns-json-schema-draft-4/package.json | 4 ++-- .../apidom-ns-json-schema-draft-4/test/tsconfig.json | 10 ++++++++++ ...ration.tsconfig.json => tsconfig.declaration.json} | 3 --- packages/apidom-ns-json-schema-draft-4/tsconfig.json | 1 - 6 files changed, 12 insertions(+), 26 deletions(-) delete mode 100644 packages/apidom-ns-json-schema-draft-4/check-types-test.tsconfig.json delete mode 100644 packages/apidom-ns-json-schema-draft-4/check-types.tsconfig.json create mode 100644 packages/apidom-ns-json-schema-draft-4/test/tsconfig.json rename packages/apidom-ns-json-schema-draft-4/{declaration.tsconfig.json => tsconfig.declaration.json} (82%) diff --git a/packages/apidom-ns-json-schema-draft-4/check-types-test.tsconfig.json b/packages/apidom-ns-json-schema-draft-4/check-types-test.tsconfig.json deleted file mode 100644 index d031802e04..0000000000 --- a/packages/apidom-ns-json-schema-draft-4/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-json-schema-draft-4/check-types.tsconfig.json b/packages/apidom-ns-json-schema-draft-4/check-types.tsconfig.json deleted file mode 100644 index 501a41d3f2..0000000000 --- a/packages/apidom-ns-json-schema-draft-4/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-json-schema-draft-4/package.json b/packages/apidom-ns-json-schema-draft-4/package.json index 61055b5d9d..1651457583 100644 --- a/packages/apidom-ns-json-schema-draft-4/package.json +++ b/packages/apidom-ns-json-schema-draft-4/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 BABEL_ENV=cjs 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-json-schema-draft-4/test/tsconfig.json b/packages/apidom-ns-json-schema-draft-4/test/tsconfig.json new file mode 100644 index 0000000000..405aae2d2f --- /dev/null +++ b/packages/apidom-ns-json-schema-draft-4/test/tsconfig.json @@ -0,0 +1,10 @@ +{ + "extends": "../tsconfig.json", + "compilerOptions": { + "module": "esnext", + "moduleResolution": "node" + }, + "include": [ + "." + ] +} diff --git a/packages/apidom-ns-json-schema-draft-4/declaration.tsconfig.json b/packages/apidom-ns-json-schema-draft-4/tsconfig.declaration.json similarity index 82% rename from packages/apidom-ns-json-schema-draft-4/declaration.tsconfig.json rename to packages/apidom-ns-json-schema-draft-4/tsconfig.declaration.json index 5697fa3e89..82d128fa80 100644 --- a/packages/apidom-ns-json-schema-draft-4/declaration.tsconfig.json +++ b/packages/apidom-ns-json-schema-draft-4/tsconfig.declaration.json @@ -1,8 +1,5 @@ { "extends": "./tsconfig.json", - "exclude": [ - "test/**/*" - ], "compilerOptions": { "declaration": true, "declarationDir": "types", diff --git a/packages/apidom-ns-json-schema-draft-4/tsconfig.json b/packages/apidom-ns-json-schema-draft-4/tsconfig.json index a86c615aaa..e1f8436f14 100644 --- a/packages/apidom-ns-json-schema-draft-4/tsconfig.json +++ b/packages/apidom-ns-json-schema-draft-4/tsconfig.json @@ -7,6 +7,5 @@ }, "include": [ "src/**/*", - "test/**/*" ] }