diff --git a/lib/ember/addon/application/deprecations.js b/lib/ember/addon/application/deprecations.js new file mode 100644 index 0000000..f77d678 --- /dev/null +++ b/lib/ember/addon/application/deprecations.js @@ -0,0 +1,3 @@ +import Ember from 'ember'; +export const deprecate = Ember.deprecate; +export const deprecateFunc = Ember.deprecateFunc; diff --git a/lib/ember/addon/application/globals-resolver.js b/lib/ember/addon/application/globals-resolver.js new file mode 100644 index 0000000..b728002 --- /dev/null +++ b/lib/ember/addon/application/globals-resolver.js @@ -0,0 +1,2 @@ +import Ember from 'ember'; +export default Ember.DefaultResolver; diff --git a/lib/ember/addon/application/index.js b/lib/ember/addon/application/index.js new file mode 100644 index 0000000..a1a2f87 --- /dev/null +++ b/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; diff --git a/lib/ember/addon/application/resolver.js b/lib/ember/addon/application/resolver.js new file mode 100644 index 0000000..2b29a78 --- /dev/null +++ b/lib/ember/addon/application/resolver.js @@ -0,0 +1,2 @@ +import Ember from 'ember'; +export default Ember.Resolver; diff --git a/lib/ember/addon/array/index.js b/lib/ember/addon/array/index.js new file mode 100644 index 0000000..9e7f8e4 --- /dev/null +++ b/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; diff --git a/lib/ember/addon/array/mutable.js b/lib/ember/addon/array/mutable.js new file mode 100644 index 0000000..916ecf9 --- /dev/null +++ b/lib/ember/addon/array/mutable.js @@ -0,0 +1,2 @@ +import Ember from 'ember'; +export default Ember.MutableArray; diff --git a/lib/ember/addon/array/proxy.js b/lib/ember/addon/array/proxy.js new file mode 100644 index 0000000..16fbd69 --- /dev/null +++ b/lib/ember/addon/array/proxy.js @@ -0,0 +1,2 @@ +import Ember from 'ember'; +export default Ember.ArrayProxy; diff --git a/lib/ember/addon/component/checkbox.js b/lib/ember/addon/component/checkbox.js new file mode 100644 index 0000000..333951a --- /dev/null +++ b/lib/ember/addon/component/checkbox.js @@ -0,0 +1,2 @@ +import Ember from 'ember'; +export default Ember.Checkbox; diff --git a/lib/ember/addon/component/helper.js b/lib/ember/addon/component/helper.js new file mode 100644 index 0000000..87cb959 --- /dev/null +++ b/lib/ember/addon/component/helper.js @@ -0,0 +1,3 @@ +import Ember from 'ember'; +export const helper = Ember.Helper.helper; +export default Ember.Helper; diff --git a/lib/ember/addon/component/index.js b/lib/ember/addon/component/index.js new file mode 100644 index 0000000..933d225 --- /dev/null +++ b/lib/ember/addon/component/index.js @@ -0,0 +1,2 @@ +import Ember from 'ember'; +export default Ember.Component; diff --git a/lib/ember/addon/component/text-area.js b/lib/ember/addon/component/text-area.js new file mode 100644 index 0000000..ce01098 --- /dev/null +++ b/lib/ember/addon/component/text-area.js @@ -0,0 +1,2 @@ +import Ember from 'ember'; +export default Ember.TextArea; diff --git a/lib/ember/addon/component/text-field.js b/lib/ember/addon/component/text-field.js new file mode 100644 index 0000000..538ba2d --- /dev/null +++ b/lib/ember/addon/component/text-field.js @@ -0,0 +1,2 @@ +import Ember from 'ember'; +export default Ember.TextField; diff --git a/lib/ember/addon/controller/index.js b/lib/ember/addon/controller/index.js new file mode 100644 index 0000000..8552561 --- /dev/null +++ b/lib/ember/addon/controller/index.js @@ -0,0 +1,3 @@ +import Ember from 'ember'; +export const inject = Ember.inject.controller; +export default Ember.Controller; diff --git a/lib/ember/addon/debug/container-adapter.js b/lib/ember/addon/debug/container-adapter.js new file mode 100644 index 0000000..8fefd87 --- /dev/null +++ b/lib/ember/addon/debug/container-adapter.js @@ -0,0 +1,2 @@ +import Ember from 'ember'; +export default Ember.ContainerDebugAdapter; diff --git a/lib/ember/addon/debug/data-adapter.js b/lib/ember/addon/debug/data-adapter.js new file mode 100644 index 0000000..890ef8a --- /dev/null +++ b/lib/ember/addon/debug/data-adapter.js @@ -0,0 +1,2 @@ +import Ember from 'ember'; +export default Ember.DataAdapter; diff --git a/lib/ember/addon/debug/index.js b/lib/ember/addon/debug/index.js new file mode 100644 index 0000000..0b9213d --- /dev/null +++ b/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; diff --git a/lib/ember/addon/enumerable/index.js b/lib/ember/addon/enumerable/index.js new file mode 100644 index 0000000..fdd2f99 --- /dev/null +++ b/lib/ember/addon/enumerable/index.js @@ -0,0 +1,2 @@ +import Ember from 'ember'; +export default Ember.Enumerable; diff --git a/lib/ember/addon/instrumentation/index.js b/lib/ember/addon/instrumentation/index.js new file mode 100644 index 0000000..cc90ff5 --- /dev/null +++ b/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; diff --git a/lib/ember/addon/map/index.js b/lib/ember/addon/map/index.js new file mode 100644 index 0000000..fed8c94 --- /dev/null +++ b/lib/ember/addon/map/index.js @@ -0,0 +1,2 @@ +import Ember from 'ember'; +export default Ember.Map; diff --git a/lib/ember/addon/map/with-default.js b/lib/ember/addon/map/with-default.js new file mode 100644 index 0000000..2f6cd28 --- /dev/null +++ b/lib/ember/addon/map/with-default.js @@ -0,0 +1,2 @@ +import Ember from 'ember'; +export default Ember.MapWithDefault; diff --git a/lib/ember/addon/object/computed.js b/lib/ember/addon/object/computed.js new file mode 100644 index 0000000..9ce582d --- /dev/null +++ b/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; diff --git a/lib/ember/addon/object/evented.js b/lib/ember/addon/object/evented.js new file mode 100644 index 0000000..0111244 --- /dev/null +++ b/lib/ember/addon/object/evented.js @@ -0,0 +1,3 @@ +import Ember from 'ember'; +export const on = Ember.on; +export default Ember.Evented; diff --git a/lib/ember/addon/object/events.js b/lib/ember/addon/object/events.js new file mode 100644 index 0000000..f391e2f --- /dev/null +++ b/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; diff --git a/lib/ember/addon/object/index.js b/lib/ember/addon/object/index.js new file mode 100644 index 0000000..d94e51e --- /dev/null +++ b/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; diff --git a/lib/ember/addon/object/internals.js b/lib/ember/addon/object/internals.js new file mode 100644 index 0000000..6b1287a --- /dev/null +++ b/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; diff --git a/lib/ember/addon/object/mixin.js b/lib/ember/addon/object/mixin.js new file mode 100644 index 0000000..2f0ac2e --- /dev/null +++ b/lib/ember/addon/object/mixin.js @@ -0,0 +1,2 @@ +import Ember from 'ember'; +export default Ember.Mixin; diff --git a/lib/ember/addon/object/observers.js b/lib/ember/addon/object/observers.js new file mode 100644 index 0000000..1947c2e --- /dev/null +++ b/lib/ember/addon/object/observers.js @@ -0,0 +1,2 @@ +import Ember from 'ember'; +export const addObserver = Ember.addObserver; diff --git a/lib/ember/addon/polyfills/index.js b/lib/ember/addon/polyfills/index.js new file mode 100644 index 0000000..7daa47e --- /dev/null +++ b/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; diff --git a/lib/ember/addon/routing/auto-location.js b/lib/ember/addon/routing/auto-location.js new file mode 100644 index 0000000..196c9ee --- /dev/null +++ b/lib/ember/addon/routing/auto-location.js @@ -0,0 +1,2 @@ +import Ember from 'ember'; +export default Ember.AutoLocation; diff --git a/lib/ember/addon/routing/hash-location.js b/lib/ember/addon/routing/hash-location.js new file mode 100644 index 0000000..e618a7e --- /dev/null +++ b/lib/ember/addon/routing/hash-location.js @@ -0,0 +1,2 @@ +import Ember from 'ember'; +export default Ember.HashLocation; diff --git a/lib/ember/addon/routing/history-location.js b/lib/ember/addon/routing/history-location.js new file mode 100644 index 0000000..a6f6613 --- /dev/null +++ b/lib/ember/addon/routing/history-location.js @@ -0,0 +1,2 @@ +import Ember from 'ember'; +export default Ember.HistoryLocation; diff --git a/lib/ember/addon/routing/link-component.js b/lib/ember/addon/routing/link-component.js new file mode 100644 index 0000000..1d63f3c --- /dev/null +++ b/lib/ember/addon/routing/link-component.js @@ -0,0 +1,2 @@ +import Ember from 'ember'; +export default Ember.LinkComponent; diff --git a/lib/ember/addon/routing/location.js b/lib/ember/addon/routing/location.js new file mode 100644 index 0000000..be87a46 --- /dev/null +++ b/lib/ember/addon/routing/location.js @@ -0,0 +1,2 @@ +import Ember from 'ember'; +export default Ember.Location; diff --git a/lib/ember/addon/routing/none-location.js b/lib/ember/addon/routing/none-location.js new file mode 100644 index 0000000..5634885 --- /dev/null +++ b/lib/ember/addon/routing/none-location.js @@ -0,0 +1,2 @@ +import Ember from 'ember'; +export default Ember.NoneLocation; diff --git a/lib/ember/addon/routing/route.js b/lib/ember/addon/routing/route.js new file mode 100644 index 0000000..8c5a4e3 --- /dev/null +++ b/lib/ember/addon/routing/route.js @@ -0,0 +1,2 @@ +import Ember from 'ember'; +export default Ember.Route; diff --git a/lib/ember/addon/routing/router.js b/lib/ember/addon/routing/router.js new file mode 100644 index 0000000..e84fbad --- /dev/null +++ b/lib/ember/addon/routing/router.js @@ -0,0 +1,2 @@ +import Ember from 'ember'; +export default Ember.Router; diff --git a/lib/ember/addon/runloop/index.js b/lib/ember/addon/runloop/index.js new file mode 100644 index 0000000..76201ce --- /dev/null +++ b/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; diff --git a/lib/ember/addon/service/index.js b/lib/ember/addon/service/index.js new file mode 100644 index 0000000..da716d8 --- /dev/null +++ b/lib/ember/addon/service/index.js @@ -0,0 +1,3 @@ +import Ember from 'ember'; +export const inject = Ember.inject.service; +export default Ember.Service; diff --git a/lib/ember/addon/string/index.js b/lib/ember/addon/string/index.js new file mode 100644 index 0000000..7b6270a --- /dev/null +++ b/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; diff --git a/lib/ember/addon/utils/index.js b/lib/ember/addon/utils/index.js new file mode 100644 index 0000000..91ef53f --- /dev/null +++ b/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; diff --git a/lib/ember/index.js b/lib/ember/index.js new file mode 100644 index 0000000..fda0e4f --- /dev/null +++ b/lib/ember/index.js @@ -0,0 +1,3 @@ +module.exports = { + name: '@ember' +}; diff --git a/lib/ember/package.json b/lib/ember/package.json new file mode 100644 index 0000000..170b7bc --- /dev/null +++ b/lib/ember/package.json @@ -0,0 +1,6 @@ +{ + "name": "@ember", + "keywords": [ + "ember-addon" + ] +} diff --git a/lib/jquery/addon/index.js b/lib/jquery/addon/index.js new file mode 100644 index 0000000..fe97f1f --- /dev/null +++ b/lib/jquery/addon/index.js @@ -0,0 +1,2 @@ +import Ember from 'ember'; +export default Ember.$; diff --git a/lib/jquery/index.js b/lib/jquery/index.js new file mode 100644 index 0000000..c644cc1 --- /dev/null +++ b/lib/jquery/index.js @@ -0,0 +1,3 @@ +module.exports = { + name: 'jquery' +}; diff --git a/lib/jquery/package.json b/lib/jquery/package.json new file mode 100644 index 0000000..4b7fbf9 --- /dev/null +++ b/lib/jquery/package.json @@ -0,0 +1,6 @@ +{ + "name": "jquery", + "keywords": [ + "ember-addon" + ] +} diff --git a/lib/rsvp/addon/index.js b/lib/rsvp/addon/index.js new file mode 100644 index 0000000..cae4347 --- /dev/null +++ b/lib/rsvp/addon/index.js @@ -0,0 +1,2 @@ +import Ember from 'ember'; +export default Ember.RSVP; diff --git a/lib/rsvp/index.js b/lib/rsvp/index.js new file mode 100644 index 0000000..4868257 --- /dev/null +++ b/lib/rsvp/index.js @@ -0,0 +1,3 @@ +module.exports = { + name: 'rsvp' +}; diff --git a/lib/rsvp/package.json b/lib/rsvp/package.json new file mode 100644 index 0000000..c488168 --- /dev/null +++ b/lib/rsvp/package.json @@ -0,0 +1,6 @@ +{ + "name": "rsvp", + "keywords": [ + "ember-addon" + ] +} diff --git a/package.json b/package.json index ef676c7..dd4f688 100644 --- a/package.json +++ b/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" + ] } } diff --git a/vendor/ember-cli-shims/app-shims.js b/vendor/ember-cli-shims/app-shims.js index db185a2..d74758e 100644 --- a/vendor/ember-cli-shims/app-shims.js +++ b/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 }); })();