Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(webpack): correct dev server proxy mapping #3450

Merged
merged 3 commits into from
May 26, 2023
Merged

chore(webpack): correct dev server proxy mapping #3450

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b9a328f
chore(webpack): correct dev server proxy mapping
tasso94 May 24, 2023
0b9872b
dir & ContextHandler for camunda-welcome
danielkelemen May 24, 2023
f6bb7b6
chore(webapps): fix camunda-welcome for dev-e2e and develop
tasso94 May 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 40 additions & 0 deletions webapps/assembly/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand Down Expand Up @@ -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" />
Comment on lines +396 to +397
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I couldn't combine this with the previous ant config. 🤷‍♂️

</tasks>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId>
Expand All @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion webapps/frontend/webpack.dev.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ module.exports = (_env, argv = {}) => {
'^/api': ''
}
},
'/camunda-welcome/': {
'/camunda-welcome': {
target: 'http://localhost:8080/',
logLevel: 'debug'
},
Expand Down