|
@@ -3278,10 +3278,41 @@
|
|
|
"integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
|
|
|
"dev": true
|
|
|
},
|
|
|
+<<<<<<< HEAD
|
|
|
"fsevents": {
|
|
|
"version": "1.1.3",
|
|
|
"resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.1.3.tgz",
|
|
|
"integrity": "sha512-WIr7iDkdmdbxu/Gh6eKEZJL6KPE74/5MEsf2whTOFNxbIoIixogroLdKYqB6FDav4Wavh/lZdzzd3b2KxIXC5Q==",
|
|
|
+=======
|
|
|
+ "function-bind": {
|
|
|
+ "version": "1.1.0",
|
|
|
+ "resolved": "http://registry.npm.taobao.org/function-bind/download/function-bind-1.1.0.tgz",
|
|
|
+ "integrity": "sha1-FhdnFMgBeY5Ojyz391KUZ7tKV3E=",
|
|
|
+ "dev": true
|
|
|
+ },
|
|
|
+ "get-caller-file": {
|
|
|
+ "version": "1.0.2",
|
|
|
+ "resolved": "http://registry.npm.taobao.org/get-caller-file/download/get-caller-file-1.0.2.tgz",
|
|
|
+ "integrity": "sha1-9wLmMSfn4jHBYKgMFVSstw1QR+U=",
|
|
|
+ "dev": true
|
|
|
+ },
|
|
|
+ "get-stdin": {
|
|
|
+ "version": "4.0.1",
|
|
|
+ "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz",
|
|
|
+ "integrity": "sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4=",
|
|
|
+ "dev": true
|
|
|
+ },
|
|
|
+ "get-value": {
|
|
|
+ "version": "2.0.6",
|
|
|
+ "resolved": "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz",
|
|
|
+ "integrity": "sha1-3BXKHGcjh8p2vTesCjlbogQqLCg=",
|
|
|
+ "dev": true
|
|
|
+ },
|
|
|
+ "getpass": {
|
|
|
+ "version": "0.1.7",
|
|
|
+ "resolved": "http://registry.npm.taobao.org/getpass/download/getpass-0.1.7.tgz",
|
|
|
+ "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=",
|
|
|
+>>>>>>> 7b9c98a54ad5297f0b6e76d0dd5ecbb5579c4974
|
|
|
"dev": true,
|
|
|
"optional": true,
|
|
|
"requires": {
|
|
@@ -3294,7 +3325,108 @@
|
|
|
"bundled": true,
|
|
|
"dev": true,
|
|
|
"optional": true
|
|
|
+<<<<<<< HEAD
|
|
|
},
|
|
|
+=======
|
|
|
+ }
|
|
|
+ }
|
|
|
+ },
|
|
|
+ "glob": {
|
|
|
+ "version": "7.1.2",
|
|
|
+ "resolved": "http://registry.npm.taobao.org/glob/download/glob-7.1.2.tgz",
|
|
|
+ "integrity": "sha1-wZyd+aAocC1nhhI4SmVSQExjbRU=",
|
|
|
+ "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"
|
|
|
+ }
|
|
|
+ },
|
|
|
+ "glob-base": {
|
|
|
+ "version": "0.3.0",
|
|
|
+ "resolved": "http://registry.npm.taobao.org/glob-base/download/glob-base-0.3.0.tgz",
|
|
|
+ "integrity": "sha1-27Fk9iIbHAscz4Kuoyi0l98Oo8Q=",
|
|
|
+ "dev": true,
|
|
|
+ "requires": {
|
|
|
+ "glob-parent": "2.0.0",
|
|
|
+ "is-glob": "2.0.1"
|
|
|
+ }
|
|
|
+ },
|
|
|
+ "glob-parent": {
|
|
|
+ "version": "2.0.0",
|
|
|
+ "resolved": "http://registry.npm.taobao.org/glob-parent/download/glob-parent-2.0.0.tgz",
|
|
|
+ "integrity": "sha1-gTg9ctsFT8zPUzbaqQLxgvbtuyg=",
|
|
|
+ "dev": true,
|
|
|
+ "requires": {
|
|
|
+ "is-glob": "2.0.1"
|
|
|
+ }
|
|
|
+ },
|
|
|
+ "globals": {
|
|
|
+ "version": "9.18.0",
|
|
|
+ "resolved": "http://registry.npm.taobao.org/globals/download/globals-9.18.0.tgz",
|
|
|
+ "integrity": "sha1-qjiWs+abSH8X4x7SFD1pqOMMLYo=",
|
|
|
+ "dev": true
|
|
|
+ },
|
|
|
+ "globby": {
|
|
|
+ "version": "6.1.0",
|
|
|
+ "resolved": "http://registry.npm.taobao.org/globby/download/globby-6.1.0.tgz",
|
|
|
+ "integrity": "sha1-9abXDoOV4hyFj7BInWTfAkJNUGw=",
|
|
|
+ "dev": true,
|
|
|
+ "requires": {
|
|
|
+ "array-union": "1.0.2",
|
|
|
+ "glob": "7.1.2",
|
|
|
+ "object-assign": "4.1.1",
|
|
|
+ "pify": "2.3.0",
|
|
|
+ "pinkie-promise": "2.0.1"
|
|
|
+ },
|
|
|
+ "dependencies": {
|
|
|
+ "pify": {
|
|
|
+ "version": "2.3.0",
|
|
|
+ "resolved": "http://registry.npm.taobao.org/pify/download/pify-2.3.0.tgz",
|
|
|
+ "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
|
|
|
+ "dev": true
|
|
|
+ }
|
|
|
+ }
|
|
|
+ },
|
|
|
+ "graceful-fs": {
|
|
|
+ "version": "4.1.11",
|
|
|
+ "resolved": "http://registry.npm.taobao.org/graceful-fs/download/graceful-fs-4.1.11.tgz",
|
|
|
+ "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=",
|
|
|
+ "dev": true
|
|
|
+ },
|
|
|
+ "hammerjs": {
|
|
|
+ "version": "2.0.8",
|
|
|
+ "resolved": "http://registry.npm.taobao.org/hammerjs/download/hammerjs-2.0.8.tgz",
|
|
|
+ "integrity": "sha1-BO93hiz/K7edMPdpIJWTAiK/YPE="
|
|
|
+ },
|
|
|
+ "handle-thing": {
|
|
|
+ "version": "1.2.5",
|
|
|
+ "resolved": "https://registry.npmjs.org/handle-thing/-/handle-thing-1.2.5.tgz",
|
|
|
+ "integrity": "sha1-/Xqtcmvxpf0W38KbL3pmAdJxOcQ=",
|
|
|
+ "dev": true
|
|
|
+ },
|
|
|
+ "har-schema": {
|
|
|
+ "version": "1.0.5",
|
|
|
+ "resolved": "http://registry.npm.taobao.org/har-schema/download/har-schema-1.0.5.tgz",
|
|
|
+ "integrity": "sha1-0mMTX0MwfALGAq/I/pWXDAFRNp4=",
|
|
|
+ "dev": true,
|
|
|
+ "optional": true
|
|
|
+ },
|
|
|
+ "har-validator": {
|
|
|
+ "version": "4.2.1",
|
|
|
+ "resolved": "http://registry.npm.taobao.org/har-validator/download/har-validator-4.2.1.tgz",
|
|
|
+ "integrity": "sha1-M0gdDxu/9gDdID11gSpqX7oALio=",
|
|
|
+ "dev": true,
|
|
|
+ "optional": true,
|
|
|
+ "requires": {
|
|
|
+ "ajv": "4.11.8",
|
|
|
+ "har-schema": "1.0.5"
|
|
|
+ },
|
|
|
+ "dependencies": {
|
|
|
+>>>>>>> 7b9c98a54ad5297f0b6e76d0dd5ecbb5579c4974
|
|
|
"ajv": {
|
|
|
"version": "4.11.8",
|
|
|
"bundled": true,
|
|
@@ -3304,6 +3436,7 @@
|
|
|
"co": "4.6.0",
|
|
|
"json-stable-stringify": "1.0.1"
|
|
|
}
|
|
|
+<<<<<<< HEAD
|
|
|
},
|
|
|
"ansi-regex": {
|
|
|
"version": "2.1.1",
|
|
@@ -4330,6 +4463,8 @@
|
|
|
"co": "4.6.0",
|
|
|
"json-stable-stringify": "1.0.1"
|
|
|
}
|
|
|
+=======
|
|
|
+>>>>>>> 7b9c98a54ad5297f0b6e76d0dd5ecbb5579c4974
|
|
|
}
|
|
|
}
|
|
|
},
|
|
@@ -4715,6 +4850,91 @@
|
|
|
}
|
|
|
}
|
|
|
},
|
|
|
+ "http-deceiver": {
|
|
|
+ "version": "1.2.7",
|
|
|
+ "resolved": "https://registry.npmjs.org/http-deceiver/-/http-deceiver-1.2.7.tgz",
|
|
|
+ "integrity": "sha1-+nFolEq5pRnTN8sL7HKE3D5yPYc=",
|
|
|
+ "dev": true
|
|
|
+ },
|
|
|
+ "http-errors": {
|
|
|
+ "version": "1.6.2",
|
|
|
+ "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.2.tgz",
|
|
|
+ "integrity": "sha1-CgAsyFcHGSp+eUbO7cERVfYOxzY=",
|
|
|
+ "dev": true,
|
|
|
+ "requires": {
|
|
|
+ "depd": "1.1.1",
|
|
|
+ "inherits": "2.0.3",
|
|
|
+ "setprototypeof": "1.0.3",
|
|
|
+ "statuses": "1.3.1"
|
|
|
+ },
|
|
|
+ "dependencies": {
|
|
|
+ "depd": {
|
|
|
+ "version": "1.1.1",
|
|
|
+ "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.1.tgz",
|
|
|
+ "integrity": "sha1-V4O04cRZ8G+lyif5kfPQbnoxA1k=",
|
|
|
+ "dev": true
|
|
|
+ },
|
|
|
+ "setprototypeof": {
|
|
|
+ "version": "1.0.3",
|
|
|
+ "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.0.3.tgz",
|
|
|
+ "integrity": "sha1-ZlZ+NwQ+608E2RvWWMDL77VbjgQ=",
|
|
|
+ "dev": true
|
|
|
+ }
|
|
|
+ }
|
|
|
+ },
|
|
|
+ "http-parser-js": {
|
|
|
+ "version": "0.4.9",
|
|
|
+ "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.4.9.tgz",
|
|
|
+ "integrity": "sha1-6hoE+2St/wJC6ZdPKX3Uw8rSceE=",
|
|
|
+ "dev": true
|
|
|
+ },
|
|
|
+ "http-proxy": {
|
|
|
+ "version": "1.16.2",
|
|
|
+ "resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.16.2.tgz",
|
|
|
+ "integrity": "sha1-Bt/ykpUr9k2+hHH6nfcwZtTzd0I=",
|
|
|
+ "dev": true,
|
|
|
+ "requires": {
|
|
|
+ "eventemitter3": "1.2.0",
|
|
|
+ "requires-port": "1.0.0"
|
|
|
+ },
|
|
|
+ "dependencies": {
|
|
|
+ "eventemitter3": {
|
|
|
+ "version": "1.2.0",
|
|
|
+ "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-1.2.0.tgz",
|
|
|
+ "integrity": "sha1-HIaZHYFq0eUEdQ5zh0Ik7PO+xQg=",
|
|
|
+ "dev": true
|
|
|
+ }
|
|
|
+ }
|
|
|
+ },
|
|
|
+ "http-proxy-middleware": {
|
|
|
+ "version": "0.17.4",
|
|
|
+ "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-0.17.4.tgz",
|
|
|
+ "integrity": "sha1-ZC6ISIUdZvCdTxJJEoRtuutBuDM=",
|
|
|
+ "dev": true,
|
|
|
+ "requires": {
|
|
|
+ "http-proxy": "1.16.2",
|
|
|
+ "is-glob": "3.1.0",
|
|
|
+ "lodash": "4.17.4",
|
|
|
+ "micromatch": "2.3.11"
|
|
|
+ },
|
|
|
+ "dependencies": {
|
|
|
+ "is-extglob": {
|
|
|
+ "version": "2.1.1",
|
|
|
+ "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
|
|
|
+ "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
|
|
|
+ "dev": true
|
|
|
+ },
|
|
|
+ "is-glob": {
|
|
|
+ "version": "3.1.0",
|
|
|
+ "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
|
|
|
+ "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
|
|
|
+ "dev": true,
|
|
|
+ "requires": {
|
|
|
+ "is-extglob": "2.1.1"
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ },
|
|
|
"http-signature": {
|
|
|
"version": "1.1.1",
|
|
|
"resolved": "http://registry.npm.taobao.org/http-signature/download/http-signature-1.1.1.tgz",
|
|
@@ -4946,6 +5166,57 @@
|
|
|
"version": "1.1.3",
|
|
|
"resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.1.3.tgz",
|
|
|
"integrity": "sha1-hut1OSgF3cM69xySoO7fdO52BLI=",
|
|
|
+<<<<<<< HEAD
|
|
|
+ "dev": true
|
|
|
+ },
|
|
|
+ "is-data-descriptor": {
|
|
|
+ "version": "1.0.0",
|
|
|
+ "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
|
|
|
+ "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
|
|
|
+ "dev": true,
|
|
|
+ "requires": {
|
|
|
+ "kind-of": "6.0.2"
|
|
|
+ },
|
|
|
+ "dependencies": {
|
|
|
+ "kind-of": {
|
|
|
+ "version": "6.0.2",
|
|
|
+ "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
|
|
|
+ "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
|
|
|
+ "dev": true
|
|
|
+ }
|
|
|
+ }
|
|
|
+ },
|
|
|
+ "is-date-object": {
|
|
|
+ "version": "1.0.1",
|
|
|
+ "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.1.tgz",
|
|
|
+ "integrity": "sha1-mqIOtq7rv/d/vTPnTKAbM1gdOhY=",
|
|
|
+ "dev": true
|
|
|
+ },
|
|
|
+ "is-descriptor": {
|
|
|
+ "version": "1.0.2",
|
|
|
+ "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
|
|
|
+ "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
|
|
|
+ "dev": true,
|
|
|
+ "requires": {
|
|
|
+ "is-accessor-descriptor": "1.0.0",
|
|
|
+ "is-data-descriptor": "1.0.0",
|
|
|
+ "kind-of": "6.0.2"
|
|
|
+ },
|
|
|
+ "dependencies": {
|
|
|
+ "kind-of": {
|
|
|
+ "version": "6.0.2",
|
|
|
+ "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
|
|
|
+ "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
|
|
|
+ "dev": true
|
|
|
+ }
|
|
|
+ }
|
|
|
+ },
|
|
|
+ "is-dotfile": {
|
|
|
+ "version": "1.0.3",
|
|
|
+ "resolved": "http://registry.npm.taobao.org/is-dotfile/download/is-dotfile-1.0.3.tgz",
|
|
|
+ "integrity": "sha1-pqLzL/0t+wT1yiXs0Pa4PPeYoeE=",
|
|
|
+=======
|
|
|
+>>>>>>> 7b9c98a54ad5297f0b6e76d0dd5ecbb5579c4974
|
|
|
"dev": true
|
|
|
},
|
|
|
"is-data-descriptor": {
|
|
@@ -5914,6 +6185,7 @@
|
|
|
"integrity": "sha1-iZ8R2WhuXgXLkbNdXw5jt3PPyQE=",
|
|
|
"dev": true
|
|
|
},
|
|
|
+<<<<<<< HEAD
|
|
|
"nan": {
|
|
|
"version": "2.8.0",
|
|
|
"resolved": "https://registry.npmjs.org/nan/-/nan-2.8.0.tgz",
|
|
@@ -5921,6 +6193,8 @@
|
|
|
"dev": true,
|
|
|
"optional": true
|
|
|
},
|
|
|
+=======
|
|
|
+>>>>>>> 7b9c98a54ad5297f0b6e76d0dd5ecbb5579c4974
|
|
|
"nanomatch": {
|
|
|
"version": "1.2.7",
|
|
|
"resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.7.tgz",
|
|
@@ -6218,6 +6492,88 @@
|
|
|
}
|
|
|
}
|
|
|
},
|
|
|
+ "object-copy": {
|
|
|
+ "version": "0.1.0",
|
|
|
+ "resolved": "https://registry.npmjs.org/object-copy/-/object-copy-0.1.0.tgz",
|
|
|
+ "integrity": "sha1-fn2Fi3gb18mRpBupde04EnVOmYw=",
|
|
|
+ "dev": true,
|
|
|
+ "requires": {
|
|
|
+ "copy-descriptor": "0.1.1",
|
|
|
+ "define-property": "0.2.5",
|
|
|
+ "kind-of": "3.2.2"
|
|
|
+ },
|
|
|
+ "dependencies": {
|
|
|
+ "define-property": {
|
|
|
+ "version": "0.2.5",
|
|
|
+ "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
|
|
|
+ "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
|
|
|
+ "dev": true,
|
|
|
+ "requires": {
|
|
|
+ "is-descriptor": "0.1.6"
|
|
|
+ }
|
|
|
+ },
|
|
|
+ "is-accessor-descriptor": {
|
|
|
+ "version": "0.1.6",
|
|
|
+ "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
|
|
|
+ "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
|
|
|
+ "dev": true,
|
|
|
+ "requires": {
|
|
|
+ "kind-of": "3.2.2"
|
|
|
+ }
|
|
|
+ },
|
|
|
+ "is-data-descriptor": {
|
|
|
+ "version": "0.1.4",
|
|
|
+ "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
|
|
|
+ "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
|
|
|
+ "dev": true,
|
|
|
+ "requires": {
|
|
|
+ "kind-of": "3.2.2"
|
|
|
+ }
|
|
|
+ },
|
|
|
+ "is-descriptor": {
|
|
|
+ "version": "0.1.6",
|
|
|
+ "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
|
|
|
+ "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
|
|
|
+ "dev": true,
|
|
|
+ "requires": {
|
|
|
+ "is-accessor-descriptor": "0.1.6",
|
|
|
+ "is-data-descriptor": "0.1.4",
|
|
|
+ "kind-of": "5.1.0"
|
|
|
+ },
|
|
|
+ "dependencies": {
|
|
|
+ "kind-of": {
|
|
|
+ "version": "5.1.0",
|
|
|
+ "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
|
|
|
+ "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
|
|
|
+ "dev": true
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ },
|
|
|
+ "object-keys": {
|
|
|
+ "version": "1.0.11",
|
|
|
+ "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.0.11.tgz",
|
|
|
+ "integrity": "sha1-xUYBd4rVYPEULODgG8yotW0TQm0=",
|
|
|
+ "dev": true
|
|
|
+ },
|
|
|
+ "object-visit": {
|
|
|
+ "version": "1.0.1",
|
|
|
+ "resolved": "https://registry.npmjs.org/object-visit/-/object-visit-1.0.1.tgz",
|
|
|
+ "integrity": "sha1-95xEk68MU3e1n+OdOV5BBC3QRbs=",
|
|
|
+ "dev": true,
|
|
|
+ "requires": {
|
|
|
+ "isobject": "3.0.1"
|
|
|
+ },
|
|
|
+ "dependencies": {
|
|
|
+ "isobject": {
|
|
|
+ "version": "3.0.1",
|
|
|
+ "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
|
|
|
+ "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
|
|
|
+ "dev": true
|
|
|
+ }
|
|
|
+ }
|
|
|
+ },
|
|
|
"object.omit": {
|
|
|
"version": "2.0.1",
|
|
|
"resolved": "http://registry.npm.taobao.org/object.omit/download/object.omit-2.0.1.tgz",
|
|
@@ -8706,6 +9062,41 @@
|
|
|
}
|
|
|
}
|
|
|
},
|
|
|
+ "sockjs": {
|
|
|
+ "version": "0.3.19",
|
|
|
+ "resolved": "https://registry.npmjs.org/sockjs/-/sockjs-0.3.19.tgz",
|
|
|
+ "integrity": "sha512-V48klKZl8T6MzatbLlzzRNhMepEys9Y4oGFpypBFFn1gLI/QQ9HtLLyWJNbPlwGLelOVOEijUbTTJeLLI59jLw==",
|
|
|
+ "dev": true,
|
|
|
+ "requires": {
|
|
|
+ "faye-websocket": "0.10.0",
|
|
|
+ "uuid": "3.1.0"
|
|
|
+ }
|
|
|
+ },
|
|
|
+ "sockjs-client": {
|
|
|
+ "version": "1.1.4",
|
|
|
+ "resolved": "https://registry.npmjs.org/sockjs-client/-/sockjs-client-1.1.4.tgz",
|
|
|
+ "integrity": "sha1-W6vjhrd15M8U51IJEUUmVAFsixI=",
|
|
|
+ "dev": true,
|
|
|
+ "requires": {
|
|
|
+ "debug": "2.6.8",
|
|
|
+ "eventsource": "0.1.6",
|
|
|
+ "faye-websocket": "0.11.1",
|
|
|
+ "inherits": "2.0.3",
|
|
|
+ "json3": "3.3.2",
|
|
|
+ "url-parse": "1.2.0"
|
|
|
+ },
|
|
|
+ "dependencies": {
|
|
|
+ "faye-websocket": {
|
|
|
+ "version": "0.11.1",
|
|
|
+ "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.1.tgz",
|
|
|
+ "integrity": "sha1-8O/hjE9W5PQK/H4Gxxn9XuYYjzg=",
|
|
|
+ "dev": true,
|
|
|
+ "requires": {
|
|
|
+ "websocket-driver": "0.7.0"
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ },
|
|
|
"sort-keys": {
|
|
|
"version": "1.1.2",
|
|
|
"resolved": "http://registry.npm.taobao.org/sort-keys/download/sort-keys-1.1.2.tgz",
|
|
@@ -8912,6 +9303,93 @@
|
|
|
"version": "0.1.2",
|
|
|
"resolved": "https://registry.npmjs.org/static-extend/-/static-extend-0.1.2.tgz",
|
|
|
"integrity": "sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY=",
|
|
|
+<<<<<<< HEAD
|
|
|
+ "dev": true,
|
|
|
+ "requires": {
|
|
|
+ "define-property": "0.2.5",
|
|
|
+ "object-copy": "0.1.0"
|
|
|
+ },
|
|
|
+ "dependencies": {
|
|
|
+ "define-property": {
|
|
|
+ "version": "0.2.5",
|
|
|
+ "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
|
|
|
+ "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
|
|
|
+ "dev": true,
|
|
|
+ "requires": {
|
|
|
+ "is-descriptor": "0.1.6"
|
|
|
+ }
|
|
|
+ },
|
|
|
+ "is-accessor-descriptor": {
|
|
|
+ "version": "0.1.6",
|
|
|
+ "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
|
|
|
+ "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
|
|
|
+ "dev": true,
|
|
|
+ "requires": {
|
|
|
+ "kind-of": "3.2.2"
|
|
|
+ },
|
|
|
+ "dependencies": {
|
|
|
+ "kind-of": {
|
|
|
+ "version": "3.2.2",
|
|
|
+ "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
|
|
|
+ "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
|
|
|
+ "dev": true,
|
|
|
+ "requires": {
|
|
|
+ "is-buffer": "1.1.5"
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ },
|
|
|
+ "is-data-descriptor": {
|
|
|
+ "version": "0.1.4",
|
|
|
+ "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
|
|
|
+ "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
|
|
|
+ "dev": true,
|
|
|
+ "requires": {
|
|
|
+ "kind-of": "3.2.2"
|
|
|
+ },
|
|
|
+ "dependencies": {
|
|
|
+ "kind-of": {
|
|
|
+ "version": "3.2.2",
|
|
|
+ "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
|
|
|
+ "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
|
|
|
+ "dev": true,
|
|
|
+ "requires": {
|
|
|
+ "is-buffer": "1.1.5"
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ },
|
|
|
+ "is-descriptor": {
|
|
|
+ "version": "0.1.6",
|
|
|
+ "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
|
|
|
+ "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
|
|
|
+ "dev": true,
|
|
|
+ "requires": {
|
|
|
+ "is-accessor-descriptor": "0.1.6",
|
|
|
+ "is-data-descriptor": "0.1.4",
|
|
|
+ "kind-of": "5.1.0"
|
|
|
+ }
|
|
|
+ },
|
|
|
+ "kind-of": {
|
|
|
+ "version": "5.1.0",
|
|
|
+ "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
|
|
|
+ "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
|
|
|
+ "dev": true
|
|
|
+ }
|
|
|
+ }
|
|
|
+ },
|
|
|
+ "statuses": {
|
|
|
+ "version": "1.3.1",
|
|
|
+ "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.3.1.tgz",
|
|
|
+ "integrity": "sha1-+vUbnrdKrvOzrPStX2Gr8ky3uT4=",
|
|
|
+ "dev": true
|
|
|
+ },
|
|
|
+ "stream-browserify": {
|
|
|
+ "version": "2.0.1",
|
|
|
+ "resolved": "http://registry.npm.taobao.org/stream-browserify/download/stream-browserify-2.0.1.tgz",
|
|
|
+ "integrity": "sha1-ZiZu5fm9uZQKTkUUyvtDu3Hlyds=",
|
|
|
+=======
|
|
|
+>>>>>>> 7b9c98a54ad5297f0b6e76d0dd5ecbb5579c4974
|
|
|
"dev": true,
|
|
|
"requires": {
|
|
|
"define-property": "0.2.5",
|
|
@@ -10075,7 +10553,10 @@
|
|
|
"anymatch": "2.0.0",
|
|
|
"async-each": "1.0.1",
|
|
|
"braces": "2.3.0",
|
|
|
+<<<<<<< HEAD
|
|
|
"fsevents": "1.1.3",
|
|
|
+=======
|
|
|
+>>>>>>> 7b9c98a54ad5297f0b6e76d0dd5ecbb5579c4974
|
|
|
"glob-parent": "3.1.0",
|
|
|
"inherits": "2.0.3",
|
|
|
"is-binary-path": "1.0.1",
|