Skip to content

Commit

Permalink
don't vendor xhook; update xhook
Browse files Browse the repository at this point in the history
This switches to using npm to manage xhook, which is about as good as
vendoring now that we have lockfiles.

This also updates some misc stuff int he lockfile, but notably updates
xhook several versions forward.
  • Loading branch information
euank committed Nov 7, 2018
1 parent 67b8945 commit 73e8527
Show file tree
Hide file tree
Showing 11 changed files with 1,887 additions and 2,217 deletions.
672 changes: 488 additions & 184 deletions dist/xdomain.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/xdomain.map

Large diffs are not rendered by default.

85 changes: 45 additions & 40 deletions dist/xdomain.min.js

Large diffs are not rendered by default.

2,684 changes: 1,337 additions & 1,347 deletions package-lock.json

Large diffs are not rendered by default.

19 changes: 11 additions & 8 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,22 +9,25 @@
"type": "git",
"url": "https://github.com/jpillora/xdomain"
},
"keywords": ["cors", "ie8", "polyfill"],
"keywords": [
"cors",
"ie8",
"polyfill"
],
"author": {
"name": "Jaime Pillora",
"email": "[email protected]"
},
"scripts": {
"dev":
"parcel watch --no-source-maps --public-url . src/browser.js -o xdomain",
"devfile":
"parcel watch --no-hmr --no-source-maps --public-url . src/browser.js -o xdomain",
"build":
"parcel build --public-url . src/browser.js --no-minify -o xdomain && parcel build src/browser.js --no-source-maps --detailed-report -o xdomain.min"
"dev": "parcel watch --no-source-maps --public-url . src/browser.js -o xdomain",
"devfile": "parcel watch --no-hmr --no-source-maps --public-url . src/browser.js -o xdomain",
"build": "parcel build --public-url . src/browser.js --no-minify -o xdomain && parcel build src/browser.js --no-source-maps --detailed-report -o xdomain.min"
},
"devDependencies": {
"array.from": "^1.0.3",
"parcel-bundler": "^1.7.0"
},
"dependencies": {}
"dependencies": {
"xhook": "^1.4.9"
}
}
2 changes: 1 addition & 1 deletion src/browser.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
if (!Array.from) {
Array.from = require("array.from").getPolyfill();
}
const xhook = require("./vendor/xhook");
const xhook = require("xhook").xhook;
window.xhook = xhook;
const xdomain = require("./index");
window.xdomain = xdomain;
2 changes: 1 addition & 1 deletion src/lib/master.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const xhook = require("../vendor/xhook");
const xhook = require("xhook").xhook;
const config = require("./config");
const {
currentOrigin,
Expand Down
2 changes: 1 addition & 1 deletion src/lib/slave.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const xhook = require("../vendor/xhook");
const xhook = require("xhook").xhook;
const config = require("./config");
const {
log,
Expand Down
2 changes: 1 addition & 1 deletion src/lib/socket.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const xhook = require("../vendor/xhook");
const xhook = require("xhook").xhook;

const config = require("./config");
const { globalEmitter, log, warn, COMPAT_VERSION } = require("./util");
Expand Down
2 changes: 1 addition & 1 deletion src/lib/util.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const xhook = require("../vendor/xhook");
const xhook = require("xhook").xhook;

const config = require("./config");

Expand Down
Loading

0 comments on commit 73e8527

Please sign in to comment.