Source 
58/304
diff --git a/package-lock.json b/package-lock.json
index 6b29a00..2703382 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -12,9 +12,9 @@
"optional": true
},
"acorn": {
- "version": "5.2.1",
- "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.2.1.tgz",
- "integrity": "sha512-jG0u7c4Ly+3QkkW18V+NRDN+4bWHdln30NL1ZL2AvFZZmQe/BfopYCtghCKKVBUSetZ4QKcyA0pY6/4Gw8Pv8w==",
+ "version": "2.7.0",
+ "resolved": "https://registry.npmjs.org/acorn/-/acorn-2.7.0.tgz",
+ "integrity": "sha1-q259nYhqrKiwhbwzEreaGYQz8Oc=",
"dev": true
},
"acorn-dynamic-import": {
@@ -42,15 +42,6 @@
"optional": true,
"requires": {
"acorn": "2.7.0"
- },
- "dependencies": {
- "acorn": {
- "version": "2.7.0",
- "resolved": "https://registry.npmjs.org/acorn/-/acorn-2.7.0.tgz",
- "integrity": "sha1-q259nYhqrKiwhbwzEreaGYQz8Oc=",
- "dev": true,
- "optional": true
- }
}
},
"ajv": {
@@ -260,14 +251,6 @@
"private": "0.1.8",
"slash": "1.0.0",
"source-map": "0.5.7"
- },
- "dependencies": {
- "lodash": {
- "version": "4.17.4",
- "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz",
- "integrity": "sha1-eCA6TRwyiuHYbcpkYONptX9AVa4=",
- "dev": true
- }
}
},
"babel-generator": {
@@ -284,14 +267,6 @@
"lodash": "4.17.4",
"source-map": "0.5.7",
"trim-right": "1.0.1"
- },
- "dependencies": {
- "lodash": {
- "version": "4.17.4",
- "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz",
- "integrity": "sha1-eCA6TRwyiuHYbcpkYONptX9AVa4=",
- "dev": true
- }
}
},
"babel-helper-builder-binary-assignment-operator-visitor": {
@@ -327,14 +302,6 @@
"babel-runtime": "6.26.0",
"babel-types": "6.26.0",
"lodash": "4.17.4"
- },
- "dependencies": {
- "lodash": {
- "version": "4.17.4",
- "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz",
- "integrity": "sha1-eCA6TRwyiuHYbcpkYONptX9AVa4=",
- "dev": true
- }
}
},
"babel-helper-explode-assignable-expression": {
@@ -429,14 +396,6 @@
"babel-runtime": "6.26.0",
"babel-types": "6.26.0",
"lodash": "4.17.4"
- },
- "dependencies": {
- "lodash": {
- "version": "4.17.4",
- "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz",
- "integrity": "sha1-eCA6TRwyiuHYbcpkYONptX9AVa4=",
- "dev": true
- }
}
},
"babel-helper-remap-async-to-generator": {
@@ -513,7 +472,7 @@
"requires": {
"babel-helper-module-imports": "7.0.0-beta.3",
"babel-types": "6.26.0",
- "glob": "7.1.1",
+ "glob": "7.1.2",
"lodash": "4.17.4",
"require-package-name": "2.0.1"
}
@@ -582,14 +541,6 @@
"babel-traverse": "6.26.0",
"babel-types": "6.26.0",
"lodash": "4.17.4"
- },
- "dependencies": {
- "lodash": {
- "version": "4.17.4",
- "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz",
- "integrity": "sha1-eCA6TRwyiuHYbcpkYONptX9AVa4=",
- "dev": true
- }
}
},
"babel-plugin-transform-es2015-classes": {
@@ -858,7 +809,7 @@
"babel-plugin-transform-es2015-unicode-regex": "6.24.1",
"babel-plugin-transform-exponentiation-operator": "6.24.1",
"babel-plugin-transform-regenerator": "6.26.0",
- "browserslist": "2.10.0",
+ "browserslist": "2.11.0",
"invariant": "2.2.2",
"semver": "5.4.1"
}
@@ -876,20 +827,6 @@
"lodash": "4.17.4",
"mkdirp": "0.5.1",
"source-map-support": "0.4.18"
- },
- "dependencies": {
- "core-js": {
- "version": "2.5.3",
- "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.5.3.tgz",
- "integrity": "sha1-isw4NFgk8W2DZbfJtCWRaOjtYD4=",
- "dev": true
- },
- "lodash": {
- "version": "4.17.4",
- "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz",
- "integrity": "sha1-eCA6TRwyiuHYbcpkYONptX9AVa4=",
- "dev": true
- }
}
},
"babel-runtime": {
@@ -900,14 +837,6 @@
"requires": {
"core-js": "2.5.3",
"regenerator-runtime": "0.11.1"
- },
- "dependencies": {
- "core-js": {
- "version": "2.5.3",
- "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.5.3.tgz",
- "integrity": "sha1-isw4NFgk8W2DZbfJtCWRaOjtYD4=",
- "dev": true
- }
}
},
"babel-template": {
@@ -921,14 +850,6 @@
"babel-types": "6.26.0",
"babylon": "6.18.0",
"lodash": "4.17.4"
- },
- "dependencies": {
- "lodash": {
- "version": "4.17.4",
- "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz",
- "integrity": "sha1-eCA6TRwyiuHYbcpkYONptX9AVa4=",
- "dev": true
- }
}
},
"babel-traverse": {
@@ -946,14 +867,6 @@
"globals": "9.18.0",
"invariant": "2.2.2",
"lodash": "4.17.4"
- },
- "dependencies": {
- "lodash": {
- "version": "4.17.4",
- "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz",
- "integrity": "sha1-eCA6TRwyiuHYbcpkYONptX9AVa4=",
- "dev": true
- }
}
},
"babel-types": {
@@ -966,14 +879,6 @@
"esutils": "2.0.2",
"lodash": "4.17.4",
"to-fast-properties": "1.0.3"
- },
- "dependencies": {
- "lodash": {
- "version": "4.17.4",
- "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz",
- "integrity": "sha1-eCA6TRwyiuHYbcpkYONptX9AVa4=",
- "dev": true
- }
}
},
"babylon": {
@@ -1148,12 +1053,12 @@
}
},
"browserslist": {
- "version": "2.10.0",
- "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-2.10.0.tgz",
- "integrity": "sha512-WyvzSLsuAVPOjbljXnyeWl14Ae+ukAT8MUuagKVzIDvwBxl4UAwD1xqtyQs2eWYPGUKMeC3Ol62goqYuKqTTcw==",
+ "version": "2.11.0",
+ "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-2.11.0.tgz",
+ "integrity": "sha512-mNYp0RNeu1xueGuJFSXkU+K0nH+dBE/gcjtyhtNKfU8hwdrVIfoA7i5iFSjOmzkGdL2QaO7YX9ExiVPE7AY9JA==",
"dev": true,
"requires": {
- "caniuse-lite": "1.0.30000784",
+ "caniuse-lite": "1.0.30000787",
"electron-to-chromium": "1.3.30"
}
},
@@ -1205,22 +1110,6 @@
"ssri": "5.0.0",
"unique-filename": "1.1.0",
"y18n": "3.2.1"
- },
- "dependencies": {
- "glob": {
- "version": "7.1.2",
- "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
- "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
- "dev": true,
- "requires": {
- "fs.realpath": "1.0.0",
- "inflight": "1.0.6",
- "inherits": "2.0.3",
- "minimatch": "3.0.4",
- "once": "1.4.0",
- "path-is-absolute": "1.0.1"
- }
- }
}
},
"cachedir": {
@@ -1249,9 +1138,9 @@
"dev": true
},
"caniuse-lite": {
- "version": "1.0.30000784",
- "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000784.tgz",
- "integrity": "sha1-EpztdOmhKApEGIC2zSvOMO9Z5sA=",
+ "version": "1.0.30000787",
+ "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000787.tgz",
+ "integrity": "sha1-p2xPodasAGQER+yDwefGsz3WFcU=",
"dev": true
},
"caseless": {
@@ -1373,6 +1262,14 @@
"center-align": "0.1.3",
"right-align": "0.1.3",
"wordwrap": "0.0.2"
+ },
+ "dependencies": {
+ "wordwrap": {
+ "version": "0.0.2",
+ "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz",
+ "integrity": "sha1-t5Zpu0LstAn4PVg8rVLKF+qhZD8=",
+ "dev": true
+ }
}
},
"co": {
@@ -1445,11 +1342,40 @@
"word-wrap": "1.2.3"
}
},
+ "glob": {
+ "version": "7.1.1",
+ "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.1.tgz",
+ "integrity": "sha1-gFIR3wT6rxxjo2ADBs31reULLsg=",
+ "dev": true,
+ "requires": {
+ "fs.realpath": "1.0.0",
+ "inflight": "1.0.6",
+ "inherits": "2.0.3",
+ "minimatch": "3.0.4",
+ "once": "1.4.0",
+ "path-is-absolute": "1.0.1"
+ }
+ },
"lodash": {
"version": "4.17.2",
"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.2.tgz",
"integrity": "sha1-NKMFW6vgTOQkZ7YH1wAHLH/2v0I=",
"dev": true
+ },
+ "minimist": {
+ "version": "1.2.0",
+ "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
+ "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
+ "dev": true
+ },
+ "path-exists": {
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz",
+ "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=",
+ "dev": true,
+ "requires": {
+ "pinkie-promise": "2.0.1"
+ }
}
}
},
@@ -1813,8 +1739,16 @@
"integrity": "sha512-H6PmeeUcZloWtdt4DAkFyzFL94arpHr3NOwwmVILFiy+9Qd4JTxxXrzfyGk/lmct2qVGBwTSwSXagqu2BxmWig==",
"dev": true,
"requires": {
- "acorn": "5.2.1",
+ "acorn": "5.3.0",
"defined": "1.0.0"
+ },
+ "dependencies": {
+ "acorn": {
+ "version": "5.3.0",
+ "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.3.0.tgz",
+ "integrity": "sha512-Yej+zOJ1Dm/IMZzzj78OntP/r3zHEaKcyNoU2lAaxPtrseM6rF0xwqoz5Q5ysAiED9hTjI2hgtvLXitlCN1/Ug==",
+ "dev": true
+ }
}
},
"diffie-hellman": {
@@ -2094,15 +2028,6 @@
"esutils": "2.0.2",
"optionator": "0.8.2",
"source-map": "0.5.7"
- },
- "dependencies": {
- "esprima": {
- "version": "3.1.3",
- "resolved": "https://registry.npmjs.org/esprima/-/esprima-3.1.3.tgz",
- "integrity": "sha1-/cpRzuYTOJXjyI1TXOSdv/YqRjM=",
- "dev": true,
- "optional": true
- }
}
},
"escope": {
@@ -2134,6 +2059,14 @@
"marked": "0.3.6",
"minimist": "1.2.0",
"taffydb": "2.7.2"
+ },
+ "dependencies": {
+ "minimist": {
+ "version": "1.2.0",
+ "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
+ "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
+ "dev": true
+ }
}
},
"esdoc-accessor-plugin": {
@@ -2230,6 +2163,12 @@
"repeating": "1.1.3"
}
},
+ "minimist": {
+ "version": "1.2.0",
+ "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
+ "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
+ "dev": true
+ },
"repeating": {
"version": "1.1.3",
"resolved": "https://registry.npmjs.org/repeating/-/repeating-1.1.3.tgz",
@@ -2278,10 +2217,10 @@
"integrity": "sha1-H5h0xqfCvr+a05fDzrdcnGnaurE=",
"dev": true
},
- "esprima-fb": {
- "version": "15001.1.0-dev-harmony-fb",
- "resolved": "https://registry.npmjs.org/esprima-fb/-/esprima-fb-15001.1.0-dev-harmony-fb.tgz",
- "integrity": "sha1-MKlHMDxrjV6VW+4rmbHSMyBqaQE=",
+ "esprima": {
+ "version": "3.1.3",
+ "resolved": "https://registry.npmjs.org/esprima/-/esprima-3.1.3.tgz",
+ "integrity": "sha1-/cpRzuYTOJXjyI1TXOSdv/YqRjM=",
"dev": true
},
"esrecurse": {
@@ -2653,9 +2592,9 @@
}
},
"glob": {
- "version": "7.1.1",
- "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.1.tgz",
- "integrity": "sha1-gFIR3wT6rxxjo2ADBs31reULLsg=",
+ "version": "7.1.2",
+ "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
+ "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
"dev": true,
"requires": {
"fs.realpath": "1.0.0",
@@ -3261,15 +3200,6 @@
"webidl-conversions": "2.0.1",
"whatwg-url-compat": "0.6.5",
"xml-name-validator": "2.0.1"
- },
- "dependencies": {
- "acorn": {
- "version": "2.7.0",
- "resolved": "https://registry.npmjs.org/acorn/-/acorn-2.7.0.tgz",
- "integrity": "sha1-q259nYhqrKiwhbwzEreaGYQz8Oc=",
- "dev": true,
- "optional": true
- }
}
},
"jsesc": {
@@ -3345,6 +3275,12 @@
"source-map": "0.4.4"
},
"dependencies": {
+ "esprima-fb": {
+ "version": "15001.1.0-dev-harmony-fb",
+ "resolved": "https://registry.npmjs.org/esprima-fb/-/esprima-fb-15001.1.0-dev-harmony-fb.tgz",
+ "integrity": "sha1-MKlHMDxrjV6VW+4rmbHSMyBqaQE=",
+ "dev": true
+ },
"object-assign": {
"version": "2.1.1",
"resolved": "https://registry.npmjs.org/object-assign/-/object-assign-2.1.1.tgz",
@@ -3416,6 +3352,14 @@
"parse-json": "2.2.0",
"pify": "2.3.0",
"strip-bom": "3.0.0"
+ },
+ "dependencies": {
+ "pify": {
+ "version": "2.3.0",
+ "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+ "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
+ "dev": true
+ }
}
},
"loader-runner": {
@@ -3443,14 +3387,6 @@
"requires": {
"p-locate": "2.0.0",
"path-exists": "3.0.0"
- },
- "dependencies": {
- "path-exists": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
- "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=",
- "dev": true
- }
}
},
"lodash": {
@@ -3578,14 +3514,6 @@
"dev": true,
"requires": {
"pify": "3.0.0"
- },
- "dependencies": {
- "pify": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
- "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
- "dev": true
- }
}
},
"marked": {
@@ -3715,9 +3643,9 @@
}
},
"minimist": {
- "version": "1.2.0",
- "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
- "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
+ "version": "0.0.8",
+ "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
+ "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
"dev": true
},
"mississippi": {
@@ -3745,14 +3673,6 @@
"dev": true,
"requires": {
"minimist": "0.0.8"
- },
- "dependencies": {
- "minimist": {
- "version": "0.0.8",
- "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
- "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
- "dev": true
- }
}
},
"move-concurrently": {
@@ -3933,15 +3853,6 @@
"prelude-ls": "1.1.2",
"type-check": "0.3.2",
"wordwrap": "1.0.0"
- },
- "dependencies": {
- "wordwrap": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz",
- "integrity": "sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=",
- "dev": true,
- "optional": true
- }
}
},
"os-browserify": {
@@ -3986,10 +3897,13 @@
"dev": true
},
"p-limit": {
- "version": "1.1.0",
- "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.1.0.tgz",
- "integrity": "sha1-sH/y2aXYi+yAYDWJWiurZqJ5iLw=",
- "dev": true
+ "version": "1.2.0",
+ "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.2.0.tgz",
+ "integrity": "sha512-Y/OtIaXtUPr4/YpMv1pCL5L5ed0rumAaAeBSj12F+bSlMdys7i8oQF/GUJmfpTS/QoaRrS/k6pma29haJpsMng==",
+ "dev": true,
+ "requires": {
+ "p-try": "1.0.0"
+ }
},
"p-locate": {
"version": "2.0.0",
@@ -3997,9 +3911,15 @@
"integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=",
"dev": true,
"requires": {
- "p-limit": "1.1.0"
+ "p-limit": "1.2.0"
}
},
+ "p-try": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz",
+ "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=",
+ "dev": true
+ },
"pad-right": {
"version": "0.2.2",
"resolved": "https://registry.npmjs.org/pad-right/-/pad-right-0.2.2.tgz",
@@ -4099,13 +4019,10 @@
"dev": true
},
"path-exists": {
- "version": "2.1.0",
- "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz",
- "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=",
- "dev": true,
- "requires": {
- "pinkie-promise": "2.0.1"
- }
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
+ "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=",
+ "dev": true
},
"path-is-absolute": {
"version": "1.0.1",
@@ -4132,6 +4049,14 @@
"dev": true,
"requires": {
"pify": "2.3.0"
+ },
+ "dependencies": {
+ "pify": {
+ "version": "2.3.0",
+ "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+ "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
+ "dev": true
+ }
}
},
"pbkdf2": {
@@ -4155,9 +4080,9 @@
"optional": true
},
"pify": {
- "version": "2.3.0",
- "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
- "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
+ "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
"dev": true
},
"pinkie": {
@@ -4440,14 +4365,6 @@
"esprima": "3.1.3",
"private": "0.1.8",
"source-map": "0.5.7"
- },
- "dependencies": {
- "esprima": {
- "version": "3.1.3",
- "resolved": "https://registry.npmjs.org/esprima/-/esprima-3.1.3.tgz",
- "integrity": "sha1-/cpRzuYTOJXjyI1TXOSdv/YqRjM=",
- "dev": true
- }
}
},
"rechoir": {
@@ -4657,7 +4574,7 @@
"integrity": "sha512-lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w==",
"dev": true,
"requires": {
- "glob": "7.1.1"
+ "glob": "7.1.2"
}
},
"ripemd160": {
@@ -4778,7 +4695,7 @@
"integrity": "sha1-N5zM+1a5HIYB5HkzVutTgpJN6a0=",
"dev": true,
"requires": {
- "glob": "7.1.1",
+ "glob": "7.1.2",
"interpret": "1.1.0",
"rechoir": "0.6.2"
}
@@ -5299,7 +5216,7 @@
"integrity": "sha512-fxxKXoicjdXNUMY7LIdY89tkJJJ0m1Oo8PQutZ5rLgWbV5QVKI15Cn7+/IHnRTd3vfKfiwBx6SBqlorAuNA8LA==",
"dev": true,
"requires": {
- "acorn": "5.2.1",
+ "acorn": "5.3.0",
"acorn-dynamic-import": "2.0.2",
"ajv": "5.5.2",
"ajv-keywords": "2.1.1",
@@ -5323,6 +5240,12 @@
"yargs": "8.0.2"
},
"dependencies": {
+ "acorn": {
+ "version": "5.3.0",
+ "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.3.0.tgz",
+ "integrity": "sha512-Yej+zOJ1Dm/IMZzzj78OntP/r3zHEaKcyNoU2lAaxPtrseM6rF0xwqoz5Q5ysAiED9hTjI2hgtvLXitlCN1/Ug==",
+ "dev": true
+ },
"supports-color": {
"version": "4.5.0",
"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.5.0.tgz",
@@ -5469,10 +5392,11 @@
"dev": true
},
"wordwrap": {
- "version": "0.0.2",
- "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz",
- "integrity": "sha1-t5Zpu0LstAn4PVg8rVLKF+qhZD8=",
- "dev": true
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz",
+ "integrity": "sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=",
+ "dev": true,
+ "optional": true
},
"worker-farm": {
"version": "1.5.2",
diff --git a/src/config/configMgr.js b/src/config/configMgr.js
index 4140a79..adc8a57 100644
--- a/src/config/configMgr.js
+++ b/src/config/configMgr.js
@@ -1,7 +1,7 @@
// Created by xiazeyu.
/**
- * @description The container of configeration.
+ * @description The manager of configeration.
*/
@@ -9,7 +9,16 @@
import _ from 'lodash';
+/**
+ * The container of current configs
+ * @type {Object}
+ */
+
let currConfig = {};
+/**
+ * Default settings for defaulter
+ * @type {Object}
+ */
const defaultOptions = {
model: {
@@ -49,9 +58,14 @@ const defaultOptions = {
_: true,
}
+/**
+ * Apply users function, make the full settings
+ * @param {Object} userConfig User's custom config
+ */
+
function configApplyer(userConfig){
- if (!(_.has(userConfig, '_'))){
+ if (_.has(userConfig, '_')){
import(/* webpackMode: "lazy" */ './configValidater').then(f => {
f.configValidater(userConfig);
}).catch(err => {
diff --git a/src/config/configValidater.js b/src/config/configValidater.js
index 6f719e1..365db33 100644
--- a/src/config/configValidater.js
+++ b/src/config/configValidater.js
@@ -1,7 +1,7 @@
// Created by xiazeyu.
/**
- * @description the validater for user's config
+ * @description The validater function for user's config.
*/
diff --git a/src/index.js b/src/index.js
index 4fe2f59..b10aab6 100644
--- a/src/index.js
+++ b/src/index.js
@@ -5,7 +5,7 @@
////////////////////////////////////
/**
- * @description The entry point of live2d-widget
+ * @description The entry point of live2d-widget.
*/
@@ -16,10 +16,10 @@ import { config, configApplyer }from './config/configMgr';
/**
* The public entry point
- * @param {Object} userConfig User's config
+ * @param {Object} userConfig User's custom config
*/
-export function init(userConfig){
+function init(userConfig){
userConfig = typeof userConfig === 'undefined' ? {} : userConfig;
@@ -42,3 +42,7 @@ export function init(userConfig){
});
}
+
+export {
+ init,
+}
diff --git a/src/wpPublicPath.js b/src/wpPublicPath.js
index 198fdb1..3020ef1 100644
--- a/src/wpPublicPath.js
+++ b/src/wpPublicPath.js
@@ -1,5 +1,5 @@
/**
- * @description Automatic locate the publicPath for webpack
+ * @description Automatic locate the publicPath and set it up for webpack.
*/
@@ -7,9 +7,9 @@
/**
* Get current script path
- * @return {String} the accessable path of current script
+ * @return {String} The accessable path of current script
* @example
- * get 'dev/' or 'https'
+ * get 'dev/' or 'https://www.host.com/test/js/'
*/
function getCurrentPath(){
@@ -31,13 +31,17 @@ function getCurrentPath(){
// console.log(e);
let stack = e.stack || e.sourceURL || e.stacktrace,
- rExtractUri = /(?:http|https|file):\/\/.*?\/.+?.js/,
- absPath = rExtractUri.exec(stack);
- currentScriptPath = absPath[0] || '';
- }
+ rExtractUri = /(file:\/{3}\w:)(\/[^\/]*){3}\//;
+ // TODO: Fix wrong RegExp: rExtractUri
+ let absPath = rExtractUri.exec(stack);
+ currentScriptPath = absPath[0];
+
+ if(currentScriptPath === ''){
+ rExtractUri = /(?:http|https|file):\/\/.*?\/.+?.js/;
+ absPath = rExtractUri.exec(stack);
+ currentScriptPath = absPath[0];
+ }
- if (currentScriptPath === null){
- throw 'Cannot get currentScriptPath for wpPublicPath';
}
return currentScriptPath;
@@ -50,3 +54,7 @@ __webpack_public_path__ = getCurrentPath();
if (process.env.NODE_ENV === 'development'){
console.log(`wpPP: publicPath: ${__webpack_public_path__}`);
}
+
+export {
+ getCurrentPath,
+}