Skip to content
This repository has been archived by the owner on Apr 8, 2021. It is now read-only.

Commit

Permalink
Merge branch 'dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
hawkeye64 committed May 3, 2019
2 parents 365f192 + 186b644 commit 1d90f77
Show file tree
Hide file tree
Showing 6 changed files with 506 additions and 338 deletions.
9 changes: 9 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
root = true

[*]
charset = utf-8
indent_style = space
indent_size = 2
end_of_line = lf
insert_final_newline = true
trim_trailing_whitespace = true
55 changes: 55 additions & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
module.exports = {
root: true,

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

env: {
browser: true
},

extends: [
// https://github.com/vuejs/eslint-plugin-vue#priority-a-essential-error-prevention
// consider switching to `plugin:vue/strongly-recommended` or `plugin:vue/recommended` for stricter rules.
'plugin:vue/essential',
'@vue/standard'
],

// required to lint *.vue files
plugins: [
'vue'
],

globals: {
'ga': true, // Google Analytics
'cordova': true,
'__statics': true,
'process': true
},

// add your custom rules here
rules: {
// allow async-await
'generator-star-spacing': 'off',
// allow paren-less arrow functions
'arrow-parens': 'off',
'one-var': 'off',

'import/first': 'off',
'import/named': 'error',
'import/namespace': 'error',
'import/default': 'error',
'import/export': 'error',
'import/extensions': 'off',
'import/no-unresolved': 'off',
'import/no-extraneous-dependencies': 'off',
'prefer-promise-reject-errors': 'off',

// allow console.log during development only
'no-console': process.env.NODE_ENV === 'production' ? 'error' : 'off',
// allow debugger during development only
'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off'
}
}
5 changes: 5 additions & 0 deletions .npmignore
Original file line number Diff line number Diff line change
@@ -1 +1,6 @@
demo
docs
.git
npm-debug.log*
yarn-debug.log*
yarn-error.log*
6 changes: 3 additions & 3 deletions demo/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@
"test": "echo \"No test specified\" && exit 0"
},
"dependencies": {
"@quasar/extras": "^1.1.1",
"quasar": "^1.0.0-beta.14"
"@quasar/extras": "^1.1.2",
"quasar": "^1.0.0-beta.20"
},
"devDependencies": {
"@quasar/app": "^1.0.0-beta.15",
"@quasar/app": "^1.0.0-beta.22",
"@quasar/quasar-app-extension-dotenv": "link:../.",
"@vue/eslint-config-standard": "^4.0.0",
"babel-eslint": "^10.0.1",
Expand Down
Loading

0 comments on commit 1d90f77

Please sign in to comment.