Skip to content

Commit 42910f8

Browse files
committed
Merge pull request #347 from BenMorganIO/ember-fastboot-support
don't import hammerjs and match media if being called from node
2 parents aca9d98 + dbb0c34 commit 42910f8

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

index.js

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,11 @@ module.exports = {
1313
included: function(app) {
1414
this._super.included(app);
1515

16-
app.import(app.bowerDirectory + '/hammer.js/hammer.js');
17-
app.import(app.bowerDirectory + '/matchMedia/matchMedia.js');
16+
if (!process.env.EMBER_CLI_FASTBOOT) {
17+
app.import(app.bowerDirectory + '/hammer.js/hammer.js')
18+
app.import(app.bowerDirectory + '/matchMedia/matchMedia.js');
19+
};
20+
1821
app.import('vendor/propagating.js');
1922
},
2023

0 commit comments

Comments
 (0)