chore(webapps): fix camunda-welcome for dev-e2e and develop (#3450)

related to #3448 --------- Co-authored-by: Daniel Kelemen <daniel.kelemen@camunda.com>
camunda · May 26, 2023 · 5cfb1f3 · 5cfb1f3
1 parent 7df6604
commit 5cfb1f3
Show file tree

Hide file tree

Showing 2 changed files with 41 additions and 1 deletion.
diff --git a/webapps/assembly/pom.xml b/webapps/assembly/pom.xml
@@ -273,6 +273,21 @@
       </dependencies>
       <build>
         <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-antrun-plugin</artifactId>
+            <executions>
+              <execution>
+                <phase>generate-resources</phase>
+                <configuration>
+                  <tasks>
+                    <mkdir dir="${project.basedir}/target/webapp" />
+                    <mkdir dir="${project.basedir}/target/camunda-welcome" />
+                  </tasks>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
           <plugin>
             <groupId>org.eclipse.jetty</groupId>
             <artifactId>jetty-maven-plugin</artifactId>
@@ -285,6 +300,12 @@
                   <resourceBase>${project.basedir}/src/main/webapp</resourceBase>
                 </resourceBases>
               </webAppConfig>
+              <contextHandlers>
+                <contextHandler implementation="org.eclipse.jetty.maven.plugin.JettyWebAppContext">
+                  <war>${project.basedir}/target/camunda-welcome/</war>
+                  <contextPath>/camunda-welcome</contextPath>
+                </contextHandler>
+              </contextHandlers>
             </configuration>
           </plugin>
           <plugin>
@@ -364,6 +385,21 @@
       </dependencies>
       <build>
         <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-antrun-plugin</artifactId>
+            <executions>
+              <execution>
+                <phase>generate-resources</phase>
+                <configuration>
+                  <tasks>
+                    <mkdir dir="${project.basedir}/target/webapp" />
+                    <mkdir dir="${project.basedir}/target/camunda-welcome" />
+                  </tasks>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
           <plugin>
             <groupId>org.eclipse.jetty</groupId>
             <artifactId>jetty-maven-plugin</artifactId>
@@ -382,6 +418,10 @@
                   <war>${basedir}/target/engine-rest.war</war>
                   <contextPath>/engine-rest</contextPath>
                 </contextHandler>
+                <contextHandler implementation="org.eclipse.jetty.maven.plugin.JettyWebAppContext">
+                  <war>${project.basedir}/target/camunda-welcome/</war>
+                  <contextPath>/camunda-welcome</contextPath>
+                </contextHandler>
               </contextHandlers>
             </configuration>
             <dependencies>

diff --git a/webapps/frontend/webpack.dev.js b/webapps/frontend/webpack.dev.js
@@ -88,7 +88,7 @@ module.exports = (_env, argv = {}) => {
             '^/api': ''
           }
         },
-        '/camunda-welcome/': {
+        '/camunda-welcome': {
           target: 'http://localhost:8080/',
           logLevel: 'debug'
         },