diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml new file mode 100644 index 000000000..f9a4c0eb6 --- /dev/null +++ b/.github/workflows/release.yml @@ -0,0 +1,62 @@ +on: + workflow_dispatch: + inputs: + version: + description: version + required: true + type: choice + options: + - major + - minor + - patch + - premajor + - preminor + - prepatch + - prerelease + +permissions: + contents: write + actions: read + pull-requests: read + id-token: write + +jobs: + release: + runs-on: buildjet-2vcpu-ubuntu-2004 + steps: + - uses: actions/checkout@v4 + with: + fetch-depth: 0 + + - uses: actions/setup-node@v4 + with: + node-version: 20.6.0 + + - name: Cache node_modules + uses: actions/cache@v4 + with: + path: '**/node_modules' + key: ${{ runner.os }}-node_modules-${{ hashFiles('**/package-lock.json') }} + + - name: npm install + run: npm ci + + - name: git config + run: | + git config user.name "${GITHUB_ACTOR}" + git config user.email "${GITHUB_ACTOR}@users.noreply.github.com" + + - name: lerna version + run: lerna version --no-private --verify-access ${{ inputs.version }} + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }} + LEFTHOOK: 0 + + - name: lerna publish + run: lerna publish from-git + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }} + LEFTHOOK: 0 + diff --git a/packages/api-console-module/package.json b/packages/api-console-module/package.json index 7e84a9bf3..0bf2cad00 100644 --- a/packages/api-console-module/package.json +++ b/packages/api-console-module/package.json @@ -51,8 +51,14 @@ "rxjs": "~7.5.0" }, "jest": { + "testEnvironment": "node", "transform": { - "^.+\\.(ts|tsx)$": "ts-jest" + "^.+\\.(ts|tsx)$": [ + "ts-jest", + { + "tsconfig": "/tsconfig.spec.json" + } + ] }, "moduleNameMapper": { "(.+)\\.js": "$1" diff --git a/packages/api-console-module/tsconfig.json b/packages/api-console-module/tsconfig.json index e0a06d39d..b03146bdc 100644 --- a/packages/api-console-module/tsconfig.json +++ b/packages/api-console-module/tsconfig.json @@ -22,6 +22,9 @@ "index.ts", "node_modules/@deepkit/api-console-gui/src/api.ts" ], + "exclude": [ + "tests" + ], "references": [ { "path": "../api-console-api/tsconfig.json" diff --git a/packages/rpc/tsconfig.test.json b/packages/api-console-module/tsconfig.spec.json similarity index 64% rename from packages/rpc/tsconfig.test.json rename to packages/api-console-module/tsconfig.spec.json index f2daf30dc..b764fc77d 100644 --- a/packages/rpc/tsconfig.test.json +++ b/packages/api-console-module/tsconfig.spec.json @@ -1,8 +1,5 @@ { "extends": "./tsconfig.json", - "compilerOptions": { - "target": "es2020" - }, "include": [ "src", "index.ts", diff --git a/packages/app/package.json b/packages/app/package.json index 203f01643..ad8eb8579 100644 --- a/packages/app/package.json +++ b/packages/app/package.json @@ -42,8 +42,14 @@ "conditional-type-checks": "^1.0.5" }, "jest": { + "testEnvironment": "node", "transform": { - "^.+\\.(ts|tsx)$": "ts-jest" + "^.+\\.(ts|tsx)$": [ + "ts-jest", + { + "tsconfig": "/tsconfig.spec.json" + } + ] }, "moduleNameMapper": { "(.+)\\.js": "$1" diff --git a/packages/app/tsconfig.json b/packages/app/tsconfig.json index d6c24d2a5..d8c94fe3d 100644 --- a/packages/app/tsconfig.json +++ b/packages/app/tsconfig.json @@ -22,6 +22,9 @@ "src", "index.ts" ], + "exclude": [ + "tests" + ], "references": [ { "path": "../core/tsconfig.json" diff --git a/packages/type-compiler/tsconfig.test.json b/packages/app/tsconfig.spec.json similarity index 64% rename from packages/type-compiler/tsconfig.test.json rename to packages/app/tsconfig.spec.json index f2daf30dc..b764fc77d 100644 --- a/packages/type-compiler/tsconfig.test.json +++ b/packages/app/tsconfig.spec.json @@ -1,8 +1,5 @@ { "extends": "./tsconfig.json", - "compilerOptions": { - "target": "es2020" - }, "include": [ "src", "index.ts", diff --git a/packages/broker/package.json b/packages/broker/package.json index ec8c20f25..f970ea3d5 100644 --- a/packages/broker/package.json +++ b/packages/broker/package.json @@ -44,8 +44,14 @@ "@deepkit/type": "^1.0.1-alpha.113" }, "jest": { + "testEnvironment": "node", "transform": { - "^.+\\.(ts|tsx)$": "ts-jest" + "^.+\\.(ts|tsx)$": [ + "ts-jest", + { + "tsconfig": "/tsconfig.spec.json" + } + ] }, "moduleNameMapper": { "(.+)\\.js": "$1" diff --git a/packages/broker/tsconfig.json b/packages/broker/tsconfig.json index 26320a0aa..1d3e3a6a6 100644 --- a/packages/broker/tsconfig.json +++ b/packages/broker/tsconfig.json @@ -19,9 +19,11 @@ "reflection": true, "include": [ "src", - "tests", "index.ts" ], + "exclude": [ + "tests" + ], "references": [ { "path": "../bson/tsconfig.json" diff --git a/packages/type-spec/tsconfig.test.json b/packages/broker/tsconfig.spec.json similarity index 64% rename from packages/type-spec/tsconfig.test.json rename to packages/broker/tsconfig.spec.json index f2daf30dc..b764fc77d 100644 --- a/packages/type-spec/tsconfig.test.json +++ b/packages/broker/tsconfig.spec.json @@ -1,8 +1,5 @@ { "extends": "./tsconfig.json", - "compilerOptions": { - "target": "es2020" - }, "include": [ "src", "index.ts", diff --git a/packages/bson/package.json b/packages/bson/package.json index 4585d7a58..668304832 100644 --- a/packages/bson/package.json +++ b/packages/bson/package.json @@ -37,7 +37,12 @@ "jest": { "testEnvironment": "node", "transform": { - "^.+\\.(ts|tsx)$": "ts-jest" + "^.+\\.(ts|tsx)$": [ + "ts-jest", + { + "tsconfig": "/tsconfig.spec.json" + } + ] }, "moduleNameMapper": { "(.+)\\.js": "$1" diff --git a/packages/bson/tsconfig.json b/packages/bson/tsconfig.json index 87fad66a4..75f03d7a9 100644 --- a/packages/bson/tsconfig.json +++ b/packages/bson/tsconfig.json @@ -26,6 +26,9 @@ "src", "index.ts" ], + "exclude": [ + "tests" + ], "references": [ { "path": "../core/tsconfig.json" diff --git a/packages/type/tsconfig.test.json b/packages/bson/tsconfig.spec.json similarity index 64% rename from packages/type/tsconfig.test.json rename to packages/bson/tsconfig.spec.json index f2daf30dc..b764fc77d 100644 --- a/packages/type/tsconfig.test.json +++ b/packages/bson/tsconfig.spec.json @@ -1,8 +1,5 @@ { "extends": "./tsconfig.json", - "compilerOptions": { - "target": "es2020" - }, "include": [ "src", "index.ts", diff --git a/packages/bun/package.json b/packages/bun/package.json index 3fc55ebfa..8b41eddec 100644 --- a/packages/bun/package.json +++ b/packages/bun/package.json @@ -32,8 +32,14 @@ "bun-types": "1.0.6" }, "jest": { + "testEnvironment": "node", "transform": { - "^.+\\.(ts|tsx)$": "ts-jest" + "^.+\\.(ts|tsx)$": [ + "ts-jest", + { + "tsconfig": "/tsconfig.spec.json" + } + ] }, "moduleNameMapper": { "(.+)\\.js": "$1" diff --git a/packages/bun/tsconfig.json b/packages/bun/tsconfig.json index e98f3c252..18af7c7d8 100644 --- a/packages/bun/tsconfig.json +++ b/packages/bun/tsconfig.json @@ -20,9 +20,11 @@ }, "include": [ "src", - "tests", "index.ts" ], + "exclude": [ + "tests" + ], "references": [ { "path": "../core/tsconfig.json" diff --git a/packages/bun/tsconfig.spec.json b/packages/bun/tsconfig.spec.json new file mode 100644 index 000000000..b764fc77d --- /dev/null +++ b/packages/bun/tsconfig.spec.json @@ -0,0 +1,8 @@ +{ + "extends": "./tsconfig.json", + "include": [ + "src", + "index.ts", + "tests" + ] +} diff --git a/packages/core-rxjs/package.json b/packages/core-rxjs/package.json index a7743d299..de784bfe6 100644 --- a/packages/core-rxjs/package.json +++ b/packages/core-rxjs/package.json @@ -32,8 +32,14 @@ "rxjs": "~7.5.0" }, "jest": { + "testEnvironment": "node", "transform": { - "^.+\\.(ts|tsx)$": "ts-jest" + "^.+\\.(ts|tsx)$": [ + "ts-jest", + { + "tsconfig": "/tsconfig.spec.json" + } + ] }, "moduleNameMapper": { "(.+)\\.js": "$1" diff --git a/packages/core-rxjs/tsconfig.json b/packages/core-rxjs/tsconfig.json index 3a38e3218..247168b5b 100644 --- a/packages/core-rxjs/tsconfig.json +++ b/packages/core-rxjs/tsconfig.json @@ -18,7 +18,9 @@ }, "include": [ "src", - "index.ts", + "index.ts" + ], + "exclude": [ "tests" ], "references": [ diff --git a/packages/core-rxjs/tsconfig.spec.json b/packages/core-rxjs/tsconfig.spec.json new file mode 100644 index 000000000..b764fc77d --- /dev/null +++ b/packages/core-rxjs/tsconfig.spec.json @@ -0,0 +1,8 @@ +{ + "extends": "./tsconfig.json", + "include": [ + "src", + "index.ts", + "tests" + ] +} diff --git a/packages/core/package.json b/packages/core/package.json index 120ed2c39..7ef3f708f 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -31,8 +31,14 @@ "build": "echo '{\"type\": \"module\"}' > ./dist/esm/package.json" }, "jest": { + "testEnvironment": "node", "transform": { - "^.+\\.(ts|tsx)$": "ts-jest" + "^.+\\.(ts|tsx)$": [ + "ts-jest", + { + "tsconfig": "/tsconfig.spec.json" + } + ] }, "moduleNameMapper": { "(.+)\\.js": "$1" diff --git a/packages/core/tsconfig.json b/packages/core/tsconfig.json index f74ad9daa..ffdf72510 100644 --- a/packages/core/tsconfig.json +++ b/packages/core/tsconfig.json @@ -16,13 +16,16 @@ "declaration": true, "composite": true, "types": [ - "dot-prop" + "dot-prop", + "node" ] }, "reflection": true, "include": [ "src", - "index.ts", + "index.ts" + ], + "exclude": [ "tests" ], "references": [] diff --git a/packages/core/tsconfig.spec.json b/packages/core/tsconfig.spec.json new file mode 100644 index 000000000..b764fc77d --- /dev/null +++ b/packages/core/tsconfig.spec.json @@ -0,0 +1,8 @@ +{ + "extends": "./tsconfig.json", + "include": [ + "src", + "index.ts", + "tests" + ] +} diff --git a/packages/event/package.json b/packages/event/package.json index a34b6f117..d591c283d 100644 --- a/packages/event/package.json +++ b/packages/event/package.json @@ -33,8 +33,14 @@ "@deepkit/type": "^1.0.1-alpha.113" }, "jest": { + "testEnvironment": "node", "transform": { - "^.+\\.(ts|tsx)$": "ts-jest" + "^.+\\.(ts|tsx)$": [ + "ts-jest", + { + "tsconfig": "/tsconfig.spec.json" + } + ] }, "moduleNameMapper": { "(.+)\\.js": "$1" diff --git a/packages/event/tsconfig.json b/packages/event/tsconfig.json index 30ffe145d..eee4d7731 100644 --- a/packages/event/tsconfig.json +++ b/packages/event/tsconfig.json @@ -18,9 +18,11 @@ }, "include": [ "src", - "tests", "index.ts" ], + "exclude": [ + "tests" + ], "reflection": true, "references": [ { diff --git a/packages/event/tsconfig.spec.json b/packages/event/tsconfig.spec.json new file mode 100644 index 000000000..b764fc77d --- /dev/null +++ b/packages/event/tsconfig.spec.json @@ -0,0 +1,8 @@ +{ + "extends": "./tsconfig.json", + "include": [ + "src", + "index.ts", + "tests" + ] +} diff --git a/packages/filesystem-aws-s3/package.json b/packages/filesystem-aws-s3/package.json index 53d49c84d..c894cb03c 100644 --- a/packages/filesystem-aws-s3/package.json +++ b/packages/filesystem-aws-s3/package.json @@ -34,7 +34,7 @@ "^.+\\.(ts|tsx)$": [ "ts-jest", { - "tsconfig": "/tsconfig.json" + "tsconfig": "/tsconfig.spec.json" } ] }, diff --git a/packages/filesystem-aws-s3/tsconfig.json b/packages/filesystem-aws-s3/tsconfig.json index 88abaa0ee..121325b86 100644 --- a/packages/filesystem-aws-s3/tsconfig.json +++ b/packages/filesystem-aws-s3/tsconfig.json @@ -18,9 +18,11 @@ }, "include": [ "src", - "tests", "index.ts" ], + "exclude": [ + "tests" + ], "references": [ { "path": "../core/tsconfig.json" diff --git a/packages/filesystem-aws-s3/tsconfig.spec.json b/packages/filesystem-aws-s3/tsconfig.spec.json new file mode 100644 index 000000000..b764fc77d --- /dev/null +++ b/packages/filesystem-aws-s3/tsconfig.spec.json @@ -0,0 +1,8 @@ +{ + "extends": "./tsconfig.json", + "include": [ + "src", + "index.ts", + "tests" + ] +} diff --git a/packages/filesystem-ftp/package.json b/packages/filesystem-ftp/package.json index 8f7e45c64..6894fa349 100644 --- a/packages/filesystem-ftp/package.json +++ b/packages/filesystem-ftp/package.json @@ -34,7 +34,7 @@ "^.+\\.(ts|tsx)$": [ "ts-jest", { - "tsconfig": "/tsconfig.json" + "tsconfig": "/tsconfig.spec.json" } ] }, diff --git a/packages/filesystem-ftp/tsconfig.json b/packages/filesystem-ftp/tsconfig.json index 88abaa0ee..121325b86 100644 --- a/packages/filesystem-ftp/tsconfig.json +++ b/packages/filesystem-ftp/tsconfig.json @@ -18,9 +18,11 @@ }, "include": [ "src", - "tests", "index.ts" ], + "exclude": [ + "tests" + ], "references": [ { "path": "../core/tsconfig.json" diff --git a/packages/filesystem-ftp/tsconfig.spec.json b/packages/filesystem-ftp/tsconfig.spec.json new file mode 100644 index 000000000..b764fc77d --- /dev/null +++ b/packages/filesystem-ftp/tsconfig.spec.json @@ -0,0 +1,8 @@ +{ + "extends": "./tsconfig.json", + "include": [ + "src", + "index.ts", + "tests" + ] +} diff --git a/packages/filesystem-google/package.json b/packages/filesystem-google/package.json index b6a1e3823..3b5abb0a8 100644 --- a/packages/filesystem-google/package.json +++ b/packages/filesystem-google/package.json @@ -39,7 +39,7 @@ "^.+\\.(ts|tsx)$": [ "ts-jest", { - "tsconfig": "/tsconfig.json" + "tsconfig": "/tsconfig.spec.json" } ] }, diff --git a/packages/filesystem-google/tsconfig.json b/packages/filesystem-google/tsconfig.json index 88abaa0ee..121325b86 100644 --- a/packages/filesystem-google/tsconfig.json +++ b/packages/filesystem-google/tsconfig.json @@ -18,9 +18,11 @@ }, "include": [ "src", - "tests", "index.ts" ], + "exclude": [ + "tests" + ], "references": [ { "path": "../core/tsconfig.json" diff --git a/packages/filesystem-google/tsconfig.spec.json b/packages/filesystem-google/tsconfig.spec.json new file mode 100644 index 000000000..b764fc77d --- /dev/null +++ b/packages/filesystem-google/tsconfig.spec.json @@ -0,0 +1,8 @@ +{ + "extends": "./tsconfig.json", + "include": [ + "src", + "index.ts", + "tests" + ] +} diff --git a/packages/filesystem-sftp/package.json b/packages/filesystem-sftp/package.json index ebe219459..69bfc9cdf 100644 --- a/packages/filesystem-sftp/package.json +++ b/packages/filesystem-sftp/package.json @@ -45,7 +45,7 @@ "^.+\\.(ts|tsx)$": [ "ts-jest", { - "tsconfig": "/tsconfig.json" + "tsconfig": "/tsconfig.spec.json" } ] }, diff --git a/packages/filesystem-sftp/tsconfig.json b/packages/filesystem-sftp/tsconfig.json index a2bb7adf8..6364ffbc2 100644 --- a/packages/filesystem-sftp/tsconfig.json +++ b/packages/filesystem-sftp/tsconfig.json @@ -21,9 +21,11 @@ }, "include": [ "src", - "tests", "index.ts" ], + "exclude": [ + "tests" + ], "references": [ { "path": "../core/tsconfig.json" diff --git a/packages/filesystem-sftp/tsconfig.spec.json b/packages/filesystem-sftp/tsconfig.spec.json new file mode 100644 index 000000000..b764fc77d --- /dev/null +++ b/packages/filesystem-sftp/tsconfig.spec.json @@ -0,0 +1,8 @@ +{ + "extends": "./tsconfig.json", + "include": [ + "src", + "index.ts", + "tests" + ] +} diff --git a/packages/filesystem/package.json b/packages/filesystem/package.json index a650c4bfe..7c0d19416 100644 --- a/packages/filesystem/package.json +++ b/packages/filesystem/package.json @@ -39,7 +39,7 @@ "^.+\\.(ts|tsx)$": [ "ts-jest", { - "tsconfig": "/tsconfig.json" + "tsconfig": "/tsconfig.spec.json" } ] }, diff --git a/packages/filesystem/tsconfig.json b/packages/filesystem/tsconfig.json index 7ab3cf055..1d1eb0366 100644 --- a/packages/filesystem/tsconfig.json +++ b/packages/filesystem/tsconfig.json @@ -18,9 +18,11 @@ }, "include": [ "src", - "tests", "index.ts" ], + "exclude": [ + "tests" + ], "reflection": true, "references": [ { diff --git a/packages/filesystem/tsconfig.spec.json b/packages/filesystem/tsconfig.spec.json new file mode 100644 index 000000000..b764fc77d --- /dev/null +++ b/packages/filesystem/tsconfig.spec.json @@ -0,0 +1,8 @@ +{ + "extends": "./tsconfig.json", + "include": [ + "src", + "index.ts", + "tests" + ] +} diff --git a/packages/framework/package.json b/packages/framework/package.json index 59af1f6ee..d4e80a397 100644 --- a/packages/framework/package.json +++ b/packages/framework/package.json @@ -100,7 +100,12 @@ "jest": { "testEnvironment": "node", "transform": { - "^.+\\.(ts|tsx)$": "ts-jest" + "^.+\\.(ts|tsx)$": [ + "ts-jest", + { + "tsconfig": "/tsconfig.spec.json" + } + ] }, "moduleNameMapper": { "./xxHash32.js": "./xxHash32.cjs", diff --git a/packages/framework/tsconfig.json b/packages/framework/tsconfig.json index 1911566f1..102ce1c55 100644 --- a/packages/framework/tsconfig.json +++ b/packages/framework/tsconfig.json @@ -31,11 +31,13 @@ "include": [ "src", "jsx", - "tests", "index.ts", "jsx-runtime.ts", "loader.ts" ], + "exclude": [ + "tests" + ], "references": [ { "path": "../api-console-module/tsconfig.json" diff --git a/packages/framework/tsconfig.spec.json b/packages/framework/tsconfig.spec.json new file mode 100644 index 000000000..b764fc77d --- /dev/null +++ b/packages/framework/tsconfig.spec.json @@ -0,0 +1,8 @@ +{ + "extends": "./tsconfig.json", + "include": [ + "src", + "index.ts", + "tests" + ] +} diff --git a/packages/http/package.json b/packages/http/package.json index b045f90a0..7bdfb8c46 100644 --- a/packages/http/package.json +++ b/packages/http/package.json @@ -52,8 +52,14 @@ "@types/send": "^0.14.6" }, "jest": { + "testEnvironment": "node", "transform": { - "^.+\\.(ts|tsx)$": "ts-jest" + "^.+\\.(ts|tsx)$": [ + "ts-jest", + { + "tsconfig": "/tsconfig.spec.json" + } + ] }, "moduleNameMapper": { "(.+)\\.js": "$1" diff --git a/packages/http/tsconfig.json b/packages/http/tsconfig.json index 01eb00aed..354f7c3e5 100644 --- a/packages/http/tsconfig.json +++ b/packages/http/tsconfig.json @@ -22,9 +22,11 @@ "reflection": true, "include": [ "src", - "tests", "index.ts" ], + "exclude": [ + "tests" + ], "references": [ { "path": "../app/tsconfig.json" diff --git a/packages/http/tsconfig.spec.json b/packages/http/tsconfig.spec.json new file mode 100644 index 000000000..b764fc77d --- /dev/null +++ b/packages/http/tsconfig.spec.json @@ -0,0 +1,8 @@ +{ + "extends": "./tsconfig.json", + "include": [ + "src", + "index.ts", + "tests" + ] +} diff --git a/packages/injector/package.json b/packages/injector/package.json index 1654a2108..36d240d66 100644 --- a/packages/injector/package.json +++ b/packages/injector/package.json @@ -34,7 +34,12 @@ "jest": { "testEnvironment": "node", "transform": { - "^.+\\.(ts|tsx)$": "ts-jest" + "^.+\\.(ts|tsx)$": [ + "ts-jest", + { + "tsconfig": "/tsconfig.spec.json" + } + ] }, "moduleNameMapper": { "(.+)\\.js": "$1" diff --git a/packages/injector/tsconfig.json b/packages/injector/tsconfig.json index b022b4259..a8259a593 100644 --- a/packages/injector/tsconfig.json +++ b/packages/injector/tsconfig.json @@ -20,9 +20,11 @@ "reflection": true, "include": [ "src", - "tests", "index.ts" ], + "exclude": [ + "tests" + ], "references": [ { "path": "../core/tsconfig.json" diff --git a/packages/injector/tsconfig.spec.json b/packages/injector/tsconfig.spec.json new file mode 100644 index 000000000..b764fc77d --- /dev/null +++ b/packages/injector/tsconfig.spec.json @@ -0,0 +1,8 @@ +{ + "extends": "./tsconfig.json", + "include": [ + "src", + "index.ts", + "tests" + ] +} diff --git a/packages/logger/package.json b/packages/logger/package.json index 8715575a6..1b107f217 100644 --- a/packages/logger/package.json +++ b/packages/logger/package.json @@ -39,7 +39,12 @@ "jest": { "testEnvironment": "node", "transform": { - "^.+\\.(ts|tsx)$": "ts-jest" + "^.+\\.(ts|tsx)$": [ + "ts-jest", + { + "tsconfig": "/tsconfig.spec.json" + } + ] }, "moduleNameMapper": { "(.+)\\.js": "$1" diff --git a/packages/logger/tsconfig.json b/packages/logger/tsconfig.json index e952a3e2d..7eeaa58eb 100644 --- a/packages/logger/tsconfig.json +++ b/packages/logger/tsconfig.json @@ -21,9 +21,11 @@ "reflection": true, "include": [ "src", - "tests", "index.ts" ], + "exclude": [ + "tests" + ], "references": [ { "path": "../core/tsconfig.json" diff --git a/packages/logger/tsconfig.spec.json b/packages/logger/tsconfig.spec.json new file mode 100644 index 000000000..b764fc77d --- /dev/null +++ b/packages/logger/tsconfig.spec.json @@ -0,0 +1,8 @@ +{ + "extends": "./tsconfig.json", + "include": [ + "src", + "index.ts", + "tests" + ] +} diff --git a/packages/mongo/package.json b/packages/mongo/package.json index 5e8b835cc..c556bc9d9 100644 --- a/packages/mongo/package.json +++ b/packages/mongo/package.json @@ -46,7 +46,12 @@ "runner": "../../jest-serial-runner.js", "testEnvironment": "node", "transform": { - "^.+\\.(ts|tsx)$": "ts-jest" + "^.+\\.(ts|tsx)$": [ + "ts-jest", + { + "tsconfig": "/tsconfig.spec.json" + } + ] }, "moduleNameMapper": { "(.+)\\.js": "$1" diff --git a/packages/mongo/tsconfig.json b/packages/mongo/tsconfig.json index 2c6ebae36..93409b948 100644 --- a/packages/mongo/tsconfig.json +++ b/packages/mongo/tsconfig.json @@ -26,6 +26,7 @@ "src", "index.ts" ], + "exclude": ["tests"], "references": [ { "path": "../bson/tsconfig.json" diff --git a/packages/mongo/tsconfig.spec.json b/packages/mongo/tsconfig.spec.json new file mode 100644 index 000000000..b764fc77d --- /dev/null +++ b/packages/mongo/tsconfig.spec.json @@ -0,0 +1,8 @@ +{ + "extends": "./tsconfig.json", + "include": [ + "src", + "index.ts", + "tests" + ] +} diff --git a/packages/mysql/package.json b/packages/mysql/package.json index fef2ce457..fa316d666 100644 --- a/packages/mysql/package.json +++ b/packages/mysql/package.json @@ -45,7 +45,12 @@ "runner": "../../jest-serial-runner.js", "testEnvironment": "node", "transform": { - "^.+\\.(ts|tsx)$": "ts-jest" + "^.+\\.(ts|tsx)$": [ + "ts-jest", + { + "tsconfig": "/tsconfig.spec.json" + } + ] }, "moduleNameMapper": { "(.+)\\.js": "$1" diff --git a/packages/mysql/tsconfig.json b/packages/mysql/tsconfig.json index 42786fa1a..872c886a2 100644 --- a/packages/mysql/tsconfig.json +++ b/packages/mysql/tsconfig.json @@ -23,9 +23,11 @@ "include": [ "benchmarks", "src", - "tests", "index.ts" ], + "exclude": [ + "tests" + ], "references": [ { "path": "../core/tsconfig.json" diff --git a/packages/mysql/tsconfig.spec.json b/packages/mysql/tsconfig.spec.json new file mode 100644 index 000000000..b764fc77d --- /dev/null +++ b/packages/mysql/tsconfig.spec.json @@ -0,0 +1,8 @@ +{ + "extends": "./tsconfig.json", + "include": [ + "src", + "index.ts", + "tests" + ] +} diff --git a/packages/orm/package.json b/packages/orm/package.json index 58734022f..43d4a2682 100644 --- a/packages/orm/package.json +++ b/packages/orm/package.json @@ -50,7 +50,12 @@ "jest": { "testEnvironment": "node", "transform": { - "^.+\\.(ts|tsx)$": "ts-jest" + "^.+\\.(ts|tsx)$": [ + "ts-jest", + { + "tsconfig": "/tsconfig.spec.json" + } + ] }, "moduleNameMapper": { "(.+)\\.js": "$1" diff --git a/packages/orm/tsconfig.json b/packages/orm/tsconfig.json index 5d36efa3b..3fef63a2c 100644 --- a/packages/orm/tsconfig.json +++ b/packages/orm/tsconfig.json @@ -21,11 +21,13 @@ "reflection": true, "include": [ "src", - "tests", "browser.ts", "index.ts", "../../../../Library/Caches/JetBrains/WebStorm2021.2/javascript/typings/jest/27.0.1/node_modules/@types/jest/index.d.ts" ], + "exclude": [ + "tests" + ], "references": [ { "path": "../topsort/tsconfig.json" diff --git a/packages/orm/tsconfig.spec.json b/packages/orm/tsconfig.spec.json new file mode 100644 index 000000000..b764fc77d --- /dev/null +++ b/packages/orm/tsconfig.spec.json @@ -0,0 +1,8 @@ +{ + "extends": "./tsconfig.json", + "include": [ + "src", + "index.ts", + "tests" + ] +} diff --git a/packages/postgres/package.json b/packages/postgres/package.json index 4c528f959..b1aecd2d3 100644 --- a/packages/postgres/package.json +++ b/packages/postgres/package.json @@ -48,7 +48,12 @@ "runner": "../../jest-serial-runner.js", "testEnvironment": "node", "transform": { - "^.+\\.(ts|tsx)$": "ts-jest" + "^.+\\.(ts|tsx)$": [ + "ts-jest", + { + "tsconfig": "/tsconfig.spec.json" + } + ] }, "moduleNameMapper": { "(.+)\\.js": "$1" diff --git a/packages/postgres/tsconfig.json b/packages/postgres/tsconfig.json index 64fa4ea09..4cac532d8 100644 --- a/packages/postgres/tsconfig.json +++ b/packages/postgres/tsconfig.json @@ -25,9 +25,11 @@ ], "include": [ "src", - "tests", "index.ts" ], + "exclude": [ + "tests" + ], "references": [ { "path": "../core/tsconfig.json" diff --git a/packages/postgres/tsconfig.spec.json b/packages/postgres/tsconfig.spec.json new file mode 100644 index 000000000..b764fc77d --- /dev/null +++ b/packages/postgres/tsconfig.spec.json @@ -0,0 +1,8 @@ +{ + "extends": "./tsconfig.json", + "include": [ + "src", + "index.ts", + "tests" + ] +} diff --git a/packages/rpc-tcp/package.json b/packages/rpc-tcp/package.json index 331de8c00..f08c6babb 100644 --- a/packages/rpc-tcp/package.json +++ b/packages/rpc-tcp/package.json @@ -33,8 +33,14 @@ "@deepkit/rpc": "^1.0.1-alpha.113" }, "jest": { + "testEnvironment": "node", "transform": { - "^.+\\.(ts|tsx)$": "ts-jest" + "^.+\\.(ts|tsx)$": [ + "ts-jest", + { + "tsconfig": "/tsconfig.spec.json" + } + ] }, "moduleNameMapper": { "(.+)\\.js": "$1" diff --git a/packages/rpc-tcp/tsconfig.json b/packages/rpc-tcp/tsconfig.json index 6a96cdcdf..a4a8bc846 100644 --- a/packages/rpc-tcp/tsconfig.json +++ b/packages/rpc-tcp/tsconfig.json @@ -20,9 +20,11 @@ }, "include": [ "src", - "tests", "index.ts" ], + "exclude": [ + "tests" + ], "references": [ { "path": "../rpc/tsconfig.json" diff --git a/packages/rpc-tcp/tsconfig.spec.json b/packages/rpc-tcp/tsconfig.spec.json new file mode 100644 index 000000000..b764fc77d --- /dev/null +++ b/packages/rpc-tcp/tsconfig.spec.json @@ -0,0 +1,8 @@ +{ + "extends": "./tsconfig.json", + "include": [ + "src", + "index.ts", + "tests" + ] +} diff --git a/packages/rpc/package.json b/packages/rpc/package.json index 153962c17..996c278a9 100644 --- a/packages/rpc/package.json +++ b/packages/rpc/package.json @@ -46,19 +46,20 @@ "rxjs": "~7.5.0" }, "jest": { + "testEnvironment": "node", "transform": { - "^.+\\.(ts|tsx)$": "ts-jest" + "^.+\\.(ts|tsx)$": [ + "ts-jest", + { + "tsconfig": "/tsconfig.spec.json" + } + ] }, "testMatch": [ "**/tests/**/*.spec.ts" ], "moduleNameMapper": { "(.+)\\.js": "$1" - }, - "globals": { - "ts-jest": { - "tsconfig": "/tsconfig.test.json" - } } }, "gitHead": "56081823b559bb68b77a8781957af5d9c2e019a7" diff --git a/packages/rpc/tsconfig.json b/packages/rpc/tsconfig.json index d6509cac2..0b7173976 100644 --- a/packages/rpc/tsconfig.json +++ b/packages/rpc/tsconfig.json @@ -25,6 +25,7 @@ "src", "index.ts" ], + "exclude": ["tests"], "references": [ { "path": "../bson/tsconfig.json" diff --git a/packages/rpc/tsconfig.spec.json b/packages/rpc/tsconfig.spec.json new file mode 100644 index 000000000..b764fc77d --- /dev/null +++ b/packages/rpc/tsconfig.spec.json @@ -0,0 +1,8 @@ +{ + "extends": "./tsconfig.json", + "include": [ + "src", + "index.ts", + "tests" + ] +} diff --git a/packages/skeleton/package.json b/packages/skeleton/package.json index 50885e6d3..b93309962 100644 --- a/packages/skeleton/package.json +++ b/packages/skeleton/package.json @@ -33,7 +33,12 @@ }, "jest": { "transform": { - "^.+\\.(ts|tsx)$": "ts-jest" + "^.+\\.(ts|tsx)$": [ + "ts-jest", + { + "tsconfig": "/tsconfig.spec.json" + } + ] }, "moduleNameMapper": { "(.+)\\.js": "$1" diff --git a/packages/skeleton/tsconfig.json b/packages/skeleton/tsconfig.json index a0119f575..247168b5b 100644 --- a/packages/skeleton/tsconfig.json +++ b/packages/skeleton/tsconfig.json @@ -18,9 +18,11 @@ }, "include": [ "src", - "tests", "index.ts" ], + "exclude": [ + "tests" + ], "references": [ { "path": "../core/tsconfig.json" diff --git a/packages/skeleton/tsconfig.spec.json b/packages/skeleton/tsconfig.spec.json new file mode 100644 index 000000000..b764fc77d --- /dev/null +++ b/packages/skeleton/tsconfig.spec.json @@ -0,0 +1,8 @@ +{ + "extends": "./tsconfig.json", + "include": [ + "src", + "index.ts", + "tests" + ] +} diff --git a/packages/sql/package.json b/packages/sql/package.json index ea98ad795..024db021b 100644 --- a/packages/sql/package.json +++ b/packages/sql/package.json @@ -61,7 +61,12 @@ "runner": "../../jest-serial-runner.js", "testEnvironment": "node", "transform": { - "^.+\\.(ts|tsx)$": "ts-jest" + "^.+\\.(ts|tsx)$": [ + "ts-jest", + { + "tsconfig": "/tsconfig.spec.json" + } + ] }, "moduleNameMapper": { "(.+)\\.js": "$1" diff --git a/packages/sql/tsconfig.json b/packages/sql/tsconfig.json index 36b2f15ed..ed9944dc6 100644 --- a/packages/sql/tsconfig.json +++ b/packages/sql/tsconfig.json @@ -23,12 +23,14 @@ "include": [ "benchmarks", "src", - "tests", "main.ts", "browser.ts", "commands.ts", "index.ts" ], + "exclude": [ + "tests" + ], "references": [ { "path": "../app/tsconfig.json" diff --git a/packages/sql/tsconfig.spec.json b/packages/sql/tsconfig.spec.json new file mode 100644 index 000000000..b764fc77d --- /dev/null +++ b/packages/sql/tsconfig.spec.json @@ -0,0 +1,8 @@ +{ + "extends": "./tsconfig.json", + "include": [ + "src", + "index.ts", + "tests" + ] +} diff --git a/packages/sqlite/package.json b/packages/sqlite/package.json index 1dceb37ef..f69c58e3b 100644 --- a/packages/sqlite/package.json +++ b/packages/sqlite/package.json @@ -47,7 +47,12 @@ "runner": "../../jest-serial-runner.js", "testEnvironment": "node", "transform": { - "^.+\\.(ts|tsx)$": "ts-jest" + "^.+\\.(ts|tsx)$": [ + "ts-jest", + { + "tsconfig": "/tsconfig.spec.json" + } + ] }, "moduleNameMapper": { "(.+)\\.js": "$1" diff --git a/packages/sqlite/tsconfig.json b/packages/sqlite/tsconfig.json index 80762e5ed..9de48930b 100644 --- a/packages/sqlite/tsconfig.json +++ b/packages/sqlite/tsconfig.json @@ -25,9 +25,11 @@ "include": [ "benchmarks", "src", - "tests", "index.ts" ], + "exclude": [ + "tests" + ], "references": [ { "path": "../core/tsconfig.json" diff --git a/packages/sqlite/tsconfig.spec.json b/packages/sqlite/tsconfig.spec.json new file mode 100644 index 000000000..b764fc77d --- /dev/null +++ b/packages/sqlite/tsconfig.spec.json @@ -0,0 +1,8 @@ +{ + "extends": "./tsconfig.json", + "include": [ + "src", + "index.ts", + "tests" + ] +} diff --git a/packages/stopwatch/package.json b/packages/stopwatch/package.json index 0fb2d20b7..12f462eea 100644 --- a/packages/stopwatch/package.json +++ b/packages/stopwatch/package.json @@ -31,8 +31,14 @@ "@deepkit/type": "^1.0.1-alpha.113" }, "jest": { + "testEnvironment": "node", "transform": { - "^.+\\.(ts|tsx)$": "ts-jest" + "^.+\\.(ts|tsx)$": [ + "ts-jest", + { + "tsconfig": "/tsconfig.spec.json" + } + ] }, "moduleNameMapper": { "(.+)\\.js": "$1" diff --git a/packages/stopwatch/tsconfig.json b/packages/stopwatch/tsconfig.json index de8cee768..e7dfd66ba 100644 --- a/packages/stopwatch/tsconfig.json +++ b/packages/stopwatch/tsconfig.json @@ -19,9 +19,11 @@ "reflection": true, "include": [ "src", - "tests", "index.ts" ], + "exclude": [ + "tests" + ], "references": [ { "path": "../core/tsconfig.json" diff --git a/packages/stopwatch/tsconfig.spec.json b/packages/stopwatch/tsconfig.spec.json new file mode 100644 index 000000000..b764fc77d --- /dev/null +++ b/packages/stopwatch/tsconfig.spec.json @@ -0,0 +1,8 @@ +{ + "extends": "./tsconfig.json", + "include": [ + "src", + "index.ts", + "tests" + ] +} diff --git a/packages/template/package.json b/packages/template/package.json index 729c4a2e2..f39cbac2d 100644 --- a/packages/template/package.json +++ b/packages/template/package.json @@ -45,7 +45,12 @@ }, "jest": { "transform": { - "^.+\\.(ts|tsx)$": "ts-jest" + "^.+\\.(ts|tsx)$": [ + "ts-jest", + { + "tsconfig": "/tsconfig.spec.json" + } + ] }, "moduleNameMapper": { "(.+)\\.js": "$1" diff --git a/packages/template/tsconfig.json b/packages/template/tsconfig.json index d28903c3b..99eaffe4c 100644 --- a/packages/template/tsconfig.json +++ b/packages/template/tsconfig.json @@ -21,10 +21,12 @@ "reflection": true, "include": [ "src", - "tests", "index.ts", "jsx-runtime.ts" ], + "exclude": [ + "tests" + ], "references": [ { "path": "../core/tsconfig.json" diff --git a/packages/template/tsconfig.spec.json b/packages/template/tsconfig.spec.json new file mode 100644 index 000000000..b764fc77d --- /dev/null +++ b/packages/template/tsconfig.spec.json @@ -0,0 +1,8 @@ +{ + "extends": "./tsconfig.json", + "include": [ + "src", + "index.ts", + "tests" + ] +} diff --git a/packages/topsort/package.json b/packages/topsort/package.json index 3a4f07357..3b87f856b 100644 --- a/packages/topsort/package.json +++ b/packages/topsort/package.json @@ -26,7 +26,12 @@ "jest": { "testEnvironment": "node", "transform": { - "^.+\\.(ts|tsx)$": "ts-jest" + "^.+\\.(ts|tsx)$": [ + "ts-jest", + { + "tsconfig": "/tsconfig.spec.json" + } + ] }, "moduleNameMapper": { "(.+)\\.js": "$1" diff --git a/packages/topsort/tsconfig.json b/packages/topsort/tsconfig.json index 6a4958cd6..7ab1cd2a3 100644 --- a/packages/topsort/tsconfig.json +++ b/packages/topsort/tsconfig.json @@ -19,8 +19,10 @@ }, "include": [ "src", - "tests", "index.ts" ], + "exclude": [ + "tests" + ], "references": [] } diff --git a/packages/topsort/tsconfig.spec.json b/packages/topsort/tsconfig.spec.json new file mode 100644 index 000000000..b764fc77d --- /dev/null +++ b/packages/topsort/tsconfig.spec.json @@ -0,0 +1,8 @@ +{ + "extends": "./tsconfig.json", + "include": [ + "src", + "index.ts", + "tests" + ] +} diff --git a/packages/type-compiler/package.json b/packages/type-compiler/package.json index e148f21cb..f44e8ff03 100644 --- a/packages/type-compiler/package.json +++ b/packages/type-compiler/package.json @@ -56,7 +56,7 @@ "^.+\\.(ts|tsx)$": [ "ts-jest", { - "tsconfig": "/tsconfig.test.json" + "tsconfig": "/tsconfig.spec.json" } ] }, diff --git a/packages/type-compiler/tsconfig.json b/packages/type-compiler/tsconfig.json index b2700c9ae..af70b4080 100644 --- a/packages/type-compiler/tsconfig.json +++ b/packages/type-compiler/tsconfig.json @@ -16,16 +16,17 @@ "composite": true, "types": [ "lz-string", - "micromatch" + "micromatch", + "node" ] }, "include": [ "src", - "tests", "install-transformer.ts", "compiler-debug.ts", "index.ts" ], + "exclude": ["tests"], "references": [ { "path": "../type-spec/tsconfig.json" diff --git a/packages/type-compiler/tsconfig.spec.json b/packages/type-compiler/tsconfig.spec.json new file mode 100644 index 000000000..b764fc77d --- /dev/null +++ b/packages/type-compiler/tsconfig.spec.json @@ -0,0 +1,8 @@ +{ + "extends": "./tsconfig.json", + "include": [ + "src", + "index.ts", + "tests" + ] +} diff --git a/packages/type-spec/package.json b/packages/type-spec/package.json index cc7d612e2..64dc5be72 100644 --- a/packages/type-spec/package.json +++ b/packages/type-spec/package.json @@ -26,18 +26,18 @@ "jest": { "testEnvironment": "node", "transform": { - "^.+\\.(ts|tsx)$": "ts-jest" + "^.+\\.(ts|tsx)$": [ + "ts-jest", + { + "tsconfig": "/tsconfig.spec.json" + } + ] }, "moduleNameMapper": { "(.+)\\.js": "$1" }, "testMatch": [ "**/tests/**/*.spec.ts" - ], - "globals": { - "ts-jest": { - "tsconfig": "/tsconfig.test.json" - } - } + ] } } diff --git a/packages/type-spec/tsconfig.json b/packages/type-spec/tsconfig.json index ff7fb44c9..7d2ca091d 100644 --- a/packages/type-spec/tsconfig.json +++ b/packages/type-spec/tsconfig.json @@ -19,9 +19,9 @@ "reflection": false, "include": [ "src", - "tests", "index.ts" ], + "exclude": ["tests"], "references": [ ] } diff --git a/packages/type-spec/tsconfig.spec.json b/packages/type-spec/tsconfig.spec.json new file mode 100644 index 000000000..b764fc77d --- /dev/null +++ b/packages/type-spec/tsconfig.spec.json @@ -0,0 +1,8 @@ +{ + "extends": "./tsconfig.json", + "include": [ + "src", + "index.ts", + "tests" + ] +} diff --git a/packages/type/package.json b/packages/type/package.json index 18dbd2a44..6224c14bb 100644 --- a/packages/type/package.json +++ b/packages/type/package.json @@ -46,7 +46,7 @@ "^.+\\.(ts|tsx)$": [ "ts-jest", { - "tsconfig": "/tsconfig.test.json" + "tsconfig": "/tsconfig.spec.json" } ] }, diff --git a/packages/type/tsconfig.json b/packages/type/tsconfig.json index 87ef3c066..457e1783e 100644 --- a/packages/type/tsconfig.json +++ b/packages/type/tsconfig.json @@ -23,9 +23,9 @@ "reflection": true, "include": [ "src", - "tests", "index.ts" ], + "exclude": ["tests"], "references": [ { "path": "../core/tsconfig.json" diff --git a/packages/type/tsconfig.spec.json b/packages/type/tsconfig.spec.json new file mode 100644 index 000000000..b764fc77d --- /dev/null +++ b/packages/type/tsconfig.spec.json @@ -0,0 +1,8 @@ +{ + "extends": "./tsconfig.json", + "include": [ + "src", + "index.ts", + "tests" + ] +} diff --git a/packages/vite/package.json b/packages/vite/package.json index 08a500381..168755d16 100644 --- a/packages/vite/package.json +++ b/packages/vite/package.json @@ -34,8 +34,14 @@ "vite": "^4.0.0" }, "jest": { + "testEnvironment": "node", "transform": { - "^.+\\.(ts|tsx)$": "ts-jest" + "^.+\\.(ts|tsx)$": [ + "ts-jest", + { + "tsconfig": "/tsconfig.spec.json" + } + ] }, "moduleNameMapper": { "(.+)\\.js": "$1" diff --git a/packages/vite/tsconfig.json b/packages/vite/tsconfig.json index 9ece7712c..6e803218b 100644 --- a/packages/vite/tsconfig.json +++ b/packages/vite/tsconfig.json @@ -18,9 +18,9 @@ }, "include": [ "src", - "tests", "index.ts" ], + "exclude": ["tests"], "references": [ { "path": "../core/tsconfig.json" diff --git a/packages/vite/tsconfig.spec.json b/packages/vite/tsconfig.spec.json new file mode 100644 index 000000000..b764fc77d --- /dev/null +++ b/packages/vite/tsconfig.spec.json @@ -0,0 +1,8 @@ +{ + "extends": "./tsconfig.json", + "include": [ + "src", + "index.ts", + "tests" + ] +} diff --git a/packages/workflow/package.json b/packages/workflow/package.json index 572f8558e..cd9d9771b 100644 --- a/packages/workflow/package.json +++ b/packages/workflow/package.json @@ -37,8 +37,14 @@ "@deepkit/type": "^1.0.1-alpha.113" }, "jest": { + "testEnvironment": "node", "transform": { - "^.+\\.(ts|tsx)$": "ts-jest" + "^.+\\.(ts|tsx)$": [ + "ts-jest", + { + "tsconfig": "/tsconfig.spec.json" + } + ] }, "moduleNameMapper": { "(.+)\\.js": "$1" diff --git a/packages/workflow/tsconfig.spec.json b/packages/workflow/tsconfig.spec.json new file mode 100644 index 000000000..b764fc77d --- /dev/null +++ b/packages/workflow/tsconfig.spec.json @@ -0,0 +1,8 @@ +{ + "extends": "./tsconfig.json", + "include": [ + "src", + "index.ts", + "tests" + ] +} diff --git a/tsconfig.json b/tsconfig.json index 1c8cb86c2..847b0f305 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -73,9 +73,6 @@ { "path": "packages/rpc/tsconfig.json" }, - { - "path": "packages/rpc/tsconfig.test.json" - }, { "path": "packages/rpc-tcp/tsconfig.json" },