@ember-data/model 4.5.0-alpha.2 → 4.5.0-alpha.5
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/addon/-private/model.js +1 -1
- package/addon/-private/system/model-for-mixin.ts +2 -2
- package/blueprints/model-test/index.js +2 -0
- package/blueprints/model-test/mocha-rfc-232-files/__root__/__path__/__test__.js +1 -1
- package/blueprints/model-test/qunit-files/__root__/__path__/__test__.js +1 -1
- package/package.json +14 -13
package/addon/-private/model.js
CHANGED
|
@@ -856,7 +856,7 @@ class Model extends EmberObject {
|
|
|
856
856
|
save(options) {
|
|
857
857
|
const promise = this._internalModel.save(options).then(() => this);
|
|
858
858
|
if (DEPRECATE_SAVE_PROMISE_ACCESS) {
|
|
859
|
-
return deprecatedPromiseObject(
|
|
859
|
+
return deprecatedPromiseObject(promise);
|
|
860
860
|
}
|
|
861
861
|
|
|
862
862
|
return promise;
|
|
@@ -4,7 +4,7 @@ import type Store from '@ember-data/store';
|
|
|
4
4
|
|
|
5
5
|
import Model from '../model';
|
|
6
6
|
|
|
7
|
-
/*
|
|
7
|
+
/*
|
|
8
8
|
In case someone defined a relationship to a mixin, for example:
|
|
9
9
|
```
|
|
10
10
|
import Model, { belongsTo, hasMany } from '@ember-data/model';
|
|
@@ -24,7 +24,7 @@ import Model from '../model';
|
|
|
24
24
|
in this case
|
|
25
25
|
*/
|
|
26
26
|
export default function modelForMixin(store: Store, normalizedModelName: string): Model | null {
|
|
27
|
-
let owner = getOwner(store);
|
|
27
|
+
let owner: any = getOwner(store);
|
|
28
28
|
let MaybeMixin = owner.factoryFor(`mixin:${normalizedModelName}`);
|
|
29
29
|
let mixin = MaybeMixin && MaybeMixin.class;
|
|
30
30
|
if (mixin) {
|
|
@@ -2,6 +2,7 @@ const path = require('path');
|
|
|
2
2
|
|
|
3
3
|
const testInfo = require('ember-cli-test-info');
|
|
4
4
|
const useTestFrameworkDetector = require('@ember-data/private-build-infra/src/utilities/test-framework-detector');
|
|
5
|
+
const modulePrefixForProject = require('@ember-data/private-build-infra/src/utilities/module-prefix-for-project');
|
|
5
6
|
|
|
6
7
|
const ModelBlueprint = require('../model');
|
|
7
8
|
|
|
@@ -25,6 +26,7 @@ module.exports = useTestFrameworkDetector({
|
|
|
25
26
|
const result = ModelBlueprint.locals.apply(this, arguments);
|
|
26
27
|
|
|
27
28
|
result.friendlyTestDescription = testInfo.description(options.entity.name, 'Unit', 'Model');
|
|
29
|
+
result.modulePrefix = modulePrefixForProject(options.project);
|
|
28
30
|
|
|
29
31
|
return result;
|
|
30
32
|
},
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { expect } from 'chai';
|
|
2
2
|
import { describe, it } from 'mocha';
|
|
3
|
-
import { setupTest } from '<%=
|
|
3
|
+
import { setupTest } from '<%= modulePrefix %>/tests/helpers';
|
|
4
4
|
|
|
5
5
|
describe('<%= friendlyTestDescription %>', function() {
|
|
6
6
|
setupTest();
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@ember-data/model",
|
|
3
|
-
"version": "4.5.0-alpha.
|
|
3
|
+
"version": "4.5.0-alpha.5",
|
|
4
4
|
"description": "The default blueprint for ember-cli addons.",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"ember-addon"
|
|
@@ -18,12 +18,12 @@
|
|
|
18
18
|
"test:node": "mocha"
|
|
19
19
|
},
|
|
20
20
|
"dependencies": {
|
|
21
|
-
"@ember-data/canary-features": "4.5.0-alpha.
|
|
22
|
-
"@ember-data/private-build-infra": "4.5.0-alpha.
|
|
23
|
-
"@ember-data/store": "4.5.0-alpha.
|
|
21
|
+
"@ember-data/canary-features": "4.5.0-alpha.5",
|
|
22
|
+
"@ember-data/private-build-infra": "4.5.0-alpha.5",
|
|
23
|
+
"@ember-data/store": "4.5.0-alpha.5",
|
|
24
24
|
"@ember/edition-utils": "^1.2.0",
|
|
25
25
|
"@ember/string": "^3.0.0",
|
|
26
|
-
"ember-auto-import": "^2.2
|
|
26
|
+
"ember-auto-import": "^2.4.2",
|
|
27
27
|
"ember-cached-decorator-polyfill": "^0.1.4",
|
|
28
28
|
"ember-cli-babel": "^7.26.11",
|
|
29
29
|
"ember-cli-string-utils": "^1.1.0",
|
|
@@ -33,11 +33,11 @@
|
|
|
33
33
|
"inflection": "~1.13.1"
|
|
34
34
|
},
|
|
35
35
|
"devDependencies": {
|
|
36
|
-
"@ember-data/unpublished-test-infra": "4.5.0-alpha.
|
|
36
|
+
"@ember-data/unpublished-test-infra": "4.5.0-alpha.5",
|
|
37
37
|
"@ember/optional-features": "^2.0.0",
|
|
38
|
-
"@ember/test-helpers": "
|
|
38
|
+
"@ember/test-helpers": "~2.7.0",
|
|
39
39
|
"broccoli-asset-rev": "^3.0.0",
|
|
40
|
-
"ember-cli": "~4.
|
|
40
|
+
"ember-cli": "~4.5.0",
|
|
41
41
|
"ember-cli-blueprint-test-helpers": "^0.19.1",
|
|
42
42
|
"ember-cli-dependency-checker": "^3.3.1",
|
|
43
43
|
"ember-cli-htmlbars": "^6.0.1",
|
|
@@ -50,23 +50,24 @@
|
|
|
50
50
|
"ember-maybe-import-regenerator": "^1.0.0",
|
|
51
51
|
"ember-qunit": "^5.1.5",
|
|
52
52
|
"ember-resolver": "^8.0.3",
|
|
53
|
-
"ember-source": "~4.
|
|
53
|
+
"ember-source": "~4.5.0",
|
|
54
54
|
"ember-source-channel-url": "^3.0.0",
|
|
55
55
|
"ember-try": "^2.0.0",
|
|
56
56
|
"loader.js": "^4.7.0",
|
|
57
57
|
"qunit": "^2.17.0",
|
|
58
58
|
"qunit-dom": "^2.0.0",
|
|
59
59
|
"silent-error": "^1.1.1",
|
|
60
|
-
"webpack": "^5.
|
|
60
|
+
"webpack": "^5.73.0"
|
|
61
61
|
},
|
|
62
62
|
"engines": {
|
|
63
|
-
"node": "12.* || >= 14.*"
|
|
63
|
+
"node": "12.* || >= 14.*",
|
|
64
|
+
"yarn": "1.22.19"
|
|
64
65
|
},
|
|
65
66
|
"ember-addon": {
|
|
66
67
|
"configPath": "tests/dummy/config"
|
|
67
68
|
},
|
|
68
69
|
"volta": {
|
|
69
|
-
"node": "
|
|
70
|
-
"yarn": "1.22.
|
|
70
|
+
"node": "16.16.0",
|
|
71
|
+
"yarn": "1.22.19"
|
|
71
72
|
}
|
|
72
73
|
}
|