Skip to content
This repository has been archived by the owner on Oct 20, 2020. It is now read-only.

Commit

Permalink
Fixes Bluebird embedding in the osgjs build
Browse files Browse the repository at this point in the history
  • Loading branch information
Kuranes committed Sep 15, 2015
1 parent 760e1c3 commit eb94cc3
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion tests/index.html
Expand Up @@ -14,7 +14,7 @@
</script>

<script type='text/javascript' src='vendors/jquery-1.4.2.js'></script>
<script type='text/javascript' src='../examples/vendors/q.js'></script>
<script type='text/javascript' src='../examples/vendors/bluebird.js'></script>
<script type='text/javascript' src='../examples/vendors/hammer.js'></script>
<script type='text/javascript' src='../examples/vendors/leap.js'></script>
</head>
Expand Down
10 changes: 5 additions & 5 deletions webpack.config.js
Expand Up @@ -35,11 +35,11 @@ module.exports = {
amd: 'zlib'
}
}, {
'q': {
root: 'Q',
commonjs2: 'q',
commonjs: 'q',
amd: 'q'
'bluebird': {
root: 'P',
commonjs2: 'bluebird',
commonjs: 'bluebird',
amd: 'bluebird'
}
}, {
'hammer': {
Expand Down

0 comments on commit eb94cc3

Please sign in to comment.