From 2a148793863498d9d203df3f0a3d8ee4d801e57a Mon Sep 17 00:00:00 2001 From: einhornimmond Date: Sun, 12 Oct 2025 11:22:24 +0200 Subject: [PATCH 01/10] make update for bun 1.3 --- admin/package.json | 1 + backend/package.json | 3 +- .../resolver/CommunityResolver.test.ts | 3 + bun.lock | 105 +++++------------- core/package.json | 2 + .../logic/settlePendingSenderTransaction.ts | 2 +- database/package.json | 4 +- dht-node/package.json | 2 +- federation/package.json | 6 +- frontend/package.json | 3 +- 10 files changed, 50 insertions(+), 81 deletions(-) diff --git a/admin/package.json b/admin/package.json index 6301b315a..578b16d05 100644 --- a/admin/package.json +++ b/admin/package.json @@ -61,6 +61,7 @@ "@vue/test-utils": "^2.4.6", "config-schema": "*", "cross-env": "^7.0.3", + "dotenv": "^17.2.3", "dotenv-webpack": "^7.0.3", "eslint": "8.57.1", "eslint-config-prettier": "^10.1.1", diff --git a/backend/package.json b/backend/package.json index 659ac59dc..7413d8c83 100644 --- a/backend/package.json +++ b/backend/package.json @@ -41,6 +41,7 @@ "@swc/cli": "^0.7.3", "@swc/core": "^1.11.24", "@swc/helpers": "^0.5.17", + "@types/cors": "^2.8.19", "@types/email-templates": "^10.0.4", "@types/express": "^4.17.21", "@types/faker": "^5.5.9", @@ -62,7 +63,7 @@ "cors": "^2.8.5", "database": "*", "decimal.js-light": "^2.5.1", - "dotenv": "^10.0.0", + "dotenv": "^17.2.3", "esbuild": "^0.25.2", "express": "^4.17.21", "express-slow-down": "^2.0.1", diff --git a/backend/src/graphql/resolver/CommunityResolver.test.ts b/backend/src/graphql/resolver/CommunityResolver.test.ts index 5e7d929e2..57173c9d1 100644 --- a/backend/src/graphql/resolver/CommunityResolver.test.ts +++ b/backend/src/graphql/resolver/CommunityResolver.test.ts @@ -48,6 +48,9 @@ beforeAll(async () => { query = testEnv.query con = testEnv.con await cleanDB() + // reset id auto increment + await DbCommunity.clear() + await DbFederatedCommunity.clear() }) afterAll(async () => { diff --git a/bun.lock b/bun.lock index 5c1e61306..e13c10c4f 100644 --- a/bun.lock +++ b/bun.lock @@ -56,6 +56,7 @@ "@vue/test-utils": "^2.4.6", "config-schema": "*", "cross-env": "^7.0.3", + "dotenv": "^17.2.3", "dotenv-webpack": "^7.0.3", "eslint": "8.57.1", "eslint-config-prettier": "^10.1.1", @@ -97,6 +98,7 @@ "@swc/cli": "^0.7.3", "@swc/core": "^1.11.24", "@swc/helpers": "^0.5.17", + "@types/cors": "^2.8.19", "@types/email-templates": "^10.0.4", "@types/express": "^4.17.21", "@types/faker": "^5.5.9", @@ -113,12 +115,12 @@ "await-semaphore": "^0.1.3", "axios": "^0.21.1", "class-validator": "^0.13.1", - "config-schema": "workspace:*", - "core": "workspace:*", + "config-schema": "*", + "core": "*", "cors": "^2.8.5", - "database": "workspace:*", + "database": "*", "decimal.js-light": "^2.5.1", - "dotenv": "^10.0.0", + "dotenv": "^17.2.3", "esbuild": "^0.25.2", "express": "^4.17.21", "express-slow-down": "^2.0.1", @@ -146,7 +148,7 @@ "random-bigint": "^0.0.1", "reflect-metadata": "^0.1.13", "regenerator-runtime": "^0.14.1", - "shared": "workspace:*", + "shared": "*", "source-map-support": "^0.5.21", "ts-jest": "29.4.0", "ts-node": "^10.9.2", @@ -185,6 +187,7 @@ "database": "*", "esbuild": "^0.25.2", "i18n": "^0.15.1", + "joi": "^17.13.3", "jose": "^4.14.4", "log4js": "^6.9.1", "shared": "*", @@ -198,6 +201,7 @@ "@types/sodium-native": "^2.3.5", "config-schema": "*", "decimal.js-light": "^2.5.1", + "dotenv": "^17.2.3", "graphql-request": "5.0.0", "jest": "27.2.4", "type-graphql": "^1.1.1", @@ -211,11 +215,12 @@ "@types/uuid": "^8.3.4", "cross-env": "^7.0.3", "decimal.js-light": "^2.5.1", - "dotenv": "^10.0.0", + "dotenv": "^17.2.3", "esbuild": "^0.25.2", "geojson": "^0.5.0", "joi-extract-type": "^15.0.8", "log4js": "^6.9.1", + "mysql": "^2.18.1", "mysql2": "^2.3.0", "reflect-metadata": "^0.1.13", "shared": "*", @@ -235,6 +240,7 @@ "@types/faker": "^5.5.9", "@types/geojson": "^7946.0.13", "@types/jest": "27.0.2", + "@types/mysql": "^2.15.27", "@types/node": "^18.7.14", "await-semaphore": "^0.1.3", "crypto-random-bigint": "^2.1.1", @@ -267,7 +273,7 @@ "@types/uuid": "^8.3.4", "config-schema": "*", "database": "*", - "dotenv": "10.0.0", + "dotenv": "^17.2.3", "esbuild": "^0.25.3", "jest": "27.5.1", "joi": "^17.13.3", @@ -296,6 +302,7 @@ "@swc/cli": "^0.7.3", "@swc/core": "^1.11.24", "@swc/helpers": "^0.5.17", + "@types/cors": "^2.8.19", "@types/express": "4.17.21", "@types/jest": "27.0.2", "@types/lodash.clonedeep": "^4.5.6", @@ -311,7 +318,8 @@ "cors": "2.8.5", "database": "*", "decimal.js-light": "^2.5.1", - "dotenv": "10.0.0", + "dotenv": "^17.2.3", + "esbuild": "^0.25.3", "express": "^4.17.21", "express-slow-down": "^2.0.1", "graphql": "15.10.1", @@ -326,8 +334,10 @@ "nodemon": "^2.0.7", "prettier": "^3.5.3", "reflect-metadata": "^0.1.13", + "shared": "*", "source-map-support": "^0.5.21", "ts-jest": "27.0.5", + "ts-node": "^10.9.2", "tsconfig-paths": "^4.1.1", "type-graphql": "^1.1.1", "typeorm": "^0.3.25", @@ -394,10 +404,11 @@ "@vitest/coverage-v8": "^2.0.5", "@vue/eslint-config-prettier": "^10.2.0", "@vue/test-utils": "^2.4.6", - "chokidar-cli": "^3.0.0", + "chokidar": "^4.0.3", "concurrently": "^9.1.2", "config-schema": "*", "cross-env": "^7.0.3", + "dotenv": "^17.2.3", "dotenv-webpack": "^7.0.3", "eslint": "8.57.1", "eslint-config-prettier": "^10.1.1", @@ -1026,7 +1037,7 @@ "@types/cookies": ["@types/cookies@0.9.0", "", { "dependencies": { "@types/connect": "*", "@types/express": "*", "@types/keygrip": "*", "@types/node": "*" } }, "sha512-40Zk8qR147RABiQ7NQnBzWzDcjKzNrntB5BAmeGCb2p/MIyOE+4BVvc17wumsUqUw00bJYqoXFHYygQnEFh4/Q=="], - "@types/cors": ["@types/cors@2.8.10", "", {}, "sha512-C7srjHiVG3Ey1nR6d511dtDkCEjxuN9W1HWAEjGq8kpcwmNM6JJkpC0xvabM7BXTG2wDq8Eu33iH9aQKa7IvLQ=="], + "@types/cors": ["@types/cors@2.8.19", "", { "dependencies": { "@types/node": "*" } }, "sha512-mFNylyeyqN93lfe/9CSxOGREz8cpzAhH+E93xJ4xWQf62V8sQ/24reV2nyzUWM6H6Xji+GGHpkbLe7pVoUEskg=="], "@types/dotenv": ["@types/dotenv@8.2.3", "", { "dependencies": { "dotenv": "*" } }, "sha512-g2FXjlDX/cYuc5CiQvyU/6kkbP1JtmGzh0obW50zD7OKeILVL0NSpPWLXVfqoAGQjom2/SLLx9zHq0KXvD6mbw=="], @@ -1534,8 +1545,6 @@ "chokidar": ["chokidar@4.0.3", "", { "dependencies": { "readdirp": "^4.0.1" } }, "sha512-Qgzu8kfBvo+cA4962jnP1KkS6Dop5NS6g7R5LFYJr4b8Ub94PPQXUksCw9PvXoeXPRRddRNC5C1JQUR2SMGtnA=="], - "chokidar-cli": ["chokidar-cli@3.0.0", "", { "dependencies": { "chokidar": "^3.5.2", "lodash.debounce": "^4.0.8", "lodash.throttle": "^4.1.1", "yargs": "^13.3.0" }, "bin": { "chokidar": "index.js" } }, "sha512-xVW+Qeh7z15uZRxHOkP93Ux8A0xbPzwK4GaqD8dQOYc34TlkqUhVSS59fK36DOp5WdJlrRzlYSy02Ht99FjZqQ=="], - "chrome-trace-event": ["chrome-trace-event@1.0.4", "", {}, "sha512-rNjApaLzuwaOTjCiT8lSDdGN1APCiqkChLMJxJPWLunPAt5fy8xgU9/jNOchV84wfIxrA0lRQB7oCT8jrn/wrQ=="], "ci-info": ["ci-info@3.9.0", "", {}, "sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ=="], @@ -1662,8 +1671,6 @@ "debugging-stream": ["debugging-stream@2.0.0", "", { "dependencies": { "streamx": "^2.12.4" } }, "sha512-xwfl6wB/3xc553uwtGnSa94jFxnGOc02C0WU2Nmzwr80gzeqn1FX4VcbvoKIhe8L/lPq4BTQttAbrTN94uN8rA=="], - "decamelize": ["decamelize@1.2.0", "", {}, "sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA=="], - "decimal.js": ["decimal.js@10.5.0", "", {}, "sha512-8vDa8Qxvr/+d94hSh5P3IJwI5t8/c0KsMp+g8bNw9cY2icONa5aPfvKeieW1WlG0WQYwwhJ7mjui2xtiePQSXw=="], "decimal.js-light": ["decimal.js-light@2.5.1", "", {}, "sha512-qIMFpTMZmny+MMIitAB6D7iVPEorVw6YQRWkvarTkT4tBeSLLiHzcwj6q0MmYSFCiVpiqPJTJEYIrpcPzVEIvg=="], @@ -1740,7 +1747,7 @@ "dot-case": ["dot-case@3.0.4", "", { "dependencies": { "no-case": "^3.0.4", "tslib": "^2.0.3" } }, "sha512-Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w=="], - "dotenv": ["dotenv@10.0.0", "", {}, "sha512-rlBi9d8jpv9Sf1klPjNfFAuWDjKLwTIJJ/VxtoTwIR6hnZxcEOQCZg2oIL3MWBYw5GpUDKOEnND7LXTbIpQ03Q=="], + "dotenv": ["dotenv@17.2.3", "", {}, "sha512-JVUnt+DUIzu87TABbhPmNfVdBDt18BLOWjMUFJMSi/Qqg7NTYtabbvSNJGOJ7afbRuv9D/lngizHtP7QyLQ+9w=="], "dotenv-defaults": ["dotenv-defaults@2.0.2", "", { "dependencies": { "dotenv": "^8.2.0" } }, "sha512-iOIzovWfsUHU91L5i8bJce3NYK5JXeAwH50Jh6+ARUdLiiGlYWfGw6UkzsYqaXZH/hjE/eCd/PlfM/qqyK0AMg=="], @@ -2438,8 +2445,6 @@ "lodash.clonedeep": ["lodash.clonedeep@4.5.0", "", {}, "sha512-H5ZhCF25riFd9uB5UCkVKo61m3S/xZk1x4wA6yp/L3RFP6Z/eHH1ymQcGLo7J3GMPfm0V/7m1tryHuGVxpqEBQ=="], - "lodash.debounce": ["lodash.debounce@4.0.8", "", {}, "sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow=="], - "lodash.get": ["lodash.get@4.4.2", "", {}, "sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ=="], "lodash.memoize": ["lodash.memoize@4.1.2", "", {}, "sha512-t7j+NzmgnQzTAYXcsHYLgimltOV1MXHtlOWf6GjL9Kj8GK5FInw5JotxvbOs+IvV1/Dzo04/fCGfLVs7aXb4Ag=="], @@ -2448,8 +2453,6 @@ "lodash.sortby": ["lodash.sortby@4.7.0", "", {}, "sha512-HDWXG8isMntAyRF5vZ7xKuEvOhT4AhlRt/3czTSjvGUxjYCBVRQY48ViDHyfYz9VIoBkW4TMGQNapx+l3RUwdA=="], - "lodash.throttle": ["lodash.throttle@4.1.1", "", {}, "sha512-wIkUCfVKpVsWo3JSZlc+8MB5it+2AN5W8J7YVMST30UrvcQNZ1Okbj+rbVniijTWE6FGYy4XJq/rHkas8qJMLQ=="], - "lodash.truncate": ["lodash.truncate@4.4.2", "", {}, "sha512-jttmRe7bRse52OsWIMDLaXxWqRAmtIUccAQ3garviCqJjafXOfNMO0yMfNpdD6zbGaTU0P5Nz7e7gAT6cKmJRw=="], "log4js": ["log4js@6.9.1", "", { "dependencies": { "date-format": "^4.0.14", "debug": "^4.3.4", "flatted": "^3.2.7", "rfdc": "^1.3.0", "streamroller": "^3.1.5" } }, "sha512-1somDdy9sChrr9/f4UlzhdaGfDR2c/SaD2a4T7qEkG4jTS57/B3qmnjLYePwQ8cqWnUHZI0iAKxMBpCZICiZ2g=="], @@ -2860,8 +2863,6 @@ "require-from-string": ["require-from-string@2.0.2", "", {}, "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw=="], - "require-main-filename": ["require-main-filename@2.0.0", "", {}, "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg=="], - "requires-port": ["requires-port@1.0.0", "", {}, "sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ=="], "resolve": ["resolve@1.22.10", "", { "dependencies": { "is-core-module": "^2.16.0", "path-parse": "^1.0.7", "supports-preserve-symlinks-flag": "^1.0.0" }, "bin": { "resolve": "bin/resolve" } }, "sha512-NPRy+/ncIMeDlTAsuqwKIiferiawhefFJtkNSW0qZJEqMEb+qBt/77B/jGeeek+F0uOeN05CDa6HXbbIgtVX4w=="], @@ -2938,8 +2939,6 @@ "serve-static": ["serve-static@1.16.2", "", { "dependencies": { "encodeurl": "~2.0.0", "escape-html": "~1.0.3", "parseurl": "~1.3.3", "send": "0.19.0" } }, "sha512-VqpjJZKadQB/PEbEwvFdO43Ax5dFBZ2UECszz8bQ7pi7wt//PWe1P6MN7eCnjsatYtBT6EuiClbjSWP2WrIoTw=="], - "set-blocking": ["set-blocking@2.0.0", "", {}, "sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw=="], - "set-function-length": ["set-function-length@1.2.2", "", { "dependencies": { "define-data-property": "^1.1.4", "es-errors": "^1.3.0", "function-bind": "^1.1.2", "get-intrinsic": "^1.2.4", "gopd": "^1.0.1", "has-property-descriptors": "^1.0.2" } }, "sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg=="], "set-function-name": ["set-function-name@2.0.2", "", { "dependencies": { "define-data-property": "^1.1.4", "es-errors": "^1.3.0", "functions-have-names": "^1.2.3", "has-property-descriptors": "^1.0.2" } }, "sha512-7PGFlmtwsEADb0WYyvCMa1t+yke6daIG4Wirafur5kcf+MhUnPms1UeR0CKQdTZD81yESwMHbtn+TR+dMviakQ=="], @@ -3004,7 +3003,7 @@ "sql-highlight": ["sql-highlight@6.0.0", "", {}, "sha512-+fLpbAbWkQ+d0JEchJT/NrRRXbYRNbG15gFpANx73EwxQB1PRjj+k/OI0GTU0J63g8ikGkJECQp9z8XEJZvPRw=="], - "sqlstring": ["sqlstring@2.3.3", "", {}, "sha512-qC9iz2FlN7DQl3+wjwn3802RTyjCx7sDvfQEXchwa6CWOx07/WVfh91gBmQ9fahw8snwGEWU3xGzOt4tFyHLxg=="], + "sqlstring": ["sqlstring@2.3.1", "", {}, "sha512-ooAzh/7dxIG5+uDik1z/Rd1vli0+38izZhGzSa34FwR7IbelPWCCKSNIl8jlL/F7ERvy8CB2jNeM1E9i9mXMAQ=="], "stack-utils": ["stack-utils@2.0.6", "", { "dependencies": { "escape-string-regexp": "^2.0.0" } }, "sha512-XlkWvfIm6RmsWtNJx+uqtKLS8eqFbxUg0ZzLXqY0caEy9l7hruX8IpiDnjsLavoBgqCCR71TqWO8MaXYheJ3RQ=="], @@ -3368,8 +3367,6 @@ "which-collection": ["which-collection@1.0.2", "", { "dependencies": { "is-map": "^2.0.3", "is-set": "^2.0.3", "is-weakmap": "^2.0.2", "is-weakset": "^2.0.3" } }, "sha512-K4jVyjnBdgvc86Y6BkaLZEN933SwYOuBFkdmBu9ZfkcAbdVbpITnDmjvZ/aQjRXQrv5EPkTnD1s39GiiqbngCw=="], - "which-module": ["which-module@2.0.1", "", {}, "sha512-iBdZ57RDvnOR9AGBhML2vFZf7h8vmBjhoaZqODJBFWHVtKkDmKuHai3cx5PgVMrX5YDNp27AofYbAwctSS+vhQ=="], - "which-runtime": ["which-runtime@1.2.1", "", {}, "sha512-8feIHccQFH/whiA1fD1b4c5+Q7T4ry1g1oHYc2mHnFh81tTQFsCvy3zhS2geUapkFAVBddUT/AM1a3rbqJweFg=="], "which-typed-array": ["which-typed-array@1.1.19", "", { "dependencies": { "available-typed-arrays": "^1.0.7", "call-bind": "^1.0.8", "call-bound": "^1.0.4", "for-each": "^0.3.5", "get-proto": "^1.0.1", "gopd": "^1.2.0", "has-tostringtag": "^1.0.2" } }, "sha512-rEvr90Bck4WZt9HHFC4DJMsjvu7x+r6bImz0/BrbWb7A2djJ8hnZMrWnHo9F8ssv0OMErasDhftrfROTyqSDrw=="], @@ -3556,6 +3553,10 @@ "@types/cookies/@types/node": ["@types/node@18.19.96", "", { "dependencies": { "undici-types": "~5.26.4" } }, "sha512-PzBvgsZ7YdFs/Kng1BSW8IGv68/SPcOxYYhT7luxD7QyzIhFS1xPTpfK3K9eHBa7hVwlW+z8nN0mOd515yaduQ=="], + "@types/cors/@types/node": ["@types/node@18.19.96", "", { "dependencies": { "undici-types": "~5.26.4" } }, "sha512-PzBvgsZ7YdFs/Kng1BSW8IGv68/SPcOxYYhT7luxD7QyzIhFS1xPTpfK3K9eHBa7hVwlW+z8nN0mOd515yaduQ=="], + + "@types/dotenv/dotenv": ["dotenv@10.0.0", "", {}, "sha512-rlBi9d8jpv9Sf1klPjNfFAuWDjKLwTIJJ/VxtoTwIR6hnZxcEOQCZg2oIL3MWBYw5GpUDKOEnND7LXTbIpQ03Q=="], + "@types/express-serve-static-core/@types/node": ["@types/node@18.19.96", "", { "dependencies": { "undici-types": "~5.26.4" } }, "sha512-PzBvgsZ7YdFs/Kng1BSW8IGv68/SPcOxYYhT7luxD7QyzIhFS1xPTpfK3K9eHBa7hVwlW+z8nN0mOd515yaduQ=="], "@types/fs-capacitor/@types/node": ["@types/node@18.19.96", "", { "dependencies": { "undici-types": "~5.26.4" } }, "sha512-PzBvgsZ7YdFs/Kng1BSW8IGv68/SPcOxYYhT7luxD7QyzIhFS1xPTpfK3K9eHBa7hVwlW+z8nN0mOd515yaduQ=="], @@ -3642,6 +3643,8 @@ "apollo-server-express/@types/body-parser": ["@types/body-parser@1.19.0", "", { "dependencies": { "@types/connect": "*", "@types/node": "*" } }, "sha512-W98JrE0j2K78swW4ukqMleo8R7h/pFETjM2DQ90MF6XK2i4LO4W3gQ71Lt4w3bfm2EvVSyWHplECvB5sK22yFQ=="], + "apollo-server-express/@types/cors": ["@types/cors@2.8.10", "", {}, "sha512-C7srjHiVG3Ey1nR6d511dtDkCEjxuN9W1HWAEjGq8kpcwmNM6JJkpC0xvabM7BXTG2wDq8Eu33iH9aQKa7IvLQ=="], + "apollo-utilities/@wry/equality": ["@wry/equality@0.1.11", "", { "dependencies": { "tslib": "^1.9.3" } }, "sha512-mwEVBDUVODlsQQ5dfuLUS5/Tf7jqUKyhKYHmVi4fPB6bDMOfWvUPJmKgS1Z7Za/sOI3vzWt4+O7yCiL/70MogA=="], "apollo-utilities/ts-invariant": ["ts-invariant@0.4.4", "", { "dependencies": { "tslib": "^1.9.3" } }, "sha512-uEtWkFM/sdZvRNNDL3Ehu4WVpwaulhwQszV8mrtcdeE8nN00BV9mAmQ88RkrBhFgl9gMgvjJLAQcZbnPXI9mlA=="], @@ -3680,10 +3683,6 @@ "cheerio-select/domutils": ["domutils@2.8.0", "", { "dependencies": { "dom-serializer": "^1.0.1", "domelementtype": "^2.2.0", "domhandler": "^4.2.0" } }, "sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A=="], - "chokidar-cli/chokidar": ["chokidar@3.6.0", "", { "dependencies": { "anymatch": "~3.1.2", "braces": "~3.0.2", "glob-parent": "~5.1.2", "is-binary-path": "~2.1.0", "is-glob": "~4.0.1", "normalize-path": "~3.0.0", "readdirp": "~3.6.0" }, "optionalDependencies": { "fsevents": "~2.3.2" } }, "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw=="], - - "chokidar-cli/yargs": ["yargs@13.3.2", "", { "dependencies": { "cliui": "^5.0.0", "find-up": "^3.0.0", "get-caller-file": "^2.0.1", "require-directory": "^2.1.1", "require-main-filename": "^2.0.0", "set-blocking": "^2.0.0", "string-width": "^3.0.0", "which-module": "^2.0.0", "y18n": "^4.0.0", "yargs-parser": "^13.1.2" } }, "sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw=="], - "citty/consola": ["consola@3.4.2", "", {}, "sha512-5IKcdX0nnYavi6G7TtOhwkYzyjfJlatbjMjuLSfE2kYT5pMDOilZ4OvMhi637CcDICTmz3wARPoyhqyX1Y+XvA=="], "clean-css/source-map": ["source-map@0.6.1", "", {}, "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="], @@ -3856,7 +3855,7 @@ "mysql/safe-buffer": ["safe-buffer@5.1.2", "", {}, "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="], - "mysql/sqlstring": ["sqlstring@2.3.1", "", {}, "sha512-ooAzh/7dxIG5+uDik1z/Rd1vli0+38izZhGzSa34FwR7IbelPWCCKSNIl8jlL/F7ERvy8CB2jNeM1E9i9mXMAQ=="], + "mysql2/sqlstring": ["sqlstring@2.3.3", "", {}, "sha512-qC9iz2FlN7DQl3+wjwn3802RTyjCx7sDvfQEXchwa6CWOx07/WVfh91gBmQ9fahw8snwGEWU3xGzOt4tFyHLxg=="], "named-placeholders/lru-cache": ["lru-cache@7.18.3", "", {}, "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA=="], @@ -4112,20 +4111,6 @@ "cheerio/htmlparser2/entities": ["entities@2.2.0", "", {}, "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A=="], - "chokidar-cli/chokidar/glob-parent": ["glob-parent@5.1.2", "", { "dependencies": { "is-glob": "^4.0.1" } }, "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow=="], - - "chokidar-cli/chokidar/readdirp": ["readdirp@3.6.0", "", { "dependencies": { "picomatch": "^2.2.1" } }, "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA=="], - - "chokidar-cli/yargs/cliui": ["cliui@5.0.0", "", { "dependencies": { "string-width": "^3.1.0", "strip-ansi": "^5.2.0", "wrap-ansi": "^5.1.0" } }, "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA=="], - - "chokidar-cli/yargs/find-up": ["find-up@3.0.0", "", { "dependencies": { "locate-path": "^3.0.0" } }, "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg=="], - - "chokidar-cli/yargs/string-width": ["string-width@3.1.0", "", { "dependencies": { "emoji-regex": "^7.0.1", "is-fullwidth-code-point": "^2.0.0", "strip-ansi": "^5.1.0" } }, "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w=="], - - "chokidar-cli/yargs/y18n": ["y18n@4.0.3", "", {}, "sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ=="], - - "chokidar-cli/yargs/yargs-parser": ["yargs-parser@13.1.2", "", { "dependencies": { "camelcase": "^5.0.0", "decamelize": "^1.2.0" } }, "sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg=="], - "css-select/domutils/dom-serializer": ["dom-serializer@1.4.1", "", { "dependencies": { "domelementtype": "^2.0.1", "domhandler": "^4.2.0", "entities": "^2.0.0" } }, "sha512-VHwB3KfrcOOkelEG2ZOfxqLZdfkil8PtJi4P8N2MMXucZq2yLp75ClViUlOVwyoHEDjYU433Aq+5zWP61+RGag=="], "database/ts-jest/yargs-parser": ["yargs-parser@20.2.9", "", {}, "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w=="], @@ -4342,20 +4327,6 @@ "cheerio-select/domutils/dom-serializer/entities": ["entities@2.2.0", "", {}, "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A=="], - "chokidar-cli/yargs/cliui/strip-ansi": ["strip-ansi@5.2.0", "", { "dependencies": { "ansi-regex": "^4.1.0" } }, "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA=="], - - "chokidar-cli/yargs/cliui/wrap-ansi": ["wrap-ansi@5.1.0", "", { "dependencies": { "ansi-styles": "^3.2.0", "string-width": "^3.0.0", "strip-ansi": "^5.0.0" } }, "sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q=="], - - "chokidar-cli/yargs/find-up/locate-path": ["locate-path@3.0.0", "", { "dependencies": { "p-locate": "^3.0.0", "path-exists": "^3.0.0" } }, "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A=="], - - "chokidar-cli/yargs/string-width/emoji-regex": ["emoji-regex@7.0.3", "", {}, "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA=="], - - "chokidar-cli/yargs/string-width/is-fullwidth-code-point": ["is-fullwidth-code-point@2.0.0", "", {}, "sha512-VHskAKYM8RfSFXwee5t5cbN5PZeq1Wrh6qd5bkyiXIf6UQcN6w/A0eXM9r6t8d+GYOh+o6ZhiEnb88LN/Y8m2w=="], - - "chokidar-cli/yargs/string-width/strip-ansi": ["strip-ansi@5.2.0", "", { "dependencies": { "ansi-regex": "^4.1.0" } }, "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA=="], - - "chokidar-cli/yargs/yargs-parser/camelcase": ["camelcase@5.3.1", "", {}, "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg=="], - "css-select/domutils/dom-serializer/entities": ["entities@2.2.0", "", {}, "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A=="], "editorconfig/minimatch/brace-expansion/balanced-match": ["balanced-match@1.0.2", "", {}, "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw=="], @@ -4410,16 +4381,6 @@ "@typescript-eslint/utils/@typescript-eslint/typescript-estree/minimatch/brace-expansion/balanced-match": ["balanced-match@1.0.2", "", {}, "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw=="], - "chokidar-cli/yargs/cliui/strip-ansi/ansi-regex": ["ansi-regex@4.1.1", "", {}, "sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g=="], - - "chokidar-cli/yargs/cliui/wrap-ansi/ansi-styles": ["ansi-styles@3.2.1", "", { "dependencies": { "color-convert": "^1.9.0" } }, "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA=="], - - "chokidar-cli/yargs/find-up/locate-path/p-locate": ["p-locate@3.0.0", "", { "dependencies": { "p-limit": "^2.0.0" } }, "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ=="], - - "chokidar-cli/yargs/find-up/locate-path/path-exists": ["path-exists@3.0.0", "", {}, "sha512-bpC7GYwiDYQ4wYLe+FA8lhRjhQCMcQGuSgGGqDkg/QerRWw9CmGRT0iSOVRSZJ29NMLZgIzqaljJ63oaL4NIJQ=="], - - "chokidar-cli/yargs/string-width/strip-ansi/ansi-regex": ["ansi-regex@4.1.1", "", {}, "sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g=="], - "js-beautify/glob/minimatch/brace-expansion/balanced-match": ["balanced-match@1.0.2", "", {}, "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw=="], "pkg-dir/find-up/locate-path/p-locate/p-limit": ["p-limit@2.3.0", "", { "dependencies": { "p-try": "^2.0.0" } }, "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w=="], @@ -4429,11 +4390,5 @@ "typeorm/glob/minimatch/brace-expansion/balanced-match": ["balanced-match@1.0.2", "", {}, "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw=="], "vue-apollo/chalk/ansi-styles/color-convert/color-name": ["color-name@1.1.3", "", {}, "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw=="], - - "chokidar-cli/yargs/cliui/wrap-ansi/ansi-styles/color-convert": ["color-convert@1.9.3", "", { "dependencies": { "color-name": "1.1.3" } }, "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg=="], - - "chokidar-cli/yargs/find-up/locate-path/p-locate/p-limit": ["p-limit@2.3.0", "", { "dependencies": { "p-try": "^2.0.0" } }, "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w=="], - - "chokidar-cli/yargs/cliui/wrap-ansi/ansi-styles/color-convert/color-name": ["color-name@1.1.3", "", {}, "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw=="], } } diff --git a/core/package.json b/core/package.json index 9e745f948..6f7e6a3e5 100644 --- a/core/package.json +++ b/core/package.json @@ -28,6 +28,7 @@ "database": "*", "esbuild": "^0.25.2", "i18n": "^0.15.1", + "joi": "^17.13.3", "jose": "^4.14.4", "log4js": "^6.9.1", "shared": "*", @@ -41,6 +42,7 @@ "@types/sodium-native": "^2.3.5", "config-schema": "*", "decimal.js-light": "^2.5.1", + "dotenv": "^17.2.3", "graphql-request": "5.0.0", "jest": "27.2.4", "type-graphql": "^1.1.1", diff --git a/core/src/graphql/logic/settlePendingSenderTransaction.ts b/core/src/graphql/logic/settlePendingSenderTransaction.ts index 7e8aa9055..7f55f8ae2 100644 --- a/core/src/graphql/logic/settlePendingSenderTransaction.ts +++ b/core/src/graphql/logic/settlePendingSenderTransaction.ts @@ -13,7 +13,7 @@ import { Decimal } from 'decimal.js-light' import { LOG4JS_BASE_CATEGORY_NAME } from '../../config/const' import { PendingTransactionState } from 'shared' // import { LogError } from '@/server/LogError' -import { calculateSenderBalance } from 'core' +import { calculateSenderBalance } from '../../util/calculateSenderBalance' import { TRANSACTIONS_LOCK, getLastTransaction } from 'database' import { getLogger } from 'log4js' diff --git a/database/package.json b/database/package.json index 26aa6b9e1..b208446b4 100644 --- a/database/package.json +++ b/database/package.json @@ -40,6 +40,7 @@ "@types/faker": "^5.5.9", "@types/geojson": "^7946.0.13", "@types/jest": "27.0.2", + "@types/mysql": "^2.15.27", "@types/node": "^18.7.14", "await-semaphore": "^0.1.3", "crypto-random-bigint": "^2.1.1", @@ -53,11 +54,12 @@ "@types/uuid": "^8.3.4", "cross-env": "^7.0.3", "decimal.js-light": "^2.5.1", - "dotenv": "^10.0.0", + "dotenv": "^17.2.3", "esbuild": "^0.25.2", "geojson": "^0.5.0", "joi-extract-type": "^15.0.8", "log4js": "^6.9.1", + "mysql": "^2.18.1", "mysql2": "^2.3.0", "reflect-metadata": "^0.1.13", "shared": "*", diff --git a/dht-node/package.json b/dht-node/package.json index ee4b01bef..4824fec20 100644 --- a/dht-node/package.json +++ b/dht-node/package.json @@ -39,7 +39,7 @@ "@types/uuid": "^8.3.4", "config-schema": "*", "database": "*", - "dotenv": "10.0.0", + "dotenv": "^17.2.3", "esbuild": "^0.25.3", "jest": "27.5.1", "joi": "^17.13.3", diff --git a/federation/package.json b/federation/package.json index ab11016a7..78281b373 100644 --- a/federation/package.json +++ b/federation/package.json @@ -31,6 +31,7 @@ "@swc/cli": "^0.7.3", "@swc/core": "^1.11.24", "@swc/helpers": "^0.5.17", + "@types/cors": "^2.8.19", "@types/express": "4.17.21", "@types/jest": "27.0.2", "@types/lodash.clonedeep": "^4.5.6", @@ -46,7 +47,8 @@ "cors": "2.8.5", "database": "*", "decimal.js-light": "^2.5.1", - "dotenv": "10.0.0", + "dotenv": "^17.2.3", + "esbuild": "^0.25.3", "express": "^4.17.21", "express-slow-down": "^2.0.1", "graphql": "15.10.1", @@ -61,8 +63,10 @@ "nodemon": "^2.0.7", "prettier": "^3.5.3", "reflect-metadata": "^0.1.13", + "shared": "*", "source-map-support": "^0.5.21", "ts-jest": "27.0.5", + "ts-node": "^10.9.2", "tsconfig-paths": "^4.1.1", "type-graphql": "^1.1.1", "typeorm": "^0.3.25", diff --git a/frontend/package.json b/frontend/package.json index cc71a8a4d..7ecb40508 100755 --- a/frontend/package.json +++ b/frontend/package.json @@ -80,10 +80,11 @@ "@vitest/coverage-v8": "^2.0.5", "@vue/eslint-config-prettier": "^10.2.0", "@vue/test-utils": "^2.4.6", - "chokidar-cli": "^3.0.0", + "chokidar": "^4.0.3", "concurrently": "^9.1.2", "config-schema": "*", "cross-env": "^7.0.3", + "dotenv": "^17.2.3", "dotenv-webpack": "^7.0.3", "eslint": "8.57.1", "eslint-config-prettier": "^10.1.1", From 3c2dedc07710c44d69a9e77228460c7729123429 Mon Sep 17 00:00:00 2001 From: einhornimmond Date: Sun, 12 Oct 2025 11:58:24 +0200 Subject: [PATCH 02/10] add bun config --- bunfig.toml | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 bunfig.toml diff --git a/bunfig.toml b/bunfig.toml new file mode 100644 index 000000000..931d76919 --- /dev/null +++ b/bunfig.toml @@ -0,0 +1,2 @@ +[install] +linker = "hoisted" \ No newline at end of file From 69002ecde18d654a55a5484151c739338db5a4b1 Mon Sep 17 00:00:00 2001 From: einhornimmond Date: Sun, 12 Oct 2025 12:03:00 +0200 Subject: [PATCH 03/10] use exact bun version for ci --- .bun-version | 1 + .github/workflows/test_admin_interface.yml | 2 ++ .github/workflows/test_backend.yml | 4 ++++ .github/workflows/test_config.yml | 2 ++ .github/workflows/test_core.yml | 2 ++ .github/workflows/test_database.yml | 4 ++++ .github/workflows/test_dht_node.yml | 2 ++ .github/workflows/test_e2e.yml | 6 ++++++ .github/workflows/test_federation.yml | 2 ++ .github/workflows/test_frontend.yml | 6 +++++- .github/workflows/test_shared.yml | 2 ++ 11 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 .bun-version diff --git a/.bun-version b/.bun-version new file mode 100644 index 000000000..589268e6f --- /dev/null +++ b/.bun-version @@ -0,0 +1 @@ +1.3.0 \ No newline at end of file diff --git a/.github/workflows/test_admin_interface.yml b/.github/workflows/test_admin_interface.yml index 2026b487a..7c7c43f2a 100644 --- a/.github/workflows/test_admin_interface.yml +++ b/.github/workflows/test_admin_interface.yml @@ -54,6 +54,8 @@ jobs: - name: install bun uses: oven-sh/setup-bun@v2 + with: + bun-version-file: '.bun-version' - name: install dependencies run: | diff --git a/.github/workflows/test_backend.yml b/.github/workflows/test_backend.yml index efb59ba37..bcc805295 100644 --- a/.github/workflows/test_backend.yml +++ b/.github/workflows/test_backend.yml @@ -56,6 +56,8 @@ jobs: - name: install bun uses: oven-sh/setup-bun@v2 + with: + bun-version-file: '.bun-version' - name: install dependencies run: | @@ -81,6 +83,8 @@ jobs: - name: install bun uses: oven-sh/setup-bun@v2 + with: + bun-version-file: '.bun-version' - name: install dependencies run: | diff --git a/.github/workflows/test_config.yml b/.github/workflows/test_config.yml index 8643bf959..2aad47e9e 100644 --- a/.github/workflows/test_config.yml +++ b/.github/workflows/test_config.yml @@ -31,6 +31,8 @@ jobs: - name: install bun uses: oven-sh/setup-bun@v2 + with: + bun-version-file: '.bun-version' - name: install dependencies run: bun install --filter config-schema --frozen-lockfile diff --git a/.github/workflows/test_core.yml b/.github/workflows/test_core.yml index b6e95f60c..eacf6faff 100644 --- a/.github/workflows/test_core.yml +++ b/.github/workflows/test_core.yml @@ -32,6 +32,8 @@ jobs: - name: install bun uses: oven-sh/setup-bun@v2 + with: + bun-version-file: '.bun-version' - name: install dependencies run: | diff --git a/.github/workflows/test_database.yml b/.github/workflows/test_database.yml index e0b52d149..7c573d208 100644 --- a/.github/workflows/test_database.yml +++ b/.github/workflows/test_database.yml @@ -53,6 +53,8 @@ jobs: - name: install bun uses: oven-sh/setup-bun@v2 + with: + bun-version-file: '.bun-version' - name: install dependencies run: | @@ -76,6 +78,8 @@ jobs: - name: install bun uses: oven-sh/setup-bun@v2 + with: + bun-version-file: '.bun-version' - name: install dependencies run: | diff --git a/.github/workflows/test_dht_node.yml b/.github/workflows/test_dht_node.yml index bdde2d22f..cbfbd2041 100644 --- a/.github/workflows/test_dht_node.yml +++ b/.github/workflows/test_dht_node.yml @@ -53,6 +53,8 @@ jobs: - name: install bun uses: oven-sh/setup-bun@v2 + with: + bun-version-file: '.bun-version' - name: install dependencies run: | diff --git a/.github/workflows/test_e2e.yml b/.github/workflows/test_e2e.yml index 9a36f063f..dd61f3d82 100644 --- a/.github/workflows/test_e2e.yml +++ b/.github/workflows/test_e2e.yml @@ -17,6 +17,8 @@ jobs: - name: install bun uses: oven-sh/setup-bun@v2 + with: + bun-version-file: '.bun-version' - name: Boot up test system | docker-compose mariadb mailserver run: docker compose -f docker-compose.yml -f docker-compose.test.yml up --detach mariadb mailserver @@ -120,6 +122,8 @@ jobs: - name: install bun uses: oven-sh/setup-bun@v2 + with: + bun-version-file: '.bun-version' - name: Boot up test system | docker-compose mariadb mailserver run: docker compose -f docker-compose.yml -f docker-compose.test.yml up --detach mariadb mailserver @@ -203,6 +207,8 @@ jobs: - name: install bun uses: oven-sh/setup-bun@v2 + with: + bun-version-file: '.bun-version' - name: Boot up test system | docker-compose mariadb mailserver run: docker compose -f docker-compose.yml -f docker-compose.test.yml up --detach mariadb mailserver diff --git a/.github/workflows/test_federation.yml b/.github/workflows/test_federation.yml index 18cceed89..6b461f215 100644 --- a/.github/workflows/test_federation.yml +++ b/.github/workflows/test_federation.yml @@ -53,6 +53,8 @@ jobs: - name: install bun uses: oven-sh/setup-bun@v2 + with: + bun-version-file: '.bun-version' - name: install dependencies run: | diff --git a/.github/workflows/test_frontend.yml b/.github/workflows/test_frontend.yml index 9691e4694..c7595cfd4 100644 --- a/.github/workflows/test_frontend.yml +++ b/.github/workflows/test_frontend.yml @@ -52,6 +52,8 @@ jobs: - name: install bun uses: oven-sh/setup-bun@v2 + with: + bun-version-file: '.bun-version' - name: install dependencies run: bun install --filter frontend --frozen-lockfile @@ -77,7 +79,9 @@ jobs: - name: install bun uses: oven-sh/setup-bun@v2 - + with: + bun-version-file: '.bun-version' + - name: install dependencies run: | bun install --filter frontend --frozen-lockfile diff --git a/.github/workflows/test_shared.yml b/.github/workflows/test_shared.yml index 6e377dbbf..16accf3c0 100644 --- a/.github/workflows/test_shared.yml +++ b/.github/workflows/test_shared.yml @@ -30,6 +30,8 @@ jobs: - name: install bun uses: oven-sh/setup-bun@v2 + with: + bun-version-file: '.bun-version' - name: install dependencies run: bun install --filter shared --frozen-lockfile From 95d6b9175f15706d4ae93913d37234b4cb38a3e7 Mon Sep 17 00:00:00 2001 From: einhornimmond Date: Mon, 13 Oct 2025 17:09:13 +0200 Subject: [PATCH 04/10] change dotenv version --- admin/package.json | 2 +- backend/package.json | 2 +- core/package.json | 2 +- database/package.json | 2 +- dht-node/package.json | 2 +- federation/package.json | 2 +- frontend/package.json | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/admin/package.json b/admin/package.json index 578b16d05..53f47282d 100644 --- a/admin/package.json +++ b/admin/package.json @@ -61,7 +61,7 @@ "@vue/test-utils": "^2.4.6", "config-schema": "*", "cross-env": "^7.0.3", - "dotenv": "^17.2.3", + "dotenv": "^10.0.0", "dotenv-webpack": "^7.0.3", "eslint": "8.57.1", "eslint-config-prettier": "^10.1.1", diff --git a/backend/package.json b/backend/package.json index 7413d8c83..ae82cea7d 100644 --- a/backend/package.json +++ b/backend/package.json @@ -63,7 +63,7 @@ "cors": "^2.8.5", "database": "*", "decimal.js-light": "^2.5.1", - "dotenv": "^17.2.3", + "dotenv": "^10.0.0", "esbuild": "^0.25.2", "express": "^4.17.21", "express-slow-down": "^2.0.1", diff --git a/core/package.json b/core/package.json index 6f7e6a3e5..7a4d515a9 100644 --- a/core/package.json +++ b/core/package.json @@ -42,7 +42,7 @@ "@types/sodium-native": "^2.3.5", "config-schema": "*", "decimal.js-light": "^2.5.1", - "dotenv": "^17.2.3", + "dotenv": "^10.0.0", "graphql-request": "5.0.0", "jest": "27.2.4", "type-graphql": "^1.1.1", diff --git a/database/package.json b/database/package.json index b208446b4..6b77f99b5 100644 --- a/database/package.json +++ b/database/package.json @@ -54,7 +54,7 @@ "@types/uuid": "^8.3.4", "cross-env": "^7.0.3", "decimal.js-light": "^2.5.1", - "dotenv": "^17.2.3", + "dotenv": "^10.0.0", "esbuild": "^0.25.2", "geojson": "^0.5.0", "joi-extract-type": "^15.0.8", diff --git a/dht-node/package.json b/dht-node/package.json index 4824fec20..887415060 100644 --- a/dht-node/package.json +++ b/dht-node/package.json @@ -39,7 +39,7 @@ "@types/uuid": "^8.3.4", "config-schema": "*", "database": "*", - "dotenv": "^17.2.3", + "dotenv": "^10.0.0", "esbuild": "^0.25.3", "jest": "27.5.1", "joi": "^17.13.3", diff --git a/federation/package.json b/federation/package.json index 78281b373..b4a69cc0d 100644 --- a/federation/package.json +++ b/federation/package.json @@ -47,7 +47,7 @@ "cors": "2.8.5", "database": "*", "decimal.js-light": "^2.5.1", - "dotenv": "^17.2.3", + "dotenv": "^10.0.0", "esbuild": "^0.25.3", "express": "^4.17.21", "express-slow-down": "^2.0.1", diff --git a/frontend/package.json b/frontend/package.json index 7ecb40508..5c18b5e62 100755 --- a/frontend/package.json +++ b/frontend/package.json @@ -84,7 +84,7 @@ "concurrently": "^9.1.2", "config-schema": "*", "cross-env": "^7.0.3", - "dotenv": "^17.2.3", + "dotenv": "^10.0.0", "dotenv-webpack": "^7.0.3", "eslint": "8.57.1", "eslint-config-prettier": "^10.1.1", From fd262f57a8094d07c514c173f473393c98abbd07 Mon Sep 17 00:00:00 2001 From: einhornimmond Date: Mon, 13 Oct 2025 17:10:40 +0200 Subject: [PATCH 05/10] add missing changed bun lockfile --- bun.lock | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/bun.lock b/bun.lock index e13c10c4f..740d736f7 100644 --- a/bun.lock +++ b/bun.lock @@ -56,7 +56,7 @@ "@vue/test-utils": "^2.4.6", "config-schema": "*", "cross-env": "^7.0.3", - "dotenv": "^17.2.3", + "dotenv": "^10.0.0", "dotenv-webpack": "^7.0.3", "eslint": "8.57.1", "eslint-config-prettier": "^10.1.1", @@ -120,7 +120,7 @@ "cors": "^2.8.5", "database": "*", "decimal.js-light": "^2.5.1", - "dotenv": "^17.2.3", + "dotenv": "^10.0.0", "esbuild": "^0.25.2", "express": "^4.17.21", "express-slow-down": "^2.0.1", @@ -201,7 +201,7 @@ "@types/sodium-native": "^2.3.5", "config-schema": "*", "decimal.js-light": "^2.5.1", - "dotenv": "^17.2.3", + "dotenv": "^10.0.0", "graphql-request": "5.0.0", "jest": "27.2.4", "type-graphql": "^1.1.1", @@ -215,7 +215,7 @@ "@types/uuid": "^8.3.4", "cross-env": "^7.0.3", "decimal.js-light": "^2.5.1", - "dotenv": "^17.2.3", + "dotenv": "^10.0.0", "esbuild": "^0.25.2", "geojson": "^0.5.0", "joi-extract-type": "^15.0.8", @@ -273,7 +273,7 @@ "@types/uuid": "^8.3.4", "config-schema": "*", "database": "*", - "dotenv": "^17.2.3", + "dotenv": "^10.0.0", "esbuild": "^0.25.3", "jest": "27.5.1", "joi": "^17.13.3", @@ -318,7 +318,7 @@ "cors": "2.8.5", "database": "*", "decimal.js-light": "^2.5.1", - "dotenv": "^17.2.3", + "dotenv": "^10.0.0", "esbuild": "^0.25.3", "express": "^4.17.21", "express-slow-down": "^2.0.1", @@ -408,7 +408,7 @@ "concurrently": "^9.1.2", "config-schema": "*", "cross-env": "^7.0.3", - "dotenv": "^17.2.3", + "dotenv": "^10.0.0", "dotenv-webpack": "^7.0.3", "eslint": "8.57.1", "eslint-config-prettier": "^10.1.1", @@ -1747,7 +1747,7 @@ "dot-case": ["dot-case@3.0.4", "", { "dependencies": { "no-case": "^3.0.4", "tslib": "^2.0.3" } }, "sha512-Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w=="], - "dotenv": ["dotenv@17.2.3", "", {}, "sha512-JVUnt+DUIzu87TABbhPmNfVdBDt18BLOWjMUFJMSi/Qqg7NTYtabbvSNJGOJ7afbRuv9D/lngizHtP7QyLQ+9w=="], + "dotenv": ["dotenv@10.0.0", "", {}, "sha512-rlBi9d8jpv9Sf1klPjNfFAuWDjKLwTIJJ/VxtoTwIR6hnZxcEOQCZg2oIL3MWBYw5GpUDKOEnND7LXTbIpQ03Q=="], "dotenv-defaults": ["dotenv-defaults@2.0.2", "", { "dependencies": { "dotenv": "^8.2.0" } }, "sha512-iOIzovWfsUHU91L5i8bJce3NYK5JXeAwH50Jh6+ARUdLiiGlYWfGw6UkzsYqaXZH/hjE/eCd/PlfM/qqyK0AMg=="], @@ -3555,8 +3555,6 @@ "@types/cors/@types/node": ["@types/node@18.19.96", "", { "dependencies": { "undici-types": "~5.26.4" } }, "sha512-PzBvgsZ7YdFs/Kng1BSW8IGv68/SPcOxYYhT7luxD7QyzIhFS1xPTpfK3K9eHBa7hVwlW+z8nN0mOd515yaduQ=="], - "@types/dotenv/dotenv": ["dotenv@10.0.0", "", {}, "sha512-rlBi9d8jpv9Sf1klPjNfFAuWDjKLwTIJJ/VxtoTwIR6hnZxcEOQCZg2oIL3MWBYw5GpUDKOEnND7LXTbIpQ03Q=="], - "@types/express-serve-static-core/@types/node": ["@types/node@18.19.96", "", { "dependencies": { "undici-types": "~5.26.4" } }, "sha512-PzBvgsZ7YdFs/Kng1BSW8IGv68/SPcOxYYhT7luxD7QyzIhFS1xPTpfK3K9eHBa7hVwlW+z8nN0mOd515yaduQ=="], "@types/fs-capacitor/@types/node": ["@types/node@18.19.96", "", { "dependencies": { "undici-types": "~5.26.4" } }, "sha512-PzBvgsZ7YdFs/Kng1BSW8IGv68/SPcOxYYhT7luxD7QyzIhFS1xPTpfK3K9eHBa7hVwlW+z8nN0mOd515yaduQ=="], From c1be096bb85453e9b95f9cbfc914d18a0f1a6c98 Mon Sep 17 00:00:00 2001 From: einhornimmond Date: Wed, 22 Oct 2025 09:53:19 +0200 Subject: [PATCH 06/10] use specific bun version also in Dockerfiles and deployement script --- admin/Dockerfile | 4 ++- backend/Dockerfile | 5 +-- database/Dockerfile | 4 ++- deployment/bare_metal/install-missing-deps.sh | 35 +++++++++++++------ dht-node/Dockerfile | 5 +-- federation/Dockerfile | 5 +-- frontend/Dockerfile | 4 ++- 7 files changed, 43 insertions(+), 19 deletions(-) diff --git a/admin/Dockerfile b/admin/Dockerfile index 0ad7be7af..41b1bbab1 100644 --- a/admin/Dockerfile +++ b/admin/Dockerfile @@ -57,7 +57,9 @@ WORKDIR ${DOCKER_WORKDIR} FROM base as bun-base RUN apk update && apk add --no-cache curl tar bash -RUN curl -fsSL https://bun.sh/install | bash +COPY .bun-version .bun-version +RUN BUN_VERSION=$(cat .bun-version) && \ + curl -fsSL https://bun.com/install | bash -s "bun-v${BUN_VERSION}" # Add bun's global bin directory to PATH ENV PATH="/root/.bun/bin:${PATH}" diff --git a/backend/Dockerfile b/backend/Dockerfile index 4ab2f1883..eeab1ac17 100644 --- a/backend/Dockerfile +++ b/backend/Dockerfile @@ -54,8 +54,9 @@ WORKDIR ${DOCKER_WORKDIR} FROM base as bun-base RUN apt update && apt install -y --no-install-recommends ca-certificates curl bash unzip -#RUN apk update && apk add --no-cache curl tar bash -RUN curl -fsSL https://bun.sh/install | bash +COPY .bun-version .bun-version +RUN BUN_VERSION=$(cat .bun-version) && \ + curl -fsSL https://bun.com/install | bash -s "bun-v${BUN_VERSION}" # Add bun's global bin directory to PATH ENV PATH="/root/.bun/bin:${PATH}" diff --git a/database/Dockerfile b/database/Dockerfile index cbcaddc73..f6d50e7f2 100644 --- a/database/Dockerfile +++ b/database/Dockerfile @@ -46,7 +46,9 @@ FROM base as bun-base #RUN apt update && apt install -y --no-install-recommends ca-certificates curl bash unzip RUN apk update && apk add --no-cache curl tar bash -RUN curl -fsSL https://bun.sh/install | bash +COPY .bun-version .bun-version +RUN BUN_VERSION=$(cat .bun-version) && \ + curl -fsSL https://bun.com/install | bash -s "bun-v${BUN_VERSION}" # Add bun's global bin directory to PATH ENV PATH="/root/.bun/bin:${PATH}" diff --git a/deployment/bare_metal/install-missing-deps.sh b/deployment/bare_metal/install-missing-deps.sh index 52c1f7fab..5e538c6ae 100644 --- a/deployment/bare_metal/install-missing-deps.sh +++ b/deployment/bare_metal/install-missing-deps.sh @@ -19,19 +19,34 @@ install_nvm() { } nvm use || install_nvm -# check for some tools and install them, when missing -# bun https://bun.sh/install, faster packet-manager as yarn -if ! command -v bun &> /dev/null +# unzip needed for bun install script +if ! command -v unzip &> /dev/null then - if ! command -v unzip &> /dev/null - then - echo "'unzip' is missing, will be installed now!" - sudo apt-get install -y unzip - fi - echo "'bun' is missing, will be installed now!" - curl -fsSL https://bun.sh/install | bash + echo "'unzip' is missing, will be installed now!" + sudo apt-get install -y unzip +fi + +# check for some tools and install them, when missing +# bun https://bun.com/install, faster packet-manager as yarn +BUN_VERSION_FILE="$(dirname "$0")/../../.bun-version" +if [ ! -f "$BUN_VERSION_FILE" ]; then + echo ".bun-version file not found at: $BUN_VERSION_FILE" + exit 1 +fi +BUN_VERSION="$(cat "$BUN_VERSION_FILE" | tr -d '[:space:]')" +if ! command -v bun &> /dev/null +then + echo "'bun' is missing, v$BUN_VERSION will be installed now!" + curl -fsSL https://bun.com/install | bash -s "bun-v${BUN_VERSION}" export BUN_INSTALL="$HOME/.bun" export PATH="$BUN_INSTALL/bin:$PATH" +else + CURRENT_VERSION="$(bun --version | tr -d '[:space:]')" + if [ "$CURRENT_VERSION" != "$BUN_VERSION" ] + then + echo "'bun' is outdated, v$BUN_VERSION will be installed now!" + curl -fsSL https://bun.com/install | bash -s "bun-v${BUN_VERSION}" + fi fi # turbo https://turborepo.com/docs/getting-started if ! command -v turbo &> /dev/null diff --git a/dht-node/Dockerfile b/dht-node/Dockerfile index c19888a5d..963e093d6 100644 --- a/dht-node/Dockerfile +++ b/dht-node/Dockerfile @@ -57,8 +57,9 @@ WORKDIR ${DOCKER_WORKDIR} FROM base as bun-base RUN apt update && apt install -y --no-install-recommends ca-certificates curl bash unzip -#RUN apk update && apk add --no-cache curl tar bash -RUN curl -fsSL https://bun.sh/install | bash +COPY .bun-version .bun-version +RUN BUN_VERSION=$(cat .bun-version) && \ + curl -fsSL https://bun.com/install | bash -s "bun-v${BUN_VERSION}" # Add bun's global bin directory to PATH ENV PATH="/root/.bun/bin:${PATH}" diff --git a/federation/Dockerfile b/federation/Dockerfile index a8fcfd769..c3a45bf3d 100644 --- a/federation/Dockerfile +++ b/federation/Dockerfile @@ -55,8 +55,9 @@ WORKDIR ${DOCKER_WORKDIR} FROM base as bun-base RUN apt update && apt install -y --no-install-recommends ca-certificates curl bash unzip -#RUN apk update && apk add --no-cache curl tar bash -RUN curl -fsSL https://bun.sh/install | bash +COPY .bun-version .bun-version +RUN BUN_VERSION=$(cat .bun-version) && \ + curl -fsSL https://bun.com/install | bash -s "bun-v${BUN_VERSION}" # Add bun's global bin directory to PATH ENV PATH="/root/.bun/bin:${PATH}" diff --git a/frontend/Dockerfile b/frontend/Dockerfile index 23ca0685e..05e9e2255 100644 --- a/frontend/Dockerfile +++ b/frontend/Dockerfile @@ -57,7 +57,9 @@ WORKDIR ${DOCKER_WORKDIR} FROM base as bun-base RUN apk update && apk add --no-cache curl tar bash -RUN curl -fsSL https://bun.sh/install | bash +COPY .bun-version .bun-version +RUN BUN_VERSION=$(cat .bun-version) && \ + curl -fsSL https://bun.com/install | bash -s "bun-v${BUN_VERSION}" # Add bun's global bin directory to PATH ENV PATH="/root/.bun/bin:${PATH}" From 712f1d0c895de33cfd390cfe6a66a2eb3808f0ad Mon Sep 17 00:00:00 2001 From: einhornimmond Date: Wed, 22 Oct 2025 10:21:46 +0200 Subject: [PATCH 07/10] try to fix deploy --- deployment/bare_metal/install-missing-deps.sh | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/deployment/bare_metal/install-missing-deps.sh b/deployment/bare_metal/install-missing-deps.sh index 5e538c6ae..56ecc8d7c 100644 --- a/deployment/bare_metal/install-missing-deps.sh +++ b/deployment/bare_metal/install-missing-deps.sh @@ -1,5 +1,13 @@ #!/bin/bash +SCRIPT_PATH=$(realpath $0) +SCRIPT_DIR=$(dirname $SCRIPT_PATH) +PROJECT_ROOT=$SCRIPT_DIR/../.. + +echo "Project root: $PROJECT_ROOT" +echo "Script dir: $SCRIPT_DIR" +echo "Script path: $SCRIPT_PATH" + # Ensure required tools are installed # make sure correct node version is installed @@ -28,7 +36,7 @@ fi # check for some tools and install them, when missing # bun https://bun.com/install, faster packet-manager as yarn -BUN_VERSION_FILE="$(dirname "$0")/../../.bun-version" +BUN_VERSION_FILE="$PROJECT_ROOT/.bun-version" if [ ! -f "$BUN_VERSION_FILE" ]; then echo ".bun-version file not found at: $BUN_VERSION_FILE" exit 1 From 264d2697d1da69bb36da041a992664b1ef4eee02 Mon Sep 17 00:00:00 2001 From: einhornimmond Date: Wed, 22 Oct 2025 10:24:38 +0200 Subject: [PATCH 08/10] fix deploy --- deployment/bare_metal/install-missing-deps.sh | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/deployment/bare_metal/install-missing-deps.sh b/deployment/bare_metal/install-missing-deps.sh index 56ecc8d7c..d311f60b6 100644 --- a/deployment/bare_metal/install-missing-deps.sh +++ b/deployment/bare_metal/install-missing-deps.sh @@ -4,10 +4,6 @@ SCRIPT_PATH=$(realpath $0) SCRIPT_DIR=$(dirname $SCRIPT_PATH) PROJECT_ROOT=$SCRIPT_DIR/../.. -echo "Project root: $PROJECT_ROOT" -echo "Script dir: $SCRIPT_DIR" -echo "Script path: $SCRIPT_PATH" - # Ensure required tools are installed # make sure correct node version is installed @@ -36,7 +32,7 @@ fi # check for some tools and install them, when missing # bun https://bun.com/install, faster packet-manager as yarn -BUN_VERSION_FILE="$PROJECT_ROOT/.bun-version" +BUN_VERSION_FILE="$SCRIPT_DIR/.bun-version" if [ ! -f "$BUN_VERSION_FILE" ]; then echo ".bun-version file not found at: $BUN_VERSION_FILE" exit 1 From 77f02e33e16724d58907c995b69d43ddae24a230 Mon Sep 17 00:00:00 2001 From: einhornimmond Date: Wed, 22 Oct 2025 10:27:37 +0200 Subject: [PATCH 09/10] really fix --- deployment/bare_metal/install-missing-deps.sh | 4 ---- 1 file changed, 4 deletions(-) diff --git a/deployment/bare_metal/install-missing-deps.sh b/deployment/bare_metal/install-missing-deps.sh index d311f60b6..62ff353a4 100644 --- a/deployment/bare_metal/install-missing-deps.sh +++ b/deployment/bare_metal/install-missing-deps.sh @@ -1,9 +1,5 @@ #!/bin/bash -SCRIPT_PATH=$(realpath $0) -SCRIPT_DIR=$(dirname $SCRIPT_PATH) -PROJECT_ROOT=$SCRIPT_DIR/../.. - # Ensure required tools are installed # make sure correct node version is installed From 66975d295e5355d1a2a9e802e6efdff8a7bdb98c Mon Sep 17 00:00:00 2001 From: einhornimmond Date: Wed, 22 Oct 2025 10:28:34 +0200 Subject: [PATCH 10/10] maybe now... --- deployment/bare_metal/install-missing-deps.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deployment/bare_metal/install-missing-deps.sh b/deployment/bare_metal/install-missing-deps.sh index 62ff353a4..a75a574dc 100644 --- a/deployment/bare_metal/install-missing-deps.sh +++ b/deployment/bare_metal/install-missing-deps.sh @@ -28,7 +28,7 @@ fi # check for some tools and install them, when missing # bun https://bun.com/install, faster packet-manager as yarn -BUN_VERSION_FILE="$SCRIPT_DIR/.bun-version" +BUN_VERSION_FILE="$PROJECT_ROOT/.bun-version" if [ ! -f "$BUN_VERSION_FILE" ]; then echo ".bun-version file not found at: $BUN_VERSION_FILE" exit 1