From d0bb15f9deaf82132d03d9a58b54d9f56323bdb2 Mon Sep 17 00:00:00 2001 From: Zhi Date: Fri, 25 Jan 2019 19:15:48 +0800 Subject: [PATCH 1/3] [build] 2.5.0 --- examples/versions.json | 2 +- packages/theme-chalk/package.json | 2 +- src/index.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/examples/versions.json b/examples/versions.json index 9bd52db91..66bc3cacc 100644 --- a/examples/versions.json +++ b/examples/versions.json @@ -1 +1 @@ -{"1.4.13":"1.4","2.0.11":"2.0","2.1.0":"2.1","2.2.2":"2.2","2.3.9":"2.3","2.4.11":"2.4"} \ No newline at end of file +{"1.4.13":"1.4","2.0.11":"2.0","2.1.0":"2.1","2.2.2":"2.2","2.3.9":"2.3","2.5.0":"2.4"} \ No newline at end of file diff --git a/packages/theme-chalk/package.json b/packages/theme-chalk/package.json index 260ce0c3b..49f690a42 100644 --- a/packages/theme-chalk/package.json +++ b/packages/theme-chalk/package.json @@ -1,6 +1,6 @@ { "name": "element-theme-chalk", - "version": "2.4.11", + "version": "2.5.0", "description": "Element component chalk theme.", "main": "lib/index.css", "style": "lib/index.css", diff --git a/src/index.js b/src/index.js index fdd7254c9..755264596 100644 --- a/src/index.js +++ b/src/index.js @@ -172,7 +172,7 @@ if (typeof window !== 'undefined' && window.Vue) { } export default { - version: '2.4.11', + version: '2.5.0', locale: locale.use, i18n: locale.i18n, install, From 37f43a1f9066a3f23a66f5cbbae05112a9e2aced Mon Sep 17 00:00:00 2001 From: Zhi Date: Fri, 25 Jan 2019 19:15:48 +0800 Subject: [PATCH 2/3] [release] 2.5.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 9fb9a4b4d..89aa72f7f 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "element-ui", - "version": "2.4.11", + "version": "2.5.0", "description": "A Component Library for Vue.js.", "main": "lib/element-ui.common.js", "files": [ From 6b4413f829701812fdf182311ed2bb8a2523631e Mon Sep 17 00:00:00 2001 From: Zhi Date: Sat, 26 Jan 2019 14:31:41 +0800 Subject: [PATCH 3/3] chore: fix export issue generate by webpack upgrading --- build/deploy-faas.sh | 2 +- build/webpack.common.js | 2 ++ build/webpack.conf.js | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/build/deploy-faas.sh b/build/deploy-faas.sh index ed6e892c4..0540c338b 100644 --- a/build/deploy-faas.sh +++ b/build/deploy-faas.sh @@ -5,7 +5,7 @@ cd temp_web git clone --depth 1 -b gh-pages --single-branch https://github.com/ElemeFE/element.git && cd element # build sub folder -SUB_FOLDER='2.4' +SUB_FOLDER='2.5' mkdir $SUB_FOLDER rm -rf *.js *.css *.map static rm -rf $SUB_FOLDER/** diff --git a/build/webpack.common.js b/build/webpack.common.js index 6357fb78c..abd862516 100644 --- a/build/webpack.common.js +++ b/build/webpack.common.js @@ -14,6 +14,8 @@ module.exports = { publicPath: '/dist/', filename: 'element-ui.common.js', chunkFilename: '[id].js', + libraryExport: 'default', + library: 'ELEMENT', libraryTarget: 'commonjs2' }, resolve: { diff --git a/build/webpack.conf.js b/build/webpack.conf.js index 65fbdfa23..0ccd5fbaf 100644 --- a/build/webpack.conf.js +++ b/build/webpack.conf.js @@ -15,6 +15,7 @@ module.exports = { filename: 'index.js', chunkFilename: '[id].js', libraryTarget: 'umd', + libraryExport: 'default', library: 'ELEMENT', umdNamedDefine: true },