Skip to content

Commit 8b382af

Browse files
authored
Merge pull request #31 from zuck/quasar-2.x
Quasar 2.x
2 parents 2040890 + d14ccb7 commit 8b382af

File tree

106 files changed

+24700
-15866
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

106 files changed

+24700
-15866
lines changed

.eslintignore

+2
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,5 @@
44
/src-cordova
55
/.quasar
66
/node_modules
7+
.eslintrc.js
8+
babel.config.js

.eslintrc.js

+22-36
Original file line numberDiff line numberDiff line change
@@ -5,68 +5,54 @@ module.exports = {
55
root: true,
66

77
parserOptions: {
8-
parser: 'babel-eslint',
8+
parser: "@babel/eslint-parser",
99
ecmaVersion: 2018, // Allows for the parsing of modern ECMAScript features
10-
sourceType: 'module' // Allows for the use of imports
10+
sourceType: "module", // Allows for the use of imports
1111
},
1212

1313
env: {
14-
browser: true
14+
browser: true,
1515
},
1616

1717
// Rules order is important, please avoid shuffling them
1818
extends: [
1919
// Base ESLint recommended rules
2020
// 'eslint:recommended',
2121

22-
2322
// Uncomment any of the lines below to choose desired strictness,
2423
// but leave only one uncommented!
2524
// See https://eslint.vuejs.org/rules/#available-rules
26-
'plugin:vue/essential', // Priority A: Essential (Error Prevention)
27-
// 'plugin:vue/strongly-recommended', // Priority B: Strongly Recommended (Improving Readability)
28-
// 'plugin:vue/recommended', // Priority C: Recommended (Minimizing Arbitrary Choices and Cognitive Overhead)
29-
30-
'standard'
25+
"plugin:vue/vue3-essential", // Priority A: Essential (Error Prevention)
26+
// 'plugin:vue/vue3-strongly-recommended', // Priority B: Strongly Recommended (Improving Readability)
27+
// 'plugin:vue/vue3-recommended', // Priority C: Recommended (Minimizing Arbitrary Choices and Cognitive Overhead)
3128

29+
"prettier",
3230
],
3331

3432
plugins: [
3533
// https://eslint.vuejs.org/user-guide/#why-doesn-t-it-work-on-vue-file
3634
// required to lint *.vue files
37-
'vue',
38-
35+
"vue",
3936
],
4037

4138
globals: {
42-
ga: true, // Google Analytics
43-
cordova: true,
44-
__statics: true,
45-
process: true,
46-
Capacitor: true,
47-
chrome: true
39+
ga: "readonly", // Google Analytics
40+
cordova: "readonly",
41+
__statics: "readonly",
42+
__QUASAR_SSR__: "readonly",
43+
__QUASAR_SSR_SERVER__: "readonly",
44+
__QUASAR_SSR_CLIENT__: "readonly",
45+
__QUASAR_SSR_PWA__: "readonly",
46+
process: "readonly",
47+
Capacitor: "readonly",
48+
chrome: "readonly",
4849
},
4950

5051
// add your custom rules here
5152
rules: {
52-
// allow async-await
53-
'generator-star-spacing': 'off',
54-
// allow paren-less arrow functions
55-
'arrow-parens': 'off',
56-
'one-var': 'off',
57-
58-
'import/first': 'off',
59-
'import/named': 'error',
60-
'import/namespace': 'error',
61-
'import/default': 'error',
62-
'import/export': 'error',
63-
'import/extensions': 'off',
64-
'import/no-unresolved': 'off',
65-
'import/no-extraneous-dependencies': 'off',
66-
'prefer-promise-reject-errors': 'off',
67-
53+
"prefer-promise-reject-errors": "off",
6854

6955
// allow debugger during development only
70-
'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off'
71-
}
72-
}
56+
"no-debugger": process.env.NODE_ENV === "production" ? "error" : "off",
57+
},
58+
};

.github/ISSUE_TEMPLATE/bug_report.md

-38
This file was deleted.

.github/ISSUE_TEMPLATE/feature_request.md

-20
This file was deleted.

.github/workflows/shiftleft.yml

-54
This file was deleted.

.stylintrc

-35
This file was deleted.

.vscode/launch.json

-15
This file was deleted.

babel.config.js

+13-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,15 @@
11

2-
module.exports = {
3-
presets: [
4-
'@quasar/babel-preset-app'
5-
]
2+
3+
module.exports = api => {
4+
return {
5+
presets: [
6+
[
7+
'@quasar/babel-preset-app',
8+
api.caller(caller => caller && caller.target === 'node')
9+
? { targets: { node: 'current' } }
10+
: {}
11+
]
12+
]
13+
}
614
}
15+

jsconfig.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
"src/boot/*"
2525
],
2626
"vue$": [
27-
"node_modules/vue/dist/vue.esm.js"
27+
"node_modules/vue/dist/vue.runtime.esm-bundler.js"
2828
]
2929
}
3030
},
@@ -33,4 +33,4 @@
3333
".quasar",
3434
"node_modules"
3535
]
36-
}
36+
}

0 commit comments

Comments
 (0)