Implement new module shims

lib/ember/addon/application/deprecations.js

@@ -0,0 +1,3 @@
+import Ember from 'ember';
+export const deprecate = Ember.deprecate;
+export const deprecateFunc = Ember.deprecateFunc;

lib/ember/addon/application/globals-resolver.js

@@ -0,0 +1,2 @@
+import Ember from 'ember';
+export default Ember.DefaultResolver;

lib/ember/addon/application/index.js

@@ -0,0 +1,6 @@
+import Ember from 'ember';
+export const onLoad = Ember.onLoad;
+export const runLoadHooks = Ember.runLoadHooks;
+export const getOwner = Ember.getOwner;
+export const setOwner = Ember.setOwner;
+export default Ember.Application;

lib/ember/addon/application/resolver.js

@@ -0,0 +1,2 @@
+import Ember from 'ember';
+export default Ember.Resolver;

lib/ember/addon/array/index.js

@@ -0,0 +1,5 @@
+import Ember from 'ember';
+export const A = Ember.A;
+export const isArray = Ember.isArray;
+export const makeArray = Ember.makeArray;
+export default Ember.Array;

lib/ember/addon/array/mutable.js

@@ -0,0 +1,2 @@
+import Ember from 'ember';
+export default Ember.MutableArray;

lib/ember/addon/array/proxy.js

@@ -0,0 +1,2 @@
+import Ember from 'ember';
+export default Ember.ArrayProxy;

lib/ember/addon/component/checkbox.js

@@ -0,0 +1,2 @@
+import Ember from 'ember';
+export default Ember.Checkbox;

lib/ember/addon/component/helper.js

@@ -0,0 +1,3 @@
+import Ember from 'ember';
+export const helper = Ember.Helper.helper;
+export default Ember.Helper;

lib/ember/addon/component/index.js

@@ -0,0 +1,2 @@
+import Ember from 'ember';
+export default Ember.Component;

lib/ember/addon/component/text-area.js

@@ -0,0 +1,2 @@
+import Ember from 'ember';
+export default Ember.TextArea;

lib/ember/addon/component/text-field.js

@@ -0,0 +1,2 @@
+import Ember from 'ember';
+export default Ember.TextField;

lib/ember/addon/controller/index.js

@@ -0,0 +1,3 @@
+import Ember from 'ember';
+export const inject = Ember.inject.controller;
+export default Ember.Controller;

lib/ember/addon/debug/container-adapter.js

@@ -0,0 +1,2 @@
+import Ember from 'ember';
+export default Ember.ContainerDebugAdapter;

lib/ember/addon/debug/data-adapter.js

@@ -0,0 +1,2 @@
+import Ember from 'ember';
+export default Ember.DataAdapter;

lib/ember/addon/debug/index.js

@@ -0,0 +1,6 @@
+import Ember from 'ember';
+export const assert = Ember.assert;
+export const debug = Ember.debug;
+export const inspect = Ember.inspect;
+export const runInDebug = Ember.runInDebug;
+export const warn = Ember.warn;

lib/ember/addon/enumerable/index.js

@@ -0,0 +1,2 @@
+import Ember from 'ember';
+export default Ember.Enumerable;

lib/ember/addon/instrumentation/index.js

@@ -0,0 +1,5 @@
+import Ember from 'ember';
+export const instrument = Ember.instrument;
+export const reset = Ember.reset;
+export const subscribe = Ember.subscribe;
+export const unsubscribe = Ember.unsubscribe;

lib/ember/addon/map/index.js

@@ -0,0 +1,2 @@
+import Ember from 'ember';
+export default Ember.Map;

lib/ember/addon/map/with-default.js

@@ -0,0 +1,2 @@
+import Ember from 'ember';
+export default Ember.MapWithDefault;

lib/ember/addon/object/computed.js

@@ -0,0 +1,34 @@
+import Ember from 'ember';
+export const alias = Ember.computed.alias;
+export const and = Ember.computed.and;
+export const bool = Ember.computed.bool;
+export const collect = Ember.computed.collect;
+export const deprecatingAlias = Ember.computed.deprecatingAlias;
+export const empty = Ember.computed.empty;
+export const equal = Ember.computed.equal;
+export const filter = Ember.computed.filter;
+export const filterBy = Ember.computed.filterBy;
+export const filterProperty = Ember.computed.filterProperty;
+export const gt = Ember.computed.gt;
+export const gte = Ember.computed.gte;
+export const intersect = Ember.computed.intersect;
+export const lt = Ember.computed.lt;
+export const lte = Ember.computed.lte;
+export const map = Ember.computed.map;
+export const mapBy = Ember.computed.mapBy;
+export const mapProperty = Ember.computed.mapProperty;
+export const match = Ember.computed.match;
+export const max = Ember.computed.max;
+export const min = Ember.computed.min;
+export const none = Ember.computed.none;
+export const not = Ember.computed.not;
+export const notEmpty = Ember.computed.notEmpty;
+export const oneWay = Ember.computed.oneWay;
+export const or = Ember.computed.or;
+export const readOnly = Ember.computed.readOnly;
+export const reads = Ember.computed.reads;
+export const setDiff = Ember.computed.setDiff;
+export const sort = Ember.computed.sort;
+export const sum = Ember.computed.sum;
+export const union = Ember.computed.union;
+export const uniq = Ember.computed.uniq;

lib/ember/addon/object/evented.js

@@ -0,0 +1,3 @@
+import Ember from 'ember';
+export const on = Ember.on;
+export default Ember.Evented;

lib/ember/addon/object/events.js

@@ -0,0 +1,4 @@
+import Ember from 'ember';
+export const addListener = Ember.addListener;
+export const removeListener = Ember.removeListener;
+export const sendEvent = Ember.sendEvent;

lib/ember/addon/object/index.js

@@ -0,0 +1,10 @@
+import Ember from 'ember';
+export const aliasMethod = Ember.aliasMethod;
+export const computed = Ember.computed;
+export const get = Ember.get;
+export const getProperties = Ember.getProperties;
+export const observer = Ember.observer;
+export const set = Ember.set;
+export const setProperties = Ember.setProperties;
+export const trySet = Ember.trySet;
+export default Ember.Object;

lib/ember/addon/object/internals.js

@@ -0,0 +1,4 @@
+import Ember from 'ember';
+export const cacheFor = Ember.cacheFor;
+export const copy = Ember.copy;
+export const guidFor = Ember.guidFor;

lib/ember/addon/object/mixin.js

@@ -0,0 +1,2 @@
+import Ember from 'ember';
+export default Ember.Mixin;

lib/ember/addon/object/observers.js

@@ -0,0 +1,2 @@
+import Ember from 'ember';
+export const addObserver = Ember.addObserver;

lib/ember/addon/polyfills/index.js

@@ -0,0 +1,6 @@
+import Ember from 'ember';
+export const assign = Ember.assign;
+export const create = Ember.create;
+export const defineProperty = Ember.platform.defineProperty;
+export const hasPropertyAccessors = Ember.platform.hasPropertyAccessors;
+export const keys = Ember.keys;

lib/ember/addon/routing/auto-location.js

@@ -0,0 +1,2 @@
+import Ember from 'ember';
+export default Ember.AutoLocation;

lib/ember/addon/routing/hash-location.js

@@ -0,0 +1,2 @@
+import Ember from 'ember';
+export default Ember.HashLocation;

lib/ember/addon/routing/history-location.js

@@ -0,0 +1,2 @@
+import Ember from 'ember';
+export default Ember.HistoryLocation;

lib/ember/addon/routing/link-component.js

@@ -0,0 +1,2 @@
+import Ember from 'ember';
+export default Ember.LinkComponent;

lib/ember/addon/routing/location.js

@@ -0,0 +1,2 @@
+import Ember from 'ember';
+export default Ember.Location;

lib/ember/addon/routing/none-location.js

@@ -0,0 +1,2 @@
+import Ember from 'ember';
+export default Ember.NoneLocation;

lib/ember/addon/routing/route.js

@@ -0,0 +1,2 @@
+import Ember from 'ember';
+export default Ember.Route;

lib/ember/addon/routing/router.js

@@ -0,0 +1,2 @@
+import Ember from 'ember';
+export default Ember.Router;

lib/ember/addon/runloop/index.js

@@ -0,0 +1,14 @@
+import Ember from 'ember';
+export const run = Ember.run;
+export const begin = Ember.run.begin;
+export const bind = Ember.run.bind;
+export const cancel = Ember.run.cancel;
+export const debounce = Ember.run.debounce;
+export const end = Ember.run.end;
+export const join = Ember.run.join;
+export const later = Ember.run.later;
+export const next = Ember.run.next;
+export const once = Ember.run.once;
+export const schedule = Ember.run.schedule;
+export const scheduleOnce = Ember.run.scheduleOnce;
+export const throttle = Ember.run.throttle;

lib/ember/addon/service/index.js

@@ -0,0 +1,3 @@
+import Ember from 'ember';
+export const inject = Ember.inject.service;
+export default Ember.Service;

lib/ember/addon/string/index.js

@@ -0,0 +1,12 @@
+import Ember from 'ember';
+export const camelize = Ember.String.camelize;
+export const capitalize = Ember.String.capitalize;
+export const classify = Ember.String.classify;
+export const dasherize = Ember.String.dasherize;
+export const decamelize = Ember.String.decamelize;
+export const fmt = Ember.String.fmt;
+export const htmlSafe = Ember.String.htmlSafe;
+export const isHTMLSafe = Ember.String.isHTMLSafe;
+export const loc = Ember.String.loc;
+export const underscore = Ember.String.underscore;
+export const w = Ember.String.w;

lib/ember/addon/utils/index.js

@@ -0,0 +1,9 @@
+import Ember from 'ember';
+export const isArray = Ember.isArray;
+export const isBlank = Ember.isBlank;
+export const isEmpty = Ember.isEmpty;
+export const isEqual = Ember.isEqual;
+export const isNone = Ember.isNone;
+export const isPresent = Ember.isPresent;
+export const tryInvoke = Ember.tryInvoke;
+export const typeOf = Ember.typeOf;

lib/ember/index.js

@@ -0,0 +1,3 @@
+module.exports = {
+  name: '@ember'
+};

lib/ember/package.json

@@ -0,0 +1,6 @@
+{
+  "name": "@ember",
+  "keywords": [
+    "ember-addon"
+  ]
+}

lib/jquery/addon/index.js

@@ -0,0 +1,2 @@
+import Ember from 'ember';
+export default Ember.$;

lib/jquery/index.js

@@ -0,0 +1,3 @@
+module.exports = {
+  name: 'jquery'
+};

lib/jquery/package.json

@@ -0,0 +1,6 @@
+{
+  "name": "jquery",
+  "keywords": [
+    "ember-addon"
+  ]
+}

lib/rsvp/addon/index.js

@@ -0,0 +1,2 @@
+import Ember from 'ember';
+export default Ember.RSVP;

lib/rsvp/index.js

@@ -0,0 +1,3 @@
+module.exports = {
+  name: 'rsvp'
+};

lib/rsvp/package.json

@@ -0,0 +1,6 @@
+{
+  "name": "rsvp",
+  "keywords": [
+    "ember-addon"
+  ]
+}

package.json

@@ -45,6 +45,11 @@
     "node": ">= 4"
   },
   "ember-addon": {
-    "configPath": "tests/dummy/config"
+    "configPath": "tests/dummy/config",
+    "paths": [
+      "lib/ember",
+      "lib/jquery",
+      "lib/rsvp"
+    ]
   }
 }

vendor/ember-cli-shims/app-shims.js

@@ -3,9 +3,6 @@
 
   function processEmberShims() {
     var shims = {
-      'ember': {
-        'default': Ember
-      },
       'ember-application': {
         'default': Ember.Application
       },
@@ -218,7 +215,7 @@
     }
 
     for (var moduleName in shims) {
-      generateModule(moduleName, shims[moduleName]);
+      generateModule(moduleName, shims[moduleName], true);
     }
   }
 
@@ -242,10 +239,16 @@
     }
   }
 
-  function generateModule(name, values) {
+  function generateModule(name, values, deprecated) {
     define(name, [], function() {
       'use strict';
 
+      Ember.deprecate('Importing the module `' + name +'` has been deprecated. Please use the new module imports.', !deprecated, {
+        id: 'ember-cli-shims.deprecated-shims',
+        until: '3.0.0',
+        url: 'https://github.com/emberjs/rfcs/blob/master/text/0176-javascript-module-api.md'
+      });
+
       Object.defineProperty(values, '__esModule', {
         value: true
       });
@@ -254,8 +257,7 @@
     });
   }
 
+  generateModule('ember', { default: Ember });
   processEmberShims();
   processTestShims();
-  generateModule('jquery', { 'default': self.jQuery });
-  generateModule('rsvp', { 'default': Ember.RSVP });
 })();