build-strap 4.0.0-dev.3 → 4.0.0-dev.4

package/npm.d.ts

@@ -1,3 +1,4 @@
+import { SpawnOptions, SpawnResult } from './cp.js';
 export declare type NpmCreds = {
     email?: string;
     password?: string;
@@ -12,7 +13,12 @@ export declare type NpmConfig = {
 };
 export declare function getNpmConfig(): NpmConfig;
 export declare const envNpmCreds: null | NpmCreds;
-export declare function npmExec(args: string[], npmPath?: string): Promise<string>;
+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;

package/npm.js

@@ -1,7 +1,7 @@
 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';
@@ -10,12 +10,32 @@ export function getNpmConfig() {
 }
 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}`);
@@ -71,27 +91,31 @@ export async function npmPublish({ npmAuthToken, npmConfig, npmCreds, npmPath, p
         }
         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,
+            },
+            shell: true,
+            stdio: 'inherit',
         },
-        shell: true,
-        stdio: 'inherit',
     });
     return true;
 }
@@ -100,15 +124,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.3",
+  "version": "4.0.0-dev.4",
   "description": "Node scripts for building things",
   "license": "MIT",
   "authors": [

package/yarn.d.ts

@@ -37,7 +37,7 @@ export interface YarnPublishOptions {
 }
 export declare function yarnPublish({ npmAuthToken, npmConfig, npmCreds, npmPath, publishPath, skipExisting, tag, workDir: passedWorkDir, }?: YarnPublishOptions): Promise<boolean>;
 interface YarnPackOptions {
-    destination?: string;
+    destination: string;
     workDir?: string;
 }
 export declare function yarnPack({ destination, workDir, }: YarnPackOptions): Promise<string>;

package/yarn.js

@@ -115,6 +115,8 @@ export async function yarnPublish({ npmAuthToken, npmConfig, npmCreds, npmPath,
         args: [
             'publish',
             resolvedPath,
+            '--new-version',
+            npmVersion,
             '--tag',
             tag ||
                 (isRelease
@@ -138,24 +140,16 @@ export async function yarnPublish({ npmAuthToken, npmConfig, npmCreds, npmPath,
     return true;
 }
 export async function yarnPack({ destination, workDir = '.', }) {
-    if (destination) {
-        await fs.ensureDir(destination);
-    }
-    const { stdout } = await yarn({
-        args: [
-            'pack',
-            ...(destination ? ['--filename', path.resolve(destination)] : []),
-        ],
+    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: {
-            captureOutput: true,
             cwd: path.resolve(workDir),
-            env: {
-                ...process.env,
-                FORCE_COLOR: 'true',
-            },
             pipeOutput: true,
         },
     });
-    console.log({ stdout });
-    return path.resolve(destination || '.', stdout.trim());
+    return filename;
 }