Merge pull request #372 from QingWei-Li/fix/update-dependencies

Clear dependencies

build/config.js

@@ -3,13 +3,13 @@ var path = require('path');
 var externals = {};
 
 Object.keys(Components).forEach(function(key) {
-  externals[`packages/${key}/index.js`] = `element-ui/lib/${key}`;
-  externals[`packages/${key}/style.css`] = `element-ui/lib/${key}/style.css`;
+  externals[`element-ui/packages/${key}/index.js`] = `element-ui/lib/${key}`;
+  externals[`element-ui/packages/${key}/style.css`] = `element-ui/lib/${key}/style.css`;
 });
 
-externals['main/utils/clickoutside'] = 'element-ui/lib/utils/clickoutside';
-externals['main/utils/popper'] = 'element-ui/lib/utils/popper';
-externals['main/utils/vue-popper'] = 'element-ui/lib/utils/vue-popper';
+externals['element-ui/src/utils/clickoutside'] = 'element-ui/lib/utils/clickoutside';
+externals['element-ui/src/utils/popper'] = 'element-ui/lib/utils/popper';
+externals['element-ui/src/utils/vue-popper'] = 'element-ui/lib/utils/vue-popper';
 externals['vue-popup'] = 'vue-popup';
 
 exports.externals = Object.assign({
@@ -24,7 +24,8 @@ exports.externals = Object.assign({
 exports.alias = {
   main: path.resolve(__dirname, '../src'),
   packages: path.resolve(__dirname, '../packages'),
-  examples: path.resolve(__dirname, '../examples')
+  examples: path.resolve(__dirname, '../examples'),
+  'element-ui': path.resolve(__dirname, '../')
 };
 
 exports.jsexclude = /node_modules|utils\/popper\.js|utils\/date.\js/;

build/cooking.demo.js

@@ -102,7 +102,7 @@ var wrap = function(render) {
 
 var externals = {};
 Object.keys(Components).forEach(function(key) {
-  externals[`packages/${key}/style.css`] = 'null';
+  externals[`element-ui/packages/${key}/style.css`] = 'null';
 });
 
 // 开发模式不需要将不存在的 style.css 打包进去

package.json

@@ -35,6 +35,13 @@
   "bugs": {
     "url": "https://github.com/elemefe/element/issues"
   },
+  "dependencies": {
+    "async-validator": "^1.6.6",
+    "object-equal": "^1.0.0",
+    "throttle-debounce": "^1.0.1",
+    "vue-popup": "^0.2.8",
+    "wind-dom": "0.0.3"
+  },
   "devDependencies": {
     "babel-cli": "^6.14.0",
     "babel-core": "^6.14.0",
@@ -74,7 +81,6 @@
     "vue": "^2.0.2",
     "vue-loader": "^9.5.1",
     "vue-markdown-loader": "^0.5.1",
-    "vue-popup": "^0.2.8",
     "vue-router": "^2.0.0",
     "webpack": "^1.13.2",
     "webpack-dev-server": "^1.15.1",

packages/autocomplete/package.json

@@ -12,6 +12,5 @@
   "author": "haiping.zeng<haiping.zeng@ele.me>",
   "license": "MIT",
   "dependencies": {
-    "vue-clickoutside": "^0.1.0"
   }
 }

packages/autocomplete/src/autocomplete.vue

@@ -41,8 +41,8 @@
   </div>
 </template>
 <script>
-  import ElInput from 'packages/input/index.js';
-  import Clickoutside from 'main/utils/clickoutside';
+  import ElInput from 'element-ui/packages/input/index.js';
+  import Clickoutside from 'element-ui/src/utils/clickoutside';
 
   export default {
     name: 'ElAutocomplete',

packages/cascader/package.json

@@ -12,7 +12,6 @@
   "author": "qingwei-li<qingwei.li@ele.me>",
   "license": "MIT",
   "dependencies": {
-    "object-equal": "^1.0.0",
-    "vue-clickoutside": "0.0.4"
+    "object-equal": "^1.0.0"
   }
 }

packages/cascader/src/cascader.vue

@@ -1,5 +1,5 @@
 <script>
-  import ElInput from 'packages/input/index.js';
+  import ElInput from 'element-ui/packages/input/index.js';
   import ElDropdown from './dropdown.vue';
 
   /**
@@ -21,7 +21,7 @@
     },
 
     directives: {
-      ElementClickoutside: require('main/utils/clickoutside').default
+      ElementClickoutside: require('element-ui/src/utils/clickoutside').default
     },
 
     data() {

packages/checkbox/src/checkbox-group.vue

@@ -1,5 +1,5 @@
 <script>
-  import emitter from 'main/mixins/emitter';
+  import emitter from 'element-ui/src/mixins/emitter';
 
   export default {
     name: 'ElCheckboxGroup',

packages/checkbox/src/checkbox.vue

@@ -39,7 +39,7 @@
   </label>
 </template>
 <script>
-  import Emitter from 'main/mixins/emitter';
+  import Emitter from 'element-ui/src/mixins/emitter';
 
   export default {
     name: 'ElCheckbox',

packages/date-picker/src/panel/date-range.vue

@@ -258,7 +258,7 @@
     },
 
     directives: {
-      Clickoutside: require('main/utils/clickoutside').default
+      Clickoutside: require('element-ui/src/utils/clickoutside').default
     },
 
     data() {

packages/date-picker/src/panel/date.vue

@@ -163,7 +163,7 @@
     },
 
     directives: {
-      Clickoutside: require('main/utils/clickoutside').default
+      Clickoutside: require('element-ui/src/utils/clickoutside').default
     },
 
     methods: {

packages/date-picker/src/picker.vue

@@ -31,10 +31,10 @@
 
 <script>
 import Vue from 'vue';
-import Clickoutside from 'main/utils/clickoutside';
+import Clickoutside from 'element-ui/src/utils/clickoutside';
 import { merge, formatDate, parseDate, getWeekNumber } from './util';
-import Popper from 'main/utils/vue-popper';
-import emitter from 'main/mixins/emitter';
+import Popper from 'element-ui/src/utils/vue-popper';
+import emitter from 'element-ui/src/mixins/emitter';
 
 const newPopper = {
   props: {

packages/date-picker/src/util/index.js

@@ -1,4 +1,4 @@
-import dateUtil from 'main/utils/date';
+import dateUtil from 'element-ui/src/utils/date';
 
 const newArray = function(start, end) {
   let result = [];

packages/dropdown/package.json

@@ -12,6 +12,5 @@
   "author": "haiping.zeng<haiping.zeng@ele.me>",
   "license": "MIT",
   "dependencies": {
-    "vue-clickoutside": "0.0.4"
   }
 }

packages/dropdown/src/dropdown-menu.vue

@@ -6,7 +6,7 @@
   </transition>
 </template>
 <script>
-  import Popper from 'main/utils/vue-popper';
+  import Popper from 'element-ui/src/utils/vue-popper';
 
   export default {
     name: 'ElDropdownMenu',

packages/dropdown/src/dropdown.vue

@@ -1,6 +1,6 @@
 <script>
-  import Clickoutside from 'main/utils/clickoutside';
-  import emitter from 'main/mixins/emitter';
+  import Clickoutside from 'element-ui/src/utils/clickoutside';
+  import emitter from 'element-ui/src/mixins/emitter';
 
   export default {
     name: 'ElDropdown',

packages/form/src/form-item.vue

@@ -17,7 +17,7 @@
 </template>
 <script>
   import AsyncValidator from 'async-validator';
-  import emitter from 'main/mixins/emitter';
+  import emitter from 'element-ui/src/mixins/emitter';
 
   export default {
     name: 'ElFormItem',

packages/input-number/package.json

@@ -14,8 +14,5 @@
   "repository": "https://github.com/element-component/element/tree/master/packages/input-number",
   "dependencies": {
     "wind-dom": "0.0.3"
-  },
-  "devDependencies": {
-    "vue-clickoutside": "0.0.4"
   }
 }

packages/input-number/src/input-number.vue

@@ -33,7 +33,7 @@
   </div>
 </template>
 <script>
-  import ElInput from 'packages/input/index.js';
+  import ElInput from 'element-ui/packages/input/index.js';
   import { once, on } from 'wind-dom/src/event';
 
   export default {

packages/input/src/input.vue

@@ -55,7 +55,7 @@
   </div>
 </template>
 <script>
-  import emitter from 'main/mixins/emitter';
+  import emitter from 'element-ui/src/mixins/emitter';
   import calcTextareaHeight from './calcTextareaHeight';
 
   export default {

packages/menu/src/menu.vue

@@ -9,7 +9,7 @@
   </ul>
 </template>
 <script>
-  import emitter from 'main/mixins/emitter';
+  import emitter from 'element-ui/src/mixins/emitter';
 
   export default {
     name: 'ElMenu',

packages/message-box/src/main.vue

@@ -34,7 +34,7 @@
   };
 
   import Popup from 'vue-popup';
-  import ElInput from 'packages/input/index.js';
+  import ElInput from 'element-ui/packages/input/index.js';
   import { addClass, removeClass } from 'wind-dom/src/class';
 
   export default {

packages/pagination/src/pagination.js

@@ -1,7 +1,7 @@
 import Vue from 'vue';
 import Pager from './pager.vue';
-import ElSelect from 'packages/select/index.js';
-import ElOption from 'packages/option/index.js';
+import ElSelect from 'element-ui/packages/select/index.js';
+import ElOption from 'element-ui/packages/option/index.js';
 
 export default {
   name: 'ElPagination',

packages/popover/src/main.vue

@@ -15,7 +15,7 @@
 </template>
 
 <script>
-import Popper from 'main/utils/vue-popper';
+import Popper from 'element-ui/src/utils/vue-popper';
 import Vue from 'vue';
 import { on, off } from 'wind-dom/src/event';
 

packages/radio/src/radio-group.vue

@@ -1,5 +1,5 @@
 <script>
-  import emitter from 'main/mixins/emitter';
+  import emitter from 'element-ui/src/mixins/emitter';
 
   export default {
     name: 'ElRadioGroup',

packages/select-dropdown/src/select-dropdown.vue

@@ -8,7 +8,7 @@
 </template>
 
 <script type="text/babel">
-  import Popper from 'main/utils/vue-popper';
+  import Popper from 'element-ui/src/utils/vue-popper';
 
   export default {
     name: 'el-select-dropdown',

packages/select/package.json

@@ -13,7 +13,6 @@
   "repository": "https://github.com/element-component/element/tree/master/packages/select",
   "devDependencies": {
     "throttle-debounce": "^1.0.1",
-    "vue-clickoutside": "0.0.4",
     "wind-dom": "0.0.3"
   }
 }

packages/select/src/option-group.vue

@@ -10,7 +10,7 @@
 </template>
 
 <script type="text/babel">
-  import emitter from 'main/mixins/emitter';
+  import emitter from 'element-ui/src/mixins/emitter';
 
   export default {
     mixins: [emitter],

packages/select/src/option.vue

@@ -12,7 +12,7 @@
 </template>
 
 <script type="text/babel">
-  import emitter from 'main/mixins/emitter';
+  import emitter from 'element-ui/src/mixins/emitter';
 
   export default {
     mixins: [emitter],

packages/select/src/select.vue

@@ -64,12 +64,12 @@
 </template>
 
 <script type="text/babel">
-  import emitter from 'main/mixins/emitter';
-  import ElInput from 'packages/input/index.js';
-  import ElSelectMenu from 'packages/select-dropdown/index.js';
-  import ElTag from 'packages/tag/index.js';
+  import emitter from 'element-ui/src/mixins/emitter';
+  import ElInput from 'element-ui/packages/input/index.js';
+  import ElSelectMenu from 'element-ui/packages/select-dropdown/index.js';
+  import ElTag from 'element-ui/packages/tag/index.js';
   import debounce from 'throttle-debounce/debounce';
-  import Clickoutside from 'main/utils/clickoutside';
+  import Clickoutside from 'element-ui/src/utils/clickoutside';
   import { addClass, removeClass } from 'wind-dom/src/class';
 
   export default {

packages/slider/src/main.vue

@@ -27,8 +27,8 @@
 </template>
 
 <script type="text/babel">
-  import Popper from 'main/utils/popper';
-  import ElInputNumber from 'packages/input-number/index.js';
+  import Popper from 'element-ui/src/utils/popper';
+  import ElInputNumber from 'element-ui/packages/input-number/index.js';
   import { getStyle } from 'wind-dom/src/style';
   import { addClass, removeClass } from 'wind-dom/src/class';
 

packages/spinner/package.json

@@ -13,6 +13,5 @@
   "license": "MIT",
   "repository": "https://github.com/element-component/element/tree/master/packages/spinner",
   "devDependencies": {
-    "vue-clickoutside": "0.0.4"
   }
 }

packages/table/src/table-column.js

@@ -1,5 +1,5 @@
-import ElCheckbox from 'packages/checkbox/index.js';
-import ElTag from 'packages/tag/index.js';
+import ElCheckbox from 'element-ui/packages/checkbox/index.js';
+import ElTag from 'element-ui/packages/tag/index.js';
 import objectAssign from 'object-assign';
 
 let columnIdSeed = 1;

packages/table/src/table-header.js

@@ -1,5 +1,5 @@
-import ElCheckbox from 'packages/checkbox/index.js';
-import ElTag from 'packages/tag/index.js';
+import ElCheckbox from 'element-ui/packages/checkbox/index.js';
+import ElTag from 'element-ui/packages/tag/index.js';
 
 export default {
   name: 'el-table-header',

packages/tag/package.json

@@ -13,6 +13,5 @@
   "license": "MIT",
   "repository": "https://github.com/element-component/element/tree/master/packages/tag",
   "devDependencies": {
-    "vue-clickoutside": "0.0.4"
   }
 }

packages/tooltip/src/main.vue

@@ -20,7 +20,7 @@
 </template>
 
 <script>
-import Popper from 'main/utils/vue-popper';
+import Popper from 'element-ui/src/utils/vue-popper';
 
 export default {
   name: 'el-tooltip',

packages/upload/src/index.vue

@@ -2,7 +2,7 @@
 import UploadList from './upload-list';
 import Upload from './upload';
 import IframeUpload from './iframe-upload';
-import ElProgress from 'packages/progress/index.js';
+import ElProgress from 'element-ui/packages/progress/index.js';
 
 function noop() {
 }