build-strap 4.0.0-dev.46 → 4.0.0-dev.54

package/src/yarn.js

@@ -1,123 +1,155 @@
-// @flow
-import md5File from 'md5-file';
 import fs from 'fs-extra';
 import path from 'path';
-import { spawnAdv } from './cp';
-import type { SpawnOptions, SpawnResult } from './cp';
-import { buildLog } from './run';
-import { readDir } from './fs';
-import { getPkg } from './pkg';
-
-export type YarnOptions = {|
-  args?: string[],
-  spawnOptions?: ?SpawnOptions,
-|};
-
-export async function yarnAdv(opts?: YarnOptions): Promise<SpawnResult> {
-  const { args = [], spawnOptions } = opts || {};
-  const localYarn = path.join(
-    path.dirname(process.execPath),
-    '/node_modules/yarn/bin/yarn.js',
-  );
-
-  const spawnOpts = {
-    stdio: 'inherit',
-    shell: true,
-    env: process.env,
-    ...spawnOptions,
-  };
-
-  return (await fs.exists(localYarn))
-    ? // prefer to use local copy of yarn
-      spawnAdv(process.execPath, [localYarn, ...args], spawnOpts)
-    : // fall back to globally installed yarn
-      spawnAdv('yarn', args, spawnOpts);
+import { spawn } from './cp.js';
+import { readDir } from './fs.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 = {
+        env: process.env,
+        shell: true,
+        stdio: 'inherit',
+        ...spawnOptions,
+    };
+    return (await fs.pathExists(localYarn))
+        ? // prefer to use local copy of yarn
+            spawn(process.execPath, [localYarn, ...args], spawnOpts)
+        : // fall back to globally installed yarn
+            spawn('yarn', args, spawnOpts);
 }
-
-export async function yarn(opts?: YarnOptions): Promise<string> {
-  const { args = [], spawnOptions } = opts || {};
-  return yarnAdv({
-    args,
-    spawnOptions: { rejectOnErrorCode: true, ...spawnOptions },
-  }).then((r) => r.output);
-}
-
 export const yarnFiles = ['./package.json', './yarn.lock'];
-
-export type YarnInstallOptions = {|
-  nodeModulesPath?: string,
-  hashFilePath?: string,
-  force?: boolean,
-|};
-
 // Smart yarn invocation, only if package changed
-export async function yarnInstall(opts?: YarnInstallOptions) {
-  const {
-    nodeModulesPath = './node_modules',
-    hashFilePath = './download/buildHash_yarn.md5',
-    force = false,
-  } = opts || {};
-  await fs.ensureDir(nodeModulesPath);
-  const currentHash = (
-    await Promise.all(yarnFiles.map(async (f) => md5File(f)))
-  ).join('|');
-  await fs.ensureFile(hashFilePath);
-  const prevHash = await fs.readFile(hashFilePath, 'utf8');
-  if (currentHash !== prevHash) {
-    buildLog(
-      'node package definition changed since last build, invoking yarn.',
-    );
-  } else if (!(await readDir(`${nodeModulesPath}/**/*.js`)).length) {
-    buildLog('node packages missing, invoking yarn.');
-  } else if (force) {
-    buildLog('node packages unchanged, but yarn forced on command line...');
-  } else {
-    buildLog('node packages unchanged since last build, skipping yarn.');
-    return;
-  }
-  await yarn();
-  await fs.writeFile(hashFilePath, currentHash);
+export async function yarnInstall({ force = false, hashFilePath = './download/buildHash_yarn.md5', nodeModulesPath = './node_modules', } = {}) {
+    await fs.ensureDir(nodeModulesPath);
+    const currentHash = (await Promise.all(yarnFiles.map(async (f) => generateFileHash(f, 'md5')))).join('|');
+    await fs.ensureFile(hashFilePath);
+    const prevHash = await fs.readFile(hashFilePath, 'utf8');
+    if (currentHash !== prevHash) {
+        buildLog('node package definition changed since last build, invoking yarn.');
+    }
+    else if (!(await readDir(`${nodeModulesPath}/**/*.js`)).length) {
+        buildLog('node packages missing, invoking yarn.');
+    }
+    else if (force) {
+        buildLog('node packages unchanged, but yarn forced on command line...');
+    }
+    else {
+        buildLog('node packages unchanged since last build, skipping yarn.');
+        return;
+    }
+    await yarn();
+    await fs.writeFile(hashFilePath, currentHash);
 }
-
-export type YarnUpgradeOptions = {|
-  /**
-   * Use `yarn outdated` to find packages that should be upgraded
-   * May include breaking changes (major version changes)
-   */
-  outdated?: boolean,
-  /**
-   * `false` by default
-   * we assume any package with an explicit version shouldn't be touched
-   */
-  all?: boolean,
-|};
-
-export async function yarnUpgrade(opts?: YarnUpgradeOptions) {
-  const { outdated = false, all = false } = opts || {};
-  if (outdated) {
-    const { code, stdout } = await yarnAdv({
-      args: ['outdated'],
-      spawnOptions: { stdio: 'pipe', captureOutput: true },
-    });
-    if (code === 0) {
-      buildLog('No outdated packages.');
-    } else {
-      const { dependencies = {}, devDependencies = {} } = getPkg();
-      const packages = stdout
-        .split('\n')
-        .slice(5, -1)
-        .map((l) => l.split(/\s+/)[0])
-        .filter(
-          (p) =>
-            all || !/^\d/.test(dependencies[p] || devDependencies[p] || ''),
-        );
-      if (packages.length) {
-        await yarn({ args: ['add', ...packages] });
-        buildLog(`Upgraded: ${packages.join(', ')}`);
-      } else {
-        buildLog('No eligible outdated packages');
-      }
+export async function yarnUpgrade({ all = false, outdated = false, } = {}) {
+    if (outdated) {
+        const { code, stdout } = await yarn({
+            args: ['outdated'],
+            spawnOptions: {
+                captureOutput: true,
+                rejectOnErrorCode: false,
+                stdio: 'pipe',
+            },
+        });
+        if (code === 0) {
+            buildLog('No outdated packages.');
+        }
+        else {
+            const { dependencies = {}, devDependencies = {} } = getPkg();
+            const packages = stdout
+                .split('\n')
+                .slice(5, -1)
+                .map((l) => l.split(/\s+/)[0])
+                .filter((p) => all || !/^\d/.test(dependencies[p] || devDependencies[p] || ''));
+            if (packages.length) {
+                await yarn({ args: ['add', ...packages] });
+                buildLog(`Upgraded: ${packages.join(', ')}`);
+            }
+            else {
+                buildLog('No eligible outdated packages');
+            }
+        }
+    }
+    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: ['upgrade'] });
+    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;
 }

package/ant.js

@@ -1,43 +0,0 @@
-"use strict";Object.defineProperty(exports, "__esModule", { value: true });exports.ant = ant;
-var _cp = require("./cp");
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-/**
- * Executes the given ant command
- * @param {string} target the ant target to invoke
- * @param {AntSpawnOptions} options
- */
-async function ant(target, opts) {
-  const { properties = [], args = [], spawnOptions } = opts || {};
-
-  const execOptions = {
-    stdio: 'inherit',
-    pipeOutput: true,
-    ...spawnOptions };
-
-
-  await (0, _cp.spawn)(
-  'ant',
-  [
-  target,
-  ...args,
-  ...properties.map(({ name, value }) => `-D${name}=${value}`)],
-
-  execOptions);
-
-}
-//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uL3NyYy9hbnQuanMiXSwibmFtZXMiOlsiYW50IiwidGFyZ2V0Iiwib3B0cyIsInByb3BlcnRpZXMiLCJhcmdzIiwic3Bhd25PcHRpb25zIiwiZXhlY09wdGlvbnMiLCJzdGRpbyIsInBpcGVPdXRwdXQiLCJtYXAiLCJuYW1lIiwidmFsdWUiXSwibWFwcGluZ3MiOiI7QUFDQTs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFpQkE7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNPLGVBQWVBLEdBQWYsQ0FBbUJDLE1BQW5CLEVBQW1DQyxJQUFuQyxFQUEyRDtBQUNoRSxRQUFNLEVBQUVDLFVBQVUsR0FBRyxFQUFmLEVBQW1CQyxJQUFJLEdBQUcsRUFBMUIsRUFBOEJDLFlBQTlCLEtBQStDSCxJQUFJLElBQUksRUFBN0Q7O0FBRUEsUUFBTUksV0FBVyxHQUFHO0FBQ2xCQyxJQUFBQSxLQUFLLEVBQUUsU0FEVztBQUVsQkMsSUFBQUEsVUFBVSxFQUFFLElBRk07QUFHbEIsT0FBR0gsWUFIZSxFQUFwQjs7O0FBTUEsUUFBTTtBQUNKLE9BREk7QUFFSjtBQUNFSixFQUFBQSxNQURGO0FBRUUsS0FBR0csSUFGTDtBQUdFLEtBQUdELFVBQVUsQ0FBQ00sR0FBWCxDQUFlLENBQUMsRUFBRUMsSUFBRixFQUFRQyxLQUFSLEVBQUQsS0FBc0IsS0FBSUQsSUFBSyxJQUFHQyxLQUFNLEVBQXZELENBSEwsQ0FGSTs7QUFPSkwsRUFBQUEsV0FQSSxDQUFOOztBQVNEIiwic291cmNlc0NvbnRlbnQiOlsiLy8gQGZsb3dcbmltcG9ydCB7IHNwYXduIH0gZnJvbSAnLi9jcCc7XG5pbXBvcnQgdHlwZSB7IFNwYXduT3B0aW9ucyB9IGZyb20gJy4vY3AnO1xuXG4vKipcbiAqIE5hbWVkIHZhbHVlIHBhaXIgdG8gdXNlIHdoZW4gY29uZmlndXJpbmcgYW4gQW50IGJ1aWxkIHByb3BlcnR5XG4gKi9cbmV4cG9ydCB0eXBlIEFudFByb3BlcnR5Q29uZmlndXJhdGlvbiA9IHt8XG4gIG5hbWU6IHN0cmluZyxcbiAgdmFsdWU6IHN0cmluZyxcbnx9O1xuXG5leHBvcnQgdHlwZSBBbnRTcGF3bk9wdGlvbnMgPSB7fFxuICBwcm9wZXJ0aWVzPzogQW50UHJvcGVydHlDb25maWd1cmF0aW9uW10sIC8vIEFudCBwcm9wZXJ0eSB2YWx1ZXMgdG8gY29uZmlndXJlXG4gIGFyZ3M/OiBzdHJpbmdbXSwgLy8gQW55IGFkZGl0aW9uYWwgY29tbWFuZCBsaW5lIGFyZ3VtZW50cyB0byBwYXNzXG4gIHNwYXduT3B0aW9ucz86IFNwYXduT3B0aW9ucywgLy8gT3B0aW9uYWwgc3Bhd24gY29uZmlndXJhdGlvbi4gRGVmYXVsdHMgdG8gcnVuIHRoZSBwcm9qZWN0IHJvb3QgZGlyZWN0b3J5XG58fTtcblxuLyoqXG4gKiBFeGVjdXRlcyB0aGUgZ2l2ZW4gYW50IGNvbW1hbmRcbiAqIEBwYXJhbSB7c3RyaW5nfSB0YXJnZXQgdGhlIGFudCB0YXJnZXQgdG8gaW52b2tlXG4gKiBAcGFyYW0ge0FudFNwYXduT3B0aW9uc30gb3B0aW9uc1xuICovXG5leHBvcnQgYXN5bmMgZnVuY3Rpb24gYW50KHRhcmdldDogc3RyaW5nLCBvcHRzPzogQW50U3Bhd25PcHRpb25zKSB7XG4gIGNvbnN0IHsgcHJvcGVydGllcyA9IFtdLCBhcmdzID0gW10sIHNwYXduT3B0aW9ucyB9ID0gb3B0cyB8fCB7fTtcblxuICBjb25zdCBleGVjT3B0aW9ucyA9IHtcbiAgICBzdGRpbzogJ2luaGVyaXQnLFxuICAgIHBpcGVPdXRwdXQ6IHRydWUsXG4gICAgLi4uc3Bhd25PcHRpb25zLFxuICB9O1xuXG4gIGF3YWl0IHNwYXduKFxuICAgICdhbnQnLFxuICAgIFtcbiAgICAgIHRhcmdldCxcbiAgICAgIC4uLmFyZ3MsXG4gICAgICAuLi5wcm9wZXJ0aWVzLm1hcCgoeyBuYW1lLCB2YWx1ZSB9KSA9PiBgLUQke25hbWV9PSR7dmFsdWV9YCksXG4gICAgXSxcbiAgICBleGVjT3B0aW9ucyxcbiAgKTtcbn1cbiJdfQ==

package/ant.js.flow

@@ -1,42 +0,0 @@
-// @flow
-import { spawn } from './cp';
-import type { SpawnOptions } from './cp';
-
-/**
- * Named value pair to use when configuring an Ant build property
- */
-export type AntPropertyConfiguration = {|
-  name: string,
-  value: string,
-|};
-
-export type AntSpawnOptions = {|
-  properties?: AntPropertyConfiguration[], // Ant property values to configure
-  args?: string[], // Any additional command line arguments to pass
-  spawnOptions?: SpawnOptions, // Optional spawn configuration. Defaults to run the project root directory
-|};
-
-/**
- * Executes the given ant command
- * @param {string} target the ant target to invoke
- * @param {AntSpawnOptions} options
- */
-export async function ant(target: string, opts?: AntSpawnOptions) {
-  const { properties = [], args = [], spawnOptions } = opts || {};
-
-  const execOptions = {
-    stdio: 'inherit',
-    pipeOutput: true,
-    ...spawnOptions,
-  };
-
-  await spawn(
-    'ant',
-    [
-      target,
-      ...args,
-      ...properties.map(({ name, value }) => `-D${name}=${value}`),
-    ],
-    execOptions,
-  );
-}