Skip to content

Commit

Permalink
Merge pull request #8 from abuiles/import-module-for
Browse files Browse the repository at this point in the history
Add  import for moduleFor.
  • Loading branch information
stefanpenner committed Mar 10, 2014
2 parents 3c3372d + 82be364 commit 04766fc
Show file tree
Hide file tree
Showing 6 changed files with 14 additions and 11 deletions.
7 changes: 4 additions & 3 deletions dist/amd/module-for-component.js
Original file line number Diff line number Diff line change
@@ -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();
Expand Down
1 change: 1 addition & 0 deletions dist/cjs/module-for-component.js
Original file line number Diff line number Diff line change
@@ -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) {
Expand Down
3 changes: 2 additions & 1 deletion dist/globals/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down Expand Up @@ -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;
Expand Down
7 changes: 4 additions & 3 deletions dist/named-amd/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
3 changes: 1 addition & 2 deletions lib/module-for-component.js
Original file line number Diff line number Diff line change
@@ -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) {
Expand Down Expand Up @@ -29,5 +30,3 @@ export default function moduleForComponent(name, description, callbacks) {
context.__setup_properties__.$ = context.__setup_properties__.append;
});
}


4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -33,4 +33,4 @@
"broccoli-dist-es6-module": "^0.1.8",
"browserify": "^3.31.2"
}
}
}

0 comments on commit 04766fc

Please sign in to comment.