diff options
Diffstat (limited to 'subprojects')
-rw-r--r-- | subprojects/frontend/package.json | 66 | ||||
-rw-r--r-- | subprojects/frontend/src/editor/DiagnosticValue.ts | 1 | ||||
-rw-r--r-- | subprojects/frontend/src/editor/EditorTheme.ts | 2 | ||||
-rw-r--r-- | subprojects/frontend/src/index.tsx | 8 | ||||
-rw-r--r-- | subprojects/frontend/src/xtext/XtextClient.ts | 5 | ||||
-rw-r--r-- | subprojects/frontend/vite.config.ts | 4 |
6 files changed, 45 insertions, 41 deletions
diff --git a/subprojects/frontend/package.json b/subprojects/frontend/package.json index ba8a0a58..06ff9f6b 100644 --- a/subprojects/frontend/package.json +++ b/subprojects/frontend/package.json | |||
@@ -28,23 +28,23 @@ | |||
28 | }, | 28 | }, |
29 | "homepage": "https://refinery.tools", | 29 | "homepage": "https://refinery.tools", |
30 | "dependencies": { | 30 | "dependencies": { |
31 | "@codemirror/autocomplete": "^6.8.0", | 31 | "@codemirror/autocomplete": "^6.9.0", |
32 | "@codemirror/commands": "^6.2.4", | 32 | "@codemirror/commands": "^6.2.4", |
33 | "@codemirror/language": "^6.8.0", | 33 | "@codemirror/language": "^6.8.0", |
34 | "@codemirror/lint": "^6.2.2", | 34 | "@codemirror/lint": "^6.4.0", |
35 | "@codemirror/search": "^6.5.0", | 35 | "@codemirror/search": "^6.5.1", |
36 | "@codemirror/state": "^6.2.1", | 36 | "@codemirror/state": "^6.2.1", |
37 | "@codemirror/view": "^6.13.2", | 37 | "@codemirror/view": "^6.16.0", |
38 | "@emotion/react": "^11.11.1", | 38 | "@emotion/react": "^11.11.1", |
39 | "@emotion/styled": "^11.11.0", | 39 | "@emotion/styled": "^11.11.0", |
40 | "@fontsource-variable/inter": "^5.0.3", | 40 | "@fontsource-variable/inter": "^5.0.8", |
41 | "@fontsource-variable/jetbrains-mono": "^5.0.3", | 41 | "@fontsource-variable/jetbrains-mono": "^5.0.9", |
42 | "@lezer/common": "^1.0.3", | 42 | "@lezer/common": "^1.0.3", |
43 | "@lezer/highlight": "^1.1.6", | 43 | "@lezer/highlight": "^1.1.6", |
44 | "@lezer/lr": "^1.3.6", | 44 | "@lezer/lr": "^1.3.9", |
45 | "@material-icons/svg": "^1.0.33", | 45 | "@material-icons/svg": "^1.0.33", |
46 | "@mui/icons-material": "5.11.16", | 46 | "@mui/icons-material": "5.14.3", |
47 | "@mui/material": "5.13.5", | 47 | "@mui/material": "5.14.5", |
48 | "@vitejs/plugin-react-swc": "^3.3.2", | 48 | "@vitejs/plugin-react-swc": "^3.3.2", |
49 | "ansi-styles": "^6.2.1", | 49 | "ansi-styles": "^6.2.1", |
50 | "csstype": "^3.1.2", | 50 | "csstype": "^3.1.2", |
@@ -52,47 +52,47 @@ | |||
52 | "lodash-es": "^4.17.21", | 52 | "lodash-es": "^4.17.21", |
53 | "loglevel": "^1.8.1", | 53 | "loglevel": "^1.8.1", |
54 | "loglevel-plugin-prefix": "^0.8.4", | 54 | "loglevel-plugin-prefix": "^0.8.4", |
55 | "mobx": "^6.9.0", | 55 | "mobx": "^6.10.0", |
56 | "mobx-react-lite": "^3.4.3", | 56 | "mobx-react-lite": "^4.0.3", |
57 | "ms": "^2.1.3", | 57 | "ms": "^2.1.3", |
58 | "nanoid": "^4.0.2", | 58 | "nanoid": "^4.0.2", |
59 | "notistack": "^3.0.1", | 59 | "notistack": "^3.0.1", |
60 | "react": "^18.2.0", | 60 | "react": "^18.2.0", |
61 | "react-dom": "^18.2.0", | 61 | "react-dom": "^18.2.0", |
62 | "xstate": "^4.37.2", | 62 | "xstate": "^4.38.2", |
63 | "zod": "^3.21.4" | 63 | "zod": "^3.22.0" |
64 | }, | 64 | }, |
65 | "devDependencies": { | 65 | "devDependencies": { |
66 | "@lezer/generator": "^1.3.0", | 66 | "@lezer/generator": "^1.4.0", |
67 | "@types/eslint": "^8.40.2", | 67 | "@types/eslint": "^8.44.2", |
68 | "@types/html-minifier-terser": "^7.0.0", | 68 | "@types/html-minifier-terser": "^7.0.0", |
69 | "@types/lodash-es": "^4.17.7", | 69 | "@types/lodash-es": "^4.17.8", |
70 | "@types/micromatch": "^4.0.2", | 70 | "@types/micromatch": "^4.0.2", |
71 | "@types/ms": "^0.7.31", | 71 | "@types/ms": "^0.7.31", |
72 | "@types/node": "^18.16.18", | 72 | "@types/node": "^20.5.0", |
73 | "@types/prettier": "^2.7.3", | 73 | "@types/prettier": "^3.0.0", |
74 | "@types/react": "^18.2.12", | 74 | "@types/react": "^18.2.20", |
75 | "@types/react-dom": "^18.2.5", | 75 | "@types/react-dom": "^18.2.7", |
76 | "@typescript-eslint/eslint-plugin": "^5.59.11", | 76 | "@typescript-eslint/eslint-plugin": "^6.4.0", |
77 | "@typescript-eslint/parser": "^5.59.11", | 77 | "@typescript-eslint/parser": "^6.4.0", |
78 | "@xstate/cli": "^0.5.1", | 78 | "@xstate/cli": "^0.5.2", |
79 | "cross-env": "^7.0.3", | 79 | "cross-env": "^7.0.3", |
80 | "eslint": "^8.43.0", | 80 | "eslint": "^8.47.0", |
81 | "eslint-config-airbnb": "^19.0.4", | 81 | "eslint-config-airbnb": "^19.0.4", |
82 | "eslint-config-airbnb-typescript": "^17.0.0", | 82 | "eslint-config-airbnb-typescript": "^17.1.0", |
83 | "eslint-config-prettier": "^8.8.0", | 83 | "eslint-config-prettier": "^9.0.0", |
84 | "eslint-import-resolver-typescript": "^3.5.5", | 84 | "eslint-import-resolver-typescript": "^3.6.0", |
85 | "eslint-plugin-import": "^2.27.5", | 85 | "eslint-plugin-import": "^2.28.0", |
86 | "eslint-plugin-jsx-a11y": "^6.7.1", | 86 | "eslint-plugin-jsx-a11y": "^6.7.1", |
87 | "eslint-plugin-mobx": "^0.0.9", | 87 | "eslint-plugin-mobx": "^0.0.9", |
88 | "eslint-plugin-prettier": "^4.2.1", | 88 | "eslint-plugin-prettier": "^5.0.0", |
89 | "eslint-plugin-react": "^7.32.2", | 89 | "eslint-plugin-react": "^7.33.1", |
90 | "eslint-plugin-react-hooks": "^4.6.0", | 90 | "eslint-plugin-react-hooks": "^4.6.0", |
91 | "html-minifier-terser": "^7.2.0", | 91 | "html-minifier-terser": "^7.2.0", |
92 | "micromatch": "^4.0.5", | 92 | "micromatch": "^4.0.5", |
93 | "prettier": "^2.8.8", | 93 | "prettier": "^3.0.1", |
94 | "typescript": "5.1.3", | 94 | "typescript": "5.1.6", |
95 | "vite": "^4.3.9", | 95 | "vite": "^4.4.9", |
96 | "vite-plugin-pwa": "^0.16.4", | 96 | "vite-plugin-pwa": "^0.16.4", |
97 | "workbox-window": "^7.0.0" | 97 | "workbox-window": "^7.0.0" |
98 | } | 98 | } |
diff --git a/subprojects/frontend/src/editor/DiagnosticValue.ts b/subprojects/frontend/src/editor/DiagnosticValue.ts index 20478262..410a46b7 100644 --- a/subprojects/frontend/src/editor/DiagnosticValue.ts +++ b/subprojects/frontend/src/editor/DiagnosticValue.ts | |||
@@ -14,6 +14,7 @@ export default class DiagnosticValue extends RangeValue { | |||
14 | error: new DiagnosticValue('error'), | 14 | error: new DiagnosticValue('error'), |
15 | warning: new DiagnosticValue('warning'), | 15 | warning: new DiagnosticValue('warning'), |
16 | info: new DiagnosticValue('info'), | 16 | info: new DiagnosticValue('info'), |
17 | hint: new DiagnosticValue('hint'), | ||
17 | }; | 18 | }; |
18 | 19 | ||
19 | private constructor(public readonly severity: Severity) { | 20 | private constructor(public readonly severity: Severity) { |
diff --git a/subprojects/frontend/src/editor/EditorTheme.ts b/subprojects/frontend/src/editor/EditorTheme.ts index e057ce18..4afb93e6 100644 --- a/subprojects/frontend/src/editor/EditorTheme.ts +++ b/subprojects/frontend/src/editor/EditorTheme.ts | |||
@@ -64,7 +64,7 @@ export default styled('div', { | |||
64 | }, | 64 | }, |
65 | '.cm-focused': { | 65 | '.cm-focused': { |
66 | outline: 'none', | 66 | outline: 'none', |
67 | '.cm-selectionBackground': { | 67 | '& > .cm-scroller > .cm-selectionLayer .cm-selectionBackground': { |
68 | background: theme.palette.highlight.selection, | 68 | background: theme.palette.highlight.selection, |
69 | }, | 69 | }, |
70 | }, | 70 | }, |
diff --git a/subprojects/frontend/src/index.tsx b/subprojects/frontend/src/index.tsx index cb11e6c3..a2746748 100644 --- a/subprojects/frontend/src/index.tsx +++ b/subprojects/frontend/src/index.tsx | |||
@@ -16,8 +16,8 @@ class Person { | |||
16 | } | 16 | } |
17 | 17 | ||
18 | class Post { | 18 | class Post { |
19 | Person author | 19 | Person[1] author |
20 | Post[0..1] replyTo | 20 | Post replyTo |
21 | } | 21 | } |
22 | 22 | ||
23 | // Constraints | 23 | // Constraints |
@@ -27,7 +27,7 @@ error replyToNotFriend(Post x, Post y) <-> | |||
27 | author(y, yAuthor), | 27 | author(y, yAuthor), |
28 | !friend(xAuthor, yAuthor). | 28 | !friend(xAuthor, yAuthor). |
29 | 29 | ||
30 | error replyToCycle(Post x) <-> replyTo+(x,x). | 30 | error replyToCycle(Post x) <-> replyTo+(x, x). |
31 | 31 | ||
32 | // Instance model | 32 | // Instance model |
33 | Person(a). | 33 | Person(a). |
@@ -40,7 +40,7 @@ Post(p2). | |||
40 | author(p2, b). | 40 | author(p2, b). |
41 | replyTo(p2, p1). | 41 | replyTo(p2, p1). |
42 | 42 | ||
43 | !author(Post::new, a). // Automatically inferred: author(Post::new, b). | 43 | !author(Post::new, a). |
44 | 44 | ||
45 | // Scope | 45 | // Scope |
46 | scope Post = 10..15, Person += 0. | 46 | scope Post = 10..15, Person += 0. |
diff --git a/subprojects/frontend/src/xtext/XtextClient.ts b/subprojects/frontend/src/xtext/XtextClient.ts index e8181af0..abdf8518 100644 --- a/subprojects/frontend/src/xtext/XtextClient.ts +++ b/subprojects/frontend/src/xtext/XtextClient.ts | |||
@@ -37,7 +37,10 @@ export default class XtextClient { | |||
37 | 37 | ||
38 | private readonly occurrencesService: OccurrencesService; | 38 | private readonly occurrencesService: OccurrencesService; |
39 | 39 | ||
40 | constructor(store: EditorStore, private readonly pwaStore: PWAStore) { | 40 | constructor( |
41 | store: EditorStore, | ||
42 | private readonly pwaStore: PWAStore, | ||
43 | ) { | ||
41 | this.webSocketClient = new XtextWebSocketClient( | 44 | this.webSocketClient = new XtextWebSocketClient( |
42 | () => this.onReconnect(), | 45 | () => this.onReconnect(), |
43 | () => this.onDisconnect(), | 46 | () => this.onDisconnect(), |
diff --git a/subprojects/frontend/vite.config.ts b/subprojects/frontend/vite.config.ts index 9e08ccc4..1104f867 100644 --- a/subprojects/frontend/vite.config.ts +++ b/subprojects/frontend/vite.config.ts | |||
@@ -29,8 +29,8 @@ const { mode, isDevelopment, devModePlugins, serverOptions } = | |||
29 | process.env['NODE_ENV'] ??= mode; | 29 | process.env['NODE_ENV'] ??= mode; |
30 | 30 | ||
31 | const fontsGlob = [ | 31 | const fontsGlob = [ |
32 | 'inter-latin-variable-wghtOnly-normal-*.woff2', | 32 | 'inter-latin-wght-normal-*.woff2', |
33 | 'jetbrains-mono-latin-variable-wghtOnly-{normal,italic}-*.woff2', | 33 | 'jetbrains-mono-latin-wght-{normal,italic}-*.woff2', |
34 | ]; | 34 | ]; |
35 | 35 | ||
36 | const viteConfig: ViteConfig = { | 36 | const viteConfig: ViteConfig = { |