From 43283d604bd1eb66e0cf8757233d50f66e2767ab Mon Sep 17 00:00:00 2001 From: Adolfo Builes Date: Sun, 9 Mar 2014 23:01:43 -0300 Subject: [PATCH 1/2] Update broccoli-dist-es6-module. --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 6a16a9cd..dc2cba9c 100644 --- a/package.json +++ b/package.json @@ -14,7 +14,7 @@ "license": "MIT", "devDependencies": { "broccoli": "~0.2.0", - "broccoli-dist-es6-module": "0.1.5", + "broccoli-dist-es6-module": "^0.1.8", "karma-script-launcher": "~0.1.0", "karma-chrome-launcher": "~0.1.2", "karma-firefox-launcher": "~0.1.3", @@ -33,4 +33,4 @@ "broccoli-dist-es6-module": "^0.1.8", "browserify": "^3.31.2" } -} \ No newline at end of file +} From 82be364fabdd8aada9d8e2b7bf893f958090682a Mon Sep 17 00:00:00 2001 From: Adolfo Builes Date: Sun, 9 Mar 2014 23:06:05 -0300 Subject: [PATCH 2/2] Add import for moduleFor. --- dist/amd/module-for-component.js | 7 ++++--- dist/cjs/module-for-component.js | 1 + dist/globals/main.js | 3 ++- dist/named-amd/main.js | 7 ++++--- lib/module-for-component.js | 3 +-- 5 files changed, 12 insertions(+), 9 deletions(-) diff --git a/dist/amd/module-for-component.js b/dist/amd/module-for-component.js index c6b46dbf..28a43ff7 100644 --- a/dist/amd/module-for-component.js +++ b/dist/amd/module-for-component.js @@ -1,9 +1,10 @@ define( - ["./test-resolver","ember","exports"], - function(__dependency1__, __dependency2__, __exports__) { + ["./test-resolver","./module-for","ember","exports"], + function(__dependency1__, __dependency2__, __dependency3__, __exports__) { "use strict"; var testResolver = __dependency1__["default"] || __dependency1__; - var Ember = __dependency2__["default"] || __dependency2__; + var moduleFor = __dependency2__["default"] || __dependency2__; + var Ember = __dependency3__["default"] || __dependency3__; __exports__["default"] = function moduleForComponent(name, description, callbacks) { var resolver = testResolver.get(); diff --git a/dist/cjs/module-for-component.js b/dist/cjs/module-for-component.js index 2e6de06c..8b0505ba 100644 --- a/dist/cjs/module-for-component.js +++ b/dist/cjs/module-for-component.js @@ -1,5 +1,6 @@ "use strict"; var testResolver = require("./test-resolver")["default"] || require("./test-resolver"); +var moduleFor = require("./module-for")["default"] || require("./module-for"); var Ember = require("ember")["default"] || require("ember"); exports["default"] = function moduleForComponent(name, description, callbacks) { diff --git a/dist/globals/main.js b/dist/globals/main.js index 9bb218cc..ffcdab23 100644 --- a/dist/globals/main.js +++ b/dist/globals/main.js @@ -47,6 +47,7 @@ exports.setResolver = setResolver; },{"./isolated-container":1,"./module-for":4,"./module-for-component":3,"./test":7,"./test-resolver":6}],3:[function(_dereq_,module,exports){ "use strict"; var testResolver = _dereq_("./test-resolver")["default"] || _dereq_("./test-resolver"); +var moduleFor = _dereq_("./module-for")["default"] || _dereq_("./module-for"); var Ember = window.Ember["default"] || window.Ember; exports["default"] = function moduleForComponent(name, description, callbacks) { @@ -77,7 +78,7 @@ exports["default"] = function moduleForComponent(name, description, callbacks) { context.__setup_properties__.$ = context.__setup_properties__.append; }); } -},{"./test-resolver":6}],4:[function(_dereq_,module,exports){ +},{"./module-for":4,"./test-resolver":6}],4:[function(_dereq_,module,exports){ "use strict"; var Ember = window.Ember["default"] || window.Ember; var QUnit = window.QUnit["default"] || window.QUnit; diff --git a/dist/named-amd/main.js b/dist/named-amd/main.js index 6135dec3..59aa02f5 100644 --- a/dist/named-amd/main.js +++ b/dist/named-amd/main.js @@ -49,11 +49,12 @@ define("ember-qunit/isolated-container", __exports__.test = test; __exports__.setResolver = setResolver; });define("ember-qunit/module-for-component", - ["./test-resolver","ember","exports"], - function(__dependency1__, __dependency2__, __exports__) { + ["./test-resolver","./module-for","ember","exports"], + function(__dependency1__, __dependency2__, __dependency3__, __exports__) { "use strict"; var testResolver = __dependency1__["default"] || __dependency1__; - var Ember = __dependency2__["default"] || __dependency2__; + var moduleFor = __dependency2__["default"] || __dependency2__; + var Ember = __dependency3__["default"] || __dependency3__; __exports__["default"] = function moduleForComponent(name, description, callbacks) { var resolver = testResolver.get(); diff --git a/lib/module-for-component.js b/lib/module-for-component.js index e26910aa..326ecd68 100644 --- a/lib/module-for-component.js +++ b/lib/module-for-component.js @@ -1,4 +1,5 @@ import testResolver from './test-resolver'; +import moduleFor from './module-for'; import Ember from 'ember'; export default function moduleForComponent(name, description, callbacks) { @@ -29,5 +30,3 @@ export default function moduleForComponent(name, description, callbacks) { context.__setup_properties__.$ = context.__setup_properties__.append; }); } - -