build: separate module for frontend

This allows us to simplify the webpack configuration and the gradle
build scripts.

46 files changed, 149 insertions, 203 deletions

diff --git a/subprojects/language-web/.eslintrc.js b/subprojects/frontend/.eslintrc.js
index b27feb0e..aa7636f8 100644
--- a/subprojects/language-web/.eslintrc.js
+++ b/subprojects/frontend/.eslintrc.js
@@ -26,7 +26,6 @@ module.exports = {
     '@typescript-eslint/switch-exhaustiveness-check': 'error',
     // https://github.com/airbnb/javascript/pull/2501
     'react/function-component-definition': ['error', {
-      namedComponents: 'function-expression',
       namedComponents: 'function-declaration',
     }],
   },
diff --git a/subprojects/language-web/.stylelintrc.js b/subprojects/frontend/.stylelintrc.js
index 7adf8f26..7adf8f26 100644
--- a/subprojects/language-web/.stylelintrc.js
+++ b/subprojects/frontend/.stylelintrc.js
diff --git a/subprojects/frontend/build.gradle b/subprojects/frontend/build.gradle
new file mode 100644
index 00000000..71444e89
--- /dev/null
+++ b/subprojects/frontend/build.gradle
@@ -0,0 +1,101 @@
+plugins {
+        id 'refinery-frontend-workspace'
+        id 'refinery-sonarqube'
+}
+
+import org.siouan.frontendgradleplugin.infrastructure.gradle.RunYarn
+
+def webpackOutputDir = "${buildDir}/webpack"
+def productionResources = file("${webpackOutputDir}/production")
+
+frontend {
+        assembleScript = 'assemble:webpack'
+}
+
+configurations {
+        productionAssets {
+                canBeConsumed = true
+                canBeResolved = false
+        }
+}
+
+def installFrontend = tasks.named('installFrontend')
+
+def generateLezerGrammar = tasks.register('generateLezerGrammar', RunYarn) {
+        dependsOn installFrontend
+        inputs.file 'src/language/problem.grammar'
+        inputs.file 'package.json'
+        inputs.file rootProject.file('yarn.lock')
+        outputs.file "${buildDir}/generated/sources/lezer/problem.ts"
+        outputs.file "${buildDir}/generated/sources/lezer/problem.terms.ts"
+        script = 'run assemble:lezer'
+}
+
+def assembleFrontend = tasks.named('assembleFrontend')
+assembleFrontend.configure {
+        dependsOn generateLezerGrammar
+        inputs.dir 'src'
+        inputs.file "${buildDir}/generated/sources/lezer/problem.ts"
+        inputs.file "${buildDir}/generated/sources/lezer/problem.terms.ts"
+        inputs.files('package.json', 'webpack.config.js')
+        inputs.file rootProject.file('yarn.lock')
+        outputs.dir productionResources
+}
+
+artifacts {
+        productionAssets(productionResources) {
+                builtBy assembleFrontend
+        }
+}
+
+def eslint = tasks.register('eslint', RunYarn) {
+        dependsOn installFrontend
+        inputs.dir 'src'
+        inputs.files('.eslintrc.js', 'tsconfig.json')
+        inputs.file rootProject.file('yarn.lock')
+        if (project.hasProperty('ci')) {
+                outputs.file "${buildDir}/eslint.json"
+                script = 'run check:eslint:ci'
+        } else {
+                script = 'run check:eslint'
+        }
+        group = 'verification'
+        description = 'Check for TypeScript errors.'
+}
+
+def stylelint = tasks.register('stylelint', RunYarn) {
+        dependsOn installFrontend
+        inputs.dir 'src'
+        inputs.file '.stylelintrc.js'
+        inputs.file rootProject.file('yarn.lock')
+        if (project.hasProperty('ci')) {
+                outputs.file "${buildDir}/stylelint.json"
+                script = 'run check:stylelint:ci'
+        } else {
+                script = 'run check:stylelint'
+        }
+        group = 'verification'
+        description = 'Check for Sass errors.'
+}
+
+tasks.named('check') {
+        dependsOn(eslint, stylelint)
+}
+
+tasks.register('webpackServe', RunYarn) {
+        dependsOn installFrontend
+        dependsOn generateLezerGrammar
+        outputs.dir "${webpackOutputDir}/development"
+        script = 'run serve'
+        group = 'run'
+        description = 'Start a Webpack dev server with hot module replacement.'
+}
+
+sonarqube.properties {
+        properties['sonar.sources'] += ['src']
+        property 'sonar.nodejs.executable', "${frontend.nodeInstallDirectory.get()}/bin/node"
+        property 'sonar.eslint.reportPaths', "${buildDir}/eslint.json"
+        property 'sonar.css.stylelint.reportPaths', "${buildDir}/stylelint.json"
+        // SonarJS does not pick up typescript files with `exactOptionalPropertyTypes`
+        property 'sonar.typescript.tsconfigPath', 'tsconfig.sonar.json'
+}
diff --git a/subprojects/language-web/package.json b/subprojects/frontend/package.json
index 5fa977d9..14795885 100644
--- a/subprojects/language-web/package.json
+++ b/subprojects/frontend/package.json
@@ -1,23 +1,23 @@
 {
-  "name": "@refinery/language-web",
+  "name": "@refinery/frontend",
   "version": "0.0.0",
-  "description": "Web frontend for VIATRA-Generator",
+  "description": "Web frontend for Refinery",
   "main": "index.js",
   "scripts": {
-    "assemble:lezer": "lezer-generator src/main/js/language/problem.grammar -o build/generated/sources/lezer/problem.ts",
+    "assemble:lezer": "lezer-generator src/language/problem.grammar -o build/generated/sources/lezer/problem.ts",
     "assemble:webpack": "webpack --node-env production",
     "serve": "webpack serve --node-env development --hot",
     "check": "yarn run check:eslint && yarn run check:stylelint",
     "check:eslint": "eslint .",
     "check:eslint:ci": "eslint -f json -o build/eslint.json .",
-    "check:stylelint": "stylelint src/main/css/**/*.scss",
-    "check:stylelint:ci": "stylelint -f json src/main/css/**/*.scss > build/stylelint.json"
+    "check:stylelint": "stylelint src/**/*.scss",
+    "check:stylelint:ci": "stylelint -f json src/**/*.scss > build/stylelint.json"
   },
   "repository": {
     "type": "git",
     "url": "git+https://github.com/graphs4value/refinery.git"
   },
-  "author": "VIATRA-Generator authors",
+  "author": "Refinery authors",
   "license": "EPL-2.0",
   "bugs": {
     "url": "https://github.com/graphs4value/issues"
@@ -47,9 +47,8 @@
     "eslint-plugin-react-hooks": "^4.3.0",
     "html-webpack-plugin": "^5.5.0",
     "image-webpack-loader": "^8.0.1",
-    "magic-comments-loader": "^1.4.1",
     "mini-css-extract-plugin": "^2.4.5",
-    "postcss": "^8.4.4",
+    "postcss": "^8.4.5",
     "postcss-scss": "^4.0.2",
     "sass": "^1.45.0",
     "sass-loader": "^12.4.0",
@@ -81,7 +80,7 @@
     "@codemirror/search": "^0.19.4",
     "@codemirror/state": "^0.19.6",
     "@codemirror/view": "^0.19.29",
-    "@emotion/react": "^11.7.0",
+    "@emotion/react": "^11.7.1",
     "@emotion/styled": "^11.6.0",
     "@fontsource/jetbrains-mono": "^4.5.0",
     "@fontsource/roboto": "^4.5.1",
diff --git a/subprojects/language-web/src/main/js/App.tsx b/subprojects/frontend/src/App.tsx
index 54f92f9a..54f92f9a 100644
--- a/subprojects/language-web/src/main/js/App.tsx
+++ b/subprojects/frontend/src/App.tsx
diff --git a/subprojects/language-web/src/main/js/RootStore.tsx b/subprojects/frontend/src/RootStore.tsx
index baf0b61e..baf0b61e 100644
--- a/subprojects/language-web/src/main/js/RootStore.tsx
+++ b/subprojects/frontend/src/RootStore.tsx
diff --git a/subprojects/language-web/src/main/js/editor/EditorArea.tsx b/subprojects/frontend/src/editor/EditorArea.tsx
index dba20f6e..dba20f6e 100644
--- a/subprojects/language-web/src/main/js/editor/EditorArea.tsx
+++ b/subprojects/frontend/src/editor/EditorArea.tsx
diff --git a/subprojects/language-web/src/main/js/editor/EditorButtons.tsx b/subprojects/frontend/src/editor/EditorButtons.tsx
index 150aa00d..150aa00d 100644
--- a/subprojects/language-web/src/main/js/editor/EditorButtons.tsx
+++ b/subprojects/frontend/src/editor/EditorButtons.tsx
diff --git a/subprojects/language-web/src/main/js/editor/EditorParent.ts b/subprojects/frontend/src/editor/EditorParent.ts
index 94ca24ea..94ca24ea 100644
--- a/subprojects/language-web/src/main/js/editor/EditorParent.ts
+++ b/subprojects/frontend/src/editor/EditorParent.ts
diff --git a/subprojects/language-web/src/main/js/editor/EditorStore.ts b/subprojects/frontend/src/editor/EditorStore.ts
index 5760de28..5760de28 100644
--- a/subprojects/language-web/src/main/js/editor/EditorStore.ts
+++ b/subprojects/frontend/src/editor/EditorStore.ts
diff --git a/subprojects/language-web/src/main/js/editor/GenerateButton.tsx b/subprojects/frontend/src/editor/GenerateButton.tsx
index 3834cec4..3834cec4 100644
--- a/subprojects/language-web/src/main/js/editor/GenerateButton.tsx
+++ b/subprojects/frontend/src/editor/GenerateButton.tsx
diff --git a/subprojects/language-web/src/main/js/editor/decorationSetExtension.ts b/subprojects/frontend/src/editor/decorationSetExtension.ts
index 2d630c20..2d630c20 100644
--- a/subprojects/language-web/src/main/js/editor/decorationSetExtension.ts
+++ b/subprojects/frontend/src/editor/decorationSetExtension.ts
diff --git a/subprojects/language-web/src/main/js/editor/findOccurrences.ts b/subprojects/frontend/src/editor/findOccurrences.ts
index 92102746..92102746 100644
--- a/subprojects/language-web/src/main/js/editor/findOccurrences.ts
+++ b/subprojects/frontend/src/editor/findOccurrences.ts
diff --git a/subprojects/language-web/src/main/js/editor/semanticHighlighting.ts b/subprojects/frontend/src/editor/semanticHighlighting.ts
index 2aed421b..2aed421b 100644
--- a/subprojects/language-web/src/main/js/editor/semanticHighlighting.ts
+++ b/subprojects/frontend/src/editor/semanticHighlighting.ts
diff --git a/subprojects/language-web/src/main/js/global.d.ts b/subprojects/frontend/src/global.d.ts
index 0533a46e..0533a46e 100644
--- a/subprojects/language-web/src/main/js/global.d.ts
+++ b/subprojects/frontend/src/global.d.ts
diff --git a/subprojects/language-web/src/main/html/index.html b/subprojects/frontend/src/index.html
index f404aa8a..f404aa8a 100644
--- a/subprojects/language-web/src/main/html/index.html
+++ b/subprojects/frontend/src/index.html
diff --git a/subprojects/language-web/src/main/css/index.scss b/subprojects/frontend/src/index.scss
index ad876aaf..ad876aaf 100644
--- a/subprojects/language-web/src/main/css/index.scss
+++ b/subprojects/frontend/src/index.scss
diff --git a/subprojects/language-web/src/main/js/index.tsx b/subprojects/frontend/src/index.tsx
index d368c9ba..15b26adb 100644
--- a/subprojects/language-web/src/main/js/index.tsx
+++ b/subprojects/frontend/src/index.tsx
@@ -6,7 +6,7 @@ import { App } from './App';
 import { RootStore, RootStoreProvider } from './RootStore';
 import { ThemeProvider } from './theme/ThemeProvider';
 
-import '../css/index.scss';
+import './index.scss';
 
 const initialValue = `class Family {
     contains Person[] members
diff --git a/subprojects/language-web/src/main/js/language/folding.ts b/subprojects/frontend/src/language/folding.ts
index 5d51f796..5d51f796 100644
--- a/subprojects/language-web/src/main/js/language/folding.ts
+++ b/subprojects/frontend/src/language/folding.ts
diff --git a/subprojects/language-web/src/main/js/language/indentation.ts b/subprojects/frontend/src/language/indentation.ts
index 6d36ed3b..6d36ed3b 100644
--- a/subprojects/language-web/src/main/js/language/indentation.ts
+++ b/subprojects/frontend/src/language/indentation.ts
diff --git a/subprojects/language-web/src/main/js/language/problem.grammar b/subprojects/frontend/src/language/problem.grammar
index bccc2e31..1ace2872 100644
--- a/subprojects/language-web/src/main/js/language/problem.grammar
+++ b/subprojects/frontend/src/language/problem.grammar
@@ -1,6 +1,6 @@
 @detectDelim
 
-@external prop implicitCompletion from '../../../../src/main/js/language/props.ts'
+@external prop implicitCompletion from '../../../../src/language/props.ts'
 
 @top Problem { statement* }
 
diff --git a/subprojects/language-web/src/main/js/language/problemLanguageSupport.ts b/subprojects/frontend/src/language/problemLanguageSupport.ts
index 6508a2c0..b858ba91 100644
--- a/subprojects/language-web/src/main/js/language/problemLanguageSupport.ts
+++ b/subprojects/frontend/src/language/problemLanguageSupport.ts
@@ -9,7 +9,7 @@ import {
 } from '@codemirror/language';
 import { LRParser } from '@lezer/lr';
 
-import { parser } from '../../../../build/generated/sources/lezer/problem';
+import { parser } from '../../build/generated/sources/lezer/problem';
 import {
   foldBlockComment,
   foldConjunction,
diff --git a/subprojects/language-web/src/main/js/language/props.ts b/subprojects/frontend/src/language/props.ts
index 8e488bf5..8e488bf5 100644
--- a/subprojects/language-web/src/main/js/language/props.ts
+++ b/subprojects/frontend/src/language/props.ts
diff --git a/subprojects/language-web/src/main/js/theme/EditorTheme.ts b/subprojects/frontend/src/theme/EditorTheme.ts
index 1b0dd5de..294192fa 100644
--- a/subprojects/language-web/src/main/js/theme/EditorTheme.ts
+++ b/subprojects/frontend/src/theme/EditorTheme.ts
@@ -1,6 +1,6 @@
 import type { PaletteMode } from '@mui/material';
 
-import cssVariables from '../../css/themeVariables.module.scss';
+import cssVariables from '../themeVariables.module.scss';
 
 export enum EditorTheme {
   Light,
diff --git a/subprojects/language-web/src/main/js/theme/ThemeProvider.tsx b/subprojects/frontend/src/theme/ThemeProvider.tsx
index f5b50be1..f5b50be1 100644
--- a/subprojects/language-web/src/main/js/theme/ThemeProvider.tsx
+++ b/subprojects/frontend/src/theme/ThemeProvider.tsx
diff --git a/subprojects/language-web/src/main/js/theme/ThemeStore.ts b/subprojects/frontend/src/theme/ThemeStore.ts
index ffaf6dde..ffaf6dde 100644
--- a/subprojects/language-web/src/main/js/theme/ThemeStore.ts
+++ b/subprojects/frontend/src/theme/ThemeStore.ts
diff --git a/subprojects/language-web/src/main/css/themeVariables.module.scss b/subprojects/frontend/src/themeVariables.module.scss
index 85af4219..85af4219 100644
--- a/subprojects/language-web/src/main/css/themeVariables.module.scss
+++ b/subprojects/frontend/src/themeVariables.module.scss
diff --git a/subprojects/language-web/src/main/css/themes.scss b/subprojects/frontend/src/themes.scss
index a30f1de3..a30f1de3 100644
--- a/subprojects/language-web/src/main/css/themes.scss
+++ b/subprojects/frontend/src/themes.scss
diff --git a/subprojects/language-web/src/main/js/utils/ConditionVariable.ts b/subprojects/frontend/src/utils/ConditionVariable.ts
index 0910dfa6..0910dfa6 100644
--- a/subprojects/language-web/src/main/js/utils/ConditionVariable.ts
+++ b/subprojects/frontend/src/utils/ConditionVariable.ts
diff --git a/subprojects/language-web/src/main/js/utils/PendingTask.ts b/subprojects/frontend/src/utils/PendingTask.ts
index 51b79fb0..51b79fb0 100644
--- a/subprojects/language-web/src/main/js/utils/PendingTask.ts
+++ b/subprojects/frontend/src/utils/PendingTask.ts
diff --git a/subprojects/language-web/src/main/js/utils/Timer.ts b/subprojects/frontend/src/utils/Timer.ts
index 8f653070..8f653070 100644
--- a/subprojects/language-web/src/main/js/utils/Timer.ts
+++ b/subprojects/frontend/src/utils/Timer.ts
diff --git a/subprojects/language-web/src/main/js/utils/logger.ts b/subprojects/frontend/src/utils/logger.ts
index 306d122c..306d122c 100644
--- a/subprojects/language-web/src/main/js/utils/logger.ts
+++ b/subprojects/frontend/src/utils/logger.ts
diff --git a/subprojects/language-web/src/main/js/xtext/ContentAssistService.ts b/subprojects/frontend/src/xtext/ContentAssistService.ts
index 8b872e06..8b872e06 100644
--- a/subprojects/language-web/src/main/js/xtext/ContentAssistService.ts
+++ b/subprojects/frontend/src/xtext/ContentAssistService.ts
diff --git a/subprojects/language-web/src/main/js/xtext/HighlightingService.ts b/subprojects/frontend/src/xtext/HighlightingService.ts
index dfbb4a19..dfbb4a19 100644
--- a/subprojects/language-web/src/main/js/xtext/HighlightingService.ts
+++ b/subprojects/frontend/src/xtext/HighlightingService.ts
diff --git a/subprojects/language-web/src/main/js/xtext/OccurrencesService.ts b/subprojects/frontend/src/xtext/OccurrencesService.ts
index bc865537..bc865537 100644
--- a/subprojects/language-web/src/main/js/xtext/OccurrencesService.ts
+++ b/subprojects/frontend/src/xtext/OccurrencesService.ts
diff --git a/subprojects/language-web/src/main/js/xtext/UpdateService.ts b/subprojects/frontend/src/xtext/UpdateService.ts
index e78944a9..e78944a9 100644
--- a/subprojects/language-web/src/main/js/xtext/UpdateService.ts
+++ b/subprojects/frontend/src/xtext/UpdateService.ts
diff --git a/subprojects/language-web/src/main/js/xtext/ValidationService.ts b/subprojects/frontend/src/xtext/ValidationService.ts
index ff7d3700..ff7d3700 100644
--- a/subprojects/language-web/src/main/js/xtext/ValidationService.ts
+++ b/subprojects/frontend/src/xtext/ValidationService.ts
diff --git a/subprojects/language-web/src/main/js/xtext/XtextClient.ts b/subprojects/frontend/src/xtext/XtextClient.ts
index 0898e725..0898e725 100644
--- a/subprojects/language-web/src/main/js/xtext/XtextClient.ts
+++ b/subprojects/frontend/src/xtext/XtextClient.ts
diff --git a/subprojects/language-web/src/main/js/xtext/XtextWebSocketClient.ts b/subprojects/frontend/src/xtext/XtextWebSocketClient.ts
index 2ce20a54..2ce20a54 100644
--- a/subprojects/language-web/src/main/js/xtext/XtextWebSocketClient.ts
+++ b/subprojects/frontend/src/xtext/XtextWebSocketClient.ts
diff --git a/subprojects/language-web/src/main/js/xtext/xtextMessages.ts b/subprojects/frontend/src/xtext/xtextMessages.ts
index c4305fcf..c4305fcf 100644
--- a/subprojects/language-web/src/main/js/xtext/xtextMessages.ts
+++ b/subprojects/frontend/src/xtext/xtextMessages.ts
diff --git a/subprojects/language-web/src/main/js/xtext/xtextServiceResults.ts b/subprojects/frontend/src/xtext/xtextServiceResults.ts
index f79b059c..f79b059c 100644
--- a/subprojects/language-web/src/main/js/xtext/xtextServiceResults.ts
+++ b/subprojects/frontend/src/xtext/xtextServiceResults.ts
diff --git a/subprojects/language-web/tsconfig.json b/subprojects/frontend/tsconfig.json
index cb5f6b13..94c357c5 100644
--- a/subprojects/language-web/tsconfig.json
+++ b/subprojects/frontend/tsconfig.json
@@ -13,6 +13,6 @@
     "noEmit": true,
     "skipLibCheck": true
   },
-  "include": ["./src/main/js/**/*"],
+  "include": ["./src/**/*"],
   "exclude": ["./build/generated/sources/lezer/*"]
 }
diff --git a/subprojects/language-web/tsconfig.sonar.json b/subprojects/frontend/tsconfig.sonar.json
index 54eef68b..9db12b91 100644
--- a/subprojects/language-web/tsconfig.sonar.json
+++ b/subprojects/frontend/tsconfig.sonar.json
@@ -12,6 +12,5 @@
     "noEmit": true,
     "skipLibCheck": true
   },
-  "include": ["./src/main/js/**/*"],
-  "exclude": ["./src/main/js/xtext/**/*"]
+  "include": ["./src/**/*"]
 }
diff --git a/subprojects/language-web/webpack.config.js b/subprojects/frontend/webpack.config.js
index 801a705c..bacb7e4a 100644
--- a/subprojects/language-web/webpack.config.js
+++ b/subprojects/frontend/webpack.config.js
@@ -13,10 +13,11 @@ const currentNodeEnv = process.env.NODE_ENV || 'development';
 const devMode = currentNodeEnv !== 'production';
 const outputPath = path.resolve(__dirname, 'build/webpack', currentNodeEnv);
 
-const portNumberOrElse = (envName, fallback) => {
+function portNumberOrElse (envName, fallback) {
   const value = process.env[envName];
   return value ? parseInt(value) : fallback;
-};
+}
+
 const listenHost = process.env['LISTEN_HOST'] || 'localhost';
 const listenPort = portNumberOrElse('LISTEN_PORT', 1313);
 const apiHost = process.env['API_HOST'] || listenHost;
@@ -24,78 +25,34 @@ const apiPort = portNumberOrElse('API_PORT', 1312);
 const publicHost = process.env['PUBLIC_HOST'] || listenHost;
 const publicPort = portNumberOrElse('PUBLIC_PORT', listenPort);
 
-const resolveSources = sources => path.resolve(__dirname, 'src', sources);
-const mainJsSources = resolveSources('main/js');
-const babelLoaderFilters = {
-  include: [mainJsSources],
-};
-const babelPresets = [
-  [
-    '@babel/preset-env',
-    {
-      targets: 'defaults',
-    },
-  ],
-  '@babel/preset-react',
-];
-const babelPlugins = [
-  '@babel/plugin-transform-runtime',
-]
-const magicCommentsLoader = {
-  loader: 'magic-comments-loader',
-  options: {
-    webpackChunkName: true,
-  }
-};
-
 module.exports = {
   mode: devMode ? 'development' : 'production',
-  entry: './src/main/js',
+  entry: './src/index',
   output: {
     path: outputPath,
     publicPath: '/',
     filename: devMode ? '[name].js' : '[name].[contenthash].js',
-    chunkFilename: devMode ? '[name].js' : '[name].[contenthash].js',
-    assetModuleFilename: devMode ? '[name].js' : '[name].[contenthash][ext]',
+    assetModuleFilename: devMode ? '[name][ext]' : '[name].[contenthash][ext]',
     clean: true,
     crossOriginLoading: 'anonymous',
   },
   module: {
     rules: [
       {
-        test: /\.jsx?$/i,
-        ...babelLoaderFilters,
+        test: /.[jt]sx?$/i,
+        include: [path.resolve(__dirname, 'src')],
         use: [
           {
             loader: 'babel-loader',
             options: {
-              presets: babelPresets,
-              plugins: [
+              presets: [
                 [
-                  '@babel/plugin-proposal-class-properties',
+                  '@babel/preset-env',
                   {
-                    loose: false,
+                    targets: 'defaults',
                   },
-                  ...babelPlugins,
                 ],
-              ],
-              assumptions: {
-                'setPublicClassFields': false,
-              },
-            },
-          },
-          magicCommentsLoader,
-        ],
-      },
-      {
-        test: /.tsx?$/i,
-        ...babelLoaderFilters,
-        use: [
-          {
-            loader: 'babel-loader',
-            options: {
-              presets: [
-                ...babelPresets,
+                '@babel/preset-react',
                 [
                   '@babel/preset-typescript',
                   {
@@ -107,10 +64,11 @@ module.exports = {
                   },
                 ]
               ],
-              plugins: babelPlugins,
+              plugins: [
+                '@babel/plugin-transform-runtime',
+              ],
             },
           },
-          magicCommentsLoader,
         ],
       },
       {
@@ -145,11 +103,7 @@ module.exports = {
     ],
   },
   resolve: {
-    modules: [
-      'node_modules',
-      mainJsSources,
-    ],
-    extensions: ['.js', '.jsx', '.ts', '.tsx'],
+    extensions: ['.ts', '.tsx', '.js', '.jsx'],
   },
   devtool: devMode ? 'inline-source-map' : 'source-map',
   optimization: {
@@ -157,19 +111,6 @@ module.exports = {
     sideEffects: devMode ? 'flag' : true,
     splitChunks: {
       chunks: 'all',
-      cacheGroups: {
-        defaultVendors: {
-          test: /[\\/]node_modules[\\/]/,
-          priority: -10,
-          reuseExistingChunk: true,
-          filename: devMode ? 'vendor.[id].js' : 'vendor.[contenthash].js',
-        },
-        default: {
-          minChunks: 2,
-          priority: -20,
-          reuseExistingChunk: true,
-        },
-      },
     },
   },
   devServer: {
@@ -205,16 +146,7 @@ module.exports = {
     }),
     new SubresourceIntegrityPlugin(),
     new HtmlWebpackPlugin({
-      template: 'src/main/html/index.html',
-      minify: devMode ? false : {
-        collapseWhitespace: true,
-        removeComments: true,
-        removeOptionalTags: true,
-        removeRedundantAttributes: true,
-        removeScriptTypeAttributes: true,
-        removeStyleLinkTypeAttributes: true,
-        useShortDoctype: true,
-      },
+      template: 'src/index.html',
     }),
     new HtmlWebpackInjectPreload({
       files: [
diff --git a/subprojects/language-web/.editorconfig b/subprojects/language-web/.editorconfig
deleted file mode 100644
index 1b78e967..00000000
--- a/subprojects/language-web/.editorconfig
+++ /dev/null
@@ -1,5 +0,0 @@
-[src/main/css/xtext/**.css]
-indent_style = tab
-
-[src/main/js/xtext/**.js]
-indent_style = tab
diff --git a/subprojects/language-web/build.gradle b/subprojects/language-web/build.gradle
index a549288a..6be4d5e8 100644
--- a/subprojects/language-web/build.gradle
+++ b/subprojects/language-web/build.gradle
@@ -1,10 +1,14 @@
 plugins {
-        id 'refinery-frontend-workspace'
         id 'refinery-java-application'
         id 'refinery-xtext-conventions'
 }
 
-import org.siouan.frontendgradleplugin.infrastructure.gradle.RunYarn
+configurations {
+        webapp {
+                canBeConsumed = false
+                canBeResolved = true
+        }
+}
 
 dependencies {
         implementation project(':refinery-language')
@@ -16,6 +20,7 @@ dependencies {
         implementation libs.jetty.websocket.server
         implementation libs.slf4j.simple
         implementation libs.slf4j.log4j
+        webapp project(path: ':refinery-frontend', configuration: 'productionAssets')
         testImplementation testFixtures(project(':refinery-language'))
         testImplementation libs.jetty.websocket.client
 }
@@ -28,120 +33,36 @@ for (taskName in ['compileJava', 'processResources']) {
         }
 }
 
-def webpackOutputDir = "${buildDir}/webpack"
-def productionResources = "${webpackOutputDir}/production"
-def serverMainClass = 'tools.refinery.language.web.ServerLauncher'
-
-frontend {
-        assembleScript = 'assemble:webpack'
-}
-
-def installFrontend = tasks.named('installFrontend')
-
-def generateLezerGrammar = tasks.register('generateLezerGrammar', RunYarn) {
-        dependsOn installFrontend
-        inputs.file('src/main/js/language/problem.grammar')
-        inputs.files('package.json', 'yarn.lock')
-        outputs.file "${buildDir}/generated/sources/lezer/problem.ts"
-        outputs.file "${buildDir}/generated/sources/lezer/problem.terms.ts"
-        script = 'run assemble:lezer'
-}
-
-def assembleFrontend = tasks.named('assembleFrontend')
-assembleFrontend.configure {
-        dependsOn generateLezerGrammar
-        inputs.dir 'src/main/css'
-        inputs.dir 'src/main/html'
-        inputs.dir 'src/main/js'
-        inputs.file "${buildDir}/generated/sources/lezer/problem.ts"
-        inputs.file "${buildDir}/generated/sources/lezer/problem.terms.ts"
-        inputs.files('package.json', 'yarn.lock', 'webpack.config.js')
-        outputs.dir productionResources
-}
-
-def eslint = tasks.register('eslint', RunYarn) {
-        dependsOn installFrontend
-        inputs.dir 'src/main/js'
-        inputs.files('.eslintrc.js', 'tsconfig.json')
-        if (project.hasProperty('ci')) {
-                outputs.file "${buildDir}/eslint.json"
-                script = 'run check:eslint:ci'
-        } else {
-                script = 'run check:eslint'
-        }
-        group = 'verification'
-        description = 'Check for TypeScript errors.'
-}
-
-def stylelint = tasks.register('stylelint', RunYarn) {
-        dependsOn installFrontend
-        inputs.dir 'src/main/css'
-        inputs.file '.stylelintrc.js'
-        if (project.hasProperty('ci')) {
-                outputs.file "${buildDir}/stylelint.json"
-                script = 'run check:stylelint:ci'
-        } else {
-                script = 'run check:stylelint'
-        }
-        group = 'verification'
-        description = 'Check for Sass errors.'
-}
-
-tasks.named('check') {
-        dependsOn(eslint, stylelint)
-}
-
-mainClassName = serverMainClass
+mainClassName = 'tools.refinery.language.web.ServerLauncher'
 
 tasks.named('jar') {
-        dependsOn assembleFrontend
-        from(productionResources) {
+        dependsOn project.configurations.webapp
+        from(project.configurations.webapp) {
                 into 'webapp'
         }
 }
 
 tasks.named('shadowJar') {
-        dependsOn assembleFrontend
-        from(project.convention.getPlugin(JavaPluginConvention).sourceSets.main.output)
+        dependsOn project.configurations.webapp
+        from(project.sourceSets.main.output)
         configurations = [project.configurations.runtimeClasspath]
         exclude('META-INF/INDEX.LIST', 'META-INF/*.SF', 'META-INF/*.DSA', 'META-INF/*.RSA','schema/*',
                 '.options', '.api_description', '*.profile', 'about.*', 'about_*.html', 'about_files/*',
                 'plugin.xml', 'systembundle.properties', 'profile.list', 'META-INF/resources/xtext/**')
         append('plugin.properties')
-        from(productionResources) {
+        from(project.configurations.webapp) {
                 into 'webapp'
         }
 }
 
 def jettyRun = tasks.register('jettyRun', JavaExec) {
-        dependsOn assembleFrontend
+        dependsOn project.configurations.webapp
         dependsOn sourceSets.main.runtimeClasspath
-        classpath = sourceSets.main.runtimeClasspath.filter{it.exists()}
-        mainClass = serverMainClass
+        classpath = sourceSets.main.runtimeClasspath
+        mainClass = mainClassName
         standardInput = System.in
-        environment BASE_RESOURCE: productionResources
+        def baseResource = project.configurations.webapp.incoming.artifacts.artifactFiles.first()
+        environment BASE_RESOURCE: baseResource
         group = 'run'
         description = 'Start a Jetty web server serving the Xtex API and assets.'
 }
-
-tasks.register('webpackServe', RunYarn) {
-        dependsOn installFrontend
-        dependsOn generateLezerGrammar
-        outputs.dir "${webpackOutputDir}/development"
-        script = 'run serve'
-        group = 'run'
-        description = 'Start a Webpack dev server with hot module replacement.'
-}
-
-sonarqube.properties {
-        properties['sonar.sources'] += [
-                'src/main/css',
-                'src/main/html',
-                'src/main/js',
-        ]
-        property 'sonar.nodejs.executable', "${frontend.nodeInstallDirectory.get()}/bin/node"
-        property 'sonar.eslint.reportPaths', "${buildDir}/eslint.json"
-        property 'sonar.css.stylelint.reportPaths', "${buildDir}/stylelint.json"
-        // SonarJS does not pick up typescript files with `exactOptionalPropertyTypes`
-        property 'sonar.typescript.tsconfigPath', 'tsconfig.sonar.json'
-}