Skip to content

Commit a0aa434

Browse files
committed
Fix @ember/string dependency
`@ember/string` must be a peer dpendency as `ember-cli-addon-docs` imports it in their codebase. Currently this still works, but with v4 of `@ember/string` (v2 addon) this will break as it fully relies on `ember-auto-import`.
1 parent 4852afc commit a0aa434

File tree

2 files changed

+29
-11
lines changed

2 files changed

+29
-11
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,6 @@
105105
"@babel/plugin-proposal-decorators": "^7.23.6",
106106
"@babel/preset-env": "^7.23.6",
107107
"@ember/optional-features": "^2.0.0",
108-
"@ember/string": "^3.1.1",
109108
"@ember/test-helpers": "^3.2.1",
110109
"@embroider/test-setup": "^3.0.3",
111110
"@fullhuman/postcss-purgecss": "^4.0.3",
@@ -155,6 +154,7 @@
155154
"webpack": "^5.89.0"
156155
},
157156
"peerDependencies": {
157+
"@ember/string": "^3.1.1 || ^4.0.0",
158158
"ember-data": ">= 3.0.0",
159159
"ember-fetch": "^8.1.1",
160160
"ember-source": ">= 4.0.0"

yarn.lock

Lines changed: 28 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1408,13 +1408,6 @@
14081408
ember-cli-babel "^7.26.11"
14091409
ember-modifier-manager-polyfill "^1.2.0"
14101410

1411-
"@ember/string@^3.1.1":
1412-
version "3.1.1"
1413-
resolved "https://registry.yarnpkg.com/@ember/string/-/string-3.1.1.tgz#0a5ac0d1e4925259e41d5c8d55ef616117d47ff0"
1414-
integrity sha512-UbXJ+k3QOrYN4SRPHgXCqYIJ+yWWUg1+vr0H4DhdQPTy8LJfyqwZ2tc5uqpSSnEXE+/1KopHBE5J8GDagAg5cg==
1415-
dependencies:
1416-
ember-cli-babel "^7.26.6"
1417-
14181411
"@ember/test-helpers@^3.2.1":
14191412
version "3.2.1"
14201413
resolved "https://registry.yarnpkg.com/@ember/test-helpers/-/test-helpers-3.2.1.tgz#990159e64bfa7ae9743aca1f1ab65e7d80b22f37"
@@ -14246,7 +14239,16 @@ string-template@~0.2.1:
1424614239
resolved "https://registry.yarnpkg.com/string-template/-/string-template-0.2.1.tgz#42932e598a352d01fc22ec3367d9d84eec6c9add"
1424714240
integrity sha512-Yptehjogou2xm4UJbxJ4CxgZx12HBfeystp0y3x7s4Dj32ltVVG1Gg8YhKjHZkHicuKpZX/ffilA8505VbUbpw==
1424814241

14249-
"string-width-cjs@npm:string-width@^4.2.0", "string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
14242+
"string-width-cjs@npm:string-width@^4.2.0":
14243+
version "4.2.3"
14244+
resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
14245+
integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
14246+
dependencies:
14247+
emoji-regex "^8.0.0"
14248+
is-fullwidth-code-point "^3.0.0"
14249+
strip-ansi "^6.0.1"
14250+
14251+
"string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
1425014252
version "4.2.3"
1425114253
resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
1425214254
integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
@@ -14348,7 +14350,7 @@ stringstream@~0.0.4:
1434814350
resolved "https://registry.yarnpkg.com/stringstream/-/stringstream-0.0.6.tgz#7880225b0d4ad10e30927d167a1d6f2fd3b33a72"
1434914351
integrity sha512-87GEBAkegbBcweToUrdzf3eLhWNg06FJTebl4BVJz/JgWy8CvEr9dRtX5qWphiynMSQlxxi+QqN0z5T32SLlhA==
1435014352

14351-
"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.0, strip-ansi@^6.0.1:
14353+
"strip-ansi-cjs@npm:strip-ansi@^6.0.1":
1435214354
version "6.0.1"
1435314355
resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
1435414356
integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
@@ -14376,6 +14378,13 @@ strip-ansi@^5.1.0, strip-ansi@^5.2.0:
1437614378
dependencies:
1437714379
ansi-regex "^4.1.0"
1437814380

14381+
strip-ansi@^6.0.0, strip-ansi@^6.0.1:
14382+
version "6.0.1"
14383+
resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
14384+
integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
14385+
dependencies:
14386+
ansi-regex "^5.0.1"
14387+
1437914388
strip-ansi@^7.0.1, strip-ansi@^7.1.0:
1438014389
version "7.1.0"
1438114390
resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-7.1.0.tgz#d5b6568ca689d8561370b0707685d22434faff45"
@@ -15698,7 +15707,7 @@ workerpool@^6.0.2, workerpool@^6.1.5, workerpool@^6.4.0:
1569815707
resolved "https://registry.yarnpkg.com/workerpool/-/workerpool-6.5.1.tgz#060f73b39d0caf97c6db64da004cd01b4c099544"
1569915708
integrity sha512-Fs4dNYcsdpYSAfVxhnl1L5zTksjvOJxtC5hzMNl+1t9B8hTJTdKDyZ5ju7ztgPy+ft9tBFXoOlDNiOT9WUXZlA==
1570015709

15701-
"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0:
15710+
"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0":
1570215711
version "7.0.0"
1570315712
resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
1570415713
integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
@@ -15716,6 +15725,15 @@ wrap-ansi@^6.2.0:
1571615725
string-width "^4.1.0"
1571715726
strip-ansi "^6.0.0"
1571815727

15728+
wrap-ansi@^7.0.0:
15729+
version "7.0.0"
15730+
resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
15731+
integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
15732+
dependencies:
15733+
ansi-styles "^4.0.0"
15734+
string-width "^4.1.0"
15735+
strip-ansi "^6.0.0"
15736+
1571915737
wrap-ansi@^8.1.0:
1572015738
version "8.1.0"
1572115739
resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-8.1.0.tgz#56dc22368ee570face1b49819975d9b9a5ead214"

0 commit comments

Comments
 (0)