diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 83bd77bef..9ed032d1a 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -2,7 +2,7 @@ ### 提交 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. If you've added code that should be tested, add tests! 3. If you've changed APIs, update the documentation. diff --git a/build/utils/postcss_pipe.js b/build/utils/postcss_pipe.js index 4c069951c..0a6cd4ed4 100644 --- a/build/utils/postcss_pipe.js +++ b/build/utils/postcss_pipe.js @@ -4,18 +4,20 @@ var config = { 'separators': {'descendent': '__', 'modifier': '--'} } }; +var reset = require('postcss-css-reset')(); + // https://github.com/trysound/postcss-easy-import -var partialImport = require("postcss-easy-import")(); +var partialImport = require('postcss-easy-import')(); // 这不是bem，虽然名字叫bem，其实它是suit // 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 -var precss = require("precss")(); +var precss = require('precss')(); // https://github.com/postcss/autoprefixer -var autoprefixer = require("autoprefixer")(); +var autoprefixer = require('autoprefixer')(); module.exports = function (webpack) { // 顺序很重要 @@ -23,6 +25,7 @@ module.exports = function (webpack) { partialImport, bem, precss, - autoprefixer + autoprefixer, + reset ]; }; diff --git a/build/webpack.build.js b/build/webpack.build.js index c0e0b91da..6b3a3ad0d 100644 --- a/build/webpack.build.js +++ b/build/webpack.build.js @@ -9,7 +9,8 @@ config.entry = { config.output = { filename: './lib/[name].js', library: 'vant', - libraryTarget: 'umd' + libraryTarget: 'umd', + umdNamedDefine: true }; config.externals = { diff --git a/build/webpack.components.js b/build/webpack.components.js index f7ab1d9cf..b0b2b91e2 100644 --- a/build/webpack.components.js +++ b/build/webpack.components.js @@ -18,7 +18,8 @@ config.externals = { config.output = { path: path.join(__dirname, '../lib'), filename: '[name].js', - libraryTarget: 'umd' + libraryTarget: 'umd', + umdNamedDefine: true }; module.exports = config; diff --git a/build/webpack.config.dev.js b/build/webpack.config.dev.js index a078e7e5e..d2538370d 100644 --- a/build/webpack.config.dev.js +++ b/build/webpack.config.dev.js @@ -3,7 +3,7 @@ var path = require('path'); var slugify = require('transliteration').slugify; var striptags = require('./strip-tags'); 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 HtmlWebpackPlugin = require('html-webpack-plugin'); var OptimizeCssAssetsPlugin = require('optimize-css-assets-webpack-plugin'); @@ -39,7 +39,8 @@ module.exports = { output: { path: path.join(__dirname, '../docs/dist'), publicPath: '/', - filename: '[name].js' + filename: '[name].js', + umdNamedDefine: true }, devServer: { historyApiFallback: { @@ -107,14 +108,14 @@ module.exports = { new webpack.LoaderOptionsPlugin({ minimize: true, options: { - postcss: getPoastcssPlugin, + postcss: getPostcssPlugin, babel: { presets: ['es2015'], plugins: ['transform-runtime', 'transform-vue-jsx'] }, vue: { autoprefixer: false, - postcss: getPoastcssPlugin + postcss: getPostcssPlugin }, vueMarkdown: { use: [ diff --git a/build/webpack.config.prod.js b/build/webpack.config.prod.js index f7a46de6a..65cc03030 100644 --- a/build/webpack.config.prod.js +++ b/build/webpack.config.prod.js @@ -7,7 +7,8 @@ module.exports = merge(devConfig, { output: { path: path.join(__dirname, '../docs/dist'), publicPath: '/zanui/vue', - filename: '[name].[hash:8].js' + filename: '[name].[hash:8].js', + umdNamedDefine: true }, devtool: false, plugins: [ diff --git a/docs/examples-dist/cell.vue b/docs/examples-dist/cell.vue index 5c5db6ae6..cecd940e3 100644 --- a/docs/examples-dist/cell.vue +++ b/docs/examples-dist/cell.vue @@ -4,10 +4,16 @@ + + + + + + - - + + @@ -31,6 +37,11 @@ + + + diff --git a/docs/examples-dist/icon.vue b/docs/examples-dist/icon.vue index aa1b14017..d79da066a 100644 --- a/docs/examples-dist/icon.vue +++ b/docs/examples-dist/icon.vue @@ -1,138 +1,128 @@