fixes

emberjs · Nov 28, 2019 · 3bbc431 · 3bbc431
1 parent 1dae202
commit 3bbc431
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 11 deletions.
diff --git a/packages/model/addon/-private/system/promise-many-array.js b/packages/model/addon/-private/system/promise-many-array.js
@@ -24,6 +24,7 @@ import { PromiseArray, proxyToContent } from '@ember-data/store/-private';
 
   @class PromiseManyArray
   @extends Ember.ArrayProxy
+  @private
 */
 const PromiseManyArray = PromiseArray.extend({
   links: FULL_LINKS_ON_RELATIONSHIPS ? reads('content.links') : undefined,

diff --git a/packages/model/addon/index.ts b/packages/model/addon/index.ts
@@ -39,4 +39,4 @@
   @public
  */
 
-export { Model as default, attr, belongsTo, hasMany, ManyArray, PromiseManyArray } from './-private';
+export { Model as default, attr, belongsTo, hasMany } from './-private';
diff --git a/packages/store/addon/-private/system/model/internal-model.ts b/packages/store/addon/-private/system/model/internal-model.ts
@@ -43,8 +43,8 @@ type Relationships = import('@ember-data/record-data/-private/relationships/stat
 
 // move to TS hacks module that we can delete when this is no longer a necessary recast
 type ManyArray = InstanceType<typeof import('@ember-data/model/-private').ManyArray>;
-type PromiseBelongsTo = InstanceType<typeof import('@ember-data/model/-private').ManyArray>;
-type PromiseManyArray = InstanceType<typeof import('@ember-data/model/-private').ManyArray>;
+type PromiseBelongsTo = InstanceType<typeof import('@ember-data/model/-private').PromiseBelongsTo>;
+type PromiseManyArray = InstanceType<typeof import('@ember-data/model/-private').PromiseManyArray>;
 
 /**
   @module @ember-data/store
@@ -171,7 +171,9 @@ export default class InternalModel {
   error: any;
 
   constructor(public store: CoreStore | Store, public identifier: StableRecordIdentifier) {
-    _getModelPackage();
+    if (HAS_MODEL_PACKAGE) {
+      _getModelPackage();
+    }
     this._id = identifier.id;
     this.modelName = identifier.type;
     this.clientId = identifier.lid;

diff --git a/packages/store/index.js b/packages/store/index.js
@@ -7,12 +7,6 @@ const addonBaseConfig = addonBuildConfigForDataPackage(name);
 module.exports = Object.assign({}, addonBaseConfig, {
   shouldRollupPrivate: true,
   externalDependenciesForPrivateModule() {
-    return [
-      '@ember-data/canary-features',
-      'ember-inflector',
-      '@ember-data/store/-debug',
-      'require',
-      '@ember-data/model',
-    ];
+    return ['@ember-data/canary-features', 'ember-inflector', '@ember-data/store/-debug', 'require'];
   },
 });
-Original file line number
+Diff line change
@@ Expand Up / @@ -39,4 +39,4 @@ @@
       @public
      */
-    export { Model as default, attr, belongsTo, hasMany, ManyArray, PromiseManyArray } from './-private';
+    export { Model as default, attr, belongsTo, hasMany } from './-private';