diff --git a/build/build-changelog.sh b/build/build-changelog.sh deleted file mode 100644 index e2b5c49a0..000000000 --- a/build/build-changelog.sh +++ /dev/null @@ -1,22 +0,0 @@ -#!/usr/bin/env sh - -if ! command_exists github_changelog_generator ; then - fail 'github_changelog_generator is required to publish packages' -fi - -if [ -z "$CHANGELOG_GITHUB_TOKEN" ] ; then - fail 'You must set CHANGELOG_GITHUB_TOKEN environment variable\nhttps://github.com/skywinder/github-changelog-generator#github-token' -fi - -basepath=$(dirname $0) - -github_changelog_generator \ - --header-label "## 更新日志" \ - --bugs-label "**Bug Fixes**" \ - --enhancement-label "**Breaking changes**" \ - --issues-label "**Issue**" \ - --pr-label "**Improvements**" \ - --no-unreleased \ - --max-issues 200 \ - --since-tag v1.0.0 \ - -o $basepath/../docs/markdown/changelog.generated.md diff --git a/docs/src/components/nprogress.css b/docs/src/components/nprogress.css deleted file mode 100644 index 44b7691b7..000000000 --- a/docs/src/components/nprogress.css +++ /dev/null @@ -1,75 +0,0 @@ -/* Make clicks pass-through */ -#nprogress { - pointer-events: none; -} - -#nprogress .bar { - background: rgba(52, 152, 219, .7); - - position: fixed; - z-index: 1031; - top: 0; - left: 0; - - width: 100%; - height: 2px; -} - -/* Fancy blur effect */ -#nprogress .peg { - display: block; - position: absolute; - right: 0px; - width: 100px; - height: 100%; - box-shadow: 0 0 5px rgba(52, 152, 219, .7), 0 0 2px rgba(52, 152, 219, .7); - opacity: 1.0; - - -webkit-transform: rotate(3deg) translate(0px, -4px); - -ms-transform: rotate(3deg) translate(0px, -4px); - transform: rotate(3deg) translate(0px, -4px); -} - -/* Remove these to get rid of the spinner */ -#nprogress .spinner { - display: block; - position: fixed; - z-index: 1031; - top: 15px; - right: 15px; -} - -#nprogress .spinner-icon { - display: none; - width: 12px; - height: 12px; - box-sizing: border-box; - - border: solid 2px transparent; - border-top-color: rgba(52, 152, 219, .7); - border-left-color: rgba(52, 152, 219, .7); - border-radius: 50%; - - -webkit-animation: nprogress-spinner 400ms linear infinite; - animation: nprogress-spinner 400ms linear infinite; -} - -.nprogress-custom-parent { - overflow: hidden; - position: relative; -} - -.nprogress-custom-parent #nprogress .spinner, -.nprogress-custom-parent #nprogress .bar { - position: absolute; -} - -@-webkit-keyframes nprogress-spinner { - 0% { -webkit-transform: rotate(0deg); } - 100% { -webkit-transform: rotate(360deg); } -} -@keyframes nprogress-spinner { - 0% { transform: rotate(0deg); } - 100% { transform: rotate(360deg); } -} - diff --git a/docs/src/index.js b/docs/src/index.js index b0dc5aa3d..8f92527c6 100644 --- a/docs/src/index.js +++ b/docs/src/index.js @@ -2,10 +2,8 @@ import Vue from 'vue'; import VueRouter from 'vue-router'; import App from './DocsApp'; import routes from './router'; -import VantDoc from 'vant-doc'; -import progress from 'nprogress'; +import VantDoc, { progress } from 'vant-doc'; import { isMobile } from './utils'; -import './components/nprogress.css'; Vue.use(VueRouter).use(VantDoc); diff --git a/docs/src/mobile.js b/docs/src/mobile.js index 55fd79f1d..cc0b200ac 100644 --- a/docs/src/mobile.js +++ b/docs/src/mobile.js @@ -1,11 +1,10 @@ import '../../packages/vant-css/src/index.css'; -import './components/nprogress.css'; import Vue from 'vue'; import VueRouter from 'vue-router'; import App from './WapApp'; import routes from './router'; -import progress from 'nprogress'; -import 'vant-doc/src/helper/touch-simulator'; +import { progress } from 'vant-doc'; +import 'vant-doc/helper/touch-simulator'; const router = new VueRouter({ mode: 'hash', diff --git a/package.json b/package.json index 06341414f..982496a0c 100644 --- a/package.json +++ b/package.json @@ -14,14 +14,13 @@ ], "scripts": { "bootstrap": "yarn || npm i && cd ./packages/vant-css/ && yarn || npm i && cd ../../", - "dev": "npm run build:file && webpack-serve --config build/webpack.dev.js", + "dev": "node build/build-entry.js && webpack-serve --config build/webpack.dev.js", "lint": "eslint ./packages --ext .js,.vue && stylelint \"packages/vant-css/src/*.css\"", - "build:file": "node build/build-entry.js", "build:components": "node build/build-components.js --color", "build:vant-css": "gulp build --gulpfile packages/vant-css/gulpfile.js --color --silent", "build:vant": "cross-env NODE_ENV=production webpack --color --config build/webpack.build.js && cross-env NODE_ENV=production webpack -p --color --config build/webpack.build.js", "build:style-entry": "node build/build-style-entry.js", - "build:changelog": "sh build/build-changelog.sh", + "build:changelog": "vant-doc changelog ./docs/markdown/changelog.generated.md", "build:iconfont": "gulp --gulpfile ./build/build-iconfont.js", "build:lib": "node build/build-lib.js", "build:site": "rimraf docs/dist && cross-env NODE_ENV=production webpack --config build/webpack.doc.js && gh-pages -d docs/dist", @@ -102,7 +101,7 @@ "stylelint-config-standard": "^18.2.0", "uppercamelcase": "^3.0.0", "url-loader": "^1.0.1", - "vant-doc": "1.0.8", + "vant-doc": "1.0.11", "vue": "2.5.17", "vue-jest": "^2.6.0", "vue-loader": "^15.2.6", diff --git a/yarn.lock b/yarn.lock index 0841b2fce..e09ca0b1d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2156,6 +2156,10 @@ commander@^2.16.0: version "2.16.0" resolved "https://registry.yarnpkg.com/commander/-/commander-2.16.0.tgz#f16390593996ceb4f3eeb020b31d78528f7f8a50" +commander@^2.17.1: + version "2.17.1" + resolved "https://registry.yarnpkg.com/commander/-/commander-2.17.1.tgz#bd77ab7de6de94205ceacc72f1716d29f20a77bf" + commander@~2.13.0: version "2.13.0" resolved "https://registry.yarnpkg.com/commander/-/commander-2.13.0.tgz#6964bca67685df7c1f1430c584f07d7597885b9c" @@ -9516,11 +9520,12 @@ validate-npm-package-license@^3.0.1: spdx-correct "^3.0.0" spdx-expression-parse "^3.0.0" -vant-doc@1.0.8: - version "1.0.8" - resolved "https://registry.yarnpkg.com/vant-doc/-/vant-doc-1.0.8.tgz#5cf253733ad93f26e501034f45b945b6c9bdd2bd" +vant-doc@1.0.11: + version "1.0.11" + resolved "https://registry.yarnpkg.com/vant-doc/-/vant-doc-1.0.11.tgz#b53b8bae343dfad42d1b0b640e0fdc12cac1fb50" dependencies: cheerio "0.22.0" + commander "^2.17.1" decamelize "^1.2.0" fs-extra "^4.0.2" nprogress "^0.2.0"