build-strap 5.1.0-dev.118 → 5.2.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "build-strap",
-  "version": "5.1.0-dev.118",
+  "version": "5.2.0",
   "description": "Node scripts for building things",
   "license": "MIT",
   "authors": [

package/src/cp.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 import cp from 'child_process';
 export interface SpawnOptions extends cp.SpawnOptions {
     captureOutput?: boolean;

package/src/docker.js

@@ -73,7 +73,7 @@ export async function dockerImages(repo = getDockerRepo(), filter = null) {
             digest,
             id,
             repository,
-            size: bytes.parse(Size),
+            size: bytes.parse(Size) || 0,
             tag,
         };
     })

package/src/index.d.ts

@@ -19,6 +19,7 @@ export * from './git.js';
 export * from './macos.js';
 export * from './maps.js';
 export * from './npm.js';
+export * from './orbstack.js';
 export * from './pkg.js';
 export * from './promise.js';
 export * from './prompt.js';

package/src/index.js

@@ -19,6 +19,7 @@ export * from './git.js';
 export * from './macos.js';
 export * from './maps.js';
 export * from './npm.js';
+export * from './orbstack.js';
 export * from './pkg.js';
 export * from './promise.js';
 export * from './prompt.js';

package/src/npm.d.ts

@@ -32,12 +32,13 @@ export interface NpmPublishOptions {
     npmConfig?: NpmConfig;
     npmCreds?: NpmCreds;
     npmPath?: string;
+    provenance?: boolean;
     publishPath?: string;
     skipExisting?: boolean;
     tag?: string;
     workDir?: string;
 }
-export declare function npmPublish({ npmAuthToken, npmConfig, npmCreds, npmPath, publishPath, skipExisting, tag, workDir: passedWorkDir, }?: NpmPublishOptions): Promise<boolean>;
+export declare function npmPublish({ npmAuthToken, npmConfig, npmCreds, npmPath, provenance, publishPath, skipExisting, tag, workDir: passedWorkDir, }?: NpmPublishOptions): Promise<boolean>;
 interface NpmPackOptions {
     destination?: string;
     npmConfig?: NpmConfig;

package/src/npm.js

@@ -48,6 +48,7 @@ export async function npmWriteRc({ authToken, creds, outPath, registry, }) {
     // Write out .npmrc with credentials
     const theRegistry = registry || 'https://registry.npmjs.org/';
     const [, host] = /^(?:http(?:s)?:\/\/)?(.+)$/.exec(theRegistry) || [];
+    buildLog(`Writing npmrc with registry ${theRegistry}`);
     await fs.mkdirp(path.dirname(outPath));
     await fs.writeFile(outPath, `registry=${theRegistry}
 ${authToken ? `//${host}:_authToken=${authToken}` : ''}
@@ -57,7 +58,7 @@ always-auth=true
 email=${creds.email}`
         : ''}`);
 }
-export async function npmPublish({ npmAuthToken, npmConfig, npmCreds, npmPath, publishPath = '.', skipExisting = false, tag, workDir: passedWorkDir, } = {}) {
+export async function npmPublish({ npmAuthToken, npmConfig, npmCreds, npmPath, provenance = false, publishPath = '.', skipExisting = false, tag, workDir: passedWorkDir, } = {}) {
     const creds = npmCreds || envNpmCreds;
     const authToken = npmAuthToken || process.env.NPM_TOKEN;
     const name = getPkgName(true);
@@ -93,6 +94,9 @@ export async function npmPublish({ npmAuthToken, npmConfig, npmCreds, npmPath, p
         }
         throw new Error('Failed to publish npm package, this version already exists!');
     }
+    if (authToken) {
+        buildLog(`Using NPM_TOKEN for authentication`);
+    }
     await npm({
         args: [
             'publish',
@@ -106,6 +110,7 @@ export async function npmPublish({ npmAuthToken, npmConfig, npmCreds, npmPath, p
                         : 'branch'),
             ...(access ? ['--access', access] : []),
             ...(dryRun ? ['--dry-run'] : []),
+            ...(provenance ? ['--provenance'] : []),
             '--color=always',
         ],
         npmPath,
@@ -113,7 +118,12 @@ export async function npmPublish({ npmAuthToken, npmConfig, npmCreds, npmPath, p
             cwd: workDir,
             env: {
                 ...process.env,
-                NPM_TOKEN: authToken,
+                npm_config_registry: registry || 'https://registry.npmjs.org/',
+                ...(authToken
+                    ? {
+                        NPM_TOKEN: authToken,
+                    }
+                    : {}),
             },
         },
     });

package/src/orbstack.d.ts

@@ -0,0 +1,4 @@
+import { SpawnOptions, SpawnResult } from './cp';
+export declare const ensureOrbStackInstalled: (options?: SpawnOptions) => Promise<SpawnResult | null>;
+export declare const ensureOrbStackRunning: (timeoutSeconds?: number) => Promise<void>;
+export declare const ensureOrbStackConfigured: (desiredConfig?: null | Record<string, unknown>) => Promise<void>;

package/src/orbstack.js

@@ -0,0 +1,90 @@
+import fs from 'fs-extra';
+import os from 'os';
+import path from 'path';
+import { brew } from './brew';
+import { spawn } from './cp';
+import { dockerIsRunning } from './docker';
+import { cmdExists, isMac } from './env';
+import { buildLog } from './run';
+export const ensureOrbStackInstalled = async (options) => {
+    if (!isMac()) {
+        throw new Error('OrbStack is only supported on macOS');
+    }
+    if (!(await cmdExists('orb'))) {
+        return brew(['install', 'orbstack'], options);
+    }
+    return null;
+};
+export const ensureOrbStackRunning = async (timeoutSeconds = 600) => {
+    if (!(await dockerIsRunning())) {
+        if (!isMac()) {
+            throw new Error('OrbStack is only supported on macOS');
+        }
+        buildLog('docker is not running, starting OrbStack...');
+        await spawn('open', ['-a', '/Applications/OrbStack.app']);
+        let attempts = 0;
+        while (!(await dockerIsRunning())) {
+            attempts += 1;
+            if (attempts % 5 === 0) {
+                process.stdout.write('.');
+            }
+            if (attempts > timeoutSeconds) {
+                throw new Error('Timeout starting OrbStack');
+            }
+            await new Promise((resolve) => {
+                setTimeout(resolve, 1000);
+            });
+        }
+        if (attempts >= 5) {
+            process.stdout.write('\n');
+        }
+    }
+};
+const defaultConfig = {
+    memory_mib: 16384,
+};
+export const ensureOrbStackConfigured = async (desiredConfig) => {
+    if (!desiredConfig) {
+        buildLog('Skipping OrbStack configuration due to empty config value');
+        return;
+    }
+    if (!isMac()) {
+        throw new Error('OrbStack is only supported on macOS');
+    }
+    const configPath = path.join(os.homedir(), '.orbstack/vmconfig.json');
+    await fs.ensureDir(path.dirname(configPath));
+    let changed = false;
+    if (!(await fs.pathExists(configPath))) {
+        buildLog('Setting OrbStack config...');
+        await fs.writeJson(configPath, desiredConfig, { spaces: 2 });
+        changed = true;
+    }
+    else {
+        const existingConfig = await fs.readJson(configPath);
+        const effectiveConfig = {
+            ...defaultConfig,
+            ...existingConfig,
+        };
+        if (!Object.entries(desiredConfig).every(([key, value]) => effectiveConfig[key] === value)) {
+            buildLog('Adjusting OrbStack config...');
+            const newConfig = {
+                ...existingConfig,
+                ...desiredConfig,
+            };
+            for (const [key, value] of Object.entries(defaultConfig)) {
+                if (newConfig[key] === value) {
+                    // Don't write default values
+                    delete newConfig[key];
+                }
+            }
+            await fs.writeJson(configPath, newConfig, { spaces: 2 });
+            changed = true;
+        }
+    }
+    if (changed && (await dockerIsRunning())) {
+        // Restart the app
+        buildLog('Killing OrbStack...');
+        await spawn('osascript', ['-e', `quit app "OrbStack"`]);
+        await ensureOrbStackRunning();
+    }
+};

package/src/tgz.d.ts

@@ -1,6 +1,5 @@
-/// <reference types="node" />
 import { Readable } from 'stream';
-import { TarOptionsWithAliases } from 'tar/dist/commonjs/options.js';
+import { TarOptionsWithAliasesNoFile } from 'tar/dist/commonjs/options.js';
 export type ArtifactInfo = {
     contentType?: string;
     md5: string;
@@ -8,6 +7,6 @@ export type ArtifactInfo = {
     sha512: string;
     size: number;
 };
-export declare const generateFileHash: (filePath: string, type: 'md5' | 'sha1' | 'sha512') => Promise<string>;
+export declare const generateFileHash: (filePath: string, type: "md5" | "sha1" | "sha512") => Promise<string>;
 export declare function getArtifactInfo(artifact: string | Pick<Readable, 'pipe'>): Promise<ArtifactInfo>;
-export declare function tgzDir(srcDir: string, outPath: string, options?: TarOptionsWithAliases): Promise<ArtifactInfo>;
+export declare function tgzDir(srcDir: string, outPath: string, options?: TarOptionsWithAliasesNoFile): Promise<ArtifactInfo>;