Skip to content

Commit a1a51b1

Browse files
hipertrackerhipertracker
committed
fix Context import and upgrade to Quasar 2.0beta12
1 parent c61a299 commit a1a51b1

File tree

4 files changed

+97
-95
lines changed

4 files changed

+97
-95
lines changed

‎package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@
1515
"core-js": "^3.6.5",
1616
"overmind": "^27.0.0",
1717
"overmind-vue": "^27.0.0",
18-
"quasar": "^2.0.0-beta.1",
18+
"quasar": "^2.0.0-beta.12",
1919
"vue-i18n": "^9.0.0-beta.0"
2020
},
2121
"devDependencies": {
22-
"@quasar/app": "^3.0.0-beta.1",
22+
"@quasar/app": "^3.0.0-beta.12",
2323
"@types/node": "^10.17.15",
2424
"@typescript-eslint/eslint-plugin": "^4.16.1",
2525
"@typescript-eslint/parser": "^4.16.1",

‎src/overmind/actions.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { Context } from 'overmind';
1+
import { Context } from '../overmind';
22

33
export const inc = ({ state }: Context): void => {
44
state.counter += 1;

‎src/overmind/index.ts‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
1-
import { IConfig, IOnInitialize, IContext } from 'overmind';
2-
import { createHooks } from 'overmind-vue/vue3';
1+
import * as actions from './actions';
2+
3+
import { IConfig, IContext, IOnInitialize } from 'overmind';
34

5+
import { createHooks } from 'overmind-vue/vue3';
46
import { state } from './state';
5-
import * as actions from './actions';
67

78
export const config = {
89
state,
910
actions,
11+
effects: {},
1012
};
1113

1214
// Due to circular typing we have to define an
@@ -15,7 +17,7 @@ export const config = {
1517
export type Config = IConfig<{
1618
state: typeof config.state;
1719
actions: typeof config.actions;
18-
// effects: typeof config.effects;
20+
effects: typeof config.effects;
1921
}>;
2022

2123
export type OnInitialize = IOnInitialize<Config>;

‎yarn.lock‎

Lines changed: 88 additions & 88 deletions
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,7 @@
258258
chalk "^2.0.0"
259259
js-tokens "^4.0.0"
260260

261-
"@babel/parser@^7.12.0", "@babel/parser@^7.12.13", "@babel/parser@^7.13.13", "@babel/parser@^7.7.0":
261+
"@babel/parser@^7.12.0", "@babel/parser@^7.12.13", "@babel/parser@^7.13.13", "@babel/parser@^7.13.9", "@babel/parser@^7.7.0":
262262
version "7.13.13"
263263
resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.13.13.tgz#42f03862f4aed50461e543270916b47dd501f0df"
264264
integrity sha512-OhsyMrqygfk5v8HmWwOzlYjJrtLaFhF34MrfG/Z73DgYCI6ojNUTUp2TYbtnjo8PegeJp12eamsNettCQjKjVw==
@@ -1012,10 +1012,10 @@
10121012
resolved "https://registry.yarnpkg.com/@positron/stack-trace/-/stack-trace-1.0.0.tgz#14fcc712a530038ef9be1ce6952315a839f466a8"
10131013
integrity sha1-FPzHEqUwA475vhzmlSMVqDn0Zqg=
10141014

1015-
"@quasar/app@^3.0.0-beta.1":
1016-
version "3.0.0-beta.10"
1017-
resolved "https://registry.yarnpkg.com/@quasar/app/-/app-3.0.0-beta.10.tgz#f4401fa64f9f94b7e643560fb8968f3f7250578d"
1018-
integrity sha512-KC5dmW7hOJ0x634vgyb98cjjia2Mj0BySgq1JghMGiCqq3noF6E9DS9UoF3ru9HUVRUtxfLe73Su8V0s1UoQZg==
1015+
"@quasar/app@^3.0.0-beta.12":
1016+
version "3.0.0-beta.12"
1017+
resolved "https://registry.yarnpkg.com/@quasar/app/-/app-3.0.0-beta.12.tgz#2fbcedbe5117fd70efe0c4fc50602103e76cae5e"
1018+
integrity sha512-hHyyvBojMI9dnfSRcEsvJTCGCNXC0Xd3QrptZVurRhDTgYGwdnkWi7dKs9BEqQDQu7BL2Vmm9BwJOmhmM41xEQ==
10191019
dependencies:
10201020
"@quasar/babel-preset-app" "2.0.1"
10211021
"@quasar/fastclick" "1.1.4"
@@ -1027,8 +1027,8 @@
10271027
"@types/webpack" "4.41.26"
10281028
"@types/webpack-bundle-analyzer" "3.9.1"
10291029
"@types/webpack-dev-server" "3.11.2"
1030-
"@vue/compiler-sfc" "3.0.6"
1031-
"@vue/server-renderer" "3.0.6"
1030+
"@vue/compiler-sfc" "3.0.11"
1031+
"@vue/server-renderer" "3.0.11"
10321032
archiver "5.2.0"
10331033
autoprefixer "9.8.6"
10341034
browserslist "^4.12.0"
@@ -1079,10 +1079,10 @@
10791079
ts-loader "8.0.17"
10801080
typescript "4.2.2"
10811081
url-loader "4.1.1"
1082-
vue "3.0.6"
1083-
vue-loader "16.1.2"
1084-
vue-router "4.0.3"
1085-
vue-style-loader "4.1.2"
1082+
vue "3.0.11"
1083+
vue-loader "16.2.0"
1084+
vue-router "4.0.5"
1085+
vue-style-loader "4.1.3"
10861086
vuex "4.0.0"
10871087
webpack "4.44.1"
10881088
webpack-bundle-analyzer "4.4.0"
@@ -1472,36 +1472,36 @@
14721472
"@typescript-eslint/types" "4.20.0"
14731473
eslint-visitor-keys "^2.0.0"
14741474

1475-
"@vue/[email protected].6":
1476-
version "3.0.6"
1477-
resolved "https://registry.yarnpkg.com/@vue/compiler-core/-/compiler-core-3.0.6.tgz#265bbe0711a81ab4c1344f8294e22e2d08ca167d"
1478-
integrity sha512-O7QzQ39DskOoPpEDWRvKwDX7Py9UNT7SvLHvBdIfckGA3OsAEBdiAtuYQNcVmUDeBajm+08v5wyvHWBbWgkilQ==
1475+
"@vue/[email protected].11":
1476+
version "3.0.11"
1477+
resolved "https://registry.yarnpkg.com/@vue/compiler-core/-/compiler-core-3.0.11.tgz#5ef579e46d7b336b8735228758d1c2c505aae69a"
1478+
integrity sha512-6sFj6TBac1y2cWCvYCA8YzHJEbsVkX7zdRs/3yK/n1ilvRqcn983XvpBbnN3v4mZ1UiQycTvOiajJmOgN9EVgw==
14791479
dependencies:
14801480
"@babel/parser" "^7.12.0"
14811481
"@babel/types" "^7.12.0"
1482-
"@vue/shared" "3.0.6"
1482+
"@vue/shared" "3.0.11"
14831483
estree-walker "^2.0.1"
14841484
source-map "^0.6.1"
14851485

1486-
"@vue/[email protected].6":
1487-
version "3.0.6"
1488-
resolved "https://registry.yarnpkg.com/@vue/compiler-dom/-/compiler-dom-3.0.6.tgz#f94c3959320a1252915bd02b943f96a7ee3fc951"
1489-
integrity sha512-q1wfHzYwvDRAhBlx+Qa+n3Bu5nHr1qL/j0UbpNlbQDwIlt9zpvmXUrUCL+i55Bh5lLKvSe+mNo0qlwNEApm+jA==
1486+
"@vue/[email protected].11":
1487+
version "3.0.11"
1488+
resolved "https://registry.yarnpkg.com/@vue/compiler-dom/-/compiler-dom-3.0.11.tgz#b15fc1c909371fd671746020ba55b5dab4a730ee"
1489+
integrity sha512-+3xB50uGeY5Fv9eMKVJs2WSRULfgwaTJsy23OIltKgMrynnIj8hTYY2UL97HCoz78aDw1VDXdrBQ4qepWjnQcw==
14901490
dependencies:
1491-
"@vue/compiler-core" "3.0.6"
1492-
"@vue/shared" "3.0.6"
1491+
"@vue/compiler-core" "3.0.11"
1492+
"@vue/shared" "3.0.11"
14931493

1494-
"@vue/[email protected].6":
1495-
version "3.0.6"
1496-
resolved "https://registry.yarnpkg.com/@vue/compiler-sfc/-/compiler-sfc-3.0.6.tgz#3945f73a93d52868799f1e332a75bb8849976ac9"
1497-
integrity sha512-g1tkswnhtiJpj4ELQ3SzeGxtOd0t8E5GkT+n2VlElEnTI1BzueSvr41D5QthnUS+TNWZd52ZnPtdaNz+Lfum1w==
1494+
"@vue/[email protected].11":
1495+
version "3.0.11"
1496+
resolved "https://registry.yarnpkg.com/@vue/compiler-sfc/-/compiler-sfc-3.0.11.tgz#cd8ca2154b88967b521f5ad3b10f5f8b6b665679"
1497+
integrity sha512-7fNiZuCecRleiyVGUWNa6pn8fB2fnuJU+3AGjbjl7r1P5wBivfl02H4pG+2aJP5gh2u+0wXov1W38tfWOphsXw==
14981498
dependencies:
1499-
"@babel/parser" "^7.12.0"
1500-
"@babel/types" "^7.12.0"
1501-
"@vue/compiler-core" "3.0.6"
1502-
"@vue/compiler-dom" "3.0.6"
1503-
"@vue/compiler-ssr" "3.0.6"
1504-
"@vue/shared" "3.0.6"
1499+
"@babel/parser" "^7.13.9"
1500+
"@babel/types" "^7.13.0"
1501+
"@vue/compiler-core" "3.0.11"
1502+
"@vue/compiler-dom" "3.0.11"
1503+
"@vue/compiler-ssr" "3.0.11"
1504+
"@vue/shared" "3.0.11"
15051505
consolidate "^0.16.0"
15061506
estree-walker "^2.0.1"
15071507
hash-sum "^2.0.0"
@@ -1513,55 +1513,55 @@
15131513
postcss-selector-parser "^6.0.4"
15141514
source-map "^0.6.1"
15151515

1516-
"@vue/[email protected].6":
1517-
version "3.0.6"
1518-
resolved "https://registry.yarnpkg.com/@vue/compiler-ssr/-/compiler-ssr-3.0.6.tgz#7156361e4c465cbee2723275edc61e940678e47c"
1519-
integrity sha512-Y4amPwRevUiiNQDho0cq1Ith9q6UU5N6CD6YiXkHIboFPeXEiGvH3ULJWjFzlGqn1eUV1AReNJpFJrhjtQNc7g==
1516+
"@vue/[email protected].11":
1517+
version "3.0.11"
1518+
resolved "https://registry.yarnpkg.com/@vue/compiler-ssr/-/compiler-ssr-3.0.11.tgz#ac5a05fd1257412fa66079c823d8203b6a889a13"
1519+
integrity sha512-66yUGI8SGOpNvOcrQybRIhl2M03PJ+OrDPm78i7tvVln86MHTKhM3ERbALK26F7tXl0RkjX4sZpucCpiKs3MnA==
15201520
dependencies:
1521-
"@vue/compiler-dom" "3.0.6"
1522-
"@vue/shared" "3.0.6"
1521+
"@vue/compiler-dom" "3.0.11"
1522+
"@vue/shared" "3.0.11"
15231523

15241524
"@vue/devtools-api@^6.0.0-beta.5":
15251525
version "6.0.0-beta.7"
15261526
resolved "https://registry.yarnpkg.com/@vue/devtools-api/-/devtools-api-6.0.0-beta.7.tgz#1d306613c93b9a837a3776b1b9255502662f850f"
15271527
integrity sha512-mIfqX8ZF6s2ulelIzfxGk9sFoigpoeK/2/DlWrtBGWfvwaK3kR1P2bxNkZ0LbJeuKHfcRP6hGZtGist7nxUN9A==
15281528

1529-
"@vue/[email protected].6":
1530-
version "3.0.6"
1531-
resolved "https://registry.yarnpkg.com/@vue/reactivity/-/reactivity-3.0.6.tgz#7b16f3d5d04cc55028085fff0bb8475cc0e32991"
1532-
integrity sha512-hX8PnZayNMoljWSYrZW0OclQnRaMoHxvi5eeFVFPDr7+tzBeiftmmozKttxxCLoDxBWX1B4gNc237DIcYU63Lw==
1529+
"@vue/[email protected].11":
1530+
version "3.0.11"
1531+
resolved "https://registry.yarnpkg.com/@vue/reactivity/-/reactivity-3.0.11.tgz#07b588349fd05626b17f3500cbef7d4bdb4dbd0b"
1532+
integrity sha512-SKM3YKxtXHBPMf7yufXeBhCZ4XZDKP9/iXeQSC8bBO3ivBuzAi4aZi0bNoeE2IF2iGfP/AHEt1OU4ARj4ao/Xw==
15331533
dependencies:
1534-
"@vue/shared" "3.0.6"
1534+
"@vue/shared" "3.0.11"
15351535

1536-
"@vue/[email protected].6":
1537-
version "3.0.6"
1538-
resolved "https://registry.yarnpkg.com/@vue/runtime-core/-/runtime-core-3.0.6.tgz#d16779b5664593f1d25be677fb1b1968024aa532"
1539-
integrity sha512-x6N38P0DeMyrHiAxCE/rACHTyydOzlg8IyUIPkSJ4rrSkuJnAtFKQicK6fm8NuD21dwdPr8KcZ4Cn4xaqL1JJg==
1536+
"@vue/[email protected].11":
1537+
version "3.0.11"
1538+
resolved "https://registry.yarnpkg.com/@vue/runtime-core/-/runtime-core-3.0.11.tgz#c52dfc6acf3215493623552c1c2919080c562e44"
1539+
integrity sha512-87XPNwHfz9JkmOlayBeCCfMh9PT2NBnv795DSbi//C/RaAnc/bGZgECjmkD7oXJ526BZbgk9QZBPdFT8KMxkAg==
15401540
dependencies:
1541-
"@vue/reactivity" "3.0.6"
1542-
"@vue/shared" "3.0.6"
1541+
"@vue/reactivity" "3.0.11"
1542+
"@vue/shared" "3.0.11"
15431543

1544-
"@vue/[email protected].6":
1545-
version "3.0.6"
1546-
resolved "https://registry.yarnpkg.com/@vue/runtime-dom/-/runtime-dom-3.0.6.tgz#e7d6c61913d871f1f020a9a81b558c8fcbeba8c6"
1547-
integrity sha512-Y6y4Tak9//VXB2mp2NVQxbwC4a5xsnJpotpo8yBAB3qB3L4v4HQLpqxSkwThRwI6Y6Z7dydX/sgfraqLBE8BWg==
1544+
"@vue/[email protected].11":
1545+
version "3.0.11"
1546+
resolved "https://registry.yarnpkg.com/@vue/runtime-dom/-/runtime-dom-3.0.11.tgz#7a552df21907942721feb6961c418e222a699337"
1547+
integrity sha512-jm3FVQESY3y2hKZ2wlkcmFDDyqaPyU3p1IdAX92zTNeCH7I8zZ37PtlE1b9NlCtzV53WjB4TZAYh9yDCMIEumA==
15481548
dependencies:
1549-
"@vue/runtime-core" "3.0.6"
1550-
"@vue/shared" "3.0.6"
1549+
"@vue/runtime-core" "3.0.11"
1550+
"@vue/shared" "3.0.11"
15511551
csstype "^2.6.8"
15521552

1553-
"@vue/[email protected].6":
1554-
version "3.0.6"
1555-
resolved "https://registry.yarnpkg.com/@vue/server-renderer/-/server-renderer-3.0.6.tgz#346b8225e3111be88a7a6ed8f96ecd30852a5ac5"
1556-
integrity sha512-kl+9/aZp6xLeexSi4fyBIT8SCj/r5YFj3lOMYlHzqldLIA+qRMAnCE4Vyu8Dz33Xvl/4jTg7iwPwPZ5PT4dKbQ==
1553+
"@vue/[email protected].11":
1554+
version "3.0.11"
1555+
resolved "https://registry.yarnpkg.com/@vue/server-renderer/-/server-renderer-3.0.11.tgz#d340f0db630ed56d4af7615faf495dc77558b44c"
1556+
integrity sha512-NtXRxCq+jJWohce7s2kgUdO7gD6LRrWhvpGUMrpp65ODxuwolVHVyacyvAnU9bxTj11xw+ErC7Q2+su9mJusEg==
15571557
dependencies:
1558-
"@vue/compiler-ssr" "3.0.6"
1559-
"@vue/shared" "3.0.6"
1558+
"@vue/compiler-ssr" "3.0.11"
1559+
"@vue/shared" "3.0.11"
15601560

1561-
"@vue/[email protected].6":
1562-
version "3.0.6"
1563-
resolved "https://registry.yarnpkg.com/@vue/shared/-/shared-3.0.6.tgz#d65576430fc4ad383dc7c829118798e5169178d4"
1564-
integrity sha512-c37C60HpelUZIx+SNZVEINSxkFzQYhIXFg5AynnIA4QDBmY4iSPoACfGSwSUTCTKImukPeCgY2oqRJVP3R1Mnw==
1561+
"@vue/[email protected].11":
1562+
version "3.0.11"
1563+
resolved "https://registry.yarnpkg.com/@vue/shared/-/shared-3.0.11.tgz#20d22dd0da7d358bb21c17f9bde8628152642c77"
1564+
integrity sha512-b+zB8A2so8eCE0JsxjL24J7vdGl8rzPQ09hZNhystm+KqSbKcAej1A+Hbva1rCMmTTqA+hFnUSDc5kouEo0JzA==
15651565

15661566
"@webassemblyjs/[email protected]":
15671567
version "1.11.0"
@@ -7330,10 +7330,10 @@ [email protected]:
73307330
resolved "https://registry.yarnpkg.com/qs/-/qs-6.7.0.tgz#41dc1a015e3d581f1621776be31afb2876a9b1bc"
73317331
integrity sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==
73327332

7333-
quasar@^2.0.0-beta.1:
7334-
version "2.0.0-beta.11"
7335-
resolved "https://registry.yarnpkg.com/quasar/-/quasar-2.0.0-beta.11.tgz#78f21abe94caa78fe17ad17ce945d09dfda9e5d2"
7336-
integrity sha512-YG+iVkd1LNbo0MFSrPl1npEW02FfVeD4+/98nYPz3pfZEdOy1kiOF7N9Ij7RDC8x0/+9Ans9mgBvs0xjg9YxyA==
7333+
quasar@^2.0.0-beta.12:
7334+
version "2.0.0-beta.12"
7335+
resolved "https://registry.yarnpkg.com/quasar/-/quasar-2.0.0-beta.12.tgz#e698e0156dd891b7e9d602a80432ae4271467a07"
7336+
integrity sha512-82wK5f5BkmqJ9uNYYHHhoWcIs78eWvjpziG5zYNKXmfOqXmMfVXTqWDZuGFDEPk3X+aieuXir05E07fjW2pEjw==
73377337

73387338
query-string@^4.1.0:
73397339
version "4.3.4"
@@ -8944,36 +8944,36 @@ vue-i18n@^9.0.0-beta.0:
89448944
"@intlify/shared" "9.0.0"
89458945
"@vue/devtools-api" "^6.0.0-beta.5"
89468946

8947-
vue-loader@16.1.2:
8948-
version "16.1.2"
8949-
resolved "https://registry.yarnpkg.com/vue-loader/-/vue-loader-16.1.2.tgz#5c03b6c50d2a5f983c7ceba15c50d78ca2b298f4"
8950-
integrity sha512-8QTxh+Fd+HB6fiL52iEVLKqE9N1JSlMXLR92Ijm6g8PZrwIxckgpqjPDWRP5TWxdiPaHR+alUWsnu1ShQOwt+Q==
8947+
vue-loader@16.2.0:
8948+
version "16.2.0"
8949+
resolved "https://registry.yarnpkg.com/vue-loader/-/vue-loader-16.2.0.tgz#046a53308dd47e58efe20ddec1edec027ce3b46e"
8950+
integrity sha512-TitGhqSQ61RJljMmhIGvfWzJ2zk9m1Qug049Ugml6QP3t0e95o0XJjk29roNEiPKJQBEi8Ord5hFuSuELzSp8Q==
89518951
dependencies:
89528952
chalk "^4.1.0"
89538953
hash-sum "^2.0.0"
89548954
loader-utils "^2.0.0"
89558955

8956-
[email protected].3:
8957-
version "4.0.3"
8958-
resolved "https://registry.yarnpkg.com/vue-router/-/vue-router-4.0.3.tgz#8b26050c88b2dec7e27a88835f71046b365823ec"
8959-
integrity sha512-AD1OjtVPyQHTSpoRsEGfPpxRQwhAhxcacOYO3zJ3KNkYP/r09mileSp6kdMQKhZWP2cFsPR3E2M3PZguSN5/ww==
8956+
[email protected].5:
8957+
version "4.0.5"
8958+
resolved "https://registry.yarnpkg.com/vue-router/-/vue-router-4.0.5.tgz#dd0a4134bc950c37aef64b973e9ee1008428d8fa"
8959+
integrity sha512-AQq+pllb6FCc7rS6vh4PPcce3XA1jgK3hKNkQ4hXHwoVN7jOeAOMKCnX7XAX3etV9rmN7iNW8iIwgPk95ckBjw==
89608960

8961-
[email protected].2:
8962-
version "4.1.2"
8963-
resolved "https://registry.yarnpkg.com/vue-style-loader/-/vue-style-loader-4.1.2.tgz#dedf349806f25ceb4e64f3ad7c0a44fba735fcf8"
8964-
integrity sha512-0ip8ge6Gzz/Bk0iHovU9XAUQaFt/G2B61bnWa2tCcqqdgfHs1lF9xXorFbE55Gmy92okFT+8bfmySuUOu13vxQ==
8961+
[email protected].3:
8962+
version "4.1.3"
8963+
resolved "https://registry.yarnpkg.com/vue-style-loader/-/vue-style-loader-4.1.3.tgz#6d55863a51fa757ab24e89d9371465072aa7bc35"
8964+
integrity sha512-sFuh0xfbtpRlKfm39ss/ikqs9AbKCoXZBpHeVZ8Tx650o0k0q/YCM7FRvigtxpACezfq6af+a7JeqVTWvncqDg==
89658965
dependencies:
89668966
hash-sum "^1.0.2"
89678967
loader-utils "^1.0.2"
89688968

8969-
[email protected].6:
8970-
version "3.0.6"
8971-
resolved "https://registry.yarnpkg.com/vue/-/vue-3.0.6.tgz#2c16ed4bb66f16d6c6f6eaa3b7d5835a76598049"
8972-
integrity sha512-fgjbe/+f1EsqG7ZbaFSnxdzQXF2DKoFCdJlPxZZJy9XMtyXS6SY8pGzLi8WYb4zmsPLHvTZz4bHW30kFDk7vfA==
8969+
[email protected].11:
8970+
version "3.0.11"
8971+
resolved "https://registry.yarnpkg.com/vue/-/vue-3.0.11.tgz#c82f9594cbf4dcc869241d4c8dd3e08d9a8f4b5f"
8972+
integrity sha512-3/eUi4InQz8MPzruHYSTQPxtM3LdZ1/S/BvaU021zBnZi0laRUyH6pfuE4wtUeLvI8wmUNwj5wrZFvbHUXL9dw==
89738973
dependencies:
8974-
"@vue/compiler-dom" "3.0.6"
8975-
"@vue/runtime-dom" "3.0.6"
8976-
"@vue/shared" "3.0.6"
8974+
"@vue/compiler-dom" "3.0.11"
8975+
"@vue/runtime-dom" "3.0.11"
8976+
"@vue/shared" "3.0.11"
89778977

89788978
[email protected]:
89798979
version "4.0.0"

0 commit comments

Comments
 (0)