crowetic/protocol
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1982 from 0xProject/fix/enableLerna2FAPrompt

Browse Source 
publishing: prompt user for OTP
This commit is contained in:
Fabio B
2019-07-24 20:27:24 +02:00
committed by GitHub
parent 183b4fb7ee fef1bd13b5
commit 2fecf6c80b
3 changed files with 98 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@@ -77,7 +77,7 @@
"graceful-fs": "4.1.15" "graceful-fs": "4.1.15"
}, },
"devDependencies": { "devDependencies": {
"@0x-lerna-fork/lerna": "3.16.7", "@0x-lerna-fork/lerna": "3.16.8",
"@0xproject/npm-cli-login": "^0.0.11", "@0xproject/npm-cli-login": "^0.0.11",
"async-child-process": "^1.1.1", "async-child-process": "^1.1.1",
"bundlewatch": "^0.2.1", "bundlewatch": "^0.2.1",

69
packages/monorepo-scripts/src/publish.ts
View File

@@ -2,10 +2,13 @@
import { PackageJSON } from '@0x/types'; import { PackageJSON } from '@0x/types';
import { logUtils } from '@0x/utils'; import { logUtils } from '@0x/utils';
import { spawn } from 'child_process';
import * as promisify from 'es6-promisify'; import * as promisify from 'es6-promisify';
import * as fs from 'fs';
import * as _ from 'lodash'; import * as _ from 'lodash';
import * as moment from 'moment'; import * as moment from 'moment';
import opn = require('opn'); import opn = require('opn');
import * as path from 'path';
import { exec as execAsync, spawn as spawnAsync } from 'promisify-child-process'; import { exec as execAsync, spawn as spawnAsync } from 'promisify-child-process';
import * as prompt from 'prompt'; import * as prompt from 'prompt';
import semver = require('semver'); import semver = require('semver');
@@ -254,19 +257,59 @@ async function updateChangeLogsAsync(updatedPublicPackages: Package[]): Promise<
} }
async function lernaPublishAsync(packageToNextVersion: { [name: string]: string }): Promise<void> { async function lernaPublishAsync(packageToNextVersion: { [name: string]: string }): Promise<void> {
const packageVersionString = _.map(packageToNextVersion, (nextVersion: string, packageName: string) => { return new Promise<void>((resolve, reject) => {
return `${packageName}@${nextVersion}`; const packageVersionString = _.map(packageToNextVersion, (nextVersion: string, packageName: string) => {
}).join(','); return `${packageName}|${nextVersion}`;
let lernaPublishCmd = `node ${constants.lernaExecutable} publish --cdVersions=${packageVersionString} --registry=${ }).join(',');
configs.NPM_REGISTRY_URL // HACK(fabio): Previously we would pass the packageVersionString directly to `lerna publish` using the
} --yes`; // `--cdVersions` flag. Since we now need to use `spawn` instead of `exec` when calling Lerna, passing
if (configs.IS_LOCAL_PUBLISH) { // them as a string arg is causing `spawn` to error with `ENAMETOOLONG`. In order to shorten the args
lernaPublishCmd += ` --no-git-tag-version --no-push`; // passed to `spawn` we now write the new version to a file and pass the filepath to the `cdVersions` arg.
} const cdVersionsFilepath = path.join(__dirname, 'cd_versions.txt');
utils.log('Lerna is publishing...'); fs.writeFileSync(cdVersionsFilepath, packageVersionString);
await execAsync(lernaPublishCmd, { const lernaPublishCmd = `node`;
cwd: constants.monorepoRootPath, const lernaPublishArgs = [
maxBuffer: 102400000, // 500 * 1024 * 200 `${constants.lernaExecutable}`,
'publish',
`--cdVersions=${cdVersionsFilepath}`,
`--registry=${configs.NPM_REGISTRY_URL}`,
`--yes`,
];
if (configs.IS_LOCAL_PUBLISH) {
lernaPublishArgs.push('--no-git-tag-version');
lernaPublishArgs.push('--no-push');
}
utils.log('Lerna is publishing...');
try {
const child = spawn(lernaPublishCmd, lernaPublishArgs, {
cwd: constants.monorepoRootPath,
});
child.stdout.on('data', async (data: Buffer) => {
const output = data.toString('utf8');
utils.log('Lerna publish cmd: ', output);
const isOTPPrompt = _.includes(output, 'Enter OTP:');
if (isOTPPrompt) {
// Prompt for OTP
prompt.start();
const result = await promisify(prompt.get)(['OTP']);
child.stdin.write(`${result.OTP}\n`);
}
const didFinishPublishing = _.includes(output, 'Successfully published:');
if (didFinishPublishing) {
// Remove temporary cdVersions file
fs.unlinkSync(cdVersionsFilepath);
resolve();
}
});
child.stderr.on('data', (data: Buffer) => {
const output = data.toString('utf8');
utils.log('Lerna publish cmd: ', output);
});
} catch (err) {
// Remove temporary cdVersions file
fs.unlinkSync(cdVersionsFilepath);
reject(err);
}
}); });
} }

62
yarn.lock
View File

@@ -56,16 +56,16 @@
read-package-tree "^5.1.6" read-package-tree "^5.1.6"
semver "^6.2.0" semver "^6.2.0"
"@0x-lerna-fork/changed@3.16.7": "@0x-lerna-fork/changed@3.16.8":
version "3.16.7" version "3.16.8"
resolved "https://registry.yarnpkg.com/@0x-lerna-fork/changed/-/changed-3.16.7.tgz#20529ddb56b951a75d10ed9ebfbc6b4ec9214e7e" resolved "https://registry.yarnpkg.com/@0x-lerna-fork/changed/-/changed-3.16.8.tgz#f99767c08c1070506fcca066b829f9b20506c821"
integrity sha512-26F9E0bitgoEYjb9yfJJAkb1ViMmJLTAYypxLatPuvNMFb90y3pq9YSrLXkGTxg8s6pB2uDdRD/JnnDjFge3XQ== integrity sha512-aQb6NoOrjHZbp+vccVpnIjMlot2oqiFUb+dJB5gH0c+Iw7MGb5KSKkF1lODt76U54VCqT3IsBdHB+U1O7bCWrg==
dependencies: dependencies:
"@0x-lerna-fork/collect-updates" "3.16.3" "@0x-lerna-fork/collect-updates" "3.16.3"
"@0x-lerna-fork/command" "3.16.3" "@0x-lerna-fork/command" "3.16.3"
"@0x-lerna-fork/listable" "3.16.3" "@0x-lerna-fork/listable" "3.16.3"
"@0x-lerna-fork/output" "3.16.3" "@0x-lerna-fork/output" "3.16.3"
"@0x-lerna-fork/version" "3.16.7" "@0x-lerna-fork/version" "3.16.8"
"@0x-lerna-fork/check-working-tree@3.16.3": "@0x-lerna-fork/check-working-tree@3.16.3":
version "3.16.3" version "3.16.3"
@@ -318,14 +318,14 @@
p-map "^2.1.0" p-map "^2.1.0"
write-json-file "^3.2.0" write-json-file "^3.2.0"
"@0x-lerna-fork/lerna@3.16.7": "@0x-lerna-fork/lerna@3.16.8":
version "3.16.7" version "3.16.8"
resolved "https://registry.yarnpkg.com/@0x-lerna-fork/lerna/-/lerna-3.16.7.tgz#0c36ccc46b4dd217f476f9e70a568432cdbc4130" resolved "https://registry.yarnpkg.com/@0x-lerna-fork/lerna/-/lerna-3.16.8.tgz#d8c697db74d598f5ee4e18621ee6c353e9151068"
integrity sha512-wajiUnqJnyU6gQV69isVfaLoRzueMWKzYayMHqzVfXGFNlUH8qc19YLQtD14ec8PQpDIMUlKmhEsQv4KNo9j3Q== integrity sha512-gkBFBmigBClHQE5JwEP+yE5iuLnY+xEsfUXvSWvpkDN0IOS/kh/74FVbhOzHfrotooA6x+oTOZE5l3cOMOCyuA==
dependencies: dependencies:
"@0x-lerna-fork/add" "3.16.3" "@0x-lerna-fork/add" "3.16.3"
"@0x-lerna-fork/bootstrap" "3.16.3" "@0x-lerna-fork/bootstrap" "3.16.3"
"@0x-lerna-fork/changed" "3.16.7" "@0x-lerna-fork/changed" "3.16.8"
"@0x-lerna-fork/clean" "3.16.3" "@0x-lerna-fork/clean" "3.16.3"
"@0x-lerna-fork/cli" "3.16.3" "@0x-lerna-fork/cli" "3.16.3"
"@0x-lerna-fork/create" "3.16.3" "@0x-lerna-fork/create" "3.16.3"
@@ -335,9 +335,9 @@
"@0x-lerna-fork/init" "3.16.3" "@0x-lerna-fork/init" "3.16.3"
"@0x-lerna-fork/link" "3.16.3" "@0x-lerna-fork/link" "3.16.3"
"@0x-lerna-fork/list" "3.16.3" "@0x-lerna-fork/list" "3.16.3"
"@0x-lerna-fork/publish" "3.16.7" "@0x-lerna-fork/publish" "3.16.8"
"@0x-lerna-fork/run" "3.16.3" "@0x-lerna-fork/run" "3.16.3"
"@0x-lerna-fork/version" "3.16.7" "@0x-lerna-fork/version" "3.16.8"
import-local "^2.0.0" import-local "^2.0.0"
npmlog "^4.1.2" npmlog "^4.1.2"
@@ -519,10 +519,10 @@
inquirer "^6.2.0" inquirer "^6.2.0"
npmlog "^4.1.2" npmlog "^4.1.2"
"@0x-lerna-fork/publish@3.16.7": "@0x-lerna-fork/publish@3.16.8":
version "3.16.7" version "3.16.8"
resolved "https://registry.yarnpkg.com/@0x-lerna-fork/publish/-/publish-3.16.7.tgz#5f23fbd106eb5dffb5fc15980e03c9edff901519" resolved "https://registry.yarnpkg.com/@0x-lerna-fork/publish/-/publish-3.16.8.tgz#9f2bdf8a6085b33af67dc67c700d48b29ddd032f"
integrity sha512-1TLcFi7yOn7FqXoEZf62ND62pPR0OfnBWhRoq3d+b6IUpUl+srkjaznncf0KflJU0ccXMA/2z6uh72IpkvRGCw== integrity sha512-II9XEvc7nskBTxWwWnim+T+V+IAUSMO3+ffMUd5U9crhSASuWS1tNdBGjNJPMMaqSGzswUEUxI8PjlfcfVEOIw==
dependencies: dependencies:
"@0x-lerna-fork/check-working-tree" "3.16.3" "@0x-lerna-fork/check-working-tree" "3.16.3"
"@0x-lerna-fork/child-process" "3.16.3" "@0x-lerna-fork/child-process" "3.16.3"
@@ -542,7 +542,7 @@
"@0x-lerna-fork/run-lifecycle" "3.16.3" "@0x-lerna-fork/run-lifecycle" "3.16.3"
"@0x-lerna-fork/run-topologically" "3.16.3" "@0x-lerna-fork/run-topologically" "3.16.3"
"@0x-lerna-fork/validation-error" "3.16.3" "@0x-lerna-fork/validation-error" "3.16.3"
"@0x-lerna-fork/version" "3.16.7" "@0x-lerna-fork/version" "3.16.8"
"@evocateur/libnpmaccess" "^3.1.2" "@evocateur/libnpmaccess" "^3.1.2"
"@evocateur/npm-registry-fetch" "^4.0.0" "@evocateur/npm-registry-fetch" "^4.0.0"
"@evocateur/pacote" "^9.6.3" "@evocateur/pacote" "^9.6.3"
@@ -665,10 +665,10 @@
dependencies: dependencies:
npmlog "^4.1.2" npmlog "^4.1.2"
"@0x-lerna-fork/version@3.16.7": "@0x-lerna-fork/version@3.16.8":
version "3.16.7" version "3.16.8"
resolved "https://registry.yarnpkg.com/@0x-lerna-fork/version/-/version-3.16.7.tgz#f223d1ea27716f6b47a87cfd856c95c14f7edb3c" resolved "https://registry.yarnpkg.com/@0x-lerna-fork/version/-/version-3.16.8.tgz#7e08c81149c82507e50e5c1458b748ba84b1c207"
integrity sha512-WIHT/SnXk49+LzSm65niFm78AyMq+DilDsJ3aGc4eSBEu3ADpMufRNy6ksmI6NB3uk1+KHq/o6at/9vq6bCRMQ== integrity sha512-g/oPaNUPw0guxhg6J+3mO7R+RjKlCIZY7vX52pgD7ddnW9znmUepClnEoY92CSDnCqXt3YmZEZsDxeSK0gyycQ==
dependencies: dependencies:
"@0x-lerna-fork/check-working-tree" "3.16.3" "@0x-lerna-fork/check-working-tree" "3.16.3"
"@0x-lerna-fork/child-process" "3.16.3" "@0x-lerna-fork/child-process" "3.16.3"
@@ -715,6 +715,26 @@
dependencies: dependencies:
"@0x/base-contract" "^5.1.0" "@0x/base-contract" "^5.1.0"
"@0x/abi-gen@^2.1.1":
version "2.1.1"
resolved "https://registry.yarnpkg.com/@0x/abi-gen/-/abi-gen-2.1.1.tgz#2ca9072e64a2a46b6149aaea434f09d5dbf0866f"
integrity sha512-QLigDvQEGe248MjafJ58nWfwMbz+Va6KTlCsrADTuQd711XY10c95poDPevOfAXNHFZYpgS6rEzIau0WmY+Kbw==
dependencies:
"@0x/types" "^2.4.0"
"@0x/typescript-typings" "^4.2.3"
"@0x/utils" "^4.4.0"
chalk "^2.3.0"
change-case "^3.0.2"
cli-format "^3.0.9"
ethereum-types "^2.1.3"
glob "^7.1.2"
handlebars "^4.0.11"
lodash "^4.17.11"
mkdirp "^0.5.1"
tmp "^0.0.33"
to-snake-case "^1.0.0"
yargs "^10.0.3"
"@0x/asset-buyer@6.1.4": "@0x/asset-buyer@6.1.4":
version "6.1.4" version "6.1.4"
resolved "https://registry.yarnpkg.com/@0x/asset-buyer/-/asset-buyer-6.1.4.tgz#ea863b860fbae6f633846bdcf23cacbb345aefd1" resolved "https://registry.yarnpkg.com/@0x/asset-buyer/-/asset-buyer-6.1.4.tgz#ea863b860fbae6f633846bdcf23cacbb345aefd1"