Skip to content

Commit 7984fbe

Browse files
gideonairexCMCDragonkai
authored andcommitted
feature: add tailwind, update build script, update logo.png path
1 parent 09f862d commit 7984fbe

File tree

14 files changed

+1703
-239
lines changed

14 files changed

+1703
-239
lines changed

.vscode/settings.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"compile-hero.disable-compile-files-on-did-save-code": false
3+
}

nix/default.nix

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ let
6464
in
6565

6666
stdenv.mkDerivation rec {
67-
pname = "polykey-gui";
67+
pname = "polykey";
6868
version = "0.0.1";
6969
name = "${pname}-${version}";
7070

@@ -92,7 +92,7 @@ stdenv.mkDerivation rec {
9292
ln -s -t "." "$dev_node_modules"
9393
export PATH="$dev_node_modules/.bin:$PATH"
9494
95-
webpack-cli
95+
npm run compile
9696
'';
9797

9898
# doCheck = true;
@@ -136,7 +136,7 @@ stdenv.mkDerivation rec {
136136
mv "$PWD/node_modules" "$out/lib/"
137137
declare target="$(readlink -f "$out/lib/node_modules")"
138138
ln -s -T "$target/js-polykey/bin/polykey" "$out/bin/pk"
139-
ln -s -T "$target/js-polykey/bin/polykey" "$out/bin/polykey"
139+
# ln -s -T "$target/js-polykey/bin/polykey" "$out/bin/polykey"
140140
rm -r "$out/lib/node_modules"
141141
142142
ln -s -t "$out/bin" "$out_elec_exe"

nix/generated/node-packages.nix

Lines changed: 42 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -12163,6 +12163,15 @@ let
1216312163
sha512 = "jR2b5v7d2vIOust+w3wtFKZIfpC2pnRmFAhAC/BuweZFQR8qZzxH1OyrQ10HmdVYiXWkYUqPVsz91cG7EL2FBg==";
1216412164
};
1216512165
};
12166+
"jsonfile-6.1.0" = {
12167+
name = "jsonfile";
12168+
packageName = "jsonfile";
12169+
version = "6.1.0";
12170+
src = fetchurl {
12171+
url = "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz";
12172+
sha512 = "5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==";
12173+
};
12174+
};
1216612175
"jsonparse-1.3.1" = {
1216712176
name = "jsonparse";
1216812177
packageName = "jsonparse";
@@ -19021,6 +19030,15 @@ let
1902119030
sha512 = "rb6X1W158d7pRQBg5gkR8uPaSfiids68LTJQYOtEUhoJUWBdaQHsuT/EUduxXYxcrt4r5PJ4fuHW1MHT6p0qug==";
1902219031
};
1902319032
};
19033+
"universalify-2.0.0" = {
19034+
name = "universalify";
19035+
packageName = "universalify";
19036+
version = "2.0.0";
19037+
src = fetchurl {
19038+
url = "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz";
19039+
sha512 = "hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==";
19040+
};
19041+
};
1902419042
"unpipe-1.0.0" = {
1902519043
name = "unpipe";
1902619044
packageName = "unpipe";
@@ -21354,6 +21372,11 @@ let
2135421372
sources."chalk-2.4.2"
2135521373
sources."color-convert-1.9.3"
2135621374
sources."color-name-1.1.3"
21375+
(sources."cosmiconfig-6.0.0" // {
21376+
dependencies = [
21377+
sources."path-type-4.0.0"
21378+
];
21379+
})
2135721380
sources."dir-glob-2.2.2"
2135821381
sources."eslint-scope-4.0.3"
2135921382
sources."fast-glob-2.2.7"
@@ -21362,6 +21385,19 @@ let
2136221385
sources."extend-shallow-2.0.1"
2136321386
];
2136421387
})
21388+
(sources."fork-ts-checker-webpack-plugin-v5-npm:[email protected]" // {
21389+
dependencies = [
21390+
sources."ansi-styles-4.3.0"
21391+
sources."chalk-4.1.0"
21392+
sources."color-convert-2.0.1"
21393+
sources."color-name-1.1.4"
21394+
sources."has-flag-4.0.0"
21395+
sources."schema-utils-2.7.0"
21396+
sources."semver-7.3.2"
21397+
sources."supports-color-7.2.0"
21398+
];
21399+
})
21400+
sources."fs-extra-9.0.1"
2136521401
sources."glob-7.1.6"
2136621402
(sources."glob-parent-3.1.0" // {
2136721403
dependencies = [
@@ -21375,6 +21411,11 @@ let
2137521411
sources."kind-of-3.2.2"
2137621412
];
2137721413
})
21414+
(sources."jsonfile-6.1.0" // {
21415+
dependencies = [
21416+
sources."universalify-2.0.0"
21417+
];
21418+
})
2137821419
sources."micromatch-3.1.10"
2137921420
(sources."path-type-3.0.0" // {
2138021421
dependencies = [
@@ -21394,6 +21435,7 @@ let
2139421435
sources."to-regex-range-5.0.1"
2139521436
];
2139621437
})
21438+
sources."universalify-1.0.0"
2139721439
sources."webpack-4.44.2"
2139821440
];
2139921441
})
@@ -22836,16 +22878,6 @@ let
2283622878
sources."to-regex-range-2.1.1"
2283722879
];
2283822880
})
22839-
(sources."fork-ts-checker-webpack-plugin-v5-npm:[email protected]" // {
22840-
dependencies = [
22841-
sources."cosmiconfig-6.0.0"
22842-
sources."fs-extra-9.0.1"
22843-
sources."jsonfile-6.0.1"
22844-
sources."schema-utils-2.7.0"
22845-
sources."semver-7.3.2"
22846-
sources."universalify-1.0.0"
22847-
];
22848-
})
2284922881
sources."form-data-2.3.3"
2285022882
sources."forwarded-0.1.2"
2285122883
sources."fragment-cache-0.2.1"

nix/local.nix

Lines changed: 0 additions & 15 deletions
This file was deleted.

0 commit comments

Comments
 (0)