Skip to content

Commit

Permalink
Merge pull request #3 from rwjblue/prettier
Browse files Browse the repository at this point in the history
Update prettier related packages to prettier@2
  • Loading branch information
rwjblue authored Mar 25, 2020
2 parents 4456152 + bd614d8 commit 99b3979
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 15 deletions.
10 changes: 5 additions & 5 deletions index.js
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ module.exports = class YarnWorkspacesPlugin extends UpstreamPlugin {

const task = () => {
return this.eachWorkspace(() => {
return this.exec(`npm version ${version} --no-git-tag-version`).catch(err => {
return this.exec(`npm version ${version} --no-git-tag-version`).catch((err) => {
if (/version not changed/i.test(err)) {
this.log.warn(`Did not update version in package.json, etc. (already at ${version}).`);
}
Expand Down Expand Up @@ -124,7 +124,7 @@ module.exports = class YarnWorkspacesPlugin extends UpstreamPlugin {
this.log.warn('The provided OTP is incorrect or has expired.');
}
if (otpCallback) {
return otpCallback(otp => this.publish({ otp, otpCallback }));
return otpCallback((otp) => this.publish({ otp, otpCallback }));
}
}
throw err;
Expand All @@ -134,7 +134,7 @@ module.exports = class YarnWorkspacesPlugin extends UpstreamPlugin {

eachWorkspace(action) {
return Promise.all(
this.getWorkspaceDirs().map(async workspaceDir => {
this.getWorkspaceDirs().map(async (workspaceDir) => {
try {
process.chdir(workspaceDir);
return await action();
Expand All @@ -151,9 +151,9 @@ module.exports = class YarnWorkspacesPlugin extends UpstreamPlugin {

let packageJSONFiles = walkSync(root, {
includeBasePath: true,
globs: workspaces.map(glob => `${glob}/package.json`),
globs: workspaces.map((glob) => `${glob}/package.json`),
});

return packageJSONFiles.map(file => path.dirname(file));
return packageJSONFiles.map((file) => path.dirname(file));
}
};
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,11 @@
"devDependencies": {
"broccoli-test-helper": "^2.0.0",
"eslint": "^6.8.0",
"eslint-config-prettier": "^6.10.0",
"eslint-config-prettier": "^6.10.1",
"eslint-plugin-node": "^11.0.0",
"eslint-plugin-prettier": "^3.1.2",
"jest": "^25.1.0",
"prettier": "^1.19.1",
"prettier": "^2.0.2",
"release-it-lerna-changelog": "^2.1.0",
"sinon": "^9.0.1",
"tmp": "^0.1.0"
Expand Down
16 changes: 8 additions & 8 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1812,10 +1812,10 @@ escodegen@^1.11.1:
optionalDependencies:
source-map "~0.6.1"

eslint-config-prettier@^6.10.0:
version "6.10.0"
resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-6.10.0.tgz#7b15e303bf9c956875c948f6b21500e48ded6a7f"
integrity sha512-AtndijGte1rPILInUdHjvKEGbIV06NuvPrqlIEaEaWtbtvJh464mDeyGMdZEQMsGvC0ZVkiex1fSNcC4HAbRGg==
eslint-config-prettier@^6.10.1:
version "6.10.1"
resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-6.10.1.tgz#129ef9ec575d5ddc0e269667bf09defcd898642a"
integrity sha512-svTy6zh1ecQojvpbJSgH3aei/Rt7C6i090l5f2WQ4aB05lYHeZIR1qL4wZyyILTbtmnbHP5Yn8MrsOJMGa8RkQ==
dependencies:
get-stdin "^6.0.0"

Expand Down Expand Up @@ -4533,10 +4533,10 @@ prettier-linter-helpers@^1.0.0:
dependencies:
fast-diff "^1.1.2"

prettier@^1.19.1:
version "1.19.1"
resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.19.1.tgz#f7d7f5ff8a9cd872a7be4ca142095956a60797cb"
integrity sha512-s7PoyDv/II1ObgQunCbB9PdLmUcBZcnWOcxDh7O0N/UwDEsHyqkW+Qh28jW+mVuCdx7gLB0BotYI1Y6uI9iyew==
prettier@^2.0.2:
version "2.0.2"
resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.0.2.tgz#1ba8f3eb92231e769b7fcd7cb73ae1b6b74ade08"
integrity sha512-5xJQIPT8BraI7ZnaDwSbu5zLrB6vvi8hVV58yHQ+QK64qrY40dULy0HSRlQ2/2IdzeBpjhDkqdcFBnFeDEMVdg==

pretty-format@^25.1.0:
version "25.1.0"
Expand Down

0 comments on commit 99b3979

Please sign in to comment.