diff --git a/.npmignore b/.npmignore index b8fbd72f082c958375bf6337724c01cda6cb916a..dcd99dbd5cb1878ab51e6995a2d8a3dfb141eec2 100644 --- a/.npmignore +++ b/.npmignore @@ -4,4 +4,9 @@ temp coverage .c8rc.json package-lock.json -pnpm-lock.yaml \ No newline at end of file +pnpm-lock.yaml +npm-debug.log +.npmrc +.npm +.credential +.credentials \ No newline at end of file diff --git a/nix/scripts/build.nix b/nix/scripts/build.nix index cc7d134f4d23eb788d6044cb18d83a201cc36d6d..d0178ac1c8373ef6881cd13b3505ab0b8221f9b6 100644 --- a/nix/scripts/build.nix +++ b/nix/scripts/build.nix @@ -27,9 +27,12 @@ }; in pkgs'.writeShellScriptBin "build" '' + + set -e + source ${pkgs'.common}/bin/common ${bashFktScript} -set -x + export PATH=${lib.makeBinPath [pkgs'.gzip pkgs'.gnutar]} export HOME=$NIX_BUILD_TOP # Some packages need a writable HOME @@ -63,19 +66,25 @@ set -x echo_fail "Failed to copy CHANGELOG.md. Exiting." exit 1 fi + + if ! ${pkgs'.coreutils}/bin/cp ${root}/.npmignore "./" + then + echo_fail "Failed to copy .gitignore Exiting." + exit 1 + fi if ! echo '${builtins.toJSON releasedPackageJson}' > package.json then echo_fail "Failed to write package.json. Exiting." exit 1 fi - + ${pkgs'.coreutils}/bin/mkdir -p $out - if ! ${pkgs'.gnutar}/bin/tar -czvf $out/monster-${version}.tgz * - then + + if ! ${pkgs'.nodejs_20}/bin/npm pack --pack-destination $out/ ; then echo_fail "Failed to create tarball. Exiting." exit 1 - fi - + fi + echo_ok "Tarball created successfully." '' diff --git a/nix/scripts/deploy.nix b/nix/scripts/deploy.nix index 6c48bcb5946efaaf1046eb71e6f8311271a8b08b..11ca6bc333e13cddd8357ef89f940bb557d5f2bd 100644 --- a/nix/scripts/deploy.nix +++ b/nix/scripts/deploy.nix @@ -15,13 +15,8 @@ in archive=$(ls ${monster} | grep tgz) echo "//registry.npmjs.org/:_authToken=$NPM_TOKEN" > .npmrc - set -x ${pkgs'.nodejs_20}/bin/npm publish "${monster}/$archive" - cat /root/.npm/_logs/* - - ${pkgs'.eza}/bin/eza -T /root/.npm/_cacache/ - if ! publishingResult=$(${pkgs'.nodejs_20}/bin/npm publish "${monster}/$archive" --no-git-checks --access public) then if [ -f .npmrc ] ; then rm .npmrc ; fi