Skip to content

Commit

Permalink
Use 'share' with "Failed to parse" bugfix. Require module from node_m…
Browse files Browse the repository at this point in the history
…odules
  • Loading branch information
rajit committed Mar 6, 2017
1 parent 5ccc637 commit 341838f
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
4 changes: 2 additions & 2 deletions sharejs-base/loadBCSocket.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@

//This is required to load BCSocket into the global scope for sharejs
//http://stackoverflow.com/questions/31197220/can-i-use-an-es6-2015-module-import-to-set-a-reference-in-global-scope
import {BCSocket as bc} from 'share/node_modules/browserchannel/dist/bcsocket-uncompressed'
window.BCSocket = bc;
import {BCSocket as bc} from 'browserchannel/dist/bcsocket-uncompressed'
window.BCSocket = bc;
3 changes: 2 additions & 1 deletion sharejs-base/package.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@ Package.describe({
Npm.depends({
// Fork of 0.6.3 that doesn't require("mongodb"):
// https://github.com/meteor/meteor/issues/532#issuecomment-82635979
share: "https://github.com/mizzao/ShareJS/tarball/05b625ea1e7f7f27bd13ba7ed05102b38dd175e5"
// Includes "Failed to parse" bugfix
share: "https://github.com/qeek/sharejs-tmp-fork/tarball/94c059bd4da24de8e6e90fb83484dd9c7b0efd59"
});

Package.onUse(function (api) {
Expand Down

0 comments on commit 341838f

Please sign in to comment.