Skip to content

Commit

Permalink
Merge pull request epicmaxco#684 from Kreezag/fix/ie11-not-work
Browse files Browse the repository at this point in the history
Fix working in IE11
  • Loading branch information
Kreezag authored Nov 28, 2019
2 parents 28ee6af + 21d2def commit 765eaf6
Show file tree
Hide file tree
Showing 24 changed files with 3,138 additions and 3,870 deletions.
2 changes: 1 addition & 1 deletion .browserslistrc
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
> 1%
last 2 versions
not ie <= 8
ie 11
8 changes: 4 additions & 4 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ module.exports = {
env: {
node: true,
},
'extends': [
'plugin:vue/essential',
extends: [
'@vue/standard',
'plugin:vue/essential',
],
rules: {
'no-console': process.env.NODE_ENV === 'production' ? 'error' : 'off',
Expand All @@ -17,6 +17,6 @@ module.exports = {
parser: 'babel-eslint',
},
globals: {
'workbox': 'readonly'
}
'workbox': 'readonly',
},
}
7 changes: 5 additions & 2 deletions babel.config.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
module.exports = {
presets: [
presets: [[
'@vue/app',
],
{
'useBuiltIns': 'entry',
},
]],
}
81 changes: 38 additions & 43 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,67 +16,62 @@
"@types/jest": "^24.0.11",
"amcharts3": "^3.21.14",
"ammap3": "^3.21.14",
"approximate-number": "^2.0.0",
"asva-executors": "^0.1.22",
"babel-polyfill": "^6.26.0",
"chart.js": "^2.6.0",
"detect-browser": "^4.6.0",
"element-resize-detector": "^1.1.12",
"chart.js": "^2.9.3",
"core-js": "3",
"detect-browser": "^4.8.0",
"element-resize-detector": "^1.1.15",
"epic-spinners": "^1.1.0",
"es6-promise": "^4.2.5",
"extend": "3.0.2",
"flag-icon-css": "^3.0.0",
"flag-icon-css": "^3.4.5",
"font-awesome": "^4.7.0",
"google-maps": "^3.3.0",
"ionicons": "^3.0.0",
"ionicons": "^4.6.3",
"leaflet-map": "^0.2.1",
"lodash": "4.17.15",
"medium-editor": "^5.23.3",
"normalize.css": "^8.0.1",
"popper.js": "^1.15.0",
"popper.js": "^1.16.0",
"regenerator-runtime": "^0.13.3",
"register-service-worker": "^1.6.2",
"v-tooltip": "^2.0.0-rc.30",
"vee-validate": "^2.2.13",
"v-tooltip": "^2.0.2",
"vue": "^2.6.10",
"vue-bulma-expanding": "0.0.1",
"vue-chartjs": "^3.4.0",
"vue-clipboard2": "^0.3.0",
"vue-color": "^2.7.0",
"vue-epic-bus": "^0.1.5",
"vue-gtm": "^2.0.0",
"vue-router": "^3.0.6",
"vue-yandex-maps": "^0.8.14",
"vuestic-ui": "0.1.8",
"vuetable-2": "1.7.5",
"vuex": "^3.1.0",
"vue-clipboard2": "^0.3.1",
"vue-gtm": "^2.2.0",
"vue-router": "^3.1.3",
"vue-yandex-maps": "^0.9.0",
"vuestic-ui": "^0.1.8",
"vuetable-2": "^1.7.5",
"vuex": "^3.1.2",
"vuex-i18n": "^1.13.1",
"vuex-router-sync": "5.0.0"
"vuex-router-sync": "^5.0.0"
},
"devDependencies": {
"@vue/cli-plugin-babel": "^3.10.0",
"@vue/cli-plugin-eslint": "^3.10.0",
"@vue/cli-plugin-pwa": "^3.11.0",
"@vue/cli-plugin-unit-jest": "^3.10.0",
"@vue/cli-service": "^3.10.0",
"@vue/eslint-config-standard": "^4.0.0",
"@vue/test-utils": "^1.0.0-beta.20",
"autoprefixer": "9.6.1",
"babel-core": "7.0.0-bridge.0",
"babel-jest": "^24.7.1",
"copy-webpack-plugin": "5.0.4",
"extract-text-webpack-plugin": "3.0.2",
"file-loader": "4.1.0",
"@vue/cli-plugin-babel": "^4.0.5",
"@vue/cli-plugin-eslint": "^4.0.5",
"@vue/cli-plugin-pwa": "^4.0.5",
"@vue/cli-plugin-unit-jest": "^4.0.5",
"@vue/cli-service": "^4.0.5",
"@vue/eslint-config-standard": "^5.0.0",
"@vue/test-utils": "^1.0.0-beta.29",
"autoprefixer": "^9.7.2",
"babel-eslint": "^10.0.3",
"babel-jest": "^24.9.0",
"eslint": "^6.7.1",
"eslint-plugin-import": "^2.18.2",
"eslint-plugin-node": "^10.0.0",
"eslint-plugin-promise": "^4.2.1",
"eslint-plugin-standard": "^4.0.1",
"eslint-plugin-vue": "^6.0.1",
"lint-staged": "^9.2.1",
"node-sass": "^4.9.0",
"optimize-css-assets-webpack-plugin": "5.0.3",
"sass-loader": "^7.0.1",
"node-sass": "^4.13.0",
"sass-loader": "^7.3.1",
"sass-resources-loader": "^2.0.1",
"stylelint": "^11.0.0",
"stylelint-config-recommended-scss": "^4.0.0",
"stylelint": "^12.0.0",
"stylelint-config-recommended-scss": "^4.1.0",
"stylelint-config-standard": "^19.0.0",
"stylelint-scss": "^3.11.1",
"stylelint-scss": "^3.13.0",
"stylelint-webpack-plugin": "^1.0.1",
"vue-book": "0.1.0-alpha.17",
"vue-template-compiler": "^2.6.10"
},
"engines": {
Expand Down
12 changes: 4 additions & 8 deletions src/app/main.js
Original file line number Diff line number Diff line change
@@ -1,25 +1,21 @@
// Polyfills
import 'es6-promise/auto'
import 'babel-polyfill'
import 'core-js/stable'
import 'regenerator-runtime/runtime'
// The Vue build version to load with the `import` command
// (runtime-only or standalone) has been set in webpack.base.conf with an alias.
import Vue from 'vue'
import App from './App'
import { ColorThemePlugin } from 'vuestic-ui/src/services/ColorThemePlugin'
import { ColorThemePlugin } from '../services/vuestic-ui'
import store from '../store/index'
import router from '../router/index'
import VuesticPlugin from 'vuestic-ui/src/components/vuestic-plugin'
import { VuesticPlugin } from '../services/vuestic-ui/components'
import '../i18n/index'
import YmapPlugin from 'vue-yandex-maps'
import VueClipboard from 'vue-clipboard2'
import VeeValidate from 'vee-validate'

import '../metrics'
import '../registerServiceWorker'

// NOTE: workaround for VeeValidate + vuetable-2
Vue.use(VeeValidate, { fieldsBagName: 'formFields' })

Vue.use(VuesticPlugin)
Vue.use(YmapPlugin)
Vue.use(VueClipboard)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@
</template>

<script>
import { colorArray } from 'vuestic-ui/src/components/vuestic-components/va-color-picker/VuesticTheme'
import { colorArray } from '../../../../../services/vuestic-ui/components'
let themeCache = {}
Expand Down
3 changes: 1 addition & 2 deletions src/components/admin/app-topbar/components/TopbarLink.vue
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,7 @@
</template>

<script>
import { getHoverColor } from './../../../../services/color-functions'
import { ColorThemeMixin } from '../../../../services/ColorThemePlugin'
import { getHoverColor, ColorThemeMixin } from './../../../../services/vuestic-ui'
export default {
name: 'topbar-link',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
<script>
import SidebarLink from './TopbarLink'
import Expanding from 'vue-bulma-expanding/src/Expanding'
import { getHoverColor } from './../../../../services/color-functions'
import { getHoverColor } from './../../../../services/vuestic-ui'
export default {
name: 'topbar-link-group',
Expand Down
2 changes: 1 addition & 1 deletion src/components/ui/chat/Chat.vue
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
</template>

<script>
import StickyScroll from 'vuestic-ui/src/components/vuestic-directives/StickyScroll'
import { StickyScroll } from '../../../services/vuestic-ui/components'
export default {
name: 'chat',
Expand Down
2 changes: 1 addition & 1 deletion src/data/charts/BubbleChartData.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { hex2rgb } from '../../services/color-functions'
import { hex2rgb } from '../../services/vuestic-ui'

export const getBubbleChartData = (themes) => ({
datasets: [
Expand Down
2 changes: 1 addition & 1 deletion src/data/charts/LineChartData.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { hex2rgb } from '../../services/color-functions'
import { hex2rgb } from '../../services/vuestic-ui'

const generateValue = () => {
return Math.floor(Math.random() * 100)
Expand Down
4 changes: 0 additions & 4 deletions src/router/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,6 @@ const EmptyParentComponent = {
}

const demoRoutes = []
if (process.env.NODE_ENV === 'development' || process.env.VUE_APP_INCLUDE_DEMOS) {
const vueBookRoutes = require('./vueBookRoutes').default
vueBookRoutes.forEach(route => demoRoutes.push(route))
}

export default new Router({
mode: process.env.VUE_APP_ROUTER_MODE_HISTORY === 'true' ? 'history' : 'hash',
Expand Down
15 changes: 0 additions & 15 deletions src/router/vueBookRoutes.js

This file was deleted.

4 changes: 1 addition & 3 deletions src/sass/main.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,2 @@
@import "~vuestic-ui/src/components/vuestic-sass/global/reset.scss";
@import "~vuestic-ui/src/components/vuestic-sass/global/normalize.scss";
@import "~vuestic-ui/src/components/vuestic-sass/vuestic-styles";
@import "../services/vuestic-ui/styles";
@import './icons/icons.scss';
21 changes: 0 additions & 21 deletions src/services/ColorThemePlugin-docs.md

This file was deleted.

58 changes: 0 additions & 58 deletions src/services/ColorThemePlugin.js

This file was deleted.

Loading

0 comments on commit 765eaf6

Please sign in to comment.