Skip to content

Commit

Permalink
Merge pull request #98 from superlbr/master
Browse files Browse the repository at this point in the history
track vux problem
  • Loading branch information
hubcarl committed Oct 23, 2018
2 parents cb81976 + d997139 commit a3f41eb
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 14 deletions.
3 changes: 0 additions & 3 deletions app/web/page/admin/home/home.vue
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,13 @@
</template>
<script type="text/babel">
import Vue from 'vue';
import ElementUI from 'element-ui';
import VueI18n from 'vue-i18n';
import 'element-ui/lib/theme-chalk/index.css';
import createI18n from 'framework/i18n/admin';
import store from './store/app';
import router from './router';
import AdminLayout from 'component/layout/admin';
Vue.use(VueI18n);
Vue.use(ElementUI);
export default {
router,
Expand Down
2 changes: 1 addition & 1 deletion app/web/page/admin/login/login.vue
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ import {
Input,
Button,
Checkbox
} from 'element-ui';
} from 'vux';
Vue.component(Input.name, Input);
Vue.component(Button.name, Button);
Vue.component(Checkbox.name, Checkbox);
Expand Down
11 changes: 8 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,10 @@
"egg-scripts": "^2.5.1",
"egg-validate": "^1.0.0",
"egg-view-vue-ssr": "^3.0.5",
"element-ui": "^2.0.8",
"extend": "~3.0.0",
"font-awesome": "^4.7.0",
"less": "^2.7.3",
"less-loader": "^4.1.0",
"lodash": "^4.17.4",
"lodash-id": "^0.14.0",
"lowdb": "^1.0.0",
Expand All @@ -39,7 +40,10 @@
"vue-material-input": "^1.2.0",
"vue-router": "^3.0.1",
"vuex": "^3.0.1",
"vuex-router-sync": "^5.0.0"
"vuex-router-sync": "^5.0.0",
"vux": "^2.9.2",
"vux-loader": "^1.2.9",
"yaml-loader": "^0.5.0"
},
"devDependencies": {
"autod-egg": "^1.0.0",
Expand All @@ -51,7 +55,8 @@
"eslint": "^4.19.1",
"eslint-config-egg": "^5.0.0",
"eslint-plugin-vue": "^4.4.0",
"ip": "^1.1.5"
"ip": "^1.1.5",
"vue-loader": "14.2.2"
},
"engines": {
"node": ">=8.0.0"
Expand Down
18 changes: 11 additions & 7 deletions webpack.config.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
'use strict';
// 零配置简化, 详情:https://www.yuque.com/easy-team/easywebpack/v4
module.exports = {
node: {
console: true
}
};
// target: web 表示只获取前端构建 Webpack 配置
// refer: https://www.yuque.com/easy-team/easywebpack/native
const easywebpack = require('easywebpack-vue');
const vuxLoader = require('vux-loader');
const baseWebpackConfig = easywebpack.getWebpackConfig({
target: 'vue', // target: web 表示只获取前端构建 Webpack 配置
});
// 拿到基础配置, 可以进行二次加工
module.exports = vuxLoader.merge(baseWebpackConfig, {
plugins: ['vux-ui']
});

0 comments on commit a3f41eb

Please sign in to comment.