From 4555d82c8e01b2590c4b074a58700b956e6dc384 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= Date: Sat, 12 Aug 2017 22:33:13 +0800 Subject: [PATCH 01/55] feat: use rollup to build component --- .babelrc | 4 +- build/rollup.component.config.js | 42 ++ package.json | 15 +- {src => packages/common}/mixins/findParent.js | 0 .../common}/mixins/popup/index.js | 2 +- .../common}/mixins/popup/popup-context.js | 2 +- .../common}/mixins/popup/popup-manager.js | 2 +- .../common}/utils/clickoutside.js | 0 {src => packages/common}/utils/dom.js | 0 {src => packages/common}/utils/merge.js | 0 {src => packages/common}/utils/scroll.js | 0 {src => packages/common}/utils/transition.js | 0 yarn.lock | 647 ++++++++++++++++-- 13 files changed, 665 insertions(+), 49 deletions(-) create mode 100644 build/rollup.component.config.js rename {src => packages/common}/mixins/findParent.js (100%) rename {src => packages/common}/mixins/popup/index.js (99%) rename {src => packages/common}/mixins/popup/popup-context.js (94%) rename {src => packages/common}/mixins/popup/popup-manager.js (98%) rename {src => packages/common}/utils/clickoutside.js (100%) rename {src => packages/common}/utils/dom.js (100%) rename {src => packages/common}/utils/merge.js (100%) rename {src => packages/common}/utils/scroll.js (100%) rename {src => packages/common}/utils/transition.js (100%) diff --git a/.babelrc b/.babelrc index c72eeb3a2..f266b7fa1 100644 --- a/.babelrc +++ b/.babelrc @@ -6,7 +6,7 @@ ] ], "plugins": [ - "transform-runtime", - "transform-vue-jsx" + "transform-vue-jsx", + "external-helpers" ] } \ No newline at end of file diff --git a/build/rollup.component.config.js b/build/rollup.component.config.js new file mode 100644 index 000000000..4e452bbee --- /dev/null +++ b/build/rollup.component.config.js @@ -0,0 +1,42 @@ +import path from 'path'; +import vue from 'rollup-plugin-vue'; +import alias from 'zan-rollup-plugin-alias'; +import babel from 'rollup-plugin-babel'; +import resolve from 'rollup-plugin-node-resolve'; +import commonjs from 'rollup-plugin-commonjs'; +import componentsConfig from '../components.json'; + +const extensions = ['.js', '.vue']; + +export default Object.keys(componentsConfig).map(component => { + return { + entry: componentsConfig[component], + targets: [ + { + dest: path.resolve(__dirname, `../lib/${component}/index.js`), + format: 'cjs' + } + ], + external: ['vue', 'vue-lazyload'], + plugins: [ + vue(), + babel({ + externalHelpers: true + }), + resolve({ + main: true, + jsnext: true, + extensions + }), + commonjs({ + extensions + }), + alias({ + resolve: extensions, + 'src/mixins': path.resolve(__dirname, '../packages/common/mixins'), + 'src/utils': path.resolve(__dirname, '../packages/common/utils'), + packages: path.resolve(__dirname, '../packages') + }), + ] + }; +}); diff --git a/package.json b/package.json index c26cf675e..9f63e639c 100644 --- a/package.json +++ b/package.json @@ -11,7 +11,7 @@ "packages" ], "scripts": { - "bootstrap": "yarn || npm i", + "bootstrap": "yarn || npm i && cd ./packages/vant-css/ && yarn || npm i && cd ../../", "dev": "npm run build:file && webpack-dev-server --inline --config build/webpack.config.dev.js --content-base ./", "build:file": "node build/bin/build-entry.js", "build:utils": "cross-env BABEL_ENV=utils babel src --out-dir lib --ignore src/index.js --presets=es2015", @@ -27,7 +27,8 @@ "test": "karma start test/unit/karma.conf.js --single-run", "test:coverage": "open test/unit/coverage/lcov-report/index.html", "test:watch": "karma start test/unit/karma.conf.js", - "release": "npm run bootstrap && sh build/release.sh" + "release": "npm run bootstrap && sh build/release.sh", + "rollup": "rollup -c ./build/rollup.component.config.js" }, "repository": { "type": "git", @@ -53,6 +54,7 @@ "babel-cli": "^6.14.0", "babel-core": "^6.25.0", "babel-loader": "^7.1.1", + "babel-plugin-external-helpers": "^6.22.0", "babel-plugin-module-resolver": "^2.7.1", "babel-plugin-syntax-jsx": "^6.18.0", "babel-plugin-transform-runtime": "^6.15.0", @@ -60,6 +62,7 @@ "babel-polyfill": "^6.23.0", "babel-preset-es2015": "^6.16.0", "babel-runtime": "^6.25.0", + "babelrc-rollup": "^3.0.0", "chai": "^4.1.1", "cheerio": "^0.22.0", "codecov": "^2.2.0", @@ -97,6 +100,11 @@ "precss": "^2.0.0", "progress-bar-webpack-plugin": "^1.10.0", "rimraf": "^2.5.4", + "rollup": "^0.45.2", + "rollup-plugin-babel": "^3.0.1", + "rollup-plugin-commonjs": "^8.1.0", + "rollup-plugin-node-resolve": "^3.0.0", + "rollup-plugin-vue": "^2.4.1", "run-sequence": "^2.1.0", "sinon": "^2.4.1", "sinon-chai": "^2.12.0", @@ -115,6 +123,7 @@ "webpack": "^3.5.1", "webpack-dev-server": "^2.7.1", "webpack-merge": "^4.1.0", - "zan-doc": "0.1.12" + "zan-doc": "0.1.12", + "zan-rollup-plugin-alias": "1.0.1" } } diff --git a/src/mixins/findParent.js b/packages/common/mixins/findParent.js similarity index 100% rename from src/mixins/findParent.js rename to packages/common/mixins/findParent.js diff --git a/src/mixins/popup/index.js b/packages/common/mixins/popup/index.js similarity index 99% rename from src/mixins/popup/index.js rename to packages/common/mixins/popup/index.js index c1d0dd0fa..95af13559 100644 --- a/src/mixins/popup/index.js +++ b/packages/common/mixins/popup/index.js @@ -1,4 +1,4 @@ -import merge from 'src/utils/merge'; +import merge from '../../utils/merge'; import PopupManager from './popup-manager'; import PopupContext from './popup-context'; diff --git a/src/mixins/popup/popup-context.js b/packages/common/mixins/popup/popup-context.js similarity index 94% rename from src/mixins/popup/popup-context.js rename to packages/common/mixins/popup/popup-context.js index 25a340edc..f0b2ff7ea 100644 --- a/src/mixins/popup/popup-context.js +++ b/packages/common/mixins/popup/popup-context.js @@ -1,4 +1,4 @@ -import merge from 'src/utils/merge'; +import merge from '../../utils/merge'; import Vue from 'vue'; let context; diff --git a/src/mixins/popup/popup-manager.js b/packages/common/mixins/popup/popup-manager.js similarity index 98% rename from src/mixins/popup/popup-manager.js rename to packages/common/mixins/popup/popup-manager.js index 5d8bb2d96..3a98cc340 100644 --- a/src/mixins/popup/popup-manager.js +++ b/packages/common/mixins/popup/popup-manager.js @@ -1,5 +1,5 @@ import Vue from 'vue'; -import { addClass } from 'src/utils/dom'; +import { addClass } from '../../utils/dom'; import PopupContext from './popup-context'; const getModal = function() { diff --git a/src/utils/clickoutside.js b/packages/common/utils/clickoutside.js similarity index 100% rename from src/utils/clickoutside.js rename to packages/common/utils/clickoutside.js diff --git a/src/utils/dom.js b/packages/common/utils/dom.js similarity index 100% rename from src/utils/dom.js rename to packages/common/utils/dom.js diff --git a/src/utils/merge.js b/packages/common/utils/merge.js similarity index 100% rename from src/utils/merge.js rename to packages/common/utils/merge.js diff --git a/src/utils/scroll.js b/packages/common/utils/scroll.js similarity index 100% rename from src/utils/scroll.js rename to packages/common/utils/scroll.js diff --git a/src/utils/transition.js b/packages/common/utils/transition.js similarity index 100% rename from src/utils/transition.js rename to packages/common/utils/transition.js diff --git a/yarn.lock b/yarn.lock index 672078b41..dec03518f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -36,6 +36,12 @@ acorn-globals@^1.0.4: dependencies: acorn "^2.1.0" +acorn-globals@^3.0.0: + version "3.1.0" + resolved "http://registry.npm.qima-inc.com/acorn-globals/download/acorn-globals-3.1.0.tgz#fd8270f71fbb4996b004fa880ee5d46573a731bf" + dependencies: + acorn "^4.0.4" + acorn-jsx@^3.0.0: version "3.0.1" resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-3.0.1.tgz#afdf9488fb1ecefc8348f6fb22f464e32a58b36b" @@ -46,11 +52,11 @@ acorn@^2.1.0, acorn@^2.4.0: version "2.7.0" resolved "https://registry.yarnpkg.com/acorn/-/acorn-2.7.0.tgz#ab6e7d9d886aaca8b085bc3312b79a198433f0e7" -acorn@^3.0.4: +acorn@^3.0.4, acorn@^3.1.0, acorn@~3.3.0: version "3.3.0" resolved "https://registry.yarnpkg.com/acorn/-/acorn-3.3.0.tgz#45e37fb39e8da3f25baee3ff5369e2bb5f22017a" -acorn@^4.0.3: +acorn@^4.0.1, acorn@^4.0.3, acorn@^4.0.4, acorn@~4.0.2: version "4.0.13" resolved "https://registry.yarnpkg.com/acorn/-/acorn-4.0.13.tgz#105495ae5361d697bd195c825192e1ad7f253787" @@ -253,6 +259,10 @@ arrify@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d" +asap@~2.0.3: + version "2.0.6" + resolved "http://registry.npm.qima-inc.com/asap/download/asap-2.0.6.tgz#e50347611d7e690943208bbdafebcbc2fb866d46" + asn1.js@^4.0.0: version "4.9.1" resolved "https://registry.yarnpkg.com/asn1.js/-/asn1.js-4.9.1.tgz#48ba240b45a9280e94748990ba597d216617fd40" @@ -295,6 +305,10 @@ async-each@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.1.tgz#19d386a1d9edc6e7c1c85d388aedbcc56d33602d" +async-foreach@^0.1.3: + version "0.1.3" + resolved "http://registry.npm.qima-inc.com/async-foreach/download/async-foreach-0.1.3.tgz#36121f845c0578172de419a97dbeb1d16ec34542" + async@1.x, async@^1.4.0, async@^1.5.0, async@^1.5.2: version "1.5.2" resolved "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a" @@ -529,6 +543,12 @@ babel-plugin-check-es2015-constants@^6.22.0: dependencies: babel-runtime "^6.22.0" +babel-plugin-external-helpers@^6.22.0: + version "6.22.0" + resolved "https://registry.yarnpkg.com/babel-plugin-external-helpers/-/babel-plugin-external-helpers-6.22.0.tgz#2285f48b02bd5dede85175caf8c62e86adccefa1" + dependencies: + babel-runtime "^6.22.0" + babel-plugin-module-resolver@^2.7.1: version "2.7.1" resolved "https://registry.yarnpkg.com/babel-plugin-module-resolver/-/babel-plugin-module-resolver-2.7.1.tgz#18be3c42ddf59f7a456c9e0512cd91394f6e4be1" @@ -823,6 +843,12 @@ babel-types@^6.19.0, babel-types@^6.23.0, babel-types@^6.24.1, babel-types@^6.25 lodash "^4.2.0" to-fast-properties "^1.0.1" +babelrc-rollup@^3.0.0: + version "3.0.0" + resolved "https://registry.npmjs.org/babelrc-rollup/-/babelrc-rollup-3.0.0.tgz#fcecdbe3eb6400cf4e769233c1786a2fafe8b56c" + dependencies: + resolve "^1.1.7" + babylon@^6.17.0, babylon@^6.17.2: version "6.17.4" resolved "https://registry.yarnpkg.com/babylon/-/babylon-6.17.4.tgz#3e8b7402b88d22c3423e137a1577883b15ff869a" @@ -966,6 +992,12 @@ brorand@^1.0.1: version "1.1.0" resolved "https://registry.yarnpkg.com/brorand/-/brorand-1.1.0.tgz#12c25efe40a45e3c323eb8675a0a0ce57b22371f" +browser-resolve@^1.11.0: + version "1.11.2" + resolved "http://registry.npm.qima-inc.com/browser-resolve/download/browser-resolve-1.11.2.tgz#8ff09b0a2c421718a1051c260b32e48f442938ce" + dependencies: + resolve "1.1.7" + browser-stdout@1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/browser-stdout/-/browser-stdout-1.3.0.tgz#f351d32969d32fa5d7a5567154263d928ae3bd1f" @@ -1051,7 +1083,7 @@ buffer@^4.3.0: ieee754 "^1.1.4" isarray "^1.0.0" -builtin-modules@^1.0.0, builtin-modules@^1.1.1: +builtin-modules@^1.0.0, builtin-modules@^1.1.0, builtin-modules@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-1.1.1.tgz#270f076c5a72c02f5b65a47df94c5fe3a278892f" @@ -1115,7 +1147,7 @@ camelcase@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-3.0.0.tgz#32fc4b9fcdaf845fcdf7e73bb97cac2261f0ab0a" -camelcase@^4.1.0: +camelcase@^4.0.0, camelcase@^4.1.0: version "4.1.0" resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-4.1.0.tgz#d545635be1e33c542649c69173e5de6acfae34dd" @@ -1211,6 +1243,12 @@ change-case@3.0.x: upper-case "^1.1.1" upper-case-first "^1.1.0" +character-parser@^2.1.1: + version "2.2.0" + resolved "http://registry.npm.qima-inc.com/character-parser/download/character-parser-2.2.0.tgz#c7ce28f36d4bcd9744e5ffc2c5fcde1c73261fc0" + dependencies: + is-regex "^1.0.3" + check-error@^1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/check-error/-/check-error-1.0.2.tgz#574d312edd88bb5dd8912e9286dd6c0aed4aac82" @@ -1284,7 +1322,7 @@ clap@^1.0.9: dependencies: chalk "^1.1.3" -clean-css@3.4.x: +clean-css@3.4.x, clean-css@^3.3.0: version "3.4.28" resolved "https://registry.yarnpkg.com/clean-css/-/clean-css-3.4.28.tgz#bf1945e82fc808f55695e6ddeaec01400efd03ff" dependencies: @@ -1370,6 +1408,14 @@ codecov@^2.2.0: request "2.81.0" urlgrey "0.4.4" +coffee-script@^1.12.4: + version "1.12.7" + resolved "http://registry.npm.qima-inc.com/coffee-script/download/coffee-script-1.12.7.tgz#c05dae0cb79591d05b3070a8433a98c9a89ccc53" + +coffeescript-compiler@^0.1.1: + version "0.1.1" + resolved "https://registry.npmjs.org/coffeescript-compiler/-/coffeescript-compiler-0.1.1.tgz#81a8bd44a78bda421f7e0b51f28d13c853beb805" + color-convert@^1.3.0, color-convert@^1.9.0: version "1.9.0" resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.0.tgz#1accf97dd739b983bf994d56fec8f95853641b7a" @@ -1553,6 +1599,13 @@ constant-case@^2.0.0: snake-case "^2.1.0" upper-case "^1.1.1" +constantinople@^3.0.1: + version "3.1.0" + resolved "http://registry.npm.qima-inc.com/constantinople/download/constantinople-3.1.0.tgz#7569caa8aa3f8d5935d62e1fa96f9f702cd81c79" + dependencies: + acorn "^3.1.0" + is-expression "^2.0.1" + constants-browserify@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/constants-browserify/-/constants-browserify-1.0.0.tgz#c20b96d8c617748aaf1c16021760cd27fcb8cb75" @@ -1794,6 +1847,13 @@ cross-env@^5.0.5: cross-spawn "^5.1.0" is-windows "^1.0.0" +cross-spawn@^3.0.0: + version "3.0.1" + resolved "http://registry.npm.qima-inc.com/cross-spawn/download/cross-spawn-3.0.1.tgz#1256037ecb9f0c5f79e3d6ef135e30770184b982" + dependencies: + lru-cache "^4.0.1" + which "^1.2.9" + cross-spawn@^5.0.1, cross-spawn@^5.1.0: version "5.1.0" resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-5.1.0.tgz#e8bd0efee58fcff6f8f94510a0a554bbfa235449" @@ -1855,6 +1915,21 @@ css-loader@^0.28.4: postcss-value-parser "^3.3.0" source-list-map "^0.1.7" +css-modules-loader-core@^1.0.1: + version "1.1.0" + resolved "http://registry.npm.qima-inc.com/css-modules-loader-core/download/css-modules-loader-core-1.1.0.tgz#5908668294a1becd261ae0a4ce21b0b551f21d16" + dependencies: + icss-replace-symbols "1.1.0" + postcss "6.0.1" + postcss-modules-extract-imports "1.1.0" + postcss-modules-local-by-default "1.2.0" + postcss-modules-scope "1.1.0" + postcss-modules-values "1.3.0" + +css-parse@1.7.x: + version "1.7.0" + resolved "http://registry.npm.qima-inc.com/css-parse/download/css-parse-1.7.0.tgz#321f6cf73782a6ff751111390fc05e2c657d8c9b" + css-select@^1.1.0, css-select@~1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/css-select/-/css-select-1.2.0.tgz#2b3a110539c5355f1cd8d314623e870b121ec858" @@ -1985,6 +2060,12 @@ de-indent@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/de-indent/-/de-indent-1.0.2.tgz#b2038e846dc33baa5796128d0804b455b8c1e21d" +debug@*: + version "3.0.0" + resolved "http://registry.npm.qima-inc.com/debug/download/debug-3.0.0.tgz#1d2feae53349047b08b264ec41906ba17a8516e4" + dependencies: + ms "2.0.0" + debug@0.7.4, debug@~0.7.4: version "0.7.4" resolved "https://registry.yarnpkg.com/debug/-/debug-0.7.4.tgz#06e1ea8082c2cb14e39806e22e2f6f757f92af39" @@ -2007,7 +2088,7 @@ debug@2.6.7: dependencies: ms "2.0.0" -debug@2.6.8, debug@^2.1.1, debug@^2.2.0, debug@^2.6.6, debug@^2.6.8: +debug@2.6.8, debug@^2.1.1, debug@^2.2.0, debug@^2.6.0, debug@^2.6.6, debug@^2.6.8: version "2.6.8" resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.8.tgz#e731531ca2ede27d188222427da17821d68ff4fc" dependencies: @@ -2173,6 +2254,10 @@ doctrine@^2.0.0: esutils "^2.0.2" isarray "^1.0.0" +doctypes@^1.1.0: + version "1.1.0" + resolved "http://registry.npm.qima-inc.com/doctypes/download/doctypes-1.1.0.tgz#ea80b106a87538774e8a3a4a5afe293de489e0a9" + dom-converter@~0.1: version "0.1.4" resolved "https://registry.yarnpkg.com/dom-converter/-/dom-converter-0.1.4.tgz#a45ef5727b890c9bffe6d7c876e7b19cb0e17f3b" @@ -2377,7 +2462,7 @@ entities@^1.1.1, entities@~1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/entities/-/entities-1.1.1.tgz#6e5c2d0a5621b5dadaecef80b90edfb5cd7772f0" -errno@^0.1.3: +errno@^0.1.1, errno@^0.1.3: version "0.1.4" resolved "https://registry.yarnpkg.com/errno/-/errno-0.1.4.tgz#b896e23a9e5e8ba33871fc996abd3635fc9a1c7d" dependencies: @@ -2675,6 +2760,14 @@ estraverse@^4.0.0, estraverse@^4.1.0, estraverse@^4.1.1, estraverse@^4.2.0: version "4.2.0" resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.2.0.tgz#0dee3fed31fcd469618ce7342099fc1afa0bdb13" +estree-walker@^0.2.1: + version "0.2.1" + resolved "http://registry.npm.qima-inc.com/estree-walker/download/estree-walker-0.2.1.tgz#bdafe8095383d8414d5dc2ecf4c9173b6db9412e" + +estree-walker@^0.3.0: + version "0.3.1" + resolved "http://registry.npm.qima-inc.com/estree-walker/download/estree-walker-0.3.1.tgz#e6b1a51cf7292524e7237c312e5fe6660c1ce1aa" + esutils@^2.0.2: version "2.0.2" resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.2.tgz#0abf4f1caa5bcb1f7a9d8acc6dea4faaa04bac9b" @@ -3161,6 +3254,12 @@ gaze@^0.5.1: dependencies: globule "~0.1.0" +gaze@^1.0.0: + version "1.1.2" + resolved "http://registry.npm.qima-inc.com/gaze/download/gaze-1.1.2.tgz#847224677adb8870d679257ed3388fdb61e40105" + dependencies: + globule "^1.0.0" + generate-function@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/generate-function/-/generate-function-2.0.0.tgz#6858fe7c0969b7d4e9093337647ac79f60dfbe74" @@ -3171,6 +3270,12 @@ generate-object-property@^1.1.0: dependencies: is-property "^1.0.0" +generic-names@^1.0.2: + version "1.0.2" + resolved "http://registry.npm.qima-inc.com/generic-names/download/generic-names-1.0.2.tgz#e25b7feceb5b5a8f28f5f972a7ccfe57e562adcd" + dependencies: + loader-utils "^0.2.16" + get-caller-file@^1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-1.0.2.tgz#f702e63127e7e231c160a80c1554acb70d5047e5" @@ -3289,6 +3394,17 @@ glob2base@^0.0.12: dependencies: find-index "^0.1.1" +glob@7.0.x: + version "7.0.6" + resolved "http://registry.npm.qima-inc.com/glob/download/glob-7.0.6.tgz#211bafaf49e525b8cd93260d14ab136152b3f57a" + dependencies: + fs.realpath "^1.0.0" + inflight "^1.0.4" + inherits "2" + minimatch "^3.0.2" + once "^1.3.0" + path-is-absolute "^1.0.0" + glob@7.1.1: version "7.1.1" resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.1.tgz#805211df04faaf1c63a3600306cdf5ade50b2ec8" @@ -3319,7 +3435,7 @@ glob@^5.0.15: once "^1.3.0" path-is-absolute "^1.0.0" -glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@^7.1.1, glob@^7.1.2: +glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@^7.1.1, glob@^7.1.2, glob@~7.1.1: version "7.1.2" resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.2.tgz#c19c9df9a028702d678612384a6552404c636d15" dependencies: @@ -3386,6 +3502,14 @@ globby@^6.1.0: pify "^2.0.0" pinkie-promise "^2.0.0" +globule@^1.0.0: + version "1.2.0" + resolved "http://registry.npm.qima-inc.com/globule/download/globule-1.2.0.tgz#1dc49c6822dd9e8a2fa00ba2a295006e8664bd09" + dependencies: + glob "~7.1.1" + lodash "~4.17.4" + minimatch "~3.0.2" + globule@~0.1.0: version "0.1.0" resolved "https://registry.yarnpkg.com/globule/-/globule-0.1.0.tgz#d9c8edde1da79d125a151b79533b978676346ae5" @@ -3677,7 +3801,7 @@ html-webpack-plugin@^2.29.0: pretty-error "^2.0.2" toposort "^1.0.0" -htmlparser2@^3.8.2, htmlparser2@^3.9.1: +htmlparser2@^3.8.2, htmlparser2@^3.8.3, htmlparser2@^3.9.1: version "3.9.2" resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-3.9.2.tgz#1bdf87acca0f3f9e53fa4fcceb0f4b4cbb00b338" dependencies: @@ -3756,7 +3880,7 @@ iconv-lite@^0.4.17: version "0.4.18" resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.18.tgz#23d8656b16aae6742ac29732ea8f0336a4789cf2" -icss-replace-symbols@^1.1.0: +icss-replace-symbols@1.1.0, icss-replace-symbols@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/icss-replace-symbols/-/icss-replace-symbols-1.1.0.tgz#06ea6f83679a7749e386cfe1fe812ae5db223ded" @@ -3774,10 +3898,18 @@ ignore@^3.2.0: version "3.3.3" resolved "https://registry.yarnpkg.com/ignore/-/ignore-3.3.3.tgz#432352e57accd87ab3110e82d3fea0e47812156d" +image-size@~0.5.0: + version "0.5.5" + resolved "http://registry.npm.qima-inc.com/image-size/download/image-size-0.5.5.tgz#09dfd4ab9d20e29eb1c3e80b8990378df9e3cb9c" + imurmurhash@^0.1.4: version "0.1.4" resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea" +in-publish@^2.0.0: + version "2.0.0" + resolved "http://registry.npm.qima-inc.com/in-publish/download/in-publish-2.0.0.tgz#e20ff5e3a2afc2690320b6dc552682a9c7fadf51" + indent-string@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-2.1.0.tgz#8e2d48348742121b4a8218b7a137e9a52049dc80" @@ -3939,6 +4071,20 @@ is-equal-shallow@^0.1.3: dependencies: is-primitive "^2.0.0" +is-expression@^2.0.1: + version "2.1.0" + resolved "http://registry.npm.qima-inc.com/is-expression/download/is-expression-2.1.0.tgz#91be9d47debcfef077977e9722be6dcfb4465ef0" + dependencies: + acorn "~3.3.0" + object-assign "^4.0.1" + +is-expression@^3.0.0: + version "3.0.0" + resolved "http://registry.npm.qima-inc.com/is-expression/download/is-expression-3.0.0.tgz#39acaa6be7fd1f3471dc42c7416e61c24317ac9f" + dependencies: + acorn "~4.0.2" + object-assign "^4.0.1" + is-extendable@^0.1.1: version "0.1.1" resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89" @@ -3985,6 +4131,10 @@ is-lower-case@^1.1.0: dependencies: lower-case "^1.1.0" +is-module@^1.0.0: + version "1.0.0" + resolved "http://registry.npm.qima-inc.com/is-module/download/is-module-1.0.0.tgz#3258fb69f78c14d5b815d664336b4cffb6441591" + is-my-json-valid@^2.10.0, is-my-json-valid@^2.12.4: version "2.16.0" resolved "https://registry.yarnpkg.com/is-my-json-valid/-/is-my-json-valid-2.16.0.tgz#f079dd9bfdae65ee2038aae8acbc86ab109e3693" @@ -4030,7 +4180,7 @@ is-path-inside@^1.0.0: dependencies: path-is-inside "^1.0.1" -is-plain-obj@^1.0.0: +is-plain-obj@^1.0.0, is-plain-obj@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-1.1.0.tgz#71a50c8429dfca773c92a390a4a03b39fcd51d3e" @@ -4048,7 +4198,7 @@ is-primitive@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/is-primitive/-/is-primitive-2.0.0.tgz#207bab91638499c07b2adf240a41a87210034575" -is-promise@^2.1.0: +is-promise@^2.0.0, is-promise@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/is-promise/-/is-promise-2.1.0.tgz#79a2a9ece7f096e80f36d2b2f3bc16c1ff4bf3fa" @@ -4056,7 +4206,7 @@ is-property@^1.0.0: version "1.0.2" resolved "https://registry.yarnpkg.com/is-property/-/is-property-1.0.2.tgz#57fe1c4e48474edd65b09911f26b1cd4095dda84" -is-regex@^1.0.4: +is-regex@^1.0.3, is-regex@^1.0.4: version "1.0.4" resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.0.4.tgz#5517489b547091b0930e095654ced25ee97e9491" dependencies: @@ -4195,7 +4345,7 @@ istanbul@^0.4.0: which "^1.1.1" wordwrap "^1.0.0" -js-base64@^2.1.9: +js-base64@^2.1.8, js-base64@^2.1.9: version "2.1.9" resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.1.9.tgz#f0e80ae039a4bd654b5f281fc93f04a914a7fcce" @@ -4208,6 +4358,10 @@ js-beautify@^1.6.14: mkdirp "~0.5.0" nopt "~3.0.1" +js-stringify@^1.0.1: + version "1.0.2" + resolved "http://registry.npm.qima-inc.com/js-stringify/download/js-stringify-1.0.2.tgz#1736fddfd9724f28a3682adc6230ae7e4e9679db" + js-tokens@^3.0.0: version "3.0.2" resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b" @@ -4329,6 +4483,13 @@ jsprim@^1.2.2: json-schema "0.2.3" verror "1.10.0" +jstransformer@1.0.0: + version "1.0.0" + resolved "http://registry.npm.qima-inc.com/jstransformer/download/jstransformer-1.0.0.tgz#ed8bf0921e2f3f1ed4d5c1a44f68709ed24722c3" + dependencies: + is-promise "^2.0.0" + promise "^7.0.1" + jsx-ast-utils@^1.0.0, jsx-ast-utils@^1.3.4, jsx-ast-utils@^1.4.1: version "1.4.1" resolved "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-1.4.1.tgz#3867213e8dd79bf1e8f2300c0cfc1efb182c0df1" @@ -4502,6 +4663,19 @@ lerna@^2.0.0: write-pkg "^3.0.1" yargs "^8.0.1" +less@^2.7.2: + version "2.7.2" + resolved "http://registry.npm.qima-inc.com/less/download/less-2.7.2.tgz#368d6cc73e1fb03981183280918743c5dcf9b3df" + optionalDependencies: + errno "^0.1.1" + graceful-fs "^4.1.2" + image-size "~0.5.0" + mime "^1.2.11" + mkdirp "^0.5.0" + promise "^7.1.1" + request "^2.72.0" + source-map "^0.5.3" + levn@^0.3.0, levn@~0.3.0: version "0.3.0" resolved "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz#3b09924edf9f083c0490fdd4c0bc4421e04764ee" @@ -4629,6 +4803,10 @@ lodash._root@^3.0.0: version "3.0.1" resolved "https://registry.yarnpkg.com/lodash._root/-/lodash._root-3.0.1.tgz#fba1c4524c19ee9a5f8136b4609f017cf4ded692" +lodash.assign@^4.2.0: + version "4.2.0" + resolved "http://registry.npm.qima-inc.com/lodash.assign/download/lodash.assign-4.2.0.tgz#0d99f3ccd7a6d261d19bdaeb9245005d285808e7" + lodash.assignin@^4.0.9: version "4.2.0" resolved "https://registry.yarnpkg.com/lodash.assignin/-/lodash.assignin-4.2.0.tgz#ba8df5fb841eb0a3e8044232b0e263a8dc6a28a2" @@ -4641,6 +4819,10 @@ lodash.camelcase@^4.3.0: version "4.3.0" resolved "https://registry.yarnpkg.com/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz#b28aa6288a2b9fc651035c7711f65ab6190331a6" +lodash.clonedeep@^4.3.2: + version "4.5.0" + resolved "http://registry.npm.qima-inc.com/lodash.clonedeep/download/lodash.clonedeep-4.5.0.tgz#e23f3f9c4f8fbdde872529c1071857a086e5ccef" + lodash.cond@^4.3.0: version "4.5.2" resolved "https://registry.yarnpkg.com/lodash.cond/-/lodash.cond-4.5.2.tgz#f471a1da486be60f6ab955d17115523dd1d255d5" @@ -4715,6 +4897,10 @@ lodash.merge@^4.4.0: version "4.6.0" resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.0.tgz#69884ba144ac33fe699737a6086deffadd0f89c5" +lodash.mergewith@^4.6.0: + version "4.6.0" + resolved "http://registry.npm.qima-inc.com/lodash.mergewith/download/lodash.mergewith-4.6.0.tgz#150cf0a16791f5903b8891eab154609274bdea55" + lodash.pick@^4.2.1: version "4.4.0" resolved "https://registry.yarnpkg.com/lodash.pick/-/lodash.pick-4.4.0.tgz#52f05610fff9ded422611441ed1fc123a03001b3" @@ -4777,7 +4963,7 @@ lodash@^3.8.0: version "3.10.1" resolved "https://registry.yarnpkg.com/lodash/-/lodash-3.10.1.tgz#5bf45e8e49ba4189e17d482789dfd15bd140b7b6" -lodash@^4.0.0, lodash@^4.0.1, lodash@^4.1.0, lodash@^4.14.0, lodash@^4.17.2, lodash@^4.17.3, lodash@^4.17.4, lodash@^4.2.0, lodash@^4.2.1, lodash@^4.3.0, lodash@^4.5.0: +lodash@^4.0.0, lodash@^4.0.1, lodash@^4.1.0, lodash@^4.14.0, lodash@^4.17.2, lodash@^4.17.3, lodash@^4.17.4, lodash@^4.2.0, lodash@^4.2.1, lodash@^4.3.0, lodash@^4.5.0, lodash@~4.17.4: version "4.17.4" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.4.tgz#78203a4d1c328ae1d86dca6460e369b57f4055ae" @@ -4848,6 +5034,12 @@ macaddress@^0.2.8: version "0.2.8" resolved "https://registry.yarnpkg.com/macaddress/-/macaddress-0.2.8.tgz#5904dc537c39ec6dbefeae902327135fa8511f12" +magic-string@^0.19.0: + version "0.19.1" + resolved "http://registry.npm.qima-inc.com/magic-string/download/magic-string-0.19.1.tgz#14d768013caf2ec8fdea16a49af82fc377e75201" + dependencies: + vlq "^0.2.1" + make-dir@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-1.0.0.tgz#97a011751e91dd87cfadef58832ebb04936de978" @@ -4930,6 +5122,12 @@ merge-descriptors@1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz#b00aaa556dd8b44568150ec9d1b953f3f90cbb61" +merge-options@0.0.64: + version "0.0.64" + resolved "http://registry.npm.qima-inc.com/merge-options/download/merge-options-0.0.64.tgz#cbe04f594a6985eaf27f7f8f0b2a3acf6f9d562d" + dependencies: + is-plain-obj "^1.1.0" + methods@~1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee" @@ -4973,7 +5171,7 @@ mime@1.3.4: version "1.3.4" resolved "https://registry.yarnpkg.com/mime/-/mime-1.3.4.tgz#115f9e3b6b3daf2959983cb38f149a2d40eb5d53" -mime@1.3.x, mime@^1.3.4: +mime@1.3.x, mime@^1.2.11, mime@^1.3.4: version "1.3.6" resolved "https://registry.yarnpkg.com/mime/-/mime-1.3.6.tgz#591d84d3653a6b0b4a3b9df8de5aa8108e72e5e0" @@ -4995,7 +5193,7 @@ minimalistic-crypto-utils@^1.0.0, minimalistic-crypto-utils@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz#f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a" -"minimatch@2 || 3", minimatch@^3.0.0, minimatch@^3.0.2, minimatch@^3.0.3, minimatch@^3.0.4: +"minimatch@2 || 3", minimatch@^3.0.0, minimatch@^3.0.2, minimatch@^3.0.3, minimatch@^3.0.4, minimatch@~3.0.2: version "3.0.4" resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083" dependencies: @@ -5099,7 +5297,7 @@ mute-stream@0.0.7: version "0.0.7" resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.7.tgz#3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab" -nan@^2.3.0: +nan@^2.3.0, nan@^2.3.2: version "2.6.2" resolved "https://registry.yarnpkg.com/nan/-/nan-2.6.2.tgz#e4ff34e6c95fdfb5aecc08de6596f43605a7db45" @@ -5135,6 +5333,24 @@ node-forge@0.6.33: version "0.6.33" resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-0.6.33.tgz#463811879f573d45155ad6a9f43dc296e8e85ebc" +node-gyp@^3.3.1: + version "3.6.2" + resolved "http://registry.npm.qima-inc.com/node-gyp/download/node-gyp-3.6.2.tgz#9bfbe54562286284838e750eac05295853fa1c60" + dependencies: + fstream "^1.0.0" + glob "^7.0.3" + graceful-fs "^4.1.2" + minimatch "^3.0.2" + mkdirp "^0.5.0" + nopt "2 || 3" + npmlog "0 || 1 || 2 || 3 || 4" + osenv "0" + request "2" + rimraf "2" + semver "~5.3.0" + tar "^2.0.0" + which "1" + node-libs-browser@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/node-libs-browser/-/node-libs-browser-2.0.0.tgz#a3a59ec97024985b46e958379646f96c4b616646" @@ -5177,6 +5393,29 @@ node-pre-gyp@^0.6.36: tar "^2.2.1" tar-pack "^3.4.0" +node-sass@^4.5.0: + version "4.5.3" + resolved "http://registry.npm.qima-inc.com/node-sass/download/node-sass-4.5.3.tgz#d09c9d1179641239d1b97ffc6231fdcec53e1568" + dependencies: + async-foreach "^0.1.3" + chalk "^1.1.1" + cross-spawn "^3.0.0" + gaze "^1.0.0" + get-stdin "^4.0.1" + glob "^7.0.3" + in-publish "^2.0.0" + lodash.assign "^4.2.0" + lodash.clonedeep "^4.3.2" + lodash.mergewith "^4.6.0" + meow "^3.7.0" + mkdirp "^0.5.1" + nan "^2.3.2" + node-gyp "^3.3.1" + npmlog "^4.0.0" + request "^2.79.0" + sass-graph "^2.1.1" + stdout-stream "^1.4.0" + node-watch@^0.5.5: version "0.5.5" resolved "https://registry.yarnpkg.com/node-watch/-/node-watch-0.5.5.tgz#34865ba8bc6861ab086acdcc3403e40ed55c3274" @@ -5188,7 +5427,7 @@ nomnomnomnom@^2.0.0: chalk "~0.4.0" underscore "~1.6.0" -nopt@3.x, nopt@~3.0.1: +"nopt@2 || 3", nopt@3.x, nopt@~3.0.1: version "3.0.6" resolved "https://registry.yarnpkg.com/nopt/-/nopt-3.0.6.tgz#c6465dbf08abcd4db359317f79ac68a646b28ff9" dependencies: @@ -5235,7 +5474,7 @@ npm-run-path@^2.0.0: dependencies: path-key "^2.0.0" -npmlog@^4.0.2, npmlog@^4.1.0: +"npmlog@0 || 1 || 2 || 3 || 4", npmlog@^4.0.0, npmlog@^4.0.2, npmlog@^4.1.0: version "4.1.2" resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b" dependencies: @@ -5436,7 +5675,7 @@ os-tmpdir@^1.0.0, os-tmpdir@^1.0.1, os-tmpdir@~1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274" -osenv@^0.1.4: +osenv@0, osenv@^0.1.4: version "0.1.4" resolved "https://registry.yarnpkg.com/osenv/-/osenv-0.1.4.tgz#42fe6d5953df06c8064be6f176c3d05aaaa34644" dependencies: @@ -5524,6 +5763,10 @@ parse5@^1.5.1: version "1.5.1" resolved "https://registry.yarnpkg.com/parse5/-/parse5-1.5.1.tgz#9b7f3b0de32be78dc2401b17573ccaf0f6f59d94" +parse5@^2.1.0: + version "2.2.3" + resolved "http://registry.npm.qima-inc.com/parse5/download/parse5-2.2.3.tgz#0c4fc41c1000c5e6b93d48b03f8083837834e9f6" + parsejson@0.0.3: version "0.0.3" resolved "https://registry.yarnpkg.com/parsejson/-/parsejson-0.0.3.tgz#ab7e3759f209ece99437973f7d0f1f64ae0e64ab" @@ -5959,33 +6202,48 @@ postcss-mixins@^6.0.1: postcss-simple-vars "^4.0.0" sugarss "^1.0.0" +postcss-modules-extract-imports@1.1.0: + version "1.1.0" + resolved "http://registry.npm.qima-inc.com/postcss-modules-extract-imports/download/postcss-modules-extract-imports-1.1.0.tgz#b614c9720be6816eaee35fb3a5faa1dba6a05ddb" + dependencies: + postcss "^6.0.1" + postcss-modules-extract-imports@^1.0.0: version "1.2.0" resolved "https://registry.yarnpkg.com/postcss-modules-extract-imports/-/postcss-modules-extract-imports-1.2.0.tgz#66140ecece38ef06bf0d3e355d69bf59d141ea85" dependencies: postcss "^6.0.1" -postcss-modules-local-by-default@^1.0.1: +postcss-modules-local-by-default@1.2.0, postcss-modules-local-by-default@^1.0.1: version "1.2.0" resolved "https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-1.2.0.tgz#f7d80c398c5a393fa7964466bd19500a7d61c069" dependencies: css-selector-tokenizer "^0.7.0" postcss "^6.0.1" -postcss-modules-scope@^1.0.0: +postcss-modules-scope@1.1.0, postcss-modules-scope@^1.0.0: version "1.1.0" resolved "https://registry.yarnpkg.com/postcss-modules-scope/-/postcss-modules-scope-1.1.0.tgz#d6ea64994c79f97b62a72b426fbe6056a194bb90" dependencies: css-selector-tokenizer "^0.7.0" postcss "^6.0.1" -postcss-modules-values@^1.1.0: +postcss-modules-values@1.3.0, postcss-modules-values@^1.1.0: version "1.3.0" resolved "https://registry.yarnpkg.com/postcss-modules-values/-/postcss-modules-values-1.3.0.tgz#ecffa9d7e192518389f42ad0e83f72aec456ea20" dependencies: icss-replace-symbols "^1.1.0" postcss "^6.0.1" +postcss-modules@^0.6.4: + version "0.6.4" + resolved "http://registry.npm.qima-inc.com/postcss-modules/download/postcss-modules-0.6.4.tgz#77a58bb77ba1b4392b270c0b59852fd75e89a8b4" + dependencies: + css-modules-loader-core "^1.0.1" + generic-names "^1.0.2" + postcss "^5.2.8" + string-hash "^1.1.1" + postcss-nested@^2.0.2: version "2.1.0" resolved "https://registry.yarnpkg.com/postcss-nested/-/postcss-nested-2.1.0.tgz#72661d79463f5894a8c4b890479baec689d1c693" @@ -6114,7 +6372,15 @@ postcss-zindex@^2.0.1: postcss "^5.0.4" uniqs "^2.0.0" -postcss@^5.0.10, postcss@^5.0.11, postcss@^5.0.12, postcss@^5.0.13, postcss@^5.0.14, postcss@^5.0.15, postcss@^5.0.16, postcss@^5.0.2, postcss@^5.0.4, postcss@^5.0.5, postcss@^5.0.6, postcss@^5.0.8, postcss@^5.2.16: +postcss@6.0.1: + version "6.0.1" + resolved "http://registry.npm.qima-inc.com/postcss/download/postcss-6.0.1.tgz#000dbd1f8eef217aa368b9a212c5fc40b2a8f3f2" + dependencies: + chalk "^1.1.3" + source-map "^0.5.6" + supports-color "^3.2.3" + +postcss@^5.0.10, postcss@^5.0.11, postcss@^5.0.12, postcss@^5.0.13, postcss@^5.0.14, postcss@^5.0.15, postcss@^5.0.16, postcss@^5.0.2, postcss@^5.0.4, postcss@^5.0.5, postcss@^5.0.6, postcss@^5.0.8, postcss@^5.2.11, postcss@^5.2.16, postcss@^5.2.8: version "5.2.17" resolved "https://registry.yarnpkg.com/postcss/-/postcss-5.2.17.tgz#cf4f597b864d65c8a492b2eabe9d706c879c388b" dependencies: @@ -6131,6 +6397,30 @@ postcss@^6.0.0, postcss@^6.0.1, postcss@^6.0.2, postcss@^6.0.3, postcss@^6.0.6, source-map "^0.5.6" supports-color "^4.2.0" +posthtml-attrs-parser@^0.1.1: + version "0.1.1" + resolved "https://registry.npmjs.org/posthtml-attrs-parser/-/posthtml-attrs-parser-0.1.1.tgz#cc33e00155fb99ba96f67e25e330461f05742ac8" + dependencies: + object-assign "^4.0.1" + +posthtml-parser@^0.2.0: + version "0.2.1" + resolved "http://registry.npm.qima-inc.com/posthtml-parser/download/posthtml-parser-0.2.1.tgz#35d530de386740c2ba24ff2eb2faf39ccdf271dd" + dependencies: + htmlparser2 "^3.8.3" + isobject "^2.1.0" + +posthtml-render@^1.0.5: + version "1.0.6" + resolved "http://registry.npm.qima-inc.com/posthtml-render/download/posthtml-render-1.0.6.tgz#1b88b8e7860a8ebdfe2f2a1310a4642a55cf5bda" + +posthtml@^0.9.2: + version "0.9.2" + resolved "http://registry.npm.qima-inc.com/posthtml/download/posthtml-0.9.2.tgz#f4c06db9f67b61fd17c4e256e7e3d9515bf726fd" + dependencies: + posthtml-parser "^0.2.0" + posthtml-render "^1.0.5" + precss@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/precss/-/precss-2.0.0.tgz#7f567e3318e06d44c8fdbf9e58452e8358bf4b71" @@ -6209,6 +6499,12 @@ promise-each@^2.2.0: dependencies: any-promise "^0.1.0" +promise@^7.0.1, promise@^7.1.1: + version "7.3.1" + resolved "http://registry.npm.qima-inc.com/promise/download/promise-7.3.1.tgz#064b72602b18f90f29192b8b1bc418ffd1ebd3bf" + dependencies: + asap "~2.0.3" + proto-list@~1.2.1: version "1.2.4" resolved "https://registry.yarnpkg.com/proto-list/-/proto-list-1.2.4.tgz#212d5bfe1318306a420f6402b8e26ff39647a849" @@ -6238,6 +6534,99 @@ public-encrypt@^4.0.0: parse-asn1 "^5.0.0" randombytes "^2.0.1" +pug-attrs@^2.0.2: + version "2.0.2" + resolved "http://registry.npm.qima-inc.com/pug-attrs/download/pug-attrs-2.0.2.tgz#8be2b2225568ffa75d1b866982bff9f4111affcb" + dependencies: + constantinople "^3.0.1" + js-stringify "^1.0.1" + pug-runtime "^2.0.3" + +pug-code-gen@^1.1.1: + version "1.1.1" + resolved "http://registry.npm.qima-inc.com/pug-code-gen/download/pug-code-gen-1.1.1.tgz#1cf72744ef2a039eae6a3340caaa1105871258e8" + dependencies: + constantinople "^3.0.1" + doctypes "^1.1.0" + js-stringify "^1.0.1" + pug-attrs "^2.0.2" + pug-error "^1.3.2" + pug-runtime "^2.0.3" + void-elements "^2.0.1" + with "^5.0.0" + +pug-error@^1.3.2: + version "1.3.2" + resolved "http://registry.npm.qima-inc.com/pug-error/download/pug-error-1.3.2.tgz#53ae7d9d29bb03cf564493a026109f54c47f5f26" + +pug-filters@^2.1.4: + version "2.1.4" + resolved "http://registry.npm.qima-inc.com/pug-filters/download/pug-filters-2.1.4.tgz#ab247c0f58765414b61be7b54fe979e9f6fc898f" + dependencies: + clean-css "^3.3.0" + constantinople "^3.0.1" + jstransformer "1.0.0" + pug-error "^1.3.2" + pug-walk "^1.1.4" + resolve "^1.1.6" + uglify-js "^2.6.1" + +pug-lexer@^3.1.0: + version "3.1.0" + resolved "http://registry.npm.qima-inc.com/pug-lexer/download/pug-lexer-3.1.0.tgz#fd087376d4a675b4f59f8fef422883434e9581a2" + dependencies: + character-parser "^2.1.1" + is-expression "^3.0.0" + pug-error "^1.3.2" + +pug-linker@^3.0.2: + version "3.0.2" + resolved "http://registry.npm.qima-inc.com/pug-linker/download/pug-linker-3.0.2.tgz#cc0780cf9f3f5522b270871785492b99588d3142" + dependencies: + pug-error "^1.3.2" + pug-walk "^1.1.4" + +pug-load@^2.0.8: + version "2.0.8" + resolved "http://registry.npm.qima-inc.com/pug-load/download/pug-load-2.0.8.tgz#1df1c1716f3e68c70d71699cff9458472dc38b9b" + dependencies: + object-assign "^4.1.0" + pug-walk "^1.1.4" + +pug-parser@^3.0.1: + version "3.0.1" + resolved "http://registry.npm.qima-inc.com/pug-parser/download/pug-parser-3.0.1.tgz#dc0c5dd6c9c2d89da6105abbdf3d1b0fb4d39b5e" + dependencies: + pug-error "^1.3.2" + token-stream "0.0.1" + +pug-runtime@^2.0.3: + version "2.0.3" + resolved "http://registry.npm.qima-inc.com/pug-runtime/download/pug-runtime-2.0.3.tgz#98162607b0fce9e254d427f33987a5aee7168bda" + +pug-strip-comments@^1.0.2: + version "1.0.2" + resolved "http://registry.npm.qima-inc.com/pug-strip-comments/download/pug-strip-comments-1.0.2.tgz#d313afa01bcc374980e1399e23ebf2eb9bdc8513" + dependencies: + pug-error "^1.3.2" + +pug-walk@^1.1.4: + version "1.1.4" + resolved "http://registry.npm.qima-inc.com/pug-walk/download/pug-walk-1.1.4.tgz#29e5174af43b67e99c31b448632e1ff86ddd671c" + +pug@^2.0.0-beta11: + version "2.0.0-rc.3" + resolved "http://registry.npm.qima-inc.com/pug/download/pug-2.0.0-rc.3.tgz#553cb3c3a97bb54ec3cb1e08591dcae3b6f58891" + dependencies: + pug-code-gen "^1.1.1" + pug-filters "^2.1.4" + pug-lexer "^3.1.0" + pug-linker "^3.0.2" + pug-load "^2.0.8" + pug-parser "^3.0.1" + pug-runtime "^2.0.3" + pug-strip-comments "^1.0.2" + punycode@1.3.2: version "1.3.2" resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.3.2.tgz#9653a036fb7c1ee42342f2325cceefea3926c48d" @@ -6558,7 +6947,7 @@ request-progress@~2.0.1: dependencies: throttleit "^1.0.0" -request@2.81.0, request@^2.55.0, request@^2.81.0: +request@2, request@2.81.0, request@^2.55.0, request@^2.72.0, request@^2.79.0, request@^2.81.0: version "2.81.0" resolved "https://registry.yarnpkg.com/request/-/request-2.81.0.tgz#c6928946a0e06c5f8d6f8a9333469ffda46298a0" dependencies: @@ -6644,7 +7033,7 @@ resolve-from@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-1.0.1.tgz#26cbfe935d1aeeeabb29bc3fe5aeb01e93d44226" -resolve@1.1.x: +resolve@1.1.7, resolve@1.1.x: version "1.1.7" resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.1.7.tgz#203114d82ad2c5ed9e8e0411b3932875e889e97b" @@ -6691,6 +7080,82 @@ ripemd160@^2.0.0, ripemd160@^2.0.1: hash-base "^2.0.0" inherits "^2.0.1" +rollup-plugin-babel@^3.0.1: + version "3.0.1" + resolved "http://registry.npm.qima-inc.com/rollup-plugin-babel/download/rollup-plugin-babel-3.0.1.tgz#e1b75bc3a6ea876bb8ec747562b344b15e27c94e" + dependencies: + rollup-pluginutils "^1.5.0" + +rollup-plugin-commonjs@^8.1.0: + version "8.1.0" + resolved "http://registry.npm.qima-inc.com/rollup-plugin-commonjs/download/rollup-plugin-commonjs-8.1.0.tgz#8ac9a87e6ea4c0d136e3e0e25ef41058957622b0" + dependencies: + acorn "^4.0.1" + estree-walker "^0.3.0" + magic-string "^0.19.0" + resolve "^1.1.7" + rollup-pluginutils "^2.0.1" + +rollup-plugin-node-resolve@^3.0.0: + version "3.0.0" + resolved "http://registry.npm.qima-inc.com/rollup-plugin-node-resolve/download/rollup-plugin-node-resolve-3.0.0.tgz#8b897c4c3030d5001277b0514b25d2ca09683ee0" + dependencies: + browser-resolve "^1.11.0" + builtin-modules "^1.1.0" + is-module "^1.0.0" + resolve "^1.1.6" + +rollup-plugin-vue@^2.4.1: + version "2.4.1" + resolved "https://registry.npmjs.org/rollup-plugin-vue/-/rollup-plugin-vue-2.4.1.tgz#a8780c8f3163880e70631d84019b6183b4198a97" + dependencies: + babel-runtime "^6.22.0" + camelcase "^4.0.0" + de-indent "^1.0.2" + debug "^2.6.0" + hash-sum "^1.0.2" + html-minifier "^3.2.3" + magic-string "^0.19.0" + merge-options "0.0.64" + parse5 "^2.1.0" + postcss "^5.2.11" + postcss-modules "^0.6.4" + postcss-selector-parser "^2.2.3" + posthtml "^0.9.2" + posthtml-attrs-parser "^0.1.1" + rollup-pluginutils "^2.0.1" + typescript "^2.4.1" + vue-template-compiler "*" + vue-template-es2015-compiler "^1.5.0" + vue-template-validator "^1.1.5" + optionalDependencies: + coffee-script "^1.12.4" + coffeescript-compiler "^0.1.1" + less "^2.7.2" + node-sass "^4.5.0" + pug "^2.0.0-beta11" + stylus "^0.54.5" + +rollup-pluginutils@^1.5.0: + version "1.5.2" + resolved "http://registry.npm.qima-inc.com/rollup-pluginutils/download/rollup-pluginutils-1.5.2.tgz#1e156e778f94b7255bfa1b3d0178be8f5c552408" + dependencies: + estree-walker "^0.2.1" + minimatch "^3.0.2" + +rollup-pluginutils@^2.0.1: + version "2.0.1" + resolved "http://registry.npm.qima-inc.com/rollup-pluginutils/download/rollup-pluginutils-2.0.1.tgz#7ec95b3573f6543a46a6461bd9a7c544525d0fc0" + dependencies: + estree-walker "^0.3.0" + micromatch "^2.3.11" + +rollup@^0.45.2: + version "0.45.2" + resolved "http://registry.npm.qima-inc.com/rollup/download/rollup-0.45.2.tgz#63a284c2b31234656f24e9e9717fabb6a7f0fa43" + dependencies: + source-map-support "^0.4.0" + run-async@^0.1.0: version "0.1.0" resolved "https://registry.yarnpkg.com/run-async/-/run-async-0.1.0.tgz#c8ad4a5e110661e402a7d21b530e009f25f8e389" @@ -6732,6 +7197,19 @@ samsam@1.x, samsam@^1.1.3: version "1.2.1" resolved "https://registry.yarnpkg.com/samsam/-/samsam-1.2.1.tgz#edd39093a3184370cb859243b2bdf255e7d8ea67" +sass-graph@^2.1.1: + version "2.2.4" + resolved "http://registry.npm.qima-inc.com/sass-graph/download/sass-graph-2.2.4.tgz#13fbd63cd1caf0908b9fd93476ad43a51d1e0b49" + dependencies: + glob "^7.0.0" + lodash "^4.0.0" + scss-tokenizer "^0.2.3" + yargs "^7.0.0" + +sax@0.5.x: + version "0.5.8" + resolved "http://registry.npm.qima-inc.com/sax/download/sax-0.5.8.tgz#d472db228eb331c2506b0e8c15524adb939d12c1" + sax@^1.1.4, sax@~1.2.1: version "1.2.4" resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9" @@ -6742,6 +7220,13 @@ schema-utils@^0.3.0: dependencies: ajv "^5.0.0" +scss-tokenizer@^0.2.3: + version "0.2.3" + resolved "http://registry.npm.qima-inc.com/scss-tokenizer/download/scss-tokenizer-0.2.3.tgz#8eb06db9a9723333824d3f5530641149847ce5d1" + dependencies: + js-base64 "^2.1.8" + source-map "^0.4.2" + select-hose@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/select-hose/-/select-hose-2.0.0.tgz#625d8658f865af43ec962bfc376a37359a4994ca" @@ -6760,6 +7245,10 @@ semver@^4.1.0, semver@~4.3.3: version "4.3.6" resolved "https://registry.yarnpkg.com/semver/-/semver-4.3.6.tgz#300bc6e0e86374f7ba61068b5b1ecd57fc6532da" +semver@~5.3.0: + version "5.3.0" + resolved "http://registry.npm.qima-inc.com/semver/download/semver-5.3.0.tgz#9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f" + send@0.15.4: version "0.15.4" resolved "https://registry.yarnpkg.com/send/-/send-0.15.4.tgz#985faa3e284b0273c793364a35c6737bd93905b9" @@ -6981,13 +7470,19 @@ source-list-map@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-2.0.0.tgz#aaa47403f7b245a92fbc97ea08f250d6087ed085" -source-map-support@^0.4.2: +source-map-support@^0.4.0, source-map-support@^0.4.2: version "0.4.15" resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.4.15.tgz#03202df65c06d2bd8c7ec2362a193056fef8d3b1" dependencies: source-map "^0.5.6" -source-map@0.4.x, source-map@^0.4.4: +source-map@0.1.x, source-map@^0.1.41: + version "0.1.43" + resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.1.43.tgz#c24bc146ca517c1471f5dacbe2571b2b7f9e3346" + dependencies: + amdefine ">=0.0.4" + +source-map@0.4.x, source-map@^0.4.2, source-map@^0.4.4: version "0.4.4" resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.4.4.tgz#eba4f5da9c0dc999de68032d8b4f76173652036b" dependencies: @@ -6997,12 +7492,6 @@ source-map@0.5.x, source-map@^0.5.0, source-map@^0.5.1, source-map@^0.5.3, sourc version "0.5.6" resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.6.tgz#75ce38f52bf0733c5a7f0c118d81334a2bb5f412" -source-map@^0.1.41: - version "0.1.43" - resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.1.43.tgz#c24bc146ca517c1471f5dacbe2571b2b7f9e3346" - dependencies: - amdefine ">=0.0.4" - source-map@~0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.2.0.tgz#dab73fbcfc2ba819b4de03bd6f6eaa48164b3f9d" @@ -7088,6 +7577,12 @@ stackframe@^1.0.3: version "1.3.1" resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.3.1.tgz#faf51b9eb74aaef3b3acf4ad5f61abf24cb7b93e" +stdout-stream@^1.4.0: + version "1.4.0" + resolved "http://registry.npm.qima-inc.com/stdout-stream/download/stdout-stream-1.4.0.tgz#a2c7c8587e54d9427ea9edb3ac3f2cd522df378b" + dependencies: + readable-stream "^2.0.1" + stream-browserify@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/stream-browserify/-/stream-browserify-2.0.1.tgz#66266ee5f9bdb9940a4e4514cafb43bb71e5c9db" @@ -7113,6 +7608,10 @@ 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" +string-hash@^1.1.1: + version "1.1.3" + resolved "http://registry.npm.qima-inc.com/string-hash/download/string-hash-1.1.3.tgz#e8aafc0ac1855b4666929ed7dd1275df5d6c811b" + string-length@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/string-length/-/string-length-1.0.1.tgz#56970fb1c38558e9e70b728bf3de269ac45adfac" @@ -7212,6 +7711,17 @@ style-loader@^0.18.2: loader-utils "^1.0.2" schema-utils "^0.3.0" +stylus@^0.54.5: + version "0.54.5" + resolved "http://registry.npm.qima-inc.com/stylus/download/stylus-0.54.5.tgz#42b9560931ca7090ce8515a798ba9e6aa3d6dc79" + dependencies: + css-parse "1.7.x" + debug "*" + glob "7.0.x" + mkdirp "0.5.x" + sax "0.5.x" + source-map "0.1.x" + sugarss@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/sugarss/-/sugarss-1.0.0.tgz#65e51b3958432fb70d5451a68bb33e32d0cf1ef7" @@ -7291,7 +7801,7 @@ tar-pack@^3.4.0: tar "^2.2.1" uid-number "^0.0.6" -tar@^2.2.1: +tar@^2.0.0, tar@^2.2.1: version "2.2.1" resolved "https://registry.yarnpkg.com/tar/-/tar-2.2.1.tgz#8e4d2a256c0e2185c6b18ad694aec968b83cb1d1" dependencies: @@ -7409,6 +7919,10 @@ to-fast-properties@^1.0.1: version "1.0.3" resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-1.0.3.tgz#b83571fa4d8c25b82e231b06e3a3055de4ca1a47" +token-stream@0.0.1: + version "0.0.1" + resolved "http://registry.npm.qima-inc.com/token-stream/download/token-stream-0.0.1.tgz#ceeefc717a76c4316f126d0b9dbaa55d7e7df01a" + toposort@^1.0.0: version "1.0.3" resolved "https://registry.yarnpkg.com/toposort/-/toposort-1.0.3.tgz#f02cd8a74bd8be2fc0e98611c3bacb95a171869c" @@ -7482,6 +7996,10 @@ typedarray@^0.0.6, typedarray@~0.0.5: version "0.0.6" resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777" +typescript@^2.4.1: + version "2.4.2" + resolved "http://registry.npm.qima-inc.com/typescript/download/typescript-2.4.2.tgz#f8395f85d459276067c988aa41837a8f82870844" + uc.micro@^1.0.1, uc.micro@^1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/uc.micro/-/uc.micro-1.0.3.tgz#7ed50d5e0f9a9fb0a573379259f2a77458d50192" @@ -7502,7 +8020,7 @@ uglify-js@3.0.x: commander "~2.11.0" source-map "~0.5.1" -uglify-js@^2.6, uglify-js@^2.8.29: +uglify-js@^2.6, uglify-js@^2.6.1, uglify-js@^2.8.29: version "2.8.29" resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-2.8.29.tgz#29c5733148057bb4e1f75df35b7a9cb72e6a59dd" dependencies: @@ -7717,13 +8235,17 @@ vinyl@^0.5.0: clone-stats "^0.0.1" replace-ext "0.0.1" +vlq@^0.2.1: + version "0.2.2" + resolved "http://registry.npm.qima-inc.com/vlq/download/vlq-0.2.2.tgz#e316d5257b40b86bb43cb8d5fea5d7f54d6b0ca1" + vm-browserify@0.0.4: version "0.0.4" resolved "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-0.0.4.tgz#5d7ea45bbef9e4a6ff65f95438e0a87c357d5a73" dependencies: indexof "0.0.1" -void-elements@^2.0.0: +void-elements@^2.0.0, void-elements@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/void-elements/-/void-elements-2.0.1.tgz#c066afb582bb1cb4128d60ea92392e94d5e9dbec" @@ -7787,17 +8309,23 @@ vue-style-loader@^3.0.0: hash-sum "^1.0.2" loader-utils "^1.0.2" -vue-template-compiler@^2.4.2: +vue-template-compiler@*, 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" dependencies: de-indent "^1.0.2" he "^1.1.0" -vue-template-es2015-compiler@^1.5.3: +vue-template-es2015-compiler@^1.5.0, 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-template-validator@^1.1.5: + version "1.1.5" + resolved "http://registry.npm.qima-inc.com/vue-template-validator/download/vue-template-validator-1.1.5.tgz#22d1ee77d0647c1ab14ff7eb01865942d9b3c458" + dependencies: + chalk "^1.1.1" + vue@^2.4.2: version "2.4.2" resolved "https://registry.yarnpkg.com/vue/-/vue-2.4.2.tgz#a9855261f191c978cc0dc1150531b8d08149b58c" @@ -7932,7 +8460,7 @@ which-module@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a" -which@^1.0.9, which@^1.1.1, which@^1.2.1, which@^1.2.12, which@^1.2.9: +which@1, which@^1.0.9, which@^1.1.1, which@^1.2.1, which@^1.2.12, which@^1.2.9: version "1.3.0" resolved "https://registry.yarnpkg.com/which/-/which-1.3.0.tgz#ff04bdfc010ee547d780bec38e1ac1c2777d253a" dependencies: @@ -7954,6 +8482,13 @@ window-size@0.1.0: version "0.1.0" resolved "https://registry.yarnpkg.com/window-size/-/window-size-0.1.0.tgz#5438cd2ea93b202efa3a19fe8887aee7c94f9c9d" +with@^5.0.0: + version "5.1.1" + resolved "http://registry.npm.qima-inc.com/with/download/with-5.1.1.tgz#fa4daa92daf32c4ea94ed453c81f04686b575dfe" + dependencies: + acorn "^3.1.0" + acorn-globals "^3.0.0" + wordwrap@0.0.2: version "0.0.2" resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.2.tgz#b79669bb42ecb409f83d583cad52ca17eaa1643f" @@ -8050,6 +8585,12 @@ yargs-parser@^4.2.0: dependencies: camelcase "^3.0.0" +yargs-parser@^5.0.0: + version "5.0.0" + resolved "http://registry.npm.qima-inc.com/yargs-parser/download/yargs-parser-5.0.0.tgz#275ecf0d7ffe05c77e64e7c86e4cd94bf0e1228a" + dependencies: + camelcase "^3.0.0" + yargs-parser@^7.0.0: version "7.0.0" resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-7.0.0.tgz#8d0ac42f16ea55debd332caf4c4038b3e3f5dfd9" @@ -8074,6 +8615,24 @@ yargs@^6.0.0: y18n "^3.2.1" yargs-parser "^4.2.0" +yargs@^7.0.0: + version "7.1.0" + resolved "http://registry.npm.qima-inc.com/yargs/download/yargs-7.1.0.tgz#6ba318eb16961727f5d284f8ea003e8d6154d0c8" + dependencies: + camelcase "^3.0.0" + cliui "^3.2.0" + decamelize "^1.1.1" + get-caller-file "^1.0.1" + os-locale "^1.4.0" + read-pkg-up "^1.0.1" + require-directory "^2.1.1" + require-main-filename "^1.0.1" + set-blocking "^2.0.0" + string-width "^1.0.2" + which-module "^1.0.0" + y18n "^3.2.1" + yargs-parser "^5.0.0" + yargs@^8.0.1, yargs@^8.0.2: version "8.0.2" resolved "https://registry.yarnpkg.com/yargs/-/yargs-8.0.2.tgz#6299a9055b1cefc969ff7e79c1d918dceb22c360" @@ -8120,3 +8679,9 @@ zan-doc@0.1.12: markdown-it "^8.3.1" markdown-it-container "^2.0.0" node-watch "^0.5.5" + +zan-rollup-plugin-alias@1.0.1: + version "1.0.1" + resolved "http://registry.npm.taobao.org/zan-rollup-plugin-alias/download/zan-rollup-plugin-alias-1.0.1.tgz#5004b659cdac960a83d75d4b3f8480b3982fbdd8" + dependencies: + slash "^1.0.0" From 31d1ae392be202a7aeb01d2a7bd70533efc0547d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= Date: Tue, 15 Aug 2017 13:24:19 +0800 Subject: [PATCH 02/55] fix: delete unused doc css --- CHANGELOG.md | 0 build/bin/build-entry.js | 2 +- build/rollup.component.config.js | 21 +- build/webpack.build.js | 2 +- build/webpack.components.js | 31 - build/webpack.config.dev.js | 3 +- docs/examples-docs/dialog.md | 2 +- docs/examples-docs/image-preview.md | 4 +- docs/examples-docs/toast.md | 8 +- docs/src/ExamplesApp.vue | 60 +- docs/src/examples.js | 2 +- lerna.json | 4 - package.json | 12 +- packages/cell-swipe/src/cell-swipe.vue | 5 - {src => packages}/index.js | 0 test/unit/components/waterfall/waterfall.vue | 2 - yarn.lock | 640 +------------------ 17 files changed, 75 insertions(+), 723 deletions(-) delete mode 100644 CHANGELOG.md delete mode 100644 build/webpack.components.js delete mode 100644 lerna.json rename {src => packages}/index.js (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md deleted file mode 100644 index e69de29bb..000000000 diff --git a/build/bin/build-entry.js b/build/bin/build-entry.js index db939e763..1dfb1ce86 100644 --- a/build/bin/build-entry.js +++ b/build/bin/build-entry.js @@ -4,7 +4,7 @@ var render = require('json-templater/string'); var uppercamelcase = require('uppercamelcase'); var path = require('path'); -var OUTPUT_PATH = path.join(__dirname, '../../src/index.js'); +var OUTPUT_PATH = path.join(__dirname, '../../packages/index.js'); var IMPORT_TEMPLATE = 'import {{name}} from \'../packages/{{package}}/index.js\';'; var ISNTALL_COMPONENT_TEMPLATE = ' {{name}}'; var MAIN_TEMPLATE = `{{include}} diff --git a/build/rollup.component.config.js b/build/rollup.component.config.js index 4e452bbee..c1f933470 100644 --- a/build/rollup.component.config.js +++ b/build/rollup.component.config.js @@ -1,3 +1,4 @@ +import fs from 'fs'; import path from 'path'; import vue from 'rollup-plugin-vue'; import alias from 'zan-rollup-plugin-alias'; @@ -8,6 +9,17 @@ import componentsConfig from '../components.json'; const extensions = ['.js', '.vue']; +// 打包时排除 mixins、utils、其他组件 +const utilsPath = path.resolve(__dirname, '../packages/common/utils/'); +const mixinsPath = path.resolve(__dirname, '../packages/common/mixins/'); +const external = [ + ...fs.readdirSync(utilsPath).map(item => path.resolve(utilsPath, item)), + ...fs.readdirSync(mixinsPath).map(item => path.resolve(mixinsPath, item)), + ...Object.keys(componentsConfig).map(component => + path.resolve(__dirname, '../packages', component, 'index.js') + ) +]; + export default Object.keys(componentsConfig).map(component => { return { entry: componentsConfig[component], @@ -17,7 +29,12 @@ export default Object.keys(componentsConfig).map(component => { format: 'cjs' } ], - external: ['vue', 'vue-lazyload'], + external: [ + 'vue', + 'vue-lazyload', + path.resolve(__dirname, '../packages/common/mixins/popup/index.js'), + ...external + ], plugins: [ vue(), babel({ @@ -36,7 +53,7 @@ export default Object.keys(componentsConfig).map(component => { 'src/mixins': path.resolve(__dirname, '../packages/common/mixins'), 'src/utils': path.resolve(__dirname, '../packages/common/utils'), packages: path.resolve(__dirname, '../packages') - }), + }) ] }; }); diff --git a/build/webpack.build.js b/build/webpack.build.js index 0ce2bb610..2b53cbae7 100644 --- a/build/webpack.build.js +++ b/build/webpack.build.js @@ -3,7 +3,7 @@ const config = require('./webpack.config.dev.js'); const isMinify = process.argv.indexOf('-p') !== -1; config.entry = { - 'vant': './src/index.js' + 'vant': './packages/index.js' }; config.output = { diff --git a/build/webpack.components.js b/build/webpack.components.js deleted file mode 100644 index d5a3c18fb..000000000 --- a/build/webpack.components.js +++ /dev/null @@ -1,31 +0,0 @@ -const path = require('path'); -const Components = require('../components.json'); -const config = require('./webpack.build.js'); -const webpack = require('webpack'); - -delete config.devtool; - -const entry = {}; -Object.keys(Components).forEach(key => { - entry[key + '/index'] = Components[key]; -}); - -config.entry = entry; - -config.externals = { - vue: { - root: 'Vue', - commonjs: 'vue', - commonjs2: 'vue', - amd: 'vue' - } -}; - -config.output = { - path: path.join(__dirname, '../lib'), - filename: '[name].js', - libraryExport: "default", - libraryTarget: 'umd' -}; - -module.exports = config; diff --git a/build/webpack.config.dev.js b/build/webpack.config.dev.js index 89ae7be1f..5e3ccf985 100644 --- a/build/webpack.config.dev.js +++ b/build/webpack.config.dev.js @@ -38,7 +38,8 @@ module.exports = { extensions: ['.js', '.vue', '.css'], alias: { vue: 'vue/dist/vue.runtime.esm.js', - src: path.join(__dirname, '../src'), + 'src/mixins': path.resolve(__dirname, '../packages/common/mixins'), + 'src/utils': path.resolve(__dirname, '../packages/common/utils'), packages: path.join(__dirname, '../packages'), lib: path.join(__dirname, '../lib'), components: path.join(__dirname, '../docs/src/components') diff --git a/docs/examples-docs/dialog.md b/docs/examples-docs/dialog.md index 8fbcca762..a40704c8c 100644 --- a/docs/examples-docs/dialog.md +++ b/docs/examples-docs/dialog.md @@ -7,7 +7,7 @@ @@ -22,105 +23,67 @@ ### 代码演示 -#### 按钮功能 +#### 按钮类型 -只接受`primary`, `default`, `danger`三种类型，默认`default`。 +支持`default`、`primary`、`danger`三种类型，默认为`default` -:::demo 按钮功能 +:::demo 按钮类型 ```html - - - default - - - primary - - - danger - - -``` -::: - -#### 禁用状态 - -在组件上加上`disabled`属性即可，此时按钮不可点击。 - -:::demo 禁用状态 -```html - - - diabled - - +Default +Primary +Danger ``` ::: #### 按钮尺寸 -只接受`large`, `normal`, `small`, `mini`四种尺寸，默认`normal`。`large`按钮默认100%宽度。 +支持`large`、`normal`、`small`、`mini`四种尺寸，默认为`normal` :::demo 按钮尺寸 ```html - - - large - - - normal - - - small - - - mini - - +large +normal +small +mini +``` +::: + +#### 禁用状态 + +通过`disabled`属性来禁用按钮，此时按钮不可点击 + +:::demo 禁用状态 +```html +diabled +``` +::: + +#### 加载状态 + +:::demo 加载状态 +```html + ``` ::: #### 自定义按钮标签 -按钮默认是`button`标签，可以使用`tag`属性修改为一个`a`标签。 +按钮标签默认为`button`，可以使用`tag`属性来修改按钮标签 :::demo 自定义按钮标签 ```html - - - a标签按钮 - - -``` -::: - -#### loading按钮 - -`loading`状态的按钮。 - -:::demo loading按钮 -```html - - - loading - - - - - + + a标签按钮 + ``` ::: #### 页面底部操作按钮 -一般用于`fixed`在底部的区域或是`popup`弹层的底部，一般只使用`primary`和`normal`两种状态。 - :::demo 页面底部操作按钮 ```html - - - 立即购买 - - +立即购买 + 加入购物车 @@ -136,10 +99,11 @@ | 参数 | 说明 | 类型 | 默认值 | 可选值 | |-----------|-----------|-----------|-------------|-------------| -| type | 按钮类型 | `string` | `default` | `primary`, `danger` | -| size | 按钮尺寸 | `string` | `normal` | `large`, `small`, `mini` | -| tag | 按钮标签 | `string` | `button` | 任何有意义的`html`标签, 如`a`, `span`等 | -| diabled | 按钮是否禁用 | `boolean` | `false` | | -| block | 按钮是否显示为块级元素 | `boolean` | `false` | | -| bottomAction | 按钮是否显示为底部行动按钮，一般显示在页面底部，有特殊样式 | `boolean` | `false` | | - +| type | 按钮类型 | `String` | `default` | `primary` `danger` | +| size | 按钮尺寸 | `String` | `normal` | `large` `small` `mini` | +| tag | 按钮标签 | `String` | `button` | 任意`HTML`标签 | +| nativeType | 按钮类型（原生） | `String` | `''` | | +| diabled | 是否禁用 | `Boolean` | `false` | | +| loading | 是否显示为加载状态 | `Boolean` | `false` | | +| block | 是否为块级元素 | `Boolean` | `false` | | +| bottomAction | 是否为底部行动按钮 | `Boolean` | `false` | | diff --git a/package.json b/package.json index 5157ab4b4..28c6c2f33 100644 --- a/package.json +++ b/package.json @@ -114,6 +114,6 @@ "webpack": "^3.5.5", "webpack-dev-server": "^2.7.1", "webpack-merge": "^4.1.0", - "zan-doc": "0.1.12" + "zan-doc": "0.1.13" } } diff --git a/packages/button/src/button.js b/packages/button/src/button.js index 9c213c2a1..a7bbe476e 100644 --- a/packages/button/src/button.js +++ b/packages/button/src/button.js @@ -1,17 +1,4 @@ -/** - * @module components/button - * @desc 按钮 - * @param {string} [type=default] - 显示类型，接受 default, primary, danger - * @param {boolean} [disabled=false] - 禁用 - * @param {string} [size=normal] - 尺寸，接受 normal, mini, small, large - * @param {string} [native-type] - 原生 type 属性 - * @param {slot} - 显示文本 - * - * @example - * 按钮 - */ - -import VanLoading from '../../loading'; +import Loading from '../../loading'; const ALLOWED_SIZE = ['mini', 'small', 'normal', 'large']; const ALLOWED_TYPE = ['default', 'danger', 'primary']; @@ -20,73 +7,69 @@ export default { name: 'van-button', components: { - 'van-loading': VanLoading + [Loading.name]: Loading }, props: { - disabled: Boolean, - loading: Boolean, block: Boolean, + loading: Boolean, + disabled: Boolean, + nativeType: String, bottomAction: Boolean, tag: { type: String, default: 'button' }, - nativeType: String, type: { type: String, default: 'default', - validator(value) { - return ALLOWED_TYPE.indexOf(value) > -1; - } + validator: value => ALLOWED_TYPE.indexOf(value) > -1 }, size: { type: String, default: 'normal', - validator(value) { - return ALLOWED_SIZE.indexOf(value) > -1; - } + validator: value => ALLOWED_SIZE.indexOf(value) > -1 } }, methods: { - handleClick(e) { - if (this.loading || this.disabled) return; - this.$emit('click', e); + onClick(event) { + if (!this.loading && !this.disabled) { + this.$emit('click', event); + } } }, render(h) { - const { type, nativeType, size, disabled, loading, block, bottomAction } = this; - const Tag = this.tag; + const { type, loading, disabled, tag: Tag } = this; return ( - { - loading - ? - - : null - } - {this.$slots.default} + {loading + ? + : null} + + {this.$slots.default} + ); } diff --git a/yarn.lock b/yarn.lock index d7b1c5855..69ddb1ec9 100644 --- a/yarn.lock +++ b/yarn.lock @@ -921,13 +921,6 @@ babel-runtime@^6.18.0, babel-runtime@^6.22.0: core-js "^2.4.0" regenerator-runtime "^0.10.0" -babel-runtime@^6.26.0: - version "6.26.0" - resolved "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.26.0.tgz#965c7058668e82b55d7bfe04ff2337bc8b5647fe" - dependencies: - core-js "^2.4.0" - regenerator-runtime "^0.11.0" - babel-template@^6.24.1, babel-template@^6.25.0: version "6.25.0" resolved "https://registry.yarnpkg.com/babel-template/-/babel-template-6.25.0.tgz#665241166b7c2aa4c619d71e192969552b10c071" @@ -7702,9 +7695,9 @@ yeast@0.1.2: version "0.1.2" resolved "https://registry.yarnpkg.com/yeast/-/yeast-0.1.2.tgz#008e06d8094320c372dbc2f8ed76a0ca6c8ac419" -zan-doc@0.1.12: - version "0.1.12" - resolved "https://registry.yarnpkg.com/zan-doc/-/zan-doc-0.1.12.tgz#65b3d43c6a18dbb939c5ea28d6a4630697de6824" +zan-doc@0.1.13: + version "0.1.13" + resolved "https://registry.yarnpkg.com/zan-doc/-/zan-doc-0.1.13.tgz#df532b538ba613a4fe39e436ec553de3e7c25918" dependencies: cheerio "0.22.0" decamelize "^1.2.0" From c3c24d0b71e916093cad953f1ab159602e879bfd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= Date: Mon, 21 Aug 2017 10:55:54 +0800 Subject: [PATCH 37/55] Icon: optimzie doc --- docs/examples-docs/icon.md | 417 ++++++++++--------------------------- 1 file changed, 112 insertions(+), 305 deletions(-) diff --git a/docs/examples-docs/icon.md b/docs/examples-docs/icon.md index 29c333e71..2dfdb991c 100644 --- a/docs/examples-docs/icon.md +++ b/docs/examples-docs/icon.md @@ -1,5 +1,7 @@ + + ## Icon 图标 +### 使用指南 +``` javascript +import { Icon } from 'vant'; + +Vue.component(Icon.name, Icon); +``` + ### 代码演示 #### 基础用法 @@ -27,318 +61,91 @@ :::demo 基础用法 ```html - + ``` ::: #### 所有Icons -以下目前有的所有图标及其名称： +以下为目前所有的图标： :::demo 所有Icon ```html - - - - qr-invalid - - - - qr - - - - exchange - - - - close - - - - location - - - - upgrade - - - - check - - - - checked - - - - like-o - - - - like - - - - chat - - - - shop - - - - photograph - - - - add - - - - add2 - - - - photo - - - - edit - - - - passed - - - - cart - - - - arrow - - - - gift - - - - search - - - - clear - - - - success - - - - fail - - - - contact - - - - wechat - - - - alipay - - - - password-view - - - - wap-nav - - - - password-not-view - - - - wap-home - - - - ecard-pay - - - - balance-pay - - - - peer-pay - - - - credit-pay - - - - debit-pay - - - - other-pay - - - - cart - - - - browsing-history - - - - goods-collect - - - - shop-collect - - - - receive-gift - - - - send-gift - - - - setting - - - - points - - - - coupon - - - - free-postage - - - - discount - - - - birthday-privilege - - - - member-day-privilege - - - - balance-details - - - - cash-back-record - - - - points-mall - - - - exchange-record - - - - pending-payment - - - - pending-orders - - - - pending-deliver - - - - logistics - - - - pending-evaluate - - - - cash-on-deliver - - - - gift-card-pay - - - - underway - - - - point-gift - - - - after-sale - - - - edit-data - - - - question - - - - delete - - - - records - - - - description - - - - card - - - - gift-card - - - - coupon - - - - clock - - - - gold-coin - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ``` ::: From cbe5ad30cf285880f683bb1228ddda5f48cc1d72 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= Date: Mon, 21 Aug 2017 10:56:09 +0800 Subject: [PATCH 38/55] upgrade dependencies --- package.json | 4 +- yarn.lock | 261 +++++++++++++++++++++++++++++++++++++++++++++++---- 2 files changed, 246 insertions(+), 19 deletions(-) diff --git a/package.json b/package.json index a290531bc..58e58f68f 100644 --- a/package.json +++ b/package.json @@ -52,7 +52,7 @@ "babel-cli": "^6.26.0", "babel-core": "^6.26.0", "babel-helper-vue-jsx-merge-props": "^2.0.2", - "babel-loader": "^7.1.1", + "babel-loader": "^7.1.2", "babel-plugin-module-resolver": "^2.7.1", "babel-plugin-syntax-jsx": "^6.18.0", "babel-plugin-transform-object-rest-spread": "^6.26.0", @@ -92,7 +92,7 @@ "markdown-it": "^8.3.2", "markdown-it-container": "^2.0.0", "mocha": "^3.4.2", - "optimize-css-assets-webpack-plugin": "^3.0.0", + "optimize-css-assets-webpack-plugin": "^3.1.1", "postcss": "^6.0.8", "postcss-easy-import": "^2.1.0", "postcss-loader": "^2.0.6", diff --git a/yarn.lock b/yarn.lock index 69ddb1ec9..f26a86049 100644 --- a/yarn.lock +++ b/yarn.lock @@ -107,6 +107,10 @@ ansi-html@0.0.7: version "0.0.7" resolved "https://registry.yarnpkg.com/ansi-html/-/ansi-html-0.0.7.tgz#813584021962a9e9e6fd039f940d12f56ca7859e" +ansi-regex@^0.2.0, ansi-regex@^0.2.1: + version "0.2.1" + resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-0.2.1.tgz#0d8e946967a3d8143f93e24e298525fc1b2235f9" + ansi-regex@^2.0.0: version "2.1.1" resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df" @@ -115,6 +119,10 @@ ansi-regex@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998" +ansi-styles@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-1.1.0.tgz#eaecbf66cd706882760b2f4691582b8f55d7a7de" + ansi-styles@^2.2.1: version "2.2.1" resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe" @@ -576,9 +584,9 @@ babel-helpers@^6.24.1: babel-runtime "^6.22.0" babel-template "^6.24.1" -babel-loader@^7.1.1: - version "7.1.1" - resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-7.1.1.tgz#b87134c8b12e3e4c2a94e0546085bc680a2b8488" +babel-loader@^7.1.2: + version "7.1.2" + resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-7.1.2.tgz#f6cbe122710f1aa2af4d881c6d5b54358ca24126" dependencies: find-cache-dir "^1.0.0" loader-utils "^1.0.2" @@ -1322,6 +1330,16 @@ chai@^4.1.1: pathval "^1.0.0" type-detect "^4.0.0" +chalk@^0.5.0: + version "0.5.1" + resolved "https://registry.yarnpkg.com/chalk/-/chalk-0.5.1.tgz#663b3a648b68b55d04690d49167aa837858f2174" + dependencies: + ansi-styles "^1.1.0" + escape-string-regexp "^1.0.0" + has-ansi "^0.1.0" + strip-ansi "^0.3.0" + supports-color "^0.2.0" + chalk@^1.0.0, chalk@^1.1.0, chalk@^1.1.1, chalk@^1.1.3: version "1.1.3" resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98" @@ -1440,7 +1458,7 @@ clap@^1.0.9: dependencies: chalk "^1.1.3" -clean-css@3.4.x: +clean-css@3.4.x, clean-css@^3.1.9: version "3.4.28" resolved "https://registry.yarnpkg.com/clean-css/-/clean-css-3.4.28.tgz#bf1945e82fc808f55695e6ddeaec01400efd03ff" dependencies: @@ -1479,7 +1497,7 @@ cliui@^3.2.0: strip-ansi "^3.0.1" wrap-ansi "^2.0.0" -clone-stats@^0.0.1: +clone-stats@^0.0.1, clone-stats@~0.0.1: version "0.0.1" resolved "https://registry.yarnpkg.com/clone-stats/-/clone-stats-0.0.1.tgz#b88f94a82cf38b8791d58046ea4029ad88ca99d1" @@ -1922,7 +1940,7 @@ date-now@^0.1.4: version "0.1.4" resolved "https://registry.yarnpkg.com/date-now/-/date-now-0.1.4.tgz#eaf439fd4d4848ad74e5cc7dbef200672b9e345b" -dateformat@^1.0.6: +dateformat@^1.0.6, dateformat@^1.0.7-1.2.3: version "1.0.12" resolved "https://registry.yarnpkg.com/dateformat/-/dateformat-1.0.12.tgz#9f124b67594c937ff706932e4a642cca8dbbfee9" dependencies: @@ -2422,7 +2440,7 @@ escape-html@~1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988" -escape-string-regexp@1.0.5, escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5: +escape-string-regexp@1.0.5, escape-string-regexp@^1.0.0, escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5: version "1.0.5" resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4" @@ -2854,6 +2872,10 @@ filename-regex@^2.0.0: version "2.0.1" resolved "https://registry.yarnpkg.com/filename-regex/-/filename-regex-2.0.1.tgz#c1c4b9bee3e09725ddb106b75c1e301fe2f18b26" +filesize@~2.0.0: + version "2.0.4" + resolved "https://registry.yarnpkg.com/filesize/-/filesize-2.0.4.tgz#7805941c60fcdfe63f46d7ea358c59ade11c1325" + fill-range@^2.1.0: version "2.2.3" resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-2.2.3.tgz#50b77dfd7e469bc7492470963699fe7a8485a723" @@ -3267,7 +3289,7 @@ glogg@^1.0.0: dependencies: sparkles "^1.0.0" -graceful-fs@4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.4, graceful-fs@^4.1.6, graceful-fs@^4.1.9: +graceful-fs@4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.4, graceful-fs@^4.1.6, graceful-fs@^4.1.9, graceful-fs@~4.1.4: version "4.1.11" resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.11.tgz#0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658" @@ -3281,6 +3303,10 @@ graceful-fs@~1.2.0: version "1.2.3" resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-1.2.3.tgz#15a4806a57547cb2d2dbf27f42e89a8c3451b364" +graceful-fs@~2.0.0: + version "2.0.3" + resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-2.0.3.tgz#7cd2cdb228a4a3f36e95efa6cc142de7d1a136d0" + "graceful-readlink@>= 1.0.0": version "1.0.1" resolved "https://registry.yarnpkg.com/graceful-readlink/-/graceful-readlink-1.0.1.tgz#4cafad76bc62f02fa039b2f94e9a3dd3a391a725" @@ -3289,6 +3315,33 @@ growl@1.9.2: version "1.9.2" resolved "https://registry.yarnpkg.com/growl/-/growl-1.9.2.tgz#0ea7743715db8d8de2c5ede1775e1b45ac85c02f" +gulp-cssmin@^0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/gulp-cssmin/-/gulp-cssmin-0.2.0.tgz#87ab3c69dd39b20d5d96355c6504ad6a447b1e72" + dependencies: + clean-css "^3.1.9" + filesize "~2.0.0" + graceful-fs "~4.1.4" + gulp-rename "~1.1.0" + gulp-util "~2.2.0" + map-stream "0.0.4" + temp-write "~0.1.0" + +gulp-postcss@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/gulp-postcss/-/gulp-postcss-7.0.0.tgz#cfb62a19fa947f8be67ce9ecae89ceb959f0cf93" + dependencies: + gulp-util "^3.0.8" + postcss "^6.0.0" + postcss-load-config "^1.2.0" + vinyl-sourcemaps-apply "^0.2.1" + +gulp-rename@~1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/gulp-rename/-/gulp-rename-1.1.0.tgz#93090aaaf4d386c07f20538a6888f15efba727a1" + dependencies: + map-stream ">=0.0.4" + gulp-util@^3.0.0, gulp-util@^3.0.8: version "3.0.8" resolved "https://registry.yarnpkg.com/gulp-util/-/gulp-util-3.0.8.tgz#0054e1e744502e27c04c187c3ecc505dd54bbb4f" @@ -3312,6 +3365,19 @@ gulp-util@^3.0.0, gulp-util@^3.0.8: through2 "^2.0.0" vinyl "^0.5.0" +gulp-util@~2.2.0: + version "2.2.20" + resolved "https://registry.yarnpkg.com/gulp-util/-/gulp-util-2.2.20.tgz#d7146e5728910bd8f047a6b0b1e549bc22dbd64c" + dependencies: + chalk "^0.5.0" + dateformat "^1.0.7-1.2.3" + lodash._reinterpolate "^2.4.1" + lodash.template "^2.4.1" + minimist "^0.2.0" + multipipe "^0.1.0" + through2 "^0.5.0" + vinyl "^0.2.1" + gulp@^3.9.1: version "3.9.1" resolved "https://registry.yarnpkg.com/gulp/-/gulp-3.9.1.tgz#571ce45928dd40af6514fc4011866016c13845b4" @@ -3361,6 +3427,12 @@ har-validator@~4.2.1: ajv "^4.9.1" har-schema "^1.0.5" +has-ansi@^0.1.0: + version "0.1.0" + resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-0.1.0.tgz#84f265aae8c0e6a88a12d7022894b7568894c62e" + dependencies: + ansi-regex "^0.2.0" + has-ansi@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-2.0.0.tgz#34f5049ce1ecdf2b0649af3ef24e45ed35416d91" @@ -4254,9 +4326,9 @@ klaw@^1.0.0: optionalDependencies: graceful-fs "^4.1.9" -last-call-webpack-plugin@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/last-call-webpack-plugin/-/last-call-webpack-plugin-2.0.1.tgz#4fd10d3afe79d2fad45dc873928980cbe799f1a7" +last-call-webpack-plugin@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/last-call-webpack-plugin/-/last-call-webpack-plugin-2.1.1.tgz#bd7af41186b80e6cc3968eee5d65b250eaf791f1" dependencies: lodash "^4.17.4" webpack-sources "^1.0.1" @@ -4374,14 +4446,36 @@ lodash._basevalues@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/lodash._basevalues/-/lodash._basevalues-3.0.0.tgz#5b775762802bde3d3297503e26300820fdf661b7" +lodash._escapehtmlchar@~2.4.1: + version "2.4.1" + resolved "https://registry.yarnpkg.com/lodash._escapehtmlchar/-/lodash._escapehtmlchar-2.4.1.tgz#df67c3bb6b7e8e1e831ab48bfa0795b92afe899d" + dependencies: + lodash._htmlescapes "~2.4.1" + +lodash._escapestringchar@~2.4.1: + version "2.4.1" + resolved "https://registry.yarnpkg.com/lodash._escapestringchar/-/lodash._escapestringchar-2.4.1.tgz#ecfe22618a2ade50bfeea43937e51df66f0edb72" + lodash._getnative@^3.0.0: version "3.9.1" resolved "https://registry.yarnpkg.com/lodash._getnative/-/lodash._getnative-3.9.1.tgz#570bc7dede46d61cdcde687d65d3eecbaa3aaff5" +lodash._htmlescapes@~2.4.1: + version "2.4.1" + resolved "https://registry.yarnpkg.com/lodash._htmlescapes/-/lodash._htmlescapes-2.4.1.tgz#32d14bf0844b6de6f8b62a051b4f67c228b624cb" + lodash._isiterateecall@^3.0.0: version "3.0.9" resolved "https://registry.yarnpkg.com/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz#5203ad7ba425fae842460e696db9cf3e6aac057c" +lodash._isnative@~2.4.1: + version "2.4.1" + resolved "https://registry.yarnpkg.com/lodash._isnative/-/lodash._isnative-2.4.1.tgz#3ea6404b784a7be836c7b57580e1cdf79b14832c" + +lodash._objecttypes@~2.4.1: + version "2.4.1" + resolved "https://registry.yarnpkg.com/lodash._objecttypes/-/lodash._objecttypes-2.4.1.tgz#7c0b7f69d98a1f76529f890b0cdb1b4dfec11c11" + lodash._reescape@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/lodash._reescape/-/lodash._reescape-3.0.0.tgz#2b1d6f5dfe07c8a355753e5f27fac7f1cde1616a" @@ -4390,14 +4484,31 @@ lodash._reevaluate@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/lodash._reevaluate/-/lodash._reevaluate-3.0.0.tgz#58bc74c40664953ae0b124d806996daca431e2ed" +lodash._reinterpolate@^2.4.1, lodash._reinterpolate@~2.4.1: + version "2.4.1" + resolved "https://registry.yarnpkg.com/lodash._reinterpolate/-/lodash._reinterpolate-2.4.1.tgz#4f1227aa5a8711fc632f5b07a1f4607aab8b3222" + lodash._reinterpolate@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz#0ccf2d89166af03b3663c796538b75ac6e114d9d" +lodash._reunescapedhtml@~2.4.1: + version "2.4.1" + resolved "https://registry.yarnpkg.com/lodash._reunescapedhtml/-/lodash._reunescapedhtml-2.4.1.tgz#747c4fc40103eb3bb8a0976e571f7a2659e93ba7" + dependencies: + lodash._htmlescapes "~2.4.1" + lodash.keys "~2.4.1" + lodash._root@^3.0.0: version "3.0.1" resolved "https://registry.yarnpkg.com/lodash._root/-/lodash._root-3.0.1.tgz#fba1c4524c19ee9a5f8136b4609f017cf4ded692" +lodash._shimkeys@~2.4.1: + version "2.4.1" + resolved "https://registry.yarnpkg.com/lodash._shimkeys/-/lodash._shimkeys-2.4.1.tgz#6e9cc9666ff081f0b5a6c978b83e242e6949d203" + dependencies: + lodash._objecttypes "~2.4.1" + lodash.assignin@^4.0.9: version "4.2.0" resolved "https://registry.yarnpkg.com/lodash.assignin/-/lodash.assignin-4.2.0.tgz#ba8df5fb841eb0a3e8044232b0e263a8dc6a28a2" @@ -4426,12 +4537,27 @@ lodash.defaults@^4.0.1: version "4.2.0" resolved "https://registry.yarnpkg.com/lodash.defaults/-/lodash.defaults-4.2.0.tgz#d09178716ffea4dde9e5fb7b37f6f0802274580c" +lodash.defaults@~2.4.1: + version "2.4.1" + resolved "https://registry.yarnpkg.com/lodash.defaults/-/lodash.defaults-2.4.1.tgz#a7e8885f05e68851144b6e12a8f3678026bc4c54" + dependencies: + lodash._objecttypes "~2.4.1" + lodash.keys "~2.4.1" + lodash.escape@^3.0.0: version "3.2.0" resolved "https://registry.yarnpkg.com/lodash.escape/-/lodash.escape-3.2.0.tgz#995ee0dc18c1b48cc92effae71a10aab5b487698" dependencies: lodash._root "^3.0.0" +lodash.escape@~2.4.1: + version "2.4.1" + resolved "https://registry.yarnpkg.com/lodash.escape/-/lodash.escape-2.4.1.tgz#2ce12c5e084db0a57dda5e5d1eeeb9f5d175a3b4" + dependencies: + lodash._escapehtmlchar "~2.4.1" + lodash._reunescapedhtml "~2.4.1" + lodash.keys "~2.4.1" + lodash.filter@^4.4.0: version "4.6.0" resolved "https://registry.yarnpkg.com/lodash.filter/-/lodash.filter-4.6.0.tgz#668b1d4981603ae1cc5a6fa760143e480b4c4ace" @@ -4452,6 +4578,12 @@ lodash.isarray@^3.0.0: version "3.0.4" resolved "https://registry.yarnpkg.com/lodash.isarray/-/lodash.isarray-3.0.4.tgz#79e4eb88c36a8122af86f844aa9bcd851b5fbb55" +lodash.isobject@~2.4.1: + version "2.4.1" + resolved "https://registry.yarnpkg.com/lodash.isobject/-/lodash.isobject-2.4.1.tgz#5a2e47fe69953f1ee631a7eba1fe64d2d06558f5" + dependencies: + lodash._objecttypes "~2.4.1" + lodash.isplainobject@^4.0.4: version "4.0.6" resolved "https://registry.yarnpkg.com/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz#7c526a52d89b45c45cc690b88163be0497f550cb" @@ -4468,6 +4600,14 @@ lodash.keys@^3.0.0: lodash.isarguments "^3.0.0" lodash.isarray "^3.0.0" +lodash.keys@~2.4.1: + version "2.4.1" + resolved "https://registry.yarnpkg.com/lodash.keys/-/lodash.keys-2.4.1.tgz#48dea46df8ff7632b10d706b8acb26591e2b3727" + dependencies: + lodash._isnative "~2.4.1" + lodash._shimkeys "~2.4.1" + lodash.isobject "~2.4.1" + lodash.map@^4.4.0: version "4.6.0" resolved "https://registry.yarnpkg.com/lodash.map/-/lodash.map-4.6.0.tgz#771ec7839e3473d9c4cde28b19394c3562f4f6d3" @@ -4504,6 +4644,18 @@ lodash.some@^4.4.0: version "4.6.0" resolved "https://registry.yarnpkg.com/lodash.some/-/lodash.some-4.6.0.tgz#1bb9f314ef6b8baded13b549169b2a945eb68e4d" +lodash.template@^2.4.1: + version "2.4.1" + resolved "https://registry.yarnpkg.com/lodash.template/-/lodash.template-2.4.1.tgz#9e611007edf629129a974ab3c48b817b3e1cf20d" + dependencies: + lodash._escapestringchar "~2.4.1" + lodash._reinterpolate "~2.4.1" + lodash.defaults "~2.4.1" + lodash.escape "~2.4.1" + lodash.keys "~2.4.1" + lodash.templatesettings "~2.4.1" + lodash.values "~2.4.1" + lodash.template@^3.0.0: version "3.6.2" resolved "https://registry.yarnpkg.com/lodash.template/-/lodash.template-3.6.2.tgz#f8cdecc6169a255be9098ae8b0c53d378931d14f" @@ -4525,10 +4677,23 @@ lodash.templatesettings@^3.0.0: lodash._reinterpolate "^3.0.0" lodash.escape "^3.0.0" +lodash.templatesettings@~2.4.1: + version "2.4.1" + resolved "https://registry.yarnpkg.com/lodash.templatesettings/-/lodash.templatesettings-2.4.1.tgz#ea76c75d11eb86d4dbe89a83893bb861929ac699" + dependencies: + lodash._reinterpolate "~2.4.1" + lodash.escape "~2.4.1" + lodash.uniq@^4.5.0: version "4.5.0" resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773" +lodash.values@~2.4.1: + version "2.4.1" + resolved "https://registry.yarnpkg.com/lodash.values/-/lodash.values-2.4.1.tgz#abf514436b3cb705001627978cbcf30b1280eea4" + dependencies: + lodash.keys "~2.4.1" + lodash@^3.8.0: version "3.10.1" resolved "https://registry.yarnpkg.com/lodash/-/lodash-3.10.1.tgz#5bf45e8e49ba4189e17d482789dfd15bd140b7b6" @@ -4622,6 +4787,14 @@ map-obj@^1.0.0, map-obj@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-1.0.1.tgz#d933ceb9205d82bdcf4886f6742bdc2b4dea146d" +map-stream@0.0.4: + version "0.0.4" + resolved "https://registry.yarnpkg.com/map-stream/-/map-stream-0.0.4.tgz#5ec6de90213ef6c7b2eb9367e9ade8da4efdb68b" + +map-stream@>=0.0.4: + version "0.1.0" + resolved "https://registry.yarnpkg.com/map-stream/-/map-stream-0.1.0.tgz#e56aa94c4c8055a16404a0674b78f215f7c8e194" + markdown-it-container@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/markdown-it-container/-/markdown-it-container-2.0.0.tgz#0019b43fd02eefece2f1960a2895fba81a404695" @@ -4776,6 +4949,10 @@ minimist@1.2.0, minimist@^1.1.0, minimist@^1.1.3, minimist@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284" +minimist@^0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.2.0.tgz#4dffe525dae2b864c66c2e23c6271d7afdecefce" + minimist@~0.0.1: version "0.0.10" resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.10.tgz#de3f98543dbf96082be48ad1a0c7cda836301dcf" @@ -4831,7 +5008,7 @@ multicast-dns@^6.0.1: dns-packet "^1.0.1" thunky "^0.1.0" -multipipe@^0.1.2: +multipipe@^0.1.0, multipipe@^0.1.2: version "0.1.2" resolved "https://registry.yarnpkg.com/multipipe/-/multipipe-0.1.2.tgz#2a8f2ddf70eed564dff2d57f1e1a137d9f05078b" dependencies: @@ -5106,12 +5283,12 @@ optimist@^0.6.1: minimist "~0.0.1" wordwrap "~0.0.2" -optimize-css-assets-webpack-plugin@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/optimize-css-assets-webpack-plugin/-/optimize-css-assets-webpack-plugin-3.0.0.tgz#03d4ce02e91ba3f2a7905507dc6be5f90b4158fd" +optimize-css-assets-webpack-plugin@^3.1.1: + version "3.1.1" + resolved "https://registry.yarnpkg.com/optimize-css-assets-webpack-plugin/-/optimize-css-assets-webpack-plugin-3.1.1.tgz#b86f255a762d9143e3db41a64a136a6b76e8c8a7" dependencies: cssnano "^3.4.0" - last-call-webpack-plugin "^2.0.1" + last-call-webpack-plugin "^2.1.1" optionator@^0.8.1, optionator@^0.8.2: version "0.8.2" @@ -6083,7 +6260,7 @@ read-pkg@^2.0.0: normalize-package-data "^2.3.2" path-type "^2.0.0" -readable-stream@1.0, "readable-stream@>=1.0.33-1 <1.1.0-0", readable-stream@~1.0.2: +readable-stream@1.0, "readable-stream@>=1.0.33-1 <1.1.0-0", readable-stream@~1.0.17, readable-stream@~1.0.2: version "1.0.34" resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.0.34.tgz#125820e34bc842d2f2aaafafe4c2916ee32c157c" dependencies: @@ -6796,6 +6973,12 @@ stringstream@~0.0.4: version "0.0.5" resolved "https://registry.yarnpkg.com/stringstream/-/stringstream-0.0.5.tgz#4e484cd4de5a0bbbee18e46307710a8a81621878" +strip-ansi@^0.3.0: + version "0.3.0" + resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-0.3.0.tgz#25f48ea22ca79187f3174a4db8759347bb126220" + dependencies: + ansi-regex "^0.2.1" + strip-ansi@^3.0.0, strip-ansi@^3.0.1: version "3.0.1" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf" @@ -6862,6 +7045,10 @@ supports-color@3.1.2: dependencies: has-flag "^1.0.0" +supports-color@^0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-0.2.0.tgz#d92de2694eb3f67323973d7ae3d8b55b4c22190a" + supports-color@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7" @@ -6941,6 +7128,19 @@ tcomb@^2.5.1: version "2.7.0" resolved "https://registry.yarnpkg.com/tcomb/-/tcomb-2.7.0.tgz#10d62958041669a5d53567b9a4ee8cde22b1c2b0" +temp-write@~0.1.0: + version "0.1.1" + resolved "https://registry.yarnpkg.com/temp-write/-/temp-write-0.1.1.tgz#0b6467838dd77fbf7f62a0c93da879732ffda932" + dependencies: + graceful-fs "~2.0.0" + tempfile "~0.1.2" + +tempfile@~0.1.2: + version "0.1.3" + resolved "https://registry.yarnpkg.com/tempfile/-/tempfile-0.1.3.tgz#7d6b710047339d39f847327a056dadf183103010" + dependencies: + uuid "~1.4.0" + text-encoding@0.6.4: version "0.6.4" resolved "https://registry.yarnpkg.com/text-encoding/-/text-encoding-0.6.4.tgz#e399a982257a276dae428bb92845cb71bdc26d19" @@ -6953,6 +7153,13 @@ throttleit@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/throttleit/-/throttleit-1.0.0.tgz#9e785836daf46743145a5984b6268d828528ac6c" +through2@^0.5.0: + version "0.5.1" + resolved "https://registry.yarnpkg.com/through2/-/through2-0.5.1.tgz#dfdd012eb9c700e2323fd334f38ac622ab372da7" + dependencies: + readable-stream "~1.0.17" + xtend "~3.0.0" + through2@^0.6.1: version "0.6.5" resolved "https://registry.yarnpkg.com/through2/-/through2-0.6.5.tgz#41ab9c67b29d57209071410e1d7a7a968cd3ad48" @@ -7269,6 +7476,10 @@ uuid@^3.0.0: version "3.1.0" resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.1.0.tgz#3dd3d3e790abc24d7b0d3a034ffababe28ebbc04" +uuid@~1.4.0: + version "1.4.2" + resolved "https://registry.yarnpkg.com/uuid/-/uuid-1.4.2.tgz#453019f686966a6df83cdc5244e7c990ecc332fc" + v8flags@^2.0.2, v8flags@^2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/v8flags/-/v8flags-2.1.1.tgz#aab1a1fa30d45f88dd321148875ac02c0b55e5b4" @@ -7311,6 +7522,18 @@ vinyl-fs@^0.3.0: through2 "^0.6.1" vinyl "^0.4.0" +vinyl-sourcemaps-apply@^0.2.1: + version "0.2.1" + resolved "https://registry.yarnpkg.com/vinyl-sourcemaps-apply/-/vinyl-sourcemaps-apply-0.2.1.tgz#ab6549d61d172c2b1b87be5c508d239c8ef87705" + dependencies: + source-map "^0.5.1" + +vinyl@^0.2.1: + version "0.2.3" + resolved "https://registry.yarnpkg.com/vinyl/-/vinyl-0.2.3.tgz#bca938209582ec5a49ad538a00fa1f125e513252" + dependencies: + clone-stats "~0.0.1" + vinyl@^0.4.0: version "0.4.6" resolved "https://registry.yarnpkg.com/vinyl/-/vinyl-0.4.6.tgz#2f356c87a550a255461f36bbeb2a5ba8bf784847" @@ -7620,6 +7843,10 @@ xmlhttprequest-ssl@1.5.3: version "4.0.1" resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.1.tgz#a5c6d532be656e23db820efb943a1f04998d63af" +xtend@~3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/xtend/-/xtend-3.0.0.tgz#5cce7407baf642cba7becda568111c493f59665a" + y18n@^3.2.1: version "3.2.1" resolved "https://registry.yarnpkg.com/y18n/-/y18n-3.2.1.tgz#6d15fba884c08679c0d77e88e7759e811e07fa41" From fa9b879338566c7a2595c1c7c8e4a2d5d35d2f96 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= Date: Mon, 21 Aug 2017 10:56:27 +0800 Subject: [PATCH 39/55] Doc: add usage guide --- docs/examples-docs/actionsheet.md | 7 +++++++ docs/examples-docs/badge.md | 7 +++++++ docs/examples-docs/button.md | 7 +++++++ docs/examples-docs/card.md | 7 +++++++ docs/examples-docs/cell-swipe.md | 22 ++++++++++++---------- docs/examples-docs/cell.md | 8 ++++++++ docs/examples-docs/checkbox.md | 7 +++++++ docs/examples-docs/datetime-picker.md | 7 +++++++ docs/examples-docs/field.md | 7 +++++++ docs/examples-docs/layout.md | 9 ++++++++- docs/examples-docs/loading.md | 7 +++++++ docs/examples-docs/panel.md | 7 +++++++ docs/examples-docs/picker.md | 7 +++++++ docs/examples-docs/popup.md | 7 +++++++ docs/examples-docs/progress.md | 7 +++++++ docs/examples-docs/quantity.md | 7 +++++++ docs/examples-docs/radio.md | 7 +++++++ docs/examples-docs/search.md | 7 +++++++ docs/examples-docs/steps.md | 8 ++++++++ docs/examples-docs/swipe.md | 7 +++++++ docs/examples-docs/switch.md | 7 +++++++ docs/examples-docs/tab.md | 8 ++++++++ docs/examples-docs/tag.md | 7 +++++++ docs/examples-docs/uploader.md | 7 +++++++ 24 files changed, 177 insertions(+), 11 deletions(-) diff --git a/docs/examples-docs/actionsheet.md b/docs/examples-docs/actionsheet.md index a3e353a49..09cd0fef6 100644 --- a/docs/examples-docs/actionsheet.md +++ b/docs/examples-docs/actionsheet.md @@ -55,6 +55,13 @@ export default { ## Actionsheet 行动按钮 +### 使用指南 +``` javascript +import { Actionsheet } from 'vant'; + +Vue.component(Actionsheet.name, Actionsheet); +``` + ### 代码演示 #### 基础用法 diff --git a/docs/examples-docs/badge.md b/docs/examples-docs/badge.md index d8cec30bc..b0f27058c 100644 --- a/docs/examples-docs/badge.md +++ b/docs/examples-docs/badge.md @@ -28,6 +28,13 @@ ## Badge 徽章 +### 使用指南 +``` javascript +import { Badge } from 'vant'; + +Vue.component(Badge.name, Badge); +``` + ### 代码演示 #### 基础用法 diff --git a/docs/examples-docs/button.md b/docs/examples-docs/button.md index 2f57ec21f..7f110c895 100644 --- a/docs/examples-docs/button.md +++ b/docs/examples-docs/button.md @@ -21,6 +21,13 @@ ## Button 按钮 +### 使用指南 +``` javascript +import { Button } from 'vant'; + +Vue.component(Button.name, Button); +``` + ### 代码演示 #### 按钮类型 diff --git a/docs/examples-docs/card.md b/docs/examples-docs/card.md index 79d1704db..993c39f6d 100644 --- a/docs/examples-docs/card.md +++ b/docs/examples-docs/card.md @@ -1,5 +1,12 @@ ## Card 图文组件 +### 使用指南 +``` javascript +import { Card } from 'vant'; + +Vue.component(Card.name, Card); +``` + ### 代码演示 #### 基础用法 diff --git a/docs/examples-docs/cell-swipe.md b/docs/examples-docs/cell-swipe.md index 4be8e7d11..45225aabd 100644 --- a/docs/examples-docs/cell-swipe.md +++ b/docs/examples-docs/cell-swipe.md @@ -22,6 +22,13 @@ ## CellSwipe 滑动单元格 +### 使用指南 +``` javascript +import { CellSwipe } from 'vant'; + +Vue.component(CellSwipe.name, CellSwipe); +``` + ### 代码演示 #### 基础用法 @@ -32,13 +39,8 @@ - - - 删除 - - - 选择 - + 删除 + 选择 ``` ::: @@ -48,13 +50,13 @@ | 参数 | 说明 | 类型 | 默认值 | 可选值 | |-----------|-----------|-----------|-------------|-------------| -| right-width | 右侧滑动按钮宽度 | `number` | 0 | | -| left-width | 左侧滑动按钮宽度 | `number` | 0 | | +| left-width | 左侧滑动按钮宽度 | `number` | 0 | | +| right-width | 右侧滑动按钮宽度 | `number` | 0 | | ### Slot | name | 描述 | |-----------|-----------| | - | 自定义显示内容 | -| right | 右侧滑动内容 | | left | 左侧滑动内容 | +| right | 右侧滑动内容 | diff --git a/docs/examples-docs/cell.md b/docs/examples-docs/cell.md index f3c9c3ffc..b2566b15a 100644 --- a/docs/examples-docs/cell.md +++ b/docs/examples-docs/cell.md @@ -10,6 +10,14 @@ export default { ## Cell 单元格 +### 使用指南 +``` javascript +import { Cell, CellGroup } from 'vant'; + +Vue.component(Cell.name, Cell); +Vue.component(CellGroup.name, CellGroup); +``` + ### 代码演示 #### 基础用法 diff --git a/docs/examples-docs/checkbox.md b/docs/examples-docs/checkbox.md index eb7770e30..fdfcba1d7 100644 --- a/docs/examples-docs/checkbox.md +++ b/docs/examples-docs/checkbox.md @@ -35,6 +35,13 @@ export default { ## Checkbox 复选框 +### 使用指南 +``` javascript +import { Checkbox } from 'vant'; + +Vue.component(Checkbox.name, Checkbox); +``` + ### 代码演示 #### 基础用法 diff --git a/docs/examples-docs/datetime-picker.md b/docs/examples-docs/datetime-picker.md index f1b8f0dd2..3f122139d 100644 --- a/docs/examples-docs/datetime-picker.md +++ b/docs/examples-docs/datetime-picker.md @@ -27,6 +27,13 @@ export default { ## DatetimePicker 时间选择 +### 使用指南 +``` javascript +import { DatetimePicker } from 'vant'; + +Vue.component(DatetimePicker.name, DatetimePicker); +``` + ### 代码演示 #### 基础用法 diff --git a/docs/examples-docs/field.md b/docs/examples-docs/field.md index f8789446d..97a24a36a 100644 --- a/docs/examples-docs/field.md +++ b/docs/examples-docs/field.md @@ -29,6 +29,13 @@ export default { 表单中`input`或`textarea`的输入框。 +### 使用指南 +``` javascript +import { Field } from 'vant'; + +Vue.component(Field.name, Field); +``` + ### 代码演示 #### 基础用法 diff --git a/docs/examples-docs/layout.md b/docs/examples-docs/layout.md index 846437c7c..8df684302 100644 --- a/docs/examples-docs/layout.md +++ b/docs/examples-docs/layout.md @@ -28,7 +28,14 @@ ## Layout 布局 -主要提供了`van-row`和`van-col`两个组件来进行行列布局。 +提供了`van-row`和`van-col`两个组件来进行行列布局。 + +### 使用指南 +``` javascript +import { Layout } from 'vant'; + +Vue.component(Layout.name, Layout); +``` ### 代码演示 diff --git a/docs/examples-docs/loading.md b/docs/examples-docs/loading.md index 4290c9564..098e7001d 100644 --- a/docs/examples-docs/loading.md +++ b/docs/examples-docs/loading.md @@ -20,6 +20,13 @@ ## Loading 加载 +### 使用指南 +``` javascript +import { Loading } from 'vant'; + +Vue.component(Loading.name, Loading); +``` + ### 代码演示 #### 渐变深色spinner diff --git a/docs/examples-docs/panel.md b/docs/examples-docs/panel.md index bf5c6530a..899cb071e 100644 --- a/docs/examples-docs/panel.md +++ b/docs/examples-docs/panel.md @@ -29,6 +29,13 @@ ## Panel 面板 +### 使用指南 +``` javascript +import { Panel } from 'vant'; + +Vue.component(Panel.name, Panel); +``` + ### 代码演示 #### 基础用法 diff --git a/docs/examples-docs/picker.md b/docs/examples-docs/picker.md index 8dc626267..0d3b7acac 100644 --- a/docs/examples-docs/picker.md +++ b/docs/examples-docs/picker.md @@ -38,6 +38,13 @@ export default { ## Picker 选择器 +### 使用指南 +``` javascript +import { Picker } from 'vant'; + +Vue.component(Picker.name, Picker); +``` + ### 代码演示 #### 基础用法 diff --git a/docs/examples-docs/popup.md b/docs/examples-docs/popup.md index d3d3b32ac..892b9df15 100644 --- a/docs/examples-docs/popup.md +++ b/docs/examples-docs/popup.md @@ -75,6 +75,13 @@ export default { ## Popup 弹出菜单 +### 使用指南 +``` javascript +import { Popup } from 'vant'; + +Vue.component(Popup.name, Popup); +``` + ### 代码演示 #### 基础用法 diff --git a/docs/examples-docs/progress.md b/docs/examples-docs/progress.md index 57c93c052..efb9a2993 100644 --- a/docs/examples-docs/progress.md +++ b/docs/examples-docs/progress.md @@ -10,6 +10,13 @@ ## Progress 进度条 +### 使用指南 +``` javascript +import { Progress } from 'vant'; + +Vue.component(Progress.name, Progress); +``` + ### 代码演示 #### 基础用法 diff --git a/docs/examples-docs/quantity.md b/docs/examples-docs/quantity.md index f00c49264..1361400ff 100644 --- a/docs/examples-docs/quantity.md +++ b/docs/examples-docs/quantity.md @@ -23,6 +23,13 @@ export default { ## Quantity 数量选择 +### 使用指南 +``` javascript +import { Quantity } from 'vant'; + +Vue.component(Quantity.name, Quantity); +``` + ### 代码演示 #### 基础用法 diff --git a/docs/examples-docs/radio.md b/docs/examples-docs/radio.md index 03a1b2522..e580b966b 100644 --- a/docs/examples-docs/radio.md +++ b/docs/examples-docs/radio.md @@ -25,6 +25,13 @@ export default { ## Radio 单选框 +### 使用指南 +``` javascript +import { Radio } from 'vant'; + +Vue.component(Radio.name, Radio); +``` + ### 代码演示 #### 基础用法 diff --git a/docs/examples-docs/search.md b/docs/examples-docs/search.md index acc8f62ff..a46d12c25 100644 --- a/docs/examples-docs/search.md +++ b/docs/examples-docs/search.md @@ -16,6 +16,13 @@ export default { ## Search 搜索 +### 使用指南 +``` javascript +import { Search } from 'vant'; + +Vue.component(Search.name, Search); +``` + ### 代码演示 #### 基础用法 diff --git a/docs/examples-docs/steps.md b/docs/examples-docs/steps.md index 0334e692e..d9d229b4b 100644 --- a/docs/examples-docs/steps.md +++ b/docs/examples-docs/steps.md @@ -28,6 +28,14 @@ export default { ## Steps 步骤条 +### 使用指南 +``` javascript +import { Step, Steps } from 'vant'; + +Vue.component(Step.name, Step); +Vue.component(Steps.name, Steps); +``` + ### 代码演示 #### 基础用法 diff --git a/docs/examples-docs/swipe.md b/docs/examples-docs/swipe.md index 6343fc1b8..2ce3618c8 100644 --- a/docs/examples-docs/swipe.md +++ b/docs/examples-docs/swipe.md @@ -35,6 +35,13 @@ export default { ## Swipe 轮播 +### 使用指南 +``` javascript +import { Swipe } from 'vant'; + +Vue.component(Swipe.name, Swipe); +``` + ### 代码演示 #### 基础用法 diff --git a/docs/examples-docs/switch.md b/docs/examples-docs/switch.md index 40500b81f..cb02b9ec8 100644 --- a/docs/examples-docs/switch.md +++ b/docs/examples-docs/switch.md @@ -43,6 +43,13 @@ export default { ## Switch 开关 +### 使用指南 +``` javascript +import { Switch } from 'vant'; + +Vue.component(Switch.name, Switch); +``` + ### 代码演示 #### 基础用法 diff --git a/docs/examples-docs/tab.md b/docs/examples-docs/tab.md index 5e4af3cbe..4c2d7486e 100644 --- a/docs/examples-docs/tab.md +++ b/docs/examples-docs/tab.md @@ -49,6 +49,14 @@ export default { ## Tab 标签 +### 使用指南 +``` javascript +import { Tab, Tabs } from 'vant'; + +Vue.component(Tab.name, Tab); +Vue.component(Tabs.name, Tabs); +``` + ### 代码演示 #### 基础用法 diff --git a/docs/examples-docs/tag.md b/docs/examples-docs/tag.md index 5dd8f00d2..4d21b6ba6 100644 --- a/docs/examples-docs/tag.md +++ b/docs/examples-docs/tag.md @@ -10,6 +10,13 @@ ## Tag 标记 +### 使用指南 +``` javascript +import { Tag } from 'vant'; + +Vue.component(Tag.name, Tag); +``` + ### 代码演示 #### 基础用法 diff --git a/docs/examples-docs/uploader.md b/docs/examples-docs/uploader.md index 9eeab2469..f09410dc2 100644 --- a/docs/examples-docs/uploader.md +++ b/docs/examples-docs/uploader.md @@ -16,6 +16,13 @@ export default { ## Uploader 图片上传 +### 使用指南 +``` javascript +import { Uploader } from 'vant'; + +Vue.component(Uploader.name, Uploader); +``` + ### 代码演示 #### 基础用法 From 6324fa90887ee04f111d4e23a0247410916ca042 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= Date: Mon, 21 Aug 2017 14:06:24 +0800 Subject: [PATCH 40/55] add progress bar when loading docs --- docs/src/index.js | 4 ---- package.json | 2 +- yarn.lock | 11 ++++++++--- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/docs/src/index.js b/docs/src/index.js index 4997a8d15..43f769edf 100644 --- a/docs/src/index.js +++ b/docs/src/index.js @@ -29,10 +29,6 @@ const router = new VueRouter({ }); router.beforeEach((route, redirect, next) => { - if (route.path !== '/') { - window.scrollTo(0, 0); - } - const pathname = '/zanui/vue/examples'; if (isMobile()) { window.location.replace(pathname); diff --git a/package.json b/package.json index 58e58f68f..1027ec832 100644 --- a/package.json +++ b/package.json @@ -116,6 +116,6 @@ "webpack": "^3.5.5", "webpack-dev-server": "^2.7.1", "webpack-merge": "^4.1.0", - "zan-doc": "0.1.13" + "zan-doc": "0.2.0" } } diff --git a/yarn.lock b/yarn.lock index f26a86049..9ea1f3de1 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5163,6 +5163,10 @@ npmlog@^4.0.2: gauge "~2.7.3" set-blocking "~2.0.0" +nprogress@^0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/nprogress/-/nprogress-0.2.0.tgz#cb8f34c53213d895723fcbab907e9422adbcafb1" + nth-check@~1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/nth-check/-/nth-check-1.0.1.tgz#9929acdf628fc2c41098deab82ac580cf149aae4" @@ -7922,12 +7926,13 @@ yeast@0.1.2: version "0.1.2" resolved "https://registry.yarnpkg.com/yeast/-/yeast-0.1.2.tgz#008e06d8094320c372dbc2f8ed76a0ca6c8ac419" -zan-doc@0.1.13: - version "0.1.13" - resolved "https://registry.yarnpkg.com/zan-doc/-/zan-doc-0.1.13.tgz#df532b538ba613a4fe39e436ec553de3e7c25918" +zan-doc@0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/zan-doc/-/zan-doc-0.2.0.tgz#40b31c4f1cc5ae539853a06b30f1cb479e2edca3" dependencies: cheerio "0.22.0" decamelize "^1.2.0" markdown-it "^8.3.1" markdown-it-container "^2.0.0" node-watch "^0.5.5" + nprogress "^0.2.0" From 306a6417d1896b3b04473d094caed7ff804123c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= Date: Mon, 21 Aug 2017 21:53:52 +0800 Subject: [PATCH 41/55] fix: field textarea height calc wrong --- packages/field/src/field.vue | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/packages/field/src/field.vue b/packages/field/src/field.vue index 1a10aafbf..011fdae8a 100644 --- a/packages/field/src/field.vue +++ b/packages/field/src/field.vue @@ -95,6 +95,14 @@ export default { }; }, + mounted() { + if (this.autosize && this.type === 'textarea') { + const el = this.$refs.textareaElement; + el.style.height = el.scrollHeight + 'px'; + el.style.overflowY = 'hidden'; + } + }, + watch: { value(val) { this.currentValue = val; @@ -102,7 +110,7 @@ export default { currentValue(val) { if (this.autosize && this.type === 'textarea') { - this.$nextTick(() => this.sizeAdjust()); + this.$nextTick(this.sizeAdjust); } this.$emit('input', val); } @@ -125,12 +133,9 @@ export default { }, sizeAdjust() { - const textareaElement = this.$refs.textareaElement; - const textAreaDiff = (parseInt(textareaElement.style.paddingBottom, 10) + - parseInt(textareaElement.style.paddingTop, 10)) || 0; - // 需要先设为0， 才可以让scrollHeight正确计算。 - textareaElement.style.height = 0 + 'px'; - textareaElement.style.height = (textareaElement.scrollHeight - textAreaDiff) + 'px'; + const el = this.$refs.textareaElement; + el.style.height = 'auto'; + el.style.height = el.scrollHeight + 'px'; }, handleInputFocus() { From 865f92f73583c7908a876fd1fa244ad08397a950 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= Date: Mon, 21 Aug 2017 21:54:14 +0800 Subject: [PATCH 42/55] fix: popup will not preventScroll by default --- packages/mixins/popup/index.js | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/packages/mixins/popup/index.js b/packages/mixins/popup/index.js index 95af13559..3cea8db79 100644 --- a/packages/mixins/popup/index.js +++ b/packages/mixins/popup/index.js @@ -4,16 +4,12 @@ import PopupContext from './popup-context'; export default { props: { - /** - * popup当前显示状态 - */ + // popup当前显示状态 value: { type: Boolean, default: false }, - /** - * 是否显示遮罩层 - */ + // 是否显示遮罩层 overlay: { type: Boolean, default: false @@ -26,13 +22,16 @@ export default { default: false }, zIndex: [String, Number], - /** - * popup滚动时是否body内容也滚动 - * 默认为不滚动 - */ + // popup滚动时是否body内容也滚动 + // 默认为不滚动 lockOnScroll: { type: Boolean, default: true + }, + // 防止滚动穿透 + preventScroll: { + type: Boolean, + default: false } }, @@ -137,8 +136,11 @@ export default { this.$el.style.zIndex = PopupManager.nextZIndex(); this.opened = true; this.opening = false; - document.addEventListener('touchstart', this.recordPosition, false); - document.addEventListener('touchmove', this.watchTouchMove, false); + + if (this.preventScroll) { + document.addEventListener('touchstart', this.recordPosition, false); + document.addEventListener('touchmove', this.watchTouchMove, false); + } }, /** From a94aa5bd771c01a8cb8ec6df5796fec139c6cc6c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= Date: Mon, 21 Aug 2017 21:59:06 +0800 Subject: [PATCH 43/55] fix: Popup remove watcher --- packages/mixins/popup/index.js | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/packages/mixins/popup/index.js b/packages/mixins/popup/index.js index 3cea8db79..44700d419 100644 --- a/packages/mixins/popup/index.js +++ b/packages/mixins/popup/index.js @@ -169,8 +169,11 @@ export default { doAfterClose() { this.closing = false; PopupManager.closeModal(this._popupId); - document.removeEventListener('touchstart', this.recordPosition, false); - document.removeEventListener('touchmove', this.watchTouchMove, false); + + if (this.preventScroll) { + document.removeEventListener('touchstart', this.recordPosition, false); + document.removeEventListener('touchmove', this.watchTouchMove, false); + } } }, From 1551518a4e0a1a45a32ffdf04e9a379327d8ba88 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= Date: Mon, 21 Aug 2017 22:23:59 +0800 Subject: [PATCH 44/55] [build] 0.8.5 --- docs/examples-docs/changelog.md | 7 +++++++ packages/index.js | 2 +- packages/vant-css/package.json | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/docs/examples-docs/changelog.md b/docs/examples-docs/changelog.md index 25d98d8dc..368905d3f 100644 --- a/docs/examples-docs/changelog.md +++ b/docs/examples-docs/changelog.md @@ -1,5 +1,12 @@ ## 更新日志 +## [v0.8.4](https://github.com/youzan/vant/tree/v0.8.4) (2017-08-18) +[Full Changelog](https://github.com/youzan/vant/compare/v0.8.3...v0.8.4) + +**合并的 Pull Request (可能有不兼容改动):** + +- fix: field 计算autosize，需要nextTick [\#78](https://github.com/youzan/vant/pull/78) ([pangxie1991](https://github.com/pangxie1991)) + ## [v0.8.3](https://github.com/youzan/vant/tree/v0.8.3) (2017-08-18) [Full Changelog](https://github.com/youzan/vant/compare/v0.8.1...v0.8.3) diff --git a/packages/index.js b/packages/index.js index b7ef72447..faf9b07f6 100644 --- a/packages/index.js +++ b/packages/index.js @@ -37,7 +37,7 @@ import Swipe from './swipe'; import SwipeItem from './swipe-item'; import DatetimePicker from './datetime-picker'; -const version = '0.8.4'; +const version = '0.8.5'; const components = [ Button, Switch, diff --git a/packages/vant-css/package.json b/packages/vant-css/package.json index 93029d11a..36e96b762 100644 --- a/packages/vant-css/package.json +++ b/packages/vant-css/package.json @@ -1,6 +1,6 @@ { "name": "vant-css", - "version": "0.8.4", + "version": "0.8.5", "description": "vant css.", "main": "lib/index.css", "style": "lib/index.css", From bafe9142ead0731ed45846a55909d57b72ac79be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= Date: Mon, 21 Aug 2017 22:24:00 +0800 Subject: [PATCH 45/55] [release] 0.8.5 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 1027ec832..43297595b 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "vant", - "version": "0.8.4", + "version": "0.8.5", "description": "有赞vue wap组件库", "main": "lib/vant.js", "style": "lib/vant-css/index.css", From d76db3d74aeb8db9d1c1e358d62a9f0885fdfe9e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= Date: Tue, 22 Aug 2017 13:31:36 +0800 Subject: [PATCH 46/55] Layout: optimize doc && code review --- docs/examples-docs/layout.md | 90 +++++++++++++------------------- docs/examples-docs/quickstart.md | 6 +-- docs/src/doc.config.js | 2 +- package.json | 2 +- packages/col/src/col.vue | 45 ++++++++-------- packages/row/src/row.vue | 45 ++++++++-------- yarn.lock | 10 ++-- 7 files changed, 92 insertions(+), 108 deletions(-) diff --git a/docs/examples-docs/layout.md b/docs/examples-docs/layout.md index 8df684302..93762dbeb 100644 --- a/docs/examples-docs/layout.md +++ b/docs/examples-docs/layout.md @@ -1,93 +1,75 @@ ## Layout 布局 -提供了`van-row`和`van-col`两个组件来进行行列布局。 +提供了`van-row`和`van-col`两个组件来进行行列布局 ### 使用指南 ``` javascript -import { Layout } from 'vant'; +import { Row, Col } from 'vant'; -Vue.component(Layout.name, Layout); +Vue.component(Row.name, Row); +Vue.component(Col.name, Col); ``` ### 代码演示 -#### 常规用法 +#### 基本用法 -Layout组件提供了`24列栅格`，通过在`van-col`上添加`span`属性设置列所占的宽度百分比`(span / 24)`；此外，添加`offset`属性可以设置列的偏移宽度，计算方式与span相同。 +Layout 组件提供了`24列栅格`，通过在`Col`上添加`span`属性设置列所占的宽度百分比 +此外，添加`offset`属性可以设置列的偏移宽度，计算方式与 span 相同 -:::demo 常规用法 +:::demo 基本用法 ```html - -
span: 8
- - -
span: 8
- - -
span: 8
- + span: 8 + span: 8 + span: 8 + - -
span: 4
- - -
offset: 4, span: 10
- + span: 4 + offset: 4, span: 10 + - -
offset: 12, span: 12
- + offset: 12, span: 12 ``` ::: -#### 在列元素之间增加间距 +#### 设置列元素间距 -列元素之间默认间距为0，如果希望在列元素增加相同的间距，可以在`van-row`上添加`gutter`属性来设置列元素之间的间距。 +通过`gutter`属性可以设置列元素之间的间距，默认间距为 0 :::demo 在列元素之间增加间距 ```html - -
span: 8
- - -
span: 8
- - -
span: 8
- + span: 8 + span: 8 + span: 8 ``` ::: @@ -98,9 +80,11 @@ Layout组件提供了`24列栅格`，通过在`van-col`上添加`span`属性设 | 参数 | 说明 | 类型 | 默认值 | 可选值 | |-----------|-----------|-----------|-------------|-------------| | gutter | 列元素之间的间距（单位为px） | `String | Number` | - | | +| prefix | className 前缀 | `String` | `van` | | #### Column | 参数 | 说明 | 类型 | 默认值 | 可选值 | |-----------|-----------|-----------|-------------|-------------| | span | 列元素宽度 | `String | Number` | - | | -| offset | 列元素偏移宽度 | `String | Number` | - | | +| offset | 列元素偏移距离 | `String | Number` | - | | +| prefix | className 前缀 | `String` | `van` | | diff --git a/docs/examples-docs/quickstart.md b/docs/examples-docs/quickstart.md index a8d2fd815..838dc92f6 100644 --- a/docs/examples-docs/quickstart.md +++ b/docs/examples-docs/quickstart.md @@ -1,6 +1,6 @@ ## Vant -一套基于`Vue.js 2.0`的 Mobile 组件库 +基于`Vue 2.0`的 Mobile 组件库 ### 安装 @@ -47,11 +47,11 @@ Vue.use(vant); ### 自定义主题 -`Vant`默认提供一套主题，`CSS`命名采用`BEM`的风格方便使用者覆盖样式。如果你想完全替换主题色或者部分样式，可以使用下面的方法： +`Vant`提供了一套默认主题，CSS 命名采用 BEM 的风格，方便使用者覆盖样式。如果你想完全替换主题色或者部分样式，可以使用下面的方法： #### 下载主题 -可以通过Github或npm来下载主题： +可以通过 Github 或 npm 来下载主题： ```bash # npm diff --git a/docs/src/doc.config.js b/docs/src/doc.config.js index 6a2a62c5d..110f0cadb 100644 --- a/docs/src/doc.config.js +++ b/docs/src/doc.config.js @@ -40,7 +40,7 @@ module.exports = { ] }, { - "name": "Vant组件", + "name": "组件列表", "showInMobile": true, "groups": [ { diff --git a/package.json b/package.json index 43297595b..4beb3342a 100644 --- a/package.json +++ b/package.json @@ -116,6 +116,6 @@ "webpack": "^3.5.5", "webpack-dev-server": "^2.7.1", "webpack-merge": "^4.1.0", - "zan-doc": "0.2.0" + "zan-doc": "^0.2.1" } } diff --git a/packages/col/src/col.vue b/packages/col/src/col.vue index 51fa4c7dc..281d0995e 100644 --- a/packages/col/src/col.vue +++ b/packages/col/src/col.vue @@ -13,27 +13,28 @@ diff --git a/packages/row/src/row.vue b/packages/row/src/row.vue index 036b9fb1c..374cc793a 100644 --- a/packages/row/src/row.vue +++ b/packages/row/src/row.vue @@ -1,32 +1,31 @@ diff --git a/yarn.lock b/yarn.lock index 9ea1f3de1..f546eae28 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4809,7 +4809,7 @@ markdown-it@^6.0.5: mdurl "~1.0.1" uc.micro "^1.0.1" -markdown-it@^8.3.1, markdown-it@^8.3.2: +markdown-it@^8.3.2: version "8.3.2" resolved "https://registry.yarnpkg.com/markdown-it/-/markdown-it-8.3.2.tgz#df4b86530d17c3bc9beec3b68d770b92ea17ae96" dependencies: @@ -7926,13 +7926,13 @@ yeast@0.1.2: version "0.1.2" resolved "https://registry.yarnpkg.com/yeast/-/yeast-0.1.2.tgz#008e06d8094320c372dbc2f8ed76a0ca6c8ac419" -zan-doc@0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/zan-doc/-/zan-doc-0.2.0.tgz#40b31c4f1cc5ae539853a06b30f1cb479e2edca3" +zan-doc@^0.2.1: + version "0.2.1" + resolved "https://registry.npmjs.org/zan-doc/-/zan-doc-0.2.1.tgz#34723ea180d0ac2e183b66d2a3e4a04b4f6fe91b" dependencies: cheerio "0.22.0" decamelize "^1.2.0" - markdown-it "^8.3.1" + markdown-it "^8.3.2" markdown-it-container "^2.0.0" node-watch "^0.5.5" nprogress "^0.2.0" From c4b0aebc75bf07086167e4bfb48ca021a0cc6a07 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= Date: Tue, 22 Aug 2017 13:33:37 +0800 Subject: [PATCH 47/55] Layout: adjust font size --- docs/examples-docs/layout.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/examples-docs/layout.md b/docs/examples-docs/layout.md index 93762dbeb..67d32b869 100644 --- a/docs/examples-docs/layout.md +++ b/docs/examples-docs/layout.md @@ -5,7 +5,7 @@ } .van-col { color: #fff; - font-size: 12px; + font-size: 13px; line-height: 30px; text-align: center; margin-bottom: 10px; From 96a90097a500ce25957a198463c6f4d639c64616 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= Date: Tue, 22 Aug 2017 13:41:42 +0800 Subject: [PATCH 48/55] Doc: fix scroll position --- docs/src/index.js | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/docs/src/index.js b/docs/src/index.js index 43f769edf..8b19eb7c9 100644 --- a/docs/src/index.js +++ b/docs/src/index.js @@ -6,11 +6,11 @@ import ZanDoc from 'zan-doc'; import DemoBlock from './components/demo-block'; import 'packages/vant-css/src/index.css'; -function isMobile() { +const isMobile = (function() { var platform = navigator.userAgent.toLowerCase(); return (/(android|bb\d+|meego).+mobile|kdtunion|weibo|m2oapp|micromessenger|avantgo|bada\/|blackberry|blazer|compal|elaine|fennec|hiptop|iemobile|ip(hone|od)|iris|kindle|lge |maemo|midp|mmp|mobile.+firefox|netfront|opera m(ob|in)i|palm( os)?|phone|p(ixi|re)\/|plucker|pocket|psp|series(4|6)0|symbian|treo|up\.(browser|link)|vodafone|wap|windows (ce|phone)|xda|xiino/i).test(platform) || (/1207|6310|6590|3gso|4thp|50[1-6]i|770s|802s|a wa|abac|ac(er|oo|s\-)|ai(ko|rn)|al(av|ca|co)|amoi|an(ex|ny|yw)|aptu|ar(ch|go)|as(te|us)|attw|au(di|\-m|r |s )|avan|be(ck|ll|nq)|bi(lb|rd)|bl(ac|az)|br(e|v)w|bumb|bw\-(n|u)|c55\/|capi|ccwa|cdm\-|cell|chtm|cldc|cmd\-|co(mp|nd)|craw|da(it|ll|ng)|dbte|dc\-s|devi|dica|dmob|do(c|p)o|ds(12|\-d)|el(49|ai)|em(l2|ul)|er(ic|k0)|esl8|ez([4-7]0|os|wa|ze)|fetc|fly(\-|_)|g1 u|g560|gene|gf\-5|g\-mo|go(\.w|od)|gr(ad|un)|haie|hcit|hd\-(m|p|t)|hei\-|hi(pt|ta)|hp( i|ip)|hs\-c|ht(c(\-| |_|a|g|p|s|t)|tp)|hu(aw|tc)|i\-(20|go|ma)|i230|iac( |\-|\/)|ibro|idea|ig01|ikom|im1k|inno|ipaq|iris|ja(t|v)a|jbro|jemu|jigs|kddi|keji|kgt( |\/)|klon|kpt |kwc\-|kyo(c|k)|le(no|xi)|lg( g|\/(k|l|u)|50|54|\-[a-w])|libw|lynx|m1\-w|m3ga|m50\/|ma(te|ui|xo)|mc(01|21|ca)|m\-cr|me(rc|ri)|mi(o8|oa|ts)|mmef|mo(01|02|bi|de|do|t(\-| |o|v)|zz)|mt(50|p1|v )|mwbp|mywa|n10[0-2]|n20[2-3]|n30(0|2)|n50(0|2|5)|n7(0(0|1)|10)|ne((c|m)\-|on|tf|wf|wg|wt)|nok(6|i)|nzph|o2im|op(ti|wv)|oran|owg1|p800|pan(a|d|t)|pdxg|pg(13|\-([1-8]|c))|phil|pire|pl(ay|uc)|pn\-2|po(ck|rt|se)|prox|psio|pt\-g|qa\-a|qc(07|12|21|32|60|\-[2-7]|i\-)|qtek|r380|r600|raks|rim9|ro(ve|zo)|s55\/|sa(ge|ma|mm|ms|ny|va)|sc(01|h\-|oo|p\-)|sdk\/|se(c(\-|0|1)|47|mc|nd|ri)|sgh\-|shar|sie(\-|m)|sk\-0|sl(45|id)|sm(al|ar|b3|it|t5)|so(ft|ny)|sp(01|h\-|v\-|v )|sy(01|mb)|t2(18|50)|t6(00|10|18)|ta(gt|lk)|tcl\-|tdg\-|tel(i|m)|tim\-|t\-mo|to(pl|sh)|ts(70|m\-|m3|m5)|tx\-9|up(\.b|g1|si)|utst|v400|v750|veri|vi(rg|te)|vk(40|5[0-3]|\-v)|vm40|voda|vulc|vx(52|53|60|61|70|80|81|83|85|98)|w3c(\-| )|webc|whit|wi(g |nc|nw)|wmlb|wonu|x700|yas\-|your|zeto|zte\-/i).test(platform.substr(0, 4)); -} +})(); Vue.use(VueRouter); Vue.use(ZanDoc); @@ -29,15 +29,20 @@ const router = new VueRouter({ }); router.beforeEach((route, redirect, next) => { - const pathname = '/zanui/vue/examples'; - if (isMobile()) { - window.location.replace(pathname); + if (isMobile) { + window.location.replace('/zanui/vue/examples'); return; } document.title = route.meta.title || document.title; next(); }); +router.afterEach(() => { + if (!isMobile) { + window.scrollTo(0, 0); + } +}) + new Vue({ // eslint-disable-line render: h => h(App), router From 15569b0e510d75ef5139d76f0153e81cd43276ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= Date: Tue, 22 Aug 2017 14:15:43 +0800 Subject: [PATCH 49/55] fix: Col empty style --- packages/col/src/col.vue | 2 +- packages/row/src/row.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/col/src/col.vue b/packages/col/src/col.vue index 281d0995e..4f1ed8cfe 100644 --- a/packages/col/src/col.vue +++ b/packages/col/src/col.vue @@ -33,7 +33,7 @@ export default { const padding = `${this.gutter / 2}px`; return this.gutter ? { paddingLeft: padding, paddingRight: padding } - : null; + : {}; } } }; diff --git a/packages/row/src/row.vue b/packages/row/src/row.vue index 374cc793a..0e4a6ae69 100644 --- a/packages/row/src/row.vue +++ b/packages/row/src/row.vue @@ -24,7 +24,7 @@ export default { const margin = `-${Number(this.gutter) / 2}px`; return this.gutter ? { marginLeft: margin, marginRight: margin } - : null; + : {}; } } }; From 28cd16c7f0d4be05661685749a16da78f1730711 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= Date: Tue, 22 Aug 2017 17:13:38 +0800 Subject: [PATCH 50/55] Button: reduce unnecessary styles --- docs/examples-docs/button.md | 12 ++++---- packages/vant-css/src/button.css | 46 ++++------------------------ packages/vant-css/src/common/var.css | 2 +- 3 files changed, 13 insertions(+), 47 deletions(-) diff --git a/docs/examples-docs/button.md b/docs/examples-docs/button.md index 7f110c895..992cc5ccc 100644 --- a/docs/examples-docs/button.md +++ b/docs/examples-docs/button.md @@ -48,10 +48,10 @@ Vue.component(Button.name, Button); :::demo 按钮尺寸 ```html -large -normal -small -mini +Large +Normal +Small +Mini ``` ::: @@ -61,7 +61,7 @@ Vue.component(Button.name, Button); :::demo 禁用状态 ```html -diabled +Diabled ``` ::: @@ -80,7 +80,7 @@ Vue.component(Button.name, Button); :::demo 自定义按钮标签 ```html - a标签按钮 + a 标签按钮 ``` ::: diff --git a/packages/vant-css/src/button.css b/packages/vant-css/src/button.css index 617c7de6d..0d05cdbf4 100644 --- a/packages/vant-css/src/button.css +++ b/packages/vant-css/src/button.css @@ -1,5 +1,4 @@ @import './common/var.css'; -@import './loading.css'; .van-button { position: relative; @@ -11,9 +10,9 @@ box-sizing: border-box; font-size: 16px; text-align: center; - appearance: none; outline: 0; overflow: hidden; + -webkit-appearance: none; &::after { content: " "; @@ -22,8 +21,8 @@ left: 0; right: 0; bottom: 0; - background-color: #000; opacity: 0; + background-color: #000; border-radius: inherit; /* inherit parent's border radius */ } @@ -33,9 +32,6 @@ &__icon-loading { display: inline-block; - width: 16px; - height: 16px; - vertical-align: middle; } &--default { @@ -44,8 +40,6 @@ border: 1px solid $button-default-border-color; &:active { - border-color: #cacaca; - background-color: $c-gray-light; color: $c-gray-dark; } } @@ -54,30 +48,18 @@ color: $button-primary-color; background-color: $button-primary-background-color; border: 1px solid $button-primary-border-color; - - &:active { - border-color: #00AA00; - background-color: #00AA00; - color: #66CC66; - } } &--danger { color: $button-danger-color; background-color: $button-danger-background-color; border: 1px solid $button-danger-border-color; - - &:active { - border-color: #D43333; - background-color: #D43333; - } } &--large { width: 100%; height: 50px; line-height: 48px; - font-size: 16px; } &--normal { @@ -92,9 +74,7 @@ font-size: 12px; } - /* - mini图标默认宽度50px，文字不能超过4个 - */ + /* mini图标默认宽度50px，文字不能超过4个 */ &--mini { display: inline-block; width: 50px; @@ -114,14 +94,8 @@ } &--block { - display: block; width: 100%; - } - - &--loading { - .van-button__text { - display: none; - } + display: block; } &--bottom-action { @@ -130,24 +104,16 @@ line-height: 50px; border: 0; border-radius: 0; - background-color: $bottom-action-button-default-background-color; color: $bottom-action-button-default-color; - font-size: 16px; + background-color: $bottom-action-button-default-background-color; &:active { - border-color: #DD6F44; - background-color: #DD6F44; color: #fff; } &.van-button--primary { - background-color: $bottom-action-button-primary-background-color; color: $bottom-action-button-primary-color; - - &:active { - border-color: #D43333; - background-color: #D43333; - } + background-color: $bottom-action-button-primary-background-color; } } } diff --git a/packages/vant-css/src/common/var.css b/packages/vant-css/src/common/var.css index 4e89219f5..2edb3809e 100644 --- a/packages/vant-css/src/common/var.css +++ b/packages/vant-css/src/common/var.css @@ -23,7 +23,7 @@ $button-primary-border-color: #0a0; $button-default-color: $c-black; $button-default-background-color: $c-white; -$button-default-border-color: #bbb; +$button-default-border-color: #ccc; $button-danger-color: $c-white; $button-danger-background-color: #f44; From 3c2e8f4868675a48b427e7d6f1cc31896cc6c6f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= Date: Tue, 22 Aug 2017 17:14:57 +0800 Subject: [PATCH 51/55] Icon: code review --- docs/examples-docs/icon.md | 4 +--- packages/icon/src/icon.vue | 24 +++++++++--------------- 2 files changed, 10 insertions(+), 18 deletions(-) diff --git a/docs/examples-docs/icon.md b/docs/examples-docs/icon.md index 2dfdb991c..a2278a668 100644 --- a/docs/examples-docs/icon.md +++ b/docs/examples-docs/icon.md @@ -65,9 +65,7 @@ Vue.component(Icon.name, Icon); ``` ::: -#### 所有Icons - -以下为目前所有的图标： +#### 图标列表 :::demo 所有Icon ```html diff --git a/packages/icon/src/icon.vue b/packages/icon/src/icon.vue index b7d1e4642..8560237b0 100644 --- a/packages/icon/src/icon.vue +++ b/packages/icon/src/icon.vue @@ -1,22 +1,16 @@ From c494292e3f042ea10bad161081663bb07b67c1db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= Date: Tue, 22 Aug 2017 17:52:16 +0800 Subject: [PATCH 52/55] directory adjust: delete entry index.js --- packages/actionsheet/index.js | 3 - .../{src/actionsheet.vue => index.vue} | 6 +- packages/badge-group/index.js | 3 - .../badge-group.vue => badge-group/index.vue} | 0 packages/badge/index.js | 3 - packages/badge/{src/badge.vue => index.vue} | 0 packages/button/index.js | 77 +++++++++- packages/button/src/button.js | 76 ---------- packages/card/index.js | 3 - packages/card/{src/card.vue => index.vue} | 0 packages/cell-group/index.js | 3 - .../cell-group.vue => cell-group/index.vue} | 0 packages/cell-swipe/index.js | 3 - packages/cell-swipe/index.vue | 129 +++++++++++++++++ packages/cell-swipe/src/cell-swipe.vue | 137 ------------------ packages/cell/index.js | 3 - packages/cell/{src/cell.vue => index.vue} | 8 +- packages/checkbox-group/index.js | 3 - .../index.vue} | 0 packages/checkbox/index.js | 3 - .../checkbox/{src/checkbox.vue => index.vue} | 2 +- packages/col/index.js | 3 - packages/col/{src/col.vue => index.vue} | 0 packages/datetime-picker/index.js | 3 - .../{src/datetime-picker.vue => index.vue} | 2 +- packages/dialog/{src => }/dialog.vue | 4 +- packages/dialog/index.js | 98 ++++++++++++- packages/dialog/src/dialog.js | 97 ------------- packages/field/index.js | 3 - packages/field/{src/field.vue => index.vue} | 4 +- packages/icon/index.js | 3 - packages/icon/{src/icon.vue => index.vue} | 0 .../image-preview/{src => }/image-preview.vue | 6 +- packages/image-preview/index.js | 36 ++++- packages/image-preview/src/image-preview.js | 35 ----- packages/loading/index.js | 3 - .../loading/{src/loading.vue => index.vue} | 0 packages/panel/index.js | 3 - packages/panel/{src/panel.vue => index.vue} | 0 packages/picker/{src => }/draggable.js | 0 packages/picker/index.js | 3 - packages/picker/{src/picker.vue => index.vue} | 0 packages/picker/{src => }/picker-column.vue | 2 +- packages/popup/index.js | 3 - packages/popup/{src/popup.vue => index.vue} | 2 +- packages/progress/index.js | 3 - .../progress/{src/progress.vue => index.vue} | 0 packages/quantity/index.js | 3 - .../quantity/{src/quantity.vue => index.vue} | 0 packages/radio-group/index.js | 3 - .../radio-group.vue => radio-group/index.vue} | 0 packages/radio/index.js | 3 - packages/radio/{src/radio.vue => index.vue} | 2 +- packages/row/index.js | 3 - packages/row/{src/row.vue => index.vue} | 0 packages/search/index.js | 3 - packages/search/index.vue | 105 ++++++++++++++ packages/search/src/search.vue | 105 -------------- packages/step/index.js | 3 - .../{steps/src/step.vue => step/index.vue} | 0 packages/steps/index.js | 3 - packages/steps/{src/steps.vue => index.vue} | 2 +- packages/swipe-item/index.js | 3 - .../swipe-item.vue => swipe-item/index.vue} | 0 packages/swipe/index.js | 3 - packages/swipe/{src/swipe.vue => index.vue} | 0 packages/swipe/{src => }/input.js | 0 packages/swipe/{src => }/scroll.js | 0 packages/swipe/{src => }/spring_dummy.js | 0 packages/swipe/{src => }/utils.js | 0 packages/switch/index.js | 3 - packages/switch/{src/switch.vue => index.vue} | 2 +- packages/tab/index.js | 2 - packages/tab/index.vue | 36 +++++ packages/tab/src/tab.vue | 36 ----- packages/tabs/index.js | 3 - packages/{tab/src/tabs.vue => tabs/index.vue} | 2 +- packages/{tab/src => tabs}/swipe.js | 0 packages/tag/index.js | 3 - packages/tag/{src/main.vue => index.vue} | 0 packages/toast/index.js | 78 +++++++++- packages/toast/src/toast.js | 79 ---------- packages/toast/{src => }/toast.vue | 4 +- packages/uploader/index.js | 3 - packages/uploader/{src/main.vue => index.vue} | 4 +- packages/waterfall/{src => }/directive.js | 2 +- packages/waterfall/index.js | 13 +- packages/waterfall/src/main.js | 14 -- 88 files changed, 587 insertions(+), 713 deletions(-) delete mode 100644 packages/actionsheet/index.js rename packages/actionsheet/{src/actionsheet.vue => index.vue} (94%) delete mode 100644 packages/badge-group/index.js rename packages/{badge/src/badge-group.vue => badge-group/index.vue} (100%) delete mode 100644 packages/badge/index.js rename packages/badge/{src/badge.vue => index.vue} (100%) delete mode 100644 packages/button/src/button.js delete mode 100644 packages/card/index.js rename packages/card/{src/card.vue => index.vue} (100%) delete mode 100644 packages/cell-group/index.js rename packages/{cell/src/cell-group.vue => cell-group/index.vue} (100%) delete mode 100644 packages/cell-swipe/index.js create mode 100644 packages/cell-swipe/index.vue delete mode 100644 packages/cell-swipe/src/cell-swipe.vue delete mode 100644 packages/cell/index.js rename packages/cell/{src/cell.vue => index.vue} (91%) delete mode 100644 packages/checkbox-group/index.js rename packages/{checkbox/src/checkbox-group.vue => checkbox-group/index.vue} (100%) delete mode 100644 packages/checkbox/index.js rename packages/checkbox/{src/checkbox.vue => index.vue} (98%) delete mode 100644 packages/col/index.js rename packages/col/{src/col.vue => index.vue} (100%) delete mode 100644 packages/datetime-picker/index.js rename packages/datetime-picker/{src/datetime-picker.vue => index.vue} (99%) rename packages/dialog/{src => }/dialog.vue (95%) delete mode 100644 packages/dialog/src/dialog.js delete mode 100644 packages/field/index.js rename packages/field/{src/field.vue => index.vue} (97%) delete mode 100644 packages/icon/index.js rename packages/icon/{src/icon.vue => index.vue} (100%) rename packages/image-preview/{src => }/image-preview.vue (95%) delete mode 100644 packages/image-preview/src/image-preview.js delete mode 100644 packages/loading/index.js rename packages/loading/{src/loading.vue => index.vue} (100%) delete mode 100644 packages/panel/index.js rename packages/panel/{src/panel.vue => index.vue} (100%) rename packages/picker/{src => }/draggable.js (100%) delete mode 100644 packages/picker/index.js rename packages/picker/{src/picker.vue => index.vue} (100%) rename packages/picker/{src => }/picker-column.vue (99%) delete mode 100644 packages/popup/index.js rename packages/popup/{src/popup.vue => index.vue} (96%) delete mode 100644 packages/progress/index.js rename packages/progress/{src/progress.vue => index.vue} (100%) delete mode 100644 packages/quantity/index.js rename packages/quantity/{src/quantity.vue => index.vue} (100%) delete mode 100644 packages/radio-group/index.js rename packages/{radio/src/radio-group.vue => radio-group/index.vue} (100%) delete mode 100644 packages/radio/index.js rename packages/radio/{src/radio.vue => index.vue} (96%) delete mode 100644 packages/row/index.js rename packages/row/{src/row.vue => index.vue} (100%) delete mode 100644 packages/search/index.js create mode 100644 packages/search/index.vue delete mode 100644 packages/search/src/search.vue delete mode 100644 packages/step/index.js rename packages/{steps/src/step.vue => step/index.vue} (100%) delete mode 100644 packages/steps/index.js rename packages/steps/{src/steps.vue => index.vue} (97%) delete mode 100644 packages/swipe-item/index.js rename packages/{swipe/src/swipe-item.vue => swipe-item/index.vue} (100%) delete mode 100644 packages/swipe/index.js rename packages/swipe/{src/swipe.vue => index.vue} (100%) rename packages/swipe/{src => }/input.js (100%) rename packages/swipe/{src => }/scroll.js (100%) rename packages/swipe/{src => }/spring_dummy.js (100%) rename packages/swipe/{src => }/utils.js (100%) delete mode 100644 packages/switch/index.js rename packages/switch/{src/switch.vue => index.vue} (97%) delete mode 100644 packages/tab/index.js create mode 100644 packages/tab/index.vue delete mode 100644 packages/tab/src/tab.vue delete mode 100644 packages/tabs/index.js rename packages/{tab/src/tabs.vue => tabs/index.vue} (99%) rename packages/{tab/src => tabs}/swipe.js (100%) delete mode 100644 packages/tag/index.js rename packages/tag/{src/main.vue => index.vue} (100%) delete mode 100644 packages/toast/src/toast.js rename packages/toast/{src => }/toast.vue (96%) delete mode 100644 packages/uploader/index.js rename packages/uploader/{src/main.vue => index.vue} (98%) rename packages/waterfall/{src => }/directive.js (98%) delete mode 100644 packages/waterfall/src/main.js diff --git a/packages/actionsheet/index.js b/packages/actionsheet/index.js deleted file mode 100644 index 40c4a8d78..000000000 --- a/packages/actionsheet/index.js +++ /dev/null @@ -1,3 +0,0 @@ -import ActionSheet from './src/actionsheet'; - -export default ActionSheet; diff --git a/packages/actionsheet/src/actionsheet.vue b/packages/actionsheet/index.vue similarity index 94% rename from packages/actionsheet/src/actionsheet.vue rename to packages/actionsheet/index.vue index 852c821f8..175d00245 100644 --- a/packages/actionsheet/src/actionsheet.vue +++ b/packages/actionsheet/index.vue @@ -27,9 +27,9 @@ diff --git a/packages/cell-swipe/src/cell-swipe.vue b/packages/cell-swipe/src/cell-swipe.vue deleted file mode 100644 index 00acbfe11..000000000 --- a/packages/cell-swipe/src/cell-swipe.vue +++ /dev/null @@ -1,137 +0,0 @@ - - - - diff --git a/packages/cell/index.js b/packages/cell/index.js deleted file mode 100644 index aa54ff040..000000000 --- a/packages/cell/index.js +++ /dev/null @@ -1,3 +0,0 @@ -import Cell from './src/cell'; - -export default Cell; diff --git a/packages/cell/src/cell.vue b/packages/cell/index.vue similarity index 91% rename from packages/cell/src/cell.vue rename to packages/cell/index.vue index afd997c80..f356c8aa9 100644 --- a/packages/cell/src/cell.vue +++ b/packages/cell/index.vue @@ -1,5 +1,5 @@ diff --git a/packages/search/src/search.vue b/packages/search/src/search.vue deleted file mode 100644 index 7363a51f5..000000000 --- a/packages/search/src/search.vue +++ /dev/null @@ -1,105 +0,0 @@ - - - diff --git a/packages/step/index.js b/packages/step/index.js deleted file mode 100644 index 5ec38e896..000000000 --- a/packages/step/index.js +++ /dev/null @@ -1,3 +0,0 @@ -import Step from '../steps/src/step'; - -export default Step; diff --git a/packages/steps/src/step.vue b/packages/step/index.vue similarity index 100% rename from packages/steps/src/step.vue rename to packages/step/index.vue diff --git a/packages/steps/index.js b/packages/steps/index.js deleted file mode 100644 index aaf50e801..000000000 --- a/packages/steps/index.js +++ /dev/null @@ -1,3 +0,0 @@ -import Steps from './src/steps'; - -export default Steps; diff --git a/packages/steps/src/steps.vue b/packages/steps/index.vue similarity index 97% rename from packages/steps/src/steps.vue rename to packages/steps/index.vue index 7a533f938..91adf1efd 100644 --- a/packages/steps/src/steps.vue +++ b/packages/steps/index.vue @@ -24,7 +24,7 @@ diff --git a/packages/tab/src/tab.vue b/packages/tab/src/tab.vue deleted file mode 100644 index d0fa5627f..000000000 --- a/packages/tab/src/tab.vue +++ /dev/null @@ -1,36 +0,0 @@ - - - diff --git a/packages/tabs/index.js b/packages/tabs/index.js deleted file mode 100644 index 5db150464..000000000 --- a/packages/tabs/index.js +++ /dev/null @@ -1,3 +0,0 @@ -import Tabs from '../tab/src/tabs'; - -export default Tabs; diff --git a/packages/tab/src/tabs.vue b/packages/tabs/index.vue similarity index 99% rename from packages/tab/src/tabs.vue rename to packages/tabs/index.vue index e38628d46..0da594a6e 100644 --- a/packages/tab/src/tabs.vue +++ b/packages/tabs/index.vue @@ -42,7 +42,7 @@