Skip to content

Commit 6a704b5

Browse files
Merge pull request #829 from NullVoxPopuli/ember-async-data-as-dependency
Make ember-async-data a dependency
2 parents c48716f + 51dd612 commit 6a704b5

File tree

5 files changed

+244
-63
lines changed

5 files changed

+244
-63
lines changed

.changeset/gold-ravens-clap.md

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"ember-resources": patch
3+
---
4+
5+
Move ember-async-data to "dependencies" because users are not required to import from that package ever"

ember-resources/package.json

+2-5
Original file line numberDiff line numberDiff line change
@@ -101,24 +101,21 @@
101101
"dependencies": {
102102
"@babel/runtime": "^7.17.8",
103103
"@embroider/addon-shim": "^1.2.0",
104-
"@embroider/macros": "^1.2.0"
104+
"@embroider/macros": "^1.2.0",
105+
"ember-async-data": "^1.0.1"
105106
},
106107
"peerDependencies": {
107108
"@ember/test-waiters": "^3.0.0",
108109
"@glimmer/component": "^1.1.2",
109110
"@glimmer/tracking": "^1.1.2",
110111
"@glint/template": "^1.0.0-beta.3 || ^1.0.0",
111-
"ember-async-data": "^1.0.1",
112112
"ember-concurrency": "^2.0.0 || ^3.0.0",
113113
"ember-source": "^3.28.0 || ^4.0.0 || ^5.0.0"
114114
},
115115
"peerDependenciesMeta": {
116116
"@glimmer/component": {
117117
"optional": true
118118
},
119-
"ember-async-data": {
120-
"optional": true
121-
},
122119
"ember-concurrency": {
123120
"optional": true
124121
},

package.json

+4-3
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,10 @@
5252
"msw",
5353
"webpack"
5454
],
55-
"allowedVersions": {
56-
"typescript": "*"
57-
}
55+
"allowAny": [
56+
"ember-source",
57+
"typescript"
58+
]
5859
},
5960
"patchedDependencies": {
6061
"@changesets/assemble-release-plan@5.2.3": "patches/@changesets__assemble-release-plan@5.2.3.patch"

0 commit comments

Comments
 (0)