Skip to content

update to babel 7.9 vuetify-cli 2.0 #91

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 14 additions & 6 deletions .eslintrc.js
Original file line number Diff line number Diff line change
@@ -11,31 +11,39 @@ module.exports = {
'comma-dangle': ['error', 'always-multiline'],
'array-element-newline': [
'error', {
"multiline": true,
"minItems": 2,
multiline: true,
minItems: 2,
},
],
'array-bracket-newline': [
'error', {
"multiline": true,
"minItems": 2,
multiline: true,
minItems: 2,
},
],
'array-bracket-spacing': ['error', 'never'],
'object-curly-newline': [
'error', {
'consistent': true,
consistent: true,
},
],
'object-curly-spacing': ['error', 'always'],
},

parser: "vue-eslint-parser",

parserOptions: {
parser: 'babel-eslint',
parser: "babel-eslint",
sourceType: "module",
ecmaVersion: 2017,
},

extends: [
'plugin:vue/essential',
'@vue/standard',
],

plugins: [
'vue',
],
}
11 changes: 10 additions & 1 deletion babel.config.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,12 @@
module.exports = {
presets: ['@vue/app'],
presets: [
[
'@babel/preset-env',
{
useBuiltIns: 'usage',
corejs: 3,
},
],
// '@vue/app',
],
}
2 changes: 1 addition & 1 deletion examples/cms/config/crud.js
Original file line number Diff line number Diff line change
@@ -17,7 +17,7 @@ export default {
return param.substring(0, 10)
},
timeFromTimestamp: (param) => {
let tmp = param || ''
const tmp = param || ''
return tmp.substring(0, 5)
},
datetimeFromTimestamp: (param) => {
1 change: 1 addition & 0 deletions examples/cms/registerServiceWorker.js
Original file line number Diff line number Diff line change
@@ -7,6 +7,7 @@ if (process.env.NODE_ENV === 'production') {
ready () {
console.log(
'App is being served from cache by a service worker.\n' +
// eslint-disable-next-line comma-dangle
'For more details, visit https://goo.gl/AFskqB'
)
},
2 changes: 1 addition & 1 deletion examples/cms/routes/app/Index.vue
Original file line number Diff line number Diff line change
@@ -201,7 +201,7 @@ export default {
'userInfo',
]),
year () {
let year = new Date()
const year = new Date()
return year.getFullYear()
},
},
2 changes: 1 addition & 1 deletion examples/cms/routes/app/router.js
Original file line number Diff line number Diff line change
@@ -8,7 +8,7 @@ import storeRoutes from './routes/store/router'
import Administration from './routes/administration/Index.vue'
import administrationRoutes from './routes/administration/router'

let appRoutes = [
const appRoutes = [
{
path: 'home',
name: 'home',
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
let actions = {
const actions = {
// permissions

// user permissions
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
let getters = {
const getters = {
// permissions

// user permissions
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@ import getters from './getters'
import mutations from './mutations'
import actions from './actions'

let administration = {
const administration = {
namespaced: true,
state,
getters,
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
let mutations = {
const mutations = {
// permissions

// user permissions
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
let state = {
const state = {
// permissions

// user permissions
2 changes: 1 addition & 1 deletion examples/cms/routes/app/routes/blog/store/actions.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
let actions = {
const actions = {
}

export default actions
2 changes: 1 addition & 1 deletion examples/cms/routes/app/routes/blog/store/getters.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
let getters = {
const getters = {
}

export default getters
2 changes: 1 addition & 1 deletion examples/cms/routes/app/routes/blog/store/index.js
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@ import getters from './getters'
import mutations from './mutations'
import actions from './actions'

let blog = {
const blog = {
namespaced: true,
state,
getters,
2 changes: 1 addition & 1 deletion examples/cms/routes/app/routes/blog/store/mutations.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
let mutations = {
const mutations = {

}
export default mutations
2 changes: 1 addition & 1 deletion examples/cms/routes/app/routes/blog/store/state.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
let state = {
const state = {

}

2 changes: 1 addition & 1 deletion examples/cms/routes/app/routes/cms/store/actions.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
let actions = {
const actions = {
}

export default actions
2 changes: 1 addition & 1 deletion examples/cms/routes/app/routes/cms/store/getters.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
let getters = {
const getters = {
}

export default getters
2 changes: 1 addition & 1 deletion examples/cms/routes/app/routes/cms/store/index.js
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@ import getters from './getters'
import mutations from './mutations'
import actions from './actions'

let cms = {
const cms = {
namespaced: true,
state,
getters,
2 changes: 1 addition & 1 deletion examples/cms/routes/app/routes/cms/store/mutations.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
let mutations = {
const mutations = {

}
export default mutations
2 changes: 1 addition & 1 deletion examples/cms/routes/app/routes/cms/store/state.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
let state = {
const state = {

}

2 changes: 1 addition & 1 deletion examples/cms/routes/app/routes/store/router.js
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@ import TransactionProducts from './routes/transaction-products/Index.vue'
import Transactions from './routes/transactions/Index.vue'
import Customers from './routes/customers/Index.vue'

let storeRoutes = [
const storeRoutes = [
{
path: 'sections',
name: 'store-sections',
2 changes: 1 addition & 1 deletion examples/cms/routes/app/routes/store/store/actions.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
let actions = {
const actions = {
}

export default actions
2 changes: 1 addition & 1 deletion examples/cms/routes/app/routes/store/store/getters.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
let getters = {
const getters = {
}

export default getters
2 changes: 1 addition & 1 deletion examples/cms/routes/app/routes/store/store/index.js
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@ import getters from './getters'
import mutations from './mutations'
import actions from './actions'

let store = {
const store = {
namespaced: true,
state,
getters,
2 changes: 1 addition & 1 deletion examples/cms/routes/app/routes/store/store/mutations.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
let mutations = {
const mutations = {

}
export default mutations
2 changes: 1 addition & 1 deletion examples/cms/routes/app/routes/store/store/state.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
let state = {
const state = {

}

2 changes: 1 addition & 1 deletion examples/crm/config/crud.js
Original file line number Diff line number Diff line change
@@ -17,7 +17,7 @@ export default {
return param.substring(0, 10)
},
timeFromTimestamp: (param) => {
let tmp = param || ''
const tmp = param || ''
return tmp.substring(0, 5)
},
datetimeFromTimestamp: (param) => {
1 change: 1 addition & 0 deletions examples/crm/registerServiceWorker.js
Original file line number Diff line number Diff line change
@@ -7,6 +7,7 @@ if (process.env.NODE_ENV === 'production') {
ready () {
console.log(
'App is being served from cache by a service worker.\n' +
// eslint-disable-next-line comma-dangle
'For more details, visit https://goo.gl/AFskqB'
)
},
2 changes: 1 addition & 1 deletion examples/crm/routes/app/Index.vue
Original file line number Diff line number Diff line change
@@ -175,7 +175,7 @@ export default {
'userInfo',
]),
year () {
let year = new Date()
const year = new Date()
return year.getFullYear()
},
},
2 changes: 1 addition & 1 deletion examples/crm/routes/app/router.js
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@ import crmRoutes from './routes/crm/router'
import Administration from './routes/administration/Index.vue'
import administrationRoutes from './routes/administration/router'

let appRoutes = [
const appRoutes = [
{
path: 'home',
name: 'home',
2 changes: 1 addition & 1 deletion examples/crm/routes/app/routes/administration/router.js
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@ import Users from './routes/users/Index.vue'
import Permissions from './routes/permissions/Index.vue'
import UserPermissions from './routes/user-permissions/Index.vue'

let administrationRoutes = [
const administrationRoutes = [
{
path: 'users',
name: 'users',
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
let actions = {
const actions = {
// permissions

// user permissions
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
let getters = {
const getters = {
// permissions

// user permissions
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@ import getters from './getters'
import mutations from './mutations'
import actions from './actions'

let administration = {
const administration = {
namespaced: true,
state,
getters,
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
let mutations = {
const mutations = {
// permissions

// user permissions
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
let state = {
const state = {
// permissions

// user permissions
2 changes: 1 addition & 1 deletion examples/crm/routes/app/routes/crm/router.js
Original file line number Diff line number Diff line change
@@ -17,7 +17,7 @@ import PersonCommentTypes from './routes/person-comment-types/Index.vue'

import Tasks from './routes/tasks/Index.vue'

let crmRoutes = [
const crmRoutes = [
{
path: 'companies',
name: 'companies',
2 changes: 1 addition & 1 deletion examples/crm/routes/app/routes/crm/store/actions.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
let actions = {}
const actions = {}

export default actions
2 changes: 1 addition & 1 deletion examples/crm/routes/app/routes/crm/store/getters.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
let getters = {}
const getters = {}

export default getters
2 changes: 1 addition & 1 deletion examples/crm/routes/app/routes/crm/store/index.js
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@ import getters from './getters'
import mutations from './mutations'
import actions from './actions'

let crm = {
const crm = {
namespaced: true,
state,
getters,
2 changes: 1 addition & 1 deletion examples/crm/routes/app/routes/crm/store/mutations.js
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
let mutations = {}
const mutations = {}
export default mutations
2 changes: 1 addition & 1 deletion examples/crm/routes/app/routes/crm/store/state.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
let state = {}
const state = {}

export default state
23 changes: 22 additions & 1 deletion examples/empty/config/main.js
Original file line number Diff line number Diff line change
@@ -1 +1,22 @@
export default {}
export default {
title: 'Your App',
locales: [
{
name: 'en',
text: 'English',
},
],
defaultLocale: 'en',
iconfont: 'md',
primaryTheme: 'dark',
secondaryTheme: 'dark',
theme: {
primary: '#AB47BC',
secondary: '#424242',
accent: '#82B1FF',
error: '#FF5252',
info: '#2196F3',
success: '#4CAF50',
warning: '#FFC107',
},
}
6 changes: 3 additions & 3 deletions examples/sandbox/routes/App.vue
Original file line number Diff line number Diff line change
@@ -514,9 +514,9 @@ export default {
title="${this.toolbarTitle}"
titleLink="${this.toolbarTitleLink}" ${this.toolbarShowLogo ? `
logo="${this.toolbarLogo}"` : `
:showLogo="false"`} ${this.toolbarProfileBtn ? `` : `
:profileBtn="false"`} ${this.toolbarLocalesBtn ? `` : `
:loclesBtn="false"`} ${this.toolbarLogoutBtn ? `` : `
:showLogo="false"`} ${this.toolbarProfileBtn ? '' : `
:profileBtn="false"`} ${this.toolbarLocalesBtn ? '' : `
:loclesBtn="false"`} ${this.toolbarLogoutBtn ? '' : `
:logoutBtn="false"`}
> ${this.toolbarLeftSlot ? `
<template slot="left" v-if="toolbarLeftSlot">
4 changes: 2 additions & 2 deletions examples/sandbox/routes/Crud.vue
Original file line number Diff line number Diff line change
@@ -605,8 +605,8 @@ export default {
]
},
buttons () {
let obj1 = this.showButton1 ? this.button1 : []
let obj2 = this.showButton2 ? this.button2 : []
const obj1 = this.showButton1 ? this.button1 : []
const obj2 = this.showButton2 ? this.button2 : []
return [
...obj1,
...obj2,
Loading