Merge remote-tracking branch 'upstream/dev' into dev

This commit is contained in:
niunai 2017-05-19 11:19:59 +08:00
commit 8ceef31886
64 changed files with 637 additions and 790 deletions

View File

@ -2,7 +2,7 @@
### 提交 PR 前请确保完成以下内容: ### 提交 PR 前请确保完成以下内容:
1. Fork [the repository](https://github.com/youzan/vant) and create your branch from `master`. 1. Fork [the repository](https://github.com/youzan/vant) and create your branch from `dev`.
2. Follow the [contributing guide](./CONTRIBUTING.md) to setup your develop environment. 2. Follow the [contributing guide](./CONTRIBUTING.md) to setup your develop environment.
2. If you've added code that should be tested, add tests! 2. If you've added code that should be tested, add tests!
3. If you've changed APIs, update the documentation. 3. If you've changed APIs, update the documentation.

View File

@ -4,18 +4,20 @@ var config = {
'separators': {'descendent': '__', 'modifier': '--'} 'separators': {'descendent': '__', 'modifier': '--'}
} }
}; };
var reset = require('postcss-css-reset')();
// https://github.com/trysound/postcss-easy-import // https://github.com/trysound/postcss-easy-import
var partialImport = require("postcss-easy-import")(); var partialImport = require('postcss-easy-import')();
// 这不是bem虽然名字叫bem其实它是suit // 这不是bem虽然名字叫bem其实它是suit
// https://github.com/saladcss/saladcss-bem // https://github.com/saladcss/saladcss-bem
var bem = require("saladcss-bem")(config.bem); var bem = require('saladcss-bem')(config.bem);
// https://github.com/jonathantneal/precss // https://github.com/jonathantneal/precss
var precss = require("precss")(); var precss = require('precss')();
// https://github.com/postcss/autoprefixer // https://github.com/postcss/autoprefixer
var autoprefixer = require("autoprefixer")(); var autoprefixer = require('autoprefixer')();
module.exports = function (webpack) { module.exports = function (webpack) {
// 顺序很重要 // 顺序很重要
@ -23,6 +25,7 @@ module.exports = function (webpack) {
partialImport, partialImport,
bem, bem,
precss, precss,
autoprefixer autoprefixer,
reset
]; ];
}; };

View File

@ -9,7 +9,8 @@ config.entry = {
config.output = { config.output = {
filename: './lib/[name].js', filename: './lib/[name].js',
library: 'vant', library: 'vant',
libraryTarget: 'umd' libraryTarget: 'umd',
umdNamedDefine: true
}; };
config.externals = { config.externals = {

View File

@ -18,7 +18,8 @@ config.externals = {
config.output = { config.output = {
path: path.join(__dirname, '../lib'), path: path.join(__dirname, '../lib'),
filename: '[name].js', filename: '[name].js',
libraryTarget: 'umd' libraryTarget: 'umd',
umdNamedDefine: true
}; };
module.exports = config; module.exports = config;

View File

@ -3,7 +3,7 @@ var path = require('path');
var slugify = require('transliteration').slugify; var slugify = require('transliteration').slugify;
var striptags = require('./strip-tags'); var striptags = require('./strip-tags');
var ExtractTextPlugin = require('extract-text-webpack-plugin'); var ExtractTextPlugin = require('extract-text-webpack-plugin');
var getPoastcssPlugin = require('./utils/postcss_pipe'); var getPostcssPlugin = require('./utils/postcss_pipe');
var ProgressBarPlugin = require('progress-bar-webpack-plugin'); var ProgressBarPlugin = require('progress-bar-webpack-plugin');
var HtmlWebpackPlugin = require('html-webpack-plugin'); var HtmlWebpackPlugin = require('html-webpack-plugin');
var OptimizeCssAssetsPlugin = require('optimize-css-assets-webpack-plugin'); var OptimizeCssAssetsPlugin = require('optimize-css-assets-webpack-plugin');
@ -39,7 +39,8 @@ module.exports = {
output: { output: {
path: path.join(__dirname, '../docs/dist'), path: path.join(__dirname, '../docs/dist'),
publicPath: '/', publicPath: '/',
filename: '[name].js' filename: '[name].js',
umdNamedDefine: true
}, },
devServer: { devServer: {
historyApiFallback: { historyApiFallback: {
@ -107,14 +108,14 @@ module.exports = {
new webpack.LoaderOptionsPlugin({ new webpack.LoaderOptionsPlugin({
minimize: true, minimize: true,
options: { options: {
postcss: getPoastcssPlugin, postcss: getPostcssPlugin,
babel: { babel: {
presets: ['es2015'], presets: ['es2015'],
plugins: ['transform-runtime', 'transform-vue-jsx'] plugins: ['transform-runtime', 'transform-vue-jsx']
}, },
vue: { vue: {
autoprefixer: false, autoprefixer: false,
postcss: getPoastcssPlugin postcss: getPostcssPlugin
}, },
vueMarkdown: { vueMarkdown: {
use: [ use: [

View File

@ -7,7 +7,8 @@ module.exports = merge(devConfig, {
output: { output: {
path: path.join(__dirname, '../docs/dist'), path: path.join(__dirname, '../docs/dist'),
publicPath: '/zanui/vue', publicPath: '/zanui/vue',
filename: '[name].[hash:8].js' filename: '[name].[hash:8].js',
umdNamedDefine: true
}, },
devtool: false, devtool: false,
plugins: [ plugins: [

View File

@ -4,10 +4,16 @@
<van-cell title="单元格2" value="单元格2内容"></van-cell> <van-cell title="单元格2" value="单元格2内容"></van-cell>
</van-cell-group> </van-cell-group>
</example-block><example-block title="只设置value">
<van-cell-group>
<van-cell value="单元格1内容"></van-cell>
<van-cell value="单元格2内容"></van-cell>
</van-cell-group>
</example-block><example-block title="标题带描述信息"> </example-block><example-block title="标题带描述信息">
<van-cell-group> <van-cell-group>
<van-cell title="单元格1" label="描述信息" is-link="" url="javascript:void(0)" @click="handleClick"></van-cell> <van-cell title="单元格1" label="描述信息" value="查看专栏" is-link="" url="javascript:void(0)" @click="handleClick"></van-cell>
<van-cell title="单元格2" label="描述信息"></van-cell> <van-cell title="单元格2" label="描述信息" value="查看专栏" is-link=""></van-cell>
</van-cell-group> </van-cell-group>
</example-block><example-block title="带图标"> </example-block><example-block title="带图标">
@ -31,6 +37,11 @@
</template> </template>
</van-cell> </van-cell>
<van-cell title="线下门店" icon="location" url="http://youzan.com" is-link=""></van-cell> <van-cell title="线下门店" icon="location" url="http://youzan.com" is-link=""></van-cell>
<van-cell title="其他">
<template slot="right-icon">
<van-icon name="passed" class="van-cell__right-icon" style="font-size: 16px;"></van-icon>
</template>
</van-cell>
</van-cell-group> </van-cell-group>
</example-block></section></template> </example-block></section></template>

View File

@ -12,8 +12,6 @@
<van-icon name="exchange"></van-icon> <van-icon name="exchange"></van-icon>
<span>exchange</span> <span>exchange</span>
</van-col> </van-col>
</van-row>
<van-row>
<van-col span="8"> <van-col span="8">
<van-icon name="close"></van-icon> <van-icon name="close"></van-icon>
<span>close</span> <span>close</span>
@ -26,8 +24,6 @@
<van-icon name="upgrade"></van-icon> <van-icon name="upgrade"></van-icon>
<span>upgrade</span> <span>upgrade</span>
</van-col> </van-col>
</van-row>
<van-row>
<van-col span="8"> <van-col span="8">
<van-icon name="check"></van-icon> <van-icon name="check"></van-icon>
<span>check</span> <span>check</span>
@ -40,8 +36,6 @@
<van-icon name="like-o"></van-icon> <van-icon name="like-o"></van-icon>
<span>like-o</span> <span>like-o</span>
</van-col> </van-col>
</van-row>
<van-row>
<van-col span="8"> <van-col span="8">
<van-icon name="like" style="color: red;"></van-icon> <van-icon name="like" style="color: red;"></van-icon>
<span>like</span> <span>like</span>
@ -54,8 +48,6 @@
<van-icon name="shop"></van-icon> <van-icon name="shop"></van-icon>
<span>shop</span> <span>shop</span>
</van-col> </van-col>
</van-row>
<van-row>
<van-col span="8"> <van-col span="8">
<van-icon name="photograph"></van-icon> <van-icon name="photograph"></van-icon>
<span>photograph</span> <span>photograph</span>
@ -68,8 +60,6 @@
<van-icon name="add2"></van-icon> <van-icon name="add2"></van-icon>
<span>add2</span> <span>add2</span>
</van-col> </van-col>
</van-row>
<van-row>
<van-col span="8"> <van-col span="8">
<van-icon name="photo"></van-icon> <van-icon name="photo"></van-icon>
<span>photo</span> <span>photo</span>
@ -82,8 +72,6 @@
<van-icon name="edit"></van-icon> <van-icon name="edit"></van-icon>
<span>edit</span> <span>edit</span>
</van-col> </van-col>
</van-row>
<van-row>
<van-col span="8"> <van-col span="8">
<van-icon name="passed"></van-icon> <van-icon name="passed"></van-icon>
<span>passed</span> <span>passed</span>
@ -96,8 +84,6 @@
<van-icon name="arrow"></van-icon> <van-icon name="arrow"></van-icon>
<span>arrow</span> <span>arrow</span>
</van-col> </van-col>
</van-row>
<van-row>
<van-col span="8"> <van-col span="8">
<van-icon name="gift"></van-icon> <van-icon name="gift"></van-icon>
<span>gift</span> <span>gift</span>
@ -110,8 +96,6 @@
<van-icon name="clear"></van-icon> <van-icon name="clear"></van-icon>
<span>clear</span> <span>clear</span>
</van-col> </van-col>
</van-row>
<van-row>
<van-col span="8"> <van-col span="8">
<van-icon name="success"></van-icon> <van-icon name="success"></van-icon>
<span>success</span> <span>success</span>
@ -124,8 +108,6 @@
<van-icon name="contact"></van-icon> <van-icon name="contact"></van-icon>
<span>contact</span> <span>contact</span>
</van-col> </van-col>
</van-row>
<van-row>
<van-col span="8"> <van-col span="8">
<van-icon name="wechat"></van-icon> <van-icon name="wechat"></van-icon>
<span>wechat</span> <span>wechat</span>
@ -134,6 +116,14 @@
<van-icon name="alipay"></van-icon> <van-icon name="alipay"></van-icon>
<span>alipay</span> <span>alipay</span>
</van-col> </van-col>
<van-col span="8">
<van-icon name="password-view"></van-icon>
<span>password-view</span>
</van-col>
<van-col span="8">
<van-icon name="password-not-view"></van-icon>
<span>password-not-view</span>
</van-col>
</van-row> </van-row>
</example-block></section></template> </example-block></section></template>

View File

@ -25,7 +25,7 @@
</van-row> </van-row>
</example-block><example-block title="在列元素之间增加间距"> </example-block><example-block title="在列元素之间增加间距">
<van-row gutter="10"> <van-row gutter="20">
<van-col span="8"> <van-col span="8">
<div class="gray">span: 8</div> <div class="gray">span: 8</div>
</van-col> </van-col>

View File

@ -18,6 +18,16 @@
<van-step>交易完成</van-step> <van-step>交易完成</van-step>
</van-steps> </van-steps>
</example-block><example-block title="高级用法">
<van-steps :active="active" title="等待商家发货">
<van-icon slot="icon" name="like"></van-icon>
<p slot="message-extra">流程</p>
<van-step>买家下单</van-step>
<van-step>商家接单</van-step>
<van-step>买家提货</van-step>
<van-step>交易完成</van-step>
</van-steps>
</example-block></section></template> </example-block></section></template>
<style> <style>
@component-namespace demo { @component-namespace demo {

View File

@ -16,9 +16,16 @@
<van-tab title="选项五">内容五</van-tab> <van-tab title="选项五">内容五</van-tab>
</van-tabs> </van-tabs>
</example-block><example-block title="设置切换tab的动画时间">
<van-tabs :duration="0.6">
<van-tab title="选项一">内容一</van-tab>
<van-tab title="选项二">内容二</van-tab>
<van-tab title="选项三">内容三</van-tab>
</van-tabs>
</example-block><example-block title="禁用tab"> </example-block><example-block title="禁用tab">
<van-tabs> <van-tabs>
<van-tab title="选项一">内容一</van-tab> <van-tab title="选项">内容一</van-tab>
<van-tab title="选项二" disabled @disabled="popalert">内容二</van-tab> <van-tab title="选项二" disabled @disabled="popalert">内容二</van-tab>
<van-tab title="选项三">内容三</van-tab> <van-tab title="选项三">内容三</van-tab>
<van-tab title="选项四">内容四</van-tab> <van-tab title="选项四">内容四</van-tab>

View File

@ -1,17 +1,20 @@
<template><section class="demo-tag"><h1 class="demo-title">Tag 标记</h1><example-block title="基础用法"> <template><section class="demo-tag"><h1 class="demo-title">Tag 标记</h1><example-block title="基础用法">
<div class="tags-container"> <div class="tags-container">
<van-tag>返现</van-tag> <van-tag>返现</van-tag>
</div>
<div class="tags-container">
<van-tag type="danger">返现</van-tag>
<van-tag type="success">四字标签</van-tag>
<van-tag type="primary"></van-tag>
</div>
</example-block><example-block title="高级用法">
<div class="tags-container">
<van-tag>返现</van-tag>
<van-tag plain="">返现</van-tag> <van-tag plain="">返现</van-tag>
</div> </div>
<div class="tags-container"> <div class="tags-container">
<van-tag type="danger">返现</van-tag> <van-tag type="danger">返现</van-tag>
<van-tag type="danger">四字标签</van-tag>
<van-tag type="danger"></van-tag>
</div>
</example-block><example-block title="高级用法">
<div class="tags-container">
<van-tag type="danger">返现</van-tag>
<van-tag plain="" type="danger">返现</van-tag> <van-tag plain="" type="danger">返现</van-tag>
</div> </div>
<div class="tags-container"> <div class="tags-container">
@ -22,9 +25,6 @@
<van-tag type="success">返现</van-tag> <van-tag type="success">返现</van-tag>
<van-tag plain="" type="success">返现</van-tag> <van-tag plain="" type="success">返现</van-tag>
</div> </div>
<div class="tags-container">
<van-tag type="danger" mark="">返现</van-tag>
</div>
</example-block></section></template> </example-block></section></template>
<style> <style>

View File

@ -83,6 +83,7 @@ Vue.component(ActionSheet.name, ActionSheet);
```js ```js
import { ActionSheet } from 'vant'; import { ActionSheet } from 'vant';
import 'vant/lib/vant-css/actionSheet.css';
export default { export default {
components: { components: {

View File

@ -53,6 +53,7 @@ Vue.component(BadgeGroup.name, BadgeGroup);
```js ```js
import { Badge, BadgeGroup } from 'vant'; import { Badge, BadgeGroup } from 'vant';
import 'vant/lib/vant-css/badge.css';
export default { export default {
components: { components: {

View File

@ -44,6 +44,7 @@ Vue.component(Button.name, Button);
```js ```js
import { Button } from 'vant'; import { Button } from 'vant';
import 'vant/lib/vant-css/button.css';
export default { export default {
components: { components: {
@ -170,7 +171,7 @@ export default {
|-----------|-----------|-----------|-------------|-------------| |-----------|-----------|-----------|-------------|-------------|
| type | 按钮类型 | `string` | `default` | `primary`, `danger` | | type | 按钮类型 | `string` | `default` | `primary`, `danger` |
| size | 按钮尺寸 | `string` | `normal` | `large`, `small`, `mini` | | size | 按钮尺寸 | `string` | `normal` | `large`, `small`, `mini` |
| tag | 按钮标签 | `string` | `button` | `a`, `span`, ... | | tag | 按钮标签 | `string` | `button` | 任何有意义的`html`标签, 如`a`, `span` |
| diabled | 按钮是否禁用 | `boolean` | `false` | | | diabled | 按钮是否禁用 | `boolean` | `false` | |
| block | 按钮是否显示为块级元素 | `boolean` | `false` | | | block | 按钮是否显示为块级元素 | `boolean` | `false` | |
| bottomAction | 按钮是否显示为底部行动按钮,一般显示在页面底部,有特殊样式 | `boolean` | `false` | | | bottomAction | 按钮是否显示为底部行动按钮,一般显示在页面底部,有特殊样式 | `boolean` | `false` | |

View File

@ -22,6 +22,7 @@ Vue.component(Card.name, Card);
```js ```js
import { Card } from 'vant'; import { Card } from 'vant';
import 'vant/lib/vant-css/card.css';
export default { export default {
components: { components: {

View File

@ -20,9 +20,10 @@ export default {
```js ```js
import Vue from 'vue'; import Vue from 'vue';
import { Cell } from 'vant'; import { Cell, CellGroup } from 'vant';
import 'vant/lib/vant-css/cell.css'; import 'vant/lib/vant-css/cell.css';
Vue.component(CellGroup.name, CellGroup);
Vue.component(Cell.name, Cell); Vue.component(Cell.name, Cell);
``` ```
@ -32,9 +33,11 @@ Vue.component(Cell.name, Cell);
```js ```js
import { Cell } from 'vant'; import { Cell } from 'vant';
import 'vant/lib/vant-css/cell.css';
export default { export default {
components: { components: {
'van-cell-group': CellGroup,
'van-cell': Cell 'van-cell': Cell
} }
}; };
@ -44,6 +47,8 @@ export default {
#### 基础用法 #### 基础用法
你可以将`van-cell-group`组件看成一个容器即可。
:::demo 基础用法 :::demo 基础用法
```html ```html
<van-cell-group> <van-cell-group>
@ -53,6 +58,19 @@ export default {
``` ```
::: :::
#### 只设置value
只设置`value`时会向左对齐。
:::demo 只设置value
```html
<van-cell-group>
<van-cell value="单元格1内容"></van-cell>
<van-cell value="单元格2内容"></van-cell>
</van-cell-group>
```
:::
#### 标题带描述信息 #### 标题带描述信息
传入`label`属性,属性值为描述信息的值。 传入`label`属性,属性值为描述信息的值。
@ -60,8 +78,8 @@ export default {
:::demo 标题带描述信息 :::demo 标题带描述信息
```html ```html
<van-cell-group> <van-cell-group>
<van-cell title="单元格1" label="描述信息" is-link url="javascript:void(0)" @click="handleClick"></van-cell> <van-cell title="单元格1" label="描述信息" value="查看专栏" is-link url="javascript:void(0)" @click="handleClick"></van-cell>
<van-cell title="单元格2" label="描述信息"></van-cell> <van-cell title="单元格2" label="描述信息" value="查看专栏" is-link></van-cell>
</van-cell-group> </van-cell-group>
``` ```
::: :::
@ -94,7 +112,7 @@ export default {
#### 高级用法 #### 高级用法
如以上用法不能满足你的需求,可以使用对应的`slot`来自定义显示的内容。包含三个`slot`,默认`slot``icon``title`的`slot` 如以上用法不能满足你的需求,可以使用对应的`slot`来自定义显示的内容。包含三个`slot`,默认`slot``icon``title``right-icon`的`slot`
:::demo 高级用法 :::demo 高级用法
```html ```html
@ -106,6 +124,11 @@ export default {
</template> </template>
</van-cell> </van-cell>
<van-cell title="线下门店" icon="location" url="http://youzan.com" is-link></van-cell> <van-cell title="线下门店" icon="location" url="http://youzan.com" is-link></van-cell>
<van-cell title="其他">
<template slot="right-icon">
<van-icon name="passed" class="van-cell__right-icon" style="font-size: 16px;"></van-icon>
</template>
</van-cell>
</van-cell-group> </van-cell-group>
``` ```
::: :::
@ -128,3 +151,4 @@ export default {
| - | 自定义显示内容 | | - | 自定义显示内容 |
| icon | 自定义`icon` | | icon | 自定义`icon` |
| title | 自定义`title` | | title | 自定义`title` |
| right-icon | 自定义右侧按钮,默认是`arrow` |

View File

@ -60,6 +60,7 @@ Vue.component(CheckboxGroup.name, CheckboxGroup);
```js ```js
import { Checkbox, CheckboxGroup } from 'vant'; import { Checkbox, CheckboxGroup } from 'vant';
import 'vant/lib/vant-css/checkbox.css';
export default { export default {
components: { components: {

View File

@ -44,6 +44,7 @@ Vue.component(Field.name, Field);
```js ```js
import { Field } from 'vant'; import { Field } from 'vant';
import 'vant/lib/vant-css/field.css';
export default { export default {
components: { components: {

View File

@ -38,6 +38,7 @@ Vue.component(Icon.name, Icon);
```js ```js
import { Icon } from 'vant'; import { Icon } from 'vant';
import 'vant/lib/vant-css/icon.css';
export default { export default {
components: { components: {
@ -67,8 +68,6 @@ export default {
<van-icon name="exchange"></van-icon> <van-icon name="exchange"></van-icon>
<span>exchange</span> <span>exchange</span>
</van-col> </van-col>
</van-row>
<van-row>
<van-col span="8"> <van-col span="8">
<van-icon name="close"></van-icon> <van-icon name="close"></van-icon>
<span>close</span> <span>close</span>
@ -81,8 +80,6 @@ export default {
<van-icon name="upgrade"></van-icon> <van-icon name="upgrade"></van-icon>
<span>upgrade</span> <span>upgrade</span>
</van-col> </van-col>
</van-row>
<van-row>
<van-col span="8"> <van-col span="8">
<van-icon name="check"></van-icon> <van-icon name="check"></van-icon>
<span>check</span> <span>check</span>
@ -95,8 +92,6 @@ export default {
<van-icon name="like-o"></van-icon> <van-icon name="like-o"></van-icon>
<span>like-o</span> <span>like-o</span>
</van-col> </van-col>
</van-row>
<van-row>
<van-col span="8"> <van-col span="8">
<van-icon name="like" style="color: red;"></van-icon> <van-icon name="like" style="color: red;"></van-icon>
<span>like</span> <span>like</span>
@ -109,8 +104,6 @@ export default {
<van-icon name="shop"></van-icon> <van-icon name="shop"></van-icon>
<span>shop</span> <span>shop</span>
</van-col> </van-col>
</van-row>
<van-row>
<van-col span="8"> <van-col span="8">
<van-icon name="photograph"></van-icon> <van-icon name="photograph"></van-icon>
<span>photograph</span> <span>photograph</span>
@ -123,8 +116,6 @@ export default {
<van-icon name="add2"></van-icon> <van-icon name="add2"></van-icon>
<span>add2</span> <span>add2</span>
</van-col> </van-col>
</van-row>
<van-row>
<van-col span="8"> <van-col span="8">
<van-icon name="photo"></van-icon> <van-icon name="photo"></van-icon>
<span>photo</span> <span>photo</span>
@ -137,8 +128,6 @@ export default {
<van-icon name="edit"></van-icon> <van-icon name="edit"></van-icon>
<span>edit</span> <span>edit</span>
</van-col> </van-col>
</van-row>
<van-row>
<van-col span="8"> <van-col span="8">
<van-icon name="passed"></van-icon> <van-icon name="passed"></van-icon>
<span>passed</span> <span>passed</span>
@ -151,8 +140,6 @@ export default {
<van-icon name="arrow"></van-icon> <van-icon name="arrow"></van-icon>
<span>arrow</span> <span>arrow</span>
</van-col> </van-col>
</van-row>
<van-row>
<van-col span="8"> <van-col span="8">
<van-icon name="gift"></van-icon> <van-icon name="gift"></van-icon>
<span>gift</span> <span>gift</span>
@ -165,8 +152,6 @@ export default {
<van-icon name="clear"></van-icon> <van-icon name="clear"></van-icon>
<span>clear</span> <span>clear</span>
</van-col> </van-col>
</van-row>
<van-row>
<van-col span="8"> <van-col span="8">
<van-icon name="success"></van-icon> <van-icon name="success"></van-icon>
<span>success</span> <span>success</span>
@ -179,8 +164,6 @@ export default {
<van-icon name="contact"></van-icon> <van-icon name="contact"></van-icon>
<span>contact</span> <span>contact</span>
</van-col> </van-col>
</van-row>
<van-row>
<van-col span="8"> <van-col span="8">
<van-icon name="wechat"></van-icon> <van-icon name="wechat"></van-icon>
<span>wechat</span> <span>wechat</span>
@ -189,6 +172,14 @@ export default {
<van-icon name="alipay"></van-icon> <van-icon name="alipay"></van-icon>
<span>alipay</span> <span>alipay</span>
</van-col> </van-col>
<van-col span="8">
<van-icon name="password-view"></van-icon>
<span>password-view</span>
</van-col>
<van-col span="8">
<van-icon name="password-not-view"></van-icon>
<span>password-not-view</span>
</van-col>
</van-row> </van-row>
``` ```
::: :::

View File

@ -56,6 +56,8 @@ Vue.component(Col.name, Col);
```js ```js
import { Row, Col } from 'vant'; import { Row, Col } from 'vant';
import 'vant/lib/vant-css/col.css';
import 'vant/lib/vant-css/row.css';
export default { export default {
components: { components: {
@ -106,7 +108,7 @@ Layout组件提供了`24列栅格`,通过在`van-col`上添加`span`属性设
:::demo 在列元素之间增加间距 :::demo 在列元素之间增加间距
```html ```html
<van-row gutter="10"> <van-row gutter="20">
<van-col span="8"> <van-col span="8">
<div class="gray">span: 8</div> <div class="gray">span: 8</div>
</van-col> </van-col>

View File

@ -44,6 +44,7 @@ Vue.component(Loading.name, Loading);
```js ```js
import { Loading } from 'vant'; import { Loading } from 'vant';
import 'vant/lib/vant-css/loading.css';
export default { export default {
components: { components: {

View File

@ -53,6 +53,7 @@ Vue.component(Panel.name, Panel);
```js ```js
import { Panel } from 'vant'; import { Panel } from 'vant';
import 'vant/lib/vant-css/panel.css';
export default { export default {
components: { components: {

View File

@ -8,6 +8,7 @@ const citys = {
export default { export default {
data() { data() {
return { return {
title: '地区选择',
pickerColumns: [ pickerColumns: [
{ {
values: Object.keys(citys), values: Object.keys(citys),
@ -59,6 +60,7 @@ Vue.component(Picker.name, Picker);
```js ```js
import { Picker } from 'vant'; import { Picker } from 'vant';
import 'vant/lib/vant-css/picker.css';
export default { export default {
components: { components: {
@ -112,7 +114,14 @@ export default {
:::demo 带toolbar的Picker :::demo 带toolbar的Picker
```html ```html
<van-picker :columns="pickerColumns" show-toolbar @change="handlePickerChange" @cancel="handlePickerCancel" @confirm="handlePickerConfirm"></van-picker> <van-picker
:title="title"
:columns="pickerColumns"
show-toolbar
@change="handlePickerChange"
@cancel="handlePickerCancel"
@confirm="handlePickerConfirm"
></van-picker>
<script> <script>
const citys = { const citys = {
@ -124,6 +133,7 @@ const citys = {
export default { export default {
data() { data() {
return { return {
title: '地区选择',
pickerColumns: [ pickerColumns: [
{ {
values: Object.keys(citys), values: Object.keys(citys),
@ -161,6 +171,7 @@ export default {
| itemHeight | 选中元素区高度 | `number` | `44` | | | itemHeight | 选中元素区高度 | `number` | `44` | |
| columns | 对象数组,配置每一列显示的数据 | `Array` | | | | columns | 对象数组,配置每一列显示的数据 | `Array` | | |
| showToolbar | 是否在组件顶部显示一个toolbar | `Boolean` | `true` | | | showToolbar | 是否在组件顶部显示一个toolbar | `Boolean` | `true` | |
| title | 在toolbar上显示的标题文字 | `String` | | |
### columns ### columns

View File

@ -102,6 +102,7 @@ Vue.component(Popup.name, Popup);
```js ```js
import { Popup } from 'vant'; import { Popup } from 'vant';
import 'vant/lib/vant-css/popup.css';
export default { export default {
components: { components: {

View File

@ -34,6 +34,7 @@ Vue.component(Progress.name, Progress);
```js ```js
import { Progress } from 'vant'; import { Progress } from 'vant';
import 'vant/lib/vant-css/progress.css';
export default { export default {
components: { components: {

View File

@ -47,6 +47,7 @@ Vue.component(Quantity.name, Quantity);
```js ```js
import { Quantity } from 'vant'; import { Quantity } from 'vant';
import 'vant/lib/vant-css/quantity.css';
export default { export default {
components: { components: {

View File

@ -50,6 +50,7 @@ Vue.component(RadioGroup.name, RadioGroup);
```js ```js
import { Radio, RadioGroup } from 'vant'; import { Radio, RadioGroup } from 'vant';
import 'vant/lib/vant-css/radio.css';
export default { export default {
components: { components: {

View File

@ -38,6 +38,7 @@ Vue.component(Search.name, Search);
```js ```js
import { Search } from 'vant'; import { Search } from 'vant';
import 'vant/lib/vant-css/search.css';
export default { export default {
components: { components: {

View File

@ -53,6 +53,7 @@ Vue.component(Step.name, Step);
```js ```js
import { Steps, Step } from 'vant'; import { Steps, Step } from 'vant';
import 'vant/lib/vant-css/steps.css';
export default { export default {
components: { components: {
@ -97,7 +98,7 @@ export default {
#### 只显示步骤条 #### 只显示步骤条
当你不设置`title``description`属性时,就会🈯️显示步骤条,而没有步骤的详细信息。 当你不设置`title``description`属性时,就会显示步骤条,而没有步骤的详细信息。
:::demo 只显示步骤条 :::demo 只显示步骤条
```html ```html
@ -110,6 +111,22 @@ export default {
``` ```
::: :::
### 高级用法
可以使用具名`slot`增加自定义内容,其中包含`icon``message-extra`
:::demo 高级用法
```html
<van-steps :active="active" title="等待商家发货">
<van-icon slot="icon" name="like"></van-icon>
<p slot="message-extra">流程</p>
<van-step>买家下单</van-step>
<van-step>商家接单</van-step>
<van-step>买家提货</van-step>
<van-step>交易完成</van-step>
</van-steps>
```
:::
### Steps API ### Steps API

View File

@ -60,6 +60,7 @@ Vue.component(SwipeItem.name, SwipeItem);
```js ```js
import { Swipe, SwipeItem } from 'vant'; import { Swipe, SwipeItem } from 'vant';
import 'vant/lib/vant-css/swipe.css';
export default { export default {
components: { components: {

View File

@ -67,6 +67,7 @@ Vue.component(Switch.name, Switch);
```js ```js
import { Switch } from 'vant'; import { Switch } from 'vant';
import 'vant/lib/vant-css/switch.css';
export default { export default {
components: { components: {

View File

@ -74,6 +74,7 @@ Vue.component(Tabs.name, Tabs);
```js ```js
import { Tab, Tabs } from 'vant'; import { Tab, Tabs } from 'vant';
import 'vant/lib/vant-css/tab.css';
export default { export default {
components: { components: {
@ -103,7 +104,7 @@ export default {
#### active特定tab #### active特定tab
可以在`van-tabs`上设置`active`为对应`tab`的索引从0开始即0代表第一个即可激活对应`tab` 可以在`van-tabs`上设置`active`为对应`tab`的索引从0开始即0代表第一个即可激活对应`tab`默认为0
:::demo 基础用法 :::demo 基础用法
```html ```html
@ -117,6 +118,20 @@ export default {
``` ```
::: :::
### 设置切换tab的动画时间
通过设置`duration`来指定时间默认为0.3s,只接受`Number`类型参数。
:::demo 设置切换tab的动画时间
```html
<van-tabs :duration="0.6">
<van-tab title="选项一">内容一</van-tab>
<van-tab title="选项二">内容二</van-tab>
<van-tab title="选项三">内容三</van-tab>
</van-tabs>
```
:::
#### 禁用tab #### 禁用tab
在对应的`van-tab`上设置`disabled`属性即可,如果需要监听禁用事件,可以监听`disabled`事件。 在对应的`van-tab`上设置`disabled`属性即可,如果需要监听禁用事件,可以监听`disabled`事件。
@ -124,7 +139,7 @@ export default {
:::demo 禁用tab :::demo 禁用tab
```html ```html
<van-tabs> <van-tabs>
<van-tab title="选项">内容一</van-tab> <van-tab title="选项">内容一</van-tab>
<van-tab title="选项二" disabled @disabled="popalert">内容二</van-tab> <van-tab title="选项二" disabled @disabled="popalert">内容二</van-tab>
<van-tab title="选项三">内容三</van-tab> <van-tab title="选项三">内容三</van-tab>
<van-tab title="选项四">内容四</van-tab> <van-tab title="选项四">内容四</van-tab>
@ -235,6 +250,7 @@ export default {
| classtype | 两种UI | `string` | `line` | `line`, `card` | | classtype | 两种UI | `string` | `line` | `line`, `card` |
| active | 默认激活的tab | `string`, `number` | `0` | | | active | 默认激活的tab | `string`, `number` | `0` | |
| navclass | tabs的内部nav上的自定义classname | `string` | | | | navclass | tabs的内部nav上的自定义classname | `string` | | |
| duration | 切换tab的动画时间 | `number` | `0.3` | | |
### van-tab API ### van-tab API

View File

@ -32,6 +32,7 @@ Vue.component(Tag.name, Tag);
```js ```js
import { Tag } from 'vant'; import { Tag } from 'vant';
import 'vant/lib/vant-css/tag.css';
export default { export default {
components: { components: {
@ -44,18 +45,17 @@ export default {
#### 基础用法 #### 基础用法
`Tag`目前有三种类型,`danger``success``primary`,它们分别显示为红色,绿色和蓝色,你也可以加上自定义的类,为它们加上其他的颜色。 `Tag`默认是灰色,另外还有有三种类型,`danger``success``primary`,它们分别显示为红色,绿色和蓝色,你也可以加上自定义的类,为它们加上其他的颜色。
:::demo 基础用法 :::demo 基础用法
```html ```html
<div class="tags-container"> <div class="tags-container">
<van-tag>返现</van-tag> <van-tag>返现</van-tag>
<van-tag plain>返现</van-tag>
</div> </div>
<div class="tags-container"> <div class="tags-container">
<van-tag type="danger">返现</van-tag> <van-tag type="danger">返现</van-tag>
<van-tag type="danger">四字标签</van-tag> <van-tag type="success">四字标签</van-tag>
<van-tag type="danger"></van-tag> <van-tag type="primary"></van-tag>
</div> </div>
``` ```
::: :::
@ -66,6 +66,10 @@ export default {
:::demo 高级用法 :::demo 高级用法
```html ```html
<div class="tags-container">
<van-tag>返现</van-tag>
<van-tag plain>返现</van-tag>
</div>
<div class="tags-container"> <div class="tags-container">
<van-tag type="danger">返现</van-tag> <van-tag type="danger">返现</van-tag>
<van-tag plain type="danger">返现</van-tag> <van-tag plain type="danger">返现</van-tag>
@ -78,9 +82,6 @@ export default {
<van-tag type="success">返现</van-tag> <van-tag type="success">返现</van-tag>
<van-tag plain type="success">返现</van-tag> <van-tag plain type="success">返现</van-tag>
</div> </div>
<div class="tags-container">
<van-tag type="danger" mark>返现</van-tag>
</div>
``` ```
::: :::

View File

@ -37,6 +37,7 @@ Vue.component(Uploader.name, Uploader);
```js ```js
import { Uploader } from 'vant'; import { Uploader } from 'vant';
import 'vant/lib/vant-css/uploader.css';
export default { export default {
components: { components: {

View File

@ -21,6 +21,10 @@ module.exports = {
{ {
"groupName": "基础组件", "groupName": "基础组件",
"list": [ "list": [
{
"path": "/layout",
"title": "Layout 布局"
},
{ {
"path": "/button", "path": "/button",
"title": "Button 按钮" "title": "Button 按钮"
@ -37,21 +41,17 @@ module.exports = {
"path": "/progress", "path": "/progress",
"title": "Progress 进度条" "title": "Progress 进度条"
}, },
{
"path": "/panel",
"title": "Panel 面板"
},
{ {
"path": "/card", "path": "/card",
"title": "Card 图文组件" "title": "Card 图文组件"
}, },
{ {
"path": "/loading", "path": "/panel",
"title": "Loading 加载" "title": "Panel 面板"
}, },
{ {
"path": "/layout", "path": "/loading",
"title": "Layout 布局" "title": "Loading 加载"
}, },
{ {
"path": "/steps", "path": "/steps",

View File

@ -1,6 +1,6 @@
{ {
"name": "vant", "name": "vant",
"version": "0.5.2", "version": "0.5.7",
"description": "有赞vue wap组件库", "description": "有赞vue wap组件库",
"main": "lib/vant.js", "main": "lib/vant.js",
"style": "lib/vant-css/index.css", "style": "lib/vant-css/index.css",
@ -104,6 +104,7 @@
"mocha": "^3.2.0", "mocha": "^3.2.0",
"optimize-css-assets-webpack-plugin": "^1.3.0", "optimize-css-assets-webpack-plugin": "^1.3.0",
"postcss": "^5.1.2", "postcss": "^5.1.2",
"postcss-css-reset": "^1.0.2",
"postcss-easy-import": "^2.0.0", "postcss-easy-import": "^2.0.0",
"postcss-loader": "^1.3.3", "postcss-loader": "^1.3.3",
"precss": "^1.4.0", "precss": "^1.4.0",

View File

@ -24,7 +24,9 @@
<span v-text="value"></span> <span v-text="value"></span>
</slot> </slot>
</div> </div>
<i class="van-icon van-icon-arrow" v-if="isLink"></i> <slot name="right-icon">
<i class="van-cell__right-icon van-icon van-icon-arrow" v-if="isLink"></i>
</slot>
</a> </a>
</template> </template>

View File

@ -16,6 +16,7 @@ var ImagePreviewBox = images => {
initInstance(); initInstance();
} }
/* istanbul ignore else */
if (!instance.value) { if (!instance.value) {
instance.images = images; instance.images = images;

View File

@ -69,10 +69,14 @@ export default {
this.currentValues = val; this.currentValues = val;
}, },
currentValues(val) { currentValues(val) {
/* istanbul ignore else */
if (this.valueIndex === -1) { if (this.valueIndex === -1) {
this.currentValue = (val || [])[0]; this.currentValue = (val || [])[0];
} }
}, },
value(val) {
this.currentValue = val;
},
currentValue(val) { currentValue(val) {
this.doOnValueChange(); this.doOnValueChange();
@ -168,6 +172,7 @@ export default {
startTop: event.pageY, startTop: event.pageY,
startTranslateTop: translateUtil.getElementTranslate(el).top startTranslateTop: translateUtil.getElementTranslate(el).top
}; };
pickerItems = el.querySelectorAll('.van-picker-item'); // eslint-disable-line pickerItems = el.querySelectorAll('.van-picker-item'); // eslint-disable-line
}, },

View File

@ -4,6 +4,7 @@
<slot> <slot>
<a href="javascript:void(0)" class="van-picker__cancel" @click="handlePickerCancel">取消</a> <a href="javascript:void(0)" class="van-picker__cancel" @click="handlePickerCancel">取消</a>
<a href="javascript:void(0)" class="van-picker__confirm" @click="handlePickerConfirm">完成</a> <a href="javascript:void(0)" class="van-picker__confirm" @click="handlePickerConfirm">完成</a>
<p v-if="title" class="van-picker__title">{{ title }}</p>
</slot> </slot>
</div> </div>
<div class="van-picker__columns" :class="['van-picker__columns--' + columns.length]"> <div class="van-picker__columns" :class="['van-picker__columns--' + columns.length]">
@ -65,6 +66,10 @@ export default {
type: Boolean, type: Boolean,
default: false default: false
}, },
/**
* 顶部toolbar 显示的title
*/
title: String,
valueKey: String valueKey: String
}, },

View File

@ -1,7 +1,7 @@
<template> <template>
<div class="van-steps" :class="`van-steps--${steps.length}`"> <div class="van-steps" :class="`van-steps--${steps.length}`">
<div class="van-steps__status" v-if="title || description"> <div class="van-steps__status" v-if="title || description">
<div class="van-steps__icon" v-if="icon || $slot.icon"> <div class="van-steps__icon" v-if="icon || $slots.icon">
<slot name="icon"> <slot name="icon">
<van-icon :name="icon" :class="iconClass"></van-icon> <van-icon :name="icon" :class="iconClass"></van-icon>
</slot> </slot>

View File

@ -35,6 +35,11 @@
type: { type: {
type: String, type: String,
default: 'line' default: 'line'
},
// tab
duration: {
type: Number,
default: 0.3
} }
}, },
@ -66,7 +71,8 @@
return { return {
width: offsetWidth, width: offsetWidth,
transform: `translate3d(${offsetLeft}, 0px, 0px)` transform: `translate3d(${offsetLeft}, 0px, 0px)`,
transitionDuration: `${this.duration}s`
}; };
} }
}, },

View File

@ -5,10 +5,17 @@
</template> </template>
<script> <script>
const ALLOW_TYPE = ['danger', 'success', 'primary'];
export default { export default {
name: 'van-tag', name: 'van-tag',
props: { props: {
type: {
type: String, type: String,
validator: function (val) {
return ~ALLOW_TYPE.indexOf(val);
}
},
mark: Boolean, mark: Boolean,
plain: Boolean plain: Boolean
} }

View File

@ -1,11 +1,11 @@
var gulp = require('gulp'); var gulp = require('gulp');
var postcss = require('gulp-postcss'); var postcss = require('gulp-postcss');
var cssmin = require('gulp-cssmin'); var cssmin = require('gulp-cssmin');
var salad = require('postcss-salad')(require('./salad.config.json')); var postcssPlugin = require('../../build/utils/postcss_pipe')();
gulp.task('compile', function() { gulp.task('compile', function() {
return gulp.src('./src/*.css') return gulp.src('./src/*.css')
.pipe(postcss([salad])) .pipe(postcss(postcssPlugin))
.pipe(cssmin()) .pipe(cssmin())
.pipe(gulp.dest('./lib')); .pipe(gulp.dest('./lib'));
}); });

View File

@ -1,6 +1,6 @@
{ {
"name": "vant-css", "name": "vant-css",
"version": "0.5.2", "version": "0.5.7",
"description": "vant css.", "description": "vant css.",
"main": "lib/index.css", "main": "lib/index.css",
"style": "lib/index.css", "style": "lib/index.css",
@ -14,10 +14,14 @@
}, },
"license": "MIT", "license": "MIT",
"devDependencies": { "devDependencies": {
"autoprefixer": "^6.7.5",
"gulp": "^3.9.1", "gulp": "^3.9.1",
"gulp-cssmin": "^0.1.7", "gulp-cssmin": "^0.1.7",
"gulp-postcss": "^6.1.1", "gulp-postcss": "^6.1.1",
"postcss-salad": "^1.0.5" "postcss-css-reset": "^1.0.2",
"postcss-easy-import": "^2.0.0",
"precss": "^1.4.0",
"saladcss-bem": "^0.0.1"
}, },
"dependencies": {} "dependencies": {}
} }

View File

@ -1,16 +0,0 @@
{
"browsers": ["ie > 8", "last 2 versions"],
"features": {
"bem": {
"shortcuts": {
"component": "b",
"modifier": "m",
"descendent": "e"
},
"separators": {
"descendent": "__",
"modifier": "--"
}
}
}
}

View File

@ -161,6 +161,16 @@ module.exports = {
keywords: ['alipay'], keywords: ['alipay'],
src: '支付宝支付.svg', src: '支付宝支付.svg',
css: 'alipay' css: 'alipay'
},
{
keywords: ['password', 'view'],
src: '密码可查看.svg',
css: 'password-view'
},
{
keywords: ['password', 'not', 'view'],
src: '密码不可查看.svg',
css: 'password-not-view'
} }
] ]
}; };

View File

@ -14,7 +14,8 @@
} }
@b cell { @b cell {
display: block; width: 100%;
display: table;
position: relative; position: relative;
padding: 10px 15px 10px 0; padding: 10px 15px 10px 0;
box-sizing: border-box; box-sizing: border-box;
@ -36,7 +37,7 @@
} }
@e title { @e title {
float: left; display: table-cell;
} }
@e label { @e label {
@ -47,15 +48,17 @@
} }
@e value { @e value {
float: right; display: table-cell;
text-align: right;
vertical-align: middle;
overflow: hidden; overflow: hidden;
@m link { @m link {
margin-right: 20px; padding-right: 20px;
} }
@m alone { @m alone {
float: none; text-align: left;
} }
} }
@ -76,7 +79,7 @@
} }
} }
.van-icon-arrow { @e right-icon {
position: absolute; position: absolute;
top: 50%; top: 50%;
right: 15px; right: 15px;

View File

@ -2,11 +2,11 @@
@font-face { @font-face {
font-family: 'vant-icon'; font-family: 'vant-icon';
src: url('https://b.yzcdn.cn/zanui/icon/vant-icon-9e3e482229.eot'); src: url('https://b.yzcdn.cn/zanui/icon/vant-icon-1f66ec158e.eot');
src: url('https://b.yzcdn.cn/zanui/icon/vant-icon-9e3e482229.eot?#iefix') format('embedded-opentype'), src: url('https://b.yzcdn.cn/zanui/icon/vant-icon-1f66ec158e.eot?#iefix') format('embedded-opentype'),
url('https://b.yzcdn.cn/zanui/icon/vant-icon-9e3e482229.woff2') format('woff2'), url('https://b.yzcdn.cn/zanui/icon/vant-icon-1f66ec158e.woff2') format('woff2'),
url('https://b.yzcdn.cn/zanui/icon/vant-icon-9e3e482229.woff') format('woff'), url('https://b.yzcdn.cn/zanui/icon/vant-icon-1f66ec158e.woff') format('woff'),
url('https://b.yzcdn.cn/zanui/icon/vant-icon-9e3e482229.ttf') format('truetype') url('https://b.yzcdn.cn/zanui/icon/vant-icon-1f66ec158e.ttf') format('truetype')
} }
.van-icon { .van-icon {
@ -76,3 +76,5 @@
.van-icon-contact:before { content: '\e81a'; } /* '' */ .van-icon-contact:before { content: '\e81a'; } /* '' */
.van-icon-wechat:before { content: '\e81b'; } /* '' */ .van-icon-wechat:before { content: '\e81b'; } /* '' */
.van-icon-alipay:before { content: '\e81c'; } /* '' */ .van-icon-alipay:before { content: '\e81c'; } /* '' */
.van-icon-password-view:before { content: '\e81d'; } /* '' */
.van-icon-password-not-view:before { content: '\e81e'; } /* '' */

View File

@ -1,6 +1,7 @@
/** /**
css组件库入口组装成css组件库 css组件库入口组装成css组件库
*/ */
@import './reset.css';
@import './button.css'; @import './button.css';
@import './cell.css'; @import './cell.css';
@import './card.css'; @import './card.css';

View File

@ -27,6 +27,17 @@
float: right; float: right;
} }
@e title {
height: 40px;
padding: 0 10px;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
word-wrap: normal;
word-break: break-all;
text-align: center;
}
@e columns { @e columns {
position: relative; position: relative;
overflow: hidden; overflow: hidden;

View File

@ -0,0 +1,26 @@
@reset-global mobile;
body {
font-family: Helvetica, "STHeiti STXihei", "Microsoft YaHei", Tohoma, Arial, sans-serif;
color: #333;
background-color: #f8f8f8;
-webkit-backface-visibility: hidden;
}
a {
background: transparent;
text-decoration: none;
-webkit-tap-highlight-color: rgba(0, 0, 0, 0);
}
button,
input[type='number'],input[type='text'],input[type='password'],input[type='email'],input[type='search'],
select,
textarea {
font-family: inherit;
font-size: 100%;
margin: 0;
-webkit-tap-highlight-color: rgba(0, 0, 0, 0);
-webkit-appearance: none;
-moz-appearance: none;
}

View File

@ -86,7 +86,6 @@
font-size: 14px; font-size: 14px;
line-height: 44px; line-height: 44px;
box-sizing: border-box; box-sizing: border-box;
transition: color .3s cubic-bezier(.645, .045, .355, 1);
cursor: pointer; cursor: pointer;
text-align: center; text-align: center;
float: left; float: left;

View File

@ -22,11 +22,7 @@ ansi-styles@^2.2.1:
version "2.2.1" version "2.2.1"
resolved "http://registry.npm.qima-inc.com/ansi-styles/download/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe" resolved "http://registry.npm.qima-inc.com/ansi-styles/download/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe"
any-promise@^1.0.0: any-promise@^0.1.0, any-promise@~0.1.0:
version "1.3.0"
resolved "http://registry.npm.qima-inc.com/any-promise/download/any-promise-1.3.0.tgz#abc6afeedcea52e809cdc0376aed3ce39635d17f"
any-promise@~0.1.0:
version "0.1.0" version "0.1.0"
resolved "http://registry.npm.qima-inc.com/any-promise/download/any-promise-0.1.0.tgz#830b680aa7e56f33451d4b049f3bd8044498ee27" resolved "http://registry.npm.qima-inc.com/any-promise/download/any-promise-0.1.0.tgz#830b680aa7e56f33451d4b049f3bd8044498ee27"
@ -76,13 +72,9 @@ arrify@^1.0.0:
version "1.0.1" version "1.0.1"
resolved "http://registry.npm.qima-inc.com/arrify/download/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d" resolved "http://registry.npm.qima-inc.com/arrify/download/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d"
async@~0.2.6: autoprefixer@^6.7.5:
version "0.2.10"
resolved "http://registry.npm.qima-inc.com/async/download/async-0.2.10.tgz#b6bbe0b0674b9d719708ca38de8c237cb526c3d1"
autoprefixer@^6.0.2:
version "6.7.7" version "6.7.7"
resolved "http://registry.npm.qima-inc.com/autoprefixer/download/autoprefixer-6.7.7.tgz#1dbd1c835658e35ce3f9984099db00585c782014" resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-6.7.7.tgz#1dbd1c835658e35ce3f9984099db00585c782014"
dependencies: dependencies:
browserslist "^1.7.6" browserslist "^1.7.6"
caniuse-db "^1.0.30000634" caniuse-db "^1.0.30000634"
@ -91,22 +83,7 @@ autoprefixer@^6.0.2:
postcss "^5.2.16" postcss "^5.2.16"
postcss-value-parser "^3.2.3" postcss-value-parser "^3.2.3"
babel-polyfill@^6.7.4: balanced-match@0.1.0:
version "6.23.0"
resolved "http://registry.npm.qima-inc.com/babel-polyfill/download/babel-polyfill-6.23.0.tgz#8364ca62df8eafb830499f699177466c3b03499d"
dependencies:
babel-runtime "^6.22.0"
core-js "^2.4.0"
regenerator-runtime "^0.10.0"
babel-runtime@^6.22.0:
version "6.23.0"
resolved "http://registry.npm.qima-inc.com/babel-runtime/download/babel-runtime-6.23.0.tgz#0a9489f144de70efb3ce4300accdb329e2fc543b"
dependencies:
core-js "^2.4.0"
regenerator-runtime "^0.10.0"
balanced-match@0.1.0, balanced-match@^0.1.0:
version "0.1.0" version "0.1.0"
resolved "http://registry.npm.qima-inc.com/balanced-match/download/balanced-match-0.1.0.tgz#b504bd05869b39259dd0c5efc35d843176dccc4a" resolved "http://registry.npm.qima-inc.com/balanced-match/download/balanced-match-0.1.0.tgz#b504bd05869b39259dd0c5efc35d843176dccc4a"
@ -122,10 +99,6 @@ beeper@^1.0.0:
version "1.1.1" version "1.1.1"
resolved "http://registry.npm.qima-inc.com/beeper/download/beeper-1.1.1.tgz#e6d5ea8c5dad001304a70b22638447f69cb2f809" resolved "http://registry.npm.qima-inc.com/beeper/download/beeper-1.1.1.tgz#e6d5ea8c5dad001304a70b22638447f69cb2f809"
boolbase@~1.0.0:
version "1.0.0"
resolved "http://registry.npm.qima-inc.com/boolbase/download/boolbase-1.0.0.tgz#68dff5fbe60c51eb37725ea9e3ed310dcc1e776e"
brace-expansion@^1.0.0: brace-expansion@^1.0.0:
version "1.1.7" version "1.1.7"
resolved "http://registry.npm.qima-inc.com/brace-expansion/download/brace-expansion-1.1.7.tgz#3effc3c50e000531fb720eaff80f0ae8ef23cf59" resolved "http://registry.npm.qima-inc.com/brace-expansion/download/brace-expansion-1.1.7.tgz#3effc3c50e000531fb720eaff80f0ae8ef23cf59"
@ -141,7 +114,7 @@ braces@^1.8.2:
preserve "^0.2.0" preserve "^0.2.0"
repeat-element "^1.1.2" repeat-element "^1.1.2"
browserslist@^1.0.0, browserslist@^1.3.6, browserslist@^1.7.6: browserslist@^1.7.6:
version "1.7.7" version "1.7.7"
resolved "http://registry.npm.qima-inc.com/browserslist/download/browserslist-1.7.7.tgz#0bd76704258be829b2398bb50e4b62d1a166b0b9" resolved "http://registry.npm.qima-inc.com/browserslist/download/browserslist-1.7.7.tgz#0bd76704258be829b2398bb50e4b62d1a166b0b9"
dependencies: dependencies:
@ -167,16 +140,7 @@ camelcase@^2.0.0:
version "2.1.1" version "2.1.1"
resolved "http://registry.npm.qima-inc.com/camelcase/download/camelcase-2.1.1.tgz#7c1d16d679a1bbe59ca02cacecfb011e201f5a1f" resolved "http://registry.npm.qima-inc.com/camelcase/download/camelcase-2.1.1.tgz#7c1d16d679a1bbe59ca02cacecfb011e201f5a1f"
caniuse-api@^1.3.2: caniuse-db@^1.0.30000634, caniuse-db@^1.0.30000639:
version "1.6.1"
resolved "http://registry.npm.qima-inc.com/caniuse-api/download/caniuse-api-1.6.1.tgz#b534e7c734c4f81ec5fbe8aca2ad24354b962c6c"
dependencies:
browserslist "^1.3.6"
caniuse-db "^1.0.30000529"
lodash.memoize "^4.1.2"
lodash.uniq "^4.5.0"
caniuse-db@^1.0.30000529, caniuse-db@^1.0.30000634, caniuse-db@^1.0.30000639:
version "1.0.30000656" version "1.0.30000656"
resolved "http://registry.npm.qima-inc.com/caniuse-db/download/caniuse-db-1.0.30000656.tgz#127c8c6e655e7464e58f039558f1e878fcca3c45" resolved "http://registry.npm.qima-inc.com/caniuse-db/download/caniuse-db-1.0.30000656.tgz#127c8c6e655e7464e58f039558f1e878fcca3c45"
@ -235,7 +199,7 @@ color-string@^0.3.0:
dependencies: dependencies:
color-name "^1.0.0" color-name "^1.0.0"
color@^0.11.0, color@^0.11.1: color@^0.11.0:
version "0.11.4" version "0.11.4"
resolved "http://registry.npm.qima-inc.com/color/download/color-0.11.4.tgz#6d7b5c74fb65e841cd48792ad1ed5e07b904d764" resolved "http://registry.npm.qima-inc.com/color/download/color-0.11.4.tgz#6d7b5c74fb65e841cd48792ad1ed5e07b904d764"
dependencies: dependencies:
@ -253,10 +217,6 @@ concat-map@0.0.1:
version "0.0.1" version "0.0.1"
resolved "http://registry.npm.qima-inc.com/concat-map/download/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" resolved "http://registry.npm.qima-inc.com/concat-map/download/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
core-js@^2.4.0:
version "2.4.1"
resolved "http://registry.npm.qima-inc.com/core-js/download/core-js-2.4.1.tgz#4de911e667b0eae9124e34254b53aea6fc618d3e"
core-util-is@~1.0.0: core-util-is@~1.0.0:
version "1.0.2" version "1.0.2"
resolved "http://registry.npm.qima-inc.com/core-util-is/download/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7" resolved "http://registry.npm.qima-inc.com/core-util-is/download/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
@ -281,23 +241,6 @@ css-color-function@^1.2.0:
debug "~0.7.4" debug "~0.7.4"
rgb "~0.1.0" rgb "~0.1.0"
css-font-weight-names@^0.2.1:
version "0.2.1"
resolved "http://registry.npm.qima-inc.com/css-font-weight-names/download/css-font-weight-names-0.2.1.tgz#5710d485ad295f6b3f1ceec41f882e324a46b516"
css-select@^1.2.0:
version "1.2.0"
resolved "http://registry.npm.qima-inc.com/css-select/download/css-select-1.2.0.tgz#2b3a110539c5355f1cd8d314623e870b121ec858"
dependencies:
boolbase "~1.0.0"
css-what "2.1"
domutils "1.5.1"
nth-check "~1.0.1"
css-what@2.1:
version "2.1.0"
resolved "http://registry.npm.qima-inc.com/css-what/download/css-what-2.1.0.tgz#9467d032c38cfaefb9f2d79501253062f87fa1bd"
currently-unhandled@^0.4.1: currently-unhandled@^0.4.1:
version "0.4.1" version "0.4.1"
resolved "http://registry.npm.qima-inc.com/currently-unhandled/download/currently-unhandled-0.4.1.tgz#988df33feab191ef799a61369dd76c17adf957ea" resolved "http://registry.npm.qima-inc.com/currently-unhandled/download/currently-unhandled-0.4.1.tgz#988df33feab191ef799a61369dd76c17adf957ea"
@ -339,42 +282,6 @@ detect-file@^0.1.0:
dependencies: dependencies:
fs-exists-sync "^0.1.0" fs-exists-sync "^0.1.0"
directory-encoder@^0.7.2:
version "0.7.2"
resolved "http://registry.npm.qima-inc.com/directory-encoder/download/directory-encoder-0.7.2.tgz#59b4e2aa4f25422f6c63b527b462f5e2d0dd2c58"
dependencies:
fs-extra "^0.23.1"
handlebars "^1.3.0"
img-stats "^0.5.2"
dom-serializer@0, dom-serializer@^0.1.0:
version "0.1.0"
resolved "http://registry.npm.qima-inc.com/dom-serializer/download/dom-serializer-0.1.0.tgz#073c697546ce0780ce23be4a28e293e40bc30c82"
dependencies:
domelementtype "~1.1.1"
entities "~1.1.1"
domelementtype@1, domelementtype@^1.3.0:
version "1.3.0"
resolved "http://registry.npm.qima-inc.com/domelementtype/download/domelementtype-1.3.0.tgz#b17aed82e8ab59e52dd9c19b1756e0fc187204c2"
domelementtype@~1.1.1:
version "1.1.3"
resolved "http://registry.npm.qima-inc.com/domelementtype/download/domelementtype-1.1.3.tgz#bd28773e2642881aec51544924299c5cd822185b"
domhandler@^2.3.0:
version "2.3.0"
resolved "http://registry.npm.qima-inc.com/domhandler/download/domhandler-2.3.0.tgz#2de59a0822d5027fabff6f032c2b25a2a8abe738"
dependencies:
domelementtype "1"
domutils@1.5.1, domutils@^1.5.1:
version "1.5.1"
resolved "http://registry.npm.qima-inc.com/domutils/download/domutils-1.5.1.tgz#dcd8488a26f563d61079e48c9f7b7e32373682cf"
dependencies:
dom-serializer "0"
domelementtype "1"
duplexer2@0.0.2: duplexer2@0.0.2:
version "0.0.2" version "0.0.2"
resolved "http://registry.npm.qima-inc.com/duplexer2/download/duplexer2-0.0.2.tgz#c614dcf67e2fb14995a91711e5a617e8a60a31db" resolved "http://registry.npm.qima-inc.com/duplexer2/download/duplexer2-0.0.2.tgz#c614dcf67e2fb14995a91711e5a617e8a60a31db"
@ -391,10 +298,6 @@ end-of-stream@~0.1.5:
dependencies: dependencies:
once "~1.3.0" once "~1.3.0"
entities@^1.1.1, entities@~1.1.1:
version "1.1.1"
resolved "http://registry.npm.qima-inc.com/entities/download/entities-1.1.1.tgz#6e5c2d0a5621b5dadaecef80b90edfb5cd7772f0"
error-ex@^1.2.0: error-ex@^1.2.0:
version "1.3.1" version "1.3.1"
resolved "http://registry.npm.qima-inc.com/error-ex/download/error-ex-1.3.1.tgz#f855a86ce61adc4e8621c3cda21e7a7612c3a8dc" resolved "http://registry.npm.qima-inc.com/error-ex/download/error-ex-1.3.1.tgz#f855a86ce61adc4e8621c3cda21e7a7612c3a8dc"
@ -502,10 +405,6 @@ flagged-respawn@^0.3.2:
version "0.3.2" version "0.3.2"
resolved "http://registry.npm.qima-inc.com/flagged-respawn/download/flagged-respawn-0.3.2.tgz#ff191eddcd7088a675b2610fffc976be9b8074b5" resolved "http://registry.npm.qima-inc.com/flagged-respawn/download/flagged-respawn-0.3.2.tgz#ff191eddcd7088a675b2610fffc976be9b8074b5"
flatten@^1.0.2:
version "1.0.2"
resolved "http://registry.npm.qima-inc.com/flatten/download/flatten-1.0.2.tgz#dae46a9d78fbe25292258cc1e780a41d95c03782"
for-in@^1.0.1: for-in@^1.0.1:
version "1.0.2" version "1.0.2"
resolved "http://registry.npm.qima-inc.com/for-in/download/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80" resolved "http://registry.npm.qima-inc.com/for-in/download/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80"
@ -520,15 +419,6 @@ fs-exists-sync@^0.1.0:
version "0.1.0" version "0.1.0"
resolved "http://registry.npm.qima-inc.com/fs-exists-sync/download/fs-exists-sync-0.1.0.tgz#982d6893af918e72d08dec9e8673ff2b5a8d6add" resolved "http://registry.npm.qima-inc.com/fs-exists-sync/download/fs-exists-sync-0.1.0.tgz#982d6893af918e72d08dec9e8673ff2b5a8d6add"
fs-extra@^0.23.1:
version "0.23.1"
resolved "http://registry.npm.qima-inc.com/fs-extra/download/fs-extra-0.23.1.tgz#6611dba6adf2ab8dc9c69fab37cddf8818157e3d"
dependencies:
graceful-fs "^4.1.2"
jsonfile "^2.1.0"
path-is-absolute "^1.0.0"
rimraf "^2.2.8"
fs-extra@^0.24.0: fs-extra@^0.24.0:
version "0.24.0" version "0.24.0"
resolved "http://registry.npm.qima-inc.com/fs-extra/download/fs-extra-0.24.0.tgz#d4e4342a96675cb7846633a6099249332b539952" resolved "http://registry.npm.qima-inc.com/fs-extra/download/fs-extra-0.24.0.tgz#d4e4342a96675cb7846633a6099249332b539952"
@ -538,41 +428,12 @@ fs-extra@^0.24.0:
path-is-absolute "^1.0.0" path-is-absolute "^1.0.0"
rimraf "^2.2.8" rimraf "^2.2.8"
fs-extra@^0.26.5:
version "0.26.7"
resolved "http://registry.npm.qima-inc.com/fs-extra/download/fs-extra-0.26.7.tgz#9ae1fdd94897798edab76d0918cf42d0c3184fa9"
dependencies:
graceful-fs "^4.1.2"
jsonfile "^2.1.0"
klaw "^1.0.0"
path-is-absolute "^1.0.0"
rimraf "^2.2.8"
fs-extra@^0.30.0:
version "0.30.0"
resolved "http://registry.npm.qima-inc.com/fs-extra/download/fs-extra-0.30.0.tgz#f233ffcc08d4da7d432daa449776989db1df93f0"
dependencies:
graceful-fs "^4.1.2"
jsonfile "^2.1.0"
klaw "^1.0.0"
path-is-absolute "^1.0.0"
rimraf "^2.2.8"
fs-promise@^0.3.1: fs-promise@^0.3.1:
version "0.3.1" version "0.3.1"
resolved "http://registry.npm.qima-inc.com/fs-promise/download/fs-promise-0.3.1.tgz#bf34050368f24d6dc9dfc6688ab5cead8f86842a" resolved "http://registry.npm.qima-inc.com/fs-promise/download/fs-promise-0.3.1.tgz#bf34050368f24d6dc9dfc6688ab5cead8f86842a"
dependencies: dependencies:
any-promise "~0.1.0" any-promise "~0.1.0"
fs-promise@^0.5.0:
version "0.5.0"
resolved "http://registry.npm.qima-inc.com/fs-promise/download/fs-promise-0.5.0.tgz#4347d6bf624655a7061a4319213c393276ad3ef3"
dependencies:
any-promise "^1.0.0"
fs-extra "^0.26.5"
mz "^2.3.1"
thenify-all "^1.6.0"
fs.realpath@^1.0.0: fs.realpath@^1.0.0:
version "1.0.0" version "1.0.0"
resolved "http://registry.npm.qima-inc.com/fs.realpath/download/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" resolved "http://registry.npm.qima-inc.com/fs.realpath/download/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
@ -642,7 +503,7 @@ glob@^5.0.3:
once "^1.3.0" once "^1.3.0"
path-is-absolute "^1.0.0" path-is-absolute "^1.0.0"
glob@^7.0.5: glob@^7.0.3, glob@^7.0.5:
version "7.1.1" version "7.1.1"
resolved "http://registry.npm.qima-inc.com/glob/download/glob-7.1.1.tgz#805211df04faaf1c63a3600306cdf5ade50b2ec8" resolved "http://registry.npm.qima-inc.com/glob/download/glob-7.1.1.tgz#805211df04faaf1c63a3600306cdf5ade50b2ec8"
dependencies: dependencies:
@ -688,6 +549,16 @@ globby@^3.0.1:
pify "^2.0.0" pify "^2.0.0"
pinkie-promise "^1.0.0" pinkie-promise "^1.0.0"
globby@^6.1.0:
version "6.1.0"
resolved "https://registry.yarnpkg.com/globby/-/globby-6.1.0.tgz#f5a6d70e8395e21c858fb0489d64df02424d506c"
dependencies:
array-union "^1.0.1"
glob "^7.0.3"
object-assign "^4.0.1"
pify "^2.0.0"
pinkie-promise "^2.0.0"
globule@~0.1.0: globule@~0.1.0:
version "0.1.0" version "0.1.0"
resolved "http://registry.npm.qima-inc.com/globule/download/globule-0.1.0.tgz#d9c8edde1da79d125a151b79533b978676346ae5" resolved "http://registry.npm.qima-inc.com/globule/download/globule-0.1.0.tgz#d9c8edde1da79d125a151b79533b978676346ae5"
@ -708,7 +579,7 @@ graceful-fs@^3.0.0:
dependencies: dependencies:
natives "^1.1.0" natives "^1.1.0"
graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.1.9: graceful-fs@^4.1.2, graceful-fs@^4.1.6:
version "4.1.11" version "4.1.11"
resolved "http://registry.npm.qima-inc.com/graceful-fs/download/graceful-fs-4.1.11.tgz#0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658" resolved "http://registry.npm.qima-inc.com/graceful-fs/download/graceful-fs-4.1.11.tgz#0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658"
@ -811,14 +682,6 @@ gulplog@^1.0.0:
dependencies: dependencies:
glogg "^1.0.0" glogg "^1.0.0"
handlebars@^1.3.0:
version "1.3.0"
resolved "http://registry.npm.qima-inc.com/handlebars/download/handlebars-1.3.0.tgz#9e9b130a93e389491322d975cf3ec1818c37ce34"
dependencies:
optimist "~0.3"
optionalDependencies:
uglify-js "~2.3"
has-ansi@^0.1.0: has-ansi@^0.1.0:
version "0.1.0" version "0.1.0"
resolved "http://registry.npm.qima-inc.com/has-ansi/download/has-ansi-0.1.0.tgz#84f265aae8c0e6a88a12d7022894b7568894c62e" resolved "http://registry.npm.qima-inc.com/has-ansi/download/has-ansi-0.1.0.tgz#84f265aae8c0e6a88a12d7022894b7568894c62e"
@ -851,37 +714,12 @@ hosted-git-info@^2.1.4:
version "2.4.2" version "2.4.2"
resolved "http://registry.npm.qima-inc.com/hosted-git-info/download/hosted-git-info-2.4.2.tgz#0076b9f46a270506ddbaaea56496897460612a67" resolved "http://registry.npm.qima-inc.com/hosted-git-info/download/hosted-git-info-2.4.2.tgz#0076b9f46a270506ddbaaea56496897460612a67"
htmlparser2@^3.9.0:
version "3.9.2"
resolved "http://registry.npm.qima-inc.com/htmlparser2/download/htmlparser2-3.9.2.tgz#1bdf87acca0f3f9e53fa4fcceb0f4b4cbb00b338"
dependencies:
domelementtype "^1.3.0"
domhandler "^2.3.0"
domutils "^1.5.1"
entities "^1.1.1"
inherits "^2.0.1"
readable-stream "^2.0.2"
humps@^1.1.0:
version "1.1.0"
resolved "http://registry.npm.qima-inc.com/humps/download/humps-1.1.0.tgz#99a05cc80b13ae754a3d1e1a92182f271ef1d98f"
img-stats@^0.5.2:
version "0.5.2"
resolved "http://registry.npm.qima-inc.com/img-stats/download/img-stats-0.5.2.tgz#c203496c42f2d9eb2e5ab8232fa756bab32c9e2b"
dependencies:
xmldom "^0.1.19"
indent-string@^2.1.0: indent-string@^2.1.0:
version "2.1.0" version "2.1.0"
resolved "http://registry.npm.qima-inc.com/indent-string/download/indent-string-2.1.0.tgz#8e2d48348742121b4a8218b7a137e9a52049dc80" resolved "http://registry.npm.qima-inc.com/indent-string/download/indent-string-2.1.0.tgz#8e2d48348742121b4a8218b7a137e9a52049dc80"
dependencies: dependencies:
repeating "^2.0.0" repeating "^2.0.0"
indexes-of@^1.0.1:
version "1.0.1"
resolved "http://registry.npm.qima-inc.com/indexes-of/download/indexes-of-1.0.1.tgz#f30f716c8e2bd346c7b67d3df3915566a7c05607"
inflight@^1.0.4: inflight@^1.0.4:
version "1.0.6" version "1.0.6"
resolved "http://registry.npm.qima-inc.com/inflight/download/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9" resolved "http://registry.npm.qima-inc.com/inflight/download/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
@ -893,7 +731,7 @@ inherits@1:
version "1.0.2" version "1.0.2"
resolved "http://registry.npm.qima-inc.com/inherits/download/inherits-1.0.2.tgz#ca4309dadee6b54cc0b8d247e8d7c7a0975bdc9b" resolved "http://registry.npm.qima-inc.com/inherits/download/inherits-1.0.2.tgz#ca4309dadee6b54cc0b8d247e8d7c7a0975bdc9b"
inherits@2, inherits@^2.0.1, inherits@~2.0.1: inherits@2, inherits@~2.0.1:
version "2.0.3" version "2.0.3"
resolved "http://registry.npm.qima-inc.com/inherits/download/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de" resolved "http://registry.npm.qima-inc.com/inherits/download/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
@ -944,6 +782,10 @@ is-extglob@^1.0.0:
version "1.0.0" version "1.0.0"
resolved "http://registry.npm.qima-inc.com/is-extglob/download/is-extglob-1.0.0.tgz#ac468177c4943405a092fc8f29760c6ffc6206c0" resolved "http://registry.npm.qima-inc.com/is-extglob/download/is-extglob-1.0.0.tgz#ac468177c4943405a092fc8f29760c6ffc6206c0"
is-extglob@^2.1.0:
version "2.1.1"
resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
is-finite@^1.0.0: is-finite@^1.0.0:
version "1.0.2" version "1.0.2"
resolved "http://registry.npm.qima-inc.com/is-finite/download/is-finite-1.0.2.tgz#cc6677695602be550ef11e8b4aa6305342b6d0aa" resolved "http://registry.npm.qima-inc.com/is-finite/download/is-finite-1.0.2.tgz#cc6677695602be550ef11e8b4aa6305342b6d0aa"
@ -956,6 +798,12 @@ is-glob@^2.0.0, is-glob@^2.0.1:
dependencies: dependencies:
is-extglob "^1.0.0" is-extglob "^1.0.0"
is-glob@^3.1.0:
version "3.1.0"
resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-3.1.0.tgz#7ba5ae24217804ac70707b96922567486cc3e84a"
dependencies:
is-extglob "^2.1.0"
is-number@^2.0.2, is-number@^2.1.0: is-number@^2.0.2, is-number@^2.1.0:
version "2.1.0" version "2.1.0"
resolved "http://registry.npm.qima-inc.com/is-number/download/is-number-2.1.0.tgz#01fcbbb393463a548f2f466cce16dece49db908f" resolved "http://registry.npm.qima-inc.com/is-number/download/is-number-2.1.0.tgz#01fcbbb393463a548f2f466cce16dece49db908f"
@ -1008,7 +856,7 @@ isobject@^2.0.0:
dependencies: dependencies:
isarray "1.0.0" isarray "1.0.0"
js-base64@^2.1.5, js-base64@^2.1.9: js-base64@^2.1.9:
version "2.1.9" version "2.1.9"
resolved "http://registry.npm.qima-inc.com/js-base64/download/js-base64-2.1.9.tgz#f0e80ae039a4bd654b5f281fc93f04a914a7fcce" resolved "http://registry.npm.qima-inc.com/js-base64/download/js-base64-2.1.9.tgz#f0e80ae039a4bd654b5f281fc93f04a914a7fcce"
@ -1031,12 +879,6 @@ kind-of@^3.0.2:
dependencies: dependencies:
is-buffer "^1.0.2" is-buffer "^1.0.2"
klaw@^1.0.0:
version "1.3.1"
resolved "http://registry.npm.qima-inc.com/klaw/download/klaw-1.3.1.tgz#4088433b46b3b1ba259d78785d8e96f73ba02439"
optionalDependencies:
graceful-fs "^4.1.9"
liftoff@^2.1.0: liftoff@^2.1.0:
version "2.3.0" version "2.3.0"
resolved "http://registry.npm.qima-inc.com/liftoff/download/liftoff-2.3.0.tgz#a98f2ff67183d8ba7cfaca10548bd7ff0550b385" resolved "http://registry.npm.qima-inc.com/liftoff/download/liftoff-2.3.0.tgz#a98f2ff67183d8ba7cfaca10548bd7ff0550b385"
@ -1115,7 +957,7 @@ lodash._reinterpolate@^2.4.1, lodash._reinterpolate@~2.4.1:
version "2.4.1" version "2.4.1"
resolved "http://registry.npm.qima-inc.com/lodash._reinterpolate/download/lodash._reinterpolate-2.4.1.tgz#4f1227aa5a8711fc632f5b07a1f4607aab8b3222" resolved "http://registry.npm.qima-inc.com/lodash._reinterpolate/download/lodash._reinterpolate-2.4.1.tgz#4f1227aa5a8711fc632f5b07a1f4607aab8b3222"
lodash._reinterpolate@^3.0.0, lodash._reinterpolate@~3.0.0: lodash._reinterpolate@^3.0.0:
version "3.0.0" version "3.0.0"
resolved "http://registry.npm.qima-inc.com/lodash._reinterpolate/download/lodash._reinterpolate-3.0.0.tgz#0ccf2d89166af03b3663c796538b75ac6e114d9d" resolved "http://registry.npm.qima-inc.com/lodash._reinterpolate/download/lodash._reinterpolate-3.0.0.tgz#0ccf2d89166af03b3663c796538b75ac6e114d9d"
@ -1207,10 +1049,6 @@ lodash.mapvalues@^4.4.0:
version "4.6.0" version "4.6.0"
resolved "http://registry.npm.qima-inc.com/lodash.mapvalues/download/lodash.mapvalues-4.6.0.tgz#1bafa5005de9dd6f4f26668c30ca37230cc9689c" resolved "http://registry.npm.qima-inc.com/lodash.mapvalues/download/lodash.mapvalues-4.6.0.tgz#1bafa5005de9dd6f4f26668c30ca37230cc9689c"
lodash.memoize@^4.1.2:
version "4.1.2"
resolved "http://registry.npm.qima-inc.com/lodash.memoize/download/lodash.memoize-4.1.2.tgz#bcc6c49a42a2840ed997f323eada5ecd182e0bfe"
lodash.pick@^4.2.1: lodash.pick@^4.2.1:
version "4.4.0" version "4.4.0"
resolved "http://registry.npm.qima-inc.com/lodash.pick/download/lodash.pick-4.4.0.tgz#52f05610fff9ded422611441ed1fc123a03001b3" resolved "http://registry.npm.qima-inc.com/lodash.pick/download/lodash.pick-4.4.0.tgz#52f05610fff9ded422611441ed1fc123a03001b3"
@ -1245,13 +1083,6 @@ lodash.template@^3.0.0:
lodash.restparam "^3.0.0" lodash.restparam "^3.0.0"
lodash.templatesettings "^3.0.0" lodash.templatesettings "^3.0.0"
lodash.template@^4.2.4:
version "4.4.0"
resolved "http://registry.npm.qima-inc.com/lodash.template/download/lodash.template-4.4.0.tgz#e73a0385c8355591746e020b99679c690e68fba0"
dependencies:
lodash._reinterpolate "~3.0.0"
lodash.templatesettings "^4.0.0"
lodash.templatesettings@^3.0.0: lodash.templatesettings@^3.0.0:
version "3.1.1" version "3.1.1"
resolved "http://registry.npm.qima-inc.com/lodash.templatesettings/download/lodash.templatesettings-3.1.1.tgz#fb307844753b66b9f1afa54e262c745307dba8e5" resolved "http://registry.npm.qima-inc.com/lodash.templatesettings/download/lodash.templatesettings-3.1.1.tgz#fb307844753b66b9f1afa54e262c745307dba8e5"
@ -1259,12 +1090,6 @@ lodash.templatesettings@^3.0.0:
lodash._reinterpolate "^3.0.0" lodash._reinterpolate "^3.0.0"
lodash.escape "^3.0.0" lodash.escape "^3.0.0"
lodash.templatesettings@^4.0.0:
version "4.1.0"
resolved "http://registry.npm.qima-inc.com/lodash.templatesettings/download/lodash.templatesettings-4.1.0.tgz#2b4d4e95ba440d915ff08bc899e4553666713316"
dependencies:
lodash._reinterpolate "~3.0.0"
lodash.templatesettings@~2.4.1: lodash.templatesettings@~2.4.1:
version "2.4.1" version "2.4.1"
resolved "http://registry.npm.qima-inc.com/lodash.templatesettings/download/lodash.templatesettings-2.4.1.tgz#ea76c75d11eb86d4dbe89a83893bb861929ac699" resolved "http://registry.npm.qima-inc.com/lodash.templatesettings/download/lodash.templatesettings-2.4.1.tgz#ea76c75d11eb86d4dbe89a83893bb861929ac699"
@ -1272,16 +1097,16 @@ lodash.templatesettings@~2.4.1:
lodash._reinterpolate "~2.4.1" lodash._reinterpolate "~2.4.1"
lodash.escape "~2.4.1" lodash.escape "~2.4.1"
lodash.uniq@^4.5.0:
version "4.5.0"
resolved "http://registry.npm.qima-inc.com/lodash.uniq/download/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773"
lodash.values@~2.4.1: lodash.values@~2.4.1:
version "2.4.1" version "2.4.1"
resolved "http://registry.npm.qima-inc.com/lodash.values/download/lodash.values-2.4.1.tgz#abf514436b3cb705001627978cbcf30b1280eea4" resolved "http://registry.npm.qima-inc.com/lodash.values/download/lodash.values-2.4.1.tgz#abf514436b3cb705001627978cbcf30b1280eea4"
dependencies: dependencies:
lodash.keys "~2.4.1" lodash.keys "~2.4.1"
lodash@^4.17.4:
version "4.17.4"
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.4.tgz#78203a4d1c328ae1d86dca6460e369b57f4055ae"
lodash@~1.0.1: lodash@~1.0.1:
version "1.0.2" version "1.0.2"
resolved "http://registry.npm.qima-inc.com/lodash/download/lodash-1.0.2.tgz#8f57560c83b59fc270bd3d561b690043430e2551" resolved "http://registry.npm.qima-inc.com/lodash/download/lodash-1.0.2.tgz#8f57560c83b59fc270bd3d561b690043430e2551"
@ -1309,10 +1134,6 @@ map-stream@0.0.4, map-stream@>=0.0.4:
version "0.0.4" version "0.0.4"
resolved "http://registry.npm.qima-inc.com/map-stream/download/map-stream-0.0.4.tgz#5ec6de90213ef6c7b2eb9367e9ade8da4efdb68b" resolved "http://registry.npm.qima-inc.com/map-stream/download/map-stream-0.0.4.tgz#5ec6de90213ef6c7b2eb9367e9ade8da4efdb68b"
math-expression-evaluator@^1.2.14:
version "1.2.16"
resolved "http://registry.npm.qima-inc.com/math-expression-evaluator/download/math-expression-evaluator-1.2.16.tgz#b357fa1ca9faefb8e48d10c14ef2bcb2d9f0a7c9"
meow@^3.3.0: meow@^3.3.0:
version "3.7.0" version "3.7.0"
resolved "http://registry.npm.qima-inc.com/meow/download/meow-3.7.0.tgz#72cb668b425228290abbfa856892587308a801fb" resolved "http://registry.npm.qima-inc.com/meow/download/meow-3.7.0.tgz#72cb668b425228290abbfa856892587308a801fb"
@ -1346,19 +1167,15 @@ micromatch@^2.3.7:
parse-glob "^3.0.4" parse-glob "^3.0.4"
regex-cache "^0.4.2" regex-cache "^0.4.2"
mime@^1.2.11: "minimatch@2 || 3", minimatch@^2.0.1:
version "1.3.4" version "2.0.10"
resolved "http://registry.npm.qima-inc.com/mime/download/mime-1.3.4.tgz#115f9e3b6b3daf2959983cb38f149a2d40eb5d53" resolved "http://registry.npm.qima-inc.com/minimatch/download/minimatch-2.0.10.tgz#8d087c39c6b38c001b97fca7ce6d0e1e80afbac7"
"minimatch@2 || 3", minimatch@^3.0.0, minimatch@^3.0.2:
version "3.0.3"
resolved "http://registry.npm.qima-inc.com/minimatch/download/minimatch-3.0.3.tgz#2a4e4090b96b2db06a9d7df01055a62a77c9b774"
dependencies: dependencies:
brace-expansion "^1.0.0" brace-expansion "^1.0.0"
minimatch@^2.0.1: minimatch@^3.0.2:
version "2.0.10" version "3.0.3"
resolved "http://registry.npm.qima-inc.com/minimatch/download/minimatch-2.0.10.tgz#8d087c39c6b38c001b97fca7ce6d0e1e80afbac7" resolved "http://registry.npm.qima-inc.com/minimatch/download/minimatch-3.0.3.tgz#2a4e4090b96b2db06a9d7df01055a62a77c9b774"
dependencies: dependencies:
brace-expansion "^1.0.0" brace-expansion "^1.0.0"
@ -1393,14 +1210,6 @@ multipipe@^0.1.0, multipipe@^0.1.2:
dependencies: dependencies:
duplexer2 "0.0.2" duplexer2 "0.0.2"
mz@^2.3.1:
version "2.6.0"
resolved "http://registry.npm.qima-inc.com/mz/download/mz-2.6.0.tgz#c8b8521d958df0a4f2768025db69c719ee4ef1ce"
dependencies:
any-promise "^1.0.0"
object-assign "^4.0.1"
thenify-all "^1.0.0"
natives@^1.1.0: natives@^1.1.0:
version "1.1.0" version "1.1.0"
resolved "http://registry.npm.qima-inc.com/natives/download/natives-1.1.0.tgz#e9ff841418a6b2ec7a495e939984f78f163e6e31" resolved "http://registry.npm.qima-inc.com/natives/download/natives-1.1.0.tgz#e9ff841418a6b2ec7a495e939984f78f163e6e31"
@ -1424,12 +1233,6 @@ normalize-range@^0.1.2:
version "0.1.2" version "0.1.2"
resolved "http://registry.npm.qima-inc.com/normalize-range/download/normalize-range-0.1.2.tgz#2d10c06bdfd312ea9777695a4d28439456b75942" resolved "http://registry.npm.qima-inc.com/normalize-range/download/normalize-range-0.1.2.tgz#2d10c06bdfd312ea9777695a4d28439456b75942"
nth-check@~1.0.1:
version "1.0.1"
resolved "http://registry.npm.qima-inc.com/nth-check/download/nth-check-1.0.1.tgz#9929acdf628fc2c41098deab82ac580cf149aae4"
dependencies:
boolbase "~1.0.0"
num2fraction@^1.2.2: num2fraction@^1.2.2:
version "1.2.2" version "1.2.2"
resolved "http://registry.npm.qima-inc.com/num2fraction/download/num2fraction-1.2.2.tgz#6f682b6a027a4e9ddfa4564cd2589d1d4e669ede" resolved "http://registry.npm.qima-inc.com/num2fraction/download/num2fraction-1.2.2.tgz#6f682b6a027a4e9ddfa4564cd2589d1d4e669ede"
@ -1459,12 +1262,6 @@ once@^1.3.0, once@~1.3.0:
dependencies: dependencies:
wrappy "1" wrappy "1"
optimist@~0.3, optimist@~0.3.5:
version "0.3.7"
resolved "http://registry.npm.qima-inc.com/optimist/download/optimist-0.3.7.tgz#c90941ad59e4273328923074d2cf2e7cbc6ec0d9"
dependencies:
wordwrap "~0.0.2"
orchestrator@^0.3.0: orchestrator@^0.3.0:
version "0.3.8" version "0.3.8"
resolved "http://registry.npm.qima-inc.com/orchestrator/download/orchestrator-0.3.8.tgz#14e7e9e2764f7315fbac184e506c7aa6df94ad7e" resolved "http://registry.npm.qima-inc.com/orchestrator/download/orchestrator-0.3.8.tgz#14e7e9e2764f7315fbac184e506c7aa6df94ad7e"
@ -1564,14 +1361,6 @@ pinkie@^2.0.0:
version "2.0.4" version "2.0.4"
resolved "http://registry.npm.qima-inc.com/pinkie/download/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870" resolved "http://registry.npm.qima-inc.com/pinkie/download/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870"
pixrem@^3.0.0:
version "3.0.2"
resolved "http://registry.npm.qima-inc.com/pixrem/download/pixrem-3.0.2.tgz#30d1bafb4c3bdce8e9bb4bd56a13985619320c34"
dependencies:
browserslist "^1.0.0"
postcss "^5.0.0"
reduce-css-calc "^1.2.7"
postcss-advanced-variables@1.2.2: postcss-advanced-variables@1.2.2:
version "1.2.2" version "1.2.2"
resolved "http://registry.npm.qima-inc.com/postcss-advanced-variables/download/postcss-advanced-variables-1.2.2.tgz#90a6213262e66a050a368b4a9c5d4778d72dbd74" resolved "http://registry.npm.qima-inc.com/postcss-advanced-variables/download/postcss-advanced-variables-1.2.2.tgz#90a6213262e66a050a368b4a9c5d4778d72dbd74"
@ -1584,15 +1373,7 @@ postcss-atroot@^0.1.2:
dependencies: dependencies:
postcss "^5.0.5" postcss "^5.0.5"
postcss-calc@^5.0.0: postcss-color-function@^2.0.0:
version "5.3.1"
resolved "http://registry.npm.qima-inc.com/postcss-calc/download/postcss-calc-5.3.1.tgz#77bae7ca928ad85716e2fda42f261bf7c1d65b5e"
dependencies:
postcss "^5.0.2"
postcss-message-helpers "^2.0.0"
reduce-css-calc "^1.2.6"
postcss-color-function@^2.0.0, postcss-color-function@^2.0.1:
version "2.0.1" version "2.0.1"
resolved "http://registry.npm.qima-inc.com/postcss-color-function/download/postcss-color-function-2.0.1.tgz#9ad226f550e8a7c7f8b8a77860545b6dd7f55241" resolved "http://registry.npm.qima-inc.com/postcss-color-function/download/postcss-color-function-2.0.1.tgz#9ad226f550e8a7c7f8b8a77860545b6dd7f55241"
dependencies: dependencies:
@ -1628,37 +1409,35 @@ postcss-custom-selectors@^3.0.0:
postcss "^5.0.0" postcss "^5.0.0"
postcss-selector-matches "^2.0.0" postcss-selector-matches "^2.0.0"
postcss-easy-import@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/postcss-easy-import/-/postcss-easy-import-2.0.0.tgz#a874d4de054b9242545bf553e438c1823c108512"
dependencies:
globby "^6.1.0"
is-glob "^3.1.0"
lodash "^4.17.4"
object-assign "^4.0.1"
pify "^2.3.0"
postcss "^5.0.15"
postcss-import "^9.1.0"
resolve "^1.1.7"
postcss-extend@^1.0.1: postcss-extend@^1.0.1:
version "1.0.5" version "1.0.5"
resolved "http://registry.npm.qima-inc.com/postcss-extend/download/postcss-extend-1.0.5.tgz#5ea98bf787ba3cacf4df4609743f80a833b1d0e7" resolved "http://registry.npm.qima-inc.com/postcss-extend/download/postcss-extend-1.0.5.tgz#5ea98bf787ba3cacf4df4609743f80a833b1d0e7"
dependencies: dependencies:
postcss "^5.0.4" postcss "^5.0.4"
postcss-font-weights@^2.0.1: postcss-import@^9.1.0:
version "2.0.1" version "9.1.0"
resolved "http://registry.npm.qima-inc.com/postcss-font-weights/download/postcss-font-weights-2.0.1.tgz#a85dd7b51aa7691b95c9bc0269f412756c91931d" resolved "https://registry.yarnpkg.com/postcss-import/-/postcss-import-9.1.0.tgz#95fe9876a1e79af49fbdc3589f01fe5aa7cc1e80"
dependencies: dependencies:
css-font-weight-names "^0.2.1"
postcss "^5.0.12"
postcss-initial@^1.3.1:
version "1.5.3"
resolved "http://registry.npm.qima-inc.com/postcss-initial/download/postcss-initial-1.5.3.tgz#20c3e91c96822ddb1bed49508db96d56bac377d0"
dependencies:
lodash.template "^4.2.4"
postcss "^5.0.19"
postcss-inline-svg@^1.4.0:
version "1.4.0"
resolved "http://registry.npm.qima-inc.com/postcss-inline-svg/download/postcss-inline-svg-1.4.0.tgz#514651f84ea9aba8526d5d1cf3d89aa43696c274"
dependencies:
css-select "^1.2.0"
dom-serializer "^0.1.0"
htmlparser2 "^3.9.0"
object-assign "^4.0.1" object-assign "^4.0.1"
postcss "^5.0.14" postcss "^5.0.14"
postcss-value-parser "^3.2.3" postcss-value-parser "^3.2.3"
promise-each "^2.2.0"
read-cache "^1.0.0" read-cache "^1.0.0"
resolve "^1.1.7"
postcss-load-config@^1.2.0: postcss-load-config@^1.2.0:
version "1.2.0" version "1.2.0"
@ -1701,13 +1480,6 @@ postcss-mixins@^2.1.0:
postcss "^5.0.10" postcss "^5.0.10"
postcss-simple-vars "^1.0.1" postcss-simple-vars "^1.0.1"
postcss-neat@^2.5.2:
version "2.5.2"
resolved "http://registry.npm.qima-inc.com/postcss-neat/download/postcss-neat-2.5.2.tgz#3943f2dcf5f4182d2fcb33fd6be2fcbee8e6e158"
dependencies:
babel-polyfill "^6.7.4"
postcss "^5.0.19"
postcss-nested@^1.0.0: postcss-nested@^1.0.0:
version "1.0.1" version "1.0.1"
resolved "http://registry.npm.qima-inc.com/postcss-nested/download/postcss-nested-1.0.1.tgz#91f28f4e6e23d567241ac154558a0cfab4cc0d8f" resolved "http://registry.npm.qima-inc.com/postcss-nested/download/postcss-nested-1.0.1.tgz#91f28f4e6e23d567241ac154558a0cfab4cc0d8f"
@ -1730,16 +1502,6 @@ postcss-partial-import@^1.3.0:
postcss "^5.0.5" postcss "^5.0.5"
string-hash "^1.1.0" string-hash "^1.1.0"
postcss-partial-import@^2.1.0:
version "2.1.0"
resolved "http://registry.npm.qima-inc.com/postcss-partial-import/download/postcss-partial-import-2.1.0.tgz#09edaf13d78f39ee4f2a62e0fef6193b003853f3"
dependencies:
fs-extra "^0.30.0"
fs-promise "^0.5.0"
object-assign "^4.1.0"
postcss "^5.0.21"
resolve "^1.1.7"
postcss-property-lookup@^1.1.3: postcss-property-lookup@^1.1.3:
version "1.2.1" version "1.2.1"
resolved "http://registry.npm.qima-inc.com/postcss-property-lookup/download/postcss-property-lookup-1.2.1.tgz#30450a1361b7aae758bbedd5201fbe057bb8270b" resolved "http://registry.npm.qima-inc.com/postcss-property-lookup/download/postcss-property-lookup-1.2.1.tgz#30450a1361b7aae758bbedd5201fbe057bb8270b"
@ -1748,54 +1510,6 @@ postcss-property-lookup@^1.1.3:
postcss "^5.0.4" postcss "^5.0.4"
tcomb "^2.5.1" tcomb "^2.5.1"
postcss-pseudo-class-any-link@^1.0.0:
version "1.0.0"
resolved "http://registry.npm.qima-inc.com/postcss-pseudo-class-any-link/download/postcss-pseudo-class-any-link-1.0.0.tgz#903239196401d335fe73ac756186fa62e693af26"
dependencies:
postcss "^5.0.3"
postcss-selector-parser "^1.1.4"
postcss-salad@^1.0.5:
version "1.0.8"
resolved "http://registry.npm.qima-inc.com/postcss-salad/download/postcss-salad-1.0.8.tgz#ffa87b5fa394821d9608f68da5a14d13ea4c5059"
dependencies:
autoprefixer "^6.0.2"
caniuse-api "^1.3.2"
chalk "^1.1.1"
pixrem "^3.0.0"
postcss "^5.0.5"
postcss-calc "^5.0.0"
postcss-color-function "^2.0.1"
postcss-css-reset "^1.0.2"
postcss-initial "^1.3.1"
postcss-inline-svg "^1.4.0"
postcss-neat "^2.5.2"
postcss-partial-import "^2.1.0"
postcss-pseudo-class-any-link "^1.0.0"
postcss-sass-color-functions "^1.1.0"
postcss-scss "^0.1.7"
postcss-shape "^0.0.1"
postcss-short "^1.4.0"
postcss-url "^5.1.2"
postcss-utils "^1.0.1"
precss "^1.4.0"
saladcss-bem "^0.0.1"
postcss-sass-color-functions@^1.1.0:
version "1.1.0"
resolved "http://registry.npm.qima-inc.com/postcss-sass-color-functions/download/postcss-sass-color-functions-1.1.0.tgz#6ed267fd9ffe8008332d3ad6ccb7f0a9e9e8f1e9"
dependencies:
balanced-match "^0.1.0"
color "^0.11.1"
postcss "^5.0.4"
postcss-message-helpers "^2.0.0"
postcss-scss@^0.1.7:
version "0.1.9"
resolved "http://registry.npm.qima-inc.com/postcss-scss/download/postcss-scss-0.1.9.tgz#7606caff64bb4b34b7605ab749574cf78d886b08"
dependencies:
postcss "^5.1.0"
postcss-selector-matches@^2.0.0: postcss-selector-matches@^2.0.0:
version "2.0.5" version "2.0.5"
resolved "http://registry.npm.qima-inc.com/postcss-selector-matches/download/postcss-selector-matches-2.0.5.tgz#fa0f43be57b68e77aa4cd11807023492a131027f" resolved "http://registry.npm.qima-inc.com/postcss-selector-matches/download/postcss-selector-matches-2.0.5.tgz#fa0f43be57b68e77aa4cd11807023492a131027f"
@ -1810,115 +1524,17 @@ postcss-selector-not@^2.0.0:
balanced-match "^0.2.0" balanced-match "^0.2.0"
postcss "^5.0.0" postcss "^5.0.0"
postcss-selector-parser@^1.1.4:
version "1.3.3"
resolved "http://registry.npm.qima-inc.com/postcss-selector-parser/download/postcss-selector-parser-1.3.3.tgz#d2ee19df7a64f8ef21c1a71c86f7d4835c88c281"
dependencies:
flatten "^1.0.2"
indexes-of "^1.0.1"
uniq "^1.0.1"
postcss-shape@^0.0.1:
version "0.0.1"
resolved "http://registry.npm.qima-inc.com/postcss-shape/download/postcss-shape-0.0.1.tgz#a3747b1c1e006a1b18c071ff0e980632e8a0be85"
dependencies:
postcss "^5.0.19"
postcss-short-border@^1.0.0:
version "1.0.0"
resolved "http://registry.npm.qima-inc.com/postcss-short-border/download/postcss-short-border-1.0.0.tgz#7519868e9863ccd69ad5af4b986e1d99f1f5bee4"
dependencies:
postcss "^5.0.8"
postcss-short-color@^1.0.0:
version "1.0.0"
resolved "http://registry.npm.qima-inc.com/postcss-short-color/download/postcss-short-color-1.0.0.tgz#c7b79c9b4b66120dde5f648091ae7d4ba86e3a76"
dependencies:
postcss "^5.0.4"
postcss-short-data@^1.1.0:
version "1.1.0"
resolved "http://registry.npm.qima-inc.com/postcss-short-data/download/postcss-short-data-1.1.0.tgz#4e7ac80a173b6ec4dde0acd8205cd282cb4f8330"
dependencies:
postcss "^5.0.12"
postcss-short-font-size@^1.0.1:
version "1.0.1"
resolved "http://registry.npm.qima-inc.com/postcss-short-font-size/download/postcss-short-font-size-1.0.1.tgz#7adc71eccfd1d2a8171113a108b95214256c3dd6"
dependencies:
postcss "^5.0.4"
postcss-short-position@^1.0.0:
version "1.0.0"
resolved "http://registry.npm.qima-inc.com/postcss-short-position/download/postcss-short-position-1.0.0.tgz#32bf54df3597ed56fe4e1bab216d4759cb2f75de"
dependencies:
postcss "^5.0.5"
postcss-short-size@^1.0.0:
version "1.1.0"
resolved "http://registry.npm.qima-inc.com/postcss-short-size/download/postcss-short-size-1.1.0.tgz#4a7c9c5bd9b21f5f68457521b0cfaddb9e1727b1"
dependencies:
postcss "^5.0.19"
postcss-short-spacing@^1.0.0:
version "1.0.0"
resolved "http://registry.npm.qima-inc.com/postcss-short-spacing/download/postcss-short-spacing-1.0.0.tgz#cb19037e61213d0c872b486fdb5c601a4ea9571d"
dependencies:
postcss "^5.0.4"
postcss-short-text@^1.1.0:
version "1.1.0"
resolved "http://registry.npm.qima-inc.com/postcss-short-text/download/postcss-short-text-1.1.0.tgz#93c4ee645a09262df45c1a7f53421184f0ecb14b"
dependencies:
object-assign "^4.0.1"
postcss "^5.0.4"
postcss-short@^1.4.0:
version "1.4.0"
resolved "http://registry.npm.qima-inc.com/postcss-short/download/postcss-short-1.4.0.tgz#20d16ed87d1d6a2ca04ec5eb949ed100dc3c1a2a"
dependencies:
object-assign "^4.0.1"
postcss "^5.0.12"
postcss-font-weights "^2.0.1"
postcss-short-border "^1.0.0"
postcss-short-color "^1.0.0"
postcss-short-data "^1.1.0"
postcss-short-font-size "^1.0.1"
postcss-short-position "^1.0.0"
postcss-short-size "^1.0.0"
postcss-short-spacing "^1.0.0"
postcss-short-text "^1.1.0"
postcss-simple-vars@^1.0.1: postcss-simple-vars@^1.0.1:
version "1.2.0" version "1.2.0"
resolved "http://registry.npm.qima-inc.com/postcss-simple-vars/download/postcss-simple-vars-1.2.0.tgz#2e6689921144b74114e765353275a3c32143f150" resolved "http://registry.npm.qima-inc.com/postcss-simple-vars/download/postcss-simple-vars-1.2.0.tgz#2e6689921144b74114e765353275a3c32143f150"
dependencies: dependencies:
postcss "^5.0.13" postcss "^5.0.13"
postcss-url@^5.1.2:
version "5.1.2"
resolved "http://registry.npm.qima-inc.com/postcss-url/download/postcss-url-5.1.2.tgz#98b3165be8d592471cb0caadde2c0d1f832f133e"
dependencies:
directory-encoder "^0.7.2"
js-base64 "^2.1.5"
mime "^1.2.11"
minimatch "^3.0.0"
mkdirp "^0.5.0"
path-is-absolute "^1.0.0"
postcss "^5.0.0"
postcss-utils@^1.0.1:
version "1.0.2"
resolved "http://registry.npm.qima-inc.com/postcss-utils/download/postcss-utils-1.0.2.tgz#36ca83b78279b5a7aa01d87f7e81f71f4b22ca2a"
dependencies:
humps "^1.1.0"
postcss "^5.0.19"
postcss-value-parser@^3.2.3, postcss-value-parser@^3.3.0: postcss-value-parser@^3.2.3, postcss-value-parser@^3.3.0:
version "3.3.0" version "3.3.0"
resolved "http://registry.npm.qima-inc.com/postcss-value-parser/download/postcss-value-parser-3.3.0.tgz#87f38f9f18f774a4ab4c8a232f5c5ce8872a9d15" resolved "http://registry.npm.qima-inc.com/postcss-value-parser/download/postcss-value-parser-3.3.0.tgz#87f38f9f18f774a4ab4c8a232f5c5ce8872a9d15"
postcss@^5.0.0, postcss@^5.0.10, postcss@^5.0.12, postcss@^5.0.13, postcss@^5.0.14, postcss@^5.0.19, postcss@^5.0.2, postcss@^5.0.21, postcss@^5.0.3, postcss@^5.0.4, postcss@^5.0.5, postcss@^5.0.8, postcss@^5.1.0, postcss@^5.2.12, postcss@^5.2.16, postcss@^5.2.17: postcss@^5.0.0, postcss@^5.0.10, postcss@^5.0.13, postcss@^5.0.14, postcss@^5.0.15, postcss@^5.0.19, postcss@^5.0.4, postcss@^5.0.5, postcss@^5.0.8, postcss@^5.2.12, postcss@^5.2.16, postcss@^5.2.17:
version "5.2.17" version "5.2.17"
resolved "http://registry.npm.qima-inc.com/postcss/download/postcss-5.2.17.tgz#cf4f597b864d65c8a492b2eabe9d706c879c388b" resolved "http://registry.npm.qima-inc.com/postcss/download/postcss-5.2.17.tgz#cf4f597b864d65c8a492b2eabe9d706c879c388b"
dependencies: dependencies:
@ -1960,6 +1576,12 @@ process-nextick-args@~1.0.6:
version "1.0.7" version "1.0.7"
resolved "http://registry.npm.qima-inc.com/process-nextick-args/download/process-nextick-args-1.0.7.tgz#150e20b756590ad3f91093f25a4f2ad8bff30ba3" resolved "http://registry.npm.qima-inc.com/process-nextick-args/download/process-nextick-args-1.0.7.tgz#150e20b756590ad3f91093f25a4f2ad8bff30ba3"
promise-each@^2.2.0:
version "2.2.0"
resolved "https://registry.yarnpkg.com/promise-each/-/promise-each-2.2.0.tgz#3353174eff2694481037e04e01f77aa0fb6d1b60"
dependencies:
any-promise "^0.1.0"
randomatic@^1.1.3: randomatic@^1.1.3:
version "1.1.6" version "1.1.6"
resolved "http://registry.npm.qima-inc.com/randomatic/download/randomatic-1.1.6.tgz#110dcabff397e9dcff7c0789ccc0a49adf1ec5bb" resolved "http://registry.npm.qima-inc.com/randomatic/download/randomatic-1.1.6.tgz#110dcabff397e9dcff7c0789ccc0a49adf1ec5bb"
@ -1997,7 +1619,7 @@ read-pkg@^1.0.0:
isarray "0.0.1" isarray "0.0.1"
string_decoder "~0.10.x" string_decoder "~0.10.x"
readable-stream@^2.0.2, readable-stream@^2.1.5: readable-stream@^2.1.5:
version "2.2.9" version "2.2.9"
resolved "http://registry.npm.qima-inc.com/readable-stream/download/readable-stream-2.2.9.tgz#cf78ec6f4a6d1eb43d26488cac97f042e74b7fc8" resolved "http://registry.npm.qima-inc.com/readable-stream/download/readable-stream-2.2.9.tgz#cf78ec6f4a6d1eb43d26488cac97f042e74b7fc8"
dependencies: dependencies:
@ -2031,24 +1653,6 @@ redent@^1.0.0:
indent-string "^2.1.0" indent-string "^2.1.0"
strip-indent "^1.0.1" strip-indent "^1.0.1"
reduce-css-calc@^1.2.6, reduce-css-calc@^1.2.7:
version "1.3.0"
resolved "http://registry.npm.qima-inc.com/reduce-css-calc/download/reduce-css-calc-1.3.0.tgz#747c914e049614a4c9cfbba629871ad1d2927716"
dependencies:
balanced-match "^0.4.2"
math-expression-evaluator "^1.2.14"
reduce-function-call "^1.0.1"
reduce-function-call@^1.0.1:
version "1.0.2"
resolved "http://registry.npm.qima-inc.com/reduce-function-call/download/reduce-function-call-1.0.2.tgz#5a200bf92e0e37751752fe45b0ab330fd4b6be99"
dependencies:
balanced-match "^0.4.2"
regenerator-runtime@^0.10.0:
version "0.10.3"
resolved "http://registry.npm.qima-inc.com/regenerator-runtime/download/regenerator-runtime-0.10.3.tgz#8c4367a904b51ea62a908ac310bf99ff90a82a3e"
regex-cache@^0.4.2: regex-cache@^0.4.2:
version "0.4.3" version "0.4.3"
resolved "http://registry.npm.qima-inc.com/regex-cache/download/regex-cache-0.4.3.tgz#9b1a6c35d4d0dfcef5711ae651e8e9d3d7114145" resolved "http://registry.npm.qima-inc.com/regex-cache/download/regex-cache-0.4.3.tgz#9b1a6c35d4d0dfcef5711ae651e8e9d3d7114145"
@ -2137,12 +1741,6 @@ source-map@^0.5.1, source-map@^0.5.6:
version "0.5.6" version "0.5.6"
resolved "http://registry.npm.qima-inc.com/source-map/download/source-map-0.5.6.tgz#75ce38f52bf0733c5a7f0c118d81334a2bb5f412" resolved "http://registry.npm.qima-inc.com/source-map/download/source-map-0.5.6.tgz#75ce38f52bf0733c5a7f0c118d81334a2bb5f412"
source-map@~0.1.7:
version "0.1.43"
resolved "http://registry.npm.qima-inc.com/source-map/download/source-map-0.1.43.tgz#c24bc146ca517c1471f5dacbe2571b2b7f9e3346"
dependencies:
amdefine ">=0.0.4"
sparkles@^1.0.0: sparkles@^1.0.0:
version "1.0.0" version "1.0.0"
resolved "http://registry.npm.qima-inc.com/sparkles/download/sparkles-1.0.0.tgz#1acbbfb592436d10bbe8f785b7cc6f82815012c3" resolved "http://registry.npm.qima-inc.com/sparkles/download/sparkles-1.0.0.tgz#1acbbfb592436d10bbe8f785b7cc6f82815012c3"
@ -2245,18 +1843,6 @@ tempfile@~0.1.2:
dependencies: dependencies:
uuid "~1.4.0" uuid "~1.4.0"
thenify-all@^1.0.0, thenify-all@^1.6.0:
version "1.6.0"
resolved "http://registry.npm.qima-inc.com/thenify-all/download/thenify-all-1.6.0.tgz#1a1918d402d8fc3f98fbf234db0bcc8cc10e9726"
dependencies:
thenify ">= 3.1.0 < 4"
"thenify@>= 3.1.0 < 4":
version "3.2.1"
resolved "http://registry.npm.qima-inc.com/thenify/download/thenify-3.2.1.tgz#251fd1c80aff6e5cf57cb179ab1fcb724269bd11"
dependencies:
any-promise "^1.0.0"
through2@^0.5.0: through2@^0.5.0:
version "0.5.1" version "0.5.1"
resolved "http://registry.npm.qima-inc.com/through2/download/through2-0.5.1.tgz#dfdd012eb9c700e2323fd334f38ac622ab372da7" resolved "http://registry.npm.qima-inc.com/through2/download/through2-0.5.1.tgz#dfdd012eb9c700e2323fd334f38ac622ab372da7"
@ -2292,22 +1878,10 @@ trim-newlines@^1.0.0:
version "1.0.0" version "1.0.0"
resolved "http://registry.npm.qima-inc.com/trim-newlines/download/trim-newlines-1.0.0.tgz#5887966bb582a4503a41eb524f7d35011815a613" resolved "http://registry.npm.qima-inc.com/trim-newlines/download/trim-newlines-1.0.0.tgz#5887966bb582a4503a41eb524f7d35011815a613"
uglify-js@~2.3:
version "2.3.6"
resolved "http://registry.npm.qima-inc.com/uglify-js/download/uglify-js-2.3.6.tgz#fa0984770b428b7a9b2a8058f46355d14fef211a"
dependencies:
async "~0.2.6"
optimist "~0.3.5"
source-map "~0.1.7"
unc-path-regex@^0.1.0: unc-path-regex@^0.1.0:
version "0.1.2" version "0.1.2"
resolved "http://registry.npm.qima-inc.com/unc-path-regex/download/unc-path-regex-0.1.2.tgz#e73dd3d7b0d7c5ed86fbac6b0ae7d8c6a69d50fa" resolved "http://registry.npm.qima-inc.com/unc-path-regex/download/unc-path-regex-0.1.2.tgz#e73dd3d7b0d7c5ed86fbac6b0ae7d8c6a69d50fa"
uniq@^1.0.1:
version "1.0.1"
resolved "http://registry.npm.qima-inc.com/uniq/download/uniq-1.0.1.tgz#b31c5ae8254844a3a8281541ce2b04b865a734ff"
unique-stream@^1.0.0: unique-stream@^1.0.0:
version "1.0.0" version "1.0.0"
resolved "http://registry.npm.qima-inc.com/unique-stream/download/unique-stream-1.0.0.tgz#d59a4a75427447d9aa6c91e70263f8d26a4b104b" resolved "http://registry.npm.qima-inc.com/unique-stream/download/unique-stream-1.0.0.tgz#d59a4a75427447d9aa6c91e70263f8d26a4b104b"
@ -2383,18 +1957,10 @@ which@^1.2.12:
dependencies: dependencies:
isexe "^2.0.0" isexe "^2.0.0"
wordwrap@~0.0.2:
version "0.0.3"
resolved "http://registry.npm.qima-inc.com/wordwrap/download/wordwrap-0.0.3.tgz#a3d5da6cd5c0bc0008d37234bbaf1bed63059107"
wrappy@1: wrappy@1:
version "1.0.2" version "1.0.2"
resolved "http://registry.npm.qima-inc.com/wrappy/download/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" resolved "http://registry.npm.qima-inc.com/wrappy/download/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
xmldom@^0.1.19:
version "0.1.27"
resolved "http://registry.npm.qima-inc.com/xmldom/download/xmldom-0.1.27.tgz#d501f97b3bdb403af8ef9ecc20573187aadac0e9"
"xtend@>=4.0.0 <4.1.0-0", xtend@~4.0.1: "xtend@>=4.0.0 <4.1.0-0", xtend@~4.0.1:
version "4.0.1" version "4.0.1"
resolved "http://registry.npm.qima-inc.com/xtend/download/xtend-4.0.1.tgz#a5c6d532be656e23db820efb943a1f04998d63af" resolved "http://registry.npm.qima-inc.com/xtend/download/xtend-4.0.1.tgz#a5c6d532be656e23db820efb943a1f04998d63af"

View File

@ -81,7 +81,7 @@ if (typeof window !== 'undefined' && window.Vue) {
module.exports = { module.exports = {
install, install,
version: '0.5.2', version: '0.5.7',
Button, Button,
Switch, Switch,
Field, Field,

View File

@ -66,15 +66,14 @@ export default {
/** /**
* 显示popup * 显示popup
*/ */
open(options) { open() {
if (this.opened) return; if (this.opened) return;
this.opening = true; this.opening = true;
this.$emit('input', true); this.$emit('input', true);
const props = merge({}, this, options); const zIndex = this.zIndex;
const zIndex = props.zIndex;
// 如果属性中传入了`zIndex`,则覆盖`popupContext`中对应的`zIndex` // 如果属性中传入了`zIndex`,则覆盖`popupContext`中对应的`zIndex`
if (zIndex) { if (zIndex) {

View File

@ -25,7 +25,7 @@ const PopupContext = {
}, },
plusKeyByOne(key) { plusKeyByOne(key) {
const oldVal = context[key]; const oldVal = +context[key];
context[key] = oldVal + 1; context[key] = oldVal + 1;
return oldVal; return oldVal;

View File

@ -1,5 +1,5 @@
<template> <template>
<van-tabs :active="active" @click="handleTabClick" @disabled="handleTabDisabledClick"> <van-tabs :active="active" :duration="duration" @click="handleTabClick" @disabled="handleTabDisabledClick">
<van-tab title="选项一">内容一</van-tab> <van-tab title="选项一">内容一</van-tab>
<van-tab title="选项二">内容二</van-tab> <van-tab title="选项二">内容二</van-tab>
<van-tab title="选项三" disabled>内容三</van-tab> <van-tab title="选项三" disabled>内容三</van-tab>
@ -20,7 +20,8 @@ export default {
data() { data() {
return { return {
active: 0 active: 0,
duration: 0.5
}; };
}, },

View File

@ -1,6 +1,7 @@
import Picker from 'packages/picker'; import Picker from 'packages/picker';
import PickerColumn from 'packages/picker/src/picker-column'; import PickerColumn from 'packages/picker/src/picker-column';
import { mount } from 'avoriaz'; import { mount } from 'avoriaz';
import Wrapper from 'avoriaz/dist/Wrapper';
const itemHeight = 44; const itemHeight = 44;
@ -170,6 +171,25 @@ describe('PickerColumn', () => {
expect(wrapper.vm.dragRange[1]).to.equal(2 * itemHeight); expect(wrapper.vm.dragRange[1]).to.equal(2 * itemHeight);
}); });
it('change picker-column value', (done) => {
wrapper = mount(PickerColumn, {
propsData: {
values: [1, 2, 3, 4, 5],
value: 1
}
});
expect(wrapper.hasClass('van-picker-column')).to.be.true;
expect(wrapper.vm.values.length).to.equal(5);
wrapper.vm.value = 3;
wrapper.update();
wrapper.vm.$nextTick(() => {
expect(wrapper.vm.currentValue).to.equal(3);
done();
});
});
it('change picker-column values', (done) => { it('change picker-column values', (done) => {
wrapper = mount(PickerColumn); wrapper = mount(PickerColumn);
@ -188,12 +208,62 @@ describe('PickerColumn', () => {
it('create a picker test translate', () => { it('create a picker test translate', () => {
wrapper = mount(PickerColumn, { wrapper = mount(PickerColumn, {
propsData: { propsData: {
values: [1, 2, 3, 4, 5] values: [1, 2, 3, 4, 5],
value: 1
} }
}); });
expect(wrapper.vm.values.length).to.equal(5); expect(wrapper.vm.values.length).to.equal(5);
expect(wrapper.vm.value2Translate(2)).to.equal((1- Math.floor(5 / 2)) * (-itemHeight)); expect(wrapper.vm.value2Translate(2)).to.equal((1 - Math.floor(5 / 2)) * (-itemHeight));
expect(wrapper.vm.translate2Value(0)).to.equal(3); expect(wrapper.vm.translate2Value(0)).to.equal(3);
}); });
it('test draggable', done => {
wrapper = mount(PickerColumn, {
propsData: {
values: [1, 2, 3, 4, 5]
},
attachToDocument: true
});
expect(wrapper.vm.values.length).to.equal(5);
setTimeout(() => {
const nColumn = wrapper.find('.van-picker-column-wrapper')[0];
const eventMouseObject = new window.Event('mousedown');
eventMouseObject.pageY = 0;
nColumn.element.dispatchEvent(eventMouseObject);
const eventTouchObject = new window.Event('touchstart');
eventTouchObject.changedTouches = [{ pageY: 0 }];
nColumn.element.dispatchEvent(eventTouchObject);
}, 500);
setTimeout(() => {
const nColumn = wrapper.find('.van-picker-column-wrapper')[0];
const eventMouseMoveObject = new window.Event('mousemove');
eventMouseMoveObject.pageY = 40;
document.dispatchEvent(eventMouseMoveObject);
const eventObject = new window.Event('touchmove');
eventObject.changedTouches = [{ pageY: 40 }];
nColumn.element.dispatchEvent(eventObject);
// 结束滚动
const eventMouseUpObject = new window.Event('mouseup');
document.dispatchEvent(eventMouseUpObject);
const eventEndObject = new window.Event('touchend');
eventEndObject.changedTouches = [{}];
nColumn.element.dispatchEvent(eventEndObject);
}, 1000);
setTimeout(() => {
const nItem = wrapper.find('.van-picker-column__item');
expect(nItem[1].hasClass('van-picker-column__item--selected')).to.be.true;
done();
}, 1200);
});
}); });

View File

@ -68,4 +68,10 @@ describe('Tabs', () => {
done(); done();
}); });
}); });
it('check animation duration', () => {
wrapper = mount(TabsTestComponent);
expect(wrapper.style.transitionDuration != '').to.be.true;
});
}); });

View File

@ -0,0 +1,29 @@
import Tag from 'packages/tag';
import { mount } from 'avoriaz';
describe('Tag', () => {
let wrapper;
afterEach(() => {
wrapper && wrapper.destroy();
});
it('create without typeProps', () => {
wrapper = mount(Tag);
});
it('create with right typeProps', () => {
wrapper = mount(Tag, {
propsData: {
type: 'primary'
}
})
});
it('create with wrong typeProps', () => {
wrapper = mount(Tag, {
propsData: {
type: 'wrong'
}
})
});
});

View File

@ -5102,6 +5102,12 @@ postcss-convert-values@^2.3.4:
postcss "^5.0.11" postcss "^5.0.11"
postcss-value-parser "^3.1.2" postcss-value-parser "^3.1.2"
postcss-css-reset@^1.0.2:
version "1.0.2"
resolved "https://registry.yarnpkg.com/postcss-css-reset/-/postcss-css-reset-1.0.2.tgz#769f2d62d3f1f76e2600fb4f79066399bebe2bd8"
dependencies:
postcss "^5.0.19"
postcss-custom-media@^5.0.0: postcss-custom-media@^5.0.0:
version "5.0.1" version "5.0.1"
resolved "https://registry.yarnpkg.com/postcss-custom-media/-/postcss-custom-media-5.0.1.tgz#138d25a184bf2eb54de12d55a6c01c30a9d8bd81" resolved "https://registry.yarnpkg.com/postcss-custom-media/-/postcss-custom-media-5.0.1.tgz#138d25a184bf2eb54de12d55a6c01c30a9d8bd81"