Correct import of Ember Data model blueprint

[backspace]

As suggested by @fsmanuel, this fixes @fredguth’s error generating a model.

I’m not sure how this fix should affect the version number. Or maybe some kind of dual import should happen, to keep backward compatibility. Thoughts?

For now, @fredguth, you could just edit node_modules/ember-pouch/blueprints/pouch-model/index.js with this change and you’d be able to generate the model.

[fsmanuel]

@backspace nice! what you can do is wrap the require in a try catch:

var ModelBlueprint;

try {
  ModelBlueprint = require('ember-data/blueprints/model');
} catch (e) {
  ModelBlueprint = require('ember-cli/blueprints/model');
}

module.exports = ModelBlueprint;

so we have a fallback to ember-cli.

[backspace]

Oh yes, good idea @fsmanuel, thanks. I rewrote the commit with that solution.

[fsmanuel]

👍

[simonexmachina]

@backspace and @nolanlawson: is there any reason this shouldn't be merged already? Looks like a straighforward bug-fix and patch release to me.