build-strap 4.0.0-dev.2 → 4.0.0-dev.5

package/npm.d.ts

@@ -1,3 +1,4 @@
+import { SpawnOptions, SpawnResult } from './cp.js';
 export declare type NpmCreds = {
     email?: string;
     password?: string;
@@ -11,8 +12,21 @@ export declare type NpmConfig = {
     registry?: string;
 };
 export declare function getNpmConfig(): NpmConfig;
-export declare function npmExec(args: string[], npmPath?: string): Promise<string>;
+export declare const envNpmCreds: null | NpmCreds;
+export interface NpmOptions {
+    args?: string[];
+    npmPath?: string;
+    spawnOptions?: SpawnOptions;
+}
+export declare function npm({ args, spawnOptions, npmPath, }?: NpmOptions): Promise<SpawnResult>;
 export declare function npmGetVersions(packageName: string, npmPath?: string): Promise<string[]>;
+interface NpmWriteRcOptions {
+    authToken?: string;
+    creds?: NpmCreds | null;
+    outPath: string;
+    registry?: string;
+}
+export declare function npmWriteRc({ authToken, creds, outPath, registry, }: NpmWriteRcOptions): Promise<void>;
 export interface NpmPublishOptions {
     npmAuthToken?: string;
     npmConfig?: NpmConfig;

package/npm.js

@@ -1,27 +1,60 @@
 import fs from 'fs-extra';
 import { platform } from 'os';
 import path from 'path';
-import { exec, spawn } from './cp.js';
+import { spawn } from './cp.js';
 import { getCfg, getPkgName } from './pkg.js';
 import { buildLog } from './run.js';
 import { getDevBranch, getVersion } from './version.js';
 export function getNpmConfig() {
     return getCfg().npm || {};
 }
-const envNpmCreds = (process.env.NPM_CREDS && JSON.parse(process.env.NPM_CREDS)) || null;
+export const envNpmCreds = (process.env.NPM_CREDS && JSON.parse(process.env.NPM_CREDS)) || null;
 const npmExe = (npmPath) => npmPath || (platform() === 'win32' ? 'npm.cmd' : 'npm');
-export async function npmExec(args, npmPath) {
-    return (await exec(`${npmExe(npmPath)} ${args.join(' ')}`)).stdout.toString();
+export async function npm({ args = [], spawnOptions, npmPath, } = {}) {
+    const localNpm = path.join(path.dirname(process.execPath), 'lib/node_modules/npm/bin/npm-cli.js');
+    const spawnOpts = {
+        env: process.env,
+        shell: true,
+        stdio: 'inherit',
+        ...spawnOptions,
+    };
+    return npmPath
+        ? spawn(npmPath, args, spawnOpts)
+        : (await fs.pathExists(localNpm))
+            ? // prefer to use local copy of npm
+                spawn(process.execPath, [localNpm, ...args], spawnOpts)
+            : // fall back to globally installed npm
+                spawn(npmExe(), args, spawnOpts);
 }
 export async function npmGetVersions(packageName, npmPath) {
     try {
-        return JSON.parse((await npmExec(['show', packageName, 'versions', '--json'], npmPath)).trim());
+        return JSON.parse((await npm({
+            args: ['show', packageName, 'versions', '--json'],
+            npmPath,
+            spawnOptions: {
+                captureOutput: true,
+                stdio: 'pipe',
+            },
+        })).stdout.trim());
     }
     catch (err) {
         buildLog(`warning: failed to find existing package for ${packageName} in npm registry: ${err.message}`);
         return [];
     }
 }
+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) || [];
+    await fs.mkdirp(path.dirname(outPath));
+    await fs.writeFile(outPath, `registry=${theRegistry}
+${authToken ? `//${host}:_authToken=${authToken}` : ''}
+${creds
+        ? `_auth=${Buffer.from(`${creds.username}:${creds.password}`).toString('base64')}
+always-auth=true
+email=${creds.email}`
+        : ''}`);
+}
 export async function npmPublish({ npmAuthToken, npmConfig, npmCreds, npmPath, publishPath = '.', skipExisting = false, tag, workDir: passedWorkDir, } = {}) {
     const creds = npmCreds || envNpmCreds;
     const authToken = npmAuthToken || process.env.NPM_TOKEN;
@@ -42,16 +75,12 @@ export async function npmPublish({ npmAuthToken, npmConfig, npmCreds, npmPath, p
     }
     if (creds || registry || authToken) {
         // Write out .npmrc with credentials
-        const theRegistry = registry || 'https://registry.npmjs.org/';
-        const [, host] = /^(?:http(?:s)?:\/\/)?(.+)$/.exec(theRegistry) || [];
-        await fs.mkdirp(workDir);
-        await fs.writeFile(path.join(workDir, '.npmrc'), `registry=${theRegistry}
-${authToken ? `//${host}:_authToken=\${NPM_TOKEN}` : ''}
-${creds
-            ? `_auth=${Buffer.from(`${creds.username}:${creds.password}`).toString('base64')}
-always-auth=true
-email=${creds.email}`
-            : ''}`);
+        await npmWriteRc({
+            authToken: authToken ? `\${NPM_TOKEN}` : undefined,
+            creds,
+            outPath: path.join(workDir, '.npmrc'),
+            registry,
+        });
     }
     const existing = await npmGetVersions(name, npmPath);
     const { branch, isRelease, npm: npmVersion } = await getVersion();
@@ -62,26 +91,29 @@ email=${creds.email}`
         }
         throw new Error('Failed to publish npm package, this version already exists!');
     }
-    await spawn(npmExe(npmPath), [
-        'publish',
-        resolvedPath,
-        '--tag',
-        tag ||
-            (isRelease
-                ? 'latest'
-                : branch === (await getDevBranch())
-                    ? 'next'
-                    : 'branch'),
-        ...(access ? ['--access', access] : []),
-        ...(dryRun ? ['--dry-run'] : []),
-        '--color=always',
-    ], {
-        cwd: workDir,
-        env: {
-            ...process.env,
-            NPM_TOKEN: authToken,
+    await npm({
+        args: [
+            'publish',
+            resolvedPath,
+            '--tag',
+            tag ||
+                (isRelease
+                    ? 'latest'
+                    : branch === (await getDevBranch())
+                        ? 'next'
+                        : 'branch'),
+            ...(access ? ['--access', access] : []),
+            ...(dryRun ? ['--dry-run'] : []),
+            '--color=always',
+        ],
+        npmPath,
+        spawnOptions: {
+            cwd: workDir,
+            env: {
+                ...process.env,
+                NPM_TOKEN: authToken,
+            },
         },
-        stdio: 'inherit',
     });
     return true;
 }
@@ -90,15 +122,20 @@ export async function npmPack({ destination, npmConfig, npmPath, workDir = '.',
     if (destination) {
         await fs.ensureDir(destination);
     }
-    const { stdout } = await spawn(npmExe(npmPath), [
-        'pack',
-        ...(dryRun ? ['--dry-run'] : []),
-        ...(destination ? ['--pack-destination', path.resolve(destination)] : []),
-        '--color=always',
-    ], {
-        captureOutput: true,
-        cwd: path.resolve(workDir),
-        pipeOutput: true,
+    const { stdout } = await npm({
+        args: [
+            'pack',
+            ...(dryRun ? ['--dry-run'] : []),
+            ...(destination ? ['--pack-destination', path.resolve(destination)] : []),
+            '--color=always',
+        ],
+        npmPath,
+        spawnOptions: {
+            captureOutput: true,
+            cwd: path.resolve(workDir),
+            pipeOutput: true,
+            stdio: 'pipe',
+        },
     });
     return path.resolve(destination || '.', stdout.trim());
 }

package/package.json

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

package/yarn.d.ts

@@ -1,4 +1,5 @@
 import { SpawnOptions, SpawnResult } from './cp.js';
+import { NpmConfig, NpmCreds } from './npm.js';
 export interface YarnOptions {
     args?: string[];
     spawnOptions?: SpawnOptions;
@@ -24,3 +25,20 @@ export interface YarnUpgradeOptions {
     outdated?: boolean;
 }
 export declare function yarnUpgrade({ all, outdated, }?: YarnUpgradeOptions): Promise<void>;
+export interface YarnPublishOptions {
+    npmAuthToken?: string;
+    npmConfig?: NpmConfig;
+    npmCreds?: NpmCreds;
+    npmPath?: string;
+    publishPath?: string;
+    skipExisting?: boolean;
+    tag?: string;
+    workDir?: string;
+}
+export declare function yarnPublish({ npmAuthToken, npmConfig, npmCreds, npmPath, publishPath, skipExisting, tag, workDir: passedWorkDir, }?: YarnPublishOptions): Promise<boolean>;
+interface YarnPackOptions {
+    destination: string;
+    workDir?: string;
+}
+export declare function yarnPack({ destination, workDir, }: YarnPackOptions): Promise<string>;
+export {};

package/yarn.js

@@ -2,9 +2,11 @@ import fs from 'fs-extra';
 import path from 'path';
 import { spawn } from './cp.js';
 import { readDir } from './fs.js';
-import { getPkg } from './pkg.js';
+import { envNpmCreds, getNpmConfig, npmGetVersions, npmWriteRc, } from './npm.js';
+import { getPkg, getPkgName } from './pkg.js';
 import { buildLog } from './run.js';
 import { generateFileHash } from './tgz.js';
+import { getDevBranch, getVersion } from './version.js';
 export async function yarn({ args = [], spawnOptions, } = {}) {
     const localYarn = path.join(path.dirname(process.execPath), '/node_modules/yarn/bin/yarn.js');
     const spawnOpts = {
@@ -73,3 +75,81 @@ export async function yarnUpgrade({ all = false, outdated = false, } = {}) {
     }
     await yarn({ args: ['upgrade'] });
 }
+export async function yarnPublish({ npmAuthToken, npmConfig, npmCreds, npmPath, publishPath = '.', skipExisting = false, tag, workDir: passedWorkDir, } = {}) {
+    const creds = npmCreds || envNpmCreds;
+    const authToken = npmAuthToken || process.env.NPM_TOKEN;
+    const name = getPkgName();
+    const { access, publish, registry } = npmConfig || getNpmConfig();
+    if (!publish) {
+        buildLog('npm publish info missing from package.json, skipping npm publish');
+        return false;
+    }
+    const resolvedPath = path.resolve(publishPath);
+    const workDir = passedWorkDir ||
+        ((await fs.stat(resolvedPath)).isDirectory()
+            ? resolvedPath
+            : path.dirname(resolvedPath));
+    if (!(await fs.pathExists(path.join(workDir, 'package.json')))) {
+        buildLog(`warning: no package.json found in ${workDir}, skipping npm publish`);
+        return false;
+    }
+    if (creds || registry || authToken) {
+        // Write out .npmrc with credentials
+        await npmWriteRc({
+            authToken: authToken ? `\${NPM_TOKEN}` : undefined,
+            creds,
+            outPath: path.join(workDir, '.npmrc'),
+            registry,
+        });
+    }
+    const existing = await npmGetVersions(name, npmPath);
+    const { branch, isRelease, npm: npmVersion } = await getVersion();
+    if (existing.includes(npmVersion)) {
+        if (skipExisting) {
+            buildLog('npm package with this same version already exists. Skipping publish...');
+            return false;
+        }
+        throw new Error('Failed to publish npm package, this version already exists!');
+    }
+    await yarn({
+        args: [
+            'publish',
+            resolvedPath,
+            '--new-version',
+            npmVersion,
+            '--tag',
+            tag ||
+                (isRelease
+                    ? 'latest'
+                    : branch === (await getDevBranch())
+                        ? 'next'
+                        : 'branch'),
+            ...(access ? ['--access', access] : []),
+        ],
+        spawnOptions: {
+            cwd: workDir,
+            env: {
+                ...process.env,
+                FORCE_COLOR: 'true',
+                NPM_TOKEN: authToken,
+            },
+            shell: true,
+            stdio: 'inherit',
+        },
+    });
+    return true;
+}
+export async function yarnPack({ destination, workDir = '.', }) {
+    await fs.ensureDir(destination);
+    const version = await getVersion();
+    const name = getPkgName();
+    const filename = path.resolve(destination, `${name}-${version.npm}.tgz`);
+    await yarn({
+        args: ['pack', ...(destination ? ['--filename', filename] : [])],
+        spawnOptions: {
+            cwd: path.resolve(workDir),
+            pipeOutput: true,
+        },
+    });
+    return filename;
+}