Merge pull request #3995 from rwjblue/embed-shims

[BUGFIX beta] Implement public module API.

addon/adapter.js

@@ -0,0 +1 @@
+export { default } from "ember-data/-private/system/adapter";

addon/adapters/json-api.js

@@ -0,0 +1 @@
+export { default } from "ember-data/-private/adapters/json-api-adapter";

addon/adapters/rest.js

@@ -0,0 +1 @@
+export { default } from "ember-data/-private/adapters/rest-adapter";

addon/attr.js

@@ -0,0 +1 @@
+export { default } from "ember-data/-private/system/model/attributes";

addon/model.js

@@ -0,0 +1 @@
+export { default } from "ember-data/-private/system/model";

addon/relationships.js

@@ -0,0 +1 @@
+export * from 'ember-data/-private/system/relationships';

addon/serializers/json-api.js

@@ -0,0 +1 @@
+export { default } from "ember-data/-private/serializers/json-api-serializer";

addon/serializers/json.js

@@ -0,0 +1 @@
+export { default } from "ember-data/-private/serializers/json-serializer";

addon/serializers/rest.js

@@ -0,0 +1 @@
+export { default } from "ember-data/-private/serializers/rest-serializer";

addon/store.js

@@ -0,0 +1 @@
+export { default } from "ember-data/-private/system/store";

addon/transform.js

@@ -0,0 +1 @@
+export { default } from "ember-data/-private/transforms/base";

index.js

@@ -4,10 +4,59 @@
 module.exports = {
   name: 'ember-data',
 
+  _warn: function(message) {
+    var chalk = require('chalk');
+    var warning = chalk.yellow('WARNING: ' + message);
+
+    if (this.ui && this.ui.writeWarnLine) {
+      this.ui.writeWarnLine(message);
+    } else if (this.ui) {
+      this.ui.writeLine(warning);
+    } else {
+      console.log(warning);
+    }
+  },
+
+  init: function() {
+    var bowerDeps = this.project.bowerDependencies();
+
+    if (bowerDeps['ember-data']) {
+      this._warn('Please remove `ember-data` from `bower.json`. As of Ember Data 2.3.0, only the NPM package is needed.');
+      this._forceBowerUsage = true;
+    } else {
+      this._forceBowerUsage = false;
+    }
+
+    var VersionChecker = require('ember-cli-version-checker');
+
+    var checker = new VersionChecker(this);
+    var dep = checker.for('ember-cli-shims', 'bower');
+
+    if (!dep.satisfies('>= 0.1.0')) {
+      this._warn('Using a version of ember-cli-shims prior to 0.1.0 will cause errors while loading Ember Data 2.3+. Please update ember-cli-shims from ' + dep.version + ' to 0.1.0.');
+    }
+  },
+
   treeForAddon: function(dir) {
+    if (this._forceBowerUsage) {
+      // Fakes an empty broccoli tree
+      return { inputTree: dir, rebuild: function() { return []; } };
+    }
+
     var version      = require('./lib/version');
     var merge        = require('broccoli-merge-trees');
 
     return this._super.treeForAddon.call(this, merge([version(), dir]));
+  },
+
+  included: function(app) {
+    this._super.included.apply(this, arguments);
+
+    if (this._forceBowerUsage) {
+      this.app.import({
+        development: app.bowerDirectory + '/ember-data/ember-data.js',
+        production: app.bowerDirectory + '/ember-data/ember-data.prod.js'
+      });
+    }
   }
 };

lib/ember-data-shims.js

@@ -0,0 +1,36 @@
+;(function() {
+  function processEmberDataShims() {
+    var shims = {
+      'ember-data':                          { default: DS },
+      'ember-data/model':                    { default: DS.Model },
+      'ember-data/serializers/rest':         { default: DS.RESTSerializer },
+      'ember-data/serializers/active-model': { default: DS.ActiveModelSerializer },
+      'ember-data/serializers/json':         { default: DS.JSONSerializer },
+      'ember-data/serializers/json-api':     { default: DS.JSONAPISerializer },
+      'ember-data/adapters/json-api':        { default: DS.JSONAPIAdapter },
+      'ember-data/adapters/rest':            { default: DS.RESTAdapter },
+      'ember-data/adapter':                  { default: DS.Adapter },
+      'ember-data/adapters/active-model':    { default: DS.ActiveModelAdapter },
+      'ember-data/store':                    { default: DS.Store },
+      'ember-data/transform':                { default: DS.Transform },
+      'ember-data/attr':                     { default: DS.attr },
+      'ember-data/relationships':            { hasMany: DS.hasMany, belongsTo: DS.belongsTo }
+    };
+
+    for (var moduleName in shims) {
+      generateModule(moduleName, shims[moduleName]);
+    }
+  }
+
+  function generateModule(name, values) {
+    define(name, [], function() {
+      'use strict';
+
+      return values;
+    });
+  }
+
+  if (typeof define !== 'undefined' && define && define.petal) {
+    processEmberDataShims();
+  }
+})();

lib/javascripts.js

@@ -105,12 +105,15 @@ function collapse(tree, outputFileName) {
   var license = new Funnel(generatorDir, {include: ['license.js']});
   license = versionReplace(license);
 
+  var emberDataShimsPath = path.join(__dirname, 'ember-data-shims.js');
+  var emberDataShims = fs.readFileSync(emberDataShimsPath, { encoding: 'utf8' });
+
   var withLoader = merge([tree, loader, license, emberShim]);
   return concat(withLoader, {
     inputFiles: ['license.js', 'loader.js', '**/*.js'],
     outputFile: '/' + outputFileName,
     header: '(function(){ \n"use strict";\n',
-    footer: '\nrequire("ember-data");\n})();\n'
+    footer: '\nrequire("ember-data");\n})();\n' + emberDataShims
   });
 }
 

package.json

@@ -15,7 +15,6 @@
     "bower": "bower install",
     "production": "ember build --environment=production"
   },
-  "repository": "",
   "engines": {
     "node": ">= 0.10.0"
   },
@@ -24,7 +23,9 @@
   "dependencies": {
     "broccoli-file-creator": "^1.0.0",
     "broccoli-merge-trees": "^1.0.0",
-    "ember-cli-babel": "^5.1.3"
+    "chalk": "^1.1.1",
+    "ember-cli-babel": "^5.1.3",
+    "ember-cli-version-checker": "^1.1.4"
   },
   "devDependencies": {
     "babel-plugin-feature-flags": "^0.2.0",

tests/dummy/config/environment.js

@@ -1,16 +1,22 @@
 /* jshint node: true */
 
+var fs = require('fs');
+var featuresJson = fs.readFileSync('config/features.json', { encoding: 'utf8' });
+var featureFlags = JSON.parse(featuresJson);
+
 module.exports = function(environment) {
   var ENV = {
     modulePrefix: 'dummy',
     environment: environment,
     baseURL: '/',
     locationType: 'auto',
     EmberENV: {
-      FEATURES: {
-        // Here you can enable experimental features on an ember canary build
-        // e.g. 'with-controller': true
-      }
+      FEATURES: featureFlags,
+      ENABLE_DS_FILTER: true,
+
+      // don't raise on deprecation yet, since there are too many thrown errors;
+      // this should be addressed in another PR
+      // RAISE_ON_DEPRECATION: true
     },
 
     APP: {
@@ -19,6 +25,10 @@ module.exports = function(environment) {
     }
   };
 
+  if (environment === 'test-optional-features') {
+    ENV.EmberENV.ENABLE_OPTIONAL_FEATURES = true;
+  }
+
   if (environment === 'development') {
     // ENV.APP.LOG_RESOLVER = true;
     // ENV.APP.LOG_ACTIVE_GENERATION = true;