Compare commits

...

2 commits

Author SHA1 Message Date
8fb1408bb4
use nodejs_22 in nix files 2024-10-24 19:15:40 -07:00
3641ce9277
throw error if modules path is unspecified 2024-10-24 19:14:46 -07:00
3 changed files with 8 additions and 4 deletions

View file

@ -4,7 +4,7 @@
nix-gitignore, nix-gitignore,
yarn-berry, yarn-berry,
nodejs, nodejs_22,
cacert, cacert,
}: stdenv.mkDerivation (final: let }: stdenv.mkDerivation (final: let
nodeModules = stdenv.mkDerivation { nodeModules = stdenv.mkDerivation {
@ -13,7 +13,7 @@
src = final.src; src = final.src;
nativeBuildInputs = [ nodejs yarn-berry cacert ]; nativeBuildInputs = [ nodejs_22 yarn-berry cacert ];
configurePhase = '' configurePhase = ''
mkdir garbage-tooling mkdir garbage-tooling
@ -33,7 +33,7 @@
HOME=$(pwd)/garbage-tooling yarn install || true HOME=$(pwd)/garbage-tooling yarn install || true
mkdir -p node_modules/node/bin mkdir -p node_modules/node/bin
ln -s ${nodejs}/bin/node node_modules/node/bin/node ln -s ${nodejs_22}/bin/node node_modules/node/bin/node
HOME=$(pwd)/garbage-tooling yarn install HOME=$(pwd)/garbage-tooling yarn install
''; '';

View file

@ -8,7 +8,7 @@
set -x set -x
yarn install || true yarn install || true
mkdir -p node_modules/node/bin mkdir -p node_modules/node/bin
ln -sf ${pkgs.nodejs}/bin/node node_modules/node/bin/node ln -sf ${pkgs.nodejs_22}/bin/node node_modules/node/bin/node
yarn install yarn install
'') ]; '') ];

View file

@ -33,6 +33,10 @@ async function readSubdir(subdir: string): Promise<dirData[]> {
export async function generateTypeData(): Promise<RouteData[]> { export async function generateTypeData(): Promise<RouteData[]> {
const mainDir = import.meta.env.SECRET_MODULES_PATH; const mainDir = import.meta.env.SECRET_MODULES_PATH;
if (!mainDir || mainDir == "") {
throw new Error("Cannot generate types, missing SECRET_MODULES_PATH");
}
const subdirs = await fs.readdir(mainDir, { const subdirs = await fs.readdir(mainDir, {
withFileTypes: true, withFileTypes: true,
}); });