!NhAsaYbbgmzHtXTPQJ:funklause.de

Nix NodeJS

200 Members
57 Servers

You have reached the beginning of time (for this room).


SenderMessageTime
10 Dec 2023
@lily:lily.flowersLily Foster
In reply to @lily:lily.flowers

so this doesn't remove the openapi.json file, but this diff seems to build and run similarly in testing:

diff --git a/flake.nix b/flake.nix
index 71760eff..1391bca1 100644
--- a/flake.nix
+++ b/flake.nix
@@ -15,46 +15,10 @@
 			pname = "spacebar-server-ts";
 			src = ./.;
 			name = "spacebar-server-ts";
-			nativeBuildInputs = with pkgs; [ python3 ];
 			npmDepsHash = "sha256-axzbsD+jOViIQ9+qFSX41j6harBL9vyaXDKdOSaPW8M=";
-			makeCacheWritable = true;
 			postPatch = ''
 				substituteInPlace package.json --replace 'npx patch-package' '${pkgs.nodePackages.patch-package}/bin/patch-package'
 			'';
-			installPhase = ''
-				runHook preInstall
-				set -x
-				#remove packages not needed for production, or at least try to...
-				npm prune --omit dev --no-save $npmInstallFlags "''${npmInstallFlagsArray[@]}" $npmFlags "''${npmFlagsArray[@]}"
-			  find node_modules -maxdepth 1 -type d -empty -delete
-
-				mkdir -p $out/node_modules/
-				cp -r node_modules/* $out/node_modules/
-				cp -r dist/ $out/node_modules/@spacebar
-				for i in dist/**/start.js
-				do
-					makeWrapper ${pkgs.nodejs-slim}/bin/node $out/bin/start-`dirname ''${i/dist\//}` --prefix NODE_PATH : $out/node_modules --add-flags $out/node_modules/@spacebar`dirname ''${i/dist/}`/start.js
-				done
-				set +x
-				substituteInPlace package.json --replace 'dist/' 'node_modules/@spacebar/'
-				find $out/node_modules/@spacebar/ -type f -name "*.js" | while read srcFile; do
-					echo Patching imports in ''${srcFile/$out\/node_modules\/@spacebar//}...
-					substituteInPlace $srcFile --replace 'require("./' 'require(__dirname + "/'
-					substituteInPlace $srcFile --replace 'require("../' 'require(__dirname + "/../'
-					substituteInPlace $srcFile --replace ', "assets"' ', "..", "assets"'
-					#substituteInPlace $srcFile --replace 'require("@spacebar/' 'require("
-				done
-				set -x
-				cp -r assets/ $out/
-				cp package.json $out/
-				rm -v $out/assets/openapi.json
-				#rm -v $out/assets/schemas.json
-
-				#debug utils:
-				#cp $out/node_modules/@spacebar/ $out/build_output -r
-				set +x
-				runHook postInstall
-			'';
 		};
 		devShell = pkgs.mkShell {
 			buildInputs = with pkgs; [
diff --git a/package.json b/package.json
index 83ec9dcc..e0dcf4c9 100644
--- a/package.json
+++ b/package.json
@@ -37,6 +37,16 @@
 	"imports": {
 		"#*": "./dist/*/index.js"
 	},
+	"files": [
+		"dist",
+		"assets"
+	],
+	"bin": {
+		"start-bundle": "dist/bundle/start.js",
+		"start-api": "dist/api/start.js",
+		"start-cdn": "dist/cdn/start.js",
+		"start-gateway": "dist/gateway/start.js"
+	},
 	"homepage": "https://spacebar.chat",
 	"devDependencies": {
 		"@types/amqplib": "^0.8.2",
you might also want to add a substituteInPlace src/bundle/start.ts --replace 'execSync("git rev-parse HEAD").toString().trim()' '"${self.rev or "dirty"}"' to postPatch as well, so that way the pre-release commit hash shows up correctly and doesn't depend on running it from a git repo
21:32:17
@emma:conduit.rory.gayEmma [it/its] ⚡️didnt we just get rid of postPatch?21:32:43
@lily:lily.flowersLily Foster
In reply to @emma:conduit.rory.gay
didnt we just get rid of postPatch?
no, i left it there in my diff
21:34:24
@emma:conduit.rory.gayEmma [it/its] ⚡️oh, the diff claimed it was removedd as far as i saw21:34:44
@lily:lily.flowersLily Foster i mostly just got rid of installPhase and used npm to handle the logic 21:34:44
@emma:conduit.rory.gayEmma [it/its] ⚡️oh wait nvm i confused it for installPhase21:34:56
@lily:lily.flowersLily Fosterah, yeah. it happens :)21:35:08

Show newer messages


Back to Room ListRoom Version: 6