diff --git a/bun.lockb b/bun.lockb index 67c3e51b0b..1f1eb81c1d 100644 Binary files a/bun.lockb and b/bun.lockb differ diff --git a/libs/backend/authorization/.swcrc b/libs/backend/authorization/.swcrc deleted file mode 100644 index d54df2b947..0000000000 --- a/libs/backend/authorization/.swcrc +++ /dev/null @@ -1,29 +0,0 @@ -{ - "jsc": { - "target": "es2017", - "parser": { - "syntax": "typescript", - "decorators": true, - "dynamicImport": true - }, - "transform": { - "decoratorMetadata": true, - "legacyDecorator": true - }, - "keepClassNames": true, - "externalHelpers": true, - "loose": true - }, - "module": { - "type": "commonjs" - }, - "sourceMaps": true, - "exclude": [ - "jest.config.ts", - ".*\\.spec.tsx?$", - ".*\\.test.tsx?$", - "./src/jest-setup.ts$", - "./**/jest-setup.ts$", - ".*.js$" - ] -} diff --git a/libs/backend/authorization/package.json b/libs/backend/authorization/package.json index 105aba4af9..2f2ce270b9 100644 --- a/libs/backend/authorization/package.json +++ b/libs/backend/authorization/package.json @@ -8,9 +8,9 @@ "@nestjs/core": "^10.3.8", "@nestjs/jwt": "^10.2.0", "@nestjs/graphql": "^12.1.1", - "@swc/helpers": "^0.5.11", "fastify": "^4.28.1", - "jwks-rsa": "^3.1.0" + "jwks-rsa": "^3.1.0", + "tslib": "^2.8.1" }, "type": "commonjs", "main": "./src/index.js", diff --git a/libs/backend/authorization/project.json b/libs/backend/authorization/project.json index 290b74ef23..b9b11b7720 100644 --- a/libs/backend/authorization/project.json +++ b/libs/backend/authorization/project.json @@ -6,14 +6,19 @@ "tags": [], "targets": { "build": { - "executor": "@nx/js:swc", + "executor": "@nx/js:tsc", "outputs": ["{options.outputPath}"], "options": { "outputPath": "{workspaceRoot}/dist/{projectRoot}", "tsConfig": "{projectRoot}/tsconfig.lib.json", "packageJson": "{projectRoot}/package.json", "main": "{projectRoot}/src/index.ts", - "assets": ["{projectRoot/*.md"] + "assets": ["{projectRoot/*.md"], + "transformers": [ + { + "name": "typescript-transform-paths/nx-transformer" + } + ] } }, "test": { diff --git a/libs/backend/belgium/flanders/games/project.json b/libs/backend/belgium/flanders/games/project.json index 13083b8359..071d3f8c7b 100644 --- a/libs/backend/belgium/flanders/games/project.json +++ b/libs/backend/belgium/flanders/games/project.json @@ -13,7 +13,12 @@ "tsConfig": "{projectRoot}/tsconfig.lib.json", "packageJson": "{projectRoot}/package.json", "main": "{projectRoot}/src/index.ts", - "assets": ["{projectRoot/*.md"] + "assets": ["{projectRoot/*.md"], + "transformers": [ + { + "name": "typescript-transform-paths/nx-transformer" + } + ] } }, "lint": { diff --git a/libs/backend/belgium/flanders/places/project.json b/libs/backend/belgium/flanders/places/project.json index 2f726de2d9..06052ac8c8 100644 --- a/libs/backend/belgium/flanders/places/project.json +++ b/libs/backend/belgium/flanders/places/project.json @@ -13,7 +13,12 @@ "tsConfig": "{projectRoot}/tsconfig.lib.json", "packageJson": "{projectRoot}/package.json", "main": "{projectRoot}/src/index.ts", - "assets": ["{projectRoot/*.md"] + "assets": ["{projectRoot/*.md"], + "transformers": [ + { + "name": "typescript-transform-paths/nx-transformer" + } + ] } }, "test": { diff --git a/libs/backend/belgium/flanders/points/project.json b/libs/backend/belgium/flanders/points/project.json index 43fa3d62c0..169f027565 100644 --- a/libs/backend/belgium/flanders/points/project.json +++ b/libs/backend/belgium/flanders/points/project.json @@ -13,7 +13,12 @@ "tsConfig": "{projectRoot}/tsconfig.lib.json", "packageJson": "{projectRoot}/package.json", "main": "{projectRoot}/src/index.ts", - "assets": ["{projectRoot/*.md"] + "assets": ["{projectRoot/*.md"], + "transformers": [ + { + "name": "typescript-transform-paths/nx-transformer" + } + ] } }, "test": { diff --git a/libs/backend/cache/.swcrc b/libs/backend/cache/.swcrc deleted file mode 100644 index d54df2b947..0000000000 --- a/libs/backend/cache/.swcrc +++ /dev/null @@ -1,29 +0,0 @@ -{ - "jsc": { - "target": "es2017", - "parser": { - "syntax": "typescript", - "decorators": true, - "dynamicImport": true - }, - "transform": { - "decoratorMetadata": true, - "legacyDecorator": true - }, - "keepClassNames": true, - "externalHelpers": true, - "loose": true - }, - "module": { - "type": "commonjs" - }, - "sourceMaps": true, - "exclude": [ - "jest.config.ts", - ".*\\.spec.tsx?$", - ".*\\.test.tsx?$", - "./src/jest-setup.ts$", - "./**/jest-setup.ts$", - ".*.js$" - ] -} diff --git a/libs/backend/cache/package.json b/libs/backend/cache/package.json index 8c39796a86..c4da243413 100644 --- a/libs/backend/cache/package.json +++ b/libs/backend/cache/package.json @@ -2,12 +2,12 @@ "name": "@badman/backend-cache", "version": "6.174.5", "dependencies": { - "@swc/helpers": "~0.5.2", "@badman/utils": "6.174.5", "@nestjs/common": "^10.3.10", "@nestjs/cache-manager": "^2.2.2", "@nestjs/config": "^3.2.3", - "cache-manager-redis-store": "^3.0.1" + "cache-manager-redis-store": "^3.0.1", + "tslib": "^2.8.1" }, "type": "commonjs", "main": "./src/index.js", diff --git a/libs/backend/cache/project.json b/libs/backend/cache/project.json index 8451553d77..de526eaecb 100644 --- a/libs/backend/cache/project.json +++ b/libs/backend/cache/project.json @@ -6,14 +6,19 @@ "tags": [], "targets": { "build": { - "executor": "@nx/js:swc", + "executor": "@nx/js:tsc", "outputs": ["{options.outputPath}"], "options": { "outputPath": "{workspaceRoot}/dist/{projectRoot}", "tsConfig": "{projectRoot}/tsconfig.lib.json", "packageJson": "{projectRoot}/package.json", "main": "{projectRoot}/src/index.ts", - "assets": ["{projectRoot/*.md"] + "assets": ["{projectRoot/*.md"], + "transformers": [ + { + "name": "typescript-transform-paths/nx-transformer" + } + ] } }, "test": { diff --git a/libs/backend/cluster/.swcrc b/libs/backend/cluster/.swcrc deleted file mode 100644 index d54df2b947..0000000000 --- a/libs/backend/cluster/.swcrc +++ /dev/null @@ -1,29 +0,0 @@ -{ - "jsc": { - "target": "es2017", - "parser": { - "syntax": "typescript", - "decorators": true, - "dynamicImport": true - }, - "transform": { - "decoratorMetadata": true, - "legacyDecorator": true - }, - "keepClassNames": true, - "externalHelpers": true, - "loose": true - }, - "module": { - "type": "commonjs" - }, - "sourceMaps": true, - "exclude": [ - "jest.config.ts", - ".*\\.spec.tsx?$", - ".*\\.test.tsx?$", - "./src/jest-setup.ts$", - "./**/jest-setup.ts$", - ".*.js$" - ] -} diff --git a/libs/backend/cluster/package.json b/libs/backend/cluster/package.json index d879e5ab3f..4c374a0b4e 100644 --- a/libs/backend/cluster/package.json +++ b/libs/backend/cluster/package.json @@ -3,7 +3,7 @@ "version": "6.174.5", "dependencies": { "@nestjs/common": "^10.3.8", - "@swc/helpers": "^0.5.11" + "tslib": "^2.8.1" }, "type": "commonjs", "main": "./src/index.js", diff --git a/libs/backend/cluster/project.json b/libs/backend/cluster/project.json index 35df71963e..e8a95a7ce7 100644 --- a/libs/backend/cluster/project.json +++ b/libs/backend/cluster/project.json @@ -6,14 +6,19 @@ "tags": [], "targets": { "build": { - "executor": "@nx/js:swc", + "executor": "@nx/js:tsc", "outputs": ["{options.outputPath}"], "options": { "outputPath": "{workspaceRoot}/dist/{projectRoot}", "tsConfig": "{projectRoot}/tsconfig.lib.json", "packageJson": "{projectRoot}/package.json", "main": "{projectRoot}/src/index.ts", - "assets": ["{projectRoot/*.md"] + "assets": ["{projectRoot/*.md"], + "transformers": [ + { + "name": "typescript-transform-paths/nx-transformer" + } + ] } }, "test": { diff --git a/libs/backend/competition/assembly/project.json b/libs/backend/competition/assembly/project.json index afa620181c..4863a1c981 100644 --- a/libs/backend/competition/assembly/project.json +++ b/libs/backend/competition/assembly/project.json @@ -13,7 +13,12 @@ "tsConfig": "{projectRoot}/tsconfig.lib.json", "packageJson": "{projectRoot}/package.json", "main": "{projectRoot}/src/index.ts", - "assets": ["{projectRoot/*.md"] + "assets": ["{projectRoot/*.md"], + "transformers": [ + { + "name": "typescript-transform-paths/nx-transformer" + } + ] } }, "test": { diff --git a/libs/backend/competition/change-encounter/project.json b/libs/backend/competition/change-encounter/project.json index f9965dad80..2b3c41812f 100644 --- a/libs/backend/competition/change-encounter/project.json +++ b/libs/backend/competition/change-encounter/project.json @@ -13,7 +13,12 @@ "tsConfig": "{projectRoot}/tsconfig.lib.json", "packageJson": "{projectRoot}/package.json", "main": "{projectRoot}/src/index.ts", - "assets": ["{projectRoot/*.md"] + "assets": ["{projectRoot/*.md"], + "transformers": [ + { + "name": "typescript-transform-paths/nx-transformer" + } + ] } }, "test": { diff --git a/libs/backend/competition/enrollment/project.json b/libs/backend/competition/enrollment/project.json index bf5c812ab1..e9b20a86bb 100644 --- a/libs/backend/competition/enrollment/project.json +++ b/libs/backend/competition/enrollment/project.json @@ -13,7 +13,12 @@ "tsConfig": "{projectRoot}/tsconfig.lib.json", "packageJson": "{projectRoot}/package.json", "main": "{projectRoot}/src/index.ts", - "assets": ["{projectRoot/*.md"] + "assets": ["{projectRoot/*.md"], + "transformers": [ + { + "name": "typescript-transform-paths/nx-transformer" + } + ] } }, "test": { diff --git a/libs/backend/competition/transfer-loans/project.json b/libs/backend/competition/transfer-loans/project.json index 7ca535faaa..4b5a80b7b2 100644 --- a/libs/backend/competition/transfer-loans/project.json +++ b/libs/backend/competition/transfer-loans/project.json @@ -13,7 +13,12 @@ "tsConfig": "{projectRoot}/tsconfig.lib.json", "packageJson": "{projectRoot}/package.json", "main": "{projectRoot}/src/index.ts", - "assets": ["{projectRoot/*.md"] + "assets": ["{projectRoot/*.md"], + "transformers": [ + { + "name": "typescript-transform-paths/nx-transformer" + } + ] } }, "test": { diff --git a/libs/backend/compile/.swcrc b/libs/backend/compile/.swcrc deleted file mode 100644 index d54df2b947..0000000000 --- a/libs/backend/compile/.swcrc +++ /dev/null @@ -1,29 +0,0 @@ -{ - "jsc": { - "target": "es2017", - "parser": { - "syntax": "typescript", - "decorators": true, - "dynamicImport": true - }, - "transform": { - "decoratorMetadata": true, - "legacyDecorator": true - }, - "keepClassNames": true, - "externalHelpers": true, - "loose": true - }, - "module": { - "type": "commonjs" - }, - "sourceMaps": true, - "exclude": [ - "jest.config.ts", - ".*\\.spec.tsx?$", - ".*\\.test.tsx?$", - "./src/jest-setup.ts$", - "./**/jest-setup.ts$", - ".*.js$" - ] -} diff --git a/libs/backend/compile/package.json b/libs/backend/compile/package.json index c95b69c73f..364e2f031b 100644 --- a/libs/backend/compile/package.json +++ b/libs/backend/compile/package.json @@ -2,7 +2,6 @@ "name": "@badman/backend-compile", "version": "6.174.5", "dependencies": { - "@swc/helpers": "~0.5.2", "@nestjs/common": "^10.3.1", "@nestjs/config": "^3.1.1", "juice": "^10.0.0", @@ -12,7 +11,8 @@ "@badman/utils": "6.174.5", "consolidate": "^1.0.3", "moment-timezone": "^0.5.45", - "nestjs-i18n": "^10.4.5" + "nestjs-i18n": "^10.4.5", + "tslib": "^2.8.1" }, "type": "commonjs", "main": "./src/index.js", diff --git a/libs/backend/compile/project.json b/libs/backend/compile/project.json index d7a8b73d64..949db621c1 100644 --- a/libs/backend/compile/project.json +++ b/libs/backend/compile/project.json @@ -6,14 +6,19 @@ "tags": [], "targets": { "build": { - "executor": "@nx/js:swc", + "executor": "@nx/js:tsc", "outputs": ["{options.outputPath}"], "options": { "outputPath": "{workspaceRoot}/dist/{projectRoot}", "tsConfig": "{projectRoot}/tsconfig.lib.json", "packageJson": "{projectRoot}/package.json", "main": "{projectRoot}/src/index.ts", - "assets": ["{projectRoot/*.md"] + "assets": ["{projectRoot/*.md"], + "transformers": [ + { + "name": "typescript-transform-paths/nx-transformer" + } + ] } }, "test": { diff --git a/libs/backend/database/.swcrc b/libs/backend/database/.swcrc deleted file mode 100644 index d54df2b947..0000000000 --- a/libs/backend/database/.swcrc +++ /dev/null @@ -1,29 +0,0 @@ -{ - "jsc": { - "target": "es2017", - "parser": { - "syntax": "typescript", - "decorators": true, - "dynamicImport": true - }, - "transform": { - "decoratorMetadata": true, - "legacyDecorator": true - }, - "keepClassNames": true, - "externalHelpers": true, - "loose": true - }, - "module": { - "type": "commonjs" - }, - "sourceMaps": true, - "exclude": [ - "jest.config.ts", - ".*\\.spec.tsx?$", - ".*\\.test.tsx?$", - "./src/jest-setup.ts$", - "./**/jest-setup.ts$", - ".*.js$" - ] -} diff --git a/libs/backend/database/package.json b/libs/backend/database/package.json index c13ab070e6..918715f938 100644 --- a/libs/backend/database/package.json +++ b/libs/backend/database/package.json @@ -2,7 +2,6 @@ "name": "@badman/backend-database", "version": "6.174.5", "dependencies": { - "@swc/helpers": "~0.5.2", "@nestjs/graphql": "^12.0.11", "@badman/utils": "6.174.5", "@badman/backend-cache": "6.174.5", @@ -15,7 +14,8 @@ "@nestjs/sequelize": "^10.0.1", "sequelize-slugify": "^1.6.2", "moment": "^2.30.1", - "pg": "^8.12.0" + "pg": "^8.12.0", + "tslib": "^2.8.1" }, "type": "commonjs", "main": "./src/index.js", diff --git a/libs/backend/database/project.json b/libs/backend/database/project.json index 7f3b6bb600..d802c6898c 100644 --- a/libs/backend/database/project.json +++ b/libs/backend/database/project.json @@ -6,14 +6,19 @@ "tags": [], "targets": { "build": { - "executor": "@nx/js:swc", + "executor": "@nx/js:tsc", "outputs": ["{options.outputPath}"], "options": { "outputPath": "{workspaceRoot}/dist/{projectRoot}", "tsConfig": "{projectRoot}/tsconfig.lib.json", "packageJson": "{projectRoot}/package.json", "main": "{projectRoot}/src/index.ts", - "assets": ["{projectRoot/*.md"] + "assets": ["{projectRoot/*.md"], + "transformers": [ + { + "name": "typescript-transform-paths/nx-transformer" + } + ] } }, "test": { diff --git a/libs/backend/generator/.swcrc b/libs/backend/generator/.swcrc deleted file mode 100644 index d54df2b947..0000000000 --- a/libs/backend/generator/.swcrc +++ /dev/null @@ -1,29 +0,0 @@ -{ - "jsc": { - "target": "es2017", - "parser": { - "syntax": "typescript", - "decorators": true, - "dynamicImport": true - }, - "transform": { - "decoratorMetadata": true, - "legacyDecorator": true - }, - "keepClassNames": true, - "externalHelpers": true, - "loose": true - }, - "module": { - "type": "commonjs" - }, - "sourceMaps": true, - "exclude": [ - "jest.config.ts", - ".*\\.spec.tsx?$", - ".*\\.test.tsx?$", - "./src/jest-setup.ts$", - "./**/jest-setup.ts$", - ".*.js$" - ] -} diff --git a/libs/backend/generator/package.json b/libs/backend/generator/package.json index b865545f02..ffcc5305e2 100644 --- a/libs/backend/generator/package.json +++ b/libs/backend/generator/package.json @@ -10,7 +10,7 @@ "@nestjs/config": "^3.2.2", "moment": "^2.30.1", "nestjs-i18n": "^10.4.5", - "@swc/helpers": "^0.5.11" + "tslib": "^2.8.1" }, "optionalDependencies": {}, "type": "commonjs", diff --git a/libs/backend/generator/project.json b/libs/backend/generator/project.json index 90dd99bbc4..c604fadffa 100644 --- a/libs/backend/generator/project.json +++ b/libs/backend/generator/project.json @@ -6,14 +6,19 @@ "tags": [], "targets": { "build": { - "executor": "@nx/js:swc", + "executor": "@nx/js:tsc", "outputs": ["{options.outputPath}"], "options": { "outputPath": "{workspaceRoot}/dist/{projectRoot}", "tsConfig": "{projectRoot}/tsconfig.lib.json", "packageJson": "{projectRoot}/package.json", "main": "{projectRoot}/src/index.ts", - "assets": ["{projectRoot/*.md"] + "assets": ["{projectRoot/*.md"], + "transformers": [ + { + "name": "typescript-transform-paths/nx-transformer" + } + ] } }, "test": { diff --git a/libs/backend/graphql/.swcrc b/libs/backend/graphql/.swcrc deleted file mode 100644 index d54df2b947..0000000000 --- a/libs/backend/graphql/.swcrc +++ /dev/null @@ -1,29 +0,0 @@ -{ - "jsc": { - "target": "es2017", - "parser": { - "syntax": "typescript", - "decorators": true, - "dynamicImport": true - }, - "transform": { - "decoratorMetadata": true, - "legacyDecorator": true - }, - "keepClassNames": true, - "externalHelpers": true, - "loose": true - }, - "module": { - "type": "commonjs" - }, - "sourceMaps": true, - "exclude": [ - "jest.config.ts", - ".*\\.spec.tsx?$", - ".*\\.test.tsx?$", - "./src/jest-setup.ts$", - "./**/jest-setup.ts$", - ".*.js$" - ] -} diff --git a/libs/backend/graphql/package.json b/libs/backend/graphql/package.json index 8540713934..2157d91a54 100644 --- a/libs/backend/graphql/package.json +++ b/libs/backend/graphql/package.json @@ -2,7 +2,6 @@ "name": "@badman/backend-graphql", "version": "6.174.5", "dependencies": { - "@swc/helpers": "~0.5.2", "@nestjs/graphql": "^12.0.11", "@badman/backend-authorization": "6.174.5", "@nestjs/apollo": "^12.0.11", @@ -32,7 +31,8 @@ "graphql-type-json": "^0.3.2", "@apollo/server": "^4.10.4", "@badman/backend-change-encounter": "6.174.5", - "@badman/backend-orchestrator": "6.174.5" + "@badman/backend-orchestrator": "6.174.5", + "tslib": "^2.8.1" }, "type": "commonjs", "main": "./src/index.js", diff --git a/libs/backend/graphql/project.json b/libs/backend/graphql/project.json index 9c5d231b90..5271e38aa6 100644 --- a/libs/backend/graphql/project.json +++ b/libs/backend/graphql/project.json @@ -6,14 +6,19 @@ "tags": [], "targets": { "build": { - "executor": "@nx/js:swc", + "executor": "@nx/js:tsc", "outputs": ["{options.outputPath}"], "options": { "outputPath": "{workspaceRoot}/dist/{projectRoot}", "tsConfig": "{projectRoot}/tsconfig.lib.json", "packageJson": "{projectRoot}/package.json", "main": "{projectRoot}/src/index.ts", - "assets": ["{projectRoot/*.md"] + "assets": ["{projectRoot/*.md"], + "transformers": [ + { + "name": "typescript-transform-paths/nx-transformer" + } + ] } }, "test": { diff --git a/libs/backend/health/.swcrc b/libs/backend/health/.swcrc deleted file mode 100644 index d54df2b947..0000000000 --- a/libs/backend/health/.swcrc +++ /dev/null @@ -1,29 +0,0 @@ -{ - "jsc": { - "target": "es2017", - "parser": { - "syntax": "typescript", - "decorators": true, - "dynamicImport": true - }, - "transform": { - "decoratorMetadata": true, - "legacyDecorator": true - }, - "keepClassNames": true, - "externalHelpers": true, - "loose": true - }, - "module": { - "type": "commonjs" - }, - "sourceMaps": true, - "exclude": [ - "jest.config.ts", - ".*\\.spec.tsx?$", - ".*\\.test.tsx?$", - "./src/jest-setup.ts$", - "./**/jest-setup.ts$", - ".*.js$" - ] -} diff --git a/libs/backend/health/package.json b/libs/backend/health/package.json index a019e257eb..c00c9a5e63 100644 --- a/libs/backend/health/package.json +++ b/libs/backend/health/package.json @@ -5,7 +5,7 @@ "@nestjs/common": "^10.3.8", "@nestjs/terminus": "^10.2.3", "@nestjs/config": "^3.2.2", - "@swc/helpers": "^0.5.11" + "tslib": "^2.8.1" }, "type": "commonjs", "main": "./src/index.js", diff --git a/libs/backend/health/project.json b/libs/backend/health/project.json index 6042fb5663..207bd18a8d 100644 --- a/libs/backend/health/project.json +++ b/libs/backend/health/project.json @@ -6,14 +6,19 @@ "tags": [], "targets": { "build": { - "executor": "@nx/js:swc", + "executor": "@nx/js:tsc", "outputs": ["{options.outputPath}"], "options": { "outputPath": "{workspaceRoot}/dist/{projectRoot}", "tsConfig": "{projectRoot}/tsconfig.lib.json", "packageJson": "{projectRoot}/package.json", "main": "{projectRoot}/src/index.ts", - "assets": ["{projectRoot/*.md"] + "assets": ["{projectRoot/*.md"], + "transformers": [ + { + "name": "typescript-transform-paths/nx-transformer" + } + ] } }, "test": { diff --git a/libs/backend/logging/.swcrc b/libs/backend/logging/.swcrc deleted file mode 100644 index d54df2b947..0000000000 --- a/libs/backend/logging/.swcrc +++ /dev/null @@ -1,29 +0,0 @@ -{ - "jsc": { - "target": "es2017", - "parser": { - "syntax": "typescript", - "decorators": true, - "dynamicImport": true - }, - "transform": { - "decoratorMetadata": true, - "legacyDecorator": true - }, - "keepClassNames": true, - "externalHelpers": true, - "loose": true - }, - "module": { - "type": "commonjs" - }, - "sourceMaps": true, - "exclude": [ - "jest.config.ts", - ".*\\.spec.tsx?$", - ".*\\.test.tsx?$", - "./src/jest-setup.ts$", - "./**/jest-setup.ts$", - ".*.js$" - ] -} diff --git a/libs/backend/logging/package.json b/libs/backend/logging/package.json index c30d89fb32..f6380590ab 100644 --- a/libs/backend/logging/package.json +++ b/libs/backend/logging/package.json @@ -2,14 +2,14 @@ "name": "@badman/backend-logging", "version": "6.174.5", "dependencies": { - "@swc/helpers": "~0.5.2", "@badman/utils": "6.174.5", "@logtail/node": "~0.4.21", "@logtail/winston": "^0.4.21", "@nestjs/common": "^10.3.10", "@nestjs/config": "^3.2.3", "nest-winston": "^1.10.0", - "winston": "^3.13.0" + "winston": "^3.13.0", + "tslib": "^2.8.1" }, "type": "commonjs", "main": "./src/index.js", diff --git a/libs/backend/logging/project.json b/libs/backend/logging/project.json index 345aec959e..0793e98d6c 100644 --- a/libs/backend/logging/project.json +++ b/libs/backend/logging/project.json @@ -6,14 +6,19 @@ "tags": [], "targets": { "build": { - "executor": "@nx/js:swc", + "executor": "@nx/js:tsc", "outputs": ["{options.outputPath}"], "options": { "outputPath": "{workspaceRoot}/dist/{projectRoot}", "tsConfig": "{projectRoot}/tsconfig.lib.json", "packageJson": "{projectRoot}/package.json", "main": "{projectRoot}/src/index.ts", - "assets": ["{projectRoot/*.md"] + "assets": ["{projectRoot/*.md"], + "transformers": [ + { + "name": "typescript-transform-paths/nx-transformer" + } + ] } }, "test": { diff --git a/libs/backend/mailing/.swcrc b/libs/backend/mailing/.swcrc deleted file mode 100644 index d54df2b947..0000000000 --- a/libs/backend/mailing/.swcrc +++ /dev/null @@ -1,29 +0,0 @@ -{ - "jsc": { - "target": "es2017", - "parser": { - "syntax": "typescript", - "decorators": true, - "dynamicImport": true - }, - "transform": { - "decoratorMetadata": true, - "legacyDecorator": true - }, - "keepClassNames": true, - "externalHelpers": true, - "loose": true - }, - "module": { - "type": "commonjs" - }, - "sourceMaps": true, - "exclude": [ - "jest.config.ts", - ".*\\.spec.tsx?$", - ".*\\.test.tsx?$", - "./src/jest-setup.ts$", - "./**/jest-setup.ts$", - ".*.js$" - ] -} diff --git a/libs/backend/mailing/package.json b/libs/backend/mailing/package.json index f3037ba48f..02803d9aad 100644 --- a/libs/backend/mailing/package.json +++ b/libs/backend/mailing/package.json @@ -11,7 +11,7 @@ "moment-timezone": "^0.5.45", "nodemailer": "^6.9.13", "rxjs": "~7.8.1", - "@swc/helpers": "^0.5.11" + "tslib": "^2.8.1" }, "type": "commonjs", "main": "./src/index.js", diff --git a/libs/backend/mailing/project.json b/libs/backend/mailing/project.json index a04acac0a5..c76ba48f94 100644 --- a/libs/backend/mailing/project.json +++ b/libs/backend/mailing/project.json @@ -6,14 +6,19 @@ "tags": [], "targets": { "build": { - "executor": "@nx/js:swc", + "executor": "@nx/js:tsc", "outputs": ["{options.outputPath}"], "options": { "outputPath": "{workspaceRoot}/dist/{projectRoot}", "tsConfig": "{projectRoot}/tsconfig.lib.json", "packageJson": "{projectRoot}/package.json", "main": "{projectRoot}/src/index.ts", - "assets": ["{projectRoot/*.md"] + "assets": ["{projectRoot/*.md"], + "transformers": [ + { + "name": "typescript-transform-paths/nx-transformer" + } + ] } }, "test": { diff --git a/libs/backend/micro/.swcrc b/libs/backend/micro/.swcrc deleted file mode 100644 index d54df2b947..0000000000 --- a/libs/backend/micro/.swcrc +++ /dev/null @@ -1,29 +0,0 @@ -{ - "jsc": { - "target": "es2017", - "parser": { - "syntax": "typescript", - "decorators": true, - "dynamicImport": true - }, - "transform": { - "decoratorMetadata": true, - "legacyDecorator": true - }, - "keepClassNames": true, - "externalHelpers": true, - "loose": true - }, - "module": { - "type": "commonjs" - }, - "sourceMaps": true, - "exclude": [ - "jest.config.ts", - ".*\\.spec.tsx?$", - ".*\\.test.tsx?$", - "./src/jest-setup.ts$", - "./**/jest-setup.ts$", - ".*.js$" - ] -} diff --git a/libs/backend/micro/package.json b/libs/backend/micro/package.json index 992dce09e7..5c48a8eb49 100644 --- a/libs/backend/micro/package.json +++ b/libs/backend/micro/package.json @@ -5,7 +5,7 @@ "@nestjs/common": "^10.3.8", "@nestjs/config": "^3.2.2", "@nestjs/microservices": "^10.3.8", - "@swc/helpers": "^0.5.11" + "tslib": "^2.8.1" }, "type": "commonjs", "main": "./src/index.js", diff --git a/libs/backend/micro/project.json b/libs/backend/micro/project.json index db91330af4..f9b2ae7f4f 100644 --- a/libs/backend/micro/project.json +++ b/libs/backend/micro/project.json @@ -6,14 +6,19 @@ "tags": [], "targets": { "build": { - "executor": "@nx/js:swc", + "executor": "@nx/js:tsc", "outputs": ["{options.outputPath}"], "options": { "outputPath": "{workspaceRoot}/dist/{projectRoot}", "tsConfig": "{projectRoot}/tsconfig.lib.json", "packageJson": "{projectRoot}/package.json", "main": "{projectRoot}/src/index.ts", - "assets": ["{projectRoot/*.md"] + "assets": ["{projectRoot/*.md"], + "transformers": [ + { + "name": "typescript-transform-paths/nx-transformer" + } + ] } }, "test": { diff --git a/libs/backend/notifications/.swcrc b/libs/backend/notifications/.swcrc deleted file mode 100644 index d54df2b947..0000000000 --- a/libs/backend/notifications/.swcrc +++ /dev/null @@ -1,29 +0,0 @@ -{ - "jsc": { - "target": "es2017", - "parser": { - "syntax": "typescript", - "decorators": true, - "dynamicImport": true - }, - "transform": { - "decoratorMetadata": true, - "legacyDecorator": true - }, - "keepClassNames": true, - "externalHelpers": true, - "loose": true - }, - "module": { - "type": "commonjs" - }, - "sourceMaps": true, - "exclude": [ - "jest.config.ts", - ".*\\.spec.tsx?$", - ".*\\.test.tsx?$", - "./src/jest-setup.ts$", - "./**/jest-setup.ts$", - ".*.js$" - ] -} diff --git a/libs/backend/notifications/package.json b/libs/backend/notifications/package.json index 3dbce2e591..2838641259 100644 --- a/libs/backend/notifications/package.json +++ b/libs/backend/notifications/package.json @@ -6,12 +6,12 @@ "@badman/utils": "6.174.5", "@nestjs/common": "^10.3.8", "@nestjs/config": "^3.2.2", - "@swc/helpers": "^0.5.11", "@badman/backend-mailing": "6.174.5", "@badman/backend-change-encounter": "6.174.5", "web-push": "^3.6.7", "moment": "^2.30.1", - "nestjs-i18n": "^10.4.5" + "nestjs-i18n": "^10.4.5", + "tslib": "^2.8.1" }, "type": "commonjs", "main": "./src/index.js", diff --git a/libs/backend/notifications/project.json b/libs/backend/notifications/project.json index 5dc4e5c537..a42f891e1a 100644 --- a/libs/backend/notifications/project.json +++ b/libs/backend/notifications/project.json @@ -6,14 +6,19 @@ "tags": [], "targets": { "build": { - "executor": "@nx/js:swc", + "executor": "@nx/js:tsc", "outputs": ["{options.outputPath}"], "options": { "outputPath": "{workspaceRoot}/dist/{projectRoot}", "tsConfig": "{projectRoot}/tsconfig.lib.json", "packageJson": "{projectRoot}/package.json", "main": "{projectRoot}/src/index.ts", - "assets": ["{projectRoot/*.md"] + "assets": ["{projectRoot/*.md"], + "transformers": [ + { + "name": "typescript-transform-paths/nx-transformer" + } + ] } }, "test": { diff --git a/libs/backend/orchestrator/.swcrc b/libs/backend/orchestrator/.swcrc deleted file mode 100644 index d54df2b947..0000000000 --- a/libs/backend/orchestrator/.swcrc +++ /dev/null @@ -1,29 +0,0 @@ -{ - "jsc": { - "target": "es2017", - "parser": { - "syntax": "typescript", - "decorators": true, - "dynamicImport": true - }, - "transform": { - "decoratorMetadata": true, - "legacyDecorator": true - }, - "keepClassNames": true, - "externalHelpers": true, - "loose": true - }, - "module": { - "type": "commonjs" - }, - "sourceMaps": true, - "exclude": [ - "jest.config.ts", - ".*\\.spec.tsx?$", - ".*\\.test.tsx?$", - "./src/jest-setup.ts$", - "./**/jest-setup.ts$", - ".*.js$" - ] -} diff --git a/libs/backend/orchestrator/package.json b/libs/backend/orchestrator/package.json index 4bc9806953..871a98eacf 100644 --- a/libs/backend/orchestrator/package.json +++ b/libs/backend/orchestrator/package.json @@ -13,7 +13,7 @@ "bull": "^4.12.3", "cron": "3.1.7", "moment": "^2.30.1", - "@swc/helpers": "^0.5.11" + "tslib": "^2.8.1" }, "type": "commonjs", "main": "./src/index.js", diff --git a/libs/backend/orchestrator/project.json b/libs/backend/orchestrator/project.json index 91da2a67b7..4396955b12 100644 --- a/libs/backend/orchestrator/project.json +++ b/libs/backend/orchestrator/project.json @@ -6,14 +6,19 @@ "tags": [], "targets": { "build": { - "executor": "@nx/js:swc", + "executor": "@nx/js:tsc", "outputs": ["{options.outputPath}"], "options": { "outputPath": "{workspaceRoot}/dist/{projectRoot}", "tsConfig": "{projectRoot}/tsconfig.lib.json", "packageJson": "{projectRoot}/package.json", "main": "{projectRoot}/src/index.ts", - "assets": ["{projectRoot/*.md"] + "assets": ["{projectRoot/*.md"], + "transformers": [ + { + "name": "typescript-transform-paths/nx-transformer" + } + ] } }, "test": { diff --git a/libs/backend/pupeteer/.swcrc b/libs/backend/pupeteer/.swcrc deleted file mode 100644 index d54df2b947..0000000000 --- a/libs/backend/pupeteer/.swcrc +++ /dev/null @@ -1,29 +0,0 @@ -{ - "jsc": { - "target": "es2017", - "parser": { - "syntax": "typescript", - "decorators": true, - "dynamicImport": true - }, - "transform": { - "decoratorMetadata": true, - "legacyDecorator": true - }, - "keepClassNames": true, - "externalHelpers": true, - "loose": true - }, - "module": { - "type": "commonjs" - }, - "sourceMaps": true, - "exclude": [ - "jest.config.ts", - ".*\\.spec.tsx?$", - ".*\\.test.tsx?$", - "./src/jest-setup.ts$", - "./**/jest-setup.ts$", - ".*.js$" - ] -} diff --git a/libs/backend/pupeteer/package.json b/libs/backend/pupeteer/package.json index 1c2ab3651b..8dcbbf379e 100644 --- a/libs/backend/pupeteer/package.json +++ b/libs/backend/pupeteer/package.json @@ -4,7 +4,7 @@ "dependencies": { "puppeteer": "^22.8.0", "@nestjs/common": "^10.3.8", - "@swc/helpers": "^0.5.11" + "tslib": "^2.8.1" }, "type": "commonjs", "main": "./src/index.js", diff --git a/libs/backend/pupeteer/project.json b/libs/backend/pupeteer/project.json index da1661e911..dece6a8959 100644 --- a/libs/backend/pupeteer/project.json +++ b/libs/backend/pupeteer/project.json @@ -6,14 +6,19 @@ "tags": [], "targets": { "build": { - "executor": "@nx/js:swc", + "executor": "@nx/js:tsc", "outputs": ["{options.outputPath}"], "options": { "outputPath": "{workspaceRoot}/dist/{projectRoot}", "tsConfig": "{projectRoot}/tsconfig.lib.json", "packageJson": "{projectRoot}/package.json", "main": "{projectRoot}/src/index.ts", - "assets": ["{projectRoot/*.md"] + "assets": ["{projectRoot/*.md"], + "transformers": [ + { + "name": "typescript-transform-paths/nx-transformer" + } + ] } }, "test": { diff --git a/libs/backend/queue/.swcrc b/libs/backend/queue/.swcrc deleted file mode 100644 index d54df2b947..0000000000 --- a/libs/backend/queue/.swcrc +++ /dev/null @@ -1,29 +0,0 @@ -{ - "jsc": { - "target": "es2017", - "parser": { - "syntax": "typescript", - "decorators": true, - "dynamicImport": true - }, - "transform": { - "decoratorMetadata": true, - "legacyDecorator": true - }, - "keepClassNames": true, - "externalHelpers": true, - "loose": true - }, - "module": { - "type": "commonjs" - }, - "sourceMaps": true, - "exclude": [ - "jest.config.ts", - ".*\\.spec.tsx?$", - ".*\\.test.tsx?$", - "./src/jest-setup.ts$", - "./**/jest-setup.ts$", - ".*.js$" - ] -} diff --git a/libs/backend/queue/package.json b/libs/backend/queue/package.json index cb53ee74a4..976b20405c 100644 --- a/libs/backend/queue/package.json +++ b/libs/backend/queue/package.json @@ -2,11 +2,11 @@ "name": "@badman/backend-queue", "version": "6.174.5", "dependencies": { - "@swc/helpers": "~0.5.2", "@badman/utils": "6.174.5", "@nestjs/common": "^10.3.10", "@nestjs/config": "^3.2.3", - "@nestjs/bull": "^10.1.1" + "@nestjs/bull": "^10.1.1", + "tslib": "^2.8.1" }, "type": "commonjs", "main": "./src/index.js", diff --git a/libs/backend/queue/project.json b/libs/backend/queue/project.json index 03c8fe389e..ada8fac212 100644 --- a/libs/backend/queue/project.json +++ b/libs/backend/queue/project.json @@ -6,14 +6,19 @@ "tags": [], "targets": { "build": { - "executor": "@nx/js:swc", + "executor": "@nx/js:tsc", "outputs": ["{options.outputPath}"], "options": { "outputPath": "{workspaceRoot}/dist/{projectRoot}", "tsConfig": "{projectRoot}/tsconfig.lib.json", "packageJson": "{projectRoot}/package.json", "main": "{projectRoot}/src/index.ts", - "assets": ["{projectRoot/*.md"] + "assets": ["{projectRoot/*.md"], + "transformers": [ + { + "name": "typescript-transform-paths/nx-transformer" + } + ] } }, "test": { diff --git a/libs/backend/ranking/.swcrc b/libs/backend/ranking/.swcrc deleted file mode 100644 index d54df2b947..0000000000 --- a/libs/backend/ranking/.swcrc +++ /dev/null @@ -1,29 +0,0 @@ -{ - "jsc": { - "target": "es2017", - "parser": { - "syntax": "typescript", - "decorators": true, - "dynamicImport": true - }, - "transform": { - "decoratorMetadata": true, - "legacyDecorator": true - }, - "keepClassNames": true, - "externalHelpers": true, - "loose": true - }, - "module": { - "type": "commonjs" - }, - "sourceMaps": true, - "exclude": [ - "jest.config.ts", - ".*\\.spec.tsx?$", - ".*\\.test.tsx?$", - "./src/jest-setup.ts$", - "./**/jest-setup.ts$", - ".*.js$" - ] -} diff --git a/libs/backend/ranking/package.json b/libs/backend/ranking/package.json index 96b12dfd74..159a12ced0 100644 --- a/libs/backend/ranking/package.json +++ b/libs/backend/ranking/package.json @@ -12,11 +12,12 @@ "fastify": "^4.27.0", "moment": "^2.30.1", "@fastify/multipart": "^8.2.0", - "@swc/helpers": "^0.5.11", "sequelize": "^6.37.3", "@nestjs/bull": "^10.1.1", "bull": "^4.15.0", - "sequelize-typescript": "^2.1.6" + "sequelize-typescript": "^2.1.6", + "@nestjs/core": "^10.4.6", + "tslib": "^2.8.1" }, "type": "commonjs", "main": "./src/index.js", diff --git a/libs/backend/ranking/project.json b/libs/backend/ranking/project.json index 402f58db71..5c3a0552d2 100644 --- a/libs/backend/ranking/project.json +++ b/libs/backend/ranking/project.json @@ -6,14 +6,19 @@ "tags": [], "targets": { "build": { - "executor": "@nx/js:swc", + "executor": "@nx/js:tsc", "outputs": ["{options.outputPath}"], "options": { "outputPath": "{workspaceRoot}/dist/{projectRoot}", "tsConfig": "{projectRoot}/tsconfig.lib.json", "packageJson": "{projectRoot}/package.json", "main": "{projectRoot}/src/index.ts", - "assets": ["{projectRoot/*.md"] + "assets": ["{projectRoot/*.md"], + "transformers": [ + { + "name": "typescript-transform-paths/nx-transformer" + } + ] } }, "test": { diff --git a/libs/backend/ranking/src/controllers/upload.controller.ts b/libs/backend/ranking/src/controllers/upload.controller.ts index fc673503cd..16ddb90e24 100644 --- a/libs/backend/ranking/src/controllers/upload.controller.ts +++ b/libs/backend/ranking/src/controllers/upload.controller.ts @@ -5,6 +5,8 @@ import moment from 'moment'; import * as XLSX from 'xlsx'; import { MembersRolePerGroupData, UpdateRankingService } from '../services'; import { UploadGuard, MultipartFile, File } from '@badman/backend-utils'; +import workerThreadFilePath from '../worker/config'; +import { Worker } from 'worker_threads'; @Controller('ranking/upload') export class UploadRankingController { @@ -55,22 +57,29 @@ export class UploadRankingController { res.send({ message: true }); - this._updateRankingService - .processFileUpload(mappedData, { + const worker = new Worker(workerThreadFilePath, { + workerData: JSON.stringify({ updateCompStatus, updateRanking, updatePossible, updateClubs, - rankingDate: rankingDate.toDate(), - clubMembershipStartDate: clubMembershipStartDate.toDate(), - clubMembershipEndDate: clubMembershipEndDate.toDate(), + rankingDate, + clubMembershipStartDate, + clubMembershipEndDate, removeAllRanking, rankingSystemId, createNewPlayers, - }) - .then(() => { - this._logger.log('Ranking processed'); - }); + mappedData, + }), + }); + + worker.on('message', () => { + this._logger.verbose('Done'); + }); + worker.on('error', (e) => { + return this._logger.error('on error', e); + }); + worker.on('exit', (code) => this._logger.log('on exit', code)); }); } diff --git a/libs/backend/ranking/src/worker/config.ts b/libs/backend/ranking/src/worker/config.ts new file mode 100644 index 0000000000..1f9320cfd1 --- /dev/null +++ b/libs/backend/ranking/src/worker/config.ts @@ -0,0 +1,6 @@ +import path from 'node:path'; + +// it will import the compiled js file from dist directory +const workerThreadFilePath = path.resolve(process.cwd(), 'dist/libs/backend/ranking/src/worker/process-ranking.js') + +export default workerThreadFilePath; diff --git a/libs/backend/ranking/src/worker/process-ranking.ts b/libs/backend/ranking/src/worker/process-ranking.ts new file mode 100644 index 0000000000..802633c6a2 --- /dev/null +++ b/libs/backend/ranking/src/worker/process-ranking.ts @@ -0,0 +1,41 @@ +import { NestFactory } from '@nestjs/core'; +import { isMainThread, workerData } from 'worker_threads'; +import { RankingModule } from '../ranking.module'; +import { UpdateRankingService } from '../services'; + +async function run() { + if (isMainThread) { + throw new Error('This script should be run as a worker thread'); + } + const app = await NestFactory.createApplicationContext(RankingModule); + const updateRankingService = app.get(UpdateRankingService); + + const { + updateCompStatus, + updateRanking, + updatePossible, + updateClubs, + rankingDate, + clubMembershipStartDate, + clubMembershipEndDate, + removeAllRanking, + rankingSystemId, + createNewPlayers, + mappedData, + } = JSON.parse(workerData); + + await updateRankingService.processFileUpload(mappedData, { + updateCompStatus, + updateRanking, + updatePossible, + updateClubs, + rankingDate, + clubMembershipStartDate, + clubMembershipEndDate, + removeAllRanking, + rankingSystemId, + createNewPlayers, + }); +} + +run(); diff --git a/libs/backend/search/.swcrc b/libs/backend/search/.swcrc deleted file mode 100644 index d54df2b947..0000000000 --- a/libs/backend/search/.swcrc +++ /dev/null @@ -1,29 +0,0 @@ -{ - "jsc": { - "target": "es2017", - "parser": { - "syntax": "typescript", - "decorators": true, - "dynamicImport": true - }, - "transform": { - "decoratorMetadata": true, - "legacyDecorator": true - }, - "keepClassNames": true, - "externalHelpers": true, - "loose": true - }, - "module": { - "type": "commonjs" - }, - "sourceMaps": true, - "exclude": [ - "jest.config.ts", - ".*\\.spec.tsx?$", - ".*\\.test.tsx?$", - "./src/jest-setup.ts$", - "./**/jest-setup.ts$", - ".*.js$" - ] -} diff --git a/libs/backend/search/package.json b/libs/backend/search/package.json index 33e867cde3..7e2d0f2547 100644 --- a/libs/backend/search/package.json +++ b/libs/backend/search/package.json @@ -2,13 +2,13 @@ "name": "@badman/backend-search", "version": "6.174.5", "dependencies": { - "@swc/helpers": "~0.5.2", "@nestjs/common": "^10.3.1", "@nestjs/config": "^3.1.1", "@badman/backend-database": "6.174.5", "@nestjs/graphql": "^12.0.11", "sequelize": "^6.35.2", - "@badman/utils": "6.174.5" + "@badman/utils": "6.174.5", + "tslib": "^2.8.1" }, "type": "commonjs", "main": "./src/index.js", diff --git a/libs/backend/search/project.json b/libs/backend/search/project.json index 021677e7ec..98298c5b54 100644 --- a/libs/backend/search/project.json +++ b/libs/backend/search/project.json @@ -6,14 +6,19 @@ "tags": [], "targets": { "build": { - "executor": "@nx/js:swc", + "executor": "@nx/js:tsc", "outputs": ["{options.outputPath}"], "options": { "outputPath": "{workspaceRoot}/dist/{projectRoot}", "tsConfig": "{projectRoot}/tsconfig.lib.json", "packageJson": "{projectRoot}/package.json", "main": "{projectRoot}/src/index.ts", - "assets": ["{projectRoot/*.md"] + "assets": ["{projectRoot/*.md"], + "transformers": [ + { + "name": "typescript-transform-paths/nx-transformer" + } + ] } }, "test": { diff --git a/libs/backend/translate/.swcrc b/libs/backend/translate/.swcrc deleted file mode 100644 index d54df2b947..0000000000 --- a/libs/backend/translate/.swcrc +++ /dev/null @@ -1,29 +0,0 @@ -{ - "jsc": { - "target": "es2017", - "parser": { - "syntax": "typescript", - "decorators": true, - "dynamicImport": true - }, - "transform": { - "decoratorMetadata": true, - "legacyDecorator": true - }, - "keepClassNames": true, - "externalHelpers": true, - "loose": true - }, - "module": { - "type": "commonjs" - }, - "sourceMaps": true, - "exclude": [ - "jest.config.ts", - ".*\\.spec.tsx?$", - ".*\\.test.tsx?$", - "./src/jest-setup.ts$", - "./**/jest-setup.ts$", - ".*.js$" - ] -} diff --git a/libs/backend/translate/package.json b/libs/backend/translate/package.json index 1b69fbe8b1..49243eae25 100644 --- a/libs/backend/translate/package.json +++ b/libs/backend/translate/package.json @@ -2,12 +2,12 @@ "name": "@badman/backend-translate", "version": "6.174.5", "dependencies": { - "@swc/helpers": "~0.5.2", "@badman/backend-authorization": "6.174.5", "@badman/utils": "6.174.5", "@nestjs/common": "^10.3.1", "nestjs-i18n": "^10.4.0", - "fastify": "^4.28.1" + "fastify": "^4.28.1", + "tslib": "^2.8.1" }, "type": "commonjs", "main": "./src/index.js", diff --git a/libs/backend/translate/project.json b/libs/backend/translate/project.json index 8ccaa4aa61..4852f87653 100644 --- a/libs/backend/translate/project.json +++ b/libs/backend/translate/project.json @@ -6,14 +6,19 @@ "tags": [], "targets": { "build": { - "executor": "@nx/js:swc", + "executor": "@nx/js:tsc", "outputs": ["{options.outputPath}"], "options": { "outputPath": "{workspaceRoot}/dist/{projectRoot}", "tsConfig": "{projectRoot}/tsconfig.lib.json", "packageJson": "{projectRoot}/package.json", "main": "{projectRoot}/src/index.ts", - "assets": ["{projectRoot/*.md"] + "assets": ["{projectRoot/*.md"], + "transformers": [ + { + "name": "typescript-transform-paths/nx-transformer" + } + ] } }, "test": { diff --git a/libs/backend/twizzit/.swcrc b/libs/backend/twizzit/.swcrc deleted file mode 100644 index d54df2b947..0000000000 --- a/libs/backend/twizzit/.swcrc +++ /dev/null @@ -1,29 +0,0 @@ -{ - "jsc": { - "target": "es2017", - "parser": { - "syntax": "typescript", - "decorators": true, - "dynamicImport": true - }, - "transform": { - "decoratorMetadata": true, - "legacyDecorator": true - }, - "keepClassNames": true, - "externalHelpers": true, - "loose": true - }, - "module": { - "type": "commonjs" - }, - "sourceMaps": true, - "exclude": [ - "jest.config.ts", - ".*\\.spec.tsx?$", - ".*\\.test.tsx?$", - "./src/jest-setup.ts$", - "./**/jest-setup.ts$", - ".*.js$" - ] -} diff --git a/libs/backend/twizzit/package.json b/libs/backend/twizzit/package.json index c4b1946d35..1489c8fb4d 100644 --- a/libs/backend/twizzit/package.json +++ b/libs/backend/twizzit/package.json @@ -7,12 +7,12 @@ "fastify": "^4.27.0", "moment-timezone": "^0.5.45", "sequelize": "^6.37.3", - "@swc/helpers": "^0.5.11", "@badman/utils": "6.174.5", "@nestjs/config": "^3.2.3", "axios": "^1.7.7", "axios-rate-limit": "^1.4.0", - "axios-retry": "^4.5.0" + "axios-retry": "^4.5.0", + "tslib": "^2.8.1" }, "type": "commonjs", "main": "./src/index.js", diff --git a/libs/backend/twizzit/project.json b/libs/backend/twizzit/project.json index c9052734d8..eeea2a6abb 100644 --- a/libs/backend/twizzit/project.json +++ b/libs/backend/twizzit/project.json @@ -6,14 +6,19 @@ "tags": [], "targets": { "build": { - "executor": "@nx/js:swc", + "executor": "@nx/js:tsc", "outputs": ["{options.outputPath}"], "options": { "outputPath": "{workspaceRoot}/dist/{projectRoot}", "tsConfig": "{projectRoot}/tsconfig.lib.json", "packageJson": "{projectRoot}/package.json", "main": "{projectRoot}/src/index.ts", - "assets": ["{projectRoot/*.md"] + "assets": ["{projectRoot/*.md"], + "transformers": [ + { + "name": "typescript-transform-paths/nx-transformer" + } + ] } }, "test": { diff --git a/libs/backend/utils/.swcrc b/libs/backend/utils/.swcrc deleted file mode 100644 index d54df2b947..0000000000 --- a/libs/backend/utils/.swcrc +++ /dev/null @@ -1,29 +0,0 @@ -{ - "jsc": { - "target": "es2017", - "parser": { - "syntax": "typescript", - "decorators": true, - "dynamicImport": true - }, - "transform": { - "decoratorMetadata": true, - "legacyDecorator": true - }, - "keepClassNames": true, - "externalHelpers": true, - "loose": true - }, - "module": { - "type": "commonjs" - }, - "sourceMaps": true, - "exclude": [ - "jest.config.ts", - ".*\\.spec.tsx?$", - ".*\\.test.tsx?$", - "./src/jest-setup.ts$", - "./**/jest-setup.ts$", - ".*.js$" - ] -} diff --git a/libs/backend/utils/package.json b/libs/backend/utils/package.json index 60ae58c736..ce91a5a867 100644 --- a/libs/backend/utils/package.json +++ b/libs/backend/utils/package.json @@ -6,7 +6,7 @@ "fastify": "^4.27.0", "@fastify/multipart": "^8.2.0", "multer": "1.4.5-lts.1", - "@swc/helpers": "^0.5.11" + "tslib": "^2.8.1" }, "type": "commonjs", "main": "./src/index.js", diff --git a/libs/backend/utils/project.json b/libs/backend/utils/project.json index c5b268b383..d10f313120 100644 --- a/libs/backend/utils/project.json +++ b/libs/backend/utils/project.json @@ -6,14 +6,19 @@ "tags": [], "targets": { "build": { - "executor": "@nx/js:swc", + "executor": "@nx/js:tsc", "outputs": ["{options.outputPath}"], "options": { "outputPath": "{workspaceRoot}/dist/{projectRoot}", "tsConfig": "{projectRoot}/tsconfig.lib.json", "packageJson": "{projectRoot}/package.json", "main": "{projectRoot}/src/index.ts", - "assets": ["{projectRoot/*.md"] + "assets": ["{projectRoot/*.md"], + "transformers": [ + { + "name": "typescript-transform-paths/nx-transformer" + } + ] } }, "test": { diff --git a/libs/backend/validation/.swcrc b/libs/backend/validation/.swcrc deleted file mode 100644 index d54df2b947..0000000000 --- a/libs/backend/validation/.swcrc +++ /dev/null @@ -1,29 +0,0 @@ -{ - "jsc": { - "target": "es2017", - "parser": { - "syntax": "typescript", - "decorators": true, - "dynamicImport": true - }, - "transform": { - "decoratorMetadata": true, - "legacyDecorator": true - }, - "keepClassNames": true, - "externalHelpers": true, - "loose": true - }, - "module": { - "type": "commonjs" - }, - "sourceMaps": true, - "exclude": [ - "jest.config.ts", - ".*\\.spec.tsx?$", - ".*\\.test.tsx?$", - "./src/jest-setup.ts$", - "./**/jest-setup.ts$", - ".*.js$" - ] -} diff --git a/libs/backend/validation/package.json b/libs/backend/validation/package.json index 02d2a9fb32..d97be4063a 100644 --- a/libs/backend/validation/package.json +++ b/libs/backend/validation/package.json @@ -3,8 +3,8 @@ "version": "6.174.5", "dependencies": { "@nestjs/common": "^10.3.8", - "@swc/helpers": "^0.5.11", - "@badman/backend-database": "6.174.5" + "@badman/backend-database": "6.174.5", + "tslib": "^2.8.1" }, "type": "commonjs", "main": "./src/index.js", diff --git a/libs/backend/validation/project.json b/libs/backend/validation/project.json index 97df40cbbe..e1ed46e81b 100644 --- a/libs/backend/validation/project.json +++ b/libs/backend/validation/project.json @@ -6,14 +6,19 @@ "tags": [], "targets": { "build": { - "executor": "@nx/js:swc", + "executor": "@nx/js:tsc", "outputs": ["{options.outputPath}"], "options": { "outputPath": "{workspaceRoot}/dist/{projectRoot}", "tsConfig": "{projectRoot}/tsconfig.lib.json", "packageJson": "{projectRoot}/package.json", "main": "{projectRoot}/src/index.ts", - "assets": ["{projectRoot/*.md"] + "assets": ["{projectRoot/*.md"], + "transformers": [ + { + "name": "typescript-transform-paths/nx-transformer" + } + ] } }, "test": { diff --git a/libs/backend/visual/.swcrc b/libs/backend/visual/.swcrc deleted file mode 100644 index d54df2b947..0000000000 --- a/libs/backend/visual/.swcrc +++ /dev/null @@ -1,29 +0,0 @@ -{ - "jsc": { - "target": "es2017", - "parser": { - "syntax": "typescript", - "decorators": true, - "dynamicImport": true - }, - "transform": { - "decoratorMetadata": true, - "legacyDecorator": true - }, - "keepClassNames": true, - "externalHelpers": true, - "loose": true - }, - "module": { - "type": "commonjs" - }, - "sourceMaps": true, - "exclude": [ - "jest.config.ts", - ".*\\.spec.tsx?$", - ".*\\.test.tsx?$", - "./src/jest-setup.ts$", - "./**/jest-setup.ts$", - ".*.js$" - ] -} diff --git a/libs/backend/visual/package.json b/libs/backend/visual/package.json index 350a0d1bcb..6b60a08bb9 100644 --- a/libs/backend/visual/package.json +++ b/libs/backend/visual/package.json @@ -14,7 +14,7 @@ "moment-timezone": "^0.5.45", "cache-manager": "5.7.2", "@nestjs/cache-manager": "^2.2.2", - "@swc/helpers": "^0.5.11" + "tslib": "^2.8.1" }, "type": "commonjs", "main": "./src/index.js", diff --git a/libs/backend/visual/project.json b/libs/backend/visual/project.json index 08202bd715..fc54148931 100644 --- a/libs/backend/visual/project.json +++ b/libs/backend/visual/project.json @@ -6,14 +6,19 @@ "tags": [], "targets": { "build": { - "executor": "@nx/js:swc", + "executor": "@nx/js:tsc", "outputs": ["{options.outputPath}"], "options": { "outputPath": "{workspaceRoot}/dist/{projectRoot}", "tsConfig": "{projectRoot}/tsconfig.lib.json", "packageJson": "{projectRoot}/package.json", "main": "{projectRoot}/src/index.ts", - "assets": ["{projectRoot/*.md"] + "assets": ["{projectRoot/*.md"], + "transformers": [ + { + "name": "typescript-transform-paths/nx-transformer" + } + ] } }, "test": { diff --git a/libs/backend/websockets/.swcrc b/libs/backend/websockets/.swcrc deleted file mode 100644 index d54df2b947..0000000000 --- a/libs/backend/websockets/.swcrc +++ /dev/null @@ -1,29 +0,0 @@ -{ - "jsc": { - "target": "es2017", - "parser": { - "syntax": "typescript", - "decorators": true, - "dynamicImport": true - }, - "transform": { - "decoratorMetadata": true, - "legacyDecorator": true - }, - "keepClassNames": true, - "externalHelpers": true, - "loose": true - }, - "module": { - "type": "commonjs" - }, - "sourceMaps": true, - "exclude": [ - "jest.config.ts", - ".*\\.spec.tsx?$", - ".*\\.test.tsx?$", - "./src/jest-setup.ts$", - "./**/jest-setup.ts$", - ".*.js$" - ] -} diff --git a/libs/backend/websockets/package.json b/libs/backend/websockets/package.json index 27c1bbb50b..f5cb44bf09 100644 --- a/libs/backend/websockets/package.json +++ b/libs/backend/websockets/package.json @@ -8,7 +8,7 @@ "redis": "^4.6.13", "@nestjs/websockets": "^10.3.8", "@nestjs/common": "^10.3.8", - "@swc/helpers": "^0.5.11" + "tslib": "^2.8.1" }, "type": "commonjs", "main": "./src/index.js", diff --git a/libs/backend/websockets/project.json b/libs/backend/websockets/project.json index 348a26a452..607eb07412 100644 --- a/libs/backend/websockets/project.json +++ b/libs/backend/websockets/project.json @@ -6,14 +6,19 @@ "tags": [], "targets": { "build": { - "executor": "@nx/js:swc", + "executor": "@nx/js:tsc", "outputs": ["{options.outputPath}"], "options": { "outputPath": "{workspaceRoot}/dist/{projectRoot}", "tsConfig": "{projectRoot}/tsconfig.lib.json", "packageJson": "{projectRoot}/package.json", "main": "{projectRoot}/src/index.ts", - "assets": ["{projectRoot/*.md"] + "assets": ["{projectRoot/*.md"], + "transformers": [ + { + "name": "typescript-transform-paths/nx-transformer" + } + ] } }, "test": { diff --git a/libs/utils/.swcrc b/libs/utils/.swcrc deleted file mode 100644 index d54df2b947..0000000000 --- a/libs/utils/.swcrc +++ /dev/null @@ -1,29 +0,0 @@ -{ - "jsc": { - "target": "es2017", - "parser": { - "syntax": "typescript", - "decorators": true, - "dynamicImport": true - }, - "transform": { - "decoratorMetadata": true, - "legacyDecorator": true - }, - "keepClassNames": true, - "externalHelpers": true, - "loose": true - }, - "module": { - "type": "commonjs" - }, - "sourceMaps": true, - "exclude": [ - "jest.config.ts", - ".*\\.spec.tsx?$", - ".*\\.test.tsx?$", - "./src/jest-setup.ts$", - "./**/jest-setup.ts$", - ".*.js$" - ] -} diff --git a/libs/utils/package.json b/libs/utils/package.json index 4122552909..bae6752b80 100644 --- a/libs/utils/package.json +++ b/libs/utils/package.json @@ -5,7 +5,7 @@ "joi": "^17.12.1", "moment": "^2.30.1", "nestjs-i18n": "^10.4.0", - "@swc/helpers": "^0.5.6" + "tslib": "^2.8.1" }, "type": "commonjs", "main": "./src/index.js", diff --git a/libs/utils/project.json b/libs/utils/project.json index 50ce327d41..6449a71d73 100644 --- a/libs/utils/project.json +++ b/libs/utils/project.json @@ -6,14 +6,19 @@ "tags": [], "targets": { "build": { - "executor": "@nx/js:swc", + "executor": "@nx/js:tsc", "outputs": ["{options.outputPath}"], "options": { "outputPath": "{workspaceRoot}/dist/{projectRoot}", "tsConfig": "{projectRoot}/tsconfig.lib.json", "packageJson": "{projectRoot}/package.json", "main": "{projectRoot}/src/index.ts", - "assets": ["{projectRoot/*.md"] + "assets": ["{projectRoot/*.md"], + "transformers": [ + { + "name": "typescript-transform-paths/nx-transformer" + } + ] } }, "test": { diff --git a/nx.json b/nx.json index cef28834b4..d240170854 100644 --- a/nx.json +++ b/nx.json @@ -62,11 +62,6 @@ "dependsOn": ["^build"], "inputs": ["production", "^production"] }, - "@nx/js:swc": { - "cache": true, - "dependsOn": ["^build"], - "inputs": ["production", "^production"] - }, "@nx/angular:ng-packagr-lite": { "cache": true, "dependsOn": ["^build"], diff --git a/package.json b/package.json index ca1647e37e..9a257709e9 100644 --- a/package.json +++ b/package.json @@ -181,10 +181,6 @@ "@playwright/test": "^1.48.2", "@prettier/plugin-pug": "^3.2.0", "@schematics/angular": "18.2.7", - "@swc-node/register": "1.10.7", - "@swc/cli": "0.4.0", - "@swc/core": "1.6.13", - "@swc/helpers": "0.5.12", "@types/archiver": "^6.0.3", "@types/compression": "^1.7.5", "@types/consolidate": "^0.14.4", @@ -218,10 +214,10 @@ "prettier": "3.3.2", "redis-memory-server": "^0.11.0", "supertest": "^7.0.0", - "swc-loader": "^0.2.6", "ts-jest": "^29.2.5", "ts-node": "10.9.2", "typescript": "5.5.4", + "typescript-transform-paths": "^3.5.2", "webpack": "^5.96.1", "webpack-cli": "^5.1.4" },