From 1133606407e2e382ac917073dd39b181c8bd9334 Mon Sep 17 00:00:00 2001 From: ULIVZ <472590061@qq.com> Date: Thu, 16 Aug 2018 22:38:20 +0800 Subject: [PATCH 1/2] chore: bump vuepress --- package.json | 4 +- yarn.lock | 191 ++++++++++++++++++++++++++++++--------------------- 2 files changed, 113 insertions(+), 82 deletions(-) diff --git a/package.json b/package.json index 0826fa37..d6fdcbdd 100644 --- a/package.json +++ b/package.json @@ -23,7 +23,7 @@ }, "homepage": "https://github.com/vuejs/vue-ssr-docs#readme", "devDependencies": { - "vuepress": "^0.10.0", - "vuepress-theme-vue": "^1.0.3" + "vuepress": "^0.14.2", + "vuepress-theme-vue": "^1.1.0" } } diff --git a/yarn.lock b/yarn.lock index b7eced55..baa8c105 100644 --- a/yarn.lock +++ b/yarn.lock @@ -682,9 +682,9 @@ babel-plugin-dynamic-import-node "^1.2.0" babel-plugin-transform-vue-jsx "^4.0.1" -"@vue/component-compiler-utils@^1.2.1": - version "1.3.0" - resolved "https://registry.yarnpkg.com/@vue/component-compiler-utils/-/component-compiler-utils-1.3.0.tgz#2f9c04c3d0a14e64324257d5d04d1d0fc67e6b19" +"@vue/component-compiler-utils@^2.0.0": + version "2.1.2" + resolved "https://registry.yarnpkg.com/@vue/component-compiler-utils/-/component-compiler-utils-2.1.2.tgz#75e7cc8496baecbb0994dc8783571d9ff07737fe" dependencies: consolidate "^0.15.1" hash-sum "^1.0.2" @@ -692,7 +692,7 @@ merge-source-map "^1.1.0" postcss "^6.0.20" postcss-selector-parser "^3.1.1" - prettier "^1.11.1" + prettier "1.13.7" source-map "^0.5.6" vue-template-es2015-compiler "^1.6.0" @@ -812,6 +812,31 @@ "@webassemblyjs/wast-parser" "1.4.3" long "^3.2.0" +"@webpack-contrib/config-loader@^1.1.1": + version "1.2.1" + resolved "https://registry.yarnpkg.com/@webpack-contrib/config-loader/-/config-loader-1.2.1.tgz#5b3dd474e207437939d294d200c68b7b00008e04" + dependencies: + "@webpack-contrib/schema-utils" "^1.0.0-beta.0" + chalk "^2.1.0" + cosmiconfig "^5.0.2" + is-plain-obj "^1.1.0" + loud-rejection "^1.6.0" + merge-options "^1.0.1" + minimist "^1.2.0" + resolve "^1.6.0" + webpack-log "^1.1.2" + +"@webpack-contrib/schema-utils@^1.0.0-beta.0": + version "1.0.0-beta.0" + resolved "https://registry.yarnpkg.com/@webpack-contrib/schema-utils/-/schema-utils-1.0.0-beta.0.tgz#bf9638c9464d177b48209e84209e23bee2eb4f65" + dependencies: + ajv "^6.1.0" + ajv-keywords "^3.1.0" + chalk "^2.3.2" + strip-ansi "^4.0.0" + text-table "^0.2.0" + webpack-log "^1.1.2" + abbrev@1: version "1.1.1" resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8" @@ -1669,14 +1694,13 @@ cosmiconfig@^2.1.0, cosmiconfig@^2.1.1: parse-json "^2.2.0" require-from-string "^1.1.0" -cosmiconfig@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-4.0.0.tgz#760391549580bbd2df1e562bc177b13c290972dc" +cosmiconfig@^5.0.2: + version "5.0.6" + resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-5.0.6.tgz#dca6cf680a0bd03589aff684700858c81abeeb39" dependencies: is-directory "^0.3.1" js-yaml "^3.9.0" parse-json "^4.0.0" - require-from-string "^2.0.1" create-ecdh@^4.0.0: version "4.0.3" @@ -3240,6 +3264,12 @@ koa-mount@^3.0.0: debug "^2.6.1" koa-compose "^3.2.1" +koa-range@^0.3.0: + version "0.3.0" + resolved "https://registry.yarnpkg.com/koa-range/-/koa-range-0.3.0.tgz#3588e3496473a839a1bd264d2a42b1d85bd7feac" + dependencies: + stream-slice "^0.1.2" + koa-send@^4.1.3: version "4.1.3" resolved "https://registry.yarnpkg.com/koa-send/-/koa-send-4.1.3.tgz#0822207bbf5253a414c8f1765ebc29fa41353cb6" @@ -3256,14 +3286,14 @@ koa-static@^4.0.2: debug "^3.1.0" koa-send "^4.1.3" -koa-webpack@^3.0.1: - version "3.0.2" - resolved "https://registry.yarnpkg.com/koa-webpack/-/koa-webpack-3.0.2.tgz#5a0604d476ec5ab3f12f02fd5bf8406a77b49ed2" +koa-webpack@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/koa-webpack/-/koa-webpack-4.0.0.tgz#1d9b83c109db106d8ef65db376f910a45ba964c7" dependencies: app-root-path "^2.0.1" merge-options "^1.0.0" webpack-dev-middleware "^3.0.0" - webpack-hot-client "^2.0.0" + webpack-hot-client "^3.0.0" webpack-log "^1.1.1" koa@^2.4.1: @@ -3363,10 +3393,6 @@ lodash._reinterpolate@~3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz#0ccf2d89166af03b3663c796538b75ac6e114d9d" -lodash.assign@~4.2.0: - version "4.2.0" - resolved "https://registry.yarnpkg.com/lodash.assign/-/lodash.assign-4.2.0.tgz#0d99f3ccd7a6d261d19bdaeb9245005d285808e7" - lodash.camelcase@^4.3.0: version "4.3.0" resolved "https://registry.yarnpkg.com/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz#b28aa6288a2b9fc651035c7711f65ab6190331a6" @@ -3481,11 +3507,9 @@ map-visit@^1.0.0: dependencies: object-visit "^1.0.0" -markdown-it-anchor@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/markdown-it-anchor/-/markdown-it-anchor-4.0.0.tgz#e87fb5543e01965adf71506c6bf7b0491841b7e3" - dependencies: - string "^3.3.3" +markdown-it-anchor@^5.0.2: + version "5.0.2" + resolved "https://registry.yarnpkg.com/markdown-it-anchor/-/markdown-it-anchor-5.0.2.tgz#cdd917a05b7bf92fb736a6dae3385c6d0d0fa552" markdown-it-container@^2.0.0: version "2.0.0" @@ -3495,12 +3519,9 @@ markdown-it-emoji@^1.4.0: version "1.4.0" resolved "https://registry.yarnpkg.com/markdown-it-emoji/-/markdown-it-emoji-1.4.0.tgz#9bee0e9a990a963ba96df6980c4fddb05dfb4dcc" -markdown-it-table-of-contents@^0.3.3: - version "0.3.3" - resolved "https://registry.yarnpkg.com/markdown-it-table-of-contents/-/markdown-it-table-of-contents-0.3.3.tgz#b62e943c32de2c4a27d3e7c83cd63acbc2a9c4a2" - dependencies: - lodash.assign "~4.2.0" - string "~3.3.3" +markdown-it-table-of-contents@^0.4.0: + version "0.4.2" + resolved "https://registry.yarnpkg.com/markdown-it-table-of-contents/-/markdown-it-table-of-contents-0.4.2.tgz#33ebb08eec4790bc1ccf10e3a75e53ac90ce515f" markdown-it@^8.4.1: version "8.4.1" @@ -3542,21 +3563,21 @@ memory-fs@^0.4.0, memory-fs@~0.4.1: errno "^0.1.3" readable-stream "^2.0.1" -meow@^4.0.0: - version "4.0.1" - resolved "https://registry.yarnpkg.com/meow/-/meow-4.0.1.tgz#d48598f6f4b1472f35bf6317a95945ace347f975" +meow@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/meow/-/meow-5.0.0.tgz#dfc73d63a9afc714a5e371760eb5c88b91078aa4" dependencies: camelcase-keys "^4.0.0" decamelize-keys "^1.0.0" loud-rejection "^1.0.0" - minimist "^1.1.3" minimist-options "^3.0.1" normalize-package-data "^2.3.4" read-pkg-up "^3.0.0" redent "^2.0.0" trim-newlines "^2.0.0" + yargs-parser "^10.0.0" -merge-options@^1.0.0: +merge-options@^1.0.0, merge-options@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/merge-options/-/merge-options-1.0.1.tgz#2a64b24457becd4e4dc608283247e94ce589aa32" dependencies: @@ -3639,10 +3660,11 @@ min-document@^2.19.0: dependencies: dom-walk "^0.1.0" -mini-css-extract-plugin@^0.4.0: - version "0.4.0" - resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-0.4.0.tgz#ff3bf08bee96e618e177c16ca6131bfecef707f9" +mini-css-extract-plugin@^0.4.1: + version "0.4.1" + resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-0.4.1.tgz#d2bcf77bb2596b8e4bd9257e43d3f9164c2e86cb" dependencies: + "@webpack-contrib/schema-utils" "^1.0.0-beta.0" loader-utils "^1.1.0" webpack-sources "^1.1.0" @@ -3671,7 +3693,7 @@ minimist@0.0.8: version "0.0.8" resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d" -minimist@^1.1.3, minimist@^1.2.0: +minimist@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284" @@ -4501,9 +4523,9 @@ preserve@^0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/preserve/-/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b" -prettier@^1.11.1: - version "1.12.1" - resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.12.1.tgz#c1ad20e803e7749faf905a409d2367e06bbe7325" +prettier@1.13.7: + version "1.13.7" + resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.13.7.tgz#850f3b8af784a49a6ea2d2eaa7ed1428a34b7281" pretty-bytes@^4.0.2: version "4.0.2" @@ -4775,9 +4797,9 @@ regexpu-core@^4.1.3, regexpu-core@^4.1.4: unicode-match-property-ecmascript "^1.0.3" unicode-match-property-value-ecmascript "^1.0.1" -register-service-worker@^1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/register-service-worker/-/register-service-worker-1.2.0.tgz#c0472dcc856e391ba7a87c0aa96c4f6cf1aec67c" +register-service-worker@^1.5.1: + version "1.5.1" + resolved "https://registry.yarnpkg.com/register-service-worker/-/register-service-worker-1.5.1.tgz#4f91d8915f6019b083433b83ffe4bfd6f976f342" registry-auth-token@^3.0.1: version "3.3.2" @@ -4846,10 +4868,6 @@ require-from-string@^1.1.0: version "1.2.1" resolved "https://registry.yarnpkg.com/require-from-string/-/require-from-string-1.2.1.tgz#529c9ccef27380adfec9a2f965b649bbee636418" -require-from-string@^2.0.1: - version "2.0.2" - resolved "https://registry.yarnpkg.com/require-from-string/-/require-from-string-2.0.2.tgz#89a7fdd938261267318eafe14f9c32e598c36909" - resolve-cwd@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/resolve-cwd/-/resolve-cwd-2.0.0.tgz#00a9f7387556e27038eae232caa372a6a59b665a" @@ -5178,6 +5196,10 @@ stream-shift@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/stream-shift/-/stream-shift-1.0.0.tgz#d5c752825e5367e786f78e18e445ea223a155952" +stream-slice@^0.1.2: + version "0.1.2" + resolved "https://registry.yarnpkg.com/stream-slice/-/stream-slice-0.1.2.tgz#2dc4f4e1b936fb13f3eb39a2def1932798d07a4b" + strict-uri-encode@^1.0.0: version "1.1.0" resolved "https://registry.yarnpkg.com/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz#279b225df1d582b1f54e65addd4352e18faa0713" @@ -5197,10 +5219,6 @@ string-width@^1.0.1: is-fullwidth-code-point "^2.0.0" strip-ansi "^4.0.0" -string@^3.3.3, string@~3.3.3: - version "3.3.3" - resolved "https://registry.yarnpkg.com/string/-/string-3.3.3.tgz#5ea211cd92d228e184294990a6cc97b366a77cb0" - string_decoder@^1.0.0, string_decoder@~1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8" @@ -5323,6 +5341,10 @@ term-size@^1.2.0: dependencies: execa "^0.7.0" +text-table@^0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4" + thenify-all@^1.0.0: version "1.6.0" resolved "https://registry.yarnpkg.com/thenify-all/-/thenify-all-1.6.0.tgz#1a1918d402d8fc3f98fbf234db0bcc8cc10e9726" @@ -5638,9 +5660,9 @@ uuid@^3.1.0: version "3.2.1" resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.2.1.tgz#12c528bb9d58d0b9265d9a2f6f0fe8be17ff1f14" -v8-compile-cache@^1.1.0: - version "1.1.2" - resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-1.1.2.tgz#8d32e4f16974654657e676e0e467a348e89b0dc4" +v8-compile-cache@^2.0.0: + version "2.0.2" + resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.0.2.tgz#a428b28bb26790734c4fc8bc9fa106fccebf6a6c" validate-npm-package-license@^3.0.1: version "3.0.3" @@ -5667,11 +5689,11 @@ vue-hot-reload-api@^2.3.0: version "2.3.0" resolved "https://registry.yarnpkg.com/vue-hot-reload-api/-/vue-hot-reload-api-2.3.0.tgz#97976142405d13d8efae154749e88c4e358cf926" -vue-loader@^15.2.1: - version "15.2.1" - resolved "https://registry.yarnpkg.com/vue-loader/-/vue-loader-15.2.1.tgz#89a13b6b7dec63614729c73b1b46a571a69bb20e" +vue-loader@^15.2.4: + version "15.3.0" + resolved "https://registry.yarnpkg.com/vue-loader/-/vue-loader-15.3.0.tgz#b474d10a4e93d934a78c147fc3e314b370e9fc54" dependencies: - "@vue/component-compiler-utils" "^1.2.1" + "@vue/component-compiler-utils" "^2.0.0" hash-sum "^1.0.2" loader-utils "^1.1.0" vue-hot-reload-api "^2.3.0" @@ -5728,13 +5750,13 @@ vuepress-html-webpack-plugin@^3.2.0: toposort "^1.0.0" util.promisify "1.0.0" -vuepress-theme-vue@^1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/vuepress-theme-vue/-/vuepress-theme-vue-1.0.3.tgz#8465434401bc99325de53ba038e1eed2d2ec84b9" +vuepress-theme-vue@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/vuepress-theme-vue/-/vuepress-theme-vue-1.1.0.tgz#8b109e3db8cad7b18459f4d77076808110c2bcaa" -vuepress@^0.10.0: - version "0.10.0" - resolved "https://registry.yarnpkg.com/vuepress/-/vuepress-0.10.0.tgz#8b5c5e8c457d56c0108831567d1cf69293e49044" +vuepress@^0.14.2: + version "0.14.2" + resolved "https://registry.yarnpkg.com/vuepress/-/vuepress-0.14.2.tgz#48e5e102178370980d1408e230c0263d768435b7" dependencies: "@babel/core" "7.0.0-beta.47" "@vue/babel-preset-app" "3.0.0-beta.11" @@ -5758,29 +5780,30 @@ vuepress@^0.10.0: js-yaml "^3.11.0" koa-connect "^2.0.1" koa-mount "^3.0.0" + koa-range "^0.3.0" koa-static "^4.0.2" loader-utils "^1.1.0" lodash.throttle "^4.1.1" lru-cache "^4.1.2" markdown-it "^8.4.1" - markdown-it-anchor "^4.0.0" + markdown-it-anchor "^5.0.2" markdown-it-container "^2.0.0" markdown-it-emoji "^1.4.0" - markdown-it-table-of-contents "^0.3.3" - mini-css-extract-plugin "^0.4.0" + markdown-it-table-of-contents "^0.4.0" + mini-css-extract-plugin "^0.4.1" nprogress "^0.2.0" optimize-css-assets-webpack-plugin "^4.0.0" portfinder "^1.0.13" postcss-loader "^2.1.5" prismjs "^1.13.0" - register-service-worker "^1.2.0" + register-service-worker "^1.5.1" semver "^5.5.0" stylus "^0.54.5" stylus-loader "^3.0.2" toml "^2.3.3" url-loader "^1.0.1" vue "^2.5.16" - vue-loader "^15.2.1" + vue-loader "^15.2.4" vue-router "^3.0.1" vue-server-renderer "^2.5.16" vue-template-compiler "^2.5.16" @@ -5788,7 +5811,7 @@ vuepress@^0.10.0: webpack "^4.8.1" webpack-chain "^4.6.0" webpack-merge "^4.1.2" - webpack-serve "^0.3.2" + webpack-serve "^1.0.2" webpackbar "^2.6.1" workbox-build "^3.1.0" @@ -5829,12 +5852,13 @@ webpack-dev-middleware@^3.0.0: url-join "^4.0.0" webpack-log "^1.0.1" -webpack-hot-client@^2.0.0, webpack-hot-client@^2.2.0: - version "2.2.2" - resolved "https://registry.yarnpkg.com/webpack-hot-client/-/webpack-hot-client-2.2.2.tgz#4a97c513fc22d132573a0cb66ba7f525ff5fc036" +webpack-hot-client@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/webpack-hot-client/-/webpack-hot-client-3.0.0.tgz#b714f257a264001275bc1491741685779cde12f2" dependencies: json-stringify-safe "^5.0.1" loglevelnext "^1.0.2" + strip-ansi "^4.0.0" uuid "^3.1.0" webpack-log "^1.1.1" ws "^4.0.0" @@ -5854,32 +5878,33 @@ webpack-merge@^4.1.2: dependencies: lodash "^4.17.5" -webpack-serve@^0.3.2: - version "0.3.2" - resolved "https://registry.yarnpkg.com/webpack-serve/-/webpack-serve-0.3.2.tgz#9cfd823dd570438d8cf362e70586bc54af1f0c92" +webpack-serve@^1.0.2: + version "1.0.4" + resolved "https://registry.yarnpkg.com/webpack-serve/-/webpack-serve-1.0.4.tgz#d1c83955926969ba195e5032f978da92ef07829c" dependencies: "@shellscape/koa-static" "^4.0.4" + "@webpack-contrib/config-loader" "^1.1.1" chalk "^2.3.0" clipboardy "^1.2.2" - cosmiconfig "^4.0.0" + cosmiconfig "^5.0.2" debug "^3.1.0" find-up "^2.1.0" get-port "^3.2.0" import-local "^1.0.0" killable "^1.0.0" koa "^2.4.1" - koa-webpack "^3.0.1" + koa-webpack "^4.0.0" lodash "^4.17.5" loud-rejection "^1.6.0" - meow "^4.0.0" + meow "^5.0.0" nanobus "^4.3.1" opn "^5.1.0" resolve "^1.6.0" time-fix-plugin "^2.0.0" update-notifier "^2.3.0" url-join "3.0.0" - v8-compile-cache "^1.1.0" - webpack-hot-client "^2.2.0" + v8-compile-cache "^2.0.0" + webpack-hot-client "^3.0.0" webpack-log "^1.1.2" webpack-sources@^1.0.1, webpack-sources@^1.1.0: @@ -6104,3 +6129,9 @@ yallist@^2.1.2: yallist@^3.0.0, yallist@^3.0.2: version "3.0.2" resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.0.2.tgz#8452b4bb7e83c7c188d8041c1a837c773d6d8bb9" + +yargs-parser@^10.0.0: + version "10.1.0" + resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-10.1.0.tgz#7202265b89f7e9e9f2e5765e0fe735a905edbaa8" + dependencies: + camelcase "^4.1.0" From 38445d7ff32774c682a19a7887cf92be2594ecd2 Mon Sep 17 00:00:00 2001 From: ULIVZ <472590061@qq.com> Date: Thu, 16 Aug 2018 22:40:54 +0800 Subject: [PATCH 2/2] chore: enable SW-Update popup --- docs/.vuepress/config.js | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/docs/.vuepress/config.js b/docs/.vuepress/config.js index 680e419c..aeb6eba4 100644 --- a/docs/.vuepress/config.js +++ b/docs/.vuepress/config.js @@ -31,6 +31,12 @@ module.exports = { label: 'English', selectText: 'Languages', editLinkText: 'Edit this page on GitHub', + serviceWorker: { + updatePopup: { + message: "New content is available.", + buttonText: "Refresh" + } + }, nav: [ { text: 'Guide', @@ -62,6 +68,12 @@ module.exports = { label: '简体中文', selectText: '选择语言', editLinkText: '在 GitHub 上编辑此页', + serviceWorker: { + updatePopup: { + message: "发现新内容可用", + buttonText: "刷新" + } + }, nav: [ { text: '指南',