From 7d8392f03683044da26b5a5865e5239491c07c53 Mon Sep 17 00:00:00 2001 From: Wu Haotian Date: Sun, 24 Sep 2017 18:34:44 +0800 Subject: [PATCH 1/2] Upgrade Vue to 2.4.4 --- package.json | 6 +++--- start/package.json | 4 ++-- yarn.lock | 18 +++++++++--------- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/package.json b/package.json index 598d5389cd..e53f742c33 100644 --- a/package.json +++ b/package.json @@ -109,12 +109,12 @@ "source-map-support": "^0.4.17", "tappable": "^1.1.0", "url-loader": "^0.5.9", - "vue": "~2.4.2", + "vue": "~2.4.4", "vue-loader": "^13.0.4", "vue-meta": "^1.1.0", "vue-router": "^2.7.0", - "vue-server-renderer": "~2.4.2", - "vue-template-compiler": "~2.4.2", + "vue-server-renderer": "~2.4.4", + "vue-template-compiler": "~2.4.4", "vuex": "^2.4.0", "webpack": "^3.5.5", "webpack-bundle-analyzer": "^2.9.0", diff --git a/start/package.json b/start/package.json index fc67f8fced..ce427c9554 100644 --- a/start/package.json +++ b/start/package.json @@ -62,11 +62,11 @@ "serve-static": "^1.12.4", "compression": "^1.7.0", "fs-extra": "^4.0.1", - "vue-server-renderer": "~2.4.2", + "vue-server-renderer": "~2.4.4", "@nuxtjs/youch": "3.1.0", "source-map": "^0.5.7", "connect": "^3.6.3", - "vue": "~2.4.2", + "vue": "~2.4.4", "vue-meta": "^1.1.0", "lru-cache": "^4.1.1", "server-destroy": "^1.0.1", diff --git a/yarn.lock b/yarn.lock index 7a1c08fe84..03abc1fe20 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6570,9 +6570,9 @@ vue-router@^2.7.0: version "2.7.0" resolved "https://registry.yarnpkg.com/vue-router/-/vue-router-2.7.0.tgz#16d424493aa51c3c8cce8b7c7210ea4c3a89aff1" -vue-server-renderer@~2.4.2: - version "2.4.2" - resolved "https://registry.yarnpkg.com/vue-server-renderer/-/vue-server-renderer-2.4.2.tgz#0ba0f984181ea1c455362b09bddf60bc0e0a03fa" +vue-server-renderer@~2.4.4: + version "2.4.4" + resolved "http://registry.npm.taobao.org/vue-server-renderer/download/vue-server-renderer-2.4.4.tgz#bd59cf4e42dfaf2c9e388af8837b5420dd51360d" dependencies: chalk "^1.1.3" hash-sum "^1.0.2" @@ -6590,9 +6590,9 @@ vue-style-loader@^3.0.0: hash-sum "^1.0.2" loader-utils "^1.0.2" -vue-template-compiler@~2.4.2: - version "2.4.2" - resolved "https://registry.yarnpkg.com/vue-template-compiler/-/vue-template-compiler-2.4.2.tgz#5a45d843f148b098f6c1d1e35ac20c4956d30ad1" +vue-template-compiler@~2.4.4: + version "2.4.4" + resolved "http://registry.npm.taobao.org/vue-template-compiler/download/vue-template-compiler-2.4.4.tgz#2cde3b704124985c27d50b5387c9691ba515fb57" dependencies: de-indent "^1.0.2" he "^1.1.0" @@ -6601,9 +6601,9 @@ vue-template-es2015-compiler@^1.5.3: version "1.5.3" resolved "https://registry.yarnpkg.com/vue-template-es2015-compiler/-/vue-template-es2015-compiler-1.5.3.tgz#22787de4e37ebd9339b74223bc467d1adee30545" -vue@~2.4.2: - version "2.4.2" - resolved "https://registry.yarnpkg.com/vue/-/vue-2.4.2.tgz#a9855261f191c978cc0dc1150531b8d08149b58c" +vue@~2.4.4: + version "2.4.4" + resolved "http://registry.npm.taobao.org/vue/download/vue-2.4.4.tgz#ea9550b96a71465fd2b8b17b61673b3561861789" vuex@^2.4.0: version "2.4.0" From ddfe0eb7f7246a9b59263119f205b6475f4994e8 Mon Sep 17 00:00:00 2001 From: Wu Haotian Date: Sun, 24 Sep 2017 18:39:38 +0800 Subject: [PATCH 2/2] use yarnpkg registry --- .npmrc | 1 + yarn.lock | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) create mode 100644 .npmrc diff --git a/.npmrc b/.npmrc new file mode 100644 index 0000000000..9841c0bd3f --- /dev/null +++ b/.npmrc @@ -0,0 +1 @@ +registry=https://registry.yarnpkg.com diff --git a/yarn.lock b/yarn.lock index 03abc1fe20..fb9a89ee33 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6572,7 +6572,7 @@ vue-router@^2.7.0: vue-server-renderer@~2.4.4: version "2.4.4" - resolved "http://registry.npm.taobao.org/vue-server-renderer/download/vue-server-renderer-2.4.4.tgz#bd59cf4e42dfaf2c9e388af8837b5420dd51360d" + resolved "https://registry.yarnpkg.com/vue-server-renderer/-/vue-server-renderer-2.4.4.tgz#bd59cf4e42dfaf2c9e388af8837b5420dd51360d" dependencies: chalk "^1.1.3" hash-sum "^1.0.2" @@ -6592,7 +6592,7 @@ vue-style-loader@^3.0.0: vue-template-compiler@~2.4.4: version "2.4.4" - resolved "http://registry.npm.taobao.org/vue-template-compiler/download/vue-template-compiler-2.4.4.tgz#2cde3b704124985c27d50b5387c9691ba515fb57" + resolved "https://registry.yarnpkg.com/vue-template-compiler/-/vue-template-compiler-2.4.4.tgz#2cde3b704124985c27d50b5387c9691ba515fb57" dependencies: de-indent "^1.0.2" he "^1.1.0" @@ -6603,7 +6603,7 @@ vue-template-es2015-compiler@^1.5.3: vue@~2.4.4: version "2.4.4" - resolved "http://registry.npm.taobao.org/vue/download/vue-2.4.4.tgz#ea9550b96a71465fd2b8b17b61673b3561861789" + resolved "https://registry.yarnpkg.com/vue/-/vue-2.4.4.tgz#ea9550b96a71465fd2b8b17b61673b3561861789" vuex@^2.4.0: version "2.4.0"