diff --git a/backend/package.json b/backend/package.json index c1ec995e4..0b91c441e 100644 --- a/backend/package.json +++ b/backend/package.json @@ -10,7 +10,7 @@ "scripts": { "build": "bun esbuild.config.ts", "start": "cross-env TZ=UTC NODE_ENV=production bun build/index.js", - "dev": "cross-env TZ=UTC bun --hot src/index.ts", + "dev": "cross-env TZ=UTC nodemon -w src --ext ts,pug,json,css --exec ts-node -r tsconfig-paths/register src/index.ts", "typecheck": "tsc --noEmit", "lint": "biome check --error-on-warnings .", "lint:fix": "biome check --error-on-warnings . --write", @@ -78,7 +78,9 @@ "graphql-tag": "^2.12.6", "jest": "27.2.4", "klicktipp-api": "^1.0.2", + "nodemon": "^2.0.7", "prettier": "^3.5.3", + "tsconfig-paths": "^4.1.1", "ts-jest": "27.0.5", "typescript": "^4.9.5" }, diff --git a/bun.lock b/bun.lock index 069e87da9..4d5cd0b88 100644 --- a/bun.lock +++ b/bun.lock @@ -157,7 +157,6 @@ "@biomejs/biome": "1.9.4", "@types/node": "^17.0.21", "bun": "^1.2.11", - "esbuild": "^0.25.2", "typescript": "^4.9.5", }, }, @@ -179,7 +178,6 @@ }, "devDependencies": { "@biomejs/biome": "1.9.4", - "@types/bun": "^1.2.11", "@types/faker": "^5.5.9", "@types/geojson": "^7946.0.13", "@types/node": "^17.0.21", @@ -247,7 +245,6 @@ "uuid": "8.3.2", }, "devDependencies": { - "@anatine/esbuild-decorators": "^0.2.19", "@biomejs/biome": "1.9.4", "@types/express": "4.17.21", "@types/jest": "27.0.2", @@ -256,8 +253,6 @@ "@types/sodium-native": "^2.3.5", "@types/uuid": "^8.3.4", "apollo-server-testing": "2.25.2", - "bun": "^1.2.11", - "esbuild": "^0.25.2", "graphql-tag": "^2.12.6", "jest": "27.2.4", "prettier": "^3.5.3", @@ -829,8 +824,6 @@ "@types/body-parser": ["@types/body-parser@1.19.5", "", { "dependencies": { "@types/connect": "*", "@types/node": "*" } }, "sha512-fB3Zu92ucau0iQ0JMCFQE7b/dv8Ot07NI3KaZIkIUNXq82k4eBAqUaneXfleGY9JWskeS9y+u0nXMyspcuQrCg=="], - "@types/bun": ["@types/bun@1.2.11", "", { "dependencies": { "bun-types": "1.2.11" } }, "sha512-ZLbbI91EmmGwlWTRWuV6J19IUiUC5YQ3TCEuSHI3usIP75kuoA8/0PVF+LTrbEnVc8JIhpElWOxv1ocI1fJBbw=="], - "@types/connect": ["@types/connect@3.4.38", "", { "dependencies": { "@types/node": "*" } }, "sha512-K6uROf1LD88uDQqJCktA4yzL1YYAK6NgfsI0v/mTgyPKWsX1CnJ0XPSDhViejru1GcRkLWb8RlzFYJRqGUbaug=="], "@types/content-disposition": ["@types/content-disposition@0.5.8", "", {}, "sha512-QVSSvno3dE0MgO76pJhmv4Qyi/j0Yk9pBp0Y7TJ2Tlj+KCgJWY6qX7nnxCOLkZ3VYRSIk1WTxCvwUSdx6CCLdg=="], @@ -1269,8 +1262,6 @@ "bun": ["bun@1.2.11", "", { "optionalDependencies": { "@oven/bun-darwin-aarch64": "1.2.11", "@oven/bun-darwin-x64": "1.2.11", "@oven/bun-darwin-x64-baseline": "1.2.11", "@oven/bun-linux-aarch64": "1.2.11", "@oven/bun-linux-aarch64-musl": "1.2.11", "@oven/bun-linux-x64": "1.2.11", "@oven/bun-linux-x64-baseline": "1.2.11", "@oven/bun-linux-x64-musl": "1.2.11", "@oven/bun-linux-x64-musl-baseline": "1.2.11", "@oven/bun-windows-x64": "1.2.11", "@oven/bun-windows-x64-baseline": "1.2.11" }, "os": [ "linux", "win32", "darwin", ], "cpu": [ "x64", "arm64", ], "bin": { "bun": "bin/bun.exe", "bunx": "bin/bun.exe" } }, "sha512-9brVfsp6/TYVsE3lCl1MUxoyKhvljqyL1MNPErgwsOaS9g4Gzi2nY+W5WtRAXGzLrgz5jzsoGHHwyH/rTeRCIg=="], - "bun-types": ["bun-types@1.2.11", "", { "dependencies": { "@types/node": "*" } }, "sha512-dbkp5Lo8HDrXkLrONm6bk+yiiYQSntvFUzQp0v3pzTAsXk6FtgVMjdQ+lzFNVAmQFUkPQZ3WMZqH5tTo+Dp/IA=="], - "busboy": ["busboy@0.3.1", "", { "dependencies": { "dicer": "0.3.0" } }, "sha512-y7tTxhGKXcyBxRKAni+awqx8uqaJKrSFSNFSeRG5CsWNdmy2BIK+6VGWEW7TZnIO/533mtMEA4rOevQV815YJw=="], "bytes": ["bytes@3.1.2", "", {}, "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg=="], @@ -3283,8 +3274,6 @@ "brace-expansion/balanced-match": ["balanced-match@1.0.2", "", {}, "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw=="], - "bun-types/@types/node": ["@types/node@18.19.87", "", { "dependencies": { "undici-types": "~5.26.4" } }, "sha512-OIAAu6ypnVZHmsHCeJ+7CCSub38QNBS9uceMQeg7K5Ur0Jr+wG9wEOEvvMbhp09pxD5czIUy/jND7s7Tb6Nw7A=="], - "c12/confbox": ["confbox@0.2.2", "", {}, "sha512-1NB+BKqhtNipMsov4xI/NnhCKp9XG9NamYp5PVm9klAT0fsrNPjaFICsCFhNhwZJKNh7zB/3q8qXz0E9oaMNtQ=="], "c12/dotenv": ["dotenv@16.5.0", "", {}, "sha512-m/C+AwOAr9/W1UOIZUo232ejMNnJAJtYQjUbHoNTBNTJSvqzzDh7vnrei3o3r3m9blf6ZoDkvcw0VmozNRFJxg=="], diff --git a/config-schema/package.json b/config-schema/package.json index 0fa00d80d..f3ceed498 100644 --- a/config-schema/package.json +++ b/config-schema/package.json @@ -4,6 +4,7 @@ "description": "Gradido Config for validate config", "main": "./build/index.js", "types": "./src/index.ts", + "type": "module", "exports": { ".": { "import": "./build/index.js", @@ -15,7 +16,7 @@ "license": "Apache-2.0", "private": true, "scripts": { - "build": "bun build --outdir=build --platform=bun --bundle --packages=external src/index.ts", + "build": "esbuild src/index.ts --outdir=build --platform=node --target=node18.20.7 --bundle --packages=external", "typecheck": "tsc --noEmit", "lint": "biome check --error-on-warnings .", "lint:fix": "biome check --error-on-warnings . --write" @@ -23,11 +24,11 @@ "devDependencies": { "@biomejs/biome": "1.9.4", "@types/node": "^17.0.21", - "bun": "^1.2.11", "typescript": "^4.9.5" }, "dependencies": { - "joi": "^17.13.3" + "joi": "^17.13.3", + "esbuild": "^0.25.2" }, "engines": { "node": ">=18" diff --git a/database/package.json b/database/package.json index 0c00c46c7..c4b9b5fca 100644 --- a/database/package.json +++ b/database/package.json @@ -29,24 +29,22 @@ }, "devDependencies": { "@biomejs/biome": "1.9.4", - "@types/bun": "^1.2.11", "@types/faker": "^5.5.9", "@types/geojson": "^7946.0.13", "@types/node": "^17.0.21", - "esbuild": "^0.25.2", - "prettier": "^2.8.7", - "tsx": "^4.19.4", "typescript": "^4.9.5" }, "dependencies": { "@types/uuid": "^8.3.4", "cross-env": "^7.0.3", "decimal.js-light": "^2.5.1", + "esbuild": "^0.25.2", "dotenv": "^10.0.0", "geojson": "^0.5.0", "mysql2": "^2.3.0", "reflect-metadata": "^0.1.13", "ts-mysql-migrate": "^1.0.2", + "tsx": "^4.19.4", "typeorm": "^0.3.16", "uuid": "^8.3.2", "wkx": "^0.5.0" diff --git a/dht-node/package.json b/dht-node/package.json index 666b8bd69..145f15585 100644 --- a/dht-node/package.json +++ b/dht-node/package.json @@ -22,6 +22,7 @@ "cross-env": "^7.0.3", "database": "*", "dotenv": "10.0.0", + "esbuild": "^0.25.2", "joi": "^17.13.3", "log4js": "^6.7.1", "typeorm": "^0.3.16", @@ -34,8 +35,6 @@ "@types/joi": "^17.2.3", "@types/node": "^17.0.21", "@types/uuid": "^8.3.4", - "bun": "^1.2.11", - "esbuild": "^0.25.2", "jest": "27.5.1", "prettier": "^2.8.7", "ts-jest": "27.1.4", diff --git a/federation/esbuild.config.ts b/federation/esbuild.config.ts deleted file mode 100644 index 38ca5b58d..000000000 --- a/federation/esbuild.config.ts +++ /dev/null @@ -1,13 +0,0 @@ -import { build } from 'esbuild' - -build({ - entryPoints: ['src/index.ts'], - outdir: 'build', - platform: 'node', - target: 'node18.20.7', - bundle: true, - keepNames: true, - // legalComments: 'inline', - external: ['sodium-native'], - minify: true, -}) diff --git a/federation/package.json b/federation/package.json index 2d6f74a52..68d37b5cd 100644 --- a/federation/package.json +++ b/federation/package.json @@ -6,10 +6,10 @@ "repository": "https://github.com/gradido/gradido/federation", "author": "Gradido Academy - https://www.gradido.net", "license": "Apache-2.0", + "private": false, "scripts": { - "build": "bun esbuild.config.ts", - "start": "cross-env TZ=UTC bun build/index.js", + "start": "cross-env TZ=UTC bun src/index.ts", "dev": "cross-env TZ=UTC bun --hot src/index.ts", "typecheck": "tsc --noEmit", "test": "cross-env TZ=UTC NODE_ENV=development DB_DATABASE=gradido_test_federation jest --runInBand --forceExit --detectOpenHandles", @@ -41,7 +41,7 @@ "typeorm": "^0.3.16", "uuid": "8.3.2" }, - "devDependencies": { + "devDependencies": { "@biomejs/biome": "1.9.4", "@types/express": "4.17.21", "@types/jest": "27.0.2", @@ -50,8 +50,6 @@ "@types/sodium-native": "^2.3.5", "@types/uuid": "^8.3.4", "apollo-server-testing": "2.25.2", - "bun": "^1.2.11", - "esbuild": "^0.25.2", "graphql-tag": "^2.12.6", "jest": "27.2.4", "prettier": "^3.5.3", diff --git a/federation/tsconfig.json b/federation/tsconfig.json index 8bdf9906a..f72262d8e 100644 --- a/federation/tsconfig.json +++ b/federation/tsconfig.json @@ -83,5 +83,5 @@ /* Advanced Options */ "skipLibCheck": true, /* Skip type checking of declaration files. */ "forceConsistentCasingInFileNames": true /* Disallow inconsistently-cased references to the same file. */ - } + }, } diff --git a/yarn.lock b/yarn.lock index 54f9a55ee..c092ac4e9 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1930,13 +1930,6 @@ "@types/connect" "*" "@types/node" "*" -"@types/bun@^1.2.11": - version "1.2.11" - resolved "https://registry.yarnpkg.com/@types/bun/-/bun-1.2.11.tgz#44e9e941fa246a96b5cf5bdce7e733976e5cfb7a" - integrity sha512-ZLbbI91EmmGwlWTRWuV6J19IUiUC5YQ3TCEuSHI3usIP75kuoA8/0PVF+LTrbEnVc8JIhpElWOxv1ocI1fJBbw== - dependencies: - bun-types "1.2.11" - "@types/connect@*": version "3.4.38" resolved "https://registry.yarnpkg.com/@types/connect/-/connect-3.4.38.tgz#5ba7f3bc4fbbdeaff8dded952e5ff2cc53f8d858" @@ -3762,13 +3755,6 @@ builtins@^5.0.1: dependencies: semver "^7.0.0" -bun-types@1.2.11: - version "1.2.11" - resolved "https://registry.yarnpkg.com/bun-types/-/bun-types-1.2.11.tgz#98b480e0271b1ea6f0161db2712a359e5b3828fe" - integrity sha512-dbkp5Lo8HDrXkLrONm6bk+yiiYQSntvFUzQp0v3pzTAsXk6FtgVMjdQ+lzFNVAmQFUkPQZ3WMZqH5tTo+Dp/IA== - dependencies: - "@types/node" "*" - bun@^1.2.11: version "1.2.11" resolved "https://registry.yarnpkg.com/bun/-/bun-1.2.11.tgz#eb423adada0b562a04b30a3224c11657f5d99bc1"