From 2b64e6546bffdb9a0db6f1c294fb39da97200563 Mon Sep 17 00:00:00 2001 From: Rudraprasad Das Date: Mon, 2 Dec 2024 15:04:04 +0800 Subject: [PATCH] feat: git mod - shifting from yarn pkg to monolith (#37865) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## Description - Removing yarn based package for git - Adding git as a folder inside the src of the root project **Why?** Dependencies on code like request and AnalyticsUtil ## Automation /ok-to-test tags="@tag.Git" ### :mag: Cypress test results > [!TIP] > 🟢 🟢 🟢 All cypress tests have passed! 🎉 🎉 🎉 > Workflow run: > Commit: 310b351a3229407046318931ed697a885b524bdb > Cypress dashboard. > Tags: `@tag.Git` > Spec: >
Mon, 02 Dec 2024 06:55:35 UTC ## Communication Should the DevRel and Marketing teams inform users about this change? - [ ] Yes - [ ] No ## Summary by CodeRabbit - **New Features** - Integrated Redux Toolkit to enhance state management capabilities. - **Bug Fixes** - Removed specific ESLint settings for the `git` package, which may lead to inconsistencies in coding standards. - **Chores** - Deleted the `@appsmith/git` package and its associated configuration files, streamlining the project structure. --- app/client/package.json | 1 + app/client/packages/git/.eslintrc.json | 3 --- app/client/packages/git/package.json | 15 --------------- app/client/packages/git/tsconfig.json | 4 ---- .../git}/actions/checkoutBranchActions.ts | 0 .../src => src/git}/actions/commitActions.ts | 0 .../src => src/git}/actions/connectActions.ts | 0 .../git}/actions/createBranchActions.ts | 0 .../git}/actions/deleteBranchActions.ts | 0 .../src => src/git}/actions/discardActions.ts | 0 .../git}/actions/disconnectActions.ts | 0 .../actions/fetchAutocommitProgressActions.ts | 0 .../git}/actions/fetchBranchesActions.ts | 0 .../git}/actions/fetchGlobalConfigActions.ts | 0 .../git}/actions/fetchLocalConfigActions.ts | 0 .../git}/actions/fetchMergeStatusActions.ts | 0 .../git}/actions/fetchMetadataActions.ts | 0 .../actions/fetchProtectedBranchesActions.ts | 0 .../git}/actions/fetchSSHKeyActions.ts | 0 .../git}/actions/fetchStatusActions.ts | 0 .../src => src/git}/actions/generateSSHKey.ts | 0 .../helpers/createSingleArtifactAction.ts | 0 .../helpers/singleArtifactInitialState.ts | 0 .../git/src => src/git}/actions/mergeActions.ts | 0 .../git/src => src/git}/actions/mountActions.ts | 0 .../git/src => src/git}/actions/pullActions.ts | 0 .../git}/actions/toggleAutocommitActions.ts | 0 .../git}/actions/triggerAutocommitActions.ts | 0 .../git}/actions/updateGlobalConfigActions.ts | 0 .../git}/actions/updateLocalConfigActions.ts | 0 .../actions/updateProtectedBranchesActions.ts | 0 .../git}/components/connect/GitTest.tsx | 0 .../{packages/git/src => src/git}/enums.ts | 0 .../src => src/git}/store/gitArtifactSlice.ts | 0 .../git/src => src/git}/store/index.ts | 0 .../{packages/git/src => src/git}/types.ts | 0 app/client/yarn.lock | 17 +++++------------ 37 files changed, 6 insertions(+), 34 deletions(-) delete mode 100644 app/client/packages/git/.eslintrc.json delete mode 100644 app/client/packages/git/package.json delete mode 100644 app/client/packages/git/tsconfig.json rename app/client/{packages/git/src => src/git}/actions/checkoutBranchActions.ts (100%) rename app/client/{packages/git/src => src/git}/actions/commitActions.ts (100%) rename app/client/{packages/git/src => src/git}/actions/connectActions.ts (100%) rename app/client/{packages/git/src => src/git}/actions/createBranchActions.ts (100%) rename app/client/{packages/git/src => src/git}/actions/deleteBranchActions.ts (100%) rename app/client/{packages/git/src => src/git}/actions/discardActions.ts (100%) rename app/client/{packages/git/src => src/git}/actions/disconnectActions.ts (100%) rename app/client/{packages/git/src => src/git}/actions/fetchAutocommitProgressActions.ts (100%) rename app/client/{packages/git/src => src/git}/actions/fetchBranchesActions.ts (100%) rename app/client/{packages/git/src => src/git}/actions/fetchGlobalConfigActions.ts (100%) rename app/client/{packages/git/src => src/git}/actions/fetchLocalConfigActions.ts (100%) rename app/client/{packages/git/src => src/git}/actions/fetchMergeStatusActions.ts (100%) rename app/client/{packages/git/src => src/git}/actions/fetchMetadataActions.ts (100%) rename app/client/{packages/git/src => src/git}/actions/fetchProtectedBranchesActions.ts (100%) rename app/client/{packages/git/src => src/git}/actions/fetchSSHKeyActions.ts (100%) rename app/client/{packages/git/src => src/git}/actions/fetchStatusActions.ts (100%) rename app/client/{packages/git/src => src/git}/actions/generateSSHKey.ts (100%) rename app/client/{packages/git/src => src/git}/actions/helpers/createSingleArtifactAction.ts (100%) rename app/client/{packages/git/src => src/git}/actions/helpers/singleArtifactInitialState.ts (100%) rename app/client/{packages/git/src => src/git}/actions/mergeActions.ts (100%) rename app/client/{packages/git/src => src/git}/actions/mountActions.ts (100%) rename app/client/{packages/git/src => src/git}/actions/pullActions.ts (100%) rename app/client/{packages/git/src => src/git}/actions/toggleAutocommitActions.ts (100%) rename app/client/{packages/git/src => src/git}/actions/triggerAutocommitActions.ts (100%) rename app/client/{packages/git/src => src/git}/actions/updateGlobalConfigActions.ts (100%) rename app/client/{packages/git/src => src/git}/actions/updateLocalConfigActions.ts (100%) rename app/client/{packages/git/src => src/git}/actions/updateProtectedBranchesActions.ts (100%) rename app/client/{packages/git/src => src/git}/components/connect/GitTest.tsx (100%) rename app/client/{packages/git/src => src/git}/enums.ts (100%) rename app/client/{packages/git/src => src/git}/store/gitArtifactSlice.ts (100%) rename app/client/{packages/git/src => src/git}/store/index.ts (100%) rename app/client/{packages/git/src => src/git}/types.ts (100%) diff --git a/app/client/package.json b/app/client/package.json index f56c83dafb..2387afc4ee 100644 --- a/app/client/package.json +++ b/app/client/package.json @@ -87,6 +87,7 @@ "@react-types/shared": "^3.23.0", "@redux-saga/core": "1.1.3", "@redux-saga/types": "1.2.1", + "@reduxjs/toolkit": "^2.4.0", "@sentry/react": "^6.2.4", "@shared/ast": "workspace:^", "@shared/dsl": "workspace:^", diff --git a/app/client/packages/git/.eslintrc.json b/app/client/packages/git/.eslintrc.json deleted file mode 100644 index b6652ce70c..0000000000 --- a/app/client/packages/git/.eslintrc.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "extends": ["../../.eslintrc.base.json"] -} diff --git a/app/client/packages/git/package.json b/app/client/packages/git/package.json deleted file mode 100644 index 9bfcf578a7..0000000000 --- a/app/client/packages/git/package.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "name": "@appsmith/git", - "description": "This package contains all the git related functionality for Appsmith UI", - "private": true, - "version": "1.0.0", - "main": "src/index.ts", - "scripts": { - "lint": "yarn g:lint", - "prettier": "yarn g:prettier", - "test:unit": "yarn g:jest --passWithNoTests" - }, - "dependencies": { - "@reduxjs/toolkit": "^2.3.0" - } -} diff --git a/app/client/packages/git/tsconfig.json b/app/client/packages/git/tsconfig.json deleted file mode 100644 index 752e48c03e..0000000000 --- a/app/client/packages/git/tsconfig.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "extends": "../../tsconfig.json", - "include": ["./src/**/*"] -} diff --git a/app/client/packages/git/src/actions/checkoutBranchActions.ts b/app/client/src/git/actions/checkoutBranchActions.ts similarity index 100% rename from app/client/packages/git/src/actions/checkoutBranchActions.ts rename to app/client/src/git/actions/checkoutBranchActions.ts diff --git a/app/client/packages/git/src/actions/commitActions.ts b/app/client/src/git/actions/commitActions.ts similarity index 100% rename from app/client/packages/git/src/actions/commitActions.ts rename to app/client/src/git/actions/commitActions.ts diff --git a/app/client/packages/git/src/actions/connectActions.ts b/app/client/src/git/actions/connectActions.ts similarity index 100% rename from app/client/packages/git/src/actions/connectActions.ts rename to app/client/src/git/actions/connectActions.ts diff --git a/app/client/packages/git/src/actions/createBranchActions.ts b/app/client/src/git/actions/createBranchActions.ts similarity index 100% rename from app/client/packages/git/src/actions/createBranchActions.ts rename to app/client/src/git/actions/createBranchActions.ts diff --git a/app/client/packages/git/src/actions/deleteBranchActions.ts b/app/client/src/git/actions/deleteBranchActions.ts similarity index 100% rename from app/client/packages/git/src/actions/deleteBranchActions.ts rename to app/client/src/git/actions/deleteBranchActions.ts diff --git a/app/client/packages/git/src/actions/discardActions.ts b/app/client/src/git/actions/discardActions.ts similarity index 100% rename from app/client/packages/git/src/actions/discardActions.ts rename to app/client/src/git/actions/discardActions.ts diff --git a/app/client/packages/git/src/actions/disconnectActions.ts b/app/client/src/git/actions/disconnectActions.ts similarity index 100% rename from app/client/packages/git/src/actions/disconnectActions.ts rename to app/client/src/git/actions/disconnectActions.ts diff --git a/app/client/packages/git/src/actions/fetchAutocommitProgressActions.ts b/app/client/src/git/actions/fetchAutocommitProgressActions.ts similarity index 100% rename from app/client/packages/git/src/actions/fetchAutocommitProgressActions.ts rename to app/client/src/git/actions/fetchAutocommitProgressActions.ts diff --git a/app/client/packages/git/src/actions/fetchBranchesActions.ts b/app/client/src/git/actions/fetchBranchesActions.ts similarity index 100% rename from app/client/packages/git/src/actions/fetchBranchesActions.ts rename to app/client/src/git/actions/fetchBranchesActions.ts diff --git a/app/client/packages/git/src/actions/fetchGlobalConfigActions.ts b/app/client/src/git/actions/fetchGlobalConfigActions.ts similarity index 100% rename from app/client/packages/git/src/actions/fetchGlobalConfigActions.ts rename to app/client/src/git/actions/fetchGlobalConfigActions.ts diff --git a/app/client/packages/git/src/actions/fetchLocalConfigActions.ts b/app/client/src/git/actions/fetchLocalConfigActions.ts similarity index 100% rename from app/client/packages/git/src/actions/fetchLocalConfigActions.ts rename to app/client/src/git/actions/fetchLocalConfigActions.ts diff --git a/app/client/packages/git/src/actions/fetchMergeStatusActions.ts b/app/client/src/git/actions/fetchMergeStatusActions.ts similarity index 100% rename from app/client/packages/git/src/actions/fetchMergeStatusActions.ts rename to app/client/src/git/actions/fetchMergeStatusActions.ts diff --git a/app/client/packages/git/src/actions/fetchMetadataActions.ts b/app/client/src/git/actions/fetchMetadataActions.ts similarity index 100% rename from app/client/packages/git/src/actions/fetchMetadataActions.ts rename to app/client/src/git/actions/fetchMetadataActions.ts diff --git a/app/client/packages/git/src/actions/fetchProtectedBranchesActions.ts b/app/client/src/git/actions/fetchProtectedBranchesActions.ts similarity index 100% rename from app/client/packages/git/src/actions/fetchProtectedBranchesActions.ts rename to app/client/src/git/actions/fetchProtectedBranchesActions.ts diff --git a/app/client/packages/git/src/actions/fetchSSHKeyActions.ts b/app/client/src/git/actions/fetchSSHKeyActions.ts similarity index 100% rename from app/client/packages/git/src/actions/fetchSSHKeyActions.ts rename to app/client/src/git/actions/fetchSSHKeyActions.ts diff --git a/app/client/packages/git/src/actions/fetchStatusActions.ts b/app/client/src/git/actions/fetchStatusActions.ts similarity index 100% rename from app/client/packages/git/src/actions/fetchStatusActions.ts rename to app/client/src/git/actions/fetchStatusActions.ts diff --git a/app/client/packages/git/src/actions/generateSSHKey.ts b/app/client/src/git/actions/generateSSHKey.ts similarity index 100% rename from app/client/packages/git/src/actions/generateSSHKey.ts rename to app/client/src/git/actions/generateSSHKey.ts diff --git a/app/client/packages/git/src/actions/helpers/createSingleArtifactAction.ts b/app/client/src/git/actions/helpers/createSingleArtifactAction.ts similarity index 100% rename from app/client/packages/git/src/actions/helpers/createSingleArtifactAction.ts rename to app/client/src/git/actions/helpers/createSingleArtifactAction.ts diff --git a/app/client/packages/git/src/actions/helpers/singleArtifactInitialState.ts b/app/client/src/git/actions/helpers/singleArtifactInitialState.ts similarity index 100% rename from app/client/packages/git/src/actions/helpers/singleArtifactInitialState.ts rename to app/client/src/git/actions/helpers/singleArtifactInitialState.ts diff --git a/app/client/packages/git/src/actions/mergeActions.ts b/app/client/src/git/actions/mergeActions.ts similarity index 100% rename from app/client/packages/git/src/actions/mergeActions.ts rename to app/client/src/git/actions/mergeActions.ts diff --git a/app/client/packages/git/src/actions/mountActions.ts b/app/client/src/git/actions/mountActions.ts similarity index 100% rename from app/client/packages/git/src/actions/mountActions.ts rename to app/client/src/git/actions/mountActions.ts diff --git a/app/client/packages/git/src/actions/pullActions.ts b/app/client/src/git/actions/pullActions.ts similarity index 100% rename from app/client/packages/git/src/actions/pullActions.ts rename to app/client/src/git/actions/pullActions.ts diff --git a/app/client/packages/git/src/actions/toggleAutocommitActions.ts b/app/client/src/git/actions/toggleAutocommitActions.ts similarity index 100% rename from app/client/packages/git/src/actions/toggleAutocommitActions.ts rename to app/client/src/git/actions/toggleAutocommitActions.ts diff --git a/app/client/packages/git/src/actions/triggerAutocommitActions.ts b/app/client/src/git/actions/triggerAutocommitActions.ts similarity index 100% rename from app/client/packages/git/src/actions/triggerAutocommitActions.ts rename to app/client/src/git/actions/triggerAutocommitActions.ts diff --git a/app/client/packages/git/src/actions/updateGlobalConfigActions.ts b/app/client/src/git/actions/updateGlobalConfigActions.ts similarity index 100% rename from app/client/packages/git/src/actions/updateGlobalConfigActions.ts rename to app/client/src/git/actions/updateGlobalConfigActions.ts diff --git a/app/client/packages/git/src/actions/updateLocalConfigActions.ts b/app/client/src/git/actions/updateLocalConfigActions.ts similarity index 100% rename from app/client/packages/git/src/actions/updateLocalConfigActions.ts rename to app/client/src/git/actions/updateLocalConfigActions.ts diff --git a/app/client/packages/git/src/actions/updateProtectedBranchesActions.ts b/app/client/src/git/actions/updateProtectedBranchesActions.ts similarity index 100% rename from app/client/packages/git/src/actions/updateProtectedBranchesActions.ts rename to app/client/src/git/actions/updateProtectedBranchesActions.ts diff --git a/app/client/packages/git/src/components/connect/GitTest.tsx b/app/client/src/git/components/connect/GitTest.tsx similarity index 100% rename from app/client/packages/git/src/components/connect/GitTest.tsx rename to app/client/src/git/components/connect/GitTest.tsx diff --git a/app/client/packages/git/src/enums.ts b/app/client/src/git/enums.ts similarity index 100% rename from app/client/packages/git/src/enums.ts rename to app/client/src/git/enums.ts diff --git a/app/client/packages/git/src/store/gitArtifactSlice.ts b/app/client/src/git/store/gitArtifactSlice.ts similarity index 100% rename from app/client/packages/git/src/store/gitArtifactSlice.ts rename to app/client/src/git/store/gitArtifactSlice.ts diff --git a/app/client/packages/git/src/store/index.ts b/app/client/src/git/store/index.ts similarity index 100% rename from app/client/packages/git/src/store/index.ts rename to app/client/src/git/store/index.ts diff --git a/app/client/packages/git/src/types.ts b/app/client/src/git/types.ts similarity index 100% rename from app/client/packages/git/src/types.ts rename to app/client/src/git/types.ts diff --git a/app/client/yarn.lock b/app/client/yarn.lock index 21e7ee0d47..312a597084 100644 --- a/app/client/yarn.lock +++ b/app/client/yarn.lock @@ -91,14 +91,6 @@ __metadata: languageName: unknown linkType: soft -"@appsmith/git@workspace:packages/git": - version: 0.0.0-use.local - resolution: "@appsmith/git@workspace:packages/git" - dependencies: - "@reduxjs/toolkit": ^2.3.0 - languageName: unknown - linkType: soft - "@appsmith/utils@workspace:^, @appsmith/utils@workspace:packages/utils": version: 0.0.0-use.local resolution: "@appsmith/utils@workspace:packages/utils" @@ -7918,9 +7910,9 @@ __metadata: languageName: node linkType: hard -"@reduxjs/toolkit@npm:^2.3.0": - version: 2.3.0 - resolution: "@reduxjs/toolkit@npm:2.3.0" +"@reduxjs/toolkit@npm:^2.4.0": + version: 2.4.0 + resolution: "@reduxjs/toolkit@npm:2.4.0" dependencies: immer: ^10.0.3 redux: ^5.0.1 @@ -7934,7 +7926,7 @@ __metadata: optional: true react-redux: optional: true - checksum: 1a0d85978f99a44f7ceabec8623f46cdd2a2dc25d809dfb0d5c9cd13e2aa12cf116cffe34a4ed949169804dc6125ef9cf68143225e9527f861b597ea701e8bb5 + checksum: 49c75f488208fe8ba7834a9296b70e18480c2ac4f6a487a462157f3cb442ad3f722a67dfd975194a757910a4ccec7f9a7fcc171b76f9433de87911cffec9d4eb languageName: node linkType: hard @@ -12732,6 +12724,7 @@ __metadata: "@react-types/shared": ^3.23.0 "@redux-saga/core": 1.1.3 "@redux-saga/types": 1.2.1 + "@reduxjs/toolkit": ^2.4.0 "@sentry/react": ^6.2.4 "@sentry/webpack-plugin": ^1.18.9 "@shared/ast": "workspace:^"