Skip to content

Commit acd2b17

Browse files
committed
switch to vite, add pwa
1 parent f3f4c58 commit acd2b17

Some content is hidden

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

66 files changed

+5084
-8829
lines changed

.devcontainer/Dockerfile

+2-1
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,5 @@ FROM mcr.microsoft.com/vscode/devcontainers/javascript-node:0-${VARIANT}
1111
# RUN su node -c "source /usr/local/share/nvm/nvm.sh && nvm install ${EXTRA_NODE_VERSION}"
1212

1313
# [Optional] Uncomment if you want to install more global node modules
14-
RUN su node -c "npm install -g pnpm"
14+
# RUN su node -c "npm install -g pnpm"
15+
RUN su node -c "yarn global add @quasar/icongenie"

.devcontainer/devcontainer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
8080
4949
],
5050
// Use 'postCreateCommand' to run commands after the container is created.
51-
"postCreateCommand": "pnpm install",
51+
"postCreateCommand": "yarn",
5252
// Comment out to connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.
5353
"remoteUser": "node"
5454
}

.eslintignore

-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
/dist
2-
/src-bex/www
32
/src-capacitor
43
/src-cordova
54
/.quasar
65
/node_modules
76
.eslintrc.js
8-
babel.config.js
9-
/src-ssr

.eslintrc.js

+4-29
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,16 @@
1-
21
module.exports = {
32
// https://eslint.org/docs/user-guide/configuring#configuration-cascading-and-hierarchy
43
// This option interrupts the configuration hierarchy at this file
54
// Remove this if you have an higher level ESLint config file (it usually happens into a monorepos)
65
root: true,
76

8-
// https://eslint.vuejs.org/user-guide/#how-to-use-a-custom-parser
9-
// Must use parserOptions instead of "parser" to allow vue-eslint-parser to keep working
10-
// `parser: 'vue-eslint-parser'` is already included with any 'plugin:vue/**' config and should be omitted
117
parserOptions: {
12-
parser: require.resolve('@typescript-eslint/parser'),
13-
extraFileExtensions: [ '.vue' ]
8+
ecmaVersion: '2021', // Allows for the parsing of modern ECMAScript features
149
},
1510

1611
env: {
17-
browser: true,
18-
es2021: true,
1912
node: true,
13+
browser: true,
2014
'vue/setup-compiler-macros': true
2115
},
2216

@@ -25,10 +19,6 @@ module.exports = {
2519
// Base ESLint recommended rules
2620
// 'eslint:recommended',
2721

28-
// https://github.com/typescript-eslint/typescript-eslint/tree/master/packages/eslint-plugin#usage
29-
// ESLint typescript rules
30-
'plugin:@typescript-eslint/recommended',
31-
3222
// Uncomment any of the lines below to choose desired strictness,
3323
// but leave only one uncommented!
3424
// See https://eslint.vuejs.org/rules/#available-rules
@@ -42,12 +32,9 @@ module.exports = {
4232
],
4333

4434
plugins: [
45-
// required to apply rules which need type information
46-
'@typescript-eslint',
47-
4835
// https://eslint.vuejs.org/user-guide/#why-doesn-t-it-work-on-vue-files
4936
// required to lint *.vue files
50-
'vue'
37+
'vue',
5138

5239
// https://github.com/typescript-eslint/typescript-eslint/issues/389#issuecomment-509292674
5340
// Prettier has not been included as plugin to avoid performance impact
@@ -65,26 +52,14 @@ module.exports = {
6552
__QUASAR_SSR_PWA__: 'readonly',
6653
process: 'readonly',
6754
Capacitor: 'readonly',
68-
chrome: 'readonly',
55+
chrome: 'readonly'
6956
},
7057

7158
// add your custom rules here
7259
rules: {
7360

7461
'prefer-promise-reject-errors': 'off',
7562

76-
quotes: ['warn', 'single', { avoidEscape: true }],
77-
78-
// this rule, if on, would require explicit return type on the `render` function
79-
'@typescript-eslint/explicit-function-return-type': 'off',
80-
81-
// in plain CommonJS modules, you can't use `import foo = require('foo')` to pass this rule, so it has to be disabled
82-
'@typescript-eslint/no-var-requires': 'off',
83-
84-
// The core 'no-unused-vars' rules (in the eslint:recommeded ruleset)
85-
// does not work with type definitions
86-
'no-unused-vars': 'off',
87-
8863
// allow debugger during development only
8964
'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off'
9065
}

.gitignore

-7
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
.pnpm-store
2-
.pnpm-debug.log
3-
41
.DS_Store
52
.thumbs.db
63
node_modules
@@ -19,10 +16,6 @@ node_modules
1916
/src-capacitor/www
2017
/src-capacitor/node_modules
2118

22-
# BEX related directories and files
23-
/src-bex/www
24-
/src-bex/js/core
25-
2619
# Log files
2720
npm-debug.log*
2821
yarn-debug.log*

.npmrc

-1
This file was deleted.

.postcssrc.js

-9
This file was deleted.

README.adoc

+1-10
Original file line numberDiff line numberDiff line change
@@ -70,13 +70,4 @@ Once we abstracted what we want to learn from the situation, it's a lot easier f
7070

7171
== Development
7272

73-
Anxtgo is build with https://vuejs.org[Vue.js], https://quasar.dev[Quasar] and https://dexie.org[Dexie.js].
74-
75-
76-
=== https://www.anaconda.com/[Anaconda]
77-
78-
[source,zsh]
79-
----
80-
conda env create -n anxtgo --file environment.yml
81-
conda activate anxtgo
82-
----
73+
Anxtgo is powered by https://vuejs.org[Vue.js], https://quasar.dev[Quasar] and https://dexie.org[Dexie.js].

babel.config.js

-14
This file was deleted.

environment.yml

-14
This file was deleted.

src/index.template.html renamed to index.html

+1-2
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,7 @@
1717
</head>
1818

1919
<body>
20-
<!-- DO NOT touch the following DIV -->
21-
<div id="q-app"></div>
20+
<!-- quasar:entry-point -->
2221
</body>
2322

2423
</html>

jsconfig.json

+39
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
{
2+
"compilerOptions": {
3+
"baseUrl": ".",
4+
"paths": {
5+
"src/*": [
6+
"src/*"
7+
],
8+
"app/*": [
9+
"*"
10+
],
11+
"components/*": [
12+
"src/components/*"
13+
],
14+
"layouts/*": [
15+
"src/layouts/*"
16+
],
17+
"pages/*": [
18+
"src/pages/*"
19+
],
20+
"assets/*": [
21+
"src/assets/*"
22+
],
23+
"boot/*": [
24+
"src/boot/*"
25+
],
26+
"stores/*": [
27+
"src/stores/*"
28+
],
29+
"vue$": [
30+
"node_modules/vue/dist/vue.runtime.esm-bundler.js"
31+
]
32+
}
33+
},
34+
"exclude": [
35+
"dist",
36+
".quasar",
37+
"node_modules"
38+
]
39+
}

package.json

+18-30
Original file line numberDiff line numberDiff line change
@@ -6,53 +6,41 @@
66
"author": "David Wolf <[email protected]>",
77
"private": true,
88
"scripts": {
9-
"lint": "eslint --ext .js,.ts,.vue ./",
10-
"format": "prettier --write \"**/*.{js,ts,vue,,html,md,json}\" --ignore-path .gitignore",
9+
"lint": "eslint --ext .js,.vue ./",
10+
"format": "prettier --write \"**/*.{js,vue,html,md,json}\" --ignore-path .gitignore",
1111
"test": "echo \"No test specified\" && exit 0"
1212
},
1313
"dependencies": {
14-
"@quasar/cli": "^1.3.2",
1514
"@quasar/extras": "^1.0.0",
16-
"@vueuse/rxjs": "^8.2.5",
17-
"chart.js": "^3.7.1",
18-
"core-js": "^3.6.5",
19-
"dexie": "^3.2.1",
15+
"chart.js": "^3.8.0",
16+
"dexie": "^3.2.2",
2017
"dexie-export-import": "^1.0.3",
21-
"dotenv": "^16.0.0",
2218
"downloadjs": "^1.4.7",
23-
"pinia": "^2.0.13",
19+
"pinia": "^2.0.14",
2420
"quasar": "^2.6.0",
2521
"rxjs": "^7.5.5",
2622
"vue": "^3.0.0",
27-
"vue-chartjs": "^4.1.0",
28-
"vue-i18n": "^9.2.0-beta.35",
23+
"vue-chartjs": "^4.1.1",
24+
"vue-i18n": "^9.1.10",
2925
"vue-router": "^4.0.0"
3026
},
3127
"devDependencies": {
32-
"@quasar/app-webpack": "^3.0.0",
33-
"@types/node": "^12.20.21",
34-
"@typescript-eslint/eslint-plugin": "^5.10.0",
35-
"@typescript-eslint/parser": "^5.10.0",
36-
"electron": "^18.1.0",
37-
"electron-packager": "^15.5.1",
28+
"@quasar/app-vite": "^1.0.0",
29+
"autoprefixer": "^10.4.2",
3830
"eslint": "^8.10.0",
3931
"eslint-config-prettier": "^8.1.0",
4032
"eslint-plugin-vue": "^8.5.0",
41-
"prettier": "^2.5.1"
33+
"prettier": "^2.5.1",
34+
"workbox-build": "^6.5.0",
35+
"workbox-cacheable-response": "^6.5.0",
36+
"workbox-core": "^6.5.0",
37+
"workbox-expiration": "^6.5.0",
38+
"workbox-precaching": "^6.5.0",
39+
"workbox-routing": "^6.5.0",
40+
"workbox-strategies": "^6.5.0"
4241
},
43-
"browserslist": [
44-
"last 10 Chrome versions",
45-
"last 10 Firefox versions",
46-
"last 4 Edge versions",
47-
"last 7 Safari versions",
48-
"last 8 Android versions",
49-
"last 8 ChromeAndroid versions",
50-
"last 8 FirefoxAndroid versions",
51-
"last 10 iOS versions",
52-
"last 5 Opera versions"
53-
],
5442
"engines": {
55-
"node": ">= 12.22.1",
43+
"node": "^18 || ^16 || ^14.19",
5644
"npm": ">= 6.13.4",
5745
"yarn": ">= 1.21.1"
5846
}

0 commit comments

Comments
 (0)