Compare commits
7 Commits
Author | SHA1 | Date | |
---|---|---|---|
dc3106b4a4 | |||
bc0e8c55e3 | |||
124ddc20df | |||
218da3aef8 | |||
e18457bacd | |||
afb85cec88 | |||
4e96ee38ca |
@ -4,6 +4,7 @@ pnpm-lock.yaml
|
|||||||
yarn.lock
|
yarn.lock
|
||||||
|
|
||||||
# Build output
|
# Build output
|
||||||
|
build
|
||||||
.svelte-kit
|
.svelte-kit
|
||||||
node_modules
|
node_modules
|
||||||
|
|
||||||
|
4
client/package-lock.json
generated
4
client/package-lock.json
generated
@ -1,12 +1,12 @@
|
|||||||
{
|
{
|
||||||
"name": "trevstack",
|
"name": "trevstack",
|
||||||
"version": "0.0.9",
|
"version": "0.0.10",
|
||||||
"lockfileVersion": 3,
|
"lockfileVersion": 3,
|
||||||
"requires": true,
|
"requires": true,
|
||||||
"packages": {
|
"packages": {
|
||||||
"": {
|
"": {
|
||||||
"name": "trevstack",
|
"name": "trevstack",
|
||||||
"version": "0.0.9",
|
"version": "0.0.10",
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@connectrpc/connect": "^2.0.2",
|
"@connectrpc/connect": "^2.0.2",
|
||||||
"@connectrpc/connect-web": "^2.0.2",
|
"@connectrpc/connect-web": "^2.0.2",
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"name": "trevstack",
|
"name": "trevstack",
|
||||||
"private": true,
|
"private": true,
|
||||||
"version": "0.0.9",
|
"version": "0.0.10",
|
||||||
"type": "module",
|
"type": "module",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"dev": "vite dev",
|
"dev": "vite dev",
|
||||||
|
27
flake.nix
27
flake.nix
@ -15,7 +15,7 @@
|
|||||||
|
|
||||||
let
|
let
|
||||||
pname = "trevstack";
|
pname = "trevstack";
|
||||||
version = "0.0.9";
|
version = "0.0.10";
|
||||||
|
|
||||||
pkgs = import nixpkgs {
|
pkgs = import nixpkgs {
|
||||||
inherit system;
|
inherit system;
|
||||||
@ -38,7 +38,7 @@
|
|||||||
pname = "${pname}-client";
|
pname = "${pname}-client";
|
||||||
inherit version;
|
inherit version;
|
||||||
src = gitignore.lib.gitignoreSource ./client;
|
src = gitignore.lib.gitignoreSource ./client;
|
||||||
npmDepsHash = "sha256-W5w/73RZpLDKfWMxEy9ikBnYkeKHMWM3eMN8S7B6mvw=";
|
npmDepsHash = "sha256-GQNChIR5kEInghn/W3t8BVnOv5X4pvn/SNCXyFnvLNo=";
|
||||||
nodejs = pkgs.nodejs_22;
|
nodejs = pkgs.nodejs_22;
|
||||||
npmFlags = [ "--legacy-peer-deps" ];
|
npmFlags = [ "--legacy-peer-deps" ];
|
||||||
|
|
||||||
@ -48,6 +48,17 @@
|
|||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
|
||||||
|
server = pkgs.buildGoModule {
|
||||||
|
inherit client pname version;
|
||||||
|
src = gitignore.lib.gitignoreSource ./server;
|
||||||
|
vendorHash = "sha256-sANPwYLGwMcWyMR7Veho81aAMfIQpVzZS5Q9eveR8o8=";
|
||||||
|
env.CGO_ENABLED = 0;
|
||||||
|
|
||||||
|
preBuild = ''
|
||||||
|
cp -r ${client} internal/handlers/client/client
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
devShells.default = pkgs.mkShell {
|
devShells.default = pkgs.mkShell {
|
||||||
@ -221,17 +232,7 @@
|
|||||||
packages = rec {
|
packages = rec {
|
||||||
default = trevstack;
|
default = trevstack;
|
||||||
|
|
||||||
trevstack = pkgs.buildGoModule {
|
trevstack = server;
|
||||||
inherit client pname version;
|
|
||||||
src = gitignore.lib.gitignoreSource ./server;
|
|
||||||
vendorHash = "sha256-sANPwYLGwMcWyMR7Veho81aAMfIQpVzZS5Q9eveR8o8=";
|
|
||||||
env.CGO_ENABLED = 0;
|
|
||||||
|
|
||||||
preBuild = ''
|
|
||||||
cp -r ${client} internal/handlers/client/client
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
|
|
||||||
trevstack-client = client;
|
trevstack-client = client;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user