Remove duplicates not needed in runtime-tools-dev-ui-webapp

apache · Sep 25, 2023 · 1b29c9b · 1b29c9b
1 parent f36c3a2
commit 1b29c9b
Show file tree

Hide file tree

Showing 4 changed files with 64 additions and 237 deletions.
diff --git a/runtime-tools-quarkus-extension-parent/runtime-tools-quarkus-extension-deployment/pom.xml b/runtime-tools-quarkus-extension-parent/runtime-tools-quarkus-extension-deployment/pom.xml
@@ -113,7 +113,23 @@
               <outputDirectory>${basedir}/target/classes/dev-static/webapp</outputDirectory>
               <resources>
                 <resource>
-                  <directory>${path.to.webapp.app}/dist</directory>
+                  <directory>${path.to.webapp.app}/dist/resources/webapp</directory>
+                  <filtering>false</filtering>
+                </resource>
+              </resources>
+            </configuration>
+          </execution>
+          <execution>
+            <id>copy-webapp2</id>
+            <phase>process-resources</phase>
+            <goals>
+              <goal>copy-resources</goal>
+            </goals>
+            <configuration>
+              <outputDirectory>${basedir}/target/classes/dev-static/</outputDirectory>
+              <resources>
+                <resource>
+                  <directory>${path.to.webapp.app}/dist/webapp</directory>
                   <filtering>false</filtering>
                 </resource>
               </resources>

diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/package.json b/ui-packages/packages/runtime-tools-dev-ui-webapp/package.json
@@ -119,7 +119,7 @@
     "cypress": "^12.17.0",
     "express": "^4.18.2",
     "file-loader": "^6.2.0",
-    "filemanager-webpack-plugin": "^6.1.7",
+    "filemanager-webpack-plugin": "^7.0.0",
     "html-webpack-plugin": "^5.5.3",
     "https-browserify": "^1.0.0",
     "identity-obj-proxy": "^3.0.0",

diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/webpack.common.js b/ui-packages/packages/runtime-tools-dev-ui-webapp/webpack.common.js
@@ -65,8 +65,10 @@ module.exports = {
           copy: [
             { source: './dist/envelope.js', destination: './dist/resources/webapp/' },
             { source: './dist/envelope.js.map', destination: './dist/resources/webapp/' },
-            { source: './dist/*.js', destination: './dist/webapp/' },
-            { source: './dist/*.map', destination: './dist/webapp/' },
+            { source: './dist/standalone.js', destination: './dist/resources/webapp/' },
+            { source: './dist/standalone.js.map', destination: './dist/resources/webapp/' },
+            { source: './dist/*.js', destination: './dist/webapp/', globOptions: {ignore: ['./dist/envelope.js', './dist/standalone.js']} },
+            { source: './dist/*.map', destination: './dist/webapp/', globOptions: {ignore: ['./dist/envelope.js.map', './dist/standalone.js.map']}},
             { source: './dist/fonts', destination: './dist/webapp/fonts/' },
             {
               source: './dist/monitoring-webapp',
@@ -76,7 +78,8 @@ module.exports = {
               source: './dist/custom-dashboard-view',
               destination: './dist/resources/webapp/custom-dashboard-view'
             }
-          ]
+          ],
+          delete: ['./dist/*.js*', './dist/fonts', './dist/standalone']
         }
       }
     }),