From c195eb48239d8fcae8621849f3cf186897dbe528 Mon Sep 17 00:00:00 2001 From: Robert Jackson Date: Sun, 2 Jul 2017 21:42:30 -0400 Subject: [PATCH 1/2] Revert "Implement new module shims" This reverts commit 162c1b6aaba04078c65419525c4b14ff7bfcdaa7. --- lib/ember/addon/application/deprecations.js | 3 -- .../addon/application/globals-resolver.js | 2 -- lib/ember/addon/application/index.js | 6 ---- lib/ember/addon/application/resolver.js | 2 -- lib/ember/addon/array/index.js | 5 --- lib/ember/addon/array/mutable.js | 2 -- lib/ember/addon/array/proxy.js | 2 -- lib/ember/addon/component/checkbox.js | 2 -- lib/ember/addon/component/helper.js | 3 -- lib/ember/addon/component/index.js | 2 -- lib/ember/addon/component/text-area.js | 2 -- lib/ember/addon/component/text-field.js | 2 -- lib/ember/addon/controller/index.js | 3 -- lib/ember/addon/debug/container-adapter.js | 2 -- lib/ember/addon/debug/data-adapter.js | 2 -- lib/ember/addon/debug/index.js | 6 ---- lib/ember/addon/enumerable/index.js | 2 -- lib/ember/addon/instrumentation/index.js | 5 --- lib/ember/addon/map/index.js | 2 -- lib/ember/addon/map/with-default.js | 2 -- lib/ember/addon/object/computed.js | 34 ------------------- lib/ember/addon/object/evented.js | 3 -- lib/ember/addon/object/events.js | 4 --- lib/ember/addon/object/index.js | 10 ------ lib/ember/addon/object/internals.js | 4 --- lib/ember/addon/object/mixin.js | 2 -- lib/ember/addon/object/observers.js | 2 -- lib/ember/addon/polyfills/index.js | 6 ---- lib/ember/addon/routing/auto-location.js | 2 -- lib/ember/addon/routing/hash-location.js | 2 -- lib/ember/addon/routing/history-location.js | 2 -- lib/ember/addon/routing/link-component.js | 2 -- lib/ember/addon/routing/location.js | 2 -- lib/ember/addon/routing/none-location.js | 2 -- lib/ember/addon/routing/route.js | 2 -- lib/ember/addon/routing/router.js | 2 -- lib/ember/addon/runloop/index.js | 14 -------- lib/ember/addon/service/index.js | 3 -- lib/ember/addon/string/index.js | 12 ------- lib/ember/addon/utils/index.js | 9 ----- lib/ember/index.js | 3 -- lib/ember/package.json | 9 ----- lib/jquery/addon/index.js | 2 -- lib/jquery/index.js | 3 -- lib/jquery/package.json | 9 ----- lib/rsvp/addon/index.js | 2 -- lib/rsvp/index.js | 3 -- lib/rsvp/package.json | 9 ----- package.json | 7 +--- vendor/ember-cli-shims/app-shims.js | 16 ++++----- 50 files changed, 8 insertions(+), 231 deletions(-) delete mode 100644 lib/ember/addon/application/deprecations.js delete mode 100644 lib/ember/addon/application/globals-resolver.js delete mode 100644 lib/ember/addon/application/index.js delete mode 100644 lib/ember/addon/application/resolver.js delete mode 100644 lib/ember/addon/array/index.js delete mode 100644 lib/ember/addon/array/mutable.js delete mode 100644 lib/ember/addon/array/proxy.js delete mode 100644 lib/ember/addon/component/checkbox.js delete mode 100644 lib/ember/addon/component/helper.js delete mode 100644 lib/ember/addon/component/index.js delete mode 100644 lib/ember/addon/component/text-area.js delete mode 100644 lib/ember/addon/component/text-field.js delete mode 100644 lib/ember/addon/controller/index.js delete mode 100644 lib/ember/addon/debug/container-adapter.js delete mode 100644 lib/ember/addon/debug/data-adapter.js delete mode 100644 lib/ember/addon/debug/index.js delete mode 100644 lib/ember/addon/enumerable/index.js delete mode 100644 lib/ember/addon/instrumentation/index.js delete mode 100644 lib/ember/addon/map/index.js delete mode 100644 lib/ember/addon/map/with-default.js delete mode 100644 lib/ember/addon/object/computed.js delete mode 100644 lib/ember/addon/object/evented.js delete mode 100644 lib/ember/addon/object/events.js delete mode 100644 lib/ember/addon/object/index.js delete mode 100644 lib/ember/addon/object/internals.js delete mode 100644 lib/ember/addon/object/mixin.js delete mode 100644 lib/ember/addon/object/observers.js delete mode 100644 lib/ember/addon/polyfills/index.js delete mode 100644 lib/ember/addon/routing/auto-location.js delete mode 100644 lib/ember/addon/routing/hash-location.js delete mode 100644 lib/ember/addon/routing/history-location.js delete mode 100644 lib/ember/addon/routing/link-component.js delete mode 100644 lib/ember/addon/routing/location.js delete mode 100644 lib/ember/addon/routing/none-location.js delete mode 100644 lib/ember/addon/routing/route.js delete mode 100644 lib/ember/addon/routing/router.js delete mode 100644 lib/ember/addon/runloop/index.js delete mode 100644 lib/ember/addon/service/index.js delete mode 100644 lib/ember/addon/string/index.js delete mode 100644 lib/ember/addon/utils/index.js delete mode 100644 lib/ember/index.js delete mode 100644 lib/ember/package.json delete mode 100644 lib/jquery/addon/index.js delete mode 100644 lib/jquery/index.js delete mode 100644 lib/jquery/package.json delete mode 100644 lib/rsvp/addon/index.js delete mode 100644 lib/rsvp/index.js delete mode 100644 lib/rsvp/package.json diff --git a/lib/ember/addon/application/deprecations.js b/lib/ember/addon/application/deprecations.js deleted file mode 100644 index f77d678..0000000 --- a/lib/ember/addon/application/deprecations.js +++ /dev/null @@ -1,3 +0,0 @@ -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 deleted file mode 100644 index b728002..0000000 --- a/lib/ember/addon/application/globals-resolver.js +++ /dev/null @@ -1,2 +0,0 @@ -import Ember from 'ember'; -export default Ember.DefaultResolver; diff --git a/lib/ember/addon/application/index.js b/lib/ember/addon/application/index.js deleted file mode 100644 index a1a2f87..0000000 --- a/lib/ember/addon/application/index.js +++ /dev/null @@ -1,6 +0,0 @@ -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 deleted file mode 100644 index 2b29a78..0000000 --- a/lib/ember/addon/application/resolver.js +++ /dev/null @@ -1,2 +0,0 @@ -import Ember from 'ember'; -export default Ember.Resolver; diff --git a/lib/ember/addon/array/index.js b/lib/ember/addon/array/index.js deleted file mode 100644 index 9e7f8e4..0000000 --- a/lib/ember/addon/array/index.js +++ /dev/null @@ -1,5 +0,0 @@ -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 deleted file mode 100644 index 916ecf9..0000000 --- a/lib/ember/addon/array/mutable.js +++ /dev/null @@ -1,2 +0,0 @@ -import Ember from 'ember'; -export default Ember.MutableArray; diff --git a/lib/ember/addon/array/proxy.js b/lib/ember/addon/array/proxy.js deleted file mode 100644 index 16fbd69..0000000 --- a/lib/ember/addon/array/proxy.js +++ /dev/null @@ -1,2 +0,0 @@ -import Ember from 'ember'; -export default Ember.ArrayProxy; diff --git a/lib/ember/addon/component/checkbox.js b/lib/ember/addon/component/checkbox.js deleted file mode 100644 index 333951a..0000000 --- a/lib/ember/addon/component/checkbox.js +++ /dev/null @@ -1,2 +0,0 @@ -import Ember from 'ember'; -export default Ember.Checkbox; diff --git a/lib/ember/addon/component/helper.js b/lib/ember/addon/component/helper.js deleted file mode 100644 index 87cb959..0000000 --- a/lib/ember/addon/component/helper.js +++ /dev/null @@ -1,3 +0,0 @@ -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 deleted file mode 100644 index 933d225..0000000 --- a/lib/ember/addon/component/index.js +++ /dev/null @@ -1,2 +0,0 @@ -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 deleted file mode 100644 index ce01098..0000000 --- a/lib/ember/addon/component/text-area.js +++ /dev/null @@ -1,2 +0,0 @@ -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 deleted file mode 100644 index 538ba2d..0000000 --- a/lib/ember/addon/component/text-field.js +++ /dev/null @@ -1,2 +0,0 @@ -import Ember from 'ember'; -export default Ember.TextField; diff --git a/lib/ember/addon/controller/index.js b/lib/ember/addon/controller/index.js deleted file mode 100644 index 8552561..0000000 --- a/lib/ember/addon/controller/index.js +++ /dev/null @@ -1,3 +0,0 @@ -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 deleted file mode 100644 index 8fefd87..0000000 --- a/lib/ember/addon/debug/container-adapter.js +++ /dev/null @@ -1,2 +0,0 @@ -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 deleted file mode 100644 index 890ef8a..0000000 --- a/lib/ember/addon/debug/data-adapter.js +++ /dev/null @@ -1,2 +0,0 @@ -import Ember from 'ember'; -export default Ember.DataAdapter; diff --git a/lib/ember/addon/debug/index.js b/lib/ember/addon/debug/index.js deleted file mode 100644 index 0b9213d..0000000 --- a/lib/ember/addon/debug/index.js +++ /dev/null @@ -1,6 +0,0 @@ -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 deleted file mode 100644 index fdd2f99..0000000 --- a/lib/ember/addon/enumerable/index.js +++ /dev/null @@ -1,2 +0,0 @@ -import Ember from 'ember'; -export default Ember.Enumerable; diff --git a/lib/ember/addon/instrumentation/index.js b/lib/ember/addon/instrumentation/index.js deleted file mode 100644 index cc90ff5..0000000 --- a/lib/ember/addon/instrumentation/index.js +++ /dev/null @@ -1,5 +0,0 @@ -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 deleted file mode 100644 index fed8c94..0000000 --- a/lib/ember/addon/map/index.js +++ /dev/null @@ -1,2 +0,0 @@ -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 deleted file mode 100644 index 2f6cd28..0000000 --- a/lib/ember/addon/map/with-default.js +++ /dev/null @@ -1,2 +0,0 @@ -import Ember from 'ember'; -export default Ember.MapWithDefault; diff --git a/lib/ember/addon/object/computed.js b/lib/ember/addon/object/computed.js deleted file mode 100644 index 9ce582d..0000000 --- a/lib/ember/addon/object/computed.js +++ /dev/null @@ -1,34 +0,0 @@ -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 deleted file mode 100644 index 0111244..0000000 --- a/lib/ember/addon/object/evented.js +++ /dev/null @@ -1,3 +0,0 @@ -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 deleted file mode 100644 index f391e2f..0000000 --- a/lib/ember/addon/object/events.js +++ /dev/null @@ -1,4 +0,0 @@ -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 deleted file mode 100644 index d94e51e..0000000 --- a/lib/ember/addon/object/index.js +++ /dev/null @@ -1,10 +0,0 @@ -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 deleted file mode 100644 index 6b1287a..0000000 --- a/lib/ember/addon/object/internals.js +++ /dev/null @@ -1,4 +0,0 @@ -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 deleted file mode 100644 index 2f0ac2e..0000000 --- a/lib/ember/addon/object/mixin.js +++ /dev/null @@ -1,2 +0,0 @@ -import Ember from 'ember'; -export default Ember.Mixin; diff --git a/lib/ember/addon/object/observers.js b/lib/ember/addon/object/observers.js deleted file mode 100644 index 1947c2e..0000000 --- a/lib/ember/addon/object/observers.js +++ /dev/null @@ -1,2 +0,0 @@ -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 deleted file mode 100644 index 7daa47e..0000000 --- a/lib/ember/addon/polyfills/index.js +++ /dev/null @@ -1,6 +0,0 @@ -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 deleted file mode 100644 index 196c9ee..0000000 --- a/lib/ember/addon/routing/auto-location.js +++ /dev/null @@ -1,2 +0,0 @@ -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 deleted file mode 100644 index e618a7e..0000000 --- a/lib/ember/addon/routing/hash-location.js +++ /dev/null @@ -1,2 +0,0 @@ -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 deleted file mode 100644 index a6f6613..0000000 --- a/lib/ember/addon/routing/history-location.js +++ /dev/null @@ -1,2 +0,0 @@ -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 deleted file mode 100644 index 1d63f3c..0000000 --- a/lib/ember/addon/routing/link-component.js +++ /dev/null @@ -1,2 +0,0 @@ -import Ember from 'ember'; -export default Ember.LinkComponent; diff --git a/lib/ember/addon/routing/location.js b/lib/ember/addon/routing/location.js deleted file mode 100644 index be87a46..0000000 --- a/lib/ember/addon/routing/location.js +++ /dev/null @@ -1,2 +0,0 @@ -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 deleted file mode 100644 index 5634885..0000000 --- a/lib/ember/addon/routing/none-location.js +++ /dev/null @@ -1,2 +0,0 @@ -import Ember from 'ember'; -export default Ember.NoneLocation; diff --git a/lib/ember/addon/routing/route.js b/lib/ember/addon/routing/route.js deleted file mode 100644 index 8c5a4e3..0000000 --- a/lib/ember/addon/routing/route.js +++ /dev/null @@ -1,2 +0,0 @@ -import Ember from 'ember'; -export default Ember.Route; diff --git a/lib/ember/addon/routing/router.js b/lib/ember/addon/routing/router.js deleted file mode 100644 index e84fbad..0000000 --- a/lib/ember/addon/routing/router.js +++ /dev/null @@ -1,2 +0,0 @@ -import Ember from 'ember'; -export default Ember.Router; diff --git a/lib/ember/addon/runloop/index.js b/lib/ember/addon/runloop/index.js deleted file mode 100644 index 76201ce..0000000 --- a/lib/ember/addon/runloop/index.js +++ /dev/null @@ -1,14 +0,0 @@ -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 deleted file mode 100644 index da716d8..0000000 --- a/lib/ember/addon/service/index.js +++ /dev/null @@ -1,3 +0,0 @@ -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 deleted file mode 100644 index 7b6270a..0000000 --- a/lib/ember/addon/string/index.js +++ /dev/null @@ -1,12 +0,0 @@ -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 deleted file mode 100644 index 91ef53f..0000000 --- a/lib/ember/addon/utils/index.js +++ /dev/null @@ -1,9 +0,0 @@ -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 deleted file mode 100644 index fda0e4f..0000000 --- a/lib/ember/index.js +++ /dev/null @@ -1,3 +0,0 @@ -module.exports = { - name: '@ember' -}; diff --git a/lib/ember/package.json b/lib/ember/package.json deleted file mode 100644 index 676e782..0000000 --- a/lib/ember/package.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "name": "@ember", - "keywords": [ - "ember-addon" - ], - "dependencies": { - "ember-cli-babel": "*" - } -} diff --git a/lib/jquery/addon/index.js b/lib/jquery/addon/index.js deleted file mode 100644 index fe97f1f..0000000 --- a/lib/jquery/addon/index.js +++ /dev/null @@ -1,2 +0,0 @@ -import Ember from 'ember'; -export default Ember.$; diff --git a/lib/jquery/index.js b/lib/jquery/index.js deleted file mode 100644 index c644cc1..0000000 --- a/lib/jquery/index.js +++ /dev/null @@ -1,3 +0,0 @@ -module.exports = { - name: 'jquery' -}; diff --git a/lib/jquery/package.json b/lib/jquery/package.json deleted file mode 100644 index 0d212a7..0000000 --- a/lib/jquery/package.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "name": "jquery", - "keywords": [ - "ember-addon" - ], - "dependencies": { - "ember-cli-babel": "*" - } -} diff --git a/lib/rsvp/addon/index.js b/lib/rsvp/addon/index.js deleted file mode 100644 index cae4347..0000000 --- a/lib/rsvp/addon/index.js +++ /dev/null @@ -1,2 +0,0 @@ -import Ember from 'ember'; -export default Ember.RSVP; diff --git a/lib/rsvp/index.js b/lib/rsvp/index.js deleted file mode 100644 index 4868257..0000000 --- a/lib/rsvp/index.js +++ /dev/null @@ -1,3 +0,0 @@ -module.exports = { - name: 'rsvp' -}; diff --git a/lib/rsvp/package.json b/lib/rsvp/package.json deleted file mode 100644 index 47d1f3f..0000000 --- a/lib/rsvp/package.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "name": "rsvp", - "keywords": [ - "ember-addon" - ], - "dependencies": { - "ember-cli-babel": "*" - } -} diff --git a/package.json b/package.json index 6372dd0..87a00d0 100644 --- a/package.json +++ b/package.json @@ -39,11 +39,6 @@ "node": ">= 4" }, "ember-addon": { - "configPath": "tests/dummy/config", - "paths": [ - "lib/ember", - "lib/jquery", - "lib/rsvp" - ] + "configPath": "tests/dummy/config" } } diff --git a/vendor/ember-cli-shims/app-shims.js b/vendor/ember-cli-shims/app-shims.js index d74758e..db185a2 100644 --- a/vendor/ember-cli-shims/app-shims.js +++ b/vendor/ember-cli-shims/app-shims.js @@ -3,6 +3,9 @@ function processEmberShims() { var shims = { + 'ember': { + 'default': Ember + }, 'ember-application': { 'default': Ember.Application }, @@ -215,7 +218,7 @@ } for (var moduleName in shims) { - generateModule(moduleName, shims[moduleName], true); + generateModule(moduleName, shims[moduleName]); } } @@ -239,16 +242,10 @@ } } - function generateModule(name, values, deprecated) { + function generateModule(name, values) { 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 }); @@ -257,7 +254,8 @@ }); } - generateModule('ember', { default: Ember }); processEmberShims(); processTestShims(); + generateModule('jquery', { 'default': self.jQuery }); + generateModule('rsvp', { 'default': Ember.RSVP }); })(); From 0632801616afd13b5d3f23c599cccf7abbed3bae Mon Sep 17 00:00:00 2001 From: Robert Jackson Date: Sun, 2 Jul 2017 21:46:02 -0400 Subject: [PATCH 2/2] Bring back the deprecation for older shims. --- vendor/ember-cli-shims/app-shims.js | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/vendor/ember-cli-shims/app-shims.js b/vendor/ember-cli-shims/app-shims.js index db185a2..ce4d3dc 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 }, @@ -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,6 +257,7 @@ }); } + generateModule('ember', { default: Ember }); processEmberShims(); processTestShims(); generateModule('jquery', { 'default': self.jQuery });