diff --git a/CHANGELOG.md b/CHANGELOG.md
deleted file mode 100644
index e69de29bb..000000000
diff --git a/build/bin/build-entry.js b/build/bin/build-entry.js
index db939e763..1dfb1ce86 100644
--- a/build/bin/build-entry.js
+++ b/build/bin/build-entry.js
@@ -4,7 +4,7 @@ var render = require('json-templater/string');
var uppercamelcase = require('uppercamelcase');
var path = require('path');
-var OUTPUT_PATH = path.join(__dirname, '../../src/index.js');
+var OUTPUT_PATH = path.join(__dirname, '../../packages/index.js');
var IMPORT_TEMPLATE = 'import {{name}} from \'../packages/{{package}}/index.js\';';
var ISNTALL_COMPONENT_TEMPLATE = ' {{name}}';
var MAIN_TEMPLATE = `{{include}}
diff --git a/build/rollup.component.config.js b/build/rollup.component.config.js
index 4e452bbee..c1f933470 100644
--- a/build/rollup.component.config.js
+++ b/build/rollup.component.config.js
@@ -1,3 +1,4 @@
+import fs from 'fs';
import path from 'path';
import vue from 'rollup-plugin-vue';
import alias from 'zan-rollup-plugin-alias';
@@ -8,6 +9,17 @@ import componentsConfig from '../components.json';
const extensions = ['.js', '.vue'];
+// 打包时排除 mixins、utils、其他组件
+const utilsPath = path.resolve(__dirname, '../packages/common/utils/');
+const mixinsPath = path.resolve(__dirname, '../packages/common/mixins/');
+const external = [
+ ...fs.readdirSync(utilsPath).map(item => path.resolve(utilsPath, item)),
+ ...fs.readdirSync(mixinsPath).map(item => path.resolve(mixinsPath, item)),
+ ...Object.keys(componentsConfig).map(component =>
+ path.resolve(__dirname, '../packages', component, 'index.js')
+ )
+];
+
export default Object.keys(componentsConfig).map(component => {
return {
entry: componentsConfig[component],
@@ -17,7 +29,12 @@ export default Object.keys(componentsConfig).map(component => {
format: 'cjs'
}
],
- external: ['vue', 'vue-lazyload'],
+ external: [
+ 'vue',
+ 'vue-lazyload',
+ path.resolve(__dirname, '../packages/common/mixins/popup/index.js'),
+ ...external
+ ],
plugins: [
vue(),
babel({
@@ -36,7 +53,7 @@ export default Object.keys(componentsConfig).map(component => {
'src/mixins': path.resolve(__dirname, '../packages/common/mixins'),
'src/utils': path.resolve(__dirname, '../packages/common/utils'),
packages: path.resolve(__dirname, '../packages')
- }),
+ })
]
};
});
diff --git a/build/webpack.build.js b/build/webpack.build.js
index 0ce2bb610..2b53cbae7 100644
--- a/build/webpack.build.js
+++ b/build/webpack.build.js
@@ -3,7 +3,7 @@ const config = require('./webpack.config.dev.js');
const isMinify = process.argv.indexOf('-p') !== -1;
config.entry = {
- 'vant': './src/index.js'
+ 'vant': './packages/index.js'
};
config.output = {
diff --git a/build/webpack.components.js b/build/webpack.components.js
deleted file mode 100644
index d5a3c18fb..000000000
--- a/build/webpack.components.js
+++ /dev/null
@@ -1,31 +0,0 @@
-const path = require('path');
-const Components = require('../components.json');
-const config = require('./webpack.build.js');
-const webpack = require('webpack');
-
-delete config.devtool;
-
-const entry = {};
-Object.keys(Components).forEach(key => {
- entry[key + '/index'] = Components[key];
-});
-
-config.entry = entry;
-
-config.externals = {
- vue: {
- root: 'Vue',
- commonjs: 'vue',
- commonjs2: 'vue',
- amd: 'vue'
- }
-};
-
-config.output = {
- path: path.join(__dirname, '../lib'),
- filename: '[name].js',
- libraryExport: "default",
- libraryTarget: 'umd'
-};
-
-module.exports = config;
diff --git a/build/webpack.config.dev.js b/build/webpack.config.dev.js
index 89ae7be1f..5e3ccf985 100644
--- a/build/webpack.config.dev.js
+++ b/build/webpack.config.dev.js
@@ -38,7 +38,8 @@ module.exports = {
extensions: ['.js', '.vue', '.css'],
alias: {
vue: 'vue/dist/vue.runtime.esm.js',
- src: path.join(__dirname, '../src'),
+ 'src/mixins': path.resolve(__dirname, '../packages/common/mixins'),
+ 'src/utils': path.resolve(__dirname, '../packages/common/utils'),
packages: path.join(__dirname, '../packages'),
lib: path.join(__dirname, '../lib'),
components: path.join(__dirname, '../docs/src/components')
diff --git a/docs/examples-docs/dialog.md b/docs/examples-docs/dialog.md
index 8fbcca762..a40704c8c 100644
--- a/docs/examples-docs/dialog.md
+++ b/docs/examples-docs/dialog.md
@@ -7,7 +7,7 @@