build-strap 5.0.3 → 5.0.4-dev.106

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "build-strap",
-  "version": "5.0.3",
+  "version": "5.0.4-dev.106",
   "description": "Node scripts for building things",
   "license": "MIT",
   "authors": [
@@ -20,7 +20,7 @@
     "bytes": "^3.1.1",
     "chokidar": "^3.5.2",
     "cross-spawn": "^7.0.3",
-    "fs-extra": "^10.0.0",
+    "fs-extra": "^11.1.0",
     "get-port": "^6.0.0",
     "glob": "^8.0.1",
     "is-reachable": "^5.1.1",

package/src/aws.d.ts

@@ -1,5 +1,5 @@
 import { SpawnOptions } from './cp.js';
-export declare const aws: (args: string[], options?: SpawnOptions | undefined) => Promise<import("./cp.js").SpawnResult>;
-export declare const ensureAwsCredentialsSet: (message?: string | undefined) => Promise<void>;
-export declare const chamber: (args: string[], options?: SpawnOptions | undefined) => Promise<import("./cp.js").SpawnResult>;
+export declare const aws: (args: string[], options?: SpawnOptions) => Promise<import("./cp.js").SpawnResult>;
+export declare const ensureAwsCredentialsSet: (message?: string) => Promise<void>;
+export declare const chamber: (args: string[], options?: SpawnOptions) => Promise<import("./cp.js").SpawnResult>;
 export declare const chamberRead: (target: string, varName: string) => Promise<string>;

package/src/brew.d.ts

@@ -1,6 +1,6 @@
 import { SpawnOptions } from './cp.js';
 export declare const ensureBrewInstalled: () => Promise<void>;
-export declare const brew: (args: string[], options?: SpawnOptions | undefined) => Promise<import("./cp.js").SpawnResult>;
+export declare const brew: (args: string[], options?: SpawnOptions) => Promise<import("./cp.js").SpawnResult>;
 export declare const brewBundleCheck: (brewFile: string) => Promise<boolean>;
 export declare const brewBundleInstall: (brewFile: string) => Promise<void>;
 export declare const ensureBrewfileInstalled: (brewFile: string) => Promise<void>;

package/src/docker.d.ts

@@ -27,7 +27,7 @@ export interface DockerImage {
     size: number;
     tag: string;
 }
-export declare type DockerImageFilter = (i: DockerImage) => boolean;
+export type DockerImageFilter = (i: DockerImage) => boolean;
 export declare function dockerImages(repo?: null | string, filter?: null | DockerImageFilter): Promise<DockerImage[]>;
 export declare function getDockerId(tag?: string, repo?: null | string): Promise<string>;
 export declare function getUntaggedDockerIds(repo?: string, filter?: null | DockerImageFilter): Promise<string[]>;
@@ -68,5 +68,5 @@ export declare function copyFilesFromDockerImage({ filePaths, ignoreErrors, imag
 export declare const dockerIsRunning: () => Promise<boolean>;
 export declare const ensureDockerRunning: (timeoutSeconds?: number) => Promise<void>;
 export declare const ensureDockerInstalled: () => Promise<void>;
-export declare const ensureDockerForMacConfigured: (desiredConfig?: Record<string, unknown> | null | undefined) => Promise<void>;
+export declare const ensureDockerForMacConfigured: (desiredConfig?: null | Record<string, unknown>) => Promise<void>;
 export {};

package/src/docker.volume.d.ts

@@ -1,4 +1,4 @@
-declare type DockerVolumeInspectOutput = Record<string, unknown>;
+type DockerVolumeInspectOutput = Record<string, unknown>;
 export interface DockerVolume {
     driver: string;
     inspect: () => Promise<null | DockerVolumeInspectOutput>;

package/src/dockerCompose.d.ts

@@ -1,7 +1,7 @@
 import { DockerContainer } from './docker.container.js';
 import { DockerNetwork, DockerNetworkCreateOptions } from './docker.network.js';
 import { DockerVolume, DockerVolumeCreateOptions } from './docker.volume.js';
-export declare type DockerComposeResourceTracker = {
+export type DockerComposeResourceTracker = {
     cleaning: null | Promise<void>;
     containers: Map<string, DockerContainer>;
     networks: Map<string, DockerNetwork>;
@@ -9,12 +9,12 @@ export declare type DockerComposeResourceTracker = {
     volumes: Map<string, DockerVolume>;
 };
 export declare const dockerComposeCreateResourceTracker: () => DockerComposeResourceTracker;
-declare type DockerComposeEnvDef = string[] | Record<string, string>;
-declare type DockerComposeULimitDef = number | {
+type DockerComposeEnvDef = string[] | Record<string, string>;
+type DockerComposeULimitDef = number | {
     hard: number;
     soft: number;
 };
-declare type DockerComposeULimitsDef = Record<string, DockerComposeULimitDef>;
+type DockerComposeULimitsDef = Record<string, DockerComposeULimitDef>;
 interface DockerComposeServiceDef {
     command?: string[];
     container_name?: string;
@@ -69,9 +69,9 @@ interface ParsedNetworkInfo {
     networks: string[];
     runArgs: string[];
 }
-export declare const dockerComposeCreateNetworks: (names?: string[] | null | undefined, dockerCompose?: string | DockerCompose | null | undefined, tracker?: DockerComposeResourceTracker) => Promise<void>;
-export declare const dockerComposeCreateVolumes: (names?: string[] | undefined, dockerCompose?: string | DockerCompose | null | undefined, tracker?: DockerComposeResourceTracker) => Promise<void>;
-declare type HealthCheckFn = (result: UpResult) => Promise<void>;
+export declare const dockerComposeCreateNetworks: (names?: null | string[], dockerCompose?: null | (string | DockerCompose), tracker?: DockerComposeResourceTracker) => Promise<void>;
+export declare const dockerComposeCreateVolumes: (names?: string[], dockerCompose?: null | (string | DockerCompose), tracker?: DockerComposeResourceTracker) => Promise<void>;
+type HealthCheckFn = (result: UpResult) => Promise<void>;
 interface UpOptions {
     avoidConflicts?: boolean;
     cmd?: string[];

package/src/env.d.ts

@@ -21,7 +21,7 @@ export interface AppendToEnvOptions {
 }
 export declare const appendToEnv: (content: string | StringGenFn, { envFile, testContent }?: AppendToEnvOptions) => Promise<void>;
 export declare const appendEnvVar: (name: string, value: string, { envFile }?: ReadShellEnvVarOptions) => Promise<void>;
-export declare const ensureEnvVarValue: (name: string, value: string, opts?: ReadShellEnvVarOptions | undefined) => Promise<void>;
-export declare const ensureEnvVarSet: (name: string, getValue: () => Promise<string>, opts?: ReadShellEnvVarOptions | undefined) => Promise<void>;
+export declare const ensureEnvVarValue: (name: string, value: string, opts?: ReadShellEnvVarOptions) => Promise<void>;
+export declare const ensureEnvVarSet: (name: string, getValue: () => Promise<string>, opts?: ReadShellEnvVarOptions) => Promise<void>;
 export declare const ensureProcessPathEnvIncludes: (binPath: string) => void;
 export {};

package/src/fs.d.ts

@@ -1,10 +1,10 @@
 import glob from 'glob';
-export declare const readDir: (pattern: string, options?: glob.IOptions | undefined) => Promise<string[]>;
+export declare const readDir: (pattern: string, options?: glob.IOptions) => Promise<string[]>;
 export declare const moveDir: (source: string, target: string) => Promise<void>;
 export declare const copyDir: (source: string, target: string, fileGlob?: string, globOptions?: null | glob.IOptions, renameFn?: (name: string) => string) => Promise<void>;
-export declare const cleanDir: (pattern: string, globOptions?: false | glob.IOptions | undefined) => Promise<void>;
+export declare const cleanDir: (pattern: string, globOptions?: glob.IOptions | false) => Promise<void>;
 export declare const producedPathExists: (producer: () => Promise<string>) => Promise<boolean>;
 export declare const copyIfMissing: (src: string, dest: string) => Promise<void>;
-export declare type StringGenFn = () => string | Promise<string>;
+export type StringGenFn = () => string | Promise<string>;
 export declare const writeIfMissing: (dest: string, content: string | StringGenFn) => Promise<boolean>;
-export declare const appendIfMissing: (dest: string, content: string | StringGenFn, testContent?: string | StringGenFn | undefined) => Promise<void>;
+export declare const appendIfMissing: (dest: string, content: string | StringGenFn, testContent?: string | StringGenFn) => Promise<void>;

package/src/gh.d.ts

@@ -1,5 +1,5 @@
 import { SpawnOptions } from './cp.js';
-export declare const gh: (args: string[], options?: SpawnOptions | undefined) => Promise<import("./cp.js").SpawnResult>;
+export declare const gh: (args: string[], options?: SpawnOptions) => Promise<import("./cp.js").SpawnResult>;
 export declare const ghRepoClone: (repo: string, repoDir: string) => Promise<void>;
 export declare const ensureGhRepo: (repo: string, { rootDir, targetDir, targetName, }?: {
     rootDir?: string | undefined;

package/src/git.d.ts

@@ -1,9 +1,9 @@
 import { SpawnOptions } from './cp.js';
-export declare const git: (args: string[], opts?: SpawnOptions | undefined) => Promise<import("./cp.js").SpawnResult>;
-export declare const gitOutput: (args: string[], opts?: SpawnOptions | undefined) => Promise<string>;
+export declare const git: (args: string[], opts?: SpawnOptions) => Promise<import("./cp.js").SpawnResult>;
+export declare const gitOutput: (args: string[], opts?: SpawnOptions) => Promise<string>;
 export declare function gitBranch(): Promise<string>;
 export declare function gitRevId(): Promise<string>;
-declare type GitInfo = {
+type GitInfo = {
     branch: string;
     revision: string;
 };

package/src/macos.d.ts

@@ -1,3 +1,4 @@
 export declare const mountDmg: (dmgPath: string, mountPath: string) => Promise<void>;
 export declare const unmountDmg: (mountPath: string) => Promise<void>;
 export declare const ensureXcodeCmdInstalled: (ignoreNonMac?: boolean) => Promise<void>;
+export declare const ensureRosettaInstalled: (ignoreNonMac?: boolean) => Promise<void>;

package/src/macos.js

@@ -34,3 +34,15 @@ export const ensureXcodeCmdInstalled = async (ignoreNonMac = true) => {
         });
     }
 };
+export const ensureRosettaInstalled = async (ignoreNonMac = true) => {
+    if (!isMac()) {
+        if (!ignoreNonMac) {
+            throw new Error('Cannot install Rosetta on non-macOS');
+        }
+        return;
+    }
+    if (!(await fs.pathExists('/usr/libexec/rosetta'))) {
+        buildLog('Installing Rosetta...');
+        await spawn('softwareupdate', ['--install-rosetta', '--agree-to-license']);
+    }
+};

package/src/npm.d.ts

@@ -1,10 +1,10 @@
 import { SpawnOptions, SpawnResult } from './cp.js';
-export declare type NpmCreds = {
+export type NpmCreds = {
     email?: string;
     password?: string;
     username?: string;
 };
-export declare type NpmConfig = {
+export type NpmConfig = {
     access?: 'public' | 'restricted';
     dryRun?: boolean;
     name?: string;

package/src/run.d.ts

@@ -1,6 +1,6 @@
 export declare function format(time?: Date): string;
 export declare function buildLog(msg: string, time?: Date): void;
-export declare type RunnableModule<Args extends string[], Result> = ((...args: Args) => Promise<Result>) | {
+export type RunnableModule<Args extends string[], Result> = ((...args: Args) => Promise<Result>) | {
     default: (...args: Args) => Promise<Result>;
 };
 export declare function run<Args extends string[], Result>(fn: RunnableModule<Args, Result>, ...options: Args): Promise<Result>;

package/src/ssh.d.ts

@@ -1 +1 @@
-export declare const ensureSshKeyGenerated: (keyPath?: string | undefined) => Promise<string>;
+export declare const ensureSshKeyGenerated: (keyPath?: string) => Promise<string>;

package/src/tgz.d.ts

@@ -1,7 +1,7 @@
 /// <reference types="node" />
 import { Readable } from 'stream';
 import tar from 'tar';
-export declare type ArtifactInfo = {
+export type ArtifactInfo = {
     contentType?: string;
     md5: string;
     sha1: string;

package/src/version.d.ts

@@ -6,7 +6,7 @@ declare enum RepoType {
     unknown = "unknown"
 }
 export declare function getRepoType(): Promise<RepoType>;
-declare type RepoInfo = {
+type RepoInfo = {
     branch: string;
     revision: string;
 };