...
|
...
|
@@ -85,7 +85,7 @@ |
|
|
},
|
|
|
"adler-32": {
|
|
|
"version": "1.2.0",
|
|
|
"resolved": "https://registry.npm.taobao.org/adler-32/download/adler-32-1.2.0.tgz",
|
|
|
"resolved": "https://registry.npmjs.org/adler-32/-/adler-32-1.2.0.tgz",
|
|
|
"integrity": "sha1-aj5r8KY5ALoVZSgIyxXGgT0aXyU=",
|
|
|
"requires": {
|
|
|
"exit-on-epipe": "~1.0.1",
|
...
|
...
|
@@ -2340,7 +2340,7 @@ |
|
|
},
|
|
|
"codepage": {
|
|
|
"version": "1.14.0",
|
|
|
"resolved": "https://registry.npm.taobao.org/codepage/download/codepage-1.14.0.tgz",
|
|
|
"resolved": "https://registry.npmjs.org/codepage/-/codepage-1.14.0.tgz",
|
|
|
"integrity": "sha1-jL4lSBMjVZ19MHVxsP/5HnodL5k=",
|
|
|
"requires": {
|
|
|
"commander": "~2.14.1",
|
...
|
...
|
@@ -6313,11 +6313,7 @@ |
|
|
},
|
|
|
"normalize-wheel": {
|
|
|
"version": "1.0.1",
|
|
|
<<<<<<< HEAD
|
|
|
"resolved": "https://registry.npmjs.org/normalize-wheel/-/normalize-wheel-1.0.1.tgz",
|
|
|
=======
|
|
|
"resolved": "https://registry.npm.taobao.org/normalize-wheel/download/normalize-wheel-1.0.1.tgz",
|
|
|
>>>>>>> bc2ec1ef193de6a4d7b7d18f1b5d08e9f5203861
|
|
|
"integrity": "sha1-rsiGr/2wRQcNhWRH32Ls+GFG7EU="
|
|
|
},
|
|
|
"npm": {
|
...
|
...
|
@@ -10551,7 +10547,7 @@ |
|
|
},
|
|
|
"raw-loader": {
|
|
|
"version": "0.5.1",
|
|
|
"resolved": "https://registry.npm.taobao.org/raw-loader/download/raw-loader-0.5.1.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fraw-loader%2Fdownload%2Fraw-loader-0.5.1.tgz",
|
|
|
"resolved": "https://registry.npmjs.org/raw-loader/-/raw-loader-0.5.1.tgz",
|
|
|
"integrity": "sha1-DD0L6u2KAclm2Xh793goElKpeao="
|
|
|
},
|
|
|
"read-pkg": {
|
...
|
...
|
@@ -11146,13 +11142,8 @@ |
|
|
},
|
|
|
"resize-observer-polyfill": {
|
|
|
"version": "1.5.1",
|
|
|
<<<<<<< HEAD
|
|
|
"resolved": "https://registry.npmjs.org/resize-observer-polyfill/-/resize-observer-polyfill-1.5.1.tgz",
|
|
|
"integrity": "sha512-LwZrotdHOo12nQuZlHEmtuXdqGoOD0OhaxopaNFxWzInpEgaLWoVuAMbTzixuosCx2nEG58ngzW3vxdWoxIgdg=="
|
|
|
=======
|
|
|
"resolved": "https://registry.npm.taobao.org/resize-observer-polyfill/download/resize-observer-polyfill-1.5.1.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fresize-observer-polyfill%2Fdownload%2Fresize-observer-polyfill-1.5.1.tgz",
|
|
|
"integrity": "sha1-DpAg3T0hAkRY1OvSfiPkAmmBBGQ="
|
|
|
>>>>>>> bc2ec1ef193de6a4d7b7d18f1b5d08e9f5203861
|
|
|
},
|
|
|
"resolve": {
|
|
|
"version": "1.12.0",
|
...
|
...
|
|