Merge pull request #671 from odisha-muktasoft/COMP

fixed the component version related issue
odisha-muktasoft · Sep 17, 2024 · 1160f09 · 1160f09
2 parents 9f973a1 + a411879
commit 1160f09
Show file tree

Hide file tree

Showing 13 changed files with 39 additions and 57 deletions.
diff --git a/.github/workflows/publishUIPackages.yml b/.github/workflows/publishUIPackages.yml
@@ -11,18 +11,6 @@ on:
       - 'MUKTA-DEVELOP-v2.1.1'
     paths:
       - 'frontend/micro-ui/web/micro-ui-internals/**'
-  pull_request:
-    branches: 
-      # Push events on main branch
-      - 'master'
-      # Push events to branches matching refs/heads/mona/octocat
-      - 'develop'
-      # Push events to branches matching refs/heads/releases/10
-      - 'MUKTA-v2.1-Develop' 
-      # Push events to branches matching refs/heads/releases/10
-      - 'MUKTA-DEVELOP-v2.1.1'
-    paths:
-      - 'frontend/micro-ui/web/micro-ui-internals/**'
 
 
 jobs:

diff --git a/frontend/micro-ui/web/micro-ui-internals/example/package.json b/frontend/micro-ui/web/micro-ui-internals/example/package.json
@@ -9,21 +9,21 @@
     "start": "react-scripts start"
   },
   "devDependencies": {
+    "@egovernments/digit-ui-react-components": "1.5.12",
+    "@egovernments/digit-ui-components": "0.0.2-beta.37",
     "@egovernments/digit-ui-libraries": "1.5.0",
     "@egovernments/digit-ui-module-core": "1.8.2-beta.10",
-    "@egovernments/digit-ui-components": "0.0.2-beta.37",
     "@egovernments/digit-ui-module-hrms": "1.5.26",
     "@egovernments/digit-ui-module-dss": "1.5.52",
-    "@egovernments/digit-ui-react-components": "^1.5.0",
-    "@egovernments/digit-ui-module-attendencemgmt": "0.4.5",
-    "@egovernments/digit-ui-module-contracts": "0.4.5",
-    "@egovernments/digit-ui-module-measurement":"0.2.2",
-    "@egovernments/digit-ui-module-estimate": "0.4.8",
-    "@egovernments/digit-ui-module-masters": "0.4.7",
-    "@egovernments/digit-ui-module-project": "0.4.5",
-    "@egovernments/digit-ui-module-expenditure": "0.4.3",
-    "@egovernments/digit-ui-customisation-mukta": "0.2.3",
-    "@egovernments/digit-ui-module-rate-analysis": "0.4.3",
+    "@egovernments/digit-ui-module-attendencemgmt": "0.4.6",
+    "@egovernments/digit-ui-module-contracts": "0.4.6",
+    "@egovernments/digit-ui-module-measurement":"0.2.3",
+    "@egovernments/digit-ui-module-estimate": "0.4.9",
+    "@egovernments/digit-ui-module-masters": "0.4.8",
+    "@egovernments/digit-ui-module-project": "0.4.6",
+    "@egovernments/digit-ui-module-expenditure": "0.4.4",
+    "@egovernments/digit-ui-customisation-mukta": "0.2.4",
+    "@egovernments/digit-ui-module-rate-analysis": "0.4.4",
     "http-proxy-middleware": "^1.0.5",
     "react": "17.0.2",
     "react-dom": "17.0.2",

diff --git a/frontend/micro-ui/web/micro-ui-internals/package.json b/frontend/micro-ui/web/micro-ui-internals/package.json
@@ -4,15 +4,10 @@
   "main": "index.js",
   "workspaces": [
     "packages/libraries",
-    "example",
-    "packages/css",
     "packages/react-components",
-    "packages/modules/*",
     "packages/modules/Estimate",
-    "packages/modules/Project",
-    "packages/modules/Expenditure",
-    "packages/Mukta",
-    "packages/modules/RateAnalysis"
+    "packages/modules/RateAnalysis",
+    "packages/Mukta"
   ],
   "author": "JaganKumar <[email protected]>",
   "license": "MIT",
@@ -44,15 +39,15 @@
     "buildD": "run-p buildD:**",
     "build:libraries": "cd packages/libraries && yarn build",
     "build:components": "cd packages/react-components && yarn build",
-    "build:attendencemgmt": "cd packages/modules/AttendenceMgmt && yarn build",
-    "build:contracts": "cd packages/modules/Contracts && yarn build",
-    "build:masters": "cd packages/modules/Masters && yarn build",
+    "buildD:attendencemgmt": "cd packages/modules/AttendenceMgmt && yarn build",
+    "buildD:contracts": "cd packages/modules/Contracts && yarn build",
+    "buildD:masters": "cd packages/modules/Masters && yarn build",
     "build:estimate": "cd packages/modules/Estimate && yarn build",
-    "build:measurement": "cd packages/modules/Measurement && yarn build",
+    "buildD:measurement": "cd packages/modules/Measurement && yarn build",
     "build:mukta": "cd packages/Mukta && yarn build",
-    "build:project": "cd packages/modules/Project && yarn build",
+    "buildD:project": "cd packages/modules/Project && yarn build",
     "buildD:works": "cd packages/modules/works && yarn build",
-    "build:expenditure": "cd packages/modules/Expenditure && yarn build",
+    "buildD:expenditure": "cd packages/modules/Expenditure && yarn build",
     "build:rateAnalysis":"cd packages/modules/RateAnalysis && yarn build",
     "deploy:jenkins": "./scripts/jenkins.sh",
     "clean": "rm -rf node_modules"

diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/Mukta/package.json b/frontend/micro-ui/web/micro-ui-internals/packages/Mukta/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@egovernments/digit-ui-customisation-mukta",
-    "version": "0.2.3",
+    "version": "0.2.4",
     "description": "MUKTA Customisation of Works UI",
     "main": "dist/index.js",
     "module": "dist/index.modern.js",

diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/AttendenceMgmt/package.json b/frontend/micro-ui/web/micro-ui-internals/packages/modules/AttendenceMgmt/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@egovernments/digit-ui-module-attendencemgmt",
-  "version": "0.4.5",
+  "version": "0.4.6",
   "description": "Attendence Management Module UI",
   "main": "dist/index.js",
   "module": "dist/index.modern.js",

diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/Contracts/package.json b/frontend/micro-ui/web/micro-ui-internals/packages/modules/Contracts/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@egovernments/digit-ui-module-contracts",
-    "version": "0.4.5",
+    "version": "0.4.6",
     "description": "Contracts Module UI",
     "main": "dist/index.js",
     "module": "dist/index.modern.js",

diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/Estimate/package.json b/frontend/micro-ui/web/micro-ui-internals/packages/modules/Estimate/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@egovernments/digit-ui-module-estimate",
-    "version": "0.4.8",
+    "version": "0.4.9",
     "description": "Estimate Module UI",
     "main": "dist/index.js",
     "module": "dist/index.modern.js",

diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/Expenditure/package.json b/frontend/micro-ui/web/micro-ui-internals/packages/modules/Expenditure/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@egovernments/digit-ui-module-expenditure",
-    "version": "0.4.3",
+    "version": "0.4.4",
     "description": "Expenditure Management Module UI",
     "main": "dist/index.js",
     "module": "dist/index.modern.js",

diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/Masters/package.json b/frontend/micro-ui/web/micro-ui-internals/packages/modules/Masters/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@egovernments/digit-ui-module-masters",
-    "version": "0.4.7",
+    "version": "0.4.8",
     "description": "Masters Module UI",
     "main": "dist/index.js",
     "module": "dist/index.modern.js",

diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/Measurement/package.json b/frontend/micro-ui/web/micro-ui-internals/packages/modules/Measurement/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@egovernments/digit-ui-module-measurement",
-  "version": "0.2.2",
+  "version": "0.2.3",
   "description": "Measurement Module UI",
   "main": "dist/index.js",
   "module": "dist/index.modern.js",

diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/Project/package.json b/frontend/micro-ui/web/micro-ui-internals/packages/modules/Project/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@egovernments/digit-ui-module-project",
-    "version": "0.4.5",
+    "version": "0.4.6",
     "description": "Project Module UI",
     "main": "dist/index.js",
     "module": "dist/index.modern.js",

diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/RateAnalysis/package.json b/frontend/micro-ui/web/micro-ui-internals/packages/modules/RateAnalysis/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@egovernments/digit-ui-module-rate-analysis",
-  "version": "0.4.3",
+  "version": "0.4.4",
   "description": "Rate Analysis Module UI",
   "main": "dist/index.js",
   "module": "dist/index.modern.js",

diff --git a/frontend/micro-ui/web/package.json b/frontend/micro-ui/web/package.json
@@ -10,28 +10,27 @@
   "workspaces": [
     "micro-ui-internals/packages/libraries",
     "micro-ui-internals/packages/react-components",
-    "micro-ui-internals/packages/modules/Estimate",
-    "micro-ui-internals/packages/modules/Expenditure",
-    "micro-ui-internals/packages/modules/Measurement",
     "micro-ui-internals/packages/Mukta",
+    "micro-ui-internals/packages/modules/Estimate",
     "micro-ui-internals/packages/modules/RateAnalysis"
   ],
   "homepage": "/mukta-works-ui",
   "dependencies": {
     "@egovernments/digit-ui-react-components": "1.5.12",
     "@egovernments/digit-ui-libraries": "1.5.0",
+    "@egovernments/digit-ui-components": "0.0.2-beta.37",
     "@egovernments/digit-ui-module-core": "1.8.2-beta.10",
     "@egovernments/digit-ui-module-hrms": "1.5.26",
     "@egovernments/digit-ui-module-dss": "1.5.52",
-    "@egovernments/digit-ui-module-attendencemgmt": "0.4.5",
-    "@egovernments/digit-ui-module-contracts": "0.4.5",
-    "@egovernments/digit-ui-module-measurement":"0.2.2",
-    "@egovernments/digit-ui-module-estimate": "0.4.8",
-    "@egovernments/digit-ui-module-masters": "0.4.7",
-    "@egovernments/digit-ui-module-project": "0.4.5",
-    "@egovernments/digit-ui-module-expenditure": "0.4.3",
-    "@egovernments/digit-ui-customisation-mukta": "0.2.3",
-    "@egovernments/digit-ui-module-rate-analysis": "0.4.3",
+    "@egovernments/digit-ui-module-attendencemgmt": "0.4.6",
+    "@egovernments/digit-ui-module-contracts": "0.4.6",
+    "@egovernments/digit-ui-module-measurement":"0.2.3",
+    "@egovernments/digit-ui-module-estimate": "0.4.9",
+    "@egovernments/digit-ui-module-masters": "0.4.8",
+    "@egovernments/digit-ui-module-project": "0.4.6",
+    "@egovernments/digit-ui-module-expenditure": "0.4.4",
+    "@egovernments/digit-ui-customisation-mukta": "0.2.4",
+    "@egovernments/digit-ui-module-rate-analysis": "0.4.4",
     "babel-loader": "8.1.0",
     "clean-webpack-plugin": "4.0.0",
     "react": "17.0.2",