diff options
author | 2023-09-17 19:29:33 +0200 | |
---|---|---|
committer | 2023-09-17 19:29:33 +0200 | |
commit | 5913f308de8dce54a626a5f5e64faa1a26ace783 (patch) | |
tree | fc9cf0c59c20d06286e66c881653531848be6d97 /subprojects | |
parent | chore: remove VIATRA branding (diff) | |
parent | fix(frontend): XState warning (diff) | |
download | refinery-5913f308de8dce54a626a5f5e64faa1a26ace783.tar.gz refinery-5913f308de8dce54a626a5f5e64faa1a26ace783.tar.zst refinery-5913f308de8dce54a626a5f5e64faa1a26ace783.zip |
Merge pull request #41 from kris7t/frontend-fixes
Frontend fixes
Diffstat (limited to 'subprojects')
-rw-r--r-- | subprojects/frontend/build.gradle.kts | 4 | ||||
-rw-r--r-- | subprojects/frontend/config/graphvizUMDVitePlugin.ts | 2 | ||||
-rw-r--r-- | subprojects/frontend/package.json | 22 | ||||
-rw-r--r-- | subprojects/frontend/src/xtext/webSocketMachine.ts | 7 |
4 files changed, 17 insertions, 18 deletions
diff --git a/subprojects/frontend/build.gradle.kts b/subprojects/frontend/build.gradle.kts index 286dd05c..40e31517 100644 --- a/subprojects/frontend/build.gradle.kts +++ b/subprojects/frontend/build.gradle.kts | |||
@@ -18,7 +18,7 @@ frontend { | |||
18 | 18 | ||
19 | val viteOutputDir = layout.buildDirectory.dir("vite") | 19 | val viteOutputDir = layout.buildDirectory.dir("vite") |
20 | 20 | ||
21 | val productionResources = viteOutputDir.map { it.dir("production") } | 21 | val productionResources: Provider<Directory> = viteOutputDir.map { it.dir("production") } |
22 | 22 | ||
23 | val productionAssets: Configuration by configurations.creating { | 23 | val productionAssets: Configuration by configurations.creating { |
24 | isCanBeConsumed = true | 24 | isCanBeConsumed = true |
@@ -117,7 +117,7 @@ tasks { | |||
117 | dependsOn(installFrontend) | 117 | dependsOn(installFrontend) |
118 | dependsOn(generateXStateTypes) | 118 | dependsOn(generateXStateTypes) |
119 | inputs.files(assembleFiles) | 119 | inputs.files(assembleFiles) |
120 | outputs.dir("$viteOutputDir/development") | 120 | outputs.dir(viteOutputDir.map { it.dir("development") }) |
121 | script.set("run serve") | 121 | script.set("run serve") |
122 | group = "run" | 122 | group = "run" |
123 | description = "Start a Vite dev server with hot module replacement." | 123 | description = "Start a Vite dev server with hot module replacement." |
diff --git a/subprojects/frontend/config/graphvizUMDVitePlugin.ts b/subprojects/frontend/config/graphvizUMDVitePlugin.ts index 9c60a84e..ab726e4f 100644 --- a/subprojects/frontend/config/graphvizUMDVitePlugin.ts +++ b/subprojects/frontend/config/graphvizUMDVitePlugin.ts | |||
@@ -26,7 +26,7 @@ export default function graphvizUMDVitePlugin(): PluginOption { | |||
26 | }, | 26 | }, |
27 | async buildStart() { | 27 | async buildStart() { |
28 | const issuer = | 28 | const issuer = |
29 | root === undefined ? issuerFileName : path.join(issuerFileName); | 29 | root === undefined ? issuerFileName : path.join(root, issuerFileName); |
30 | const resolvedPath = pnpapi.resolveRequest( | 30 | const resolvedPath = pnpapi.resolveRequest( |
31 | '@hpcc-js/wasm/graphviz', | 31 | '@hpcc-js/wasm/graphviz', |
32 | issuer, | 32 | issuer, |
diff --git a/subprojects/frontend/package.json b/subprojects/frontend/package.json index 873e5170..b3169a0c 100644 --- a/subprojects/frontend/package.json +++ b/subprojects/frontend/package.json | |||
@@ -28,25 +28,25 @@ | |||
28 | }, | 28 | }, |
29 | "homepage": "https://refinery.tools", | 29 | "homepage": "https://refinery.tools", |
30 | "dependencies": { | 30 | "dependencies": { |
31 | "@codemirror/autocomplete": "^6.9.0", | 31 | "@codemirror/autocomplete": "^6.9.1", |
32 | "@codemirror/commands": "^6.2.5", | 32 | "@codemirror/commands": "^6.2.5", |
33 | "@codemirror/language": "^6.9.0", | 33 | "@codemirror/language": "^6.9.0", |
34 | "@codemirror/lint": "^6.4.1", | 34 | "@codemirror/lint": "^6.4.2", |
35 | "@codemirror/search": "^6.5.2", | 35 | "@codemirror/search": "^6.5.3", |
36 | "@codemirror/state": "^6.2.1", | 36 | "@codemirror/state": "^6.2.1", |
37 | "@codemirror/view": "^6.18.1", | 37 | "@codemirror/view": "^6.19.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/jetbrains-mono": "^5.0.13", | 40 | "@fontsource-variable/jetbrains-mono": "^5.0.13", |
41 | "@fontsource-variable/open-sans": "^5.0.13", | 41 | "@fontsource-variable/open-sans": "^5.0.13", |
42 | "@hpcc-js/wasm": "^2.13.1", | 42 | "@hpcc-js/wasm": "^2.14.0", |
43 | "@lezer/common": "^1.0.4", | 43 | "@lezer/common": "^1.0.4", |
44 | "@lezer/highlight": "^1.1.6", | 44 | "@lezer/highlight": "^1.1.6", |
45 | "@lezer/lr": "^1.3.10", | 45 | "@lezer/lr": "^1.3.10", |
46 | "@material-icons/svg": "^1.0.33", | 46 | "@material-icons/svg": "^1.0.33", |
47 | "@mui/icons-material": "5.14.8", | 47 | "@mui/icons-material": "5.14.9", |
48 | "@mui/material": "5.14.8", | 48 | "@mui/material": "5.14.9", |
49 | "@mui/system": "^5.14.8", | 49 | "@mui/system": "^5.14.9", |
50 | "@mui/x-data-grid": "^6.10.0 <6.10.1", | 50 | "@mui/x-data-grid": "^6.10.0 <6.10.1", |
51 | "ansi-styles": "^6.2.1", | 51 | "ansi-styles": "^6.2.1", |
52 | "csstype": "^3.1.2", | 52 | "csstype": "^3.1.2", |
@@ -61,7 +61,7 @@ | |||
61 | "mobx": "^6.10.2", | 61 | "mobx": "^6.10.2", |
62 | "mobx-react-lite": "^4.0.4", | 62 | "mobx-react-lite": "^4.0.4", |
63 | "ms": "^2.1.3", | 63 | "ms": "^2.1.3", |
64 | "nanoid": "^4.0.2", | 64 | "nanoid": "^5.0.1", |
65 | "notistack": "^3.0.1", | 65 | "notistack": "^3.0.1", |
66 | "react": "^18.2.0", | 66 | "react": "^18.2.0", |
67 | "react-dom": "^18.2.0", | 67 | "react-dom": "^18.2.0", |
@@ -70,7 +70,7 @@ | |||
70 | "zod": "^3.22.2" | 70 | "zod": "^3.22.2" |
71 | }, | 71 | }, |
72 | "devDependencies": { | 72 | "devDependencies": { |
73 | "@lezer/generator": "^1.5.0", | 73 | "@lezer/generator": "^1.5.1", |
74 | "@types/d3": "^7.4.0", | 74 | "@types/d3": "^7.4.0", |
75 | "@types/d3-graphviz": "^2.6.7", | 75 | "@types/d3-graphviz": "^2.6.7", |
76 | "@types/d3-selection": "^3.0.6", | 76 | "@types/d3-selection": "^3.0.6", |
@@ -80,7 +80,7 @@ | |||
80 | "@types/lodash-es": "^4.17.9", | 80 | "@types/lodash-es": "^4.17.9", |
81 | "@types/micromatch": "^4.0.2", | 81 | "@types/micromatch": "^4.0.2", |
82 | "@types/ms": "^0.7.31", | 82 | "@types/ms": "^0.7.31", |
83 | "@types/node": "^18.17.15", | 83 | "@types/node": "^18.17.17", |
84 | "@types/pnpapi": "^0.0.2", | 84 | "@types/pnpapi": "^0.0.2", |
85 | "@types/react": "^18.2.21", | 85 | "@types/react": "^18.2.21", |
86 | "@types/react-dom": "^18.2.7", | 86 | "@types/react-dom": "^18.2.7", |
diff --git a/subprojects/frontend/src/xtext/webSocketMachine.ts b/subprojects/frontend/src/xtext/webSocketMachine.ts index 9113286f..43fbff22 100644 --- a/subprojects/frontend/src/xtext/webSocketMachine.ts +++ b/subprojects/frontend/src/xtext/webSocketMachine.ts | |||
@@ -175,10 +175,9 @@ export default createMachine( | |||
175 | visibleOrUnknown: { | 175 | visibleOrUnknown: { |
176 | id: 'tabVisible', | 176 | id: 'tabVisible', |
177 | on: { | 177 | on: { |
178 | TAB_HIDDEN: [ | 178 | // The `always` transition will move to `#mayDisconnect` |
179 | { target: 'hidden.mayDisconnect', in: '#generationIdle' }, | 179 | // if disconnection is possible. |
180 | { target: 'hidden.keepAlive', in: '#generationRunning' }, | 180 | TAB_HIDDEN: '#keepAlive', |
181 | ], | ||
182 | }, | 181 | }, |
183 | }, | 182 | }, |
184 | hidden: { | 183 | hidden: { |