From c67281ca3fcb6418a8ad7c576ef9883a8720dde1 Mon Sep 17 00:00:00 2001 From: nxmin <392716797@qq.com> Date: Sun, 19 Apr 2020 11:18:38 +0800 Subject: [PATCH] vuecli3 --- .babelrc | 19 -- .env.development | 14 ++ .env.production | 6 + .env.staging | 8 + .eslintignore | 3 +- .eslintrc.js | 35 ++-- .gitattributes | 4 - .gitignore | 1 + .travis.yml | 2 +- README.md | 6 +- babel.config.js | 5 + build/build.js | 41 ---- build/check-versions.js | 54 ------ build/index.js | 35 ++++ build/logo.png | Bin 6849 -> 0 bytes build/utils.js | 101 ---------- build/vue-loader.conf.js | 22 --- build/webpack.base.conf.js | 116 ------------ build/webpack.dev.conf.js | 87 --------- build/webpack.prod.conf.js | 176 ------------------ build/webpack.test.conf.js | 91 --------- config/dev.env.js | 8 - config/index.js | 89 --------- config/prod.env.js | 5 - config/test.env.js | 7 - jest.config.js | 24 +++ jsconfig.json | 9 + package.json | 86 +++++---- .postcssrc.js => postcss.config.js | 6 +- log.ico => public/favicon.ico | Bin index.html => public/index.html | 4 +- {static => public/static}/.gitkeep | 0 {static => public/static}/img/img.jpg | Bin {static => public/static}/img/me/qq.jpg | Bin {static => public/static}/img/me/we.jpg | Bin .../static}/img/mock/card/card-1.jpg | Bin .../static}/img/mock/card/card-2.jpg | Bin .../static}/img/mock/card/card-3.jpg | Bin .../static}/img/mock/card/card-4.jpg | Bin .../static}/theme/blue/alert.css | 0 .../static}/theme/blue/aside.css | 0 .../static}/theme/blue/autocomplete.css | 0 .../static}/theme/blue/badge.css | 0 {static => public/static}/theme/blue/base.css | 0 .../static}/theme/blue/breadcrumb-item.css | 0 .../static}/theme/blue/breadcrumb.css | 0 .../static}/theme/blue/button-group.css | 0 .../static}/theme/blue/button.css | 0 {static => public/static}/theme/blue/card.css | 0 .../static}/theme/blue/carousel-item.css | 0 .../static}/theme/blue/carousel.css | 0 .../static}/theme/blue/cascader.css | 0 .../static}/theme/blue/checkbox-button.css | 0 .../static}/theme/blue/checkbox-group.css | 0 .../static}/theme/blue/checkbox.css | 0 {static => public/static}/theme/blue/col.css | 0 .../static}/theme/blue/collapse-item.css | 0 .../static}/theme/blue/collapse.css | 0 .../static}/theme/blue/color-picker.css | 0 .../static}/theme/blue/container.css | 0 .../static}/theme/blue/date-picker.css | 0 .../static}/theme/blue/dialog.css | 0 .../static}/theme/blue/display.css | 0 .../static}/theme/blue/dropdown-item.css | 0 .../static}/theme/blue/dropdown-menu.css | 0 .../static}/theme/blue/dropdown.css | 0 .../theme/blue/fonts/element-icons.ttf | Bin .../theme/blue/fonts/element-icons.woff | Bin .../static}/theme/blue/footer.css | 0 .../static}/theme/blue/form-item.css | 0 {static => public/static}/theme/blue/form.css | 0 .../static}/theme/blue/header.css | 0 {static => public/static}/theme/blue/icon.css | 0 .../static}/theme/blue/index.css | 0 .../static}/theme/blue/input-number.css | 0 .../static}/theme/blue/input.css | 0 .../static}/theme/blue/loading.css | 0 {static => public/static}/theme/blue/main.css | 0 .../static}/theme/blue/menu-item-group.css | 0 .../static}/theme/blue/menu-item.css | 0 {static => public/static}/theme/blue/menu.css | 0 .../static}/theme/blue/message-box.css | 0 .../static}/theme/blue/message.css | 0 .../static}/theme/blue/notification.css | 0 .../static}/theme/blue/option-group.css | 0 .../static}/theme/blue/option.css | 0 .../static}/theme/blue/pagination.css | 0 .../static}/theme/blue/popover.css | 0 .../static}/theme/blue/popper.css | 0 .../static}/theme/blue/progress.css | 0 .../static}/theme/blue/radio-button.css | 0 .../static}/theme/blue/radio-group.css | 0 .../static}/theme/blue/radio.css | 0 {static => public/static}/theme/blue/rate.css | 0 .../static}/theme/blue/reset.css | 0 {static => public/static}/theme/blue/row.css | 0 .../static}/theme/blue/scrollbar.css | 0 .../static}/theme/blue/select-dropdown.css | 0 .../static}/theme/blue/select.css | 0 .../static}/theme/blue/slider.css | 0 .../static}/theme/blue/spinner.css | 0 {static => public/static}/theme/blue/step.css | 0 .../static}/theme/blue/steps.css | 0 .../static}/theme/blue/submenu.css | 0 .../static}/theme/blue/switch.css | 0 .../static}/theme/blue/tab-pane.css | 0 .../static}/theme/blue/table-column.css | 0 .../static}/theme/blue/table.css | 0 {static => public/static}/theme/blue/tabs.css | 0 {static => public/static}/theme/blue/tag.css | 0 .../static}/theme/blue/time-picker.css | 0 .../static}/theme/blue/time-select.css | 0 .../static}/theme/blue/tooltip.css | 0 .../static}/theme/blue/transfer.css | 0 {static => public/static}/theme/blue/tree.css | 0 .../static}/theme/blue/upload.css | 0 .../static}/theme/default/alert.css | 0 .../static}/theme/default/aside.css | 0 .../static}/theme/default/autocomplete.css | 0 .../static}/theme/default/badge.css | 0 .../static}/theme/default/base.css | 0 .../static}/theme/default/breadcrumb-item.css | 0 .../static}/theme/default/breadcrumb.css | 0 .../static}/theme/default/button-group.css | 0 .../static}/theme/default/button.css | 0 .../static}/theme/default/card.css | 0 .../static}/theme/default/carousel-item.css | 0 .../static}/theme/default/carousel.css | 0 .../static}/theme/default/cascader.css | 0 .../static}/theme/default/checkbox-button.css | 0 .../static}/theme/default/checkbox-group.css | 0 .../static}/theme/default/checkbox.css | 0 .../static}/theme/default/col.css | 0 .../static}/theme/default/collapse-item.css | 0 .../static}/theme/default/collapse.css | 0 .../static}/theme/default/color-picker.css | 0 .../static}/theme/default/container.css | 0 .../static}/theme/default/date-picker.css | 0 .../static}/theme/default/dialog.css | 0 .../static}/theme/default/display.css | 0 .../static}/theme/default/dropdown-item.css | 0 .../static}/theme/default/dropdown-menu.css | 0 .../static}/theme/default/dropdown.css | 0 .../theme/default/fonts/element-icons.ttf | Bin .../theme/default/fonts/element-icons.woff | Bin .../static}/theme/default/footer.css | 0 .../static}/theme/default/form-item.css | 0 .../static}/theme/default/form.css | 0 .../static}/theme/default/header.css | 0 .../static}/theme/default/icon.css | 0 .../static}/theme/default/index.css | 0 .../static}/theme/default/input-number.css | 0 .../static}/theme/default/input.css | 0 .../static}/theme/default/loading.css | 0 .../static}/theme/default/main.css | 0 .../static}/theme/default/menu-item-group.css | 0 .../static}/theme/default/menu-item.css | 0 .../static}/theme/default/menu.css | 0 .../static}/theme/default/message-box.css | 0 .../static}/theme/default/message.css | 0 .../static}/theme/default/notification.css | 0 .../static}/theme/default/option-group.css | 0 .../static}/theme/default/option.css | 0 .../static}/theme/default/pagination.css | 0 .../static}/theme/default/popover.css | 0 .../static}/theme/default/popper.css | 0 .../static}/theme/default/progress.css | 0 .../static}/theme/default/radio-button.css | 0 .../static}/theme/default/radio-group.css | 0 .../static}/theme/default/radio.css | 0 .../static}/theme/default/rate.css | 0 .../static}/theme/default/reset.css | 0 .../static}/theme/default/row.css | 0 .../static}/theme/default/scrollbar.css | 0 .../static}/theme/default/select-dropdown.css | 0 .../static}/theme/default/select.css | 0 .../static}/theme/default/slider.css | 0 .../static}/theme/default/spinner.css | 0 .../static}/theme/default/step.css | 0 .../static}/theme/default/steps.css | 0 .../static}/theme/default/submenu.css | 0 .../static}/theme/default/switch.css | 0 .../static}/theme/default/tab-pane.css | 0 .../static}/theme/default/table-column.css | 0 .../static}/theme/default/table.css | 0 .../static}/theme/default/tabs.css | 0 .../static}/theme/default/tag.css | 0 .../static}/theme/default/time-picker.css | 0 .../static}/theme/default/time-select.css | 0 .../static}/theme/default/tooltip.css | 0 .../static}/theme/default/transfer.css | 0 .../static}/theme/default/tree.css | 0 .../static}/theme/default/upload.css | 0 .../static}/theme/fonts/element-icons.ttf | Bin .../static}/theme/fonts/element-icons.woff | Bin .../static}/theme/green/alert.css | 0 .../static}/theme/green/aside.css | 0 .../static}/theme/green/autocomplete.css | 0 .../static}/theme/green/badge.css | 0 .../static}/theme/green/base.css | 0 .../static}/theme/green/breadcrumb-item.css | 0 .../static}/theme/green/breadcrumb.css | 0 .../static}/theme/green/button-group.css | 0 .../static}/theme/green/button.css | 0 .../static}/theme/green/card.css | 0 .../static}/theme/green/carousel-item.css | 0 .../static}/theme/green/carousel.css | 0 .../static}/theme/green/cascader.css | 0 .../static}/theme/green/checkbox-button.css | 0 .../static}/theme/green/checkbox-group.css | 0 .../static}/theme/green/checkbox.css | 0 {static => public/static}/theme/green/col.css | 0 .../static}/theme/green/collapse-item.css | 0 .../static}/theme/green/collapse.css | 0 .../static}/theme/green/color-picker.css | 0 .../static}/theme/green/container.css | 0 .../static}/theme/green/date-picker.css | 0 .../static}/theme/green/dialog.css | 0 .../static}/theme/green/display.css | 0 .../static}/theme/green/dropdown-item.css | 0 .../static}/theme/green/dropdown-menu.css | 0 .../static}/theme/green/dropdown.css | 0 .../theme/green/fonts/element-icons.ttf | Bin .../theme/green/fonts/element-icons.woff | Bin .../static}/theme/green/footer.css | 0 .../static}/theme/green/form-item.css | 0 .../static}/theme/green/form.css | 0 .../static}/theme/green/header.css | 0 .../static}/theme/green/icon.css | 0 .../static}/theme/green/index.css | 0 .../static}/theme/green/input-number.css | 0 .../static}/theme/green/input.css | 0 .../static}/theme/green/loading.css | 0 .../static}/theme/green/main.css | 0 .../static}/theme/green/menu-item-group.css | 0 .../static}/theme/green/menu-item.css | 0 .../static}/theme/green/menu.css | 0 .../static}/theme/green/message-box.css | 0 .../static}/theme/green/message.css | 0 .../static}/theme/green/notification.css | 0 .../static}/theme/green/option-group.css | 0 .../static}/theme/green/option.css | 0 .../static}/theme/green/pagination.css | 0 .../static}/theme/green/popover.css | 0 .../static}/theme/green/popper.css | 0 .../static}/theme/green/progress.css | 0 .../static}/theme/green/radio-button.css | 0 .../static}/theme/green/radio-group.css | 0 .../static}/theme/green/radio.css | 0 .../static}/theme/green/rate.css | 0 .../static}/theme/green/reset.css | 0 {static => public/static}/theme/green/row.css | 0 .../static}/theme/green/scrollbar.css | 0 .../static}/theme/green/select-dropdown.css | 0 .../static}/theme/green/select.css | 0 .../static}/theme/green/slider.css | 0 .../static}/theme/green/spinner.css | 0 .../static}/theme/green/step.css | 0 .../static}/theme/green/steps.css | 0 .../static}/theme/green/submenu.css | 0 .../static}/theme/green/switch.css | 0 .../static}/theme/green/tab-pane.css | 0 .../static}/theme/green/table-column.css | 0 .../static}/theme/green/table.css | 0 .../static}/theme/green/tabs.css | 0 {static => public/static}/theme/green/tag.css | 0 .../static}/theme/green/time-picker.css | 0 .../static}/theme/green/time-select.css | 0 .../static}/theme/green/tooltip.css | 0 .../static}/theme/green/transfer.css | 0 .../static}/theme/green/tree.css | 0 .../static}/theme/green/upload.css | 0 .../static}/theme/purple/alert.css | 0 .../static}/theme/purple/aside.css | 0 .../static}/theme/purple/autocomplete.css | 0 .../static}/theme/purple/badge.css | 0 .../static}/theme/purple/base.css | 0 .../static}/theme/purple/breadcrumb-item.css | 0 .../static}/theme/purple/breadcrumb.css | 0 .../static}/theme/purple/button-group.css | 0 .../static}/theme/purple/button.css | 0 .../static}/theme/purple/card.css | 0 .../static}/theme/purple/carousel-item.css | 0 .../static}/theme/purple/carousel.css | 0 .../static}/theme/purple/cascader.css | 0 .../static}/theme/purple/checkbox-button.css | 0 .../static}/theme/purple/checkbox-group.css | 0 .../static}/theme/purple/checkbox.css | 0 .../static}/theme/purple/col.css | 0 .../static}/theme/purple/collapse-item.css | 0 .../static}/theme/purple/collapse.css | 0 .../static}/theme/purple/color-picker.css | 0 .../static}/theme/purple/container.css | 0 .../static}/theme/purple/date-picker.css | 0 .../static}/theme/purple/dialog.css | 0 .../static}/theme/purple/display.css | 0 .../static}/theme/purple/dropdown-item.css | 0 .../static}/theme/purple/dropdown-menu.css | 0 .../static}/theme/purple/dropdown.css | 0 .../theme/purple/fonts/element-icons.ttf | Bin .../theme/purple/fonts/element-icons.woff | Bin .../static}/theme/purple/footer.css | 0 .../static}/theme/purple/form-item.css | 0 .../static}/theme/purple/form.css | 0 .../static}/theme/purple/header.css | 0 .../static}/theme/purple/icon.css | 0 .../static}/theme/purple/index.css | 0 .../static}/theme/purple/input-number.css | 0 .../static}/theme/purple/input.css | 0 .../static}/theme/purple/loading.css | 0 .../static}/theme/purple/main.css | 0 .../static}/theme/purple/menu-item-group.css | 0 .../static}/theme/purple/menu-item.css | 0 .../static}/theme/purple/menu.css | 0 .../static}/theme/purple/message-box.css | 0 .../static}/theme/purple/message.css | 0 .../static}/theme/purple/notification.css | 0 .../static}/theme/purple/option-group.css | 0 .../static}/theme/purple/option.css | 0 .../static}/theme/purple/pagination.css | 0 .../static}/theme/purple/popover.css | 0 .../static}/theme/purple/popper.css | 0 .../static}/theme/purple/progress.css | 0 .../static}/theme/purple/radio-button.css | 0 .../static}/theme/purple/radio-group.css | 0 .../static}/theme/purple/radio.css | 0 .../static}/theme/purple/rate.css | 0 .../static}/theme/purple/reset.css | 0 .../static}/theme/purple/row.css | 0 .../static}/theme/purple/scrollbar.css | 0 .../static}/theme/purple/select-dropdown.css | 0 .../static}/theme/purple/select.css | 0 .../static}/theme/purple/slider.css | 0 .../static}/theme/purple/spinner.css | 0 .../static}/theme/purple/step.css | 0 .../static}/theme/purple/steps.css | 0 .../static}/theme/purple/submenu.css | 0 .../static}/theme/purple/switch.css | 0 .../static}/theme/purple/tab-pane.css | 0 .../static}/theme/purple/table-column.css | 0 .../static}/theme/purple/table.css | 0 .../static}/theme/purple/tabs.css | 0 .../static}/theme/purple/tag.css | 0 .../static}/theme/purple/time-picker.css | 0 .../static}/theme/purple/time-select.css | 0 .../static}/theme/purple/tooltip.css | 0 .../static}/theme/purple/transfer.css | 0 .../static}/theme/purple/tree.css | 0 .../static}/theme/purple/upload.css | 0 {static => public/static}/theme/red/alert.css | 0 {static => public/static}/theme/red/aside.css | 0 .../static}/theme/red/autocomplete.css | 0 {static => public/static}/theme/red/badge.css | 0 {static => public/static}/theme/red/base.css | 0 .../static}/theme/red/breadcrumb-item.css | 0 .../static}/theme/red/breadcrumb.css | 0 .../static}/theme/red/button-group.css | 0 .../static}/theme/red/button.css | 0 {static => public/static}/theme/red/card.css | 0 .../static}/theme/red/carousel-item.css | 0 .../static}/theme/red/carousel.css | 0 .../static}/theme/red/cascader.css | 0 .../static}/theme/red/checkbox-button.css | 0 .../static}/theme/red/checkbox-group.css | 0 .../static}/theme/red/checkbox.css | 0 {static => public/static}/theme/red/col.css | 0 .../static}/theme/red/collapse-item.css | 0 .../static}/theme/red/collapse.css | 0 .../static}/theme/red/color-picker.css | 0 .../static}/theme/red/container.css | 0 .../static}/theme/red/date-picker.css | 0 .../static}/theme/red/dialog.css | 0 .../static}/theme/red/display.css | 0 .../static}/theme/red/dropdown-item.css | 0 .../static}/theme/red/dropdown-menu.css | 0 .../static}/theme/red/dropdown.css | 0 .../static}/theme/red/fonts/element-icons.ttf | Bin .../theme/red/fonts/element-icons.woff | Bin .../static}/theme/red/footer.css | 0 .../static}/theme/red/form-item.css | 0 {static => public/static}/theme/red/form.css | 0 .../static}/theme/red/header.css | 0 {static => public/static}/theme/red/icon.css | 0 {static => public/static}/theme/red/index.css | 0 .../static}/theme/red/input-number.css | 0 {static => public/static}/theme/red/input.css | 0 .../static}/theme/red/loading.css | 0 {static => public/static}/theme/red/main.css | 0 .../static}/theme/red/menu-item-group.css | 0 .../static}/theme/red/menu-item.css | 0 {static => public/static}/theme/red/menu.css | 0 .../static}/theme/red/message-box.css | 0 .../static}/theme/red/message.css | 0 .../static}/theme/red/notification.css | 0 .../static}/theme/red/option-group.css | 0 .../static}/theme/red/option.css | 0 .../static}/theme/red/pagination.css | 0 .../static}/theme/red/popover.css | 0 .../static}/theme/red/popper.css | 0 .../static}/theme/red/progress.css | 0 .../static}/theme/red/radio-button.css | 0 .../static}/theme/red/radio-group.css | 0 {static => public/static}/theme/red/radio.css | 0 {static => public/static}/theme/red/rate.css | 0 {static => public/static}/theme/red/reset.css | 0 {static => public/static}/theme/red/row.css | 0 .../static}/theme/red/scrollbar.css | 0 .../static}/theme/red/select-dropdown.css | 0 .../static}/theme/red/select.css | 0 .../static}/theme/red/slider.css | 0 .../static}/theme/red/spinner.css | 0 {static => public/static}/theme/red/step.css | 0 {static => public/static}/theme/red/steps.css | 0 .../static}/theme/red/submenu.css | 0 .../static}/theme/red/switch.css | 0 .../static}/theme/red/tab-pane.css | 0 .../static}/theme/red/table-column.css | 0 {static => public/static}/theme/red/table.css | 0 {static => public/static}/theme/red/tabs.css | 0 {static => public/static}/theme/red/tag.css | 0 .../static}/theme/red/time-picker.css | 0 .../static}/theme/red/time-select.css | 0 .../static}/theme/red/tooltip.css | 0 .../static}/theme/red/transfer.css | 0 {static => public/static}/theme/red/tree.css | 0 .../static}/theme/red/upload.css | 0 .../assets}/css/iconfont/1.0.0/index.css | 0 {static => src/assets}/css/main.css | 0 {static => src/assets}/css/reset.css | 0 src/components/nx-help/index.vue | 4 +- src/icons/index.js | 2 + src/main.js | 2 +- src/views/errorPage/401.vue | 12 +- src/views/errorPage/404.vue | 17 +- src/views/icons/svg-icons/iconIndex.vue | 33 ++-- src/views/icons/svg-icons/svg-icons.js | 10 + tests/unit/.eslintrc.js | 5 + tests/unit/components/Breadcrumb.spec.js | 98 ++++++++++ tests/unit/components/Hamburger.spec.js | 18 ++ tests/unit/components/SvgIcon.spec.js | 22 +++ tests/unit/utils/formatTime.spec.js | 30 +++ tests/unit/utils/parseTime.spec.js | 28 +++ tests/unit/utils/validate.spec.js | 17 ++ vue.config.js | 145 +++++++++++++++ 444 files changed, 588 insertions(+), 919 deletions(-) delete mode 100644 .babelrc create mode 100644 .env.development create mode 100644 .env.production create mode 100644 .env.staging delete mode 100644 .gitattributes create mode 100644 babel.config.js delete mode 100644 build/build.js delete mode 100644 build/check-versions.js create mode 100644 build/index.js delete mode 100644 build/logo.png delete mode 100644 build/utils.js delete mode 100644 build/vue-loader.conf.js delete mode 100644 build/webpack.base.conf.js delete mode 100644 build/webpack.dev.conf.js delete mode 100644 build/webpack.prod.conf.js delete mode 100644 build/webpack.test.conf.js delete mode 100644 config/dev.env.js delete mode 100644 config/index.js delete mode 100644 config/prod.env.js delete mode 100644 config/test.env.js create mode 100644 jest.config.js create mode 100644 jsconfig.json rename .postcssrc.js => postcss.config.js (64%) rename log.ico => public/favicon.ico (100%) rename index.html => public/index.html (98%) rename {static => public/static}/.gitkeep (100%) rename {static => public/static}/img/img.jpg (100%) rename {static => public/static}/img/me/qq.jpg (100%) rename {static => public/static}/img/me/we.jpg (100%) rename {static => public/static}/img/mock/card/card-1.jpg (100%) rename {static => public/static}/img/mock/card/card-2.jpg (100%) rename {static => public/static}/img/mock/card/card-3.jpg (100%) rename {static => public/static}/img/mock/card/card-4.jpg (100%) rename {static => public/static}/theme/blue/alert.css (100%) rename {static => public/static}/theme/blue/aside.css (100%) rename {static => public/static}/theme/blue/autocomplete.css (100%) rename {static => public/static}/theme/blue/badge.css (100%) rename {static => public/static}/theme/blue/base.css (100%) rename {static => public/static}/theme/blue/breadcrumb-item.css (100%) rename {static => public/static}/theme/blue/breadcrumb.css (100%) rename {static => public/static}/theme/blue/button-group.css (100%) rename {static => public/static}/theme/blue/button.css (100%) rename {static => public/static}/theme/blue/card.css (100%) rename {static => public/static}/theme/blue/carousel-item.css (100%) rename {static => public/static}/theme/blue/carousel.css (100%) rename {static => public/static}/theme/blue/cascader.css (100%) rename {static => public/static}/theme/blue/checkbox-button.css (100%) rename {static => public/static}/theme/blue/checkbox-group.css (100%) rename {static => public/static}/theme/blue/checkbox.css (100%) rename {static => public/static}/theme/blue/col.css (100%) rename {static => public/static}/theme/blue/collapse-item.css (100%) rename {static => public/static}/theme/blue/collapse.css (100%) rename {static => public/static}/theme/blue/color-picker.css (100%) rename {static => public/static}/theme/blue/container.css (100%) rename {static => public/static}/theme/blue/date-picker.css (100%) rename {static => public/static}/theme/blue/dialog.css (100%) rename {static => public/static}/theme/blue/display.css (100%) rename {static => public/static}/theme/blue/dropdown-item.css (100%) rename {static => public/static}/theme/blue/dropdown-menu.css (100%) rename {static => public/static}/theme/blue/dropdown.css (100%) rename {static => public/static}/theme/blue/fonts/element-icons.ttf (100%) rename {static => public/static}/theme/blue/fonts/element-icons.woff (100%) rename {static => public/static}/theme/blue/footer.css (100%) rename {static => public/static}/theme/blue/form-item.css (100%) rename {static => public/static}/theme/blue/form.css (100%) rename {static => public/static}/theme/blue/header.css (100%) rename {static => public/static}/theme/blue/icon.css (100%) rename {static => public/static}/theme/blue/index.css (100%) rename {static => public/static}/theme/blue/input-number.css (100%) rename {static => public/static}/theme/blue/input.css (100%) rename {static => public/static}/theme/blue/loading.css (100%) rename {static => public/static}/theme/blue/main.css (100%) rename {static => public/static}/theme/blue/menu-item-group.css (100%) rename {static => public/static}/theme/blue/menu-item.css (100%) rename {static => public/static}/theme/blue/menu.css (100%) rename {static => public/static}/theme/blue/message-box.css (100%) rename {static => public/static}/theme/blue/message.css (100%) rename {static => public/static}/theme/blue/notification.css (100%) rename {static => public/static}/theme/blue/option-group.css (100%) rename {static => public/static}/theme/blue/option.css (100%) rename {static => public/static}/theme/blue/pagination.css (100%) rename {static => public/static}/theme/blue/popover.css (100%) rename {static => public/static}/theme/blue/popper.css (100%) rename {static => public/static}/theme/blue/progress.css (100%) rename {static => public/static}/theme/blue/radio-button.css (100%) rename {static => public/static}/theme/blue/radio-group.css (100%) rename {static => public/static}/theme/blue/radio.css (100%) rename {static => public/static}/theme/blue/rate.css (100%) rename {static => public/static}/theme/blue/reset.css (100%) rename {static => public/static}/theme/blue/row.css (100%) rename {static => public/static}/theme/blue/scrollbar.css (100%) rename {static => public/static}/theme/blue/select-dropdown.css (100%) rename {static => public/static}/theme/blue/select.css (100%) rename {static => public/static}/theme/blue/slider.css (100%) rename {static => public/static}/theme/blue/spinner.css (100%) rename {static => public/static}/theme/blue/step.css (100%) rename {static => public/static}/theme/blue/steps.css (100%) rename {static => public/static}/theme/blue/submenu.css (100%) rename {static => public/static}/theme/blue/switch.css (100%) rename {static => public/static}/theme/blue/tab-pane.css (100%) rename {static => public/static}/theme/blue/table-column.css (100%) rename {static => public/static}/theme/blue/table.css (100%) rename {static => public/static}/theme/blue/tabs.css (100%) rename {static => public/static}/theme/blue/tag.css (100%) rename {static => public/static}/theme/blue/time-picker.css (100%) rename {static => public/static}/theme/blue/time-select.css (100%) rename {static => public/static}/theme/blue/tooltip.css (100%) rename {static => public/static}/theme/blue/transfer.css (100%) rename {static => public/static}/theme/blue/tree.css (100%) rename {static => public/static}/theme/blue/upload.css (100%) rename {static => public/static}/theme/default/alert.css (100%) rename {static => public/static}/theme/default/aside.css (100%) rename {static => public/static}/theme/default/autocomplete.css (100%) rename {static => public/static}/theme/default/badge.css (100%) rename {static => public/static}/theme/default/base.css (100%) rename {static => public/static}/theme/default/breadcrumb-item.css (100%) rename {static => public/static}/theme/default/breadcrumb.css (100%) rename {static => public/static}/theme/default/button-group.css (100%) rename {static => public/static}/theme/default/button.css (100%) rename {static => public/static}/theme/default/card.css (100%) rename {static => public/static}/theme/default/carousel-item.css (100%) rename {static => public/static}/theme/default/carousel.css (100%) rename {static => public/static}/theme/default/cascader.css (100%) rename {static => public/static}/theme/default/checkbox-button.css (100%) rename {static => public/static}/theme/default/checkbox-group.css (100%) rename {static => public/static}/theme/default/checkbox.css (100%) rename {static => public/static}/theme/default/col.css (100%) rename {static => public/static}/theme/default/collapse-item.css (100%) rename {static => public/static}/theme/default/collapse.css (100%) rename {static => public/static}/theme/default/color-picker.css (100%) rename {static => public/static}/theme/default/container.css (100%) rename {static => public/static}/theme/default/date-picker.css (100%) rename {static => public/static}/theme/default/dialog.css (100%) rename {static => public/static}/theme/default/display.css (100%) rename {static => public/static}/theme/default/dropdown-item.css (100%) rename {static => public/static}/theme/default/dropdown-menu.css (100%) rename {static => public/static}/theme/default/dropdown.css (100%) rename {static => public/static}/theme/default/fonts/element-icons.ttf (100%) rename {static => public/static}/theme/default/fonts/element-icons.woff (100%) rename {static => public/static}/theme/default/footer.css (100%) rename {static => public/static}/theme/default/form-item.css (100%) rename {static => public/static}/theme/default/form.css (100%) rename {static => public/static}/theme/default/header.css (100%) rename {static => public/static}/theme/default/icon.css (100%) rename {static => public/static}/theme/default/index.css (100%) rename {static => public/static}/theme/default/input-number.css (100%) rename {static => public/static}/theme/default/input.css (100%) rename {static => public/static}/theme/default/loading.css (100%) rename {static => public/static}/theme/default/main.css (100%) rename {static => public/static}/theme/default/menu-item-group.css (100%) rename {static => public/static}/theme/default/menu-item.css (100%) rename {static => public/static}/theme/default/menu.css (100%) rename {static => public/static}/theme/default/message-box.css (100%) rename {static => public/static}/theme/default/message.css (100%) rename {static => public/static}/theme/default/notification.css (100%) rename {static => public/static}/theme/default/option-group.css (100%) rename {static => public/static}/theme/default/option.css (100%) rename {static => public/static}/theme/default/pagination.css (100%) rename {static => public/static}/theme/default/popover.css (100%) rename {static => public/static}/theme/default/popper.css (100%) rename {static => public/static}/theme/default/progress.css (100%) rename {static => public/static}/theme/default/radio-button.css (100%) rename {static => public/static}/theme/default/radio-group.css (100%) rename {static => public/static}/theme/default/radio.css (100%) rename {static => public/static}/theme/default/rate.css (100%) rename {static => public/static}/theme/default/reset.css (100%) rename {static => public/static}/theme/default/row.css (100%) rename {static => public/static}/theme/default/scrollbar.css (100%) rename {static => public/static}/theme/default/select-dropdown.css (100%) rename {static => public/static}/theme/default/select.css (100%) rename {static => public/static}/theme/default/slider.css (100%) rename {static => public/static}/theme/default/spinner.css (100%) rename {static => public/static}/theme/default/step.css (100%) rename {static => public/static}/theme/default/steps.css (100%) rename {static => public/static}/theme/default/submenu.css (100%) rename {static => public/static}/theme/default/switch.css (100%) rename {static => public/static}/theme/default/tab-pane.css (100%) rename {static => public/static}/theme/default/table-column.css (100%) rename {static => public/static}/theme/default/table.css (100%) rename {static => public/static}/theme/default/tabs.css (100%) rename {static => public/static}/theme/default/tag.css (100%) rename {static => public/static}/theme/default/time-picker.css (100%) rename {static => public/static}/theme/default/time-select.css (100%) rename {static => public/static}/theme/default/tooltip.css (100%) rename {static => public/static}/theme/default/transfer.css (100%) rename {static => public/static}/theme/default/tree.css (100%) rename {static => public/static}/theme/default/upload.css (100%) rename {static => public/static}/theme/fonts/element-icons.ttf (100%) rename {static => public/static}/theme/fonts/element-icons.woff (100%) rename {static => public/static}/theme/green/alert.css (100%) rename {static => public/static}/theme/green/aside.css (100%) rename {static => public/static}/theme/green/autocomplete.css (100%) rename {static => public/static}/theme/green/badge.css (100%) rename {static => public/static}/theme/green/base.css (100%) rename {static => public/static}/theme/green/breadcrumb-item.css (100%) rename {static => public/static}/theme/green/breadcrumb.css (100%) rename {static => public/static}/theme/green/button-group.css (100%) rename {static => public/static}/theme/green/button.css (100%) rename {static => public/static}/theme/green/card.css (100%) rename {static => public/static}/theme/green/carousel-item.css (100%) rename {static => public/static}/theme/green/carousel.css (100%) rename {static => public/static}/theme/green/cascader.css (100%) rename {static => public/static}/theme/green/checkbox-button.css (100%) rename {static => public/static}/theme/green/checkbox-group.css (100%) rename {static => public/static}/theme/green/checkbox.css (100%) rename {static => public/static}/theme/green/col.css (100%) rename {static => public/static}/theme/green/collapse-item.css (100%) rename {static => public/static}/theme/green/collapse.css (100%) rename {static => public/static}/theme/green/color-picker.css (100%) rename {static => public/static}/theme/green/container.css (100%) rename {static => public/static}/theme/green/date-picker.css (100%) rename {static => public/static}/theme/green/dialog.css (100%) rename {static => public/static}/theme/green/display.css (100%) rename {static => public/static}/theme/green/dropdown-item.css (100%) rename {static => public/static}/theme/green/dropdown-menu.css (100%) rename {static => public/static}/theme/green/dropdown.css (100%) rename {static => public/static}/theme/green/fonts/element-icons.ttf (100%) rename {static => public/static}/theme/green/fonts/element-icons.woff (100%) rename {static => public/static}/theme/green/footer.css (100%) rename {static => public/static}/theme/green/form-item.css (100%) rename {static => public/static}/theme/green/form.css (100%) rename {static => public/static}/theme/green/header.css (100%) rename {static => public/static}/theme/green/icon.css (100%) rename {static => public/static}/theme/green/index.css (100%) rename {static => public/static}/theme/green/input-number.css (100%) rename {static => public/static}/theme/green/input.css (100%) rename {static => public/static}/theme/green/loading.css (100%) rename {static => public/static}/theme/green/main.css (100%) rename {static => public/static}/theme/green/menu-item-group.css (100%) rename {static => public/static}/theme/green/menu-item.css (100%) rename {static => public/static}/theme/green/menu.css (100%) rename {static => public/static}/theme/green/message-box.css (100%) rename {static => public/static}/theme/green/message.css (100%) rename {static => public/static}/theme/green/notification.css (100%) rename {static => public/static}/theme/green/option-group.css (100%) rename {static => public/static}/theme/green/option.css (100%) rename {static => public/static}/theme/green/pagination.css (100%) rename {static => public/static}/theme/green/popover.css (100%) rename {static => public/static}/theme/green/popper.css (100%) rename {static => public/static}/theme/green/progress.css (100%) rename {static => public/static}/theme/green/radio-button.css (100%) rename {static => public/static}/theme/green/radio-group.css (100%) rename {static => public/static}/theme/green/radio.css (100%) rename {static => public/static}/theme/green/rate.css (100%) rename {static => public/static}/theme/green/reset.css (100%) rename {static => public/static}/theme/green/row.css (100%) rename {static => public/static}/theme/green/scrollbar.css (100%) rename {static => public/static}/theme/green/select-dropdown.css (100%) rename {static => public/static}/theme/green/select.css (100%) rename {static => public/static}/theme/green/slider.css (100%) rename {static => public/static}/theme/green/spinner.css (100%) rename {static => public/static}/theme/green/step.css (100%) rename {static => public/static}/theme/green/steps.css (100%) rename {static => public/static}/theme/green/submenu.css (100%) rename {static => public/static}/theme/green/switch.css (100%) rename {static => public/static}/theme/green/tab-pane.css (100%) rename {static => public/static}/theme/green/table-column.css (100%) rename {static => public/static}/theme/green/table.css (100%) rename {static => public/static}/theme/green/tabs.css (100%) rename {static => public/static}/theme/green/tag.css (100%) rename {static => public/static}/theme/green/time-picker.css (100%) rename {static => public/static}/theme/green/time-select.css (100%) rename {static => public/static}/theme/green/tooltip.css (100%) rename {static => public/static}/theme/green/transfer.css (100%) rename {static => public/static}/theme/green/tree.css (100%) rename {static => public/static}/theme/green/upload.css (100%) rename {static => public/static}/theme/purple/alert.css (100%) rename {static => public/static}/theme/purple/aside.css (100%) rename {static => public/static}/theme/purple/autocomplete.css (100%) rename {static => public/static}/theme/purple/badge.css (100%) rename {static => public/static}/theme/purple/base.css (100%) rename {static => public/static}/theme/purple/breadcrumb-item.css (100%) rename {static => public/static}/theme/purple/breadcrumb.css (100%) rename {static => public/static}/theme/purple/button-group.css (100%) rename {static => public/static}/theme/purple/button.css (100%) rename {static => public/static}/theme/purple/card.css (100%) rename {static => public/static}/theme/purple/carousel-item.css (100%) rename {static => public/static}/theme/purple/carousel.css (100%) rename {static => public/static}/theme/purple/cascader.css (100%) rename {static => public/static}/theme/purple/checkbox-button.css (100%) rename {static => public/static}/theme/purple/checkbox-group.css (100%) rename {static => public/static}/theme/purple/checkbox.css (100%) rename {static => public/static}/theme/purple/col.css (100%) rename {static => public/static}/theme/purple/collapse-item.css (100%) rename {static => public/static}/theme/purple/collapse.css (100%) rename {static => public/static}/theme/purple/color-picker.css (100%) rename {static => public/static}/theme/purple/container.css (100%) rename {static => public/static}/theme/purple/date-picker.css (100%) rename {static => public/static}/theme/purple/dialog.css (100%) rename {static => public/static}/theme/purple/display.css (100%) rename {static => public/static}/theme/purple/dropdown-item.css (100%) rename {static => public/static}/theme/purple/dropdown-menu.css (100%) rename {static => public/static}/theme/purple/dropdown.css (100%) rename {static => public/static}/theme/purple/fonts/element-icons.ttf (100%) rename {static => public/static}/theme/purple/fonts/element-icons.woff (100%) rename {static => public/static}/theme/purple/footer.css (100%) rename {static => public/static}/theme/purple/form-item.css (100%) rename {static => public/static}/theme/purple/form.css (100%) rename {static => public/static}/theme/purple/header.css (100%) rename {static => public/static}/theme/purple/icon.css (100%) rename {static => public/static}/theme/purple/index.css (100%) rename {static => public/static}/theme/purple/input-number.css (100%) rename {static => public/static}/theme/purple/input.css (100%) rename {static => public/static}/theme/purple/loading.css (100%) rename {static => public/static}/theme/purple/main.css (100%) rename {static => public/static}/theme/purple/menu-item-group.css (100%) rename {static => public/static}/theme/purple/menu-item.css (100%) rename {static => public/static}/theme/purple/menu.css (100%) rename {static => public/static}/theme/purple/message-box.css (100%) rename {static => public/static}/theme/purple/message.css (100%) rename {static => public/static}/theme/purple/notification.css (100%) rename {static => public/static}/theme/purple/option-group.css (100%) rename {static => public/static}/theme/purple/option.css (100%) rename {static => public/static}/theme/purple/pagination.css (100%) rename {static => public/static}/theme/purple/popover.css (100%) rename {static => public/static}/theme/purple/popper.css (100%) rename {static => public/static}/theme/purple/progress.css (100%) rename {static => public/static}/theme/purple/radio-button.css (100%) rename {static => public/static}/theme/purple/radio-group.css (100%) rename {static => public/static}/theme/purple/radio.css (100%) rename {static => public/static}/theme/purple/rate.css (100%) rename {static => public/static}/theme/purple/reset.css (100%) rename {static => public/static}/theme/purple/row.css (100%) rename {static => public/static}/theme/purple/scrollbar.css (100%) rename {static => public/static}/theme/purple/select-dropdown.css (100%) rename {static => public/static}/theme/purple/select.css (100%) rename {static => public/static}/theme/purple/slider.css (100%) rename {static => public/static}/theme/purple/spinner.css (100%) rename {static => public/static}/theme/purple/step.css (100%) rename {static => public/static}/theme/purple/steps.css (100%) rename {static => public/static}/theme/purple/submenu.css (100%) rename {static => public/static}/theme/purple/switch.css (100%) rename {static => public/static}/theme/purple/tab-pane.css (100%) rename {static => public/static}/theme/purple/table-column.css (100%) rename {static => public/static}/theme/purple/table.css (100%) rename {static => public/static}/theme/purple/tabs.css (100%) rename {static => public/static}/theme/purple/tag.css (100%) rename {static => public/static}/theme/purple/time-picker.css (100%) rename {static => public/static}/theme/purple/time-select.css (100%) rename {static => public/static}/theme/purple/tooltip.css (100%) rename {static => public/static}/theme/purple/transfer.css (100%) rename {static => public/static}/theme/purple/tree.css (100%) rename {static => public/static}/theme/purple/upload.css (100%) rename {static => public/static}/theme/red/alert.css (100%) rename {static => public/static}/theme/red/aside.css (100%) rename {static => public/static}/theme/red/autocomplete.css (100%) rename {static => public/static}/theme/red/badge.css (100%) rename {static => public/static}/theme/red/base.css (100%) rename {static => public/static}/theme/red/breadcrumb-item.css (100%) rename {static => public/static}/theme/red/breadcrumb.css (100%) rename {static => public/static}/theme/red/button-group.css (100%) rename {static => public/static}/theme/red/button.css (100%) rename {static => public/static}/theme/red/card.css (100%) rename {static => public/static}/theme/red/carousel-item.css (100%) rename {static => public/static}/theme/red/carousel.css (100%) rename {static => public/static}/theme/red/cascader.css (100%) rename {static => public/static}/theme/red/checkbox-button.css (100%) rename {static => public/static}/theme/red/checkbox-group.css (100%) rename {static => public/static}/theme/red/checkbox.css (100%) rename {static => public/static}/theme/red/col.css (100%) rename {static => public/static}/theme/red/collapse-item.css (100%) rename {static => public/static}/theme/red/collapse.css (100%) rename {static => public/static}/theme/red/color-picker.css (100%) rename {static => public/static}/theme/red/container.css (100%) rename {static => public/static}/theme/red/date-picker.css (100%) rename {static => public/static}/theme/red/dialog.css (100%) rename {static => public/static}/theme/red/display.css (100%) rename {static => public/static}/theme/red/dropdown-item.css (100%) rename {static => public/static}/theme/red/dropdown-menu.css (100%) rename {static => public/static}/theme/red/dropdown.css (100%) rename {static => public/static}/theme/red/fonts/element-icons.ttf (100%) rename {static => public/static}/theme/red/fonts/element-icons.woff (100%) rename {static => public/static}/theme/red/footer.css (100%) rename {static => public/static}/theme/red/form-item.css (100%) rename {static => public/static}/theme/red/form.css (100%) rename {static => public/static}/theme/red/header.css (100%) rename {static => public/static}/theme/red/icon.css (100%) rename {static => public/static}/theme/red/index.css (100%) rename {static => public/static}/theme/red/input-number.css (100%) rename {static => public/static}/theme/red/input.css (100%) rename {static => public/static}/theme/red/loading.css (100%) rename {static => public/static}/theme/red/main.css (100%) rename {static => public/static}/theme/red/menu-item-group.css (100%) rename {static => public/static}/theme/red/menu-item.css (100%) rename {static => public/static}/theme/red/menu.css (100%) rename {static => public/static}/theme/red/message-box.css (100%) rename {static => public/static}/theme/red/message.css (100%) rename {static => public/static}/theme/red/notification.css (100%) rename {static => public/static}/theme/red/option-group.css (100%) rename {static => public/static}/theme/red/option.css (100%) rename {static => public/static}/theme/red/pagination.css (100%) rename {static => public/static}/theme/red/popover.css (100%) rename {static => public/static}/theme/red/popper.css (100%) rename {static => public/static}/theme/red/progress.css (100%) rename {static => public/static}/theme/red/radio-button.css (100%) rename {static => public/static}/theme/red/radio-group.css (100%) rename {static => public/static}/theme/red/radio.css (100%) rename {static => public/static}/theme/red/rate.css (100%) rename {static => public/static}/theme/red/reset.css (100%) rename {static => public/static}/theme/red/row.css (100%) rename {static => public/static}/theme/red/scrollbar.css (100%) rename {static => public/static}/theme/red/select-dropdown.css (100%) rename {static => public/static}/theme/red/select.css (100%) rename {static => public/static}/theme/red/slider.css (100%) rename {static => public/static}/theme/red/spinner.css (100%) rename {static => public/static}/theme/red/step.css (100%) rename {static => public/static}/theme/red/steps.css (100%) rename {static => public/static}/theme/red/submenu.css (100%) rename {static => public/static}/theme/red/switch.css (100%) rename {static => public/static}/theme/red/tab-pane.css (100%) rename {static => public/static}/theme/red/table-column.css (100%) rename {static => public/static}/theme/red/table.css (100%) rename {static => public/static}/theme/red/tabs.css (100%) rename {static => public/static}/theme/red/tag.css (100%) rename {static => public/static}/theme/red/time-picker.css (100%) rename {static => public/static}/theme/red/time-select.css (100%) rename {static => public/static}/theme/red/tooltip.css (100%) rename {static => public/static}/theme/red/transfer.css (100%) rename {static => public/static}/theme/red/tree.css (100%) rename {static => public/static}/theme/red/upload.css (100%) rename {static => src/assets}/css/iconfont/1.0.0/index.css (100%) rename {static => src/assets}/css/main.css (100%) rename {static => src/assets}/css/reset.css (100%) create mode 100644 src/views/icons/svg-icons/svg-icons.js create mode 100644 tests/unit/.eslintrc.js create mode 100644 tests/unit/components/Breadcrumb.spec.js create mode 100644 tests/unit/components/Hamburger.spec.js create mode 100644 tests/unit/components/SvgIcon.spec.js create mode 100644 tests/unit/utils/formatTime.spec.js create mode 100644 tests/unit/utils/parseTime.spec.js create mode 100644 tests/unit/utils/validate.spec.js create mode 100644 vue.config.js diff --git a/.babelrc b/.babelrc deleted file mode 100644 index 4df959b..0000000 --- a/.babelrc +++ /dev/null @@ -1,19 +0,0 @@ -{ - "presets": [ - ["env", { - "modules": false, - "targets": { - "browsers": ["> 1%", "last 2 versions", "not ie <= 8"] - } - }], - "stage-2" - ], - "plugins":["transform-vue-jsx", "transform-runtime"], - "env": { - "development": { - "plugins": [ - "dynamic-import-node" - ] - } - } -} diff --git a/.env.development b/.env.development new file mode 100644 index 0000000..8f5856d --- /dev/null +++ b/.env.development @@ -0,0 +1,14 @@ +# just a flag +ENV = 'development' + +# base api +VUE_APP_BASE_API = '/dev-api' + +# vue-cli uses the VUE_CLI_BABEL_TRANSPILE_MODULES environment variable, +# to control whether the babel-plugin-dynamic-import-node plugin is enabled. +# It only does one thing by converting all import() to require(). +# This configuration can significantly increase the speed of hot updates, +# when you have a large number of pages. +# Detail: https://github.com/vuejs/vue-cli/blob/dev/packages/@vue/babel-preset-app/index.js + +VUE_CLI_BABEL_TRANSPILE_MODULES = true diff --git a/.env.production b/.env.production new file mode 100644 index 0000000..80c8103 --- /dev/null +++ b/.env.production @@ -0,0 +1,6 @@ +# just a flag +ENV = 'production' + +# base api +VUE_APP_BASE_API = '/prod-api' + diff --git a/.env.staging b/.env.staging new file mode 100644 index 0000000..a8793a0 --- /dev/null +++ b/.env.staging @@ -0,0 +1,8 @@ +NODE_ENV = production + +# just a flag +ENV = 'staging' + +# base api +VUE_APP_BASE_API = '/stage-api' + diff --git a/.eslintignore b/.eslintignore index e3a4037..e6529fc 100644 --- a/.eslintignore +++ b/.eslintignore @@ -1,3 +1,4 @@ build/*.js -config/*.js src/assets +public +dist diff --git a/.eslintrc.js b/.eslintrc.js index 14b0457..c977505 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -1,7 +1,7 @@ module.exports = { root: true, - parser: 'babel-eslint', parserOptions: { + parser: 'babel-eslint', sourceType: 'module' }, env: { @@ -9,23 +9,22 @@ module.exports = { node: true, es6: true, }, - extends: 'eslint:recommended', - // required to lint *.vue files - plugins: [ - 'html', - 'vue' - ], - // check if imports actually resolve - 'settings': { - 'import/resolver': { - 'webpack': { - 'config': 'build/webpack.base.conf.js' - } - } - }, + extends: ['plugin:vue/recommended', 'eslint:recommended'], + // add your custom rules here //it is base on https://github.com/vuejs/eslint-config-vue rules: { + "vue/max-attributes-per-line": [2, { + "singleline": 10, + "multiline": { + "max": 1, + "allowFirstLine": false + } + }], + "vue/singleline-html-element-content-newline": "off", + "vue/multiline-html-element-content-newline":"off", + "vue/name-property-casing": ["error", "PascalCase"], + "vue/no-v-html": "off", 'accessor-pairs': 2, 'arrow-spacing': [2, { 'before': true, @@ -48,7 +47,7 @@ module.exports = { 'curly': [2, 'multi-line'], 'dot-location': [2, 'property'], 'eol-last': 2, - 'eqeqeq': [2, 'allow-null'], + 'eqeqeq': ["error", "always", {"null": "ignore"}], 'generator-star-spacing': [2, { 'before': true, 'after': true @@ -77,7 +76,7 @@ module.exports = { 'no-class-assign': 2, 'no-cond-assign': 2, 'no-const-assign': 2, - 'no-control-regex': 2, + 'no-control-regex': 0, 'no-delete-var': 2, 'no-dupe-args': 2, 'no-dupe-class-members': 2, @@ -162,7 +161,7 @@ module.exports = { ':': 'before' } }], - 'padded-blocks': [2, 'never'], //要求或禁止块内填充 + 'padded-blocks': [2, 'never'], 'quotes': [2, 'single', { 'avoidEscape': true, 'allowTemplateLiterals': true diff --git a/.gitattributes b/.gitattributes deleted file mode 100644 index 375b561..0000000 --- a/.gitattributes +++ /dev/null @@ -1,4 +0,0 @@ -*.css linguist-language=vue -*.less linguist-language=vue -*.js linguist-language=vue -*.html linguist-language=vue \ No newline at end of file diff --git a/.gitignore b/.gitignore index 78a0ead..9ad28d2 100644 --- a/.gitignore +++ b/.gitignore @@ -5,6 +5,7 @@ npm-debug.log* yarn-debug.log* yarn-error.log* package-lock.json +tests/**/coverage/ # Editor directories and files .idea diff --git a/.travis.yml b/.travis.yml index 16574d9..f4be7a0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,5 @@ language: node_js -node_js: stable +node_js: 10 script: npm run test notifications: email: false diff --git a/README.md b/README.md index b087591..6c353f8 100644 --- a/README.md +++ b/README.md @@ -35,15 +35,15 @@ **完整版** [Github 仓库](https://github.com/mgbq/nx-admin) | -[码云仓库](https://gitee.com/nxmin/nx-admin) | -[预览地址](https://sdsdsy.gitee.io/nxadmin) +[码云仓库](https://gitee.com/symgg/nx-admin) | +[预览地址](https://mgbq.github.io/vue-permission/#/login) nx-admin **简化版** [Github 仓库](https://github.com/mgbq/nxAdmin-template) | -[码云仓库](https://gitee.com/nxmin/nxAdmin-template) | +[码云仓库](https://gitee.com/symgg/nxAdmin-template) | [预览地址](https://mgbq.github.io/nxAdmin-template) ## 前序准备 diff --git a/babel.config.js b/babel.config.js new file mode 100644 index 0000000..ba17966 --- /dev/null +++ b/babel.config.js @@ -0,0 +1,5 @@ +module.exports = { + presets: [ + '@vue/app' + ] +} diff --git a/build/build.js b/build/build.js deleted file mode 100644 index 955e9de..0000000 --- a/build/build.js +++ /dev/null @@ -1,41 +0,0 @@ -'use strict' -require('./check-versions')() - -process.env.NODE_ENV = 'production' - -const ora = require('ora') -const rm = require('rimraf') -const path = require('path') -const chalk = require('chalk') -const webpack = require('webpack') -const config = require('../config') -const webpackConfig = require('./webpack.prod.conf') - -const spinner = ora('building for production...') -spinner.start() - -rm(path.join(config.build.assetsRoot, config.build.assetsSubDirectory), err => { - if (err) throw err - webpack(webpackConfig, (err, stats) => { - spinner.stop() - if (err) throw err - process.stdout.write(stats.toString({ - colors: true, - modules: false, - children: false, - chunks: false, - chunkModules: false - }) + '\n\n') - - if (stats.hasErrors()) { - console.log(chalk.red(' Build failed with errors.\n')) - process.exit(1) - } - - console.log(chalk.cyan(' Build complete.\n')) - console.log(chalk.yellow( - ' Tip: built files are meant to be served over an HTTP server.\n' + - ' Opening index.html over file:// won\'t work.\n' - )) - }) -}) diff --git a/build/check-versions.js b/build/check-versions.js deleted file mode 100644 index 3ef972a..0000000 --- a/build/check-versions.js +++ /dev/null @@ -1,54 +0,0 @@ -'use strict' -const chalk = require('chalk') -const semver = require('semver') -const packageConfig = require('../package.json') -const shell = require('shelljs') - -function exec (cmd) { - return require('child_process').execSync(cmd).toString().trim() -} - -const versionRequirements = [ - { - name: 'node', - currentVersion: semver.clean(process.version), - versionRequirement: packageConfig.engines.node - } -] - -if (shell.which('npm')) { - versionRequirements.push({ - name: 'npm', - currentVersion: exec('npm --version'), - versionRequirement: packageConfig.engines.npm - }) -} - -module.exports = function () { - const warnings = [] - - for (let i = 0; i < versionRequirements.length; i++) { - const mod = versionRequirements[i] - - if (!semver.satisfies(mod.currentVersion, mod.versionRequirement)) { - warnings.push(mod.name + ': ' + - chalk.red(mod.currentVersion) + ' should be ' + - chalk.green(mod.versionRequirement) - ) - } - } - - if (warnings.length) { - console.log('') - console.log(chalk.yellow('To use this template, you must update following to modules:')) - console.log() - - for (let i = 0; i < warnings.length; i++) { - const warning = warnings[i] - console.log(' ' + warning) - } - - console.log() - process.exit(1) - } -} diff --git a/build/index.js b/build/index.js new file mode 100644 index 0000000..0c57de2 --- /dev/null +++ b/build/index.js @@ -0,0 +1,35 @@ +const { run } = require('runjs') +const chalk = require('chalk') +const config = require('../vue.config.js') +const rawArgv = process.argv.slice(2) +const args = rawArgv.join(' ') + +if (process.env.npm_config_preview || rawArgv.includes('--preview')) { + const report = rawArgv.includes('--report') + + run(`vue-cli-service build ${args}`) + + const port = 9526 + const publicPath = config.publicPath + + var connect = require('connect') + var serveStatic = require('serve-static') + const app = connect() + + app.use( + publicPath, + serveStatic('./dist', { + index: ['index.html', '/'] + }) + ) + + app.listen(port, function () { + console.log(chalk.green(`> Preview at http://localhost:${port}${publicPath}`)) + if (report) { + console.log(chalk.green(`> Report at http://localhost:${port}${publicPath}report.html`)) + } + + }) +} else { + run(`vue-cli-service build ${args}`) +} diff --git a/build/logo.png b/build/logo.png deleted file mode 100644 index f3d2503fc2a44b5053b0837ebea6e87a2d339a43..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6849 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 { - const notifier = require('node-notifier') - - return (severity, errors) => { - if (severity !== 'error') return - - const error = errors[0] - const filename = error.file && error.file.split('!').pop() - - notifier.notify({ - title: packageConfig.name, - message: severity + ': ' + error.name, - subtitle: filename || '', - icon: path.join(__dirname, 'logo.png') - }) - } -} diff --git a/build/vue-loader.conf.js b/build/vue-loader.conf.js deleted file mode 100644 index 33ed58b..0000000 --- a/build/vue-loader.conf.js +++ /dev/null @@ -1,22 +0,0 @@ -'use strict' -const utils = require('./utils') -const config = require('../config') -const isProduction = process.env.NODE_ENV === 'production' -const sourceMapEnabled = isProduction - ? config.build.productionSourceMap - : config.dev.cssSourceMap - -module.exports = { - loaders: utils.cssLoaders({ - sourceMap: sourceMapEnabled, - extract: isProduction - }), - cssSourceMap: sourceMapEnabled, - cacheBusting: config.dev.cacheBusting, - transformToRequire: { - video: ['src', 'poster'], - source: 'src', - img: 'src', - image: 'xlink:href' - } -} diff --git a/build/webpack.base.conf.js b/build/webpack.base.conf.js deleted file mode 100644 index e41b327..0000000 --- a/build/webpack.base.conf.js +++ /dev/null @@ -1,116 +0,0 @@ -'use strict' -const path = require('path') -const utils = require('./utils') -const config = require('../config') -const vueLoaderConfig = require('./vue-loader.conf') -var webpack = require("webpack") -function resolve (dir) { - return path.join(__dirname, '..', dir) -} - -const createLintingRule = () => ({ - test: /\.(js|vue)$/, - loader: 'eslint-loader', - enforce: 'pre', - include: [resolve('src'), resolve('test')], - options: { - formatter: require('eslint-friendly-formatter'), - emitWarning: !config.dev.showEslintErrorsInOverlay - } -}) - -module.exports = { - context: path.resolve(__dirname, '../'), - entry: { - app: './src/main.js' - }, - output: { - path: config.build.assetsRoot, - filename: '[name].js', - publicPath: process.env.NODE_ENV === 'production' - ? config.build.assetsPublicPath - : config.dev.assetsPublicPath - }, - resolve: { - extensions: ['.js', '.vue', '.json'], - alias: { - 'vue$': 'vue/dist/vue.esm.js', - '@': resolve('src'), - 'static': path.resolve(__dirname, 'static'), - } - }, - module: { - rules: [ - ...(config.dev.useEslint ? [createLintingRule()] : []), - { - test: /\.vue$/, - loader: 'vue-loader', - options: vueLoaderConfig - }, - { - test: /\.sass$/, - loaders: ['style', 'css', 'sass'] - }, - { - test: /\.js$/, - loader: 'babel-loader', - include: [resolve('src'), resolve('test') ,resolve('node_modules/webpack-dev-server/client')] - }, - { - test: /\.md$/, - loaders: ["text-loader"] - }, - { - test: /\.svg$/, - loader: 'svg-sprite-loader', - include: [resolve('src/icons')], - options: { - symbolId: 'icon-[name]' - } - }, - { - test: /\.(png|jpe?g|gif|svg)(\?.*)?$/, - loader: 'url-loader', - exclude: [resolve('src/icons')], - options: { - limit: 10000, - name: utils.assetsPath('img/[name].[hash:7].[ext]') - } - }, - { - test: /\.(mp4|webm|ogg|mp3|wav|flac|aac)(\?.*)?$/, - loader: 'url-loader', - options: { - limit: 10000, - name: utils.assetsPath('media/[name].[hash:7].[ext]') - } - }, - { - test: /\.(woff2?|eot|ttf|otf)(\?.*)?$/, - loader: 'url-loader', - options: { - limit: 10000, - name: utils.assetsPath('fonts/[name].[hash:7].[ext]') - } - } - ] - }, - node: { - // prevent webpack from injecting useless setImmediate polyfill because Vue - // source contains it (although only uses it if it's native). - setImmediate: false, - // prevent webpack from injecting mocks to Node native modules - // that does not make sense for the client - dgram: 'empty', - fs: 'empty', - net: 'empty', - tls: 'empty', - child_process: 'empty' - } , plugins: [ - new webpack.optimize.CommonsChunkPlugin('common.js'), - new webpack.ProvidePlugin({ - jQuery: "jquery", - $: "jquery" - }) - ] -} diff --git a/build/webpack.dev.conf.js b/build/webpack.dev.conf.js deleted file mode 100644 index a2a35b2..0000000 --- a/build/webpack.dev.conf.js +++ /dev/null @@ -1,87 +0,0 @@ -'use strict' -const path = require('path') -const utils = require('./utils') -const webpack = require('webpack') -const config = require('../config') -const merge = require('webpack-merge') -const baseWebpackConfig = require('./webpack.base.conf') -const HtmlWebpackPlugin = require('html-webpack-plugin') -const FriendlyErrorsPlugin = require('friendly-errors-webpack-plugin') -const portfinder = require('portfinder') - -function resolve (dir) { - return path.join(__dirname, '..', dir) -} - -const HOST = process.env.HOST -const PORT = process.env.PORT && Number(process.env.PORT) - -const devWebpackConfig = merge(baseWebpackConfig, { - module: { - rules: utils.styleLoaders({ sourceMap: config.dev.cssSourceMap, usePostCSS: true }) - }, - // cheap-module-eval-source-map is faster for development - devtool: config.dev.devtool, - - // these devServer options should be customized in /config/index.js - devServer: { - clientLogLevel: 'warning', - historyApiFallback: true, - hot: true, - compress: true, - host: HOST || config.dev.host, - port: PORT || config.dev.port, - open: config.dev.autoOpenBrowser, - overlay: config.dev.errorOverlay - ? { warnings: false, errors: true } - : false, - publicPath: config.dev.assetsPublicPath, - proxy: config.dev.proxyTable, - quiet: true, // necessary for FriendlyErrorsPlugin - watchOptions: { - poll: config.dev.poll, - } - }, - plugins: [ - new webpack.DefinePlugin({ - 'process.env': require('../config/dev.env') - }), - new webpack.HotModuleReplacementPlugin(), - new webpack.NamedModulesPlugin(), // HMR shows correct file names in console on update. - new webpack.NoEmitOnErrorsPlugin(), - // https://github.com/ampedandwired/html-webpack-plugin - new HtmlWebpackPlugin({ - filename: 'index.html', - template: 'index.html', - inject: true, - favicon: resolve('log.ico'), - title: 'nx-admin' - }), - ] -}) - -module.exports = new Promise((resolve, reject) => { - portfinder.basePort = process.env.PORT || config.dev.port - portfinder.getPort((err, port) => { - if (err) { - reject(err) - } else { - // publish the new Port, necessary for e2e tests - process.env.PORT = port - // add port to devServer config - devWebpackConfig.devServer.port = port - - // Add FriendlyErrorsPlugin - devWebpackConfig.plugins.push(new FriendlyErrorsPlugin({ - compilationSuccessInfo: { - messages: [`Your application is running here: http://${devWebpackConfig.devServer.host}:${port}`], - }, - onErrors: config.dev.notifyOnErrors - ? utils.createNotifierCallback() - : undefined - })) - - resolve(devWebpackConfig) - } - }) -}) diff --git a/build/webpack.prod.conf.js b/build/webpack.prod.conf.js deleted file mode 100644 index 98b5d75..0000000 --- a/build/webpack.prod.conf.js +++ /dev/null @@ -1,176 +0,0 @@ -'use strict' -const path = require('path') -const utils = require('./utils') -const webpack = require('webpack') -const config = require('../config') -const merge = require('webpack-merge') -const baseWebpackConfig = require('./webpack.base.conf') -const CopyWebpackPlugin = require('copy-webpack-plugin') -const HtmlWebpackPlugin = require('html-webpack-plugin') -const ExtractTextPlugin = require('extract-text-webpack-plugin') -const OptimizeCSSPlugin = require('optimize-css-assets-webpack-plugin') -const UglifyJsPlugin = require('uglifyjs-webpack-plugin') - -function resolve (dir) { - return path.join(__dirname, '..', dir) -} - -const env = require('../config/prod.env') - -const webpackConfig = merge(baseWebpackConfig, { - module: { - rules: utils.styleLoaders({ - sourceMap: config.build.productionSourceMap, - extract: true, - usePostCSS: true - }) - }, - devtool: config.build.productionSourceMap ? config.build.devtool : false, - output: { - path: config.build.assetsRoot, - filename: utils.assetsPath('js/[name].[chunkhash].js'), - chunkFilename: utils.assetsPath('js/[id].[chunkhash].js') - }, - plugins: [ - // http://vuejs.github.io/vue-loader/en/workflow/production.html - new webpack.DefinePlugin({ - 'process.env': env - }), - new UglifyJsPlugin({ - uglifyOptions: { - compress: { - warnings: false - } - }, - sourceMap: config.build.productionSourceMap, - parallel: true - }), - // extract css into its own file - new ExtractTextPlugin({ - filename: utils.assetsPath('css/[name].[contenthash].css'), - // Setting the following option to `false` will not extract CSS from codesplit chunks. - // Their CSS will instead be inserted dynamically with style-loader when the codesplit chunk has been loaded by webpack. - // increasing file size: https://github.com/vuejs-templates/webpack/issues/1110 - allChunks: false, - }), - // Compress extracted CSS. We are using this plugin so that possible - // duplicated CSS from different components can be deduped. - new OptimizeCSSPlugin({ - cssProcessorOptions: config.build.productionSourceMap - ? { safe: true, map: { inline: false } } - : { safe: true } - }), - // generate dist index.html with correct asset hash for caching. - // you can customize output by editing /index.html - // see https://github.com/ampedandwired/html-webpack-plugin - new HtmlWebpackPlugin({ - filename: config.build.index, - template: 'index.html', - inject: true, - favicon: resolve('log.ico'), - title: 'nx-admin', - minify: { - removeComments: true, - collapseWhitespace: true, - removeAttributeQuotes: true - // more options: - // https://github.com/kangax/html-minifier#options-quick-reference - }, - // necessary to consistently work with multiple chunks via CommonsChunkPlugin - chunksSortMode: 'dependency' - }), - // keep module.id stable when vender modules does not change - new webpack.HashedModuleIdsPlugin(), - // enable scope hoisting - new webpack.optimize.ModuleConcatenationPlugin(), - // split vendor js into its own file - new webpack.optimize.CommonsChunkPlugin({ - name: 'vendor', - minChunks (module) { - // any required modules inside node_modules are extracted to vendor - return ( - module.resource && - /\.js$/.test(module.resource) && - module.resource.indexOf( - path.join(__dirname, '../node_modules') - ) === 0 - ) - } - }), - // extract webpack runtime and module manifest to its own file in order to - // prevent vendor hash from being updated whenever app bundle is updated - new webpack.optimize.CommonsChunkPlugin({ - name: 'manifest', - minChunks: Infinity - }), - // This instance extracts shared chunks from code splitted chunks and bundles them - // in a separate chunk, similar to the vendor chunk - // see: https://webpack.js.org/plugins/commons-chunk-plugin/#extra-async-commons-chunk - new webpack.optimize.CommonsChunkPlugin({ - name: 'app', - async: 'vendor-async', - children: true, - minChunks: 3 - }), - - // split echarts into its own file - new webpack.optimize.CommonsChunkPlugin({ - async: 'echarts', - minChunks(module) { - var context = module.context; - return context && (context.indexOf('echarts') >= 0 || context.indexOf('zrender') >= 0); - } - }), - // split xlsx into its own file - new webpack.optimize.CommonsChunkPlugin({ - async: 'xlsx', - minChunks(module) { - var context = module.context; - return context && (context.indexOf('xlsx') >= 0); - } - }), - // split codemirror into its own file - new webpack.optimize.CommonsChunkPlugin({ - async: 'codemirror', - minChunks(module) { - var context = module.context; - return context && (context.indexOf('codemirror') >= 0); - } - }), - // copy custom static assets - new CopyWebpackPlugin([ - { - from: path.resolve(__dirname, '../static'), - to: config.build.assetsSubDirectory, - ignore: ['.*'] - } - ]) - ] -}) - - - -if (config.build.productionGzip) { - const CompressionWebpackPlugin = require('compression-webpack-plugin') - - webpackConfig.plugins.push( - new CompressionWebpackPlugin({ - asset: '[path].gz[query]', - algorithm: 'gzip', - test: new RegExp( - '\\.(' + - config.build.productionGzipExtensions.join('|') + - ')$' - ), - threshold: 10240, - minRatio: 0.8 - }) - ) -} - -if (config.build.bundleAnalyzerReport) { - const BundleAnalyzerPlugin = require('webpack-bundle-analyzer').BundleAnalyzerPlugin - webpackConfig.plugins.push(new BundleAnalyzerPlugin()) -} - -module.exports = webpackConfig diff --git a/build/webpack.test.conf.js b/build/webpack.test.conf.js deleted file mode 100644 index f98bfa4..0000000 --- a/build/webpack.test.conf.js +++ /dev/null @@ -1,91 +0,0 @@ -var path = require("path") -var webpack = require("webpack") -var ExtractTextPlugin = require('extract-text-webpack-plugin') - -function resolve(dir) { - - return path.join(__dirname, '..', dir) -} - -var webpackConfig = { - - module: { - - rules: [ - - // babel-loader - { - test: /\.js$/, - use: 'babel-loader', - include: [resolve('src'), resolve('test')] - }, - - // 为了统计代码覆盖率,对 js 文件加入 istanbul-instrumenter-loader - { - test: /\.(js)$/, - exclude: /node_modules/, - include: /src|packages/, - enforce: 'post', - use: [{ - loader: "istanbul-instrumenter-loader", - options: { - esModules: true - }, - }] - }, - - // vue loader - { - test: /\.vue$/, - use: [{ - loader: 'vue-loader', - options: { - // 为了统计代码覆盖率,对 vue 文件加入 istanbul-instrumenter-loader - preLoaders: { - js: 'istanbul-instrumenter-loader?esModules=true' - } - } - }] - }, - - // css loader - { - test: /\.css$/, - use: ExtractTextPlugin.extract({ - use: 'css-loader', - fallback: 'vue-style-loader' - }) - }, - - // img loader - { - test: /\.(png|gif|jpe?g)(\?\S*)?$/, - use: [{loader: 'url-loader'}] - }, - - // font loader - { - test: /\.(eot|woff|woff2|ttf|svg)(\?\S*)?$/, - use: [{loader: 'url-loader'}] - }, - ] - }, - - resolve: { - extensions: ['.js', '.vue', '.json'], - alias: { - 'vue$': 'vue/dist/vue.esm.js', - '@': resolve('src'), // 调用组件的时候方便点 - } - }, - - plugins: [ - new webpack.DefinePlugin({ - 'process.env': { - NODE_ENV: '"production"' - } - }) - ] -} - -module.exports = webpackConfig \ No newline at end of file diff --git a/config/dev.env.js b/config/dev.env.js deleted file mode 100644 index 7cb7782..0000000 --- a/config/dev.env.js +++ /dev/null @@ -1,8 +0,0 @@ -'use strict' -const merge = require('webpack-merge') -const prodEnv = require('./prod.env') - -module.exports = merge(prodEnv, { - NODE_ENV: '"development"', - // BASE_API: '"https://easy-mock.com/mock/5950a2419adc231f356a6636/vue-admin"', -}) diff --git a/config/index.js b/config/index.js deleted file mode 100644 index ec89cf8..0000000 --- a/config/index.js +++ /dev/null @@ -1,89 +0,0 @@ -'use strict' -// Template version: 1.2.6 -// see http://vuejs-templates.github.io/webpack for documentation. - -const path = require('path') - -module.exports = { - dev: { - - // Paths - assetsSubDirectory: 'static', - assetsPublicPath: '/', - proxyTable: {}, - - // Various Dev Server settings - host: 'localhost', // can be overwritten by process.env.HOST - port: 9528, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined - autoOpenBrowser: true, - errorOverlay: true, - notifyOnErrors: false, - poll: false, // https://webpack.js.org/configuration/dev-server/#devserver-watchoptions- - - // Use Eslint Loader? - // If true, your code will be linted during bundling and - // linting errors and warnings will be shown in the console. - useEslint: true, - // If true, eslint errors and warnings will also be shown in the error overlay - // in the browser. - showEslintErrorsInOverlay: false, - - /** - * Source Maps - */ - - // https://webpack.js.org/configuration/devtool/#development - devtool: 'cheap-source-map', - - // If you have problems debugging vue-files in devtools, - // set this to false - it *may* help - // https://vue-loader.vuejs.org/en/options.html#cachebusting - cacheBusting: true, - - // CSS Sourcemaps off by default because relative paths are "buggy" - // with this option, according to the CSS-Loader README - // (https://github.com/webpack/css-loader#sourcemaps) - // In our experience, they generally work as expected, - // just be aware of this issue when enabling this option. - cssSourceMap: false, - }, - - build: { - // Template for index.html - index: path.resolve(__dirname, '../dist/index.html'), - - // Paths - assetsRoot: path.resolve(__dirname, '../dist'), - assetsSubDirectory: 'static', - - /** - * You can set by youself according to actual condition - * You will need to set this if you plan to deploy your site under a sub path, - * for example GitHub pages. If you plan to deploy your site to https://foo.github.io/bar/, - * then assetsPublicPath should be set to "/bar/". - * In most cases please use '/' !!! - */ - assetsPublicPath: '/vue-permission/', // If you are deployed on the root path, please use '/' - - /** - * Source Maps - */ - - productionSourceMap: false, - // https://webpack.js.org/configuration/devtool/#production - devtool: '#source-map', - - // Gzip off by default as many popular static hosts such as - // Surge or Netlify already gzip all static assets for you. - // Before setting to `true`, make sure to: - // npm install --save-dev compression-webpack-plugin - productionGzip: false, - productionGzipExtensions: ['js', 'css'], - - // Run the build command with an extra argument to - // View the bundle analyzer report after build finishes: - // `npm run build --report` - // Set to `true` or `false` to always turn it on or off - bundleAnalyzerReport: process.env.npm_config_report - } -} diff --git a/config/prod.env.js b/config/prod.env.js deleted file mode 100644 index 44d782a..0000000 --- a/config/prod.env.js +++ /dev/null @@ -1,5 +0,0 @@ -'use strict' -module.exports = { - NODE_ENV: '"production"', - // BASE_API: '"https://easy-mock.com/mock/5950a2419adc231f356a6636/vue-admin"', -} diff --git a/config/test.env.js b/config/test.env.js deleted file mode 100644 index c2824a3..0000000 --- a/config/test.env.js +++ /dev/null @@ -1,7 +0,0 @@ -'use strict' -const merge = require('webpack-merge') -const devEnv = require('./dev.env') - -module.exports = merge(devEnv, { - NODE_ENV: '"testing"' -}) diff --git a/jest.config.js b/jest.config.js new file mode 100644 index 0000000..143cdc8 --- /dev/null +++ b/jest.config.js @@ -0,0 +1,24 @@ +module.exports = { + moduleFileExtensions: ['js', 'jsx', 'json', 'vue'], + transform: { + '^.+\\.vue$': 'vue-jest', + '.+\\.(css|styl|less|sass|scss|svg|png|jpg|ttf|woff|woff2)$': + 'jest-transform-stub', + '^.+\\.jsx?$': 'babel-jest' + }, + moduleNameMapper: { + '^@/(.*)$': '/src/$1' + }, + snapshotSerializers: ['jest-serializer-vue'], + testMatch: [ + '**/tests/unit/**/*.spec.(js|jsx|ts|tsx)|**/__tests__/*.(js|jsx|ts|tsx)' + ], + collectCoverageFrom: ['src/utils/**/*.{js,vue}', '!src/utils/auth.js', '!src/utils/request.js', 'src/components/**/*.{js,vue}'], + coverageDirectory: '/tests/unit/coverage', + // 'collectCoverage': true, + 'coverageReporters': [ + 'lcov', + 'text-summary' + ], + testURL: 'http://localhost/' +} diff --git a/jsconfig.json b/jsconfig.json new file mode 100644 index 0000000..ed079e2 --- /dev/null +++ b/jsconfig.json @@ -0,0 +1,9 @@ +{ + "compilerOptions": { + "baseUrl": "./", + "paths": { + "@/*": ["src/*"] + } + }, + "exclude": ["node_modules", "dist"] +} diff --git a/package.json b/package.json index 7f8f87c..5acc85e 100644 --- a/package.json +++ b/package.json @@ -5,14 +5,14 @@ "description": "A vue admin template with Element UI & axios & iconfont & permission control & lint", "author": "nxmin <392716797@qq.com>", "scripts": { - "dev": "cross-env BABEL_ENV=development webpack-dev-server --inline --progress --config build/webpack.dev.conf.js", - "start": "cross-env npm run dev", - "build:prod": "cross-env NODE_ENV=production env_config=prod node build/build.js", - "build:sit": "cross-env NODE_ENV=production env_config=sit node build/build.js", - "build:report": "npm_config_report=true node build/build.js", + "dev": "vue-cli-service serve", + "build:prod": "vue-cli-service build", + "build:stage": "vue-cli-service build --mode staging", + "preview": "node build/index.js --preview", "lint": "eslint --ext .js,.vue src", - "test": "npm run lint", - "precommit": "lint-staged" + "test:unit": "jest --clearCache && vue-cli-service test:unit", + "test:ci": "npm run lint && npm run test:unit", + "svgo": "svgo -f src/icons/svg --config=src/icons/svgo.yml" }, "lint-staged": { "src/**/*.{js,vue}": [ @@ -35,48 +35,57 @@ "url": "https://github.com/mgbq/nx-admin/issues" }, "dependencies": { - "axios": "0.17.1", + "axios": "0.18.1", "better-scroll": "^1.12.4", "clipboard": "^2.0.1", "clipboard-polyfill": "^2.4.7", + "core-js": "2.6.5", "countup.js": "^1.9.3", "echarts": "^4.1.0", - "element-ui": "2.3.4", - "file-saver": "^1.3.8", + "element-ui": "2.13.0", + "file-saver": "^2.0.2", "font-awesome": "^4.7.0", "highlight.js": "^9.12.0", "js-cookie": "2.2.0", "jszip": "^3.1.5", "normalize.css": "7.0.0", "nprogress": "0.2.0", + "path-to-regexp": "2.4.0", "quill": "^1.3.6", - "screenfull": "^3.3.2", - "script-loader": "^0.7.2", + "screenfull": "^5.0.2", "showdown": "^1.8.6", "simplemde": "^1.11.2", "store": "^2.0.12", "v-charts": "^1.17.6", "v-contextmenu": "^2.7.0", - "vue": "2.5.10", + "vue": "2.6.10", "vue-baidu-map": "^0.21.10", "vue-cropperjs": "^2.2.1", "vue-i18n": "^8.0.0", "vue-quill-editor": "^3.0.6", - "vue-router": "3.0.1", + "vue-router": "3.0.6", "vue-transition.css": "^1.0.2", "vuedraggable": "^2.16.0", - "vuex": "3.0.1", + "vuex": "3.1.0", "weui": "^1.1.3", "xlsx": "^0.11.16" }, "devDependencies": { - "stylus": "^0.54.5", - "stylus-loader": "^3.0.1", - "autoprefixer": "7.2.3", + "@babel/core": "7.0.0", + "@babel/register": "7.0.0", + "@babel/runtime": "^7.9.2", + "@vue/cli-plugin-babel": "3.6.0", + "@vue/cli-plugin-eslint": "^3.9.1", + "@vue/cli-plugin-unit-jest": "3.6.3", + "@vue/cli-service": "3.6.0", + "@vue/test-utils": "1.0.0-beta.29", + "acorn": "^7.1.1", + "autoprefixer": "^9.5.1", "axios-mock-adapter": "^1.15.0", - "babel-core": "6.26.0", - "babel-eslint": "8.0.3", + "babel-core": "7.0.0-bridge.0", + "babel-eslint": "10.0.1", "babel-helper-vue-jsx-merge-props": "2.0.3", + "babel-jest": "23.6.0", "babel-loader": "7.1.2", "babel-plugin-dynamic-import-node": "^2.0.0", "babel-plugin-syntax-jsx": "6.18.0", @@ -84,25 +93,27 @@ "babel-plugin-transform-vue-jsx": "3.5.0", "babel-preset-env": "1.6.1", "babel-preset-stage-2": "6.24.1", - "chalk": "2.3.0", + "cache-loader": "^4.1.0", + "chalk": "2.4.2", + "connect": "3.6.6", "copy-webpack-plugin": "4.2.3", "cross-env": "5.1.1", "css-loader": "0.28.7", - "eslint": "4.13.1", + "eslint": "5.15.3", "eslint-friendly-formatter": "3.0.0", "eslint-loader": "1.9.0", "eslint-plugin-html": "4.0.1", - "eslint-plugin-vue": "^4.5.0", + "eslint-plugin-vue": "5.2.2", "eventsource-polyfill": "0.9.6", "extract-text-webpack-plugin": "3.0.2", - "file-loader": "1.1.5", + "file-loader": "1.1.6", "friendly-errors-webpack-plugin": "1.6.1", - "html-webpack-plugin": "2.30.1", - "lint-staged": "7.2.0", + "html-webpack-plugin": "3.2.0", "jquery": "^1.12.4", - "mockjs": "^1.0.1-beta3", + "lint-staged": "7.2.0", + "mockjs": "1.0.1-beta3", "node-notifier": "5.1.2", - "node-sass": "^4.9.0", + "node-sass": "4.13", "optimize-css-assets-webpack-plugin": "3.2.0", "ora": "1.3.0", "portfinder": "1.0.13", @@ -110,23 +121,30 @@ "postcss-loader": "2.0.9", "postcss-url": "7.3.0", "rimraf": "2.6.2", - "sass-loader": "^6.0.6", + "runjs": "^4.3.2", + "sass-loader": "^7.1.0", + "script-ext-html-webpack-plugin": "2.1.3", + "script-loader": "0.7.2", "semver": "5.4.1", + "serve-static": "^1.13.2", "shelljs": "0.7.8", - "svg-sprite-loader": "3.5.2", + "stylus": "^0.54.5", + "stylus-loader": "^3.0.1", + "svg-sprite-loader": "3.2.1", + "svgo": "1.2.2", "text-loader": "^0.0.1", "uglifyjs-webpack-plugin": "1.1.3", - "url-loader": "0.6.2", - "vue-loader": "13.7.2", + "vue-loader": "^15.9.1", + "vue-runtime-helpers": "^1.1.2", "vue-style-loader": "3.0.3", - "vue-template-compiler": "2.5.10", + "vue-template-compiler": "2.6.10", "webpack": "3.10.0", "webpack-bundle-analyzer": "2.9.1", "webpack-dev-server": "2.9.7", "webpack-merge": "4.1.1" }, "engines": { - "node": ">= 4.0.0", + "node": ">=8.9", "npm": ">= 3.0.0" }, "browserslist": [ diff --git a/.postcssrc.js b/postcss.config.js similarity index 64% rename from .postcssrc.js rename to postcss.config.js index eee3e92..10473ef 100644 --- a/.postcssrc.js +++ b/postcss.config.js @@ -1,10 +1,8 @@ // https://github.com/michael-ciniawsky/postcss-load-config module.exports = { - "plugins": { - "postcss-import": {}, - "postcss-url": {}, + 'plugins': { // to edit target browsers: use "browserslist" field in package.json - "autoprefixer": {} + 'autoprefixer': {} } } diff --git a/log.ico b/public/favicon.ico similarity index 100% rename from log.ico rename to public/favicon.ico diff --git a/index.html b/public/index.html similarity index 98% rename from index.html rename to public/index.html index fc39c87..3fe192a 100644 --- a/index.html +++ b/public/index.html @@ -1,9 +1,11 @@ - + + + nx-admin