diff --git a/build/bin/build-all.js b/build/bin/build-all.js index 121aa6ada..5a190e277 100644 --- a/build/bin/build-all.js +++ b/build/bin/build-all.js @@ -14,12 +14,12 @@ Object.keys(components).forEach(key => { const filePath = path.join(__dirname, `../../packages/${key}/cooking.conf.js`); if (existsSync(filePath)) { - componentPaths.push(`../packages/${key}/cooking.conf.js`); + componentPaths.push(`packages/${key}/cooking.conf.js`); } }); const paths = componentPaths.join(','); -const cli = `cooking build -c ${paths} -p`; +const cli = `node_modules/.bin/cooking build -c ${paths} -p`; execSync(cli, { stdio: 'inherit' diff --git a/build/bin/new.js b/build/bin/new.js index 3bd6f208c..7b592ecfa 100644 --- a/build/bin/new.js +++ b/build/bin/new.js @@ -16,7 +16,7 @@ const uppercamelcase = require('uppercamelcase'); const componentname = process.argv[2]; const chineseName = process.argv[3] || componentname; const ComponentName = uppercamelcase(componentname); -const PackagePath = path.resolve(__dirname, '../packages', componentname); +const PackagePath = path.resolve(__dirname, '../../packages', componentname); const Files = [ { filename: 'index.js', diff --git a/components.json b/components.json index 1bf6dc722..520de1f3d 100644 --- a/components.json +++ b/components.json @@ -1,5 +1,4 @@ { - "select-dropdown": "./packages/select-dropdown/index.js", "pagination": "./packages/pagination/index.js", "dialog": "./packages/dialog/index.js", "autocomplete": "./packages/autocomplete/index.js", diff --git a/packages/alert/cooking.conf.js b/packages/alert/cooking.conf.js index 76dbab658..bc4f72bf5 100644 --- a/packages/alert/cooking.conf.js +++ b/packages/alert/cooking.conf.js @@ -1,5 +1,6 @@ var cooking = require('cooking'); var path = require('path'); +var config = require('../../build/config'); cooking.set({ entry: { @@ -9,21 +10,9 @@ cooking.set({ template: false, format: 'umd', moduleName: 'ElAlert', - extends: ['vue2'] -}); - -cooking.add('resolve.alias', { - 'main': path.join(__dirname, '../../src'), - 'packages': path.join(__dirname, '../../packages') -}); - -cooking.add('externals', { - vue: { - root: 'Vue', - commonjs: 'vue', - commonjs2: 'vue', - amd: 'vue' - } + extends: ['vue2'], + alias: config.alias, + externals: { vue: config.vue } }); module.exports = cooking.resolve(); diff --git a/packages/autocomplete/cooking.conf.js b/packages/autocomplete/cooking.conf.js index 640b10431..e2f8a8d52 100644 --- a/packages/autocomplete/cooking.conf.js +++ b/packages/autocomplete/cooking.conf.js @@ -1,5 +1,6 @@ var cooking = require('cooking'); var path = require('path'); +var config = require('../../build/config'); cooking.set({ entry: { @@ -9,21 +10,9 @@ cooking.set({ template: false, format: 'umd', moduleName: 'ElAutocomplete', - extends: ['vue2'] -}); - -cooking.add('resolve.alias', { - 'main': path.join(__dirname, '../../src'), - 'packages': path.join(__dirname, '../../packages') -}); - -cooking.add('externals', { - vue: { - root: 'Vue', - commonjs: 'vue', - commonjs2: 'vue', - amd: 'vue' - } + extends: ['vue2'], + alias: config.alias, + externals: { vue: config.vue } }); module.exports = cooking.resolve(); diff --git a/packages/badge/cooking.conf.js b/packages/badge/cooking.conf.js index 578005c55..2ad94bf31 100644 --- a/packages/badge/cooking.conf.js +++ b/packages/badge/cooking.conf.js @@ -1,5 +1,6 @@ var cooking = require('cooking'); var path = require('path'); +var config = require('../../build/config'); cooking.set({ entry: { @@ -9,21 +10,9 @@ cooking.set({ template: false, format: 'umd', moduleName: 'ElBadge', - extends: ['vue2'] -}); - -cooking.add('resolve.alias', { - 'main': path.join(__dirname, '../../src'), - 'packages': path.join(__dirname, '../../packages') -}); - -cooking.add('externals', { - vue: { - root: 'Vue', - commonjs: 'vue', - commonjs2: 'vue', - amd: 'vue' - } + extends: ['vue2'], + alias: config.alias, + externals: { vue: config.vue } }); module.exports = cooking.resolve(); diff --git a/packages/breadcrumb/cooking.conf.js b/packages/breadcrumb/cooking.conf.js index d4d80b49e..bb47057c6 100644 --- a/packages/breadcrumb/cooking.conf.js +++ b/packages/breadcrumb/cooking.conf.js @@ -1,5 +1,6 @@ var cooking = require('cooking'); var path = require('path'); +var config = require('../../build/config'); cooking.set({ entry: { @@ -9,21 +10,9 @@ cooking.set({ template: false, format: 'umd', moduleName: 'ElBreadcrumb', - extends: ['vue2'] -}); - -cooking.add('resolve.alias', { - 'main': path.join(__dirname, '../../src'), - 'packages': path.join(__dirname, '../../packages') -}); - -cooking.add('externals', { - vue: { - root: 'Vue', - commonjs: 'vue', - commonjs2: 'vue', - amd: 'vue' - } + extends: ['vue2'], + alias: config.alias, + externals: { vue: config.vue } }); module.exports = cooking.resolve(); diff --git a/packages/button/cooking.conf.js b/packages/button/cooking.conf.js index 70c93458d..2e6cba66a 100644 --- a/packages/button/cooking.conf.js +++ b/packages/button/cooking.conf.js @@ -1,5 +1,6 @@ var cooking = require('cooking'); var path = require('path'); +var config = require('../../build/config'); cooking.set({ entry: { @@ -9,21 +10,9 @@ cooking.set({ template: false, format: 'umd', moduleName: 'ElButton', - extends: ['vue2'] -}); - -cooking.add('resolve.alias', { - 'main': path.join(__dirname, '../../src'), - 'packages': path.join(__dirname, '../../packages') -}); - -cooking.add('externals', { - vue: { - root: 'Vue', - commonjs: 'vue', - commonjs2: 'vue', - amd: 'vue' - } + extends: ['vue2'], + alias: config.alias, + externals: { vue: config.vue } }); module.exports = cooking.resolve(); diff --git a/packages/card/cooking.conf.js b/packages/card/cooking.conf.js index 6545e96ad..e55ad54b4 100644 --- a/packages/card/cooking.conf.js +++ b/packages/card/cooking.conf.js @@ -1,5 +1,6 @@ var cooking = require('cooking'); var path = require('path'); +var config = require('../../build/config'); cooking.set({ entry: { @@ -9,21 +10,9 @@ cooking.set({ template: false, format: 'umd', moduleName: 'ElCard', - extends: ['vue2'] -}); - -cooking.add('resolve.alias', { - 'main': path.join(__dirname, '../../src'), - 'packages': path.join(__dirname, '../../packages') -}); - -cooking.add('externals', { - vue: { - root: 'Vue', - commonjs: 'vue', - commonjs2: 'vue', - amd: 'vue' - } + extends: ['vue2'], + alias: config.alias, + externals: { vue: config.vue } }); module.exports = cooking.resolve(); diff --git a/packages/cascader/README.md b/packages/cascader/README.md deleted file mode 100644 index 19014cd4b..000000000 --- a/packages/cascader/README.md +++ /dev/null @@ -1,50 +0,0 @@ -# el-cascader -> A el-cascader component for Vue.js. - -## Installation -```shell -npm i el-cascader -D -``` - -## Usage -```javascript -import Vue from 'vue' -import ElCascader from 'el-cascader' -import 'theme-default/dist/cascader.css' - -Vue.use(ElCascader) -``` - -or - -```javascript -import Vue from 'vue' -import { ElCascader } from 'el-cascader' - -Vue.component('el-cascader', ElCascader) -``` - - -## Options - -### el-cascader - -| 参数 | 说明 | 类型 | 可选值 | 默认值 | -|--------------------|----------------------------------------------------------|-------------------|-------------|--------| -|model| 绑定值| string | | | -|placeholder| 占位符| string | | | | - - -## Development -```shell -make dev - -## test -make test - -## build -make build -``` - -# License -[MIT](https://opensource.org/licenses/MIT) diff --git a/packages/cascader/cooking.conf.js b/packages/cascader/cooking.conf.js deleted file mode 100644 index b0d8c6848..000000000 --- a/packages/cascader/cooking.conf.js +++ /dev/null @@ -1,29 +0,0 @@ -var cooking = require('cooking'); -var path = require('path'); - -cooking.set({ - entry: { - index: path.join(__dirname, 'index.js') - }, - dist: path.join(__dirname, 'lib'), - template: false, - format: 'umd', - moduleName: 'ElCascader', - extends: ['vue2'] -}); - -cooking.add('resolve.alias', { - 'main': path.join(__dirname, '../../src'), - 'packages': path.join(__dirname, '../../packages') -}); - -cooking.add('externals', { - vue: { - root: 'Vue', - commonjs: 'vue', - commonjs2: 'vue', - amd: 'vue' - } -}); - -module.exports = cooking.resolve(); diff --git a/packages/cascader/index.js b/packages/cascader/index.js deleted file mode 100644 index f601f4ad3..000000000 --- a/packages/cascader/index.js +++ /dev/null @@ -1,7 +0,0 @@ -const ElCascader = require('./src/cascader'); - -ElCascader.install = function(Vue) { - Vue.component(ElCascader.name, ElCascader); -}; - -module.exports = ElCascader; diff --git a/packages/cascader/package.json b/packages/cascader/package.json deleted file mode 100644 index ecc3b0f55..000000000 --- a/packages/cascader/package.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "name": "el-cascader", - "version": "1.0.1", - "description": "A cascader component for Vue.", - "keywords": [ - "element", - "vue", - "component" - ], - "main": "./lib/index.js", - "repository": "https://github.com/element-component/element/tree/master/packages/cascader", - "author": "qingwei-li", - "license": "MIT", - "dependencies": { - "object-equal": "^1.0.0" - } -} diff --git a/packages/cascader/src/cascader.vue b/packages/cascader/src/cascader.vue deleted file mode 100644 index 88c52e6b4..000000000 --- a/packages/cascader/src/cascader.vue +++ /dev/null @@ -1,91 +0,0 @@ - - - diff --git a/packages/cascader/src/dropdown.vue b/packages/cascader/src/dropdown.vue deleted file mode 100644 index f11c49f53..000000000 --- a/packages/cascader/src/dropdown.vue +++ /dev/null @@ -1,109 +0,0 @@ - - - diff --git a/packages/cascader/src/menu.vue b/packages/cascader/src/menu.vue deleted file mode 100644 index d8b9b7c64..000000000 --- a/packages/cascader/src/menu.vue +++ /dev/null @@ -1,35 +0,0 @@ - \ No newline at end of file diff --git a/packages/checkbox/_index.js b/packages/checkbox/_index.js new file mode 100644 index 000000000..610bab8ef --- /dev/null +++ b/packages/checkbox/_index.js @@ -0,0 +1,10 @@ +const ElCheckbox = require('./src/checkbox'); +const ElCheckboxGroup = require('./src/checkbox-group.vue'); + +module.exports = function install(Vue) { + Vue.component(ElCheckboxGroup.name, ElCheckboxGroup); + Vue.component(ElCheckbox.name, ElCheckbox); +}; + +exports.ElCheckbox = ElCheckbox; +exports.ElCheckboxGroup = ElCheckboxGroup; diff --git a/packages/checkbox/cooking.conf.js b/packages/checkbox/cooking.conf.js index bcc8b62c3..dd108dd88 100644 --- a/packages/checkbox/cooking.conf.js +++ b/packages/checkbox/cooking.conf.js @@ -1,5 +1,6 @@ var cooking = require('cooking'); var path = require('path'); +var config = require('../../build/config'); cooking.set({ entry: { @@ -9,21 +10,9 @@ cooking.set({ template: false, format: 'umd', moduleName: 'ElCheckbox', - extends: ['vue2'] -}); - -cooking.add('resolve.alias', { - 'main': path.join(__dirname, '../../src'), - 'packages': path.join(__dirname, '../../packages') -}); - -cooking.add('externals', { - vue: { - root: 'Vue', - commonjs: 'vue', - commonjs2: 'vue', - amd: 'vue' - } + extends: ['vue2'], + alias: config.alias, + externals: { vue: config.vue } }); module.exports = cooking.resolve(); diff --git a/packages/checkbox/index.js b/packages/checkbox/index.js index ef523ea72..6cecf5549 100644 --- a/packages/checkbox/index.js +++ b/packages/checkbox/index.js @@ -1,7 +1,7 @@ const ElCheckbox = require('./src/checkbox'); ElCheckbox.install = function(Vue) { - Vue.component('el-checkbox', ElCheckbox); + Vue.component(ElCheckbox.name, ElCheckbox); }; module.exports = ElCheckbox; diff --git a/packages/col/cooking.conf.js b/packages/col/cooking.conf.js index 67190d5f3..2e4987239 100644 --- a/packages/col/cooking.conf.js +++ b/packages/col/cooking.conf.js @@ -1,5 +1,6 @@ var cooking = require('cooking'); var path = require('path'); +var config = require('../../build/config'); cooking.set({ entry: { @@ -9,21 +10,9 @@ cooking.set({ template: false, format: 'umd', moduleName: 'ElCol', - extends: ['vue2'] -}); - -cooking.add('resolve.alias', { - 'main': path.join(__dirname, '../../src'), - 'packages': path.join(__dirname, '../../packages') -}); - -cooking.add('externals', { - vue: { - root: 'Vue', - commonjs: 'vue', - commonjs2: 'vue', - amd: 'vue' - } + extends: ['vue2'], + alias: config.alias, + externals: { vue: config.vue } }); module.exports = cooking.resolve(); diff --git a/packages/date-picker/README.md b/packages/date-picker/README.md index e05438cc9..8d8ff9a1e 100644 --- a/packages/date-picker/README.md +++ b/packages/date-picker/README.md @@ -1,33 +1,39 @@ -# __component_name__ +# el-date-picker -# Screenshots -# Demo - -# Installation -> - -# Usage -```javascript - -``` - -# Options - -| name | description | type | default | -|-------------|-------------|-------------|-------------| -| | | | | - -# Development +## Installation ```shell -make dev - -# test -make test - -# build -make build +npm i el-date-picker -S ``` -# License -[MIT](https://opensource.org/licenses/MIT) +## Usage + +A: +```javascript +import Vue from 'vue' +import ElDatePicker from 'el-date-picker' + +Vue.use(ElDatePicker) +``` + +B: +```javascript +import Vue from 'vue' +import { DatePicker, TimePicker, TimeSelect } from 'el-date-picker' + +Vue.component(DatePicker.name, DatePicker); +Vue.component(TimePicker.name, TimePicker); +Vue.component(TimeSelect.name, TimeSelect); +``` + +C: +```html + + + +``` + +## License +MIT diff --git a/packages/date-picker/_index.js b/packages/date-picker/_index.js new file mode 100644 index 000000000..77c7e9b80 --- /dev/null +++ b/packages/date-picker/_index.js @@ -0,0 +1,13 @@ +import DatePicker from './src/picker/date-picker'; +import TimePicker from './src/picker/time-picker'; +import TimeSelect from './src/picker/time-select'; + +module.exports = function install(Vue) { + Vue.component(DatePicker.name, DatePicker); + Vue.component(TimePicker.name, TimePicker); + Vue.component(TimeSelect.name, TimeSelect); +}; + +exports.DatePicker = DatePicker; +exports.TimePicker = TimePicker; +exports.TimeSelect = TimeSelect; diff --git a/packages/date-picker/cooking.conf.js b/packages/date-picker/cooking.conf.js index e7d704240..7c9d2a0a3 100644 --- a/packages/date-picker/cooking.conf.js +++ b/packages/date-picker/cooking.conf.js @@ -1,29 +1,18 @@ var cooking = require('cooking'); var path = require('path'); +var config = require('../../build/config'); cooking.set({ entry: { - index: path.join(__dirname, 'index.js') + index: path.join(__dirname, '_index.js') }, dist: path.join(__dirname, 'lib'), template: false, format: 'umd', moduleName: 'ElDatePicker', - extends: ['vue2'] -}); - -cooking.add('resolve.alias', { - 'main': path.join(__dirname, '../../src'), - 'packages': path.join(__dirname, '../../packages') -}); - -cooking.add('externals', { - vue: { - root: 'Vue', - commonjs: 'vue', - commonjs2: 'vue', - amd: 'vue' - } + extends: ['vue2'], + alias: config.alias, + externals: { vue: config.vue } }); module.exports = cooking.resolve(); diff --git a/packages/date-picker/index.js b/packages/date-picker/index.js index caa5b7fb6..f8fbb16e6 100644 --- a/packages/date-picker/index.js +++ b/packages/date-picker/index.js @@ -1,2 +1,2 @@ -import Picker from '../date-picker/src/picker/date-picker'; +import Picker from './src/picker/date-picker'; module.exports = Picker; diff --git a/packages/dialog/cooking.conf.js b/packages/dialog/cooking.conf.js index eaf90248e..338fd6462 100644 --- a/packages/dialog/cooking.conf.js +++ b/packages/dialog/cooking.conf.js @@ -1,5 +1,6 @@ var cooking = require('cooking'); var path = require('path'); +var config = require('../../build/config'); cooking.set({ entry: { @@ -9,21 +10,9 @@ cooking.set({ template: false, format: 'umd', moduleName: 'ElDialog', - extends: ['vue2'] -}); - -cooking.add('resolve.alias', { - 'main': path.join(__dirname, '../../src'), - 'packages': path.join(__dirname, '../../packages') -}); - -cooking.add('externals', { - vue: { - root: 'Vue', - commonjs: 'vue', - commonjs2: 'vue', - amd: 'vue' - } + extends: ['vue2'], + alias: config.alias, + externals: { vue: config.vue } }); module.exports = cooking.resolve(); diff --git a/packages/dialog/index.js b/packages/dialog/index.js index a93e9c56f..cfb83b3dc 100644 --- a/packages/dialog/index.js +++ b/packages/dialog/index.js @@ -1,7 +1,7 @@ const ElDialog = require('./src/component'); ElDialog.install = function(Vue) { - Vue.component('el-dialog', ElDialog); + Vue.component(ElDialog.name, ElDialog); }; module.exports = ElDialog; diff --git a/packages/dropdown/cooking.conf.js b/packages/dropdown/cooking.conf.js index a751574bb..ef96cc5e9 100644 --- a/packages/dropdown/cooking.conf.js +++ b/packages/dropdown/cooking.conf.js @@ -1,5 +1,6 @@ var cooking = require('cooking'); var path = require('path'); +var config = require('../../build/config'); cooking.set({ entry: { @@ -9,21 +10,9 @@ cooking.set({ template: false, format: 'umd', moduleName: 'ElDropdown', - extends: ['vue2'] -}); - -cooking.add('resolve.alias', { - 'main': path.join(__dirname, '../../src'), - 'packages': path.join(__dirname, '../../packages') -}); - -cooking.add('externals', { - vue: { - root: 'Vue', - commonjs: 'vue', - commonjs2: 'vue', - amd: 'vue' - } + extends: ['vue2'], + alias: config.alias, + externals: { vue: config.vue } }); module.exports = cooking.resolve(); diff --git a/packages/form/_index.js b/packages/form/_index.js new file mode 100644 index 000000000..ec6c927c9 --- /dev/null +++ b/packages/form/_index.js @@ -0,0 +1,10 @@ +const ElFormItem = require('./src/form-item'); +const ElForm = require('./src/form'); + +module.exports = function(Vue) { + Vue.component(ElForm.name, ElForm); + Vue.component(ElFormItem.name, ElFormItem); +}; + +exports = ElFormItem; +exports = ElForm; diff --git a/packages/form/cooking.conf.js b/packages/form/cooking.conf.js index b208ea5f0..70a575b9a 100644 --- a/packages/form/cooking.conf.js +++ b/packages/form/cooking.conf.js @@ -1,29 +1,18 @@ var cooking = require('cooking'); var path = require('path'); +var config = require('../../build/config'); cooking.set({ entry: { - index: path.join(__dirname, 'index.js') + index: path.join(__dirname, '_index.js') }, dist: path.join(__dirname, 'lib'), template: false, format: 'umd', moduleName: 'ElForm', - extends: ['vue2'] -}); - -cooking.add('resolve.alias', { - 'main': path.join(__dirname, '../../src'), - 'packages': path.join(__dirname, '../../packages') -}); - -cooking.add('externals', { - vue: { - root: 'Vue', - commonjs: 'vue', - commonjs2: 'vue', - amd: 'vue' - } + extends: ['vue2'], + alias: config.alias, + externals: { vue: config.vue } }); module.exports = cooking.resolve(); diff --git a/packages/input-number/cooking.conf.js b/packages/input-number/cooking.conf.js index cd4ad4585..0708d88bf 100644 --- a/packages/input-number/cooking.conf.js +++ b/packages/input-number/cooking.conf.js @@ -1,5 +1,6 @@ var cooking = require('cooking'); var path = require('path'); +var config = require('../../build/config'); cooking.set({ entry: { @@ -9,21 +10,9 @@ cooking.set({ template: false, format: 'umd', moduleName: 'ElInputNumber', - extends: ['vue2'] -}); - -cooking.add('resolve.alias', { - 'main': path.join(__dirname, '../../src'), - 'packages': path.join(__dirname, '../../packages') -}); - -cooking.add('externals', { - vue: { - root: 'Vue', - commonjs: 'vue', - commonjs2: 'vue', - amd: 'vue' - } + extends: ['vue2'], + alias: config.alias, + externals: { vue: config.vue } }); module.exports = cooking.resolve(); diff --git a/packages/input/cooking.conf.js b/packages/input/cooking.conf.js index 2c31952e3..6121c0650 100644 --- a/packages/input/cooking.conf.js +++ b/packages/input/cooking.conf.js @@ -1,5 +1,6 @@ var cooking = require('cooking'); var path = require('path'); +var config = require('../../build/config'); cooking.set({ entry: { @@ -9,21 +10,9 @@ cooking.set({ template: false, format: 'umd', moduleName: 'ElInput', - extends: ['vue2'] -}); - -cooking.add('resolve.alias', { - 'main': path.join(__dirname, '../../src'), - 'packages': path.join(__dirname, '../../packages') -}); - -cooking.add('externals', { - vue: { - root: 'Vue', - commonjs: 'vue', - commonjs2: 'vue', - amd: 'vue' - } + extends: ['vue2'], + alias: config.alias, + externals: { vue: config.vue } }); module.exports = cooking.resolve(); diff --git a/packages/loading/cooking.conf.js b/packages/loading/cooking.conf.js index c36ea233c..a79649cf5 100644 --- a/packages/loading/cooking.conf.js +++ b/packages/loading/cooking.conf.js @@ -1,5 +1,6 @@ var cooking = require('cooking'); var path = require('path'); +var config = require('../../build/config'); cooking.set({ entry: { @@ -9,21 +10,9 @@ cooking.set({ template: false, format: 'umd', moduleName: 'ElLoading', - extends: ['vue2'] -}); - -cooking.add('resolve.alias', { - 'main': path.join(__dirname, '../../src'), - 'packages': path.join(__dirname, '../../packages') -}); - -cooking.add('externals', { - vue: { - root: 'Vue', - commonjs: 'vue', - commonjs2: 'vue', - amd: 'vue' - } + extends: ['vue2'], + alias: config.alias, + externals: { vue: config.vue } }); module.exports = cooking.resolve(); diff --git a/packages/loading/index.js b/packages/loading/index.js index a6f62af52..1ca14c6cc 100644 --- a/packages/loading/index.js +++ b/packages/loading/index.js @@ -1,4 +1,2 @@ import Loading from './src/directive'; -Loading.name = 'loading'; - module.exports = Loading; diff --git a/packages/menu/_index.js b/packages/menu/_index.js new file mode 100644 index 000000000..c726a6c55 --- /dev/null +++ b/packages/menu/_index.js @@ -0,0 +1,16 @@ +const ElMenu = require('./src/menu'); +const ElMenuItem = require('./src/menu-item'); +const ElMenuItemGroup = require('./src/menu-item-group'); +const ElSubmenu = require('./src/submenu'); + +module.exports = function(Vue) { + Vue.component(ElMenuItem.name, ElMenuItem); + Vue.component(ElMenuItemGroup.name, ElMenuItemGroup); + Vue.component(ElMenu.name, ElMenu); + Vue.component(ElSubmenu.name, ElSubmenu); +}; + +exports.ElMenuItemGroup = ElMenuItemGroup; +exports.ElMenuItem = ElMenuItem; +exports.ElMenu = ElMenu; +exports.ElSubmenu = ElSubmenu; diff --git a/packages/menu/cooking.conf.js b/packages/menu/cooking.conf.js index 551386a18..280b238a0 100644 --- a/packages/menu/cooking.conf.js +++ b/packages/menu/cooking.conf.js @@ -1,29 +1,18 @@ var cooking = require('cooking'); var path = require('path'); +var config = require('../../build/config'); cooking.set({ entry: { - index: path.join(__dirname, 'index.js') + index: path.join(__dirname, '_index.js') }, dist: path.join(__dirname, 'lib'), template: false, format: 'umd', moduleName: 'ElMenu', - extends: ['vue2'] -}); - -cooking.add('resolve.alias', { - 'main': path.join(__dirname, '../../src'), - 'packages': path.join(__dirname, '../../packages') -}); - -cooking.add('externals', { - vue: { - root: 'Vue', - commonjs: 'vue', - commonjs2: 'vue', - amd: 'vue' - } + extends: ['vue2'], + alias: config.alias, + externals: { vue: config.vue } }); module.exports = cooking.resolve(); diff --git a/packages/select-dropdown/package.json b/packages/menu/package.json similarity index 65% rename from packages/select-dropdown/package.json rename to packages/menu/package.json index 83a9d2424..3f2298b17 100644 --- a/packages/select-dropdown/package.json +++ b/packages/menu/package.json @@ -1,16 +1,17 @@ { - "name": "el-select-dropdown", + "name": "el-menu", "version": "0.0.0", - "description": "A select-dropdown component for Vue.js.", + "description": "A menu component for Vue.js.", "keywords": [ "element", "vue", "component" ], "main": "./lib/index.js", - "repository": "https://github.com/element-component/element/tree/master/packages/select-dropdown", + "repository": "https://github.com/element-component/element/tree/master/packages/menu", "author": "elemefe", "license": "MIT", "dependencies": { + "wind-dom": "0.0.3" } } diff --git a/packages/message-box/cooking.conf.js b/packages/message-box/cooking.conf.js index 91b00a0ad..2ee2d63fb 100644 --- a/packages/message-box/cooking.conf.js +++ b/packages/message-box/cooking.conf.js @@ -1,5 +1,6 @@ var cooking = require('cooking'); var path = require('path'); +var config = require('../../build/config'); cooking.set({ entry: { @@ -9,21 +10,9 @@ cooking.set({ template: false, format: 'umd', moduleName: 'ElMessageBox', - extends: ['vue2'] -}); - -cooking.add('resolve.alias', { - 'main': path.join(__dirname, '../../src'), - 'packages': path.join(__dirname, '../../packages') -}); - -cooking.add('externals', { - vue: { - root: 'Vue', - commonjs: 'vue', - commonjs2: 'vue', - amd: 'vue' - } + extends: ['vue2'], + alias: config.alias, + externals: { vue: config.vue } }); module.exports = cooking.resolve(); diff --git a/packages/message-box/index.js b/packages/message-box/index.js index 110d20fbe..02d321500 100644 --- a/packages/message-box/index.js +++ b/packages/message-box/index.js @@ -1,3 +1,2 @@ import MessageBox from './src/main.js'; - module.exports = MessageBox; diff --git a/packages/message/cooking.conf.js b/packages/message/cooking.conf.js index c67711bd4..05d1e7034 100644 --- a/packages/message/cooking.conf.js +++ b/packages/message/cooking.conf.js @@ -1,5 +1,6 @@ var cooking = require('cooking'); var path = require('path'); +var config = require('../../build/config'); cooking.set({ entry: { @@ -9,21 +10,9 @@ cooking.set({ template: false, format: 'umd', moduleName: 'ElMessage', - extends: ['vue2'] -}); - -cooking.add('resolve.alias', { - 'main': path.join(__dirname, '../../src'), - 'packages': path.join(__dirname, '../../packages') -}); - -cooking.add('externals', { - vue: { - root: 'Vue', - commonjs: 'vue', - commonjs2: 'vue', - amd: 'vue' - } + extends: ['vue2'], + alias: config.alias, + externals: { vue: config.vue } }); module.exports = cooking.resolve(); diff --git a/packages/message/index.js b/packages/message/index.js index fe700f641..e452ee669 100644 --- a/packages/message/index.js +++ b/packages/message/index.js @@ -1,3 +1,2 @@ import Message from './src/main.js'; - module.exports = Message; diff --git a/packages/notification/cooking.conf.js b/packages/notification/cooking.conf.js index 84de84b7c..1c46594bc 100644 --- a/packages/notification/cooking.conf.js +++ b/packages/notification/cooking.conf.js @@ -1,5 +1,6 @@ var cooking = require('cooking'); var path = require('path'); +var config = require('../../build/config'); cooking.set({ entry: { @@ -9,21 +10,9 @@ cooking.set({ template: false, format: 'umd', moduleName: 'ElNotification', - extends: ['vue2'] -}); - -cooking.add('resolve.alias', { - 'main': path.join(__dirname, '../../src'), - 'packages': path.join(__dirname, '../../packages') -}); - -cooking.add('externals', { - vue: { - root: 'Vue', - commonjs: 'vue', - commonjs2: 'vue', - amd: 'vue' - } + extends: ['vue2'], + alias: config.alias, + externals: { vue: config.vue } }); module.exports = cooking.resolve(); diff --git a/packages/notification/index.js b/packages/notification/index.js index aaac00867..dd9d333aa 100644 --- a/packages/notification/index.js +++ b/packages/notification/index.js @@ -1,3 +1,2 @@ import Notification from './src/main.js'; - module.exports = Notification; diff --git a/packages/pagination/cooking.conf.js b/packages/pagination/cooking.conf.js index bd5f7c8b8..b30865c76 100644 --- a/packages/pagination/cooking.conf.js +++ b/packages/pagination/cooking.conf.js @@ -1,5 +1,6 @@ var cooking = require('cooking'); var path = require('path'); +var config = require('../../build/config'); cooking.set({ entry: { @@ -9,21 +10,9 @@ cooking.set({ template: false, format: 'umd', moduleName: 'ElPagination', - extends: ['vue2'] -}); - -cooking.add('resolve.alias', { - 'main': path.join(__dirname, '../../src'), - 'packages': path.join(__dirname, '../../packages') -}); - -cooking.add('externals', { - vue: { - root: 'Vue', - commonjs: 'vue', - commonjs2: 'vue', - amd: 'vue' - } + extends: ['vue2'], + alias: config.alias, + externals: { vue: config.vue } }); module.exports = cooking.resolve(); diff --git a/packages/popover/cooking.conf.js b/packages/popover/cooking.conf.js index e22023c98..84a278343 100644 --- a/packages/popover/cooking.conf.js +++ b/packages/popover/cooking.conf.js @@ -1,5 +1,6 @@ var cooking = require('cooking'); var path = require('path'); +var config = require('../../build/config'); cooking.set({ entry: { @@ -9,21 +10,9 @@ cooking.set({ template: false, format: 'umd', moduleName: 'ElPopover', - extends: ['vue2'] -}); - -cooking.add('resolve.alias', { - 'main': path.join(__dirname, '../../src'), - 'packages': path.join(__dirname, '../../packages') -}); - -cooking.add('externals', { - vue: { - root: 'Vue', - commonjs: 'vue', - commonjs2: 'vue', - amd: 'vue' - } + extends: ['vue2'], + alias: config.alias, + externals: { vue: config.vue } }); module.exports = cooking.resolve(); diff --git a/packages/progress/cooking.conf.js b/packages/progress/cooking.conf.js index 50c7cd22f..15933e8ec 100644 --- a/packages/progress/cooking.conf.js +++ b/packages/progress/cooking.conf.js @@ -1,5 +1,6 @@ var cooking = require('cooking'); var path = require('path'); +var config = require('../../build/config'); cooking.set({ entry: { @@ -9,21 +10,9 @@ cooking.set({ template: false, format: 'umd', moduleName: 'ElProgress', - extends: ['vue2'] -}); - -cooking.add('resolve.alias', { - 'main': path.join(__dirname, '../../src'), - 'packages': path.join(__dirname, '../../packages') -}); - -cooking.add('externals', { - vue: { - root: 'Vue', - commonjs: 'vue', - commonjs2: 'vue', - amd: 'vue' - } + extends: ['vue2'], + alias: config.alias, + externals: { vue: config.vue } }); module.exports = cooking.resolve(); diff --git a/packages/radio/_index.js b/packages/radio/_index.js new file mode 100644 index 000000000..e2d954b50 --- /dev/null +++ b/packages/radio/_index.js @@ -0,0 +1,13 @@ +const ElRadio = require('./src/radio'); +const RadioButton = require('./src/radio-button.vue'); +const RadioGroup = require('./src/radio-group.vue'); + +module.exports = function(Vue) { + Vue.component(ElRadio.name, ElRadio); + Vue.component(RadioButton.name, RadioButton); + Vue.component(RadioGroup.name, RadioGroup); +}; + +exports.ElRadio = ElRadio; +exports.RadioButton = ElRadio; +exports.RadioGroup = RadioGroup; diff --git a/packages/radio/cooking.conf.js b/packages/radio/cooking.conf.js index b0d8c6848..7554e292d 100644 --- a/packages/radio/cooking.conf.js +++ b/packages/radio/cooking.conf.js @@ -1,29 +1,18 @@ var cooking = require('cooking'); var path = require('path'); +var config = require('../../build/config'); cooking.set({ entry: { - index: path.join(__dirname, 'index.js') + index: path.join(__dirname, '_index.js') }, dist: path.join(__dirname, 'lib'), template: false, format: 'umd', - moduleName: 'ElCascader', - extends: ['vue2'] -}); - -cooking.add('resolve.alias', { - 'main': path.join(__dirname, '../../src'), - 'packages': path.join(__dirname, '../../packages') -}); - -cooking.add('externals', { - vue: { - root: 'Vue', - commonjs: 'vue', - commonjs2: 'vue', - amd: 'vue' - } + moduleName: 'ElRadio', + extends: ['vue2'], + alias: config.alias, + externals: { vue: config.vue } }); module.exports = cooking.resolve(); diff --git a/packages/rate/cooking.conf.js b/packages/rate/cooking.conf.js index bcaa8e678..ed9abaeb0 100644 --- a/packages/rate/cooking.conf.js +++ b/packages/rate/cooking.conf.js @@ -1,5 +1,6 @@ var cooking = require('cooking'); var path = require('path'); +var config = require('../../build/config'); cooking.set({ entry: { @@ -9,21 +10,9 @@ cooking.set({ template: false, format: 'umd', moduleName: 'ElRate', - extends: ['vue2'] -}); - -cooking.add('resolve.alias', { - 'main': path.join(__dirname, '../../src'), - 'packages': path.join(__dirname, '../../packages') -}); - -cooking.add('externals', { - vue: { - root: 'Vue', - commonjs: 'vue', - commonjs2: 'vue', - amd: 'vue' - } + extends: ['vue2'], + alias: config.alias, + externals: { vue: config.vue } }); module.exports = cooking.resolve(); diff --git a/packages/row/cooking.conf.js b/packages/row/cooking.conf.js index 5862fb85f..d85f22321 100644 --- a/packages/row/cooking.conf.js +++ b/packages/row/cooking.conf.js @@ -1,5 +1,6 @@ var cooking = require('cooking'); var path = require('path'); +var config = require('../../build/config'); cooking.set({ entry: { @@ -9,21 +10,9 @@ cooking.set({ template: false, format: 'umd', moduleName: 'ElRow', - extends: ['vue2'] -}); - -cooking.add('resolve.alias', { - 'main': path.join(__dirname, '../../src'), - 'packages': path.join(__dirname, '../../packages') -}); - -cooking.add('externals', { - vue: { - root: 'Vue', - commonjs: 'vue', - commonjs2: 'vue', - amd: 'vue' - } + extends: ['vue2'], + alias: config.alias, + externals: { vue: config.vue } }); module.exports = cooking.resolve(); diff --git a/packages/row/index.js b/packages/row/index.js index b4420c459..33da006ed 100644 --- a/packages/row/index.js +++ b/packages/row/index.js @@ -1,7 +1,7 @@ const ElRow = require('./src/row'); ElRow.install = function(Vue) { - Vue.component('el-row', ElRow); + Vue.component(ElRow.name, ElRow); }; module.exports = ElRow; diff --git a/packages/select-dropdown/cooking.conf.js b/packages/select-dropdown/cooking.conf.js deleted file mode 100644 index e9ae74d0e..000000000 --- a/packages/select-dropdown/cooking.conf.js +++ /dev/null @@ -1,29 +0,0 @@ -var cooking = require('cooking'); -var path = require('path'); - -cooking.set({ - entry: { - index: path.join(__dirname, 'index.js') - }, - dist: path.join(__dirname, 'lib'), - template: false, - format: 'umd', - moduleName: 'ElSelectMenu', - extends: ['vue2'] -}); - -cooking.add('resolve.alias', { - 'main': path.join(__dirname, '../../src'), - 'packages': path.join(__dirname, '../../packages') -}); - -cooking.add('externals', { - vue: { - root: 'Vue', - commonjs: 'vue', - commonjs2: 'vue', - amd: 'vue' - } -}); - -module.exports = cooking.resolve(); diff --git a/packages/select-dropdown/index.js b/packages/select-dropdown/index.js deleted file mode 100644 index 60756cab8..000000000 --- a/packages/select-dropdown/index.js +++ /dev/null @@ -1,7 +0,0 @@ -const SelectDropdown = require('./src/select-dropdown.vue'); - -SelectDropdown.install = function(Vue) { - Vue.component(SelectDropdown.name, SelectDropdown); -}; - -module.exports = SelectDropdown; diff --git a/packages/select/_index.js b/packages/select/_index.js new file mode 100644 index 000000000..c371d2ebe --- /dev/null +++ b/packages/select/_index.js @@ -0,0 +1,13 @@ +const ElSelect = require('./src/select'); +const ElOption = require('./src/option'); +const ElOptionGroup = require('./src/option-group'); + +module.exports = function(Vue) { + Vue.component(ElSelect.name, ElSelect); + Vue.component(ElOption.name, ElOption); + Vue.component(ElOptionGroup.name, ElOptionGroup); +}; + +exports.ElSelect = ElSelect; +exports.ElOption = ElOption; +exports.ElOptionGroup = ElOptionGroup; diff --git a/packages/select/cooking.conf.js b/packages/select/cooking.conf.js index 3e95331eb..f7174dab3 100644 --- a/packages/select/cooking.conf.js +++ b/packages/select/cooking.conf.js @@ -1,29 +1,18 @@ var cooking = require('cooking'); var path = require('path'); +var config = require('../../build/config'); cooking.set({ entry: { - index: path.join(__dirname, 'index.js') + index: path.join(__dirname, '_index.js') }, dist: path.join(__dirname, 'lib'), template: false, format: 'umd', moduleName: 'ElSelect', - extends: ['vue2'] -}); - -cooking.add('resolve.alias', { - 'main': path.join(__dirname, '../../src'), - 'packages': path.join(__dirname, '../../packages') -}); - -cooking.add('externals', { - vue: { - root: 'Vue', - commonjs: 'vue', - commonjs2: 'vue', - amd: 'vue' - } + extends: ['vue2'], + alias: config.alias, + externals: { vue: config.vue } }); module.exports = cooking.resolve(); diff --git a/packages/select-dropdown/src/select-dropdown.vue b/packages/select/src/select-dropdown.vue similarity index 100% rename from packages/select-dropdown/src/select-dropdown.vue rename to packages/select/src/select-dropdown.vue diff --git a/packages/select/src/select.vue b/packages/select/src/select.vue index 835e9a517..1729f54f0 100644 --- a/packages/select/src/select.vue +++ b/packages/select/src/select.vue @@ -66,7 +66,7 @@