Skip to content

Commit

Permalink
fix(cli): breaks due to faulty version of colors (#18324)
Browse files Browse the repository at this point in the history
Fixes #18322 and #18323

Clarifying question: I'm not sure if the `yarn.lock` file should have automatically updated itself to only refer to `colors@1.4.0` when I set the dependency within the workspace _and_ added the resolution for child dependencies. If it's expected behavior for it _not_ to update the `yarn.lock` file after adding `resolutions`, great! If I need to do something else for that to happen, let me know!

----

*By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
  • Loading branch information
SheaBelsky authored and iliapolo committed Jan 9, 2022
1 parent 595dee1 commit 43bf9ae
Show file tree
Hide file tree
Showing 8 changed files with 19 additions and 15 deletions.
3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
"typescript": "~3.9.10"
},
"resolutions": {
"colors": "1.4.0",
"string-width": "^4.2.3"
},
"repository": {
Expand Down Expand Up @@ -179,4 +180,4 @@
"dependencies": {
"string-width": "^4.2.3"
}
}
}
4 changes: 2 additions & 2 deletions packages/@aws-cdk/aws-cloudtrail/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@
"@aws-cdk/pkglint": "0.0.0",
"@types/jest": "^27.0.3",
"aws-sdk": "^2.848.0",
"colors": "^1.4.0",
"colors": "1.4.0",
"jest": "^27.4.5"
},
"dependencies": {
Expand Down Expand Up @@ -121,4 +121,4 @@
"publishConfig": {
"tag": "latest"
}
}
}
4 changes: 2 additions & 2 deletions packages/@aws-cdk/cloudformation-diff/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
"dependencies": {
"@aws-cdk/cfnspec": "0.0.0",
"@types/node": "^10.17.60",
"colors": "^1.4.0",
"colors": "1.4.0",
"diff": "^5.0.0",
"fast-deep-equal": "^3.1.3",
"string-width": "^4.2.3",
Expand Down Expand Up @@ -58,4 +58,4 @@
"publishConfig": {
"tag": "latest-1"
}
}
}
4 changes: 2 additions & 2 deletions packages/aws-cdk/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@
"camelcase": "^6.2.1",
"cdk-assets": "0.0.0",
"chokidar": "^3.5.2",
"colors": "^1.4.0",
"colors": "1.4.0",
"decamelize": "^5.0.1",
"fs-extra": "^9.1.0",
"glob": "^7.2.0",
Expand Down Expand Up @@ -124,4 +124,4 @@
"publishConfig": {
"tag": "latest-1"
}
}
}
4 changes: 2 additions & 2 deletions packages/awslint/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"dependencies": {
"@jsii/spec": "^1.50.0",
"camelcase": "^6.2.1",
"colors": "^1.4.0",
"colors": "1.4.0",
"fs-extra": "^9.1.0",
"jsii-reflect": "^1.50.0",
"yargs": "^16.2.0"
Expand Down Expand Up @@ -71,4 +71,4 @@
"publishConfig": {
"tag": "latest-1"
}
}
}
4 changes: 2 additions & 2 deletions tools/@aws-cdk/cdk-build-tools/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
"@typescript-eslint/eslint-plugin": "^4.33.0",
"@typescript-eslint/parser": "^4.33.0",
"awslint": "0.0.0",
"colors": "^1.4.0",
"colors": "1.4.0",
"eslint": "^7.32.0",
"eslint-import-resolver-node": "^0.3.6",
"eslint-import-resolver-typescript": "^2.5.0",
Expand Down Expand Up @@ -82,4 +82,4 @@
"ubergen": {
"exclude": true
}
}
}
9 changes: 6 additions & 3 deletions tools/@aws-cdk/pkglint/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -54,15 +54,18 @@
"typescript": "~3.9.10"
},
"nozem": {
"ostools": ["chmod", "cp"]
"ostools": [
"chmod",
"cp"
]
},
"dependencies": {
"case": "^1.6.3",
"colors": "^1.4.0",
"colors": "1.4.0",
"fs-extra": "^9.1.0",
"glob": "^7.2.0",
"npm-bundled": "^1.1.2",
"semver": "^7.3.5",
"yargs": "^16.2.0"
}
}
}
2 changes: 1 addition & 1 deletion yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2835,7 +2835,7 @@ color-name@~1.1.4:
resolved "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2"
integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==

colors@^1.4.0:
colors@1.4.0, colors@^1.4.0:
version "1.4.0"
resolved "https://registry.npmjs.org/colors/-/colors-1.4.0.tgz#c50491479d4c1bdaed2c9ced32cf7c7dc2360f78"
integrity sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==
Expand Down

0 comments on commit 43bf9ae

Please sign in to comment.