diff --git a/scripts/publish.sh b/scripts/publish.sh index f7544f8bda..d6084cf89c 100644 --- a/scripts/publish.sh +++ b/scripts/publish.sh @@ -1,7 +1,8 @@ -npm run babel -rm -rf dist -webpack --config webpack.antd.config.js +rm -rf lib dist + +npm run babel # generate /lib +atool-build --config webpack.antd.config.js # generate /dist node scripts/prenpm.js npm publish $1 $2 -rm -rf lib -rm -rf dist + +rm -rf lib dist diff --git a/webpack.antd.config.js b/webpack.antd.config.js index a2389f9365..cac3a29c5a 100644 --- a/webpack.antd.config.js +++ b/webpack.antd.config.js @@ -1,21 +1,22 @@ -var config = require('./webpack.config'); -config.entry = { - 'antd': ['./style/index.less', './index.js'] +module.exports = function(webpackConfig) { + webpackConfig.entry = { + 'antd': ['./style/index.less', './index.js'] + }; + webpackConfig.externals = { + 'react': { + root: 'React', + commonjs2: 'react', + commonjs: 'react', + amd: 'react' + }, + 'react-dom': { + root: 'ReactDOM', + commonjs2: 'react-dom', + commonjs: 'react-dom', + amd: 'react-dom' + } + }; + webpackConfig.output.library = 'antd'; + webpackConfig.output.libraryTarget = 'umd'; + return webpackConfig; }; -config.externals = { - 'react': { - root: 'React', - commonjs2: 'react', - commonjs: 'react', - amd: 'react' - }, - 'react-dom': { - root: 'ReactDOM', - commonjs2: 'react-dom', - commonjs: 'react-dom', - amd: 'react-dom' - } -}; -config.output.library = 'antd'; -config.output.libraryTarget = 'umd'; -module.exports = config; diff --git a/webpack.config.js b/webpack.config.js deleted file mode 100644 index ef21c5af4e..0000000000 --- a/webpack.config.js +++ /dev/null @@ -1,67 +0,0 @@ -var webpack = require('webpack'); -var ExtractTextPlugin = require("extract-text-webpack-plugin"); -var path = require('path'); -var pkg = require('./package'); -var autoprefixer = require('autoprefixer'); - -var entry = {}; -entry['demo'] = ['./scripts/demo.js', 'webpack-hot-middleware/client']; - -module.exports = { - entry: entry, - - cache: true, - - resolve: { - extensions: ['', '.js', '.jsx'], - unsafeCache: true - }, - - noParse: /_site|node_modules/, - - output: { - path: path.join(process.cwd(), 'dist'), - publicPath: '/dist/', - filename: '[name].js' - }, - - module: { - loaders: [{ - test: /\.jsx?$/, - exclude: /node_modules/, - loader: 'babel', - query: { - cacheDirectory: true, - presets: ['es2015', 'react', 'stage-0', 'react-hmre'], - plugins: ['add-module-exports'] - } - }, { - test: /\.json$/, - exclude: /node_modules/, - loader: 'json-loader' - }, { - test: /\.less$/, - exclude: /node_modules/, - loader: ExtractTextPlugin.extract( - 'css?sourceMap&-minimize!' + 'postcss-loader!' + 'less?sourceMap' - ) - }, { - test: /\.css$/, - exclude: /node_modules/, - loader: ExtractTextPlugin.extract( - 'css?sourceMap&-minimize!' + 'postcss-loader' - ) - }] - }, - - postcss: [autoprefixer], - - plugins: [ - new ExtractTextPlugin('[name].css'), - new webpack.optimize.OccurenceOrderPlugin(), - new webpack.HotModuleReplacementPlugin(), - new webpack.NoErrorsPlugin() - ], - - devtool: 'source-map' -};