Skip to content

Commit

Permalink
fix: revert execa update to fix Lerna CLI error
Browse files Browse the repository at this point in the history
  • Loading branch information
sghoweri committed Jan 17, 2020
1 parent 679d7e5 commit db3fc1a
Show file tree
Hide file tree
Showing 8 changed files with 153 additions and 994 deletions.
5 changes: 1 addition & 4 deletions package.json
Expand Up @@ -145,7 +145,7 @@
"husky": "^3.0.0",
"jest": "^24.8.0",
"jsonwebtoken": "^8.5.1",
"lerna": "3.15.0",
"lerna": "^3.20.2",
"lint-staged": "^9.5.0",
"lit-element": "^2.2.0",
"lit-html": "^1.1.1",
Expand All @@ -166,9 +166,6 @@
"stylelint-order": "^3.0.1",
"stylelint-scss": "^3.9.2"
},
"resolutions": {
"execa": "^4.0.0"
},
"publishConfig": {
"access": "public"
}
Expand Down
2 changes: 1 addition & 1 deletion packages/build-tools/utils/package.json
Expand Up @@ -19,7 +19,7 @@
"convert-hrtime": "^3.0.0",
"cosmiconfig": "^5.2.1",
"del": "^4.1.1",
"execa": "^4.0.0",
"execa": "^1.0.0",
"js-yaml": "^3.13.1",
"jsonschema": "^1.2.4",
"node-cache": "^4.2.0",
Expand Down
Expand Up @@ -31,7 +31,7 @@ if (process.env.TRAVIS === 'true') {
},
].forEach(step => {
process.stderr.write(`${step.label}\n`);
const results = execa.sync(step.cmd);
const results = execa.shellSync(step.cmd);
if (results.failed) {
process.stderr.write(`Uh oh, this Travis git step failed:\n`);
process.stderr.write(`${results.stderr}\n`);
Expand Down
4 changes: 2 additions & 2 deletions packages/testing/testing-utils/test-utils.js
Expand Up @@ -10,7 +10,7 @@ const findPkg = require('find-pkg');
* helper function to get gitSha without needing a GITHUB_TOKEN (for local dev);
* @returns {string} git sha of last commit
*/
const gitSha = execa.sync('git', ['rev-parse', '--short', 'HEAD']).stdout;
const gitSha = execa.shellSync('git', ['rev-parse', '--short', 'HEAD']).stdout;

const repoRoot = join(__dirname, '../../..');
const lernaCli = join(repoRoot, 'node_modules/.bin/lerna');
Expand Down Expand Up @@ -138,7 +138,7 @@ function getFilesChanged({ from = 'HEAD', base = 'master', inDir } = {}) {
const cmds = ['git', 'diff', '--name-only', `${base}...${from}`];
if (inDir) cmds.push(inDir);
try {
const results = execa.sync(cmds.join(' '), {
const results = execa.shellSync(cmds.join(' '), {
cwd: repoRoot,
});
const files = results.stdout.split('\n');
Expand Down
192 changes: 0 additions & 192 deletions patches/@basalt+twig-renderer+0.13.0.patch

This file was deleted.

2 changes: 1 addition & 1 deletion scripts/package.json
Expand Up @@ -13,7 +13,7 @@
"dependencies": {
"@zeit/fetch-retry": "^3.0.0",
"ci-utils": "^0.5.0",
"execa": "^4.0.0",
"execa": "^1.0.0",
"git-semver-tags": "^2.0.2",
"jsonwebtoken": "^8.4.0",
"lodash": "^4.17.11",
Expand Down
2 changes: 1 addition & 1 deletion scripts/utils.js
Expand Up @@ -6,7 +6,7 @@ const execa = require('execa');
* helper function to get gitSha without needing a GITHUB_TOKEN (for local dev);
* @returns {string} git sha of last commit
*/
const gitSha = execa.sync('git', ['rev-parse', '--short', 'HEAD']).stdout;
const gitSha = execa.shellSync('git', ['rev-parse', '--short', 'HEAD']).stdout;

/**
* @param {Object} opt
Expand Down

0 comments on commit db3fc1a

Please sign in to comment.