Merge branch 'main' into 4385-apidom-ns-openapi-3-1

swagger-api · Nov 8, 2024 · 5aec256 · 5aec256
2 parents 451aa2c + 0b5aca7
commit 5aec256
Show file tree

Hide file tree

Showing 10 changed files with 14 additions and 28 deletions.
diff --git 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/...ages/apidom-ast/declaration.tsconfig.json → ...ages/apidom-ast/tsconfig.declaration.json b/...ages/apidom-ast/declaration.tsconfig.json → ...ages/apidom-ast/tsconfig.declaration.json
diff --git 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/...es/apidom-error/declaration.tsconfig.json → ...es/apidom-error/tsconfig.declaration.json b/...es/apidom-error/declaration.tsconfig.json → ...es/apidom-error/tsconfig.declaration.json
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
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
diff --git 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
@@ -0,0 +1,10 @@
+{
+  "extends": "../tsconfig.json",
+  "compilerOptions": {
+    "module": "esnext",
+    "moduleResolution": "node"
+  },
+  "include": [
+    "."
+  ]
+}
diff --git a/...-schema-draft-4/declaration.tsconfig.json → ...-schema-draft-4/tsconfig.declaration.json b/...-schema-draft-4/declaration.tsconfig.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
@@ -7,6 +7,5 @@
   },
   "include": [
     "src/**/*",
-    "test/**/*"
   ]
 }