Merge branch 'refs/heads/release' into chore/ok-to-test-push

.github/workflows/client-build.yml

@@ -72,13 +72,13 @@ jobs:
         with:
           files: "app/client/**"
 
-      - name: Run step if any file(s) in the client folder change
-        if: steps.changed-files-specific.outputs.any_changed == 'true'
-        env:
-          ALL_CHANGED_FILES: ${{ steps.changed-files-specific.outputs.all_changed_files }}
-        run: |
-          echo "One or more files in the server folder has changed."
-          echo "List all the files that have changed: $ALL_CHANGED_FILES"
+      #- name: Run step if any file(s) in the client folder change
+      #  if: steps.changed-files-specific.outputs.any_changed == 'true'
+      #  env:
+      #    ALL_CHANGED_FILES: ${{ steps.changed-files-specific.outputs.all_changed_files }}
+      #  run: |
+      #    echo "One or more files in the server folder has changed."
+      #    echo "List all the files that have changed: $ALL_CHANGED_FILES"
 
       - name: Check compliance
         if: inputs.pr != 0 && steps.changed-files-specific.outputs.any_changed == 'true'

app/client/.eslintrc.js

@@ -56,7 +56,7 @@ const eslintConfig = {
           ...(baseNoRestrictedImports.patterns ?? []),
           {
             group: ["**/ce/*"],
-            message: "Reason: Please use @appsmith import instead.",
+            message: "Reason: Please use ee/ import instead.",
           },
         ],
       },

app/client/packages/design-system/widgets/src/components/ToolbarButtons/src/ToolbarButtons.tsx

@@ -1,4 +1,4 @@
-import React, { forwardRef } from "react";
+import React, { forwardRef, useMemo } from "react";
 import { Button, Menu } from "@design-system/widgets";
 import { FocusScope } from "@react-aria/focus";
 import { useDOMRef } from "@react-spectrum/utils";
@@ -37,11 +37,14 @@ const _ToolbarButtonsInner = <T extends ToolbarButtonsItem>(
     domRef,
   );
 
-  let children = [...state.collection];
-  const menuChildren = (props.items as ToolbarButtonsItem[]).slice(
-    visibleItems,
+  const menuChildren = useMemo(
+    () => (props.items as ToolbarButtonsItem[]).slice(visibleItems),
+    [props.items, visibleItems],
+  );
+  const children = useMemo(
+    () => [...state.collection].slice(0, visibleItems),
+    [state.collection, visibleItems],
   );
-  children = children.slice(0, visibleItems);
 
   return (
     <FocusScope>

app/client/src/AppErrorBoundry.tsx

@@ -3,7 +3,7 @@ import styled from "styled-components";
 import AppCrashImage from "assets/images/404-image.png";
 import * as Sentry from "@sentry/react";
 import log from "loglevel";
-import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
+import AnalyticsUtil from "ee/utils/AnalyticsUtil";
 import { Button } from "design-system";
 
 const Wrapper = styled.div`

app/client/src/IDE/Components/Sidebar/Sidebar.tsx

@@ -1,7 +1,7 @@
 import React from "react";
 import styled from "styled-components";
 import SidebarButton from "./SidebarButton";
-import type { EditorState } from "@appsmith/entities/IDE/constants";
+import type { EditorState } from "ee/entities/IDE/constants";
 import type { SidebarButtonProps } from "./SidebarButton/SidebarButton";
 import { Flex } from "design-system";
 

app/client/src/IDE/hooks/useIsInSideBySideEditor.test.tsx

@@ -1,10 +1,10 @@
 import React from "react";
 import { renderHook, act } from "@testing-library/react-hooks/dom";
 import { Provider } from "react-redux";
-import { EditorViewMode } from "@appsmith/entities/IDE/constants";
+import { EditorViewMode } from "ee/entities/IDE/constants";
 import { useIsInSideBySideEditor } from "./useIsInSideBySideEditor";
 import { getIDETestState } from "test/factories/AppIDEFactoryUtils";
-import type { AppState } from "@appsmith/reducers";
+import type { AppState } from "ee/reducers";
 
 import { createMemoryHistory, type MemoryHistory } from "history";
 import { Router } from "react-router";

app/client/src/LandingScreen.tsx

@@ -1,5 +1,5 @@
 import React from "react";
-import type { AppState } from "@appsmith/reducers";
+import type { AppState } from "ee/reducers";
 import { getCurrentUser, getUserAuthError } from "selectors/usersSelectors";
 import { connect } from "react-redux";
 import type { User } from "constants/userConstants";

app/client/src/UITelemetry/auto-otel-web.ts

@@ -8,7 +8,7 @@ import {
   SEMRESATTRS_SERVICE_VERSION,
   SEMRESATTRS_SERVICE_INSTANCE_ID,
 } from "@opentelemetry/semantic-conventions";
-import { getAppsmithConfigs } from "@appsmith/configs";
+import { getAppsmithConfigs } from "ee/configs";
 import { W3CTraceContextPropagator } from "@opentelemetry/core";
 import {
   MeterProvider,

app/client/src/WidgetProvider/constants.ts

@@ -15,7 +15,7 @@ import type { DerivedPropertiesMap } from "WidgetProvider/factory";
 import type { WidgetFeatures } from "utils/WidgetFeatures";
 import type { WidgetProps } from "../widgets/BaseWidget";
 import type { ExtraDef } from "utils/autocomplete/defCreatorUtils";
-import type { WidgetEntityConfig } from "@appsmith/entities/DataTree/types";
+import type { WidgetEntityConfig } from "ee/entities/DataTree/types";
 import type {
   WidgetQueryConfig,
   WidgetQueryGenerationConfig,

app/client/src/actions/JSLibraryActions.ts

@@ -1,4 +1,4 @@
-import { ReduxActionTypes } from "@appsmith/constants/ReduxActionConstants";
+import { ReduxActionTypes } from "ee/constants/ReduxActionConstants";
 import type { ApiResponse } from "api/ApiResponses";
 import type { JSLibrary } from "workers/common/JSLibrary";
 

app/client/src/actions/actionSelectorActions.ts

@@ -1,4 +1,4 @@
-import { ReduxActionTypes } from "@appsmith/constants/ReduxActionConstants";
+import { ReduxActionTypes } from "ee/constants/ReduxActionConstants";
 
 export const evaluateActionSelectorField = (payload: {
   id: string;

app/client/src/actions/activeFieldActions.ts

@@ -1,4 +1,4 @@
-import { ReduxActionTypes } from "@appsmith/constants/ReduxActionConstants";
+import { ReduxActionTypes } from "ee/constants/ReduxActionConstants";
 
 export const setActiveEditorField = (field: string) => ({
   type: ReduxActionTypes.SET_ACTIVE_EDITOR_FIELD,

app/client/src/actions/analyticsActions.ts

@@ -1,4 +1,4 @@
-import { ReduxActionTypes } from "@appsmith/constants/ReduxActionConstants";
+import { ReduxActionTypes } from "ee/constants/ReduxActionConstants";
 
 export const segmentInitSuccess = () => ({
   type: ReduxActionTypes.SEGMENT_INITIALIZED,

app/client/src/actions/apiPaneActions.ts

@@ -1,8 +1,8 @@
-import type { ReduxAction } from "@appsmith/constants/ReduxActionConstants";
-import { ReduxActionTypes } from "@appsmith/constants/ReduxActionConstants";
-import type { EventLocation } from "@appsmith/utils/analyticsUtilTypes";
+import type { ReduxAction } from "ee/constants/ReduxActionConstants";
+import { ReduxActionTypes } from "ee/constants/ReduxActionConstants";
+import type { EventLocation } from "ee/utils/analyticsUtilTypes";
 import type { SlashCommandPayload } from "entities/Action";
-import type { ApiPaneDebuggerState } from "@appsmith/reducers/uiReducers/apiPaneReducer";
+import type { ApiPaneDebuggerState } from "ee/reducers/uiReducers/apiPaneReducer";
 
 export const changeApi = (
   id: string,

app/client/src/actions/appCollabActions.ts

@@ -2,7 +2,7 @@ import {
   appLevelWebsocketWriteEvent,
   pageLevelWebsocketWriteEvent,
 } from "./websocketActions";
-import { ReduxActionTypes } from "@appsmith/constants/ReduxActionConstants";
+import { ReduxActionTypes } from "ee/constants/ReduxActionConstants";
 import { PAGE_LEVEL_SOCKET_EVENTS } from "sagas/WebsocketSagas/socketEvents";
 
 // App Editors presence Socket actions

app/client/src/actions/appSettingsPaneActions.ts

@@ -1,4 +1,4 @@
-import { ReduxActionTypes } from "@appsmith/constants/ReduxActionConstants";
+import { ReduxActionTypes } from "ee/constants/ReduxActionConstants";
 import type { AppSettingsPaneReduxState } from "reducers/uiReducers/appSettingsPaneReducer";
 
 export const updateAppSettingsPaneSelectedTabAction = (

app/client/src/actions/appThemingActions.tsx

@@ -1,6 +1,6 @@
 import type { AppTheme } from "entities/AppTheming";
 import type { AppThemingMode } from "selectors/appThemingSelectors";
-import { ReduxActionTypes } from "@appsmith/constants/ReduxActionConstants";
+import { ReduxActionTypes } from "ee/constants/ReduxActionConstants";
 import type { ApiResponse } from "api/ApiResponses";
 
 /**

app/client/src/actions/appViewActions.ts

@@ -1,4 +1,4 @@
-import { ReduxActionTypes } from "@appsmith/constants/ReduxActionConstants";
+import { ReduxActionTypes } from "ee/constants/ReduxActionConstants";
 
 /**
  * ----------------------------------------------------------------------------

app/client/src/actions/authActions.ts

@@ -1,4 +1,4 @@
-import { ReduxActionTypes } from "@appsmith/constants/ReduxActionConstants";
+import { ReduxActionTypes } from "ee/constants/ReduxActionConstants";
 import type { ApiResponse } from "api/ApiResponses";
 
 export const getCurrentUser = (userProfile?: ApiResponse) => ({

app/client/src/actions/autoHeightActions.ts

@@ -1,5 +1,5 @@
-import type { ReduxAction } from "@appsmith/constants/ReduxActionConstants";
-import { ReduxActionTypes } from "@appsmith/constants/ReduxActionConstants";
+import type { ReduxAction } from "ee/constants/ReduxActionConstants";
+import { ReduxActionTypes } from "ee/constants/ReduxActionConstants";
 import { GridDefaults } from "constants/WidgetConstants";
 import type { TreeNode } from "utils/autoHeight/constants";
 

app/client/src/actions/autoLayoutActions.ts

@@ -1,4 +1,4 @@
-import { ReduxActionTypes } from "@appsmith/constants/ReduxActionConstants";
+import { ReduxActionTypes } from "ee/constants/ReduxActionConstants";
 import type { LayoutSystemTypes } from "layoutSystems/types";
 import type { CanvasWidgetsReduxState } from "reducers/entityReducers/canvasWidgetsReducer";
 import type {

app/client/src/actions/batchActions.ts

@@ -1,8 +1,8 @@
 import type {
   EvaluationReduxAction,
   ReduxAction,
-} from "@appsmith/constants/ReduxActionConstants";
-import { ReduxActionTypes } from "@appsmith/constants/ReduxActionConstants";
+} from "ee/constants/ReduxActionConstants";
+import { ReduxActionTypes } from "ee/constants/ReduxActionConstants";
 
 // TODO: Fix this the next time the file is edited
 // eslint-disable-next-line @typescript-eslint/no-explicit-any

app/client/src/actions/browserRequestActions.ts

@@ -1,4 +1,4 @@
-import { ReduxActionTypes } from "@appsmith/constants/ReduxActionConstants";
+import { ReduxActionTypes } from "ee/constants/ReduxActionConstants";
 
 export const setUserCurrentGeoLocation = (position: GeolocationPosition) => {
   return {

app/client/src/actions/canvasSelectionActions.ts

@@ -1,5 +1,5 @@
-import type { ReduxAction } from "@appsmith/constants/ReduxActionConstants";
-import { ReduxActionTypes } from "@appsmith/constants/ReduxActionConstants";
+import type { ReduxAction } from "ee/constants/ReduxActionConstants";
+import { ReduxActionTypes } from "ee/constants/ReduxActionConstants";
 import type { XYCord } from "layoutSystems/common/canvasArenas/ArenaTypes";
 import type { SelectedArenaDimensions } from "layoutSystems/fixedlayout/editor/FixedLayoutCanvasArenas/CanvasSelectionArena";
 

app/client/src/actions/communityTemplateActions.ts

@@ -1,4 +1,4 @@
-import { ReduxActionTypes } from "@appsmith/constants/ReduxActionConstants";
+import { ReduxActionTypes } from "ee/constants/ReduxActionConstants";
 
 export interface PublishCommunityTemplatePayload {
   title: string;

app/client/src/actions/controlActions.tsx

@@ -1,8 +1,8 @@
 import type {
   ReduxAction,
   ReduxActionType,
-} from "@appsmith/constants/ReduxActionConstants";
-import { ReduxActionTypes } from "@appsmith/constants/ReduxActionConstants";
+} from "ee/constants/ReduxActionConstants";
+import { ReduxActionTypes } from "ee/constants/ReduxActionConstants";
 import type { UpdateWidgetsPayload } from "reducers/entityReducers/canvasWidgetsReducer";
 import type { DynamicPath } from "utils/DynamicBindingUtils";
 

app/client/src/actions/crudInfoModalActions.ts

@@ -1,4 +1,4 @@
-import { ReduxActionTypes } from "@appsmith/constants/ReduxActionConstants";
+import { ReduxActionTypes } from "ee/constants/ReduxActionConstants";
 
 export interface SetCrudInfoModalOpenPayload {
   open: boolean;

app/client/src/actions/datasourceActions.ts

@@ -1,8 +1,8 @@
 import type {
   ReduxAction,
   ReduxActionWithCallbacks,
-} from "@appsmith/constants/ReduxActionConstants";
-import { ReduxActionTypes } from "@appsmith/constants/ReduxActionConstants";
+} from "ee/constants/ReduxActionConstants";
+import { ReduxActionTypes } from "ee/constants/ReduxActionConstants";
 import type { CreateDatasourceConfig } from "api/DatasourcesApi";
 import type {
   AuthenticationStatus,
@@ -17,7 +17,7 @@ import { TEMP_DATASOURCE_ID } from "constants/Datasource";
 import {
   ActionParentEntityType,
   type ActionParentEntityTypeInterface,
-} from "@appsmith/entities/Engine/actionHelpers";
+} from "ee/entities/Engine/actionHelpers";
 
 export const createDatasourceFromForm = (
   payload: CreateDatasourceConfig & Datasource,

app/client/src/actions/debuggerActions.ts

@@ -1,11 +1,11 @@
-import { ReduxActionTypes } from "@appsmith/constants/ReduxActionConstants";
+import { ReduxActionTypes } from "ee/constants/ReduxActionConstants";
 import type { Log, Message, SourceEntity } from "entities/AppsmithConsole";
-import type { ENTITY_TYPE } from "@appsmith/entities/AppsmithConsole/utils";
+import type { ENTITY_TYPE } from "ee/entities/AppsmithConsole/utils";
 import type {
   CanvasDebuggerState,
   DebuggerContext,
 } from "reducers/uiReducers/debuggerReducer";
-import type { EventName } from "@appsmith/utils/analyticsUtilTypes";
+import type { EventName } from "ee/utils/analyticsUtilTypes";
 import type { APP_MODE } from "entities/App";
 
 export interface LogDebuggerErrorAnalyticsPayload {

app/client/src/actions/editorActions.ts

@@ -1,4 +1,4 @@
-import { ReduxActionTypes } from "@appsmith/constants/ReduxActionConstants";
+import { ReduxActionTypes } from "ee/constants/ReduxActionConstants";
 import type { EntityInfo } from "pages/Editor/EntityNavigation/types";
 
 /**

app/client/src/actions/editorContextActions.ts

@@ -1,11 +1,11 @@
-import { ReduxActionTypes } from "@appsmith/constants/ReduxActionConstants";
+import { ReduxActionTypes } from "ee/constants/ReduxActionConstants";
 import type {
   CodeEditorContext,
   CursorPosition,
   EvaluatedPopupState,
   PropertyPanelContext,
-} from "@appsmith/reducers/uiReducers/editorContextReducer";
-import { CursorPositionOrigin } from "@appsmith/reducers/uiReducers/editorContextReducer";
+} from "ee/reducers/uiReducers/editorContextReducer";
+import { CursorPositionOrigin } from "ee/reducers/uiReducers/editorContextReducer";
 
 export const setFocusableInputField = (path: string | undefined) => {
   return {

app/client/src/actions/errorActions.ts

@@ -1,5 +1,5 @@
-import { ReduxActionTypes } from "@appsmith/constants/ReduxActionConstants";
-import type { ERROR_CODES } from "@appsmith/constants/ApiConstants";
+import { ReduxActionTypes } from "ee/constants/ReduxActionConstants";
+import type { ERROR_CODES } from "ee/constants/ApiConstants";
 import type { ErrorPayloadType } from "sagas/ErrorSagas";
 
 export const safeCrashAppRequest = (code?: ERROR_CODES) => {

app/client/src/actions/evaluationActions.ts

@@ -1,5 +1,5 @@
-import type { ReduxAction } from "@appsmith/constants/ReduxActionConstants";
-import { ReduxActionTypes } from "@appsmith/constants/ReduxActionConstants";
+import type { ReduxAction } from "ee/constants/ReduxActionConstants";
+import { ReduxActionTypes } from "ee/constants/ReduxActionConstants";
 import { intersection } from "lodash";
 import type { DependencyMap } from "utils/DynamicBindingUtils";
 import type { QueryActionConfig } from "entities/Action";
@@ -10,7 +10,7 @@ import {
   EVAL_AND_LINT_REDUX_ACTIONS,
   LINT_REDUX_ACTIONS,
   LOG_REDUX_ACTIONS,
-} from "@appsmith/actions/evaluationActionsList";
+} from "ee/actions/evaluationActionsList";
 
 export const shouldTriggerEvaluation = (action: ReduxAction<unknown>) => {
   return (

app/client/src/actions/explorerActions.ts

@@ -1,4 +1,4 @@
-import { ReduxActionTypes } from "@appsmith/constants/ReduxActionConstants";
+import { ReduxActionTypes } from "ee/constants/ReduxActionConstants";
 
 export const initExplorerEntityNameEdit = (actionId: string) => {
   return {

app/client/src/actions/featureFlagActions.ts

@@ -1,4 +1,4 @@
-import { ReduxActionTypes } from "@appsmith/constants/ReduxActionConstants";
+import { ReduxActionTypes } from "ee/constants/ReduxActionConstants";
 import type { OverriddenFeatureFlags } from "utils/hooks/useFeatureFlagOverride";
 
 export const setFeatureFlagOverridesAction = (

app/client/src/actions/focusHistoryActions.ts

@@ -1,6 +1,6 @@
 import type { FocusState } from "reducers/uiReducers/focusHistoryReducer";
-import type { ReduxAction } from "@appsmith/constants/ReduxActionConstants";
-import { ReduxActionTypes } from "@appsmith/constants/ReduxActionConstants";
+import type { ReduxAction } from "ee/constants/ReduxActionConstants";
+import { ReduxActionTypes } from "ee/constants/ReduxActionConstants";
 import type { Location } from "history";
 import type { AppsmithLocationState } from "utils/history";
 

app/client/src/actions/gitSyncActions.ts

@@ -1,17 +1,17 @@
 import type {
   ReduxAction,
   ReduxActionWithCallbacks,
-} from "@appsmith/constants/ReduxActionConstants";
+} from "ee/constants/ReduxActionConstants";
 import {
   ReduxActionErrorTypes,
   ReduxActionTypes,
-} from "@appsmith/constants/ReduxActionConstants";
+} from "ee/constants/ReduxActionConstants";
 import type {
   ConnectToGitPayload,
   GitAutocommitProgressResponse,
 } from "api/GitSyncAPI";
 import type { GitConfig, GitSyncModalTab, MergeStatus } from "entities/GitSync";
-import type { GitApplicationMetadata } from "@appsmith/api/ApplicationApi";
+import type { GitApplicationMetadata } from "ee/api/ApplicationApi";
 import {
   type GitStatusData,
   GitSettingsTab,

app/client/src/actions/globalSearchActions.ts

@@ -1,4 +1,4 @@
-import { ReduxActionTypes } from "@appsmith/constants/ReduxActionConstants";
+import { ReduxActionTypes } from "ee/constants/ReduxActionConstants";
 import type {
   RecentEntity,
   SearchCategory,

app/client/src/actions/helpActions.ts

@@ -1,4 +1,4 @@
-import { ReduxActionTypes } from "@appsmith/constants/ReduxActionConstants";
+import { ReduxActionTypes } from "ee/constants/ReduxActionConstants";
 
 export const setHelpDefaultRefinement = (payload: string) => {
   return {

app/client/src/actions/ideActions.ts

@@ -1,5 +1,5 @@
-import type { EditorViewMode } from "@appsmith/entities/IDE/constants";
-import { ReduxActionTypes } from "@appsmith/constants/ReduxActionConstants";
+import type { EditorViewMode } from "ee/entities/IDE/constants";
+import { ReduxActionTypes } from "ee/constants/ReduxActionConstants";
 
 export const setIdeEditorViewMode = (mode: EditorViewMode) => {
   return {

app/client/src/actions/importActions.ts

@@ -1,4 +1,4 @@
-import { ReduxActionTypes } from "@appsmith/constants/ReduxActionConstants";
+import { ReduxActionTypes } from "ee/constants/ReduxActionConstants";
 
 import type { CurlImportFormValues } from "../pages/Editor/CurlImport/helpers";
 

app/client/src/actions/initActions.ts

@@ -1,6 +1,6 @@
 import type { APP_MODE } from "entities/App";
-import type { ReduxAction } from "@appsmith/constants/ReduxActionConstants";
-import { ReduxActionTypes } from "@appsmith/constants/ReduxActionConstants";
+import type { ReduxAction } from "ee/constants/ReduxActionConstants";
+import { ReduxActionTypes } from "ee/constants/ReduxActionConstants";
 
 export const initCurrentPage = () => {
   return {

app/client/src/actions/jsActionActions.ts

@@ -3,10 +3,10 @@ import {
   type ReduxAction,
   ReduxActionErrorTypes,
   ReduxActionTypes,
-} from "@appsmith/constants/ReduxActionConstants";
+} from "ee/constants/ReduxActionConstants";
 import type { JSCollection } from "entities/JSCollection";
-import type { CreateJSCollectionRequest } from "@appsmith/api/JSActionAPI";
-import type { EventLocation } from "@appsmith/utils/analyticsUtilTypes";
+import type { CreateJSCollectionRequest } from "ee/api/JSActionAPI";
+import type { EventLocation } from "ee/utils/analyticsUtilTypes";
 import type { ApiResponse } from "api/ApiResponses";
 
 export interface FetchJSCollectionsPayload {

app/client/src/actions/jsPaneActions.ts

@@ -1,11 +1,11 @@
-import type { ReduxAction } from "@appsmith/constants/ReduxActionConstants";
-import { ReduxActionTypes } from "@appsmith/constants/ReduxActionConstants";
+import type { ReduxAction } from "ee/constants/ReduxActionConstants";
+import { ReduxActionTypes } from "ee/constants/ReduxActionConstants";
 import type { JSCollection, JSAction } from "entities/JSCollection";
 import type {
   RefactorAction,
   SetFunctionPropertyPayload,
-} from "@appsmith/api/JSActionAPI";
-import type { EventLocation } from "@appsmith/utils/analyticsUtilTypes";
+} from "ee/api/JSActionAPI";
+import type { EventLocation } from "ee/utils/analyticsUtilTypes";
 import type {
   JSEditorTab,
   JSPaneDebuggerState,

app/client/src/actions/lintingActions.ts

@@ -1,6 +1,6 @@
 import type { LintErrorsStore } from "reducers/lintingReducers/lintErrorsReducers";
-import type { ReduxAction } from "@appsmith/constants/ReduxActionConstants";
-import { ReduxActionTypes } from "@appsmith/constants/ReduxActionConstants";
+import type { ReduxAction } from "ee/constants/ReduxActionConstants";
+import { ReduxActionTypes } from "ee/constants/ReduxActionConstants";
 
 export type SetLintErrorsAction = ReduxAction<{ errors: LintErrorsStore }>;
 export const setLintingErrors = (

app/client/src/actions/metaActions.ts

@@ -1,13 +1,13 @@
-import type { ReduxAction } from "@appsmith/constants/ReduxActionConstants";
-import { ReduxActionTypes } from "@appsmith/constants/ReduxActionConstants";
+import type { ReduxAction } from "ee/constants/ReduxActionConstants";
+import { ReduxActionTypes } from "ee/constants/ReduxActionConstants";
 import type { BatchAction } from "actions/batchActions";
 import { batchAction } from "actions/batchActions";
-import type { EvalMetaUpdates } from "@appsmith/workers/common/DataTreeEvaluator/types";
+import type { EvalMetaUpdates } from "ee/workers/common/DataTreeEvaluator/types";
 import type {
   WidgetEntity,
   DataTreeEntityConfig,
   WidgetEntityConfig,
-} from "@appsmith/entities/DataTree/types";
+} from "ee/entities/DataTree/types";
 
 export interface UpdateWidgetMetaPropertyPayload {
   widgetId: string;

app/client/src/actions/metaWidgetActions.ts

@@ -1,5 +1,5 @@
-import type { ReduxAction } from "@appsmith/constants/ReduxActionConstants";
-import { ReduxActionTypes } from "@appsmith/constants/ReduxActionConstants";
+import type { ReduxAction } from "ee/constants/ReduxActionConstants";
+import { ReduxActionTypes } from "ee/constants/ReduxActionConstants";
 import type {
   DeleteMetaWidgetsPayload,
   ModifyMetaWidgetPayload,

app/client/src/actions/onboardingActions.ts

@@ -1,4 +1,4 @@
-import { ReduxActionTypes } from "@appsmith/constants/ReduxActionConstants";
+import { ReduxActionTypes } from "ee/constants/ReduxActionConstants";
 import type { SIGNPOSTING_STEP } from "pages/Editor/FirstTimeUserOnboarding/Utils";
 
 export const toggleInOnboardingWidgetSelection = (payload: boolean) => {

app/client/src/actions/oneClickBindingActions.ts

@@ -1,4 +1,4 @@
-import { ReduxActionTypes } from "@appsmith/constants/ReduxActionConstants";
+import { ReduxActionTypes } from "ee/constants/ReduxActionConstants";
 
 export const updateOneClickBindingOptionsVisibility = (
   visibility: boolean,

app/client/src/actions/pageActions.tsx

@@ -5,15 +5,15 @@ import type {
   UpdateCanvasPayload,
   AnyReduxAction,
   ClonePageSuccessPayload,
-} from "@appsmith/constants/ReduxActionConstants";
+} from "ee/constants/ReduxActionConstants";
 import {
   ReduxActionTypes,
   ReduxActionErrorTypes,
   WidgetReduxActionTypes,
   ReplayReduxActionTypes,
-} from "@appsmith/constants/ReduxActionConstants";
+} from "ee/constants/ReduxActionConstants";
 import type { DynamicPath } from "utils/DynamicBindingUtils";
-import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
+import AnalyticsUtil from "ee/utils/AnalyticsUtil";
 import type { WidgetOperation } from "widgets/BaseWidget";
 import type {
   FetchPageResponse,
@@ -25,7 +25,7 @@ import type {
 import type { UrlDataState } from "reducers/entityReducers/appReducer";
 import type { APP_MODE } from "entities/App";
 import type { CanvasWidgetsReduxState } from "reducers/entityReducers/canvasWidgetsReducer";
-import type { ENTITY_TYPE } from "@appsmith/entities/AppsmithConsole/utils";
+import type { ENTITY_TYPE } from "ee/entities/AppsmithConsole/utils";
 import type { Replayable } from "entities/Replay/ReplayEntity/ReplayEditor";
 import * as Sentry from "@sentry/react";
 

app/client/src/actions/pluginActionActions.ts

@@ -5,7 +5,7 @@ import {
   type ReduxAction,
   ReduxActionErrorTypes,
   ReduxActionTypes,
-} from "@appsmith/constants/ReduxActionConstants";
+} from "ee/constants/ReduxActionConstants";
 import type { JSUpdate } from "utils/JSPaneUtils";
 import type { Action, ActionViewMode } from "entities/Action";
 import { ActionExecutionContext } from "entities/Action";

app/client/src/actions/pluginActions.ts

@@ -1,11 +1,11 @@
 import type {
   ReduxAction,
   ReduxActionWithoutPayload,
-} from "@appsmith/constants/ReduxActionConstants";
+} from "ee/constants/ReduxActionConstants";
 import {
   ReduxActionTypes,
   ReduxActionErrorTypes,
-} from "@appsmith/constants/ReduxActionConstants";
+} from "ee/constants/ReduxActionConstants";
 import type { ApiResponse } from "api/ApiResponses";
 import type { PluginFormPayload } from "api/PluginApi";
 import type { DependencyMap } from "utils/DynamicBindingUtils";

app/client/src/actions/propertyPaneActions.ts

@@ -1,4 +1,4 @@
-import { ReduxActionTypes } from "@appsmith/constants/ReduxActionConstants";
+import { ReduxActionTypes } from "ee/constants/ReduxActionConstants";
 import type { SelectedPropertyPanel } from "reducers/uiReducers/propertyPaneReducer";
 
 export const updateWidgetName = (widgetId: string, newName: string) => {

app/client/src/actions/queryPaneActions.ts

@@ -1,7 +1,7 @@
-import type { ReduxAction } from "@appsmith/constants/ReduxActionConstants";
-import { ReduxActionTypes } from "@appsmith/constants/ReduxActionConstants";
+import type { ReduxAction } from "ee/constants/ReduxActionConstants";
+import { ReduxActionTypes } from "ee/constants/ReduxActionConstants";
 import type { Action } from "entities/Action";
-import type { QueryPaneDebuggerState } from "@appsmith/reducers/uiReducers/queryPaneReducer";
+import type { QueryPaneDebuggerState } from "ee/reducers/uiReducers/queryPaneReducer";
 
 export interface ChangeQueryPayload {
   baseQueryId: string;

app/client/src/actions/reflowActions.ts

@@ -1,5 +1,5 @@
-import type { ReduxAction } from "@appsmith/constants/ReduxActionConstants";
-import { ReflowReduxActionTypes } from "@appsmith/constants/ReduxActionConstants";
+import type { ReduxAction } from "ee/constants/ReduxActionConstants";
+import { ReflowReduxActionTypes } from "ee/constants/ReduxActionConstants";
 import type { ReflowedSpaceMap } from "reflow/reflowTypes";
 
 export const reflowMoveAction = (

app/client/src/actions/releasesActions.ts

@@ -1,4 +1,4 @@
-import { ReduxActionTypes } from "@appsmith/constants/ReduxActionConstants";
+import { ReduxActionTypes } from "ee/constants/ReduxActionConstants";
 
 export const resetReleasesCount = () => ({
   type: ReduxActionTypes.RESET_UNREAD_RELEASES_COUNT,

app/client/src/actions/templateActions.ts

@@ -1,4 +1,4 @@
-import { ReduxActionTypes } from "@appsmith/constants/ReduxActionConstants";
+import { ReduxActionTypes } from "ee/constants/ReduxActionConstants";
 
 export const getAllTemplates = () => ({
   type: ReduxActionTypes.GET_ALL_TEMPLATES_INIT,

app/client/src/actions/themeActions.ts

@@ -1,4 +1,4 @@
-import { ReduxActionTypes } from "@appsmith/constants/ReduxActionConstants";
+import { ReduxActionTypes } from "ee/constants/ReduxActionConstants";
 import type { ThemeMode } from "selectors/themeSelectors";
 
 export const setThemeMode = (mode: ThemeMode) => ({

app/client/src/actions/tourActions.ts

@@ -1,4 +1,4 @@
-import { ReduxActionTypes } from "@appsmith/constants/ReduxActionConstants";
+import { ReduxActionTypes } from "ee/constants/ReduxActionConstants";
 import type { TourType } from "entities/Tour";
 
 export const setActiveTour = (tourType: TourType) => ({

app/client/src/actions/userActions.ts

@@ -1,14 +1,14 @@
 import {
   ReduxActionErrorTypes,
   ReduxActionTypes,
-} from "@appsmith/constants/ReduxActionConstants";
+} from "ee/constants/ReduxActionConstants";
 import { CurrentUserDetailsRequestPayload } from "constants/userConstants";
 import type {
   TokenPasswordUpdateRequest,
   UpdateUserRequest,
   VerifyTokenRequest,
-} from "@appsmith/api/UserApi";
-import type { FeatureFlags } from "@appsmith/entities/FeatureFlag";
+} from "ee/api/UserApi";
+import type { FeatureFlags } from "ee/entities/FeatureFlag";
 import type {
   ProductAlert,
   ProductAlertConfig,

app/client/src/actions/utilActions.ts

@@ -1,4 +1,4 @@
-import { ReduxActionTypes } from "@appsmith/constants/ReduxActionConstants";
+import { ReduxActionTypes } from "ee/constants/ReduxActionConstants";
 
 export const historyPush = (url: string) => ({
   type: ReduxActionTypes.HISTORY_PUSH,

app/client/src/actions/websocketActions.ts

@@ -1,7 +1,7 @@
 import {
   ReduxActionTypes,
   ReduxSagaChannels,
-} from "@appsmith/constants/ReduxActionConstants";
+} from "ee/constants/ReduxActionConstants";
 import { reconnectWebsocketEvent } from "constants/WebsocketConstants";
 
 export const setIsAppLevelWebsocketConnected = (payload: boolean) => ({

app/client/src/actions/widgetActions.tsx

@@ -1,8 +1,8 @@
-import type { ReduxAction } from "@appsmith/constants/ReduxActionConstants";
+import type { ReduxAction } from "ee/constants/ReduxActionConstants";
 import {
   ReduxActionTypes,
   WidgetReduxActionTypes,
-} from "@appsmith/constants/ReduxActionConstants";
+} from "ee/constants/ReduxActionConstants";
 import type { ExecuteTriggerPayload } from "constants/AppsmithActionConstants/ActionConstants";
 import type { BatchAction } from "actions/batchActions";
 import { batchAction } from "actions/batchActions";

app/client/src/actions/widgetSelectionActions.ts

@@ -1,5 +1,5 @@
-import type { ReduxAction } from "@appsmith/constants/ReduxActionConstants";
-import { ReduxActionTypes } from "@appsmith/constants/ReduxActionConstants";
+import type { ReduxAction } from "ee/constants/ReduxActionConstants";
+import { ReduxActionTypes } from "ee/constants/ReduxActionConstants";
 import type { SelectionRequestType } from "sagas/WidgetSelectUtils";
 import type { NavigationMethod } from "utils/history";
 

app/client/src/actions/widgetSidebarActions.tsx

@@ -1,7 +1,7 @@
 import {
   ReduxActionTypes,
   ReduxActionErrorTypes,
-} from "@appsmith/constants/ReduxActionConstants";
+} from "ee/constants/ReduxActionConstants";
 import type { WidgetCardProps } from "widgets/BaseWidget";
 
 export const fetchWidgetCards = () => {

app/client/src/api/ActionAPI.tsx

@@ -2,7 +2,7 @@ import type React from "react";
 import type { HttpMethod } from "api/Api";
 import API from "api/Api";
 import type { ApiResponse } from "./ApiResponses";
-import { DEFAULT_EXECUTE_ACTION_TIMEOUT_MS } from "@appsmith/constants/ApiConstants";
+import { DEFAULT_EXECUTE_ACTION_TIMEOUT_MS } from "ee/constants/ApiConstants";
 import type { AxiosPromise, CancelTokenSource } from "axios";
 import axios from "axios";
 import type { Action, ActionViewMode } from "entities/Action";
@@ -10,7 +10,7 @@ import type { APIRequest } from "constants/AppsmithActionConstants/ActionConstan
 import type { WidgetType } from "constants/WidgetConstants";
 import type { OtlpSpan } from "UITelemetry/generateTraces";
 import { wrapFnWithParentTraceContext } from "UITelemetry/generateTraces";
-import type { ActionParentEntityTypeInterface } from "@appsmith/entities/Engine/actionHelpers";
+import type { ActionParentEntityTypeInterface } from "ee/entities/Engine/actionHelpers";
 
 export interface Property {
   key: string;

app/client/src/api/Api.ts

@@ -1,13 +1,13 @@
 import type { AxiosInstance, AxiosRequestConfig } from "axios";
 import axios from "axios";
-import { REQUEST_TIMEOUT_MS } from "@appsmith/constants/ApiConstants";
+import { REQUEST_TIMEOUT_MS } from "ee/constants/ApiConstants";
 import { convertObjectToQueryParams } from "utils/URLUtils";
 import {
   apiFailureResponseInterceptor,
   apiRequestInterceptor,
   apiSuccessResponseInterceptor,
   blockedApiRoutesForAirgapInterceptor,
-} from "@appsmith/api/ApiUtils";
+} from "ee/api/ApiUtils";
 
 //TODO(abhinav): Refactor this to make more composable.
 export const apiRequestConfig = {

app/client/src/api/CloudServicesApi.ts

@@ -1,4 +1,4 @@
-import { getAppsmithConfigs } from "@appsmith/configs";
+import { getAppsmithConfigs } from "ee/configs";
 
 const { cloudServicesBaseUrl: BASE_URL } = getAppsmithConfigs();
 

app/client/src/api/DatasourcesApi.ts

@@ -1,4 +1,4 @@
-import { DEFAULT_TEST_DATA_SOURCE_TIMEOUT_MS } from "@appsmith/constants/ApiConstants";
+import { DEFAULT_TEST_DATA_SOURCE_TIMEOUT_MS } from "ee/constants/ApiConstants";
 import API from "api/Api";
 import type { ApiResponse } from "./ApiResponses";
 import type { AxiosPromise } from "axios";

app/client/src/api/GitSyncAPI.tsx

@@ -2,7 +2,7 @@ import type { AxiosPromise } from "axios";
 import Api from "api/Api";
 import type { ApiResponse } from "./ApiResponses";
 import type { GitConfig } from "entities/GitSync";
-import ApplicationApi from "@appsmith/api/ApplicationApi";
+import ApplicationApi from "ee/api/ApplicationApi";
 
 export interface CommitPayload {
   applicationId: string;

app/client/src/api/ImportApi.ts

@@ -1,7 +1,7 @@
 import type { AxiosPromise } from "axios";
 import Api from "api/Api";
 import type { ApiResponse } from "./ApiResponses";
-import type { ActionParentEntityTypeInterface } from "@appsmith/entities/Engine/actionHelpers";
+import type { ActionParentEntityTypeInterface } from "ee/entities/Engine/actionHelpers";
 
 export interface CurlImportRequest {
   type: string;

app/client/src/api/OAuthApi.ts

@@ -2,7 +2,7 @@ import Api from "./Api";
 import type { AxiosPromise } from "axios";
 import type { ApiResponse } from "api/ApiResponses";
 import type { Datasource } from "entities/Datasource";
-import type { ActionParentEntityTypeInterface } from "@appsmith/entities/Engine/actionHelpers";
+import type { ActionParentEntityTypeInterface } from "ee/entities/Engine/actionHelpers";
 
 class OAuthApi extends Api {
   static url = "v1/saas";

app/client/src/api/PageApi.tsx

@@ -7,7 +7,7 @@ import type {
   PageAction,
 } from "constants/AppsmithActionConstants/ActionConstants";
 import type { DSLWidget } from "WidgetProvider/constants";
-import type { FetchApplicationResponse } from "@appsmith/api/ApplicationApi";
+import type { FetchApplicationResponse } from "ee/api/ApplicationApi";
 import type { APP_MODE } from "entities/App";
 
 export interface FetchPageRequest {

app/client/src/api/PluginApi.ts

@@ -3,7 +3,7 @@ import type { AxiosPromise } from "axios";
 import type { ApiResponse } from "api/ApiResponses";
 import type { PluginPackageName, PluginType } from "entities/Action";
 import type { DependencyMap } from "utils/DynamicBindingUtils";
-import { FILE_UPLOAD_TRIGGER_TIMEOUT_MS } from "@appsmith/constants/ApiConstants";
+import { FILE_UPLOAD_TRIGGER_TIMEOUT_MS } from "ee/constants/ApiConstants";
 
 export type PluginId = string;
 export type GenerateCRUDEnabledPluginMap = Record<PluginId, PluginPackageName>;

app/client/src/api/SearchApi.tsx

@@ -1,6 +1,6 @@
 import Api from "api/Api";
 import type { AxiosPromise } from "axios";
-import type { SearchApiResponse } from "@appsmith/types/ApiResponseTypes";
+import type { SearchApiResponse } from "ee/types/ApiResponseTypes";
 
 export interface SearchEntitiesRequest {
   entities?: string[];

app/client/src/api/TemplatesApi.ts

@@ -5,7 +5,7 @@ import type { WidgetType } from "constants/WidgetConstants";
 import type {
   ApplicationResponsePayload,
   ApplicationPagePayload,
-} from "@appsmith/api/ApplicationApi";
+} from "ee/api/ApplicationApi";
 import type { Datasource } from "entities/Datasource";
 
 export interface Template {

app/client/src/assets/fonts/google/index.css

@@ -1,9 +0,0 @@
-@import url("https://fonts.googleapis.com/css2?family=Nunito+Sans:ital,wght@0,300;0,400;0,700;1,300;1,400;1,700&display=swap");
-@import url("https://fonts.googleapis.com/css2?family=Poppins:ital,wght@0,300;0,400;0,500;0,700;1,300;1,400;1,500;1,700&display=swap");
-@import url("https://fonts.googleapis.com/css2?family=Inter:wght@300;400;500;700&display=swap");
-@import url("https://fonts.googleapis.com/css2?family=Montserrat:ital,wght@0,300;0,400;0,500;0,700;1,300;1,400;1,500;1,700&display=swap");
-@import url("https://fonts.googleapis.com/css2?family=Noto+Sans:ital,wght@0,300;0,400;0,500;0,700;1,300;1,400;1,500;1,700&display=swap");
-@import url("https://fonts.googleapis.com/css2?family=Open+Sans:ital,wght@0,300;0,400;0,500;0,700;1,300;1,400;1,500;1,700&display=swap");
-@import url("https://fonts.googleapis.com/css2?family=Roboto:ital,wght@0,300;0,400;0,500;0,700;1,300;1,400;1,500;1,700&display=swap");
-@import url("https://fonts.googleapis.com/css2?family=Rubik:ital,wght@0,300;0,400;0,500;0,700;1,300;1,400;1,500;1,700&display=swap");
-@import url("https://fonts.googleapis.com/css2?family=Ubuntu:ital,wght@0,300;0,400;0,500;0,700;1,300;1,400;1,500;1,700&display=swap");

app/client/src/ce/AppRouter.tsx

@@ -1,6 +1,6 @@
 import React, { Suspense, useEffect } from "react";
 import history from "utils/history";
-import AppHeader from "@appsmith/pages/common/AppHeader";
+import AppHeader from "ee/pages/common/AppHeader";
 import { Redirect, Route, Router, Switch } from "react-router-dom";
 import {
   ADMIN_SETTINGS_CATEGORY_PATH,
@@ -49,18 +49,18 @@ import UserProfile from "pages/UserProfile";
 import Setup from "pages/setup";
 import SettingsLoader from "pages/AdminSettings/loader";
 import SignupSuccess from "pages/setup/SignupSuccess";
-import type { ERROR_CODES } from "@appsmith/constants/ApiConstants";
+import type { ERROR_CODES } from "ee/constants/ApiConstants";
 import TemplatesListLoader from "pages/Templates/loader";
 import { getCurrentUser as getCurrentUserSelector } from "selectors/usersSelectors";
-import { getTenantPermissions } from "@appsmith/selectors/tenantSelectors";
+import { getTenantPermissions } from "ee/selectors/tenantSelectors";
 import useBrandingTheme from "utils/hooks/useBrandingTheme";
 import RouteChangeListener from "RouteChangeListener";
 import { initCurrentPage } from "../actions/initActions";
 import Walkthrough from "components/featureWalkthrough";
 import ProductAlertBanner from "components/editorComponents/ProductAlertBanner";
-import { getAdminSettingsPath } from "@appsmith/utils/BusinessFeatures/adminSettingsHelpers";
+import { getAdminSettingsPath } from "ee/utils/BusinessFeatures/adminSettingsHelpers";
 import { useFeatureFlag } from "utils/hooks/useFeatureFlag";
-import { FEATURE_FLAG } from "@appsmith/entities/FeatureFlag";
+import { FEATURE_FLAG } from "ee/entities/FeatureFlag";
 import CustomWidgetBuilderLoader from "pages/Editor/CustomWidgetBuilder/loader";
 import { getIsConsolidatedPageLoading } from "selectors/ui";
 import { useFeatureFlagOverride } from "utils/hooks/useFeatureFlagOverride";

app/client/src/ce/RouteBuilder.ts

@@ -8,12 +8,12 @@ import {
   TEMPLATES_PATH,
 } from "constants/routes";
 import { APP_MODE } from "entities/App";
-import urlBuilder from "@appsmith/entities/URLRedirect/URLAssembly";
-import type { URLBuilderParams } from "@appsmith/entities/URLRedirect/URLAssembly";
+import urlBuilder from "ee/entities/URLRedirect/URLAssembly";
+import type { URLBuilderParams } from "ee/entities/URLRedirect/URLAssembly";
 import type {
   ApplicationPayload,
   Page,
-} from "@appsmith/constants/ReduxActionConstants";
+} from "ee/constants/ReduxActionConstants";
 
 export const fillPathname = (
   pathname: string,

app/client/src/ce/RouteParamsMiddleware.ts

@@ -2,14 +2,14 @@ import type {
   ApplicationPayload,
   Page,
   ReduxAction,
-} from "@appsmith/constants/ReduxActionConstants";
-import { ReduxActionTypes } from "@appsmith/constants/ReduxActionConstants";
+} from "ee/constants/ReduxActionConstants";
+import { ReduxActionTypes } from "ee/constants/ReduxActionConstants";
 import type { UpdatePageResponse } from "api/PageApi";
 import type {
   ApplicationURLParams,
   PageURLParams,
-} from "@appsmith/entities/URLRedirect/URLAssembly";
-import urlBuilder from "@appsmith/entities/URLRedirect/URLAssembly";
+} from "ee/entities/URLRedirect/URLAssembly";
+import urlBuilder from "ee/entities/URLRedirect/URLAssembly";
 import type { Middleware } from "redux";
 
 // TODO: Fix this the next time the file is edited

app/client/src/ce/actions/applicationActions.ts

@@ -4,8 +4,8 @@ import type {
   FetchApplicationPayload,
   ImportApplicationRequest,
   UpdateApplicationPayload,
-} from "@appsmith/api/ApplicationApi";
-import { ReduxActionTypes } from "@appsmith/constants/ReduxActionConstants";
+} from "ee/api/ApplicationApi";
+import { ReduxActionTypes } from "ee/constants/ReduxActionConstants";
 import type { NavigationSetting, ThemeSetting } from "constants/AppConstants";
 import type { IconNames } from "design-system";
 import type { Datasource } from "entities/Datasource";

app/client/src/ce/actions/evaluationActionsList.ts

@@ -1,11 +1,11 @@
-import type { ReduxAction } from "@appsmith/constants/ReduxActionConstants";
+import type { ReduxAction } from "ee/constants/ReduxActionConstants";
 import {
   ReduxActionErrorTypes,
   ReduxActionTypes,
-} from "@appsmith/constants/ReduxActionConstants";
+} from "ee/constants/ReduxActionConstants";
 import { union } from "lodash";
 import store from "store";
-import { getAppMode } from "@appsmith/selectors/applicationSelectors";
+import { getAppMode } from "ee/selectors/applicationSelectors";
 import { APP_MODE } from "entities/App";
 import { shouldTriggerLinting } from "actions/evaluationActions";
 

app/client/src/ce/actions/helpers.ts

@@ -1,4 +1,4 @@
-import type { EventLocation } from "@appsmith/utils/analyticsUtilTypes";
+import type { EventLocation } from "ee/utils/analyticsUtilTypes";
 import {
   createNewApiAction,
   createNewQueryAction,
@@ -7,7 +7,7 @@ import { createNewJSCollection } from "actions/jsPaneActions";
 import {
   ActionParentEntityType,
   type ActionParentEntityTypeInterface,
-} from "@appsmith/entities/Engine/actionHelpers";
+} from "ee/entities/Engine/actionHelpers";
 import { saveActionName } from "actions/pluginActionActions";
 import { saveJSObjectName } from "actions/jsActionActions";
 

app/client/src/ce/actions/settingsAction.ts

@@ -1,4 +1,4 @@
-import { ReduxActionTypes } from "@appsmith/constants/ReduxActionConstants";
+import { ReduxActionTypes } from "ee/constants/ReduxActionConstants";
 
 // TODO: Fix this the next time the file is edited
 // eslint-disable-next-line @typescript-eslint/no-explicit-any

app/client/src/ce/actions/tenantActions.ts

@@ -1,5 +1,5 @@
-import { ReduxActionTypes } from "@appsmith/constants/ReduxActionConstants";
-import type { UpdateTenantConfigRequest } from "@appsmith/api/TenantApi";
+import { ReduxActionTypes } from "ee/constants/ReduxActionConstants";
+import type { UpdateTenantConfigRequest } from "ee/api/TenantApi";
 import type { ApiResponse } from "api/ApiResponses";
 
 export const getCurrentTenant = (

app/client/src/ce/actions/workspaceActions.ts

@@ -1,8 +1,8 @@
-import { ReduxActionTypes } from "@appsmith/constants/ReduxActionConstants";
+import { ReduxActionTypes } from "ee/constants/ReduxActionConstants";
 import type {
   SaveWorkspaceLogo,
   SaveWorkspaceRequest,
-} from "@appsmith/api/WorkspaceApi";
+} from "ee/api/WorkspaceApi";
 
 interface FetchAllWorkspacesParams {
   fetchEntities?: boolean;

app/client/src/ce/api/ApiUtils.test.ts

@@ -10,8 +10,8 @@ import {
   createMessage,
   ERROR_0,
   SERVER_API_TIMEOUT_ERROR,
-} from "@appsmith/constants/messages";
-import { ERROR_CODES } from "@appsmith/constants/ApiConstants";
+} from "ee/constants/messages";
+import { ERROR_CODES } from "ee/constants/ApiConstants";
 import * as Sentry from "@sentry/react";
 
 describe("axios api interceptors", () => {

app/client/src/ce/api/ApiUtils.ts

@@ -5,14 +5,14 @@ import {
   ERROR_500,
   GENERIC_API_EXECUTION_ERROR,
   SERVER_API_TIMEOUT_ERROR,
-} from "@appsmith/constants/messages";
+} from "ee/constants/messages";
 import type { AxiosRequestConfig, AxiosResponse } from "axios";
 import axios from "axios";
 import {
   API_STATUS_CODES,
   ERROR_CODES,
   SERVER_ERROR_CODES,
-} from "@appsmith/constants/ApiConstants";
+} from "ee/constants/ApiConstants";
 import log from "loglevel";
 import type { ActionExecutionResponse } from "api/ActionAPI";
 import store from "store";
@@ -21,14 +21,14 @@ import { AUTH_LOGIN_URL } from "constants/routes";
 import { getCurrentGitBranch } from "selectors/gitSyncSelectors";
 import getQueryParamsObject from "utils/getQueryParamsObject";
 import { UserCancelledActionExecutionError } from "sagas/ActionExecution/errorUtils";
-import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
-import { getAppsmithConfigs } from "@appsmith/configs";
+import AnalyticsUtil from "ee/utils/AnalyticsUtil";
+import { getAppsmithConfigs } from "ee/configs";
 import * as Sentry from "@sentry/react";
 import { CONTENT_TYPE_HEADER_KEY } from "constants/ApiEditorConstants/CommonApiConstants";
-import { isAirgapped } from "@appsmith/utils/airgapHelpers";
-import { getCurrentEnvironmentId } from "@appsmith/selectors/environmentSelectors";
+import { isAirgapped } from "ee/utils/airgapHelpers";
+import { getCurrentEnvironmentId } from "ee/selectors/environmentSelectors";
 import { UNUSED_ENV_ID } from "constants/EnvironmentContants";
-import { ID_EXTRACTION_REGEX } from "@appsmith/constants/routes/appRoutes";
+import { ID_EXTRACTION_REGEX } from "ee/constants/routes/appRoutes";
 
 const executeActionRegex = /actions\/execute/;
 const timeoutErrorRegex = /timeout of (\d+)ms exceeded/;

app/client/src/ce/api/ApplicationApi.tsx

@@ -1,5 +1,5 @@
-import type { ApplicationVersion } from "@appsmith/actions/applicationActions";
-import { getSnapShotAPIRoute } from "@appsmith/constants/ApiConstants";
+import type { ApplicationVersion } from "ee/actions/applicationActions";
+import { getSnapShotAPIRoute } from "ee/constants/ApiConstants";
 import Api from "api/Api";
 import type { ApiResponse } from "api/ApiResponses";
 import type { AxiosProgressEvent, AxiosPromise } from "axios";

app/client/src/ce/api/JSActionAPI.tsx

@@ -5,7 +5,7 @@ import type { ApiResponse } from "api/ApiResponses";
 import type { Variable, JSAction } from "entities/JSCollection";
 import type { PluginType } from "entities/Action";
 import type { FetchActionsPayload } from "api/ActionAPI";
-import type { ActionParentEntityTypeInterface } from "@appsmith/entities/Engine/actionHelpers";
+import type { ActionParentEntityTypeInterface } from "ee/entities/Engine/actionHelpers";
 
 export type JSCollectionCreateUpdateResponse = ApiResponse<JSCollection>;
 

app/client/src/ce/api/UserApi.tsx

@@ -1,7 +1,7 @@
 import type { AxiosPromise } from "axios";
 import Api from "api/Api";
 import type { ApiResponse } from "api/ApiResponses";
-import type { FeatureFlags } from "@appsmith/entities/FeatureFlag";
+import type { FeatureFlags } from "ee/entities/FeatureFlag";
 import type { ProductAlert } from "../../reducers/uiReducers/usersReducer";
 
 export interface LoginUserRequest {

app/client/src/ce/api/WorkspaceApi.ts

@@ -1,10 +1,7 @@
 import type { AxiosProgressEvent, AxiosPromise } from "axios";
 import Api from "api/Api";
 import type { ApiResponse } from "api/ApiResponses";
-import type {
-  WorkspaceRole,
-  Workspace,
-} from "@appsmith/constants/workspaceConstants";
+import type { WorkspaceRole, Workspace } from "ee/constants/workspaceConstants";
 
 export interface FetchWorkspacesResponse extends ApiResponse {
   data: Workspace[];

app/client/src/ce/components/DSDataFilter/index.tsx

@@ -1,12 +1,9 @@
 import React, { useEffect, useState } from "react";
 import styled from "styled-components";
 import { Link, Tag, Text, Tooltip } from "design-system";
-import { BUSINESS_TAG, createMessage } from "@appsmith/constants/messages";
+import { BUSINESS_TAG, createMessage } from "ee/constants/messages";
 import { capitalizeFirstLetter } from "utils/helpers";
-import {
-  getRampLink,
-  showProductRamps,
-} from "@appsmith/selectors/rampSelectors";
+import { getRampLink, showProductRamps } from "ee/selectors/rampSelectors";
 import {
   RAMP_NAME,
   RampFeature,
@@ -15,7 +12,7 @@ import {
 import { useSelector } from "react-redux";
 import type { EnvironmentType } from "constants/EnvironmentContants";
 import { environmentList } from "constants/EnvironmentContants";
-import { DisabledTooltipContent } from "@appsmith/components/SwitchEnvironment";
+import { DisabledTooltipContent } from "ee/components/SwitchEnvironment";
 
 export const Container = styled.div`
   display: flex;

app/client/src/ce/components/SwitchEnvironment/index.tsx

@@ -7,11 +7,8 @@ import {
   BUSINESS_EDITION_TEXT,
   SWITCH_ENV_DISABLED_TOOLTIP_TEXT,
   createMessage,
-} from "@appsmith/constants/messages";
-import {
-  getRampLink,
-  showProductRamps,
-} from "@appsmith/selectors/rampSelectors";
+} from "ee/constants/messages";
+import { getRampLink, showProductRamps } from "ee/selectors/rampSelectors";
 import { isDatasourceInViewMode } from "selectors/ui";
 import { matchDatasourcePath, matchSAASGsheetsPath } from "constants/routes";
 import {

app/client/src/ce/components/WorkspaceSettingsTabs/index.tsx

@@ -5,10 +5,10 @@ import {
   useLocation,
   useHistory,
 } from "react-router-dom";
-import MemberSettings from "@appsmith/pages/workspace/Members";
+import MemberSettings from "ee/pages/workspace/Members";
 import { GeneralSettings } from "pages/workspace/General";
 import { Tabs, Tab, TabsList, TabPanel } from "design-system";
-import { navigateToTab } from "@appsmith/pages/workspace/helpers";
+import { navigateToTab } from "ee/pages/workspace/helpers";
 import styled from "styled-components";
 
 import * as Sentry from "@sentry/react";

app/client/src/ce/components/editorComponents/Debugger/ErrorLogs/getLogIconForEntity.tsx

@@ -8,7 +8,7 @@ import {
   EntityIcon,
   JsFileIconV2,
 } from "pages/Editor/Explorer/ExplorerIcons";
-import { getAssetUrl } from "@appsmith/utils/airgapHelpers";
+import { getAssetUrl } from "ee/utils/airgapHelpers";
 import { ENTITY_TYPE } from "entities/DataTree/dataTreeFactory";
 
 type IconProps = LogItemProps & {

app/client/src/ce/components/editorComponents/Debugger/entityTypeLinkMap.tsx

@@ -2,7 +2,7 @@ import ActionLink from "components/editorComponents/Debugger/ActionLink";
 import DatasourceLink from "components/editorComponents/Debugger/DataSourceLink";
 import WidgetLink from "components/editorComponents/Debugger/WidgetLink";
 import JSCollectionLink from "components/editorComponents/Debugger/JSCollectionLink";
-import { ENTITY_TYPE } from "@appsmith/entities/AppsmithConsole/utils";
+import { ENTITY_TYPE } from "ee/entities/AppsmithConsole/utils";
 
 export const entityTypeLinkMap = {
   [ENTITY_TYPE.WIDGET]: WidgetLink,

app/client/src/ce/components/editorComponents/GPT/trigger.tsx

@@ -1,7 +1,7 @@
 /* eslint-disable @typescript-eslint/no-unused-vars */
 import type { TEditorModes } from "components/editorComponents/CodeEditor/EditorConfig";
-import type { FeatureFlags } from "@appsmith/entities/FeatureFlag";
-import type { EntityTypeValue } from "@appsmith/entities/DataTree/types";
+import type { FeatureFlags } from "ee/entities/FeatureFlag";
+import type { EntityTypeValue } from "ee/entities/DataTree/types";
 
 export const APPSMITH_AI = "Appsmith AI";
 

app/client/src/ce/components/gitComponents/GitSettingsCDTab/UnlicensedGitCD.tsx

@@ -3,7 +3,7 @@ import {
   CONFIGURE_CD_TITLE,
   TRY_APPSMITH_ENTERPRISE,
   createMessage,
-} from "@appsmith/constants/messages";
+} from "ee/constants/messages";
 import { Button, Text } from "design-system";
 import { useAppsmithEnterpriseLink } from "pages/Editor/gitSync/GitSettingsModal/TabBranch/hooks";
 import React from "react";