Generate all files on build

4 files changed, 144 insertions, 46 deletions

diff --git a/language-web/build.gradle b/language-web/build.gradle
index 3e0008da..ff0f9e9c 100644
--- a/language-web/build.gradle
+++ b/language-web/build.gradle
@@ -1,31 +1,76 @@
-plugins {
-        id 'war'
-}
-
 dependencies {
         compile project(':language')
         compile project(':language-ide')
         compile "org.eclipse.xtext:org.eclipse.xtext.xbase.web:${xtextVersion}"
         compile "org.eclipse.xtext:org.eclipse.xtext.web.servlet:${xtextVersion}"
         compile "org.eclipse.xtend:org.eclipse.xtend.lib:${xtextVersion}"
-        compile "org.webjars:requirejs:2.3.6"
-        compile "org.webjars:requirejs-text:2.0.15"
-        compile "org.webjars:jquery:3.6.0"
-        // CodeMirror 5.53.0 and later is incompatible with Xtext due to
-        // https://github.com/codemirror/CodeMirror/commit/b2d26b4ccb1d0994ae84d18ad8b84018de176da9#commitcomment-41525744
-        compile "org.webjars.npm:codemirror:5.52.2"
-        providedCompile "org.eclipse.jetty:jetty-annotations:9.4.42.v20210604"
-        providedCompile "org.eclipse.jetty:jetty-rewrite:9.4.42.v20210604"
-        providedCompile "org.slf4j:slf4j-simple:1.7.31"
+        compile "org.eclipse.jetty:jetty-server:9.4.42.v20210604"
+        compile "org.eclipse.jetty:jetty-annotations:9.4.42.v20210604"
+        compile "org.slf4j:slf4j-simple:1.7.31"
+}
+
+def webpackOutputDir = "${buildDir}/webpack"
+def productionResources = "${webpackOutputDir}/production"
+def mainClass = 'org.eclipse.viatra.solver.language.web.ServerLauncher'
+
+apply plugin: 'com.moowork.node'
+
+for (environment in ['production', 'development']) {
+        def taskName = 'webpack' + environment.substring(0, 1).toUpperCase() + environment.substring(1);
+        task(taskName, type: NpmTask) {
+                dependsOn ':language:generateXtext'
+                inputs.dir 'src/main/css'
+                inputs.dir 'src/main/html'
+                inputs.dir 'src/main/js'
+                inputs.dir "${buildDir}/generated/sources/xtext/js"
+                inputs.file 'webpack.config.js'
+                outputs.dir "${webpackOutputDir}/${environment}"
+                args = ['run', 'build']
+                setEnvironment NODE_ENV: environment
+        }
+}
+
+apply plugin: 'application'
+mainClassName = mainClass
+distZip.enabled = false
+
+jar {
+        dependsOn webpackProduction
+        from(productionResources) {
+                into 'webapp'
+        }
+}
+
+apply plugin: 'com.github.johnrengelman.shadow'
+shadowDistZip.enabled = false
+
+shadowJar {
+        dependsOn webpackProduction
+        from(project.convention.getPlugin(JavaPluginConvention).sourceSets.main.output)
+        configurations = [project.configurations.runtime]
+        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) {
+                into 'webapp'
+        }
 }
 
-task jettyRun(type:JavaExec) {
-        dependsOn(sourceSets.main.runtimeClasspath)
+task jettyRun(type: JavaExec) {
+        dependsOn webpackDevelopment
+        dependsOn sourceSets.main.runtimeClasspath
         classpath = sourceSets.main.runtimeClasspath.filter{it.exists()}
-        main = 'org.eclipse.viatra.solver.language.web.ServerLauncher'
+        main = mainClass
         standardInput = System.in
         group = 'run'
         description = 'Starts an example Jetty server with your language'
+        environment(
+                DEV_MODE: 'true',
+                LISTEN_ADDRESS: 'localhost',
+                LISTEN_PORT: '1313',
+                BASE_RESOURCE: "${webpackOutputDir}/development"
+        )
 }
 
 eclipse {
diff --git a/language-web/package.json b/language-web/package.json
index c503b306..f75aeced 100644
--- a/language-web/package.json
+++ b/language-web/package.json
@@ -1,10 +1,11 @@
 {
   "name": "language-web",
-  "version": "0.1.0",
+  "version": "1.0.0",
   "description": "Web frontend for VIATRA-Generator",
   "main": "index.js",
   "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
+    "test": "echo \"Error: no test specified\" && exit 1",
+    "build": "webpack"
   },
   "repository": {
     "type": "git",
diff --git a/language-web/src/main/java/org/eclipse/viatra/solver/language/web/ServerLauncher.java b/language-web/src/main/java/org/eclipse/viatra/solver/language/web/ServerLauncher.java
index d0b2562a..7127d7d5 100644
--- a/language-web/src/main/java/org/eclipse/viatra/solver/language/web/ServerLauncher.java
+++ b/language-web/src/main/java/org/eclipse/viatra/solver/language/web/ServerLauncher.java
@@ -3,55 +3,106 @@
  */
 package org.eclipse.viatra.solver.language.web;
 
+import java.io.IOException;
 import java.net.InetSocketAddress;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.net.URL;
+
 import org.eclipse.jetty.annotations.AnnotationConfiguration;
 import org.eclipse.jetty.server.Server;
 import org.eclipse.jetty.util.log.Slf4jLog;
+import org.eclipse.jetty.util.resource.Resource;
 import org.eclipse.jetty.webapp.Configuration;
 import org.eclipse.jetty.webapp.MetaInfConfiguration;
 import org.eclipse.jetty.webapp.WebAppContext;
 import org.eclipse.jetty.webapp.WebInfConfiguration;
 import org.eclipse.jetty.webapp.WebXmlConfiguration;
 
-/**
- * This program starts an HTTP server for testing the web integration of your
- * DSL. Just execute it and point a web browser to http://localhost:8080/
- */
 public class ServerLauncher {
-        public static void main(String[] args) {
-                Server server = new Server(new InetSocketAddress("localhost", 1313));
+        private static final Slf4jLog LOG = new Slf4jLog(ServerLauncher.class.getName());
+
+        private final Server server;
+
+        public ServerLauncher(InetSocketAddress bindAddress, Resource baseResource) throws IOException, URISyntaxException {
+                server = new Server(bindAddress);
                 WebAppContext ctx = new WebAppContext();
-                ctx.setResourceBase("src/main/webapp");
+                ctx.setBaseResource(baseResource);
                 ctx.setWelcomeFiles(new String[] { "index.html" });
                 ctx.setContextPath("/");
                 ctx.setConfigurations(new Configuration[] { new AnnotationConfiguration(), new WebXmlConfiguration(),
                                 new WebInfConfiguration(), new MetaInfConfiguration() });
-                ctx.setAttribute(WebInfConfiguration.CONTAINER_JAR_PATTERN, ".*/language-web/.*,.*\\.jar");
+                ctx.setAttribute(WebInfConfiguration.CONTAINER_JAR_PATTERN, ".*/build/classes/.*,.*\\.jar");
                 ctx.setInitParameter("org.eclipse.jetty.servlet.Default.useFileMappedBuffer", "false");
                 server.setHandler(ctx);
-                Slf4jLog log = new Slf4jLog(ServerLauncher.class.getName());
-                try {
-                        server.start();
-                        log.info("Server started " + server.getURI() + "...");
-                        new Thread() {
-                                public void run() {
-                                        try {
-                                                log.info("Press enter to stop the server...");
-                                                int key = System.in.read();
-                                                if (key != -1) {
-                                                        server.stop();
-                                                } else {
-                                                        log.warn(
-                                                                        "Console input is not available. In order to stop the server, you need to cancel process manually.");
-                                                }
-                                        } catch (Exception e) {
-                                                log.warn(e);
+        }
+
+        public void start() throws Exception {
+                server.start();
+                LOG.info("Server started " + server.getURI() + "...");
+                new Thread() {
+                        public void run() {
+                                try {
+                                        LOG.info("Press enter to stop the server...");
+                                        int key = System.in.read();
+                                        if (key != -1) {
+                                                server.stop();
+                                        } else {
+                                                LOG.warn(
+                                                                "Console input is not available. In order to stop the server, you need to cancel process manually.");
                                         }
+                                } catch (Exception e) {
+                                        LOG.warn(e);
+                                        System.exit(-1);
                                 }
-                        }.start();
+                        }
+                }.start();
+                try {
                         server.join();
+                } catch (InterruptedException e) {
+                        LOG.info(e);
+                }
+        }
+
+        private static InetSocketAddress getBindAddress(String listenAddress, int port) {
+                if (listenAddress == null) {
+                        return new InetSocketAddress(port);
+                }
+                return new InetSocketAddress(listenAddress, port);
+        }
+
+        private static Resource getBaseResource(String baseResourceOverride) throws IOException, URISyntaxException {
+                if (baseResourceOverride != null) {
+                        return Resource.newResource(baseResourceOverride);
+                }
+                URL indexUrlInJar = ServerLauncher.class.getResource("/webapp/index.html");
+                if (indexUrlInJar == null) {
+                        throw new RuntimeException("Cannot find pacakged web assets");
+                }
+                URI webRootUri = URI.create(indexUrlInJar.toURI().toASCIIString().replaceFirst("/index.html$", "/"));
+                return Resource.newResource(webRootUri);
+        }
+
+        public static void main(String[] args) {
+                String listenAddress = System.getenv("LiSTEN_ADDRESS");
+                int port = 8080;
+                String portStr = System.getenv("LISTEN_PORT");
+                if (portStr != null) {
+                        try {
+                                port = Integer.parseInt(portStr);
+                        } catch (NumberFormatException e) {
+                                LOG.warn(e);
+                                System.exit(-1);
+                        }
+                }
+                String baseResourceOverride = System.getenv("BASE_RESOURCE");
+                try {
+                        InetSocketAddress bindAddress = getBindAddress(listenAddress, port);
+                        Resource baseResource = getBaseResource(baseResourceOverride);
+                        ServerLauncher serverLauncher = new ServerLauncher(bindAddress, baseResource);
+                        serverLauncher.start();
                 } catch (Exception exception) {
-                        log.warn(exception.getMessage());
+                        LOG.warn(exception);
                         System.exit(1);
                 }
         }
diff --git a/language-web/webpack.config.js b/language-web/webpack.config.js
index bd999a85..ec07d4cf 100644
--- a/language-web/webpack.config.js
+++ b/language-web/webpack.config.js
@@ -4,12 +4,13 @@ const HtmlWebpackPlugin = require('html-webpack-plugin');
 const MiniCssExtractPlugin = require("mini-css-extract-plugin");
 
 const devMode = process.env.NODE_ENV !== 'production';
+const outputPath = path.resolve(__dirname, 'build/webpack', devMode ? 'development' : 'production');
 
 module.exports = {
   mode: devMode ? 'development' : 'production',
   entry: './src/main/js',
   output: {
-    path: path.resolve(__dirname, 'src/main/webapp'),
+    path: outputPath,
     publicPath: '/',
     filename: devMode ? '[name].js' : '[contenthash].js',
     chunkFilename: devMode ? '[id].js' : '[contenthash].js',