fixed versioning issues

egovernments · Mar 18, 2024 · dc0386a · dc0386a
1 parent f6f53c6
commit dc0386a
Show file tree

Hide file tree

Showing 22 changed files with 131 additions and 55 deletions.
diff --git a/micro-ui/web/packages/AttendenceMgmt/package.json b/micro-ui/web/packages/AttendenceMgmt/package.json
@@ -18,7 +18,7 @@
     "react-router-dom": "5.3.0"
   },
   "dependencies": {
-    "@egovernments/digit-ui-react-components": "1.4.108",
+    "@egovernments/digit-ui-react-components": "^1.5.0",
     "react": "17.0.2",
     "react-date-range": "^1.4.0",
     "react-dom": "17.0.2",

diff --git a/micro-ui/web/packages/Expenditure/package.json b/micro-ui/web/packages/Expenditure/package.json
@@ -18,7 +18,7 @@
     "react-router-dom": "5.3.0"
   },
   "dependencies": {
-    "@egovernments/digit-ui-react-components": "1.4.108",
+    "@egovernments/digit-ui-react-components": "1.4.102",
     "react": "17.0.2",
     "react-date-range": "^1.4.0",
     "react-dom": "17.0.2",

diff --git a/micro-ui/web/packages/app1/package.json b/micro-ui/web/packages/app1/package.json
@@ -20,7 +20,7 @@
     "serve": "^13.0.2",
     "single-spa": "^5.9.3",
     "@digit-ui/digit-ui-libraries-mfe": "1.0.7",
-    "@egovernments/digit-ui-react-components":"1.4.108",
+    "@egovernments/digit-ui-react-components":"1.4.107",
     "react": "17.0.2",
     "react-dom": "17.0.2",
     "react-query": "3.6.1",

diff --git a/micro-ui/web/packages/auth/package.json b/micro-ui/web/packages/auth/package.json
@@ -21,10 +21,10 @@
     "html-webpack-plugin": "^5.5.0"
   },
   "dependencies": {
-    "react": "17.021",
+    "react": "17.02",
     "react-dom": "17.0.2",
     "react-router-dom": "5.3.0",
     "rxjs": "6.6.3",
-    "@egovernments/digit-ui-react-components":"1.4.108"
+    "@egovernments/digit-ui-react-components":"1.4.105"
   }
 }
diff --git a/micro-ui/web/packages/common/package.json b/micro-ui/web/packages/common/package.json
@@ -10,7 +10,7 @@
     "build": "webpack --config webpack.prod.js"
   },
   "dependencies": {
-    "@egovernments/digit-ui-react-components": "1.4.108",
+    "@egovernments/digit-ui-react-components": "1.4.106",
     "react": "17.0.2",
     "react-dom": "17.0.2",
     "react-hook-form": "6.15.8",

diff --git a/micro-ui/web/packages/container/package.json b/micro-ui/web/packages/container/package.json
@@ -25,6 +25,6 @@
     "react-dom": "17.0.2",
     "react-router-dom": "5.3.0",
     "rxjs": "6.6.3",
-    "@egovernments/digit-ui-react-components": "1.4.108"
+    "@egovernments/digit-ui-react-components": "1.4.102"
   }
 }
diff --git a/micro-ui/web/packages/core/package.json b/micro-ui/web/packages/core/package.json
@@ -26,7 +26,7 @@
   },
   "dependencies": {
     "@digit-ui/digit-ui-libraries-mfe": "1.0.7",
-    "@egovernments/digit-ui-react-components": "1.4.108",
+    "@egovernments/digit-ui-react-components": "1.4.107",
     "react": "17.0.2",
     "react-dom": "17.0.2",
     "react-i18next": "11.16.2",

diff --git a/micro-ui/web/packages/core/src/modules/registerRemotes.js b/micro-ui/web/packages/core/src/modules/registerRemotes.js
@@ -32,27 +32,27 @@ export default (queryClient) => {
     },
   });
 
-  // registerApplication({
-  //   name: "PGR",
-  //   app: () => import("pgr/PGRModule"),
-  //   activeWhen: `/${window.contextPath ? window.contextPath : "core-digit-ui"}/employee/pgr/`,
-  //   customProps: {
-  //     title: "PGR is running on host",
-  //     queryClient,
-  //     userType
-  //   },
-  //  });
+  registerApplication({
+    name: "PGR",
+    app: () => import("pgr/PGRModule"),
+    activeWhen: `/${window.contextPath ? window.contextPath : "core-digit-ui"}/employee/pgr/`,
+    customProps: {
+      title: "PGR is running on host",
+      queryClient,
+      userType
+    },
+   });
 
-  //  registerApplication({
-  //   name: "Dss",
-  //   app: () => import("dss/DSSModule"),
-  //   activeWhen: `/${window.contextPath ? window.contextPath : "core-digit-ui"}/employee/dss`,
-  //   customProps: {
-  //     title: "DSS is running on host",
-  //     queryClient,
-  //     userType
-  //   },
-  // });
+   registerApplication({
+    name: "Dss",
+    app: () => import("dss/DSSModule"),
+    activeWhen: `/${window.contextPath ? window.contextPath : "core-digit-ui"}/employee/dss`,
+    customProps: {
+      title: "DSS is running on host",
+      queryClient,
+      userType
+    },
+  });
 
     registerApplication({
     name: "HRMS",

diff --git a/micro-ui/web/packages/core/webpack.dev.js b/micro-ui/web/packages/core/webpack.dev.js
@@ -46,9 +46,9 @@ module.exports = () => {
           hrms: "hrms@https://localhost:8085/remoteEntry.js",
           workbench: "workbench@https://localhost:8086/remoteEntry.js",
           common:"common@https://localhost:8090/remoteEntry.js",
-          // pgr:"pgr@https://localhost:8087/remoteEntry.js",
+          pgr:"pgr@https://localhost:8087/remoteEntry.js",
           // app1: "app1@https://localhost:8001/remoteEntry.js",
-          // dss: "dss@https://localhost:8088/remoteEntry.js",
+          dss: "dss@https://localhost:8088/remoteEntry.js",
           // measurement : "measurement@https://localhost:8088/remoteEntry.js"
         },
         shared: packageJson.dependencies,

diff --git a/micro-ui/web/packages/core/webpack.prod.js b/micro-ui/web/packages/core/webpack.prod.js
@@ -21,7 +21,7 @@ module.exports = () => {
           // dashboard: `dashboard@${domain}/dashboard/remoteEntry.js`,
           hrms: `hrms@${domain}/hrms-ui/remoteEntry.js`,
           common: `common@${domain}/common-ui/remoteEntry.js`,
-          // pgr: `pgr@${domain}/pgr-ui/remoteEntry.js`,
+          pgr: `pgr@${domain}/pgr-ui/remoteEntry.js`,
           workbench : `workbench@${domain}/workbench-mfe/remoteEntry.js`,
           dss : `dss@${domain}/dss-ui/remoteEntry.js`,
           // measurement : `measurement@${domain}/measurement/remoteEntry.js`

diff --git a/micro-ui/web/packages/dss/package.json b/micro-ui/web/packages/dss/package.json
@@ -23,8 +23,7 @@
   },
   "dependencies": {
     "@digit-ui/digit-ui-libraries-mfe": "1.0.6",
-    "@egovernments/digit-ui-react-components": "1.4.108",
-    "@egovernments/digit-ui-svg-components": "1.0.0",
+    "@egovernments/digit-ui-react-components": "1.4.106",
     "jsonpath": "^1.1.1",
     "lodash": "4.17.21",
     "react": "17.0.2",

diff --git a/micro-ui/web/packages/dss/webpack.dev.js b/micro-ui/web/packages/dss/webpack.dev.js
@@ -19,22 +19,22 @@ module.exports = () => {
           target: 'https://unified-dev.digit.org',
           secure: true,
           changeOrigin: true,
-          bypass: function (req, res, proxyOptions){
-            if(req.headers.accept.indexOf('html') !== -1){
+          bypass: function (req, res, proxyOptions) {
+            if (req.headers.accept.indexOf('html') !== -1) {
               console.log('Skipping proxy for browser request.');
               return '/index.html';
             }
           },
-          headers:{
-            "Connection" : "keep-alive"
+          headers: {
+            "Connection": "keep-alive"
           },
         },
-      
+
       ],
       historyApiFallback: {
         index: "/",
       },
-      server:"https", //Enable HTTPS
+      server: "https", //Enable HTTPS
     },
     plugins: [
       new ModuleFederationPlugin({
@@ -43,7 +43,28 @@ module.exports = () => {
         exposes: {
           "./DSSModule": "./src/SingleSpaEntry",
         },
-        shared: packageJson.dependencies,
+        shared: {
+          "jsonpath": "^1.1.1",
+          "lodash": "4.17.21",
+          "react": "17.0.2",
+          "react-date-range": "1.4.0",
+          "react-dom": "17.0.2",
+          "react-hook-form": "6.15.8",
+          "react-i18next": "11.16.2",
+          "react-inlinesvg": "1.1.7",
+          "react-query": "3.6.1",
+          "react-router-dom": "5.3.0",
+          "react-select": "5.7.4",
+          "react-simple-maps": "2.0.0",
+          "react-time-picker": "4.2.1",
+          "react-tooltip": "4.1.2",
+          "recharts": "^2.0.9",
+          "single-spa-react": "^4.6.1",
+          "webpack": "^5.68.0",
+          "webpack-cli": "^4.9.2",
+          "webpack-dev-server": "^4.8.1",
+          "webpack-merge": "5.7.3"
+        },
       }),
       new HtmlWebpackPlugin({
         template: "./public/index.html",

diff --git a/micro-ui/web/packages/dss/webpack.prod.js b/micro-ui/web/packages/dss/webpack.prod.js
@@ -17,7 +17,28 @@ module.exports = () => {
         exposes: {
           "./DSSModule": "./src/SingleSpaEntry",
         },
-        shared: packageJson.dependencies
+        shared: {
+          "jsonpath": "^1.1.1",
+          "lodash": "4.17.21",
+          "react": "17.0.2",
+          "react-date-range": "1.4.0",
+          "react-dom": "17.0.2",
+          "react-hook-form": "6.15.8",
+          "react-i18next": "11.16.2",
+          "react-inlinesvg": "1.1.7",
+          "react-query": "3.6.1",
+          "react-router-dom": "5.3.0",
+          "react-select": "5.7.4",
+          "react-simple-maps": "2.0.0",
+          "react-time-picker": "4.2.1",
+          "react-tooltip": "4.1.2",
+          "recharts": "^2.0.9",
+          "single-spa-react": "^4.6.1",
+          "webpack": "^5.68.0",
+          "webpack-cli": "^4.9.2",
+          "webpack-dev-server": "^4.8.1",
+          "webpack-merge": "5.7.3"
+        }
       }),
     ],
   };

diff --git a/micro-ui/web/packages/hrms/package.json b/micro-ui/web/packages/hrms/package.json
@@ -29,7 +29,7 @@
     "react-router-dom": "5.3.0",
     "rxjs": "6.6.3",
     "@digit-ui/digit-ui-libraries-mfe": "1.0.6",
-    "@egovernments/digit-ui-react-components":"1.4.108",
+    "@egovernments/digit-ui-react-components":"1.4.106",
     "react-hook-form": "6.15.8",
     "react-i18next": "11.16.2",
     "react-query": "3.6.1",

diff --git a/micro-ui/web/packages/hrms/webpack.dev.js b/micro-ui/web/packages/hrms/webpack.dev.js
@@ -43,7 +43,21 @@ module.exports = () => {
         exposes: {
           "./HRMSModule": "./src/SingleSpaEntry",
         },
-        shared: packageJson.dependencies,
+        shared: {
+          "single-spa-react": "^4.6.1",
+          "react": "17.0.2",
+          "react-dom": "17.0.2",
+          "react-router-dom": "5.3.0",
+          "rxjs": "6.6.3",
+          "react-hook-form": "6.15.8",
+          "react-i18next": "11.16.2",
+          "react-query": "3.6.1",
+          "rooks": "^4.4.0",
+          "webpack": "^5.68.0",
+          "webpack-cli": "^4.9.2",
+          "webpack-dev-server": "^4.8.1",
+          "webpack-merge": "5.7.3"
+        },
       }),
       new HtmlWebpackPlugin({
         template: "./public/index.html",

diff --git a/micro-ui/web/packages/measurement/package.json b/micro-ui/web/packages/measurement/package.json
@@ -25,7 +25,7 @@
     "react": "17.0.2",
     "react-dom": "17.0.2",
     "react-router-dom": "5.3.0",
-    "@egovernments/digit-ui-react-components":"1.4.108",
+    "@egovernments/digit-ui-react-components":"1.4.105",
     "@digit-ui/digit-ui-module-core-base":"1.0.8",
     "react-date-range": "^1.4.0",
     "react-hook-form": "6.15.8",

diff --git a/micro-ui/web/packages/pgr/package.json b/micro-ui/web/packages/pgr/package.json
@@ -7,7 +7,8 @@
     "predeploy": "yarn build",
     "deploy": "gh-pages -d dist",
     "start": "webpack serve --config webpack.dev.js",
-    "build": "webpack --config webpack.prod.js"
+    "build": "webpack --config webpack.prod.js",
+    "build:dev": "webpack --config webpack.dev.js --mode development"
   },
   "homepage": "http://design-egov.github.io/auth",
   "keywords": [],
@@ -24,10 +25,7 @@
   },
   "dependencies": {
     "single-spa-react": "^4.6.1",
-    "@digit-ui/digit-ui-libraries-mfe": "1.0.6",
-    "@digit-ui/digit-ui-module-core-base": "1.0.8",
-    "@egovernments/digit-ui-react-components": "1.4.108",
-    "@egovernments/digit-ui-svg-components": "1.0.0",
+    "@egovernments/digit-ui-react-components": "1.4.107",
     "@rjsf/core": "5.10.0",
     "@rjsf/utils": "5.10.0",
     "@rjsf/validator-ajv8": "5.10.0",

diff --git a/micro-ui/web/packages/ui-components/package.json b/micro-ui/web/packages/ui-components/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@egovernments/digit-ui-react-components",
-  "version": "1.4.108",
+  "version": "1.4.107",
   "license": "MIT",
   "main": "dist/main.js",
   "module": "dist/main.js",
@@ -48,7 +48,7 @@
     "dist"
   ],
   "dependencies": {
-    "@egovernments/digit-ui-svg-components":"1.0.0",
+    "@egovernments/digit-ui-svg-components":"0.0.6",
     "@googlemaps/js-api-loader": "1.13.10",
     "@hookform/resolvers": "1.3.7",
     "ajv": "^8.12.0",

diff --git a/micro-ui/web/packages/ui-core/package.json b/micro-ui/web/packages/ui-core/package.json
@@ -16,7 +16,7 @@
     "prepublish": "yarn build"
   },
   "dependencies": {
-    "@egovernments/digit-ui-react-components": "1.4.108",
+    "@egovernments/digit-ui-react-components": "1.4.106",
     "react": "17.0.2",
     "react-dom": "17.0.2",
     "react-i18next": "11.16.2",

diff --git a/micro-ui/web/packages/workbench/package.json b/micro-ui/web/packages/workbench/package.json
@@ -45,7 +45,7 @@
     "single-spa-react": "^4.6.1",
     "xlsx": "0.17.5",
     "@digit-ui/digit-ui-libraries-mfe": "1.0.6",
-    "@egovernments/digit-ui-react-components":"1.4.108",
+    "@egovernments/digit-ui-react-components":"1.4.106",
     "@rjsf/core": "5.10.0",
     "@rjsf/utils": "5.10.0",
     "@rjsf/validator-ajv8": "5.10.0",

diff --git a/micro-ui/web/packages/workbench/webpack.dev.js b/micro-ui/web/packages/workbench/webpack.dev.js
@@ -49,7 +49,28 @@ module.exports = () => {
         exposes: {
           "./WorkbenchModule": "./src/SingleSpaEntry",
         },
-        shared: packageJson.dependencies,
+        shared: {
+          "single-spa-react": "^4.6.1",
+          "xlsx": "0.17.5",
+          "@rjsf/core": "5.10.0",
+          "@rjsf/utils": "5.10.0",
+          "@rjsf/validator-ajv8": "5.10.0",
+          "react": "17.0.2",
+          "react-date-range": "1.4.0",
+          "react-dom": "17.0.2",
+          "react-hook-form": "6.15.8",
+          "react-i18next": "11.16.2",
+          "react-query": "3.6.1",
+          "react-router-dom": "5.3.0",
+          "react-select": "5.7.4",
+          "webpack": "^5.68.0",
+          "webpack-cli": "^4.9.2",
+          "webpack-dev-server": "^4.8.1",
+          "webpack-merge": "5.7.3",
+          "@heroicons/react": "^1.0.1",
+          "@mkeeorg/federation-ui": "^1.3.0",
+          "classnames": "^2.3.2"
+        },
       }),
       new HtmlWebpackPlugin({
         template: "./public/index.html",

diff --git a/micro-ui/web/packages/workbench/webpack.prod.js b/micro-ui/web/packages/workbench/webpack.prod.js
@@ -20,7 +20,6 @@ module.exports = () => {
         shared: {
           "single-spa-react": "^4.6.1",
           "xlsx": "0.17.5",
-          "@egovernments/digit-ui-react-components":"1.4.108",
           "@rjsf/core": "5.10.0",
           "@rjsf/utils": "5.10.0",
           "@rjsf/validator-ajv8": "5.10.0",
@@ -36,6 +35,9 @@ module.exports = () => {
           "webpack-cli": "^4.9.2",
           "webpack-dev-server": "^4.8.1",
           "webpack-merge": "5.7.3",
+          "@heroicons/react": "^1.0.1",
+          "@mkeeorg/federation-ui": "^1.3.0",
+          "classnames": "^2.3.2"
         }
       }),
     ],