diff --git a/extra/admin-api/outputs.nix b/extra/admin-api/outputs.nix index ccbed17d9..90182efe7 100644 --- a/extra/admin-api/outputs.nix +++ b/extra/admin-api/outputs.nix @@ -10,7 +10,7 @@ let date = builtins.substring 0 8 self.sourceInfo.lastModifiedDate; time = builtins.substring 8 6 self.sourceInfo.lastModifiedDate; in - "preview.${date}-${time}"; #+${rev}"; + "preview.${date}-${time}"; # +${rev}"; in flake-utils.lib.eachSystem flake-utils.lib.allSystems ( system: @@ -88,29 +88,29 @@ flake-utils.lib.eachSystem flake-utils.lib.allSystems ( proj.Spacebar-AdminApi-Models proj.Spacebar-Db ]; - + }; -# Spacebar-AdminApi-TestClient = makeNupkg { -# name = "Spacebar.AdminApi.TestClient"; -# projectFile = "Utilities/Spacebar.AdminApi.TestClient/Spacebar.AdminApi.TestClient.csproj"; -# nugetDeps = Utilities/Spacebar.AdminApi.TestClient/deps.json; -# projectReferences = [ -# proj.Spacebar-AdminApi-Models -# ]; -## runtimeId = "browser-wasm"; -## useAppHost = false; -# }; + # Spacebar-AdminApi-TestClient = makeNupkg { + # name = "Spacebar.AdminApi.TestClient"; + # projectFile = "Utilities/Spacebar.AdminApi.TestClient/Spacebar.AdminApi.TestClient.csproj"; + # nugetDeps = Utilities/Spacebar.AdminApi.TestClient/deps.json; + # projectReferences = [ + # proj.Spacebar-AdminApi-Models + # ]; + ## runtimeId = "browser-wasm"; + ## useAppHost = false; + # }; }; - # containers.docker = pkgs.dockerTools.buildLayeredImage { - # name = "spacebar-server-ts"; - # tag = builtins.replaceStrings [ "+" ] [ "_" ] self.packages.${system}.default.version; - # contents = [ self.packages.${system}.default ]; - # config = { - # Cmd = [ "${self.outputs.packages.${system}.default}/bin/start-bundle" ]; - # Expose = [ "3001" ]; - # }; - # }; + containers.admin-api = pkgs.dockerTools.buildLayeredImage { + name = "spacebar-server-ts-admin-api"; + tag = builtins.replaceStrings [ "+" ] [ "_" ] self.packages.${system}.Spacebar-AdminApi.version; + contents = [ self.packages.${system}.Spacebar-AdminApi ]; + config = { + Cmd = [ "${self.outputs.packages.${system}.Spacebar-AdminApi}/bin/Spacebar.AdminApi" ]; + Expose = [ "3001" ]; + }; + }; } ) // { @@ -122,7 +122,7 @@ flake-utils.lib.eachSystem flake-utils.lib.allSystems ( pkgs.lib.recursiveUpdate (pkgs.lib.attrsets.unionOfDisjoint { } self.packages) { x86_64-linux = { # spacebar-server-tests = self.packages.x86_64-linux.default.passthru.tests; - # docker-image = self.containers.x86_64-linux.docker; + docker-image = self.containers.x86_64-linux.admin-api; }; }; -} \ No newline at end of file +} diff --git a/package-lock.json b/package-lock.json index 7c711b20b..ed7b29c4e 100644 Binary files a/package-lock.json and b/package-lock.json differ diff --git a/package.json b/package.json index fc4edb4d8..5482ae76c 100644 --- a/package.json +++ b/package.json @@ -40,14 +40,14 @@ }, "homepage": "https://spacebar.chat", "devDependencies": { - "@eslint/eslintrc": "^3.3.1", + "@eslint/eslintrc": "^3.3.3", "@eslint/js": "^9.14.0", "@spacebarchat/spacebar-webrtc-types": "^1.0.1", "@types/amqplib": "^0.10.8", "@types/bcrypt": "^6.0.0", "@types/body-parser": "^1.19.6", "@types/cookie-parser": "^1.4.10", - "@types/express": "^5.0.5", + "@types/express": "^5.0.6", "@types/i18next-node-fs-backend": "^2.1.5", "@types/json-bigint": "^1.0.4", "@types/jsonwebtoken": "^9.0.10", @@ -55,49 +55,49 @@ "@types/morgan": "^1.9.10", "@types/multer": "^2.0.0", "@types/murmurhash-js": "^1.0.6", - "@types/node": "^24.10.1", + "@types/node": "^24.10.4", "@types/nodemailer": "^7.0.4", "@types/probe-image-size": "^7.2.5", "@types/sharp": "^0.31.1", "@types/ws": "^8.18.1", - "@typescript-eslint/eslint-plugin": "^8.47.0", - "@typescript-eslint/parser": "^8.47.0", - "eslint": "^9.39.1", + "@typescript-eslint/eslint-plugin": "^8.50.0", + "@typescript-eslint/parser": "^8.50.0", + "eslint": "^9.39.2", "globals": "^16.5.0", "husky": "^9.1.7", "patch-package": "^8.0.1", - "prettier": "^3.6.2", + "prettier": "^3.7.4", "pretty-quick": "^4.2.2", "ts-node": "^10.9.2", "typescript": "^5.9.3", "typescript-json-schema": "^0.65.1" }, "dependencies": { - "@aws-sdk/client-s3": "^3.936.0", + "@aws-sdk/client-s3": "^3.953.0", "@toondepauw/node-zstd": "^1.2.0", "ajv": "^8.17.1", "ajv-formats": "^3.0.1", "amqplib": "^0.10.9", "bcrypt": "^6.0.0", - "body-parser": "^2.2.0", + "body-parser": "^2.2.1", "chalk": "^5.6.2", "cheerio": "^1.1.2", "cookie-parser": "^1.4.7", - "discord-protos": "^1.2.82", + "discord-protos": "^1.2.90", "dotenv": "^17.2.3", - "email-providers": "^2.18.0", + "email-providers": "^2.19.0", "exif-be-gone": "^1.5.1", - "express": "^5.1.0", + "express": "^5.2.1", "fast-zlib": "^2.0.1", "fido2-lib": "^3.5.5", "file-type": "^21.1.1", "form-data": "^4.0.5", - "i18next": "^25.6.3", + "i18next": "^25.7.3", "i18next-fs-backend": "^2.6.1", - "i18next-http-middleware": "^3.8.2", + "i18next-http-middleware": "^3.9.0", "image-size": "^2.0.2", "json-bigint": "^1.0.0", - "jsonwebtoken": "^9.0.2", + "jsonwebtoken": "^9.0.3", "module-alias": "^2.2.3", "morgan": "^1.10.1", "ms": "^2.1.3", @@ -111,7 +111,7 @@ "reflect-metadata": "^0.2.2", "sqlite3": "^5.1.7", "tslib": "^2.8.1", - "typeorm": "^0.3.27", + "typeorm": "^0.3.28", "wretch": "^2.11.1", "ws": "^8.18.3" }, @@ -128,8 +128,8 @@ "@sendgrid/mail": "^8.1.6", "@yukikaze-bot/erlpack": "^1.0.1", "jimp": "^1.6.0", - "mailgun.js": "^12.1.1", + "mailgun.js": "^12.4.0", "node-mailjet": "^6.0.11", - "nodemailer": "^7.0.10" + "nodemailer": "^7.0.11" } }