Skip to content

Commit

Permalink
cleanup: move @ember/string to ember-data peer-dependencies (#8423)
Browse files Browse the repository at this point in the history
* cleanup: move @ember/string to ember-data peer-dependencies

* fix lint
  • Loading branch information
runspired authored Feb 25, 2023
1 parent c309c47 commit 2d50e82
Show file tree
Hide file tree
Showing 19 changed files with 1,019 additions and 992 deletions.
3 changes: 0 additions & 3 deletions @types/@ember/owner.ts

This file was deleted.

7 changes: 3 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
"@babel/runtime": "^7.21.0",
"@ember/edition-utils": "^1.2.0",
"@ember/optional-features": "^2.0.0",
"@ember/test-helpers": "~2.8.1",
"@ember/test-helpers": "^2.9.3",
"@glimmer/component": "^1.1.2",
"@glimmer/env": "^0.1.7",
"@types/ember": "^4.0.3",
Expand All @@ -60,7 +60,6 @@
"@types/ember__string": "^3.0.10",
"@types/ember__template": "^4.0.1",
"@types/ember__test": "^4.0.1",
"@types/ember__test-helpers": "^2.8.2",
"@types/ember__utils": "^4.0.2",
"@types/htmlbars-inline-precompile": "^3.0.0",
"@types/qunit": "^2.19.4",
Expand Down Expand Up @@ -146,7 +145,7 @@
},
"volta": {
"node": "19.0.0",
"pnpm": "7.18.0"
"pnpm": "7.27.1"
},
"packageManager": "[email protected]",
"changelog": {
Expand All @@ -168,4 +167,4 @@
"@embroider/[email protected]": "patches/@[email protected]"
}
}
}
}
6 changes: 4 additions & 2 deletions packages/-ember-data/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@
},
"author": "",
"license": "MIT",
"peerDependencies": {
"@ember/string": "^3.0.1"
},
"dependencies": {
"@ember-data/adapter": "workspace:4.10.0-alpha.26",
"@ember-data/debug": "workspace:4.10.0-alpha.26",
Expand All @@ -27,7 +30,6 @@
"@ember-data/tracking": "workspace:4.10.0-alpha.26",
"@ember-data/graph": "workspace:4.10.0-alpha.26",
"@ember/edition-utils": "^1.2.0",
"@ember/string": "^3.0.1",
"@embroider/macros": "^1.10.0",
"@glimmer/env": "^0.1.7",
"broccoli-merge-trees": "^4.2.0",
Expand Down Expand Up @@ -85,4 +87,4 @@
"extends": "../../package.json"
},
"packageManager": "[email protected]"
}
}
2 changes: 1 addition & 1 deletion packages/store/src/-private/store-service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -366,7 +366,7 @@ class Store {
};

// ensure that `getOwner(this)` works inside a model instance
setOwner(createOptions, getOwner(this));
setOwner(createOptions, getOwner(this)!);
return getModelFactory(this, this._modelFactoryCache, modelName).class.create(createOptions);
}
assert(`You must implement the store's instantiateRecord hook for your custom model class.`);
Expand Down
4 changes: 2 additions & 2 deletions packages/unpublished-test-infra/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
"@babel/core": "^7.21.0",
"@babel/runtime": "^7.21.0",
"@ember/optional-features": "^2.0.0",
"@ember/test-helpers": "~2.8.1",
"@ember/test-helpers": "^2.9.3",
"@glimmer/component": "^1.1.2",
"@glimmer/tracking": "^1.1.2",
"@types/semver": "^7.3.13",
Expand Down Expand Up @@ -76,4 +76,4 @@
"extends": "../../package.json"
},
"packageManager": "[email protected]"
}
}
Loading

0 comments on commit 2d50e82

Please sign in to comment.