diff options
author | Kristóf Marussy <kristof@marussy.com> | 2022-12-13 02:44:48 +0100 |
---|---|---|
committer | Kristóf Marussy <kristof@marussy.com> | 2022-12-13 12:25:00 +0100 |
commit | 36af1905dd58acf8e04041986657fd62b1983f4b (patch) | |
tree | e0519fce944af7aee7b7790a495c9a63b19666f4 /subprojects | |
parent | chore(web): upgrade to Jetty 12.0.0.alpha3 (diff) | |
download | refinery-36af1905dd58acf8e04041986657fd62b1983f4b.tar.gz refinery-36af1905dd58acf8e04041986657fd62b1983f4b.tar.zst refinery-36af1905dd58acf8e04041986657fd62b1983f4b.zip |
chore(deps): upgrade to yarn canary
Support for typescript@4.9.4 available in yarn 4.0.0-rc.33 according to
https://github.com/yarnpkg/berry/pull/5127#issuecomment-1345664949
Also updates other frontend dependencies.
Diffstat (limited to 'subprojects')
-rw-r--r-- | subprojects/frontend/package.json | 12 | ||||
-rw-r--r-- | subprojects/store/src/main/java/tools/refinery/store/model/ModelCursor.java | 25 |
2 files changed, 6 insertions, 31 deletions
diff --git a/subprojects/frontend/package.json b/subprojects/frontend/package.json index 2e6d35d5..27babf69 100644 --- a/subprojects/frontend/package.json +++ b/subprojects/frontend/package.json | |||
@@ -54,7 +54,7 @@ | |||
54 | "react": "^18.2.0", | 54 | "react": "^18.2.0", |
55 | "react-dom": "^18.2.0", | 55 | "react-dom": "^18.2.0", |
56 | "xstate": "^4.35.0", | 56 | "xstate": "^4.35.0", |
57 | "zod": "^3.20.0" | 57 | "zod": "^3.20.2" |
58 | }, | 58 | }, |
59 | "devDependencies": { | 59 | "devDependencies": { |
60 | "@lezer/generator": "^1.1.3", | 60 | "@lezer/generator": "^1.1.3", |
@@ -64,12 +64,12 @@ | |||
64 | "@types/lodash-es": "^4.17.6", | 64 | "@types/lodash-es": "^4.17.6", |
65 | "@types/micromatch": "^4.0.2", | 65 | "@types/micromatch": "^4.0.2", |
66 | "@types/ms": "^0.7.31", | 66 | "@types/ms": "^0.7.31", |
67 | "@types/node": "^18.11.13", | 67 | "@types/node": "^18.11.14", |
68 | "@types/prettier": "^2.7.1", | 68 | "@types/prettier": "^2.7.1", |
69 | "@types/react": "^18.0.26", | 69 | "@types/react": "^18.0.26", |
70 | "@types/react-dom": "^18.0.9", | 70 | "@types/react-dom": "^18.0.9", |
71 | "@typescript-eslint/eslint-plugin": "^5.46.0", | 71 | "@typescript-eslint/eslint-plugin": "^5.46.1", |
72 | "@typescript-eslint/parser": "^5.46.0", | 72 | "@typescript-eslint/parser": "^5.46.1", |
73 | "@xstate/cli": "^0.4.0", | 73 | "@xstate/cli": "^0.4.0", |
74 | "cross-env": "^7.0.3", | 74 | "cross-env": "^7.0.3", |
75 | "eslint": "^8.29.0", | 75 | "eslint": "^8.29.0", |
@@ -86,8 +86,8 @@ | |||
86 | "html-minifier-terser": "^7.1.0", | 86 | "html-minifier-terser": "^7.1.0", |
87 | "micromatch": "^4.0.5", | 87 | "micromatch": "^4.0.5", |
88 | "prettier": "^2.8.1", | 88 | "prettier": "^2.8.1", |
89 | "typescript": "4.9.3", | 89 | "typescript": "4.9.4", |
90 | "vite": "^4.0.0", | 90 | "vite": "^4.0.1", |
91 | "vite-plugin-pwa": "^0.14.0", | 91 | "vite-plugin-pwa": "^0.14.0", |
92 | "workbox-window": "^6.5.4" | 92 | "workbox-window": "^6.5.4" |
93 | } | 93 | } |
diff --git a/subprojects/store/src/main/java/tools/refinery/store/model/ModelCursor.java b/subprojects/store/src/main/java/tools/refinery/store/model/ModelCursor.java deleted file mode 100644 index a835cf69..00000000 --- a/subprojects/store/src/main/java/tools/refinery/store/model/ModelCursor.java +++ /dev/null | |||
@@ -1,25 +0,0 @@ | |||
1 | package tools.refinery.store.model; | ||
2 | |||
3 | import java.util.Map; | ||
4 | |||
5 | import tools.refinery.store.map.Cursor; | ||
6 | import tools.refinery.store.model.representation.DataRepresentation; | ||
7 | |||
8 | public class ModelCursor { | ||
9 | final Map<DataRepresentation<?, ?>,Cursor<?,?>> cursors; | ||
10 | |||
11 | public ModelCursor(Map<DataRepresentation<?, ?>, Cursor<?, ?>> cursors) { | ||
12 | super(); | ||
13 | this.cursors = cursors; | ||
14 | } | ||
15 | |||
16 | @SuppressWarnings("unchecked") | ||
17 | public <K,V> Cursor<K,V> getCursor(DataRepresentation<K, V> representation) { | ||
18 | Cursor<?, ?> cursor = cursors.get(representation); | ||
19 | if(cursor != null) { | ||
20 | return (Cursor<K, V>) cursor; | ||
21 | } else { | ||
22 | throw new IllegalArgumentException("ModelCursor does not contain cursor for representation "+representation); | ||
23 | } | ||
24 | } | ||
25 | } | ||