- fix monaco-editor versions conflicts

apache · Oct 31, 2023 · 1dfaafa · 1dfaafa
1 parent 84b682d
commit 1dfaafa
Show file tree

Hide file tree

Showing 9 changed files with 3,134 additions and 9,272 deletions.
diff --git a/...verless-workflow-devui-parent/kogito-quarkus-serverless-workflow-devui-deployment/pom.xml b/...verless-workflow-devui-parent/kogito-quarkus-serverless-workflow-devui-deployment/pom.xml
@@ -136,6 +136,10 @@
                   <directory>${path.to.webapp.app}/dist/resources/webapp</directory>
                   <filtering>false</filtering>
                 </resource>
+                <resource>
+                  <directory>${path.to.webapp.app}/dist/webapp</directory>
+                  <filtering>false</filtering>
+                </resource>
               </resources>
             </configuration>
           </execution>
@@ -162,8 +166,8 @@
                   </includes>
                 </resource>
                 <!--copy diagram into the dev-static-->
-                 <resource>
-                  <directory>${path.to.webapp.app}/dist</directory>
+                <resource>
+                  <directory>${path.to.webapp.app}/dist/resources</directory>
                   <includes>
                     <include>diagram/</include>
                   </includes>

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
@@ -136,6 +136,10 @@
                   <directory>${path.to.webapp.app}/dist/resources/webapp</directory>
                   <filtering>false</filtering>
                 </resource>
+                <resource>
+                  <directory>${path.to.webapp.app}/dist/webapp</directory>
+                  <filtering>false</filtering>
+                </resource>
               </resources>
             </configuration>
           </execution>

diff --git a/...n/java/org/kie/kogito/runtime/tools/quarkus/extension/deployment/DevConsoleProcessor.java b/...n/java/org/kie/kogito/runtime/tools/quarkus/extension/deployment/DevConsoleProcessor.java
@@ -46,6 +46,7 @@
 public class DevConsoleProcessor {
 
     private static final String STATIC_RESOURCES_PATH = "dev-static/";
+    private static final String BASE_RELATIVE_URL = "/q/dev/org.kie.kogito.runtime-tools-quarkus-extension";
     private static final String DATA_INDEX_CAPABILITY = "org.kie.kogito.data-index";
 
     @SuppressWarnings("unused")
@@ -77,7 +78,13 @@ public void deployStaticResources(final DevConsoleRecorder recorder,
                 true);
 
         routeBuildItemBuildProducer.produce(new RouteBuildItem.Builder()
-                .route("/q/dev/org.kie.kogito.runtime-tools-quarkus-extension/resources/*")
+                .route(BASE_RELATIVE_URL + "/resources/*")
+                .handler(recorder.devConsoleHandler(devConsoleStaticResourcesDeploymentPath.toString(),
+                        shutdownContext))
+                .build());
+
+        routeBuildItemBuildProducer.produce(new RouteBuildItem.Builder()
+                .route(BASE_RELATIVE_URL + "/*")
                 .handler(recorder.devConsoleHandler(devConsoleStaticResourcesDeploymentPath.toString(),
                         shutdownContext))
                 .build());

diff --git a/ui-packages/package.json b/ui-packages/package.json
@@ -47,7 +47,10 @@
     "minimatch": "^3.0.5",
     "@types/react": "17.0.5",
     "ua-parser-js": "0.7.35",
-    "yaml": "2.3.1"
+    "yaml": "2.3.1",
+    "monaco-editor": "^0.39.0",
+    "react-monaco-editor": "^0.54.0",
+    "monaco-yaml": "^4.0.4"
   },
   "engines": {
     "node": ">=18",

diff --git a/ui-packages/packages/cloud-event-form/package.json b/ui-packages/packages/cloud-event-form/package.json
@@ -32,14 +32,12 @@
     "@kie-tools-core/envelope-bus": "0.32.0",
     "@kogito-apps/components-common": "workspace:*",
     "@patternfly/patternfly": "^4.224.2",
-    "@patternfly/react-code-editor": "4.82.113",
+    "@patternfly/react-code-editor": "^4.82.113",
     "@patternfly/react-core": "^4.276.8",
     "@patternfly/react-icons": "^4.93.6",
     "lodash": "^4.17.21",
-    "monaco-yaml": "^4.0.4",
     "react": "^17.0.2",
-    "react-dom": "^17.0.2",
-    "react-monaco-editor": "^0.49.0"
+    "react-dom": "^17.0.2"
   },
   "devDependencies": {
     "@babel/core": "^7.22.8",

diff --git a/ui-packages/packages/form-details/package.json b/ui-packages/packages/form-details/package.json
@@ -34,14 +34,12 @@
     "@kogito-apps/form-displayer": "workspace:*",
     "@kogito-apps/forms-list": "workspace:*",
     "@patternfly/patternfly": "^4.224.2",
-    "@patternfly/react-code-editor": "4.82.113",
+    "@patternfly/react-code-editor": "^4.82.113",
     "@patternfly/react-core": "^4.276.8",
     "@patternfly/react-icons": "^4.93.6",
     "lodash": "^4.17.21",
-    "monaco-yaml": "^4.0.4",
     "react": "^17.0.2",
-    "react-dom": "^17.0.2",
-    "react-monaco-editor": "^0.49.0"
+    "react-dom": "^17.0.2"
   },
   "devDependencies": {
     "@babel/core": "^7.22.8",

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
@@ -122,6 +122,10 @@ module.exports = {
             {
               source: './dist/custom-dashboard-view',
               destination: './dist/resources/webapp/custom-dashboard-view'
+            },
+            {
+              source: './dist/diagram',
+              destination: './dist/resources/diagram'
             }
           ],
           delete: ['./dist/*.js*', './dist/fonts', './dist/standalone']

diff --git a/ui-packages/packages/workflow-form/package.json b/ui-packages/packages/workflow-form/package.json
@@ -32,14 +32,12 @@
     "@kie-tools-core/envelope-bus": "0.32.0",
     "@kogito-apps/components-common": "workspace:*",
     "@patternfly/patternfly": "^4.224.2",
-    "@patternfly/react-code-editor": "4.82.113",
+    "@patternfly/react-code-editor": "^4.82.113",
     "@patternfly/react-core": "^4.276.8",
     "@patternfly/react-icons": "^4.93.6",
     "lodash": "^4.17.21",
-    "monaco-yaml": "^4.0.4",
     "react": "^17.0.2",
-    "react-dom": "^17.0.2",
-    "react-monaco-editor": "^0.49.0"
+    "react-dom": "^17.0.2"
   },
   "devDependencies": {
     "@babel/core": "^7.22.8",