build fix test

egovernments · Jun 6, 2024 · 01f0826 · 01f0826
1 parent f86fe48
commit 01f0826
Show file tree

Hide file tree

Showing 10 changed files with 42 additions and 14 deletions.
diff --git a/.github/workflows/mfe-core-ui-docker.yml.yml b/.github/workflows/mfe-core-ui-docker.yml.yml
@@ -2,9 +2,10 @@ name: core ui service docker Image CI
 
 on:
   push:
-    branches: [ "develop-mfe","develop-mfe-microplan-common-pkgs" ]
+    branches: [ "develop-mfe","develop-mfe-microplan-common-pkgs","develop-mfe-build-test" ]
   pull_request:
-    branches: [ "develop-mfe","develop-mfe-microplan-common-pkgs" ]
+    branches: [ "develop-mfe", "develop-mfe-microplan-common-pkgs","develop-mfe-build-test" ]
+
 
 jobs:
 

diff --git a/.github/workflows/mfe-dss-ui-docker.yml b/.github/workflows/mfe-dss-ui-docker.yml
@@ -2,9 +2,9 @@ name: dss ui service docker Image CI
 
 on:
   push:
-    branches: [ "develop-mfe","develop-mfe-microplan-common-pkgs" ]
+    branches: [ "develop-mfe","develop-mfe-microplan-common-pkgs","develop-mfe-build-test" ]
   pull_request:
-    branches: [ "develop-mfe","develop-mfe-microplan-common-pkgs" ]
+    branches: [ "develop-mfe", "develop-mfe-microplan-common-pkgs","develop-mfe-build-test" ]
 
 jobs:
 

diff --git a/.github/workflows/mfe-engagement-ui-docker.yml b/.github/workflows/mfe-engagement-ui-docker.yml
@@ -2,9 +2,10 @@ name: engagement ui service docker Image CI
 
 on:
   push:
-    branches: [ "develop-mfe","develop-mfe-microplan-common-pkgs" ]
+    branches: [ "develop-mfe","develop-mfe-microplan-common-pkgs","develop-mfe-build-test" ]
   pull_request:
-    branches: [ "develop-mfe","develop-mfe-microplan-common-pkgs" ]
+    branches: [ "develop-mfe", "develop-mfe-microplan-common-pkgs","develop-mfe-build-test" ]
+
 
 jobs:
 

diff --git a/.github/workflows/mfe-hrms-ui-docker.yml b/.github/workflows/mfe-hrms-ui-docker.yml
@@ -2,9 +2,10 @@ name: hrms ui service docker Image CI
 
 on:
   push:
-    branches: [ "develop-mfe","develop-mfe-microplan-common-pkgs" ]
+    branches: [ "develop-mfe","develop-mfe-microplan-common-pkgs","develop-mfe-build-test" ]
   pull_request:
-    branches: [ "develop-mfe","develop-mfe-microplan-common-pkgs" ]
+    branches: [ "develop-mfe", "develop-mfe-microplan-common-pkgs","develop-mfe-build-test" ]
+
 
 jobs:
 

diff --git a/.github/workflows/mfe-microplan-web-docker.yml b/.github/workflows/mfe-microplan-web-docker.yml
@@ -2,9 +2,9 @@ name: microplan ui service docker Image CI
 
 on:
   push:
-    branches: [ "develop-mfe","develop-mfe-microplan-common-pkgs" ]
+    branches: [ "develop-mfe","develop-mfe-microplan-common-pkgs","develop-mfe-build-test" ]
   pull_request:
-    branches: [ "develop-mfe", "develop-mfe-microplan-common-pkgs" ]
+    branches: [ "develop-mfe", "develop-mfe-microplan-common-pkgs","develop-mfe-build-test" ]
 
 jobs:
 

diff --git a/.github/workflows/mfe-pgr-ui-docker.yml b/.github/workflows/mfe-pgr-ui-docker.yml
@@ -2,9 +2,10 @@ name: pgr ui service docker Image CI
 
 on:
   push:
-    branches: [ "develop-mfe","develop-mfe-microplan-common-pkgs" ]
+    branches: [ "develop-mfe","develop-mfe-microplan-common-pkgs","develop-mfe-build-test" ]
   pull_request:
-    branches: [ "develop-mfe","develop-mfe-microplan-common-pkgs" ]
+    branches: [ "develop-mfe", "develop-mfe-microplan-common-pkgs","develop-mfe-build-test" ]
+
 jobs:
 
   build:

diff --git a/.github/workflows/mfe-workbench-web-docker.yml b/.github/workflows/mfe-workbench-web-docker.yml
@@ -2,9 +2,9 @@ name: workbench ui service docker Image CI
 
 on:
   push:
-    branches: [ "develop-mfe","develop-mfe-microplan-common-pkgs" ]
+    branches: [ "develop-mfe","develop-mfe-microplan-common-pkgs","develop-mfe-build-test" ]
   pull_request:
-    branches: [ "develop-mfe","develop-mfe-microplan-common-pkgs" ]
+    branches: [ "develop-mfe", "develop-mfe-microplan-common-pkgs","develop-mfe-build-test" ]
 
 jobs:
 

diff --git a/micro-ui/web/packages/core/package.json b/micro-ui/web/packages/core/package.json
@@ -50,5 +50,13 @@
     "react-i18next": "11.16.2",
     "i18next-browser-languagedetector": "^7.2.1",
     "i18next-http-backend": "^2.5.1"
+  },
+  "resolutions":  {
+    "**/babel-loader": "8.2.2",
+    "**/@babel/core": "7.14.0",
+    "**/@babel/preset-env": "7.14.0",
+    "**/@babel/plugin-transform-modules-commonjs": "7.14.0",
+    "**/polished":"4.2.2",
+    "fast-uri":"2.1.0"
   }
 }
diff --git a/micro-ui/web/packages/microplan/package.json b/micro-ui/web/packages/microplan/package.json
@@ -52,5 +52,13 @@
     "shpjs": "^4.0.4",
     "uuid": "^9.0.1",
     "xlsx": "0.17.5"
+  },
+  "resolutions":  {
+    "**/babel-loader": "8.2.2",
+    "**/@babel/core": "7.14.0",
+    "**/@babel/preset-env": "7.14.0",
+    "**/@babel/plugin-transform-modules-commonjs": "7.14.0",
+    "**/polished":"4.2.2",
+    "fast-uri":"2.1.0"
   }
 }
diff --git a/micro-ui/web/packages/workbench/package.json b/micro-ui/web/packages/workbench/package.json
@@ -62,5 +62,13 @@
     "@heroicons/react": "^1.0.1",
     "@mkeeorg/federation-ui": "^1.3.0",
     "classnames": "^2.3.2"
+  },
+  "resolutions":  {
+    "**/babel-loader": "8.2.2",
+    "**/@babel/core": "7.14.0",
+    "**/@babel/preset-env": "7.14.0",
+    "**/@babel/plugin-transform-modules-commonjs": "7.14.0",
+    "**/polished":"4.2.2",
+    "fast-uri":"2.1.0"
   }
 }