Move admin-theme into admin package

vivid-planet · Feb 21, 2025 · fe48623 · fe48623
1 parent 520cc0b
commit fe48623
Show file tree

Hide file tree

Showing 62 changed files with 28 additions and 38 deletions.
diff --git a/packages/admin/admin-theme/package.json b/packages/admin/admin-theme/package.json
@@ -26,32 +26,22 @@
         "start:types": "tsc --project ./tsconfig.json --emitDeclarationOnly --watch --preserveWatchOutput"
     },
     "dependencies": {
-        "@comet/admin-icons": "workspace:^7.13.0",
-        "@mui/utils": "^6.4.3"
+        "@comet/admin": "workspace:^7.13.0"
     },
     "devDependencies": {
         "@babel/cli": "^7.26.4",
         "@babel/core": "^7.26.9",
         "@comet/admin-babel-preset": "workspace:^7.13.0",
         "@comet/eslint-config": "workspace:^7.13.0",
         "@mui/material": "^6.4.4",
-        "@mui/system": "^6.4.3",
-        "@mui/x-data-grid": "^7.26.0",
         "@types/react": "^18.3.18",
         "@types/react-dom": "^18.3.5",
         "eslint": "^9.20.1",
         "npm-run-all2": "^5.0.2",
         "prettier": "^3.5.1",
-        "react": "^18.3.1",
-        "react-dom": "^18.3.1",
         "rimraf": "^6.0.1",
         "typescript": "^5.7.3"
     },
-    "peerDependencies": {
-        "@mui/material": "^6.0.0",
-        "@mui/system": "^6.0.0",
-        "react": "^17.0.0 || ^18.0.0"
-    },
     "publishConfig": {
         "access": "public",
         "registry": "https://registry.npmjs.org"

diff --git a/packages/admin/admin-theme/src/index.ts b/packages/admin/admin-theme/src/index.ts
@@ -1,6 +1,14 @@
-export { breakpointsOptions, breakpointValues } from "./breakpointsOptions";
-export { errorPalette, greyPalette, infoPalette, primaryPalette, successPalette, warningPalette } from "./colors";
-export { createCometTheme } from "./createCometTheme";
-export { paletteOptions } from "./paletteOptions";
-export { shadows } from "./shadows";
-export { createTypographyOptions } from "./typographyOptions";
+export {
+    breakpointsOptions,
+    breakpointValues,
+    errorPalette,
+    greyPalette,
+    infoPalette,
+    primaryPalette,
+    successPalette,
+    warningPalette,
+    createCometTheme,
+    paletteOptions,
+    shadows,
+    createTypographyOptions,
+} from "@comet/admin";
diff --git a/packages/admin/admin/package.json b/packages/admin/admin/package.json
@@ -29,7 +29,6 @@
     },
     "dependencies": {
         "@comet/admin-icons": "workspace:^7.13.0",
-        "@comet/admin-theme": "workspace:^7.13.0",
         "exceljs": "^4.4.0",
         "file-saver": "^2.0.5",
         "final-form-set-field-data": "^1.0.2",
@@ -53,6 +52,7 @@
         "@emotion/styled": "^11.14.0",
         "@mui/material": "^6.4.4",
         "@mui/system": "^6.4.3",
+        "@mui/utils": "^6.4.3",
         "@mui/x-data-grid": "^7.26.0",
         "@mui/x-data-grid-pro": "^7.26.0",
         "@testing-library/dom": "^10.4.0",
@@ -95,6 +95,7 @@
         "@emotion/react": "^11.5.0",
         "@emotion/styled": "^11.3.0",
         "@mui/material": "^6.0.0",
+        "@mui/utils": "^6.0.0",
         "@mui/x-data-grid": "^7.0.0",
         "@mui/x-data-grid-premium": "^7.0.0",
         "@mui/x-data-grid-pro": "^7.0.0",

diff --git a/packages/admin/admin/src/index.ts b/packages/admin/admin/src/index.ts
@@ -317,6 +317,12 @@ export { IWithTableQueryProps, withTableQueryContext } from "./table/withTableQu
 export { RouterTab, RouterTabs, RouterTabsClassKey } from "./tabs/RouterTabs";
 export { Tab, Tabs, TabsClassKey, TabsProps } from "./tabs/Tabs";
 export { TabScrollButton, TabScrollButtonClassKey, TabScrollButtonProps } from "./tabs/TabScrollButton";
+export { breakpointsOptions, breakpointValues } from "./theme/breakpointsOptions";
+export { errorPalette, greyPalette, infoPalette, primaryPalette, successPalette, warningPalette } from "./theme/colors";
+export { createCometTheme } from "./theme/createCometTheme";
+export { paletteOptions } from "./theme/paletteOptions";
+export { shadows } from "./theme/shadows";
+export { createTypographyOptions } from "./theme/typographyOptions";
 export { BaseTranslationDialog } from "./translator/BaseTranslationDialog";
 export { ContentTranslationServiceProvider } from "./translator/ContentTranslationServiceProvider";
 export { useContentTranslationService } from "./translator/useContentTranslationService";
diff --git a/...min/admin-theme/src/breakpointsOptions.ts → ...min/admin/src/theme/breakpointsOptions.ts b/...min/admin-theme/src/breakpointsOptions.ts → ...min/admin/src/theme/breakpointsOptions.ts
diff --git a/packages/admin/admin-theme/src/colors.ts → packages/admin/admin/src/theme/colors.ts b/packages/admin/admin-theme/src/colors.ts → packages/admin/admin/src/theme/colors.ts
diff --git a/...theme/src/componentsTheme/MuiAccordion.ts → ...src/theme/componentsTheme/MuiAccordion.ts b/...theme/src/componentsTheme/MuiAccordion.ts → ...src/theme/componentsTheme/MuiAccordion.ts
diff --git a/...in-theme/src/componentsTheme/MuiAlert.tsx → ...in/src/theme/componentsTheme/MuiAlert.tsx b/...in-theme/src/componentsTheme/MuiAlert.tsx → ...in/src/theme/componentsTheme/MuiAlert.tsx
diff --git a/...eme/src/componentsTheme/MuiAlertTitle.tsx → ...c/theme/componentsTheme/MuiAlertTitle.tsx b/...eme/src/componentsTheme/MuiAlertTitle.tsx → ...c/theme/componentsTheme/MuiAlertTitle.tsx
diff --git a/...in-theme/src/componentsTheme/MuiAppBar.ts → ...in/src/theme/componentsTheme/MuiAppBar.ts b/...in-theme/src/componentsTheme/MuiAppBar.ts → ...in/src/theme/componentsTheme/MuiAppBar.ts
diff --git a/...e/src/componentsTheme/MuiAutocomplete.tsx → ...theme/componentsTheme/MuiAutocomplete.tsx b/...e/src/componentsTheme/MuiAutocomplete.tsx → ...theme/componentsTheme/MuiAutocomplete.tsx
diff --git a/...in-theme/src/componentsTheme/MuiBadge.tsx → ...in/src/theme/componentsTheme/MuiBadge.tsx b/...in-theme/src/componentsTheme/MuiBadge.tsx → ...in/src/theme/componentsTheme/MuiBadge.tsx
diff --git a/...in-theme/src/componentsTheme/MuiButton.ts → ...in/src/theme/componentsTheme/MuiButton.ts b/...in-theme/src/componentsTheme/MuiButton.ts → ...in/src/theme/componentsTheme/MuiButton.ts
diff --git a/...eme/src/componentsTheme/MuiButtonGroup.ts → ...c/theme/componentsTheme/MuiButtonGroup.ts b/...eme/src/componentsTheme/MuiButtonGroup.ts → ...c/theme/componentsTheme/MuiButtonGroup.ts
diff --git a/...dmin-theme/src/componentsTheme/MuiCard.ts → ...dmin/src/theme/componentsTheme/MuiCard.ts b/...dmin-theme/src/componentsTheme/MuiCard.ts → ...dmin/src/theme/componentsTheme/MuiCard.ts
diff --git a/...eme/src/componentsTheme/MuiCardContent.ts → ...c/theme/componentsTheme/MuiCardContent.ts b/...eme/src/componentsTheme/MuiCardContent.ts → ...c/theme/componentsTheme/MuiCardContent.ts
diff --git a/...heme/src/componentsTheme/MuiCardHeader.ts → ...rc/theme/componentsTheme/MuiCardHeader.ts b/...heme/src/componentsTheme/MuiCardHeader.ts → ...rc/theme/componentsTheme/MuiCardHeader.ts
diff --git a/...theme/src/componentsTheme/MuiCheckbox.tsx → ...src/theme/componentsTheme/MuiCheckbox.tsx b/...theme/src/componentsTheme/MuiCheckbox.tsx → ...src/theme/componentsTheme/MuiCheckbox.tsx
diff --git a/...min-theme/src/componentsTheme/MuiChip.tsx → ...min/src/theme/componentsTheme/MuiChip.tsx b/...min-theme/src/componentsTheme/MuiChip.tsx → ...min/src/theme/componentsTheme/MuiChip.tsx
diff --git a/...theme/src/componentsTheme/MuiDataGrid.tsx → ...src/theme/componentsTheme/MuiDataGrid.tsx b/...theme/src/componentsTheme/MuiDataGrid.tsx → ...src/theme/componentsTheme/MuiDataGrid.tsx
diff --git a/...in-theme/src/componentsTheme/MuiDialog.ts → ...in/src/theme/componentsTheme/MuiDialog.ts b/...in-theme/src/componentsTheme/MuiDialog.ts → ...in/src/theme/componentsTheme/MuiDialog.ts
diff --git a/...e/src/componentsTheme/MuiDialogActions.ts → ...theme/componentsTheme/MuiDialogActions.ts b/...e/src/componentsTheme/MuiDialogActions.ts → ...theme/componentsTheme/MuiDialogActions.ts
diff --git a/...e/src/componentsTheme/MuiDialogContent.ts → ...theme/componentsTheme/MuiDialogContent.ts b/...e/src/componentsTheme/MuiDialogContent.ts → ...theme/componentsTheme/MuiDialogContent.ts
diff --git a/...c/componentsTheme/MuiDialogContentText.ts → ...e/componentsTheme/MuiDialogContentText.ts b/...c/componentsTheme/MuiDialogContentText.ts → ...e/componentsTheme/MuiDialogContentText.ts
diff --git a/...eme/src/componentsTheme/MuiDialogTitle.ts → ...c/theme/componentsTheme/MuiDialogTitle.ts b/...eme/src/componentsTheme/MuiDialogTitle.ts → ...c/theme/componentsTheme/MuiDialogTitle.ts
diff --git a/...in-theme/src/componentsTheme/MuiDrawer.ts → ...in/src/theme/componentsTheme/MuiDrawer.ts b/...in-theme/src/componentsTheme/MuiDrawer.ts → ...in/src/theme/componentsTheme/MuiDrawer.ts
diff --git a/...rc/componentsTheme/MuiFormControlLabel.ts → ...me/componentsTheme/MuiFormControlLabel.ts b/...rc/componentsTheme/MuiFormControlLabel.ts → ...me/componentsTheme/MuiFormControlLabel.ts
diff --git a/.../src/componentsTheme/MuiFormHelperText.ts → ...heme/componentsTheme/MuiFormHelperText.ts b/.../src/componentsTheme/MuiFormHelperText.ts → ...heme/componentsTheme/MuiFormHelperText.ts
diff --git a/...theme/src/componentsTheme/MuiFormLabel.ts → ...src/theme/componentsTheme/MuiFormLabel.ts b/...theme/src/componentsTheme/MuiFormLabel.ts → ...src/theme/componentsTheme/MuiFormLabel.ts
diff --git a/...heme/src/componentsTheme/MuiIconButton.ts → ...rc/theme/componentsTheme/MuiIconButton.ts b/...heme/src/componentsTheme/MuiIconButton.ts → ...rc/theme/componentsTheme/MuiIconButton.ts
diff --git a/...min-theme/src/componentsTheme/MuiInput.ts → ...min/src/theme/componentsTheme/MuiInput.ts b/...min-theme/src/componentsTheme/MuiInput.ts → ...min/src/theme/componentsTheme/MuiInput.ts
diff --git a/.../src/componentsTheme/MuiInputAdornment.ts → ...heme/componentsTheme/MuiInputAdornment.ts b/.../src/componentsTheme/MuiInputAdornment.ts → ...heme/componentsTheme/MuiInputAdornment.ts
diff --git a/...theme/src/componentsTheme/MuiInputBase.ts → ...src/theme/componentsTheme/MuiInputBase.ts b/...theme/src/componentsTheme/MuiInputBase.ts → ...src/theme/componentsTheme/MuiInputBase.ts
diff --git a/.../src/componentsTheme/MuiLinearProgress.ts → ...heme/componentsTheme/MuiLinearProgress.ts b/.../src/componentsTheme/MuiLinearProgress.ts → ...heme/componentsTheme/MuiLinearProgress.ts
diff --git a/...dmin-theme/src/componentsTheme/MuiLink.ts → ...dmin/src/theme/componentsTheme/MuiLink.ts b/...dmin-theme/src/componentsTheme/MuiLink.ts → ...dmin/src/theme/componentsTheme/MuiLink.ts
diff --git a/...-theme/src/componentsTheme/MuiListItem.ts → .../src/theme/componentsTheme/MuiListItem.ts b/...-theme/src/componentsTheme/MuiListItem.ts → .../src/theme/componentsTheme/MuiListItem.ts
diff --git a/...e/src/componentsTheme/MuiListItemIcon.tsx → ...theme/componentsTheme/MuiListItemIcon.tsx b/...e/src/componentsTheme/MuiListItemIcon.tsx → ...theme/componentsTheme/MuiListItemIcon.tsx
diff --git a/...min-theme/src/componentsTheme/MuiMenu.tsx → ...min/src/theme/componentsTheme/MuiMenu.tsx b/...min-theme/src/componentsTheme/MuiMenu.tsx → ...min/src/theme/componentsTheme/MuiMenu.tsx
diff --git a/...e/src/componentsTheme/MuiNativeSelect.tsx → ...theme/componentsTheme/MuiNativeSelect.tsx b/...e/src/componentsTheme/MuiNativeSelect.tsx → ...theme/componentsTheme/MuiNativeSelect.tsx
diff --git a/...min-theme/src/componentsTheme/MuiPaper.ts → ...min/src/theme/componentsTheme/MuiPaper.ts b/...min-theme/src/componentsTheme/MuiPaper.ts → ...min/src/theme/componentsTheme/MuiPaper.ts
diff --git a/...n-theme/src/componentsTheme/MuiPopover.ts → ...n/src/theme/componentsTheme/MuiPopover.ts b/...n-theme/src/componentsTheme/MuiPopover.ts → ...n/src/theme/componentsTheme/MuiPopover.ts
diff --git a/...in-theme/src/componentsTheme/MuiRadio.tsx → ...in/src/theme/componentsTheme/MuiRadio.tsx b/...in-theme/src/componentsTheme/MuiRadio.tsx → ...in/src/theme/componentsTheme/MuiRadio.tsx
diff --git a/...n-theme/src/componentsTheme/MuiSelect.tsx → ...n/src/theme/componentsTheme/MuiSelect.tsx b/...n-theme/src/componentsTheme/MuiSelect.tsx → ...n/src/theme/componentsTheme/MuiSelect.tsx
diff --git a/...n-theme/src/componentsTheme/MuiSvgIcon.ts → ...n/src/theme/componentsTheme/MuiSvgIcon.ts b/...n-theme/src/componentsTheme/MuiSvgIcon.ts → ...n/src/theme/componentsTheme/MuiSvgIcon.ts
diff --git a/...in-theme/src/componentsTheme/MuiSwitch.ts → ...in/src/theme/componentsTheme/MuiSwitch.ts b/...in-theme/src/componentsTheme/MuiSwitch.ts → ...in/src/theme/componentsTheme/MuiSwitch.ts
diff --git a/...admin-theme/src/componentsTheme/MuiTab.ts → ...admin/src/theme/componentsTheme/MuiTab.ts b/...admin-theme/src/componentsTheme/MuiTab.ts → ...admin/src/theme/componentsTheme/MuiTab.ts
diff --git a/...theme/src/componentsTheme/MuiTableCell.ts → ...src/theme/componentsTheme/MuiTableCell.ts b/...theme/src/componentsTheme/MuiTableCell.ts → ...src/theme/componentsTheme/MuiTableCell.ts
diff --git a/...src/componentsTheme/MuiTablePagination.ts → ...eme/componentsTheme/MuiTablePagination.ts b/...src/componentsTheme/MuiTablePagination.ts → ...eme/componentsTheme/MuiTablePagination.ts
diff --git a/...-theme/src/componentsTheme/MuiTableRow.ts → .../src/theme/componentsTheme/MuiTableRow.ts b/...-theme/src/componentsTheme/MuiTableRow.ts → .../src/theme/componentsTheme/MuiTableRow.ts
diff --git a/...dmin-theme/src/componentsTheme/MuiTabs.ts → ...dmin/src/theme/componentsTheme/MuiTabs.ts b/...dmin-theme/src/componentsTheme/MuiTabs.ts → ...dmin/src/theme/componentsTheme/MuiTabs.ts
diff --git a/...me/src/componentsTheme/MuiToggleButton.ts → .../theme/componentsTheme/MuiToggleButton.ts b/...me/src/componentsTheme/MuiToggleButton.ts → .../theme/componentsTheme/MuiToggleButton.ts
diff --git a/...c/componentsTheme/MuiToggleButtonGroup.ts → ...e/componentsTheme/MuiToggleButtonGroup.ts b/...c/componentsTheme/MuiToggleButtonGroup.ts → ...e/componentsTheme/MuiToggleButtonGroup.ts
diff --git a/...n-theme/src/componentsTheme/MuiTooltip.ts → ...n/src/theme/componentsTheme/MuiTooltip.ts b/...n-theme/src/componentsTheme/MuiTooltip.ts → ...n/src/theme/componentsTheme/MuiTooltip.ts
diff --git a/...heme/src/componentsTheme/MuiTypography.ts → ...rc/theme/componentsTheme/MuiTypography.ts b/...heme/src/componentsTheme/MuiTypography.ts → ...rc/theme/componentsTheme/MuiTypography.ts
diff --git a/.../componentsTheme/getCommonSelectTheme.tsx → .../componentsTheme/getCommonSelectTheme.tsx b/.../componentsTheme/getCommonSelectTheme.tsx → .../componentsTheme/getCommonSelectTheme.tsx
diff --git a/...src/componentsTheme/getComponentsTheme.ts → ...eme/componentsTheme/getComponentsTheme.ts b/...src/componentsTheme/getComponentsTheme.ts → ...eme/componentsTheme/getComponentsTheme.ts
diff --git a/...admin/admin-theme/src/createCometTheme.ts → ...admin/admin/src/theme/createCometTheme.ts b/...admin/admin-theme/src/createCometTheme.ts → ...admin/admin/src/theme/createCometTheme.ts
diff --git a/...s/admin/admin-theme/src/paletteOptions.ts → ...s/admin/admin/src/theme/paletteOptions.ts b/...s/admin/admin-theme/src/paletteOptions.ts → ...s/admin/admin/src/theme/paletteOptions.ts
diff --git a/packages/admin/admin-theme/src/shadows.ts → packages/admin/admin/src/theme/shadows.ts b/packages/admin/admin-theme/src/shadows.ts → packages/admin/admin/src/theme/shadows.ts
diff --git a/...dmin/admin-theme/src/typographyOptions.ts → ...dmin/admin/src/theme/typographyOptions.ts b/...dmin/admin-theme/src/typographyOptions.ts → ...dmin/admin/src/theme/typographyOptions.ts
diff --git a/...in-theme/src/utils/mergeOverrideStyles.ts → ...in/src/theme/utils/mergeOverrideStyles.ts b/...in-theme/src/utils/mergeOverrideStyles.ts → ...in/src/theme/utils/mergeOverrideStyles.ts
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml