Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 30 additions & 2 deletions addon/ember-data.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,11 @@
import require from 'require';
import config from 'ember-get-config';
import assert from './assert';
import { hasEmberData, isDsModel } from 'ember-cli-mirage/utils/ember-data';
import {
hasEmberData,
isDsModel,
AppSymbolForEmberDataModels,
} from 'ember-cli-mirage/utils/ember-data';
import { Model, belongsTo, hasMany } from 'miragejs';
import EmberDataSerializer from 'ember-cli-mirage/serializers/ember-data-serializer';
import { _utilsInflectorCamelize as camelize } from 'miragejs';
Expand All @@ -14,6 +18,19 @@ const { modulePrefix, podModulePrefix } = config;
let DsModels, Models;
let DsSerializers, Serializers;

function _getAppInstance() {
const application = window[AppSymbolForEmberDataModels];
let appInstance = application.__deprecatedInstance__;
// If an appInstance wasn't found (such as when running the tests)
// then instantiate one manually, so we can use it to discover the
// ember-data models in a way that doesn't trigger deprecations.
if (!appInstance) {
application._buildDeprecatedInstance();
appInstance = application.__deprecatedInstance__;
}
return appInstance;
}

/**
* Get all ember data models under the app's namespaces
*
Expand Down Expand Up @@ -45,8 +62,19 @@ export function getDsModels() {
path.match(classicModelMatchRegex) || path.match(podModelMatchRegex);
if (matches && matches[1]) {
let modelName = matches[1];
let model = undefined;

// Use the appInstance to lookup the models if provided, to avoid triggering
// the ember-data:deprecate-early-static deprecation in ember-data
const appInstance = _getAppInstance();
if (appInstance) {
const modelNameExact = path.split('/models/')[1];
const store = appInstance.lookup('service:store');
model = store.modelFor(modelNameExact);
} else {
model = require(path, null, null, true).default;
}

let model = require(path, null, null, true).default;
if (isDsModel(model)) {
DsModels[modelName] = model;
}
Expand Down
7 changes: 7 additions & 0 deletions addon/utils/ember-data.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,10 @@ export const hasEmberData = dependencySatisfies('ember-data', '*');
export function isDsModel(m) {
return m && typeof m.eachRelationship === 'function';
}

/**
@hide
*/
export const AppSymbolForEmberDataModels = Symbol(
'AppSymbolForEmberDataModels'
);
3 changes: 3 additions & 0 deletions app/initializers/ember-cli-mirage.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import ENV from '../config/environment';
import getRfc232TestContext from 'ember-cli-mirage/get-rfc232-test-context';
import startMirageImpl from 'ember-cli-mirage/start-mirage';
import * as config from '../mirage/config';
import { AppSymbolForEmberDataModels } from 'ember-cli-mirage/utils/ember-data';
const { default: baseConfig, testConfig, makeServer } = config;

//
Expand All @@ -16,6 +17,8 @@ const { default: baseConfig, testConfig, makeServer } = config;
export default {
name: 'ember-cli-mirage',
initialize(application) {
window[AppSymbolForEmberDataModels] = application;

if (baseConfig) {
application.register('mirage:base-config', baseConfig, {
instantiate: false,
Expand Down