Skip to content

Commit

Permalink
chore(node-sass,vue-cli): node-sass改为sass,@vue/cli-service升级至4.5.4,修改…
Browse files Browse the repository at this point in the history
…全局/deep/语法
  • Loading branch information
BoBoooooo committed Dec 22, 2020
1 parent eaa6d4f commit 733f7a3
Show file tree
Hide file tree
Showing 6 changed files with 24 additions and 14 deletions.
3 changes: 2 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# 1.0.0 (2020-12-20)
# 1.0.0 (2020-12-22)

### 🌟 新功能
范围|描述|commitId
Expand Down Expand Up @@ -164,6 +164,7 @@
### chore
范围|描述|commitId
--|--|--
Element-Pro-Crud | 升级插件版本[@0](https://github.com/0).7.0,新增dev开发人员模式支持动态修改表单表格,修复已知bug | [eaa6d4f](https://github.com/BoBoooooo/BoBo-Vue-Admin/commit/eaa6d4f)
- | element-pro-crud version update to 0.5.4 | [65d81db](https://github.com/BoBoooooo/BoBo-Vue-Admin/commit/65d81db)
ElementProCrud | 修改ProCrud引入方式,升级版本至[@0](https://github.com/0).5.0 | [390c7cd](https://github.com/BoBoooooo/BoBo-Vue-Admin/commit/390c7cd)
ElementProCrud | 升级版本0.5.3 | [56d7e1c](https://github.com/BoBoooooo/BoBo-Vue-Admin/commit/56d7e1c)
Expand Down
14 changes: 7 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,37 +36,37 @@
"vuex-persistedstate": "3.1.0"
},
"devDependencies": {
"conventional-changelog-cli": "^2.1.0",
"compression-webpack-plugin": "^4.0.0",
"@typescript-eslint/eslint-plugin": "^2.26.0",
"@typescript-eslint/parser": "^2.26.0",
"@vue/cli-plugin-babel": "4.5.4",
"@vue/cli-plugin-eslint": "4.5.4",
"@vue/cli-plugin-typescript": "4.5.4",
"@vue/cli-plugin-unit-mocha": "4.5.4",
"@vue/cli-service": "^3.9.2",
"@vue/cli-service": "^4.5.4",
"@vue/eslint-config-airbnb": "^4.0.1",
"@vue/eslint-config-typescript": "^5.0.2",
"babel-eslint": "^10.0.2",
"chai": "^4.2.0",
"compression-webpack-plugin": "^4.0.0",
"conventional-changelog-cli": "^2.1.0",
"eslint": "^6.0.1",
"eslint-plugin-import": "^2.18.0",
"eslint-plugin-vue": "^5.2.3",
"html-webpack-include-assets-plugin": "^2.0.0",
"husky": "^3.1.0",
"image-webpack-loader": "^6.0.0",
"lint-staged": "^9.2.0",
"node-sass": "^4.12.0",
"sass-loader": "^7.1.0",
"right-pad": "^1.0.1",
"sass": "^1.30.0",
"sass-loader": "10.1.0",
"svgo-loader": "2.2.1",
"typescript": "~3.8.3",
"vue-cli-plugin-axios": "0.0.4",
"vue-cli-plugin-commitlint": "^1.0.12",
"vue-cli-plugin-element": "^1.0.1",
"vue-template-compiler": "2.6.11",
"webpack": "^4.35.3",
"webpack-bundle-analyzer": "^3.3.2",
"right-pad": "^1.0.1"
"webpack-bundle-analyzer": "^3.3.2"
},
"husky": {
"hooks": {
Expand Down
8 changes: 4 additions & 4 deletions src/views/layout/components/Menu.vue
Original file line number Diff line number Diff line change
Expand Up @@ -67,15 +67,15 @@ export default class Menu extends Vue {
&.hideSidebar {
width: 64px;
padding: 0;
/deep/.el-submenu__title,
/deep/.el-menu-item {
::v-deep.el-submenu__title,
::v-deep.el-menu-item {
padding-left: 16px !important;
height: auto;
}
/deep/.el-submenu {
::v-deep.el-submenu {
padding-left: 0 !important;
}
/deep/.el-submenu__icon-arrow {
::v-deep.el-submenu__icon-arrow {
display: none;
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/views/layout/components/PersonInfoCard.vue
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ export default class PersonInfoCard extends Vue {
cursor: pointer;
}
.avatar-uploader {
/deep/.el-upload {
::v-deep.el-upload {
border: 1px dashed #d9d9d9;
border-radius: 6px;
cursor: pointer;
Expand Down
2 changes: 1 addition & 1 deletion src/views/system/Users.vue
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,7 @@ export default class Users extends Vue {
</script>
<style lang="scss" scoped>
.avatar-uploader {
/deep/.el-upload {
::v-deep.el-upload {
border: 1px dashed #d9d9d9;
border-radius: 6px;
cursor: pointer;
Expand Down
9 changes: 9 additions & 0 deletions vue.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,7 @@ module.exports = {
lodash: '_',
jsoneditor: 'JSONEditor',
'core-js': 'core',
'element-pro-crud': 'ProCrud',
});
// 向模板插入资源
config.plugin('html-assets').use(HtmlWebpackIncludeAssetsPlugin, [
Expand Down Expand Up @@ -136,4 +137,12 @@ module.exports = {
}));
}
},
css: {
loaderOptions: {
sass: {
// eslint-disable-next-line global-require
implementation: require('sass'), // This line must in sass option
},
},
},
};

0 comments on commit 733f7a3

Please sign in to comment.