Skip to content

Commit ddc2bc6

Browse files
authored
fix(cli): breaks due to faulty version of colors (#18324)
Fixes #18322 and #18323 Clarifying question: I'm not sure if the `yarn.lock` file should have automatically updated itself to only refer to `[email protected]` 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*
1 parent 455147a commit ddc2bc6

File tree

8 files changed

+19
-15
lines changed

8 files changed

+19
-15
lines changed

package.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
"typescript": "~3.9.10"
3232
},
3333
"resolutions": {
34+
"colors": "1.4.0",
3435
"string-width": "^4.2.3"
3536
},
3637
"repository": {
@@ -179,4 +180,4 @@
179180
"dependencies": {
180181
"string-width": "^4.2.3"
181182
}
182-
}
183+
}

packages/@aws-cdk/aws-cloudtrail/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@
7979
"@aws-cdk/pkglint": "0.0.0",
8080
"@types/jest": "^27.0.3",
8181
"aws-sdk": "^2.848.0",
82-
"colors": "^1.4.0",
82+
"colors": "1.4.0",
8383
"jest": "^27.4.5"
8484
},
8585
"dependencies": {
@@ -121,4 +121,4 @@
121121
"publishConfig": {
122122
"tag": "latest"
123123
}
124-
}
124+
}

packages/@aws-cdk/cloudformation-diff/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
"dependencies": {
2626
"@aws-cdk/cfnspec": "0.0.0",
2727
"@types/node": "^10.17.60",
28-
"colors": "^1.4.0",
28+
"colors": "1.4.0",
2929
"diff": "^5.0.0",
3030
"fast-deep-equal": "^3.1.3",
3131
"string-width": "^4.2.3",
@@ -58,4 +58,4 @@
5858
"publishConfig": {
5959
"tag": "latest-1"
6060
}
61-
}
61+
}

packages/aws-cdk/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@
7777
"camelcase": "^6.2.1",
7878
"cdk-assets": "0.0.0",
7979
"chokidar": "^3.5.2",
80-
"colors": "^1.4.0",
80+
"colors": "1.4.0",
8181
"decamelize": "^5.0.1",
8282
"fs-extra": "^9.1.0",
8383
"glob": "^7.2.0",
@@ -124,4 +124,4 @@
124124
"publishConfig": {
125125
"tag": "latest-1"
126126
}
127-
}
127+
}

packages/awslint/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
"dependencies": {
2121
"@jsii/spec": "^1.50.0",
2222
"camelcase": "^6.2.1",
23-
"colors": "^1.4.0",
23+
"colors": "1.4.0",
2424
"fs-extra": "^9.1.0",
2525
"jsii-reflect": "^1.50.0",
2626
"yargs": "^16.2.0"
@@ -71,4 +71,4 @@
7171
"publishConfig": {
7272
"tag": "latest-1"
7373
}
74-
}
74+
}

tools/@aws-cdk/cdk-build-tools/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
"@typescript-eslint/eslint-plugin": "^4.33.0",
4848
"@typescript-eslint/parser": "^4.33.0",
4949
"awslint": "0.0.0",
50-
"colors": "^1.4.0",
50+
"colors": "1.4.0",
5151
"eslint": "^7.32.0",
5252
"eslint-import-resolver-node": "^0.3.6",
5353
"eslint-import-resolver-typescript": "^2.5.0",
@@ -82,4 +82,4 @@
8282
"ubergen": {
8383
"exclude": true
8484
}
85-
}
85+
}

tools/@aws-cdk/pkglint/package.json

+6-3
Original file line numberDiff line numberDiff line change
@@ -54,15 +54,18 @@
5454
"typescript": "~3.9.10"
5555
},
5656
"nozem": {
57-
"ostools": ["chmod", "cp"]
57+
"ostools": [
58+
"chmod",
59+
"cp"
60+
]
5861
},
5962
"dependencies": {
6063
"case": "^1.6.3",
61-
"colors": "^1.4.0",
64+
"colors": "1.4.0",
6265
"fs-extra": "^9.1.0",
6366
"glob": "^7.2.0",
6467
"npm-bundled": "^1.1.2",
6568
"semver": "^7.3.5",
6669
"yargs": "^16.2.0"
6770
}
68-
}
71+
}

yarn.lock

+1-1
Original file line numberDiff line numberDiff line change
@@ -2835,7 +2835,7 @@ color-name@~1.1.4:
28352835
resolved "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2"
28362836
integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==
28372837

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

0 commit comments

Comments
 (0)