build-strap 6.1.0-main.174 → 6.1.0-main.176

package/README.md

@@ -6,51 +6,39 @@ This project builds itself, so take a look in the `targets/` folder for an examp
 [![CI Build](https://github.com/murrayju/build-strap/workflows/CI%20Build/badge.svg?branch=main)](https://github.com/murrayju/build-strap/actions?query=workflow%3A%22CI+Build%22)
 [![version](https://img.shields.io/github/v/tag/murrayju/build-strap.svg?label=version&sort=semver)](https://github.com/murrayju/build-strap/releases/latest)
 [![npm](https://img.shields.io/npm/v/build-strap)](https://npmjs.org/package/build-strap)
-[![dependencies](https://img.shields.io/david/murrayju/build-strap.svg)](https://david-dm.org/murrayju/build-strap)
-[![devDependencies](https://img.shields.io/david/dev/murrayju/build-strap.svg)](https://david-dm.org/murrayju/build-strap?type=dev)
 
 ## Create a "zero dependency" bootstrapped build
-You can set up your project to build with (practically) no pre-requisite dependencies. [nub-strap](https://github.com/murrayju/nub-strap/) downloads a pinned version of [nub](https://nubjs.com) into the project. Nub then provides the pinned versions of node and yarn.
+You can set up your project to build with (practically) no pre-requisite dependencies. [nub-strap](https://github.com/murrayju/nub-strap/) downloads a pinned version of [nub](https://nubjs.com) into the project. Nub then provides the pinned version of node, and is also the package manager.
 - Copy the `nub` script from nub-strap into the root of your project, and pin the nub version in it.
 
 ```
 curl -o nub https://raw.githubusercontent.com/murrayju/nub-strap/main/nub && chmod +x nub
 ```
 
-- Pin the node and yarn versions in your `package.json`.
+- Pin the node version in your `package.json`, and set nub as the package manager (`./nub pm use nub` does this, and converts an existing lockfile to `nub.lock`).
 
 ```
 {
   "devEngines": {
-    "runtime": { "name": "node", "version": "24.18.0" }
-  },
-  "packageManager": "yarn@1.22.22"
+    "runtime": { "name": "node", "version": "24.18.0" },
+    "packageManager": { "name": "nub", "version": "^0.10.0", "onFail": "ignore" }
+  }
 }
 ```
 
-- Add a `yarn` script, which runs the pinned yarn with nub.
-
-```
-#!/bin/bash
-set -euo pipefail
-
-yarnJs=$(./nub pm which)
-exec ./nub --node "$yarnJs" "$@"
-```
-
 - Add a `bs` script, which installs dependencies and runs your build targets.
 
 ```
 #!/bin/bash
 
-./yarn install
+./nub install
 exec ./nub ./targets/run.ts "$@"
 ```
 
 ## Add the dependency reference
 Add `build-strap` to your `package.json` (likely in the `devDependencies` section).
 ```
-yarn add -D build-strap
+./nub add -D build-strap
 ```
 
 ## Add meta information to your `package.json`

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "build-strap",
-  "version": "6.1.0-main.174",
+  "version": "6.1.0-main.176",
   "description": "Node scripts for building things",
   "license": "MIT",
   "author": "Justin Murray <justin@murrayju.com>",
@@ -9,11 +9,12 @@
     "url": "https://github.com/murrayju/build-strap"
   },
   "type": "module",
-  "main": "./src/index.js",
-  "types": "./src/index.d.ts",
   "engines": {
     "node": ">=24"
   },
+  "resolutions": {
+    "minimatch": "^11.0.5"
+  },
   "dependencies": {
     "bytes": "^3.1.1",
     "chokidar": "^6.0.0",
@@ -23,14 +24,9 @@
     "glob": "^14.0.4",
     "is-reachable": "^6.1.0",
     "js-yaml": "^5.5.0",
-    "lodash-es": "^4.17.21",
-    "moment": "^2.31.0",
-    "node-fetch": "^3.3.2",
     "rimraf": "^6.1.4",
-    "stream-counter": "1",
     "tar": "^7.1.0"
   },
-  "resolutions": {
-    "minimatch": "^11.0.5"
-  }
+  "main": "./src/index.js",
+  "types": "./src/index.d.ts"
 }

package/src/cert.js

@@ -1,5 +1,4 @@
 import fs from 'fs-extra';
-import fetch from 'node-fetch';
 import os from 'os';
 import path from 'path';
 import { spawn } from './cp.js';

package/src/docker.date.js

@@ -1,2 +1,12 @@
-import moment from 'moment';
-export const parseDockerDate = (date) => moment(date, 'YYYY-MM-DD HH:mm:ss ZZ').toDate();
+// Docker prints dates in the Go format "2006-01-02 15:04:05.999999999 -0700 MST".
+// We ignore the fractional seconds and the zone name.
+const dockerDatePattern = /^(\d{4}-\d{2}-\d{2}) (\d{2}:\d{2}:\d{2})(?:\.\d+)? ([+-]\d{2})(\d{2})/;
+// Returns an invalid Date (NaN time) when the text does not match.
+export const parseDockerDate = (date) => {
+    const match = dockerDatePattern.exec(date);
+    if (!match) {
+        return new Date(NaN);
+    }
+    const [, day, time, offsetHours, offsetMinutes] = match;
+    return new Date(`${day}T${time}${offsetHours}:${offsetMinutes}`);
+};

package/src/dockerCleanup.js

@@ -1,5 +1,3 @@
-import { uniq } from 'lodash-es';
-import moment from 'moment';
 import { dockerContainerLs } from './docker.container.js';
 import { dockerImages, dockerRmi, getDockerRepo, getDockerTags, getUntaggedDockerIds, } from './docker.js';
 import { buildLog } from './run.js';
@@ -45,22 +43,24 @@ export const dockerImageCleanup = async ({ buildImageIds = [], dryRun = process.
     const filterLatest = (m) => purgeAll || !/^latest(-\w+)?$/.exec(m.tag);
     // only match images more than an hour old, AND without a :latest* tag
     const filterOld = (m) => purgeAll ||
-        (filterLatest(m) && moment().subtract(1, 'h').isAfter(m.created));
-    const uniqueList = uniq([
-        // the things that we know were just built by us
-        // remove all tags from the given repos with a matching `buildImageIds`, except for :latest*
-        ...(await flatten(repos.map((r) => buildImageIds.map(async (b) => getDockerTags(b, r, true, filterLatest))))),
-        // unconditionally delete explicitly passed images/ids
-        ...images,
-        // images in the given `repos` without a tag, older than 1hr
-        ...(await flatten(repos.map(async (r) => getUntaggedDockerIds(r, filterOld)))),
-        // images with no repo and no tag
-        ...(await dockerImages(null, (m) => m.repository === '<none>' && m.tag === '<none>' && filterOld(m))).map((m) => m.id),
-        // any leftover tags from prior builds (only if purgeAll or purgeOld)
-        ...(purgeAll || purgeOld
-            ? await flatten(repos.map(async (r) => getDockerTags(null, r, true, filterOld)))
-            : []),
-    ]);
+        (filterLatest(m) && m.created.getTime() < Date.now() - 60 * 60 * 1000);
+    const uniqueList = [
+        ...new Set([
+            // the things that we know were just built by us
+            // remove all tags from the given repos with a matching `buildImageIds`, except for :latest*
+            ...(await flatten(repos.map((r) => buildImageIds.map(async (b) => getDockerTags(b, r, true, filterLatest))))),
+            // unconditionally delete explicitly passed images/ids
+            ...images,
+            // images in the given `repos` without a tag, older than 1hr
+            ...(await flatten(repos.map(async (r) => getUntaggedDockerIds(r, filterOld)))),
+            // images with no repo and no tag
+            ...(await dockerImages(null, (m) => m.repository === '<none>' && m.tag === '<none>' && filterOld(m))).map((m) => m.id),
+            // any leftover tags from prior builds (only if purgeAll or purgeOld)
+            ...(purgeAll || purgeOld
+                ? await flatten(repos.map(async (r) => getDockerTags(null, r, true, filterOld)))
+                : []),
+        ]),
+    ];
     if (dryRun) {
         buildLog(`Images to delete (dry run):\n  ${uniqueList.join('\n  ')}`);
     }

package/src/fetch.js

@@ -1,6 +1,7 @@
 import fs from 'fs-extra';
-import fetch from 'node-fetch';
 import path from 'path';
+import { Readable } from 'stream';
+import { pipeline } from 'stream/promises';
 export const downloadFile = async (url, saveAs, overwrite = true) => {
     const res = await fetch(url);
     const { body, ok } = res;
@@ -11,10 +12,5 @@ export const downloadFile = async (url, saveAs, overwrite = true) => {
     if (overwrite) {
         await fs.remove(saveAs);
     }
-    const fileStream = fs.createWriteStream(saveAs);
-    await new Promise((resolve, reject) => {
-        body.pipe(fileStream);
-        body.on('error', reject);
-        fileStream.on('finish', resolve);
-    });
+    await pipeline(Readable.fromWeb(body), fs.createWriteStream(saveAs));
 };

package/src/npm.js

@@ -17,7 +17,6 @@ export async function npm({ args = [], npmPath, spawnOptions, } = {}) {
     const localNpm = path.join(path.dirname(process.execPath), platform() === 'win32' ? '' : '../lib', 'node_modules/npm/bin/npm-cli.js');
     const spawnOpts = {
         env: process.env,
-        shell: true,
         stdio: 'inherit',
         ...spawnOptions,
     };

package/src/tgz.js

@@ -1,7 +1,7 @@
 import crypto from 'crypto';
 import fs from 'fs-extra';
 import path from 'path';
-import StreamCounter from 'stream-counter';
+import { Writable } from 'stream';
 import { create } from 'tar';
 import { buildLog } from './run.js';
 const generateHash = async (stream, type) => new Promise((resolve, reject) => {
@@ -19,14 +19,17 @@ const generateHash = async (stream, type) => new Promise((resolve, reject) => {
 });
 export const generateFileHash = async (filePath, type) => generateHash(fs.createReadStream(filePath), type);
 const countBytes = async (stream) => new Promise((resolve, reject) => {
-    const counter = new StreamCounter();
+    let byteCount = 0;
+    const counter = new Writable({
+        write(chunk, _encoding, callback) {
+            byteCount += chunk.length;
+            callback();
+        },
+    });
     stream
         .pipe(counter)
         .on('finish', () => {
-        resolve(counter.bytes);
-    })
-        .on('end', () => {
-        resolve(counter.bytes);
+        resolve(byteCount);
     })
         .on('error', (err) => {
         reject(err);

package/src/yarn.js

@@ -11,7 +11,6 @@ export async function yarn({ args = [], spawnOptions, } = {}) {
     const localYarn = path.join(path.dirname(process.execPath), '/node_modules/yarn/bin/yarn.js');
     const spawnOpts = {
         env: process.env,
-        shell: true,
         stdio: 'inherit',
         ...spawnOptions,
     };
@@ -131,7 +130,6 @@ export async function yarnPublish({ npmAuthToken, npmConfig, npmCreds, npmPath,
                 FORCE_COLOR: 'true',
                 NPM_TOKEN: authToken,
             },
-            shell: true,
             stdio: 'inherit',
         },
     });