diff --git a/.changeset/lazy-pears-shout.md b/.changeset/lazy-pears-shout.md new file mode 100644 index 0000000000..b5f8562b00 --- /dev/null +++ b/.changeset/lazy-pears-shout.md @@ -0,0 +1,15 @@ +--- +"@comet/admin-theme": major +"@comet/admin": major +--- + +Remove the `@comet/admin-theme` package and move all of its exports into `@comet/admin` + +This includes the following values and functions: `breakpointsOptions`, `breakpointValues`, `createCometTheme`, `createTypographyOptions`, `errorPalette`, `greyPalette`, `infoPalette`, `paletteOptions`, `primaryPalette`, `shadows`, `successPalette`, `warningPalette`. + +```diff +-import { createCometTheme } from "@comet/admin-theme"; ++import { createCometTheme } from "@comet/admin"; + + const theme = createCometTheme(); +``` diff --git a/demo/admin/package.json b/demo/admin/package.json index d73ce3e89e..938a2dfd9b 100644 --- a/demo/admin/package.json +++ b/demo/admin/package.json @@ -27,7 +27,6 @@ "@comet/admin": "workspace:*", "@comet/admin-date-time": "workspace:*", "@comet/admin-icons": "workspace:*", - "@comet/admin-theme": "workspace:*", "@comet/cms-admin": "workspace:*", "@emotion/react": "^11.14.0", "@emotion/styled": "^11.14.0", diff --git a/demo/admin/src/theme.ts b/demo/admin/src/theme.ts index 728c17aaf3..97979b9cdc 100644 --- a/demo/admin/src/theme.ts +++ b/demo/admin/src/theme.ts @@ -1,3 +1,3 @@ -import { createCometTheme } from "@comet/admin-theme"; +import { createCometTheme } from "@comet/admin"; export const theme = createCometTheme(); diff --git a/demo/admin/src/vendors.d.ts b/demo/admin/src/vendors.d.ts index fe22e4a7e8..f0c79d28f9 100644 --- a/demo/admin/src/vendors.d.ts +++ b/demo/admin/src/vendors.d.ts @@ -1,5 +1,5 @@ /// -/// +/// /* eslint-disable @typescript-eslint/no-explicit-any */ declare module "*.svg" { diff --git a/demo/admin/vite.config.mts b/demo/admin/vite.config.mts index 739e73e990..64811ea4ab 100644 --- a/demo/admin/vite.config.mts +++ b/demo/admin/vite.config.mts @@ -91,14 +91,7 @@ export default defineConfig(({ mode }) => { global: "globalThis", }, }, - include: [ - "@comet/admin", - "@comet/admin-rte", - "@comet/admin-date-time", - "@comet/admin-icons", - "@comet/admin-theme", - "@comet/cms-admin", - ], + include: ["@comet/admin", "@comet/admin-rte", "@comet/admin-date-time", "@comet/admin-icons", "@comet/cms-admin"], }, resolve: { alias: { @@ -109,4 +102,4 @@ export default defineConfig(({ mode }) => { outDir: "build", }, }; -}); \ No newline at end of file +}); diff --git a/dev-pm.config.js b/dev-pm.config.js index 68a790468b..3eef5fdefd 100644 --- a/dev-pm.config.js +++ b/dev-pm.config.js @@ -4,7 +4,6 @@ const packageFolderMapping = { "@comet/admin-date-time": "packages/admin/admin-date-time", "@comet/admin-icons": "packages/admin/admin-icons", "@comet/admin-rte": "packages/admin/admin-rte", - "@comet/admin-theme": "packages/admin/admin-theme", "@comet/cms-admin": "packages/admin/cms-admin", "@comet/cms-api": "packages/api/cms-api", "@comet/cms-site": "packages/site/cms-site", @@ -45,31 +44,25 @@ module.exports = { script: "pnpm --filter @comet/admin-rte run start", group: ["comet-admin"], }, - { - name: "comet-admin-theme", - script: "pnpm --filter @comet/admin-theme run start", - group: ["comet-admin"], - waitOn: waitOnPackages("@comet/admin-icons", "@comet/admin-rte", "@comet/admin", "@comet/admin-color-picker"), - }, // group cms-admin { name: "cms-admin", script: "pnpm --filter @comet/cms-admin run start", group: ["cms-admin", "cms"], - waitOn: waitOnPackages("@comet/admin", "@comet/admin-icons", "@comet/admin-rte", "@comet/admin-theme"), + waitOn: waitOnPackages("@comet/admin", "@comet/admin-icons", "@comet/admin-rte"), }, { name: "cms-admin-codegen-graphql-types", script: "pnpm --filter @comet/cms-admin run generate-graphql-types:watch", group: ["cms-admin", "cms"], - waitOn: waitOnPackages("@comet/admin", "@comet/admin-icons", "@comet/admin-rte", "@comet/admin-theme"), + waitOn: waitOnPackages("@comet/admin", "@comet/admin-icons", "@comet/admin-rte"), }, { name: "cms-admin-codegen-block-types", script: "pnpm --filter @comet/cms-admin run generate-block-types:watch", group: ["cms-admin", "cms"], - waitOn: waitOnPackages("@comet/admin", "@comet/admin-icons", "@comet/admin-rte", "@comet/admin-theme"), + waitOn: waitOnPackages("@comet/admin", "@comet/admin-icons", "@comet/admin-rte"), }, //group cms-api @@ -107,7 +100,7 @@ module.exports = { script: "pnpm --filter comet-demo-admin run start", group: ["demo-admin", "demo"], waitOn: [ - ...waitOnPackages("@comet/admin", "@comet/admin-icons", "@comet/admin-rte", "@comet/admin-theme", "@comet/cms-admin"), + ...waitOnPackages("@comet/admin", "@comet/admin-icons", "@comet/admin-rte", "@comet/cms-admin"), "tcp:$API_PORT", ], }, diff --git a/docs/docs/5-admin-components/components/Typography.mdx b/docs/docs/5-admin-components/components/Typography.mdx index 45cd76a739..9b30b41291 100644 --- a/docs/docs/5-admin-components/components/Typography.mdx +++ b/docs/docs/5-admin-components/components/Typography.mdx @@ -6,7 +6,7 @@ Use the [Typography](https://mui.com/material-ui/react-typography/) component pr ## Custom variants -`@comet/admin-theme` defines two custom `Typography` variants: +The theme from `@comet/admin` defines two custom `Typography` variants: - `list` - `listItem` @@ -17,10 +17,10 @@ You can use them to display lists in continuous text: ### TypeScript -You must tell TypeScript to include the type overrides defined in `@comet/admin-theme`. +You must tell TypeScript to include the type overrides defined in `@comet/admin`. Otherwise, you will get a type error when trying to use the custom variants. You can do that by adding the following snippet to your `src/vendors.d.ts` file: ```ts -/// +/// ``` diff --git a/docs/package.json b/docs/package.json index a8d604a6de..a5ddd5241e 100644 --- a/docs/package.json +++ b/docs/package.json @@ -37,7 +37,6 @@ "@comet/admin-date-time": "workspace:*", "@comet/admin-icons": "workspace:*", "@comet/admin-rte": "workspace:*", - "@comet/admin-theme": "workspace:*", "@docusaurus/core": "^3.7.0", "@docusaurus/preset-classic": "^3.7.0", "@docusaurus/theme-common": "^3.7.0", diff --git a/docs/src/components/Story.tsx b/docs/src/components/Story.tsx index 735a95506b..eab9d8e7d1 100644 --- a/docs/src/components/Story.tsx +++ b/docs/src/components/Story.tsx @@ -1,4 +1,4 @@ -import { createCometTheme } from "@comet/admin-theme"; +import { createCometTheme } from "@comet/admin"; import BrowserOnly from "@docusaurus/BrowserOnly"; import CodeBlock from "@theme/CodeBlock"; import type { Props as PlaygroundProps } from "@theme/Playground"; diff --git a/docs/src/stories/customization-and-styling/OverridingStylesOfAComponentGlobally.tsx b/docs/src/stories/customization-and-styling/OverridingStylesOfAComponentGlobally.tsx index 3b3aa14abc..1a68b583bd 100644 --- a/docs/src/stories/customization-and-styling/OverridingStylesOfAComponentGlobally.tsx +++ b/docs/src/stories/customization-and-styling/OverridingStylesOfAComponentGlobally.tsx @@ -1,5 +1,4 @@ -import { ContentOverflow, MuiThemeProvider } from "@comet/admin"; -import { createCometTheme } from "@comet/admin-theme"; +import { ContentOverflow, createCometTheme, MuiThemeProvider } from "@comet/admin"; import { Typography } from "@mui/material"; function Story() { diff --git a/docs/src/stories/customization-and-styling/SettingDefaultPropsOfAComponent.tsx b/docs/src/stories/customization-and-styling/SettingDefaultPropsOfAComponent.tsx index 0e80f6477a..b126f80c58 100644 --- a/docs/src/stories/customization-and-styling/SettingDefaultPropsOfAComponent.tsx +++ b/docs/src/stories/customization-and-styling/SettingDefaultPropsOfAComponent.tsx @@ -1,6 +1,5 @@ -import { ContentOverflow, MuiThemeProvider } from "@comet/admin"; +import { ContentOverflow, createCometTheme, MuiThemeProvider } from "@comet/admin"; import { Preview } from "@comet/admin-icons"; -import { createCometTheme } from "@comet/admin-theme"; import { Typography } from "@mui/material"; function Story() { diff --git a/docs/src/theme/ReactLiveScope/index.js b/docs/src/theme/ReactLiveScope/index.js index d32913904a..ef3e3a90ca 100644 --- a/docs/src/theme/ReactLiveScope/index.js +++ b/docs/src/theme/ReactLiveScope/index.js @@ -53,8 +53,6 @@ if (ExecutionEnvironment.canUseDOM) { // eslint-disable-next-line @typescript-eslint/no-require-imports const cometAdminColorPickerImports = require("@comet/admin-color-picker"); // eslint-disable-next-line @typescript-eslint/no-require-imports - const cometAdminThemeImports = require("@comet/admin-theme"); - // eslint-disable-next-line @typescript-eslint/no-require-imports const { Card, CardContent, FormControlLabel, Grid, Chip, IconButton, Typography, Box } = require("@mui/material"); // eslint-disable-next-line @typescript-eslint/no-require-imports const { Form } = require("react-final-form"); @@ -84,10 +82,6 @@ if (ExecutionEnvironment.canUseDOM) { name: "@comet/admin-color-picker", imports: cometAdminColorPickerImports, }, - { - name: "@comet/admin-theme", - imports: cometAdminThemeImports, - }, { name: "@mui/material", imports: { Card, CardContent, FormControlLabel, Grid, Chip, IconButton, Typography, Box }, diff --git a/packages/admin/admin-theme/.babelrc.json b/packages/admin/admin-theme/.babelrc.json deleted file mode 100644 index c2c7bda7ca..0000000000 --- a/packages/admin/admin-theme/.babelrc.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "presets": ["@comet/admin-babel-preset"] -} diff --git a/packages/admin/admin-theme/.npmignore b/packages/admin/admin-theme/.npmignore deleted file mode 100644 index 85de9cf933..0000000000 --- a/packages/admin/admin-theme/.npmignore +++ /dev/null @@ -1 +0,0 @@ -src diff --git a/packages/admin/admin-theme/.prettierignore b/packages/admin/admin-theme/.prettierignore deleted file mode 100644 index f1ff06d608..0000000000 --- a/packages/admin/admin-theme/.prettierignore +++ /dev/null @@ -1 +0,0 @@ -lib/ \ No newline at end of file diff --git a/packages/admin/admin-theme/CHANGELOG.md b/packages/admin/admin-theme/CHANGELOG.md deleted file mode 100644 index d5fc38c655..0000000000 --- a/packages/admin/admin-theme/CHANGELOG.md +++ /dev/null @@ -1,881 +0,0 @@ -# @comet/admin-theme - -## 7.13.0 - -### Patch Changes - -- @comet/admin-icons@7.13.0 - -## 7.12.0 - -### Minor Changes - -- ee597535a: Add styling of `Card` and `CardHeader` to align with Comet DXP design - -### Patch Changes - -- 47be4ebd3: Adapt styling of `DialogActions`, `DialogContent`, and `DialogTitle` to match the Comet DXP design -- af51bb408: Prevent the input value of `GridToolbarQuickFilter` from being truncated too early - - @comet/admin-icons@7.12.0 - -## 7.11.0 - -### Minor Changes - -- a4fcdeb51: Enable vertical resizing for `TextAreaField` and other multiline inputs -- 5ba64aab6: Add support and styling for full screen dialogs using the `fullScreen` prop - - ```tsx - - Dialog Title - Dialog content - - ``` - -### Patch Changes - -- 9f2a1272b: Fix an issue where setting `defaultProps` of `MuiDataGrid` would override the `defaultProps` defined by `createCometTheme()` -- a30f0ee4d: Fix `border-color` of `InputBase` on default and hover state - - @comet/admin-icons@7.11.0 - -## 7.10.0 - -### Minor Changes - -- 7e94c55f6: Rework `GridFilterPanel` to match the updated Comet CI -- 22f3d402e: Adapt `Chip` styling to align with Comet DXP design - - - Fix hover styling - - Add new styling for `` - -- 589b0b9ee: Enhance `FieldContainer` with `secondaryHelperText` prop and `helperTextIcon` prop - - - `helperTextIcon` displays an icon alongside the text for `helperText`, `error` or `warning`. - - `secondaryHelperText` provides an additional helper text positioned beneath the input field, aligned to the bottom-right corner. - - **Example:** - - ```tsx - } helperText="Helper Text with icon" secondaryHelperText="0/100"> - - - ``` - -### Patch Changes - -- b51bf6d85: Adapt `Radio` and `Checkbox` styling to Comet DXP design - - Fix colors of disabled states. - -- 71876ea69: Adapt size of arrow in `Select` and `Autocomplete` fields according to Comet DXP design - - @comet/admin-icons@7.10.0 - -## 7.9.0 - -### Minor Changes - -- 9aa6947b7: Add hover styling for MUI's `Switch` - -### Patch Changes - -- 48cac4dac: Fix styling issues of inputs like `FinalFormInput`, `FinalFormNumberInput`, `FinalFormSelect`, `TextAreaField` - - - Change background-color, border-color and color of the label for different states (`default`, `disabled` and `focused`). - - For required inputs, fix spacing between the label and asterisk. - - Fix font-weight and margin of `helperText`. - -- 55d40ef08: Add icon for indeterminate checkbox -- Updated dependencies [7cea765fe] -- Updated dependencies [55d40ef08] - - @comet/admin-icons@7.9.0 - -## 7.8.0 - -### Patch Changes - -- Updated dependencies [e78315c9c] -- Updated dependencies [c6d3ac36b] - - @comet/admin-icons@7.8.0 - -## 7.7.0 - -### Patch Changes - -- @comet/admin-icons@7.7.0 - -## 7.6.0 - -### Patch Changes - -- @comet/admin-icons@7.6.0 - -## 7.5.0 - -### Patch Changes - -- @comet/admin-icons@7.5.0 - -## 7.4.2 - -### Patch Changes - -- @comet/admin-icons@7.4.2 - -## 7.4.1 - -### Patch Changes - -- @comet/admin-icons@7.4.1 - -## 7.4.0 - -### Patch Changes - -- @comet/admin-icons@7.4.0 - -## 7.3.2 - -### Patch Changes - -- @comet/admin-icons@7.3.2 - -## 7.3.1 - -### Patch Changes - -- @comet/admin-icons@7.3.1 - -## 7.3.0 - -### Patch Changes - -- Updated dependencies [5364ecb37] -- Updated dependencies [a1f4c0dec] -- Updated dependencies [2ab7b688e] - - @comet/admin-icons@7.3.0 - -## 7.2.1 - -### Patch Changes - -- @comet/admin-icons@7.2.1 - -## 7.2.0 - -### Minor Changes - -- 9b800c9f6: Slightly adjust the styling of pinned columns in DataGrid - -### Patch Changes - -- @comet/admin-icons@7.2.0 - -## 7.1.0 - -### Minor Changes - -- 04844d39e: Adjust the alignment and spacing of the label, the input, and child fields inside `FieldContainer` and `Field` - -### Patch Changes - -- 3adf5fecd: Remove unnecessary padding of DataGrid rows -- c90ae39d4: Fix spacing between page number and chevron icon in the pagination select of `DataGrid` -- Updated dependencies [b1bbd6a0c] - - @comet/admin-icons@7.1.0 - -## 7.0.0 - -### Major Changes - -- 803bc607f: Rework theme of MUI's `Chip` to match the updated Comet CI -- 33ba50719: Rework `typographyOptions` - - - Replace `typographyOptions` with `createTypographyOptions()` to enable using the theme's breakpoints for media queries - - Add new default styles for variants `subtitle1`, `subtitle2`, `caption` and `overline` - - Remove custom `fontWeights` - - Switch the font from `Roboto` to `Roboto Flex` - - The font switch requires you to make the following two changes in your admin application: - - **Note: The `@comet/upgrade` script handles these changes automatically.** - - ```diff - // package.json - - "@fontsource/roboto": "^4.5.5", - + "@fontsource-variable/roboto-flex": "^5.0.0", - ``` - - ```diff - // App.tsx - - import "@fontsource/roboto/100.css"; - - import "@fontsource/roboto/300.css"; - - import "@fontsource/roboto/400.css"; - - import "@fontsource/roboto/500.css"; - + import "@fontsource-variable/roboto-flex/full.css"; - ``` - -- 33ba50719: Rework colors - - - Rename `bluePalette` to `primaryPalette` - - Rename `neutrals` to `greyPalette` - - Remove `greenPalette` - - Change colors in all palettes - - Change `text` colors - - Add `highlight` colors `purple`, `green`, `orange`, `yellow` and `red` to palette - - Hint: To use the `highlight` colors without getting a type error, you must adjust the `vendors.d.ts` in your project: - - ```diff - + /// - - // ... - ``` - -- 33ba50719: Change `Link` text styling -- cce88d448: Adapt `Typography` headlines for mobile devices (<900px) -- 92eae2ba9: Change the method of overriding the styling of Admin components - - - Remove dependency on the legacy `@mui/styles` package in favor of `@mui/material/styles`. - - Add the ability to style components using [MUI's `sx` prop](https://mui.com/system/getting-started/the-sx-prop/). - - Add the ability to style individual elements (slots) of a component using the `slotProps` and `sx` props. - - The `# @comet/admin-theme syntax in the theme's `styleOverrides` is no longer supported, see: https://mui.com/material-ui/migration/v5-style-changes/#migrate-theme-styleoverrides-to-emotion - - ```diff - const theme = createCometTheme({ - components: { - CometAdminMyComponent: { - styleOverrides: { - - root: { - - "&$hasShadow": { - - boxShadow: "2px 2px 5px 0 rgba(0, 0, 0, 0.25)", - - }, - - "& $header": { - - backgroundColor: "lime", - - }, - - }, - + hasShadow: { - + boxShadow: "2px 2px 5px 0 rgba(0, 0, 0, 0.25)", - + }, - + header: { - + backgroundColor: "lime", - + }, - }, - }, - }, - }); - ``` - - - Overriding a component's styles using `withStyles` is no longer supported. Use the `sx` and `slotProps` props instead: - - ```diff - -import { withStyles } from "@mui/styles"; - - - -const StyledMyComponent = withStyles({ - - root: { - - backgroundColor: "lime", - - }, - - header: { - - backgroundColor: "fuchsia", - - }, - -})(MyComponent); - - - -// ... - - - -; - + - ``` - - - The module augmentation for the `DefaultTheme` type from `@mui/styles/defaultTheme` is no longer needed and needs to be removed from the admins theme file, usually located in `admin/src/theme.ts`: - - ```diff - -declare module "@mui/styles/defaultTheme" { - - // eslint-disable-next-line @typescript-eslint/no-empty-interface - - export interface DefaultTheme extends Theme {} - -} - ``` - - - Class-keys originating from MUI components have been removed from Comet Admin components, causing certain class-names and `styleOverrides` to no longer be applied. - The components `root` class-key is not affected. Other class-keys will retain the class-names and `styleOverrides` from the underlying MUI component. - For example, in `ClearInputAdornment` (when used with `position="end"`) the class-name `CometAdminClearInputAdornment-positionEnd` and the `styleOverrides` for `CometAdminClearInputAdornment.positionEnd` will no longer be applied. - The component will retain the class-names `MuiInputAdornment-positionEnd`, `MuiInputAdornment-root`, and `CometAdminClearInputAdornment-root`. - Also, the `styleOverrides` for `MuiInputAdornment.positionEnd`, `MuiInputAdornment.root`, and `CometAdminClearInputAdornment.root` will continue to be applied. - - This affects the following components: - - - `AppHeader` - - `AppHeaderMenuButton` - - `ClearInputAdornment` - - `Tooltip` - - `CancelButton` - - `DeleteButton` - - `OkayButton` - - `SaveButton` - - `StackBackButton` - - `DatePicker` - - `DateRangePicker` - - `TimePicker` - - - For more details, see MUI's migration guide: https://mui.com/material-ui/migration/v5-style-changes/#mui-styles - -- 33ba50719: Rework shadows - - - Change shadows 1 - 4 - -### Minor Changes - -- c702cc5b2: Override the default theme of `Badge` - - If no children are passed, the Badge renders as is without position relative and absolute. - -- 535444623: Slightly increase the default size of dialogs -- f9615fbf4: Adapt styling of filter panel in `DataGrid` for mobile devices (<900px) -- 33ba50719: Add `breakpointsOptions` to theme -- 865f253d8: Add custom `Typography` variants for displaying inline lists - - ```tsx - - Lorem ipsum - Lorem ipsum - Lorem ipsum - - ``` - - Hint: To use the custom variants without getting a type error, you must adjust the `vendors.d.ts` in your project: - - ```diff - + /// - - // ... - ``` - -### Patch Changes - -- @comet/admin-icons@7.0.0 - -## 7.0.0-beta.6 - -### Patch Changes - -- @comet/admin-icons@7.0.0-beta.6 - -## 7.0.0-beta.5 - -### Patch Changes - -- @comet/admin-icons@7.0.0-beta.5 - -## 7.0.0-beta.4 - -### Patch Changes - -- @comet/admin-icons@7.0.0-beta.4 - -## 7.0.0-beta.3 - -### Patch Changes - -- @comet/admin-icons@7.0.0-beta.3 - -## 7.0.0-beta.2 - -### Patch Changes - -- 2de81e40b: Fix top position of end-adornment in MuiAutocomplete - - @comet/admin-icons@7.0.0-beta.2 - -## 7.0.0-beta.1 - -### Patch Changes - -- @comet/admin-icons@7.0.0-beta.1 - -## 7.0.0-beta.0 - -### Major Changes - -- 803bc607f: Rework theme of MUI's `Chip` to match the updated Comet CI -- 33ba50719: Rework `typographyOptions` - - - Replace `typographyOptions` with `createTypographyOptions()` to enable using the theme's breakpoints for media queries - - Add new default styles for variants `subtitle1`, `subtitle2`, `caption` and `overline` - - Remove custom `fontWeights` - - Switch the font from `Roboto` to `Roboto Flex` - - The font switch requires you to make the following two changes in your admin application: - - **Note: The `@comet/upgrade` script handles these changes automatically.** - - ```diff - // package.json - - "@fontsource/roboto": "^4.5.5", - + "@fontsource-variable/roboto-flex": "^5.0.0", - ``` - - ```diff - // App.tsx - - import "@fontsource/roboto/100.css"; - - import "@fontsource/roboto/300.css"; - - import "@fontsource/roboto/400.css"; - - import "@fontsource/roboto/500.css"; - + import "@fontsource-variable/roboto-flex/full.css"; - ``` - -- 33ba50719: Rework colors - - - Rename `bluePalette` to `primaryPalette` - - Rename `neutrals` to `greyPalette` - - Remove `greenPalette` - - Change colors in all palettes - - Change `text` colors - - Add `highlight` colors `purple`, `green`, `orange`, `yellow` and `red` to palette - - Hint: To use the `highlight` colors without getting a type error, you must adjust the `vendors.d.ts` in your project: - - ```diff - + /// - - // ... - ``` - -- 33ba50719: Change `Link` text styling -- cce88d448: Adapt `Typography` headlines for mobile devices (<900px) -- 92eae2ba9: Change the method of overriding the styling of Admin components - - - Remove dependency on the legacy `@mui/styles` package in favor of `@mui/material/styles`. - - Add the ability to style components using [MUI's `sx` prop](https://mui.com/system/getting-started/the-sx-prop/). - - Add the ability to style individual elements (slots) of a component using the `slotProps` and `sx` props. - - The `# @comet/admin-theme syntax in the theme's `styleOverrides` is no longer supported, see: https://mui.com/material-ui/migration/v5-style-changes/#migrate-theme-styleoverrides-to-emotion - - ```diff - const theme = createCometTheme({ - components: { - CometAdminMyComponent: { - styleOverrides: { - - root: { - - "&$hasShadow": { - - boxShadow: "2px 2px 5px 0 rgba(0, 0, 0, 0.25)", - - }, - - "& $header": { - - backgroundColor: "lime", - - }, - - }, - + hasShadow: { - + boxShadow: "2px 2px 5px 0 rgba(0, 0, 0, 0.25)", - + }, - + header: { - + backgroundColor: "lime", - + }, - }, - }, - }, - }); - ``` - - - Overriding a component's styles using `withStyles` is no longer supported. Use the `sx` and `slotProps` props instead: - - ```diff - -import { withStyles } from "@mui/styles"; - - - -const StyledMyComponent = withStyles({ - - root: { - - backgroundColor: "lime", - - }, - - header: { - - backgroundColor: "fuchsia", - - }, - -})(MyComponent); - - - -// ... - - - -; - + - ``` - - - The module augmentation for the `DefaultTheme` type from `@mui/styles/defaultTheme` is no longer needed and needs to be removed from the admins theme file, usually located in `admin/src/theme.ts`: - - ```diff - -declare module "@mui/styles/defaultTheme" { - - // eslint-disable-next-line @typescript-eslint/no-empty-interface - - export interface DefaultTheme extends Theme {} - -} - ``` - - - Class-keys originating from MUI components have been removed from Comet Admin components, causing certain class-names and `styleOverrides` to no longer be applied. - The components `root` class-key is not affected. Other class-keys will retain the class-names and `styleOverrides` from the underlying MUI component. - For example, in `ClearInputAdornment` (when used with `position="end"`) the class-name `CometAdminClearInputAdornment-positionEnd` and the `styleOverrides` for `CometAdminClearInputAdornment.positionEnd` will no longer be applied. - The component will retain the class-names `MuiInputAdornment-positionEnd`, `MuiInputAdornment-root`, and `CometAdminClearInputAdornment-root`. - Also, the `styleOverrides` for `MuiInputAdornment.positionEnd`, `MuiInputAdornment.root`, and `CometAdminClearInputAdornment.root` will continue to be applied. - - This affects the following components: - - - `AppHeader` - - `AppHeaderMenuButton` - - `ClearInputAdornment` - - `Tooltip` - - `CancelButton` - - `DeleteButton` - - `OkayButton` - - `SaveButton` - - `StackBackButton` - - `DatePicker` - - `DateRangePicker` - - `TimePicker` - - - For more details, see MUI's migration guide: https://mui.com/material-ui/migration/v5-style-changes/#mui-styles - -- 33ba50719: Rework shadows - - - Change shadows 1 - 4 - -### Minor Changes - -- c702cc5b2: Override the default theme of `Badge` - - If no children are passed, the Badge renders as is without position relative and absolute. - -- 535444623: Slightly increase the default size of dialogs -- f9615fbf4: Adapt styling of filter panel in `DataGrid` for mobile devices (<900px) -- 33ba50719: Add `breakpointsOptions` to theme -- 865f253d8: Add custom `Typography` variants for displaying inline lists - - ```tsx - - Lorem ipsum - Lorem ipsum - Lorem ipsum - - ``` - - Hint: To use the custom variants without getting a type error, you must adjust the `vendors.d.ts` in your project: - - ```diff - + /// - - // ... - ``` - -### Patch Changes - -- @comet/admin-icons@7.0.0-beta.0 - -## 6.17.1 - -### Patch Changes - -- @comet/admin-icons@6.17.1 - -## 6.17.0 - -### Patch Changes - -- @comet/admin-icons@6.17.0 - -## 6.16.0 - -### Patch Changes - -- @comet/admin-icons@6.16.0 - -## 6.15.1 - -### Patch Changes - -- @comet/admin-icons@6.15.1 - -## 6.15.0 - -### Patch Changes - -- Updated dependencies [406027806] - - @comet/admin-icons@6.15.0 - -## 6.14.1 - -### Patch Changes - -- @comet/admin-icons@6.14.1 - -## 6.14.0 - -### Patch Changes - -- 2de81e40b: Fix top position of end-adornment in MuiAutocomplete -- Updated dependencies [efccc42a3] - - @comet/admin-icons@6.14.0 - -## 6.13.0 - -### Patch Changes - -- @comet/admin-icons@6.13.0 - -## 6.12.0 - -### Minor Changes - -- c06c6f1e9: Allow to pass args to createCometTheme to support localization via theme - - See https://mui.com/material-ui/guides/localization/ - - ```tsx - import { deDE } from "@mui/x-data-grid-pro"; - - const theme = createCometTheme({}, deDE); - - ; - ``` - -### Patch Changes - -- @comet/admin-icons@6.12.0 - -## 6.11.0 - -### Patch Changes - -- @comet/admin-icons@6.11.0 - -## 6.10.0 - -### Patch Changes - -- @comet/admin-icons@6.10.0 - -## 6.9.0 - -### Patch Changes - -- @comet/admin-icons@6.9.0 - -## 6.8.0 - -### Patch Changes - -- @comet/admin-icons@6.8.0 - -## 6.7.0 - -### Patch Changes - -- @comet/admin-icons@6.7.0 - -## 6.6.2 - -### Patch Changes - -- @comet/admin-icons@6.6.2 - -## 6.6.1 - -### Patch Changes - -- @comet/admin-icons@6.6.1 - -## 6.6.0 - -### Patch Changes - -- @comet/admin-icons@6.6.0 - -## 6.5.0 - -### Patch Changes - -- @comet/admin-icons@6.5.0 - -## 6.4.0 - -### Patch Changes - -- @comet/admin-icons@6.4.0 - -## 6.3.0 - -### Patch Changes - -- @comet/admin-icons@6.3.0 - -## 6.2.1 - -### Patch Changes - -- @comet/admin-icons@6.2.1 - -## 6.2.0 - -### Patch Changes - -- @comet/admin-icons@6.2.0 - -## 6.1.0 - -### Minor Changes - -- a4fac913: Rework `Alert` component - - - Use theme wherever possible - - Move styles where they're more fitting - - Fix some paddings - -### Patch Changes - -- Updated dependencies [08e0da09] - - @comet/admin-icons@6.1.0 - -## 6.0.0 - -### Patch Changes - -- Updated dependencies [76e50aa8] -- Updated dependencies [a525766c] - - @comet/admin-icons@6.0.0 - -## 5.6.0 - -### Minor Changes - -- fb6c8063: Change `DataGrid`'s `noRowsLabel` from "No rows" to "No results found." - -### Patch Changes - -- @comet/admin-icons@5.6.0 - -## 5.5.0 - -### Patch Changes - -- @comet/admin-icons@5.5.0 - -## 5.4.0 - -### Patch Changes - -- @comet/admin-icons@5.4.0 - -## 5.3.0 - -### Patch Changes - -- Updated dependencies [0ff9b9ba] -- Updated dependencies [0ff9b9ba] - - @comet/admin-icons@5.3.0 - -## 5.2.0 - -### Patch Changes - -- Updated dependencies [9fc7d474] - - @comet/admin-icons@5.2.0 - -## 5.1.0 - -### Patch Changes - -- @comet/admin-icons@5.1.0 - -## 5.0.0 - -### Patch Changes - -- Updated dependencies [ed692f50] - - @comet/admin-icons@5.0.0 - -## 4.7.0 - -### Minor Changes - -- d1c7a1c5: Add custom default styling for LinearProgress - - The LinearProgress is intended to be used as a LoadingOverlay in the DataGrid. This styling change adjusts it for this purpose. - -### Patch Changes - -- fe310df8: Prevent the clear-button and the select-arrow from overlapping when using `FinalFormSelect` with the `clearable` prop. -- Updated dependencies [dbdc0f55] - - @comet/admin-icons@4.7.0 - -## 4.6.0 - -### Patch Changes - -- Updated dependencies [c3b7f992] -- Updated dependencies [c3b7f992] - - @comet/admin-icons@4.6.0 - -## 4.5.0 - -### Minor Changes - -- 01677075: Fix some DataGrid styling issues and style the DataGrid components to match the Comet CI more closely. - -### Patch Changes - -- @comet/admin-icons@4.5.0 - -## 4.4.3 - -### Patch Changes - -- @comet/admin-icons@4.4.3 - -## 4.4.2 - -### Patch Changes - -- @comet/admin-icons@4.4.2 - -## 4.4.1 - -### Patch Changes - -- @comet/admin-icons@4.4.1 - -## 4.4.0 - -### Patch Changes - -- @comet/admin-icons@4.4.0 - -## 4.3.0 - -### Patch Changes - -- @comet/admin-icons@4.3.0 - -## 4.2.0 - -### Patch Changes - -- 67e54a82: Add styling variants to Tooltip - - @comet/admin-icons@4.2.0 - -## 4.1.0 - -### Patch Changes - -- Updated dependencies [51466b1a] - - @comet/admin-icons@4.1.0 diff --git a/packages/admin/admin-theme/eslint.config.mjs b/packages/admin/admin-theme/eslint.config.mjs deleted file mode 100644 index 3eaaf37f73..0000000000 --- a/packages/admin/admin-theme/eslint.config.mjs +++ /dev/null @@ -1,16 +0,0 @@ -import eslintConfigReact from "@comet/eslint-config/react.js"; - -/** @type {import('eslint')} */ -const config = [ - { - ignores: ["src/*.generated.ts", "lib/**"], - }, - ...eslintConfigReact, - { - rules: { - "@comet/no-other-module-relative-import": "off", - }, - }, -]; - -export default config; diff --git a/packages/admin/admin-theme/lint-staged.config.mjs b/packages/admin/admin-theme/lint-staged.config.mjs deleted file mode 100644 index eae9748519..0000000000 --- a/packages/admin/admin-theme/lint-staged.config.mjs +++ /dev/null @@ -1,9 +0,0 @@ -/** - * @filename: lint-staged.config.mjs - * @type {import('lint-staged').Configuration} - */ -export default { - "src/**/*.{ts,tsx,js,jsx,json,css,scss,md}": () => "pnpm lint:eslint", - "src/**/*.{ts,tsx}": () => "pnpm lint:tsc", - "*.{js,json,md,yml,yaml}": () => "pnpm lint:prettier", -}; diff --git a/packages/admin/admin-theme/package.json b/packages/admin/admin-theme/package.json deleted file mode 100644 index a6ca153311..0000000000 --- a/packages/admin/admin-theme/package.json +++ /dev/null @@ -1,59 +0,0 @@ -{ - "name": "@comet/admin-theme", - "version": "7.13.0", - "repository": { - "directory": "packages/admin/admin-theme", - "type": "git", - "url": "https://github.com/vivid-planet/comet" - }, - "license": "BSD-2-Clause", - "main": "lib/index.js", - "types": "lib/index.d.ts", - "files": [ - "lib" - ], - "scripts": { - "build": "$npm_execpath run clean && run-p build:babel build:types", - "build:babel": "npx babel ./src -x \".ts,.tsx\" -d lib", - "build:types": "tsc --project ./tsconfig.json --emitDeclarationOnly", - "clean": "rimraf lib", - "lint": "run-p lint:prettier lint:eslint lint:tsc", - "lint:eslint": "eslint --max-warnings 0 src/ **/*.json --no-warn-ignored", - "lint:prettier": "npx prettier --check './**/*.{js,json,md,yml,yaml}'", - "lint:tsc": "tsc --noEmit", - "start": "run-p start:babel start:types", - "start:babel": "npx babel ./src -x \".ts,.tsx\" -d lib -w", - "start:types": "tsc --project ./tsconfig.json --emitDeclarationOnly --watch --preserveWatchOutput" - }, - "dependencies": { - "@comet/admin-icons": "workspace:^7.13.0", - "@mui/utils": "^6.4.3" - }, - "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.5", - "@mui/system": "^6.4.3", - "@mui/x-data-grid": "^7.27.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.2", - "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 deleted file mode 100644 index 95fc8c29a4..0000000000 --- a/packages/admin/admin-theme/src/index.ts +++ /dev/null @@ -1,6 +0,0 @@ -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"; diff --git a/packages/admin/admin-theme/tsconfig.json b/packages/admin/admin-theme/tsconfig.json deleted file mode 100644 index b27b6630db..0000000000 --- a/packages/admin/admin-theme/tsconfig.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "compilerOptions": { - "outDir": "lib", - "rootDir": "src" - }, - "extends": "../tsconfig.base.json", - "include": ["./src"] -} diff --git a/packages/admin/admin/package.json b/packages/admin/admin/package.json index d978bd3012..a1446673f3 100644 --- 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.5", "@mui/system": "^6.4.3", + "@mui/utils": "^6.4.3", "@mui/x-data-grid": "^7.27.0", "@mui/x-data-grid-pro": "^7.27.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 index 81f5acac31..517120af07 100644 --- 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/packages/admin/admin-theme/src/breakpointsOptions.ts b/packages/admin/admin/src/theme/breakpointsOptions.ts similarity index 100% rename from packages/admin/admin-theme/src/breakpointsOptions.ts rename to packages/admin/admin/src/theme/breakpointsOptions.ts diff --git a/packages/admin/admin-theme/src/colors.ts b/packages/admin/admin/src/theme/colors.ts similarity index 100% rename from packages/admin/admin-theme/src/colors.ts rename to packages/admin/admin/src/theme/colors.ts diff --git a/packages/admin/admin-theme/src/componentsTheme/MuiAccordion.ts b/packages/admin/admin/src/theme/componentsTheme/MuiAccordion.ts similarity index 100% rename from packages/admin/admin-theme/src/componentsTheme/MuiAccordion.ts rename to packages/admin/admin/src/theme/componentsTheme/MuiAccordion.ts diff --git a/packages/admin/admin-theme/src/componentsTheme/MuiAlert.tsx b/packages/admin/admin/src/theme/componentsTheme/MuiAlert.tsx similarity index 100% rename from packages/admin/admin-theme/src/componentsTheme/MuiAlert.tsx rename to packages/admin/admin/src/theme/componentsTheme/MuiAlert.tsx diff --git a/packages/admin/admin-theme/src/componentsTheme/MuiAlertTitle.tsx b/packages/admin/admin/src/theme/componentsTheme/MuiAlertTitle.tsx similarity index 100% rename from packages/admin/admin-theme/src/componentsTheme/MuiAlertTitle.tsx rename to packages/admin/admin/src/theme/componentsTheme/MuiAlertTitle.tsx diff --git a/packages/admin/admin-theme/src/componentsTheme/MuiAppBar.ts b/packages/admin/admin/src/theme/componentsTheme/MuiAppBar.ts similarity index 100% rename from packages/admin/admin-theme/src/componentsTheme/MuiAppBar.ts rename to packages/admin/admin/src/theme/componentsTheme/MuiAppBar.ts diff --git a/packages/admin/admin-theme/src/componentsTheme/MuiAutocomplete.tsx b/packages/admin/admin/src/theme/componentsTheme/MuiAutocomplete.tsx similarity index 100% rename from packages/admin/admin-theme/src/componentsTheme/MuiAutocomplete.tsx rename to packages/admin/admin/src/theme/componentsTheme/MuiAutocomplete.tsx diff --git a/packages/admin/admin-theme/src/componentsTheme/MuiBadge.tsx b/packages/admin/admin/src/theme/componentsTheme/MuiBadge.tsx similarity index 100% rename from packages/admin/admin-theme/src/componentsTheme/MuiBadge.tsx rename to packages/admin/admin/src/theme/componentsTheme/MuiBadge.tsx diff --git a/packages/admin/admin-theme/src/componentsTheme/MuiButton.ts b/packages/admin/admin/src/theme/componentsTheme/MuiButton.ts similarity index 100% rename from packages/admin/admin-theme/src/componentsTheme/MuiButton.ts rename to packages/admin/admin/src/theme/componentsTheme/MuiButton.ts diff --git a/packages/admin/admin-theme/src/componentsTheme/MuiButtonGroup.ts b/packages/admin/admin/src/theme/componentsTheme/MuiButtonGroup.ts similarity index 100% rename from packages/admin/admin-theme/src/componentsTheme/MuiButtonGroup.ts rename to packages/admin/admin/src/theme/componentsTheme/MuiButtonGroup.ts diff --git a/packages/admin/admin-theme/src/componentsTheme/MuiCard.ts b/packages/admin/admin/src/theme/componentsTheme/MuiCard.ts similarity index 100% rename from packages/admin/admin-theme/src/componentsTheme/MuiCard.ts rename to packages/admin/admin/src/theme/componentsTheme/MuiCard.ts diff --git a/packages/admin/admin-theme/src/componentsTheme/MuiCardContent.ts b/packages/admin/admin/src/theme/componentsTheme/MuiCardContent.ts similarity index 100% rename from packages/admin/admin-theme/src/componentsTheme/MuiCardContent.ts rename to packages/admin/admin/src/theme/componentsTheme/MuiCardContent.ts diff --git a/packages/admin/admin-theme/src/componentsTheme/MuiCardHeader.ts b/packages/admin/admin/src/theme/componentsTheme/MuiCardHeader.ts similarity index 100% rename from packages/admin/admin-theme/src/componentsTheme/MuiCardHeader.ts rename to packages/admin/admin/src/theme/componentsTheme/MuiCardHeader.ts diff --git a/packages/admin/admin-theme/src/componentsTheme/MuiCheckbox.tsx b/packages/admin/admin/src/theme/componentsTheme/MuiCheckbox.tsx similarity index 100% rename from packages/admin/admin-theme/src/componentsTheme/MuiCheckbox.tsx rename to packages/admin/admin/src/theme/componentsTheme/MuiCheckbox.tsx diff --git a/packages/admin/admin-theme/src/componentsTheme/MuiChip.tsx b/packages/admin/admin/src/theme/componentsTheme/MuiChip.tsx similarity index 100% rename from packages/admin/admin-theme/src/componentsTheme/MuiChip.tsx rename to packages/admin/admin/src/theme/componentsTheme/MuiChip.tsx diff --git a/packages/admin/admin-theme/src/componentsTheme/MuiDataGrid.tsx b/packages/admin/admin/src/theme/componentsTheme/MuiDataGrid.tsx similarity index 100% rename from packages/admin/admin-theme/src/componentsTheme/MuiDataGrid.tsx rename to packages/admin/admin/src/theme/componentsTheme/MuiDataGrid.tsx diff --git a/packages/admin/admin-theme/src/componentsTheme/MuiDialog.ts b/packages/admin/admin/src/theme/componentsTheme/MuiDialog.ts similarity index 100% rename from packages/admin/admin-theme/src/componentsTheme/MuiDialog.ts rename to packages/admin/admin/src/theme/componentsTheme/MuiDialog.ts diff --git a/packages/admin/admin-theme/src/componentsTheme/MuiDialogActions.ts b/packages/admin/admin/src/theme/componentsTheme/MuiDialogActions.ts similarity index 100% rename from packages/admin/admin-theme/src/componentsTheme/MuiDialogActions.ts rename to packages/admin/admin/src/theme/componentsTheme/MuiDialogActions.ts diff --git a/packages/admin/admin-theme/src/componentsTheme/MuiDialogContent.ts b/packages/admin/admin/src/theme/componentsTheme/MuiDialogContent.ts similarity index 100% rename from packages/admin/admin-theme/src/componentsTheme/MuiDialogContent.ts rename to packages/admin/admin/src/theme/componentsTheme/MuiDialogContent.ts diff --git a/packages/admin/admin-theme/src/componentsTheme/MuiDialogContentText.ts b/packages/admin/admin/src/theme/componentsTheme/MuiDialogContentText.ts similarity index 100% rename from packages/admin/admin-theme/src/componentsTheme/MuiDialogContentText.ts rename to packages/admin/admin/src/theme/componentsTheme/MuiDialogContentText.ts diff --git a/packages/admin/admin-theme/src/componentsTheme/MuiDialogTitle.ts b/packages/admin/admin/src/theme/componentsTheme/MuiDialogTitle.ts similarity index 100% rename from packages/admin/admin-theme/src/componentsTheme/MuiDialogTitle.ts rename to packages/admin/admin/src/theme/componentsTheme/MuiDialogTitle.ts diff --git a/packages/admin/admin-theme/src/componentsTheme/MuiDrawer.ts b/packages/admin/admin/src/theme/componentsTheme/MuiDrawer.ts similarity index 100% rename from packages/admin/admin-theme/src/componentsTheme/MuiDrawer.ts rename to packages/admin/admin/src/theme/componentsTheme/MuiDrawer.ts diff --git a/packages/admin/admin-theme/src/componentsTheme/MuiFormControlLabel.ts b/packages/admin/admin/src/theme/componentsTheme/MuiFormControlLabel.ts similarity index 100% rename from packages/admin/admin-theme/src/componentsTheme/MuiFormControlLabel.ts rename to packages/admin/admin/src/theme/componentsTheme/MuiFormControlLabel.ts diff --git a/packages/admin/admin-theme/src/componentsTheme/MuiFormHelperText.ts b/packages/admin/admin/src/theme/componentsTheme/MuiFormHelperText.ts similarity index 100% rename from packages/admin/admin-theme/src/componentsTheme/MuiFormHelperText.ts rename to packages/admin/admin/src/theme/componentsTheme/MuiFormHelperText.ts diff --git a/packages/admin/admin-theme/src/componentsTheme/MuiFormLabel.ts b/packages/admin/admin/src/theme/componentsTheme/MuiFormLabel.ts similarity index 100% rename from packages/admin/admin-theme/src/componentsTheme/MuiFormLabel.ts rename to packages/admin/admin/src/theme/componentsTheme/MuiFormLabel.ts diff --git a/packages/admin/admin-theme/src/componentsTheme/MuiIconButton.ts b/packages/admin/admin/src/theme/componentsTheme/MuiIconButton.ts similarity index 100% rename from packages/admin/admin-theme/src/componentsTheme/MuiIconButton.ts rename to packages/admin/admin/src/theme/componentsTheme/MuiIconButton.ts diff --git a/packages/admin/admin-theme/src/componentsTheme/MuiInput.ts b/packages/admin/admin/src/theme/componentsTheme/MuiInput.ts similarity index 100% rename from packages/admin/admin-theme/src/componentsTheme/MuiInput.ts rename to packages/admin/admin/src/theme/componentsTheme/MuiInput.ts diff --git a/packages/admin/admin-theme/src/componentsTheme/MuiInputAdornment.ts b/packages/admin/admin/src/theme/componentsTheme/MuiInputAdornment.ts similarity index 100% rename from packages/admin/admin-theme/src/componentsTheme/MuiInputAdornment.ts rename to packages/admin/admin/src/theme/componentsTheme/MuiInputAdornment.ts diff --git a/packages/admin/admin-theme/src/componentsTheme/MuiInputBase.ts b/packages/admin/admin/src/theme/componentsTheme/MuiInputBase.ts similarity index 100% rename from packages/admin/admin-theme/src/componentsTheme/MuiInputBase.ts rename to packages/admin/admin/src/theme/componentsTheme/MuiInputBase.ts diff --git a/packages/admin/admin-theme/src/componentsTheme/MuiLinearProgress.ts b/packages/admin/admin/src/theme/componentsTheme/MuiLinearProgress.ts similarity index 100% rename from packages/admin/admin-theme/src/componentsTheme/MuiLinearProgress.ts rename to packages/admin/admin/src/theme/componentsTheme/MuiLinearProgress.ts diff --git a/packages/admin/admin-theme/src/componentsTheme/MuiLink.ts b/packages/admin/admin/src/theme/componentsTheme/MuiLink.ts similarity index 100% rename from packages/admin/admin-theme/src/componentsTheme/MuiLink.ts rename to packages/admin/admin/src/theme/componentsTheme/MuiLink.ts diff --git a/packages/admin/admin-theme/src/componentsTheme/MuiListItem.ts b/packages/admin/admin/src/theme/componentsTheme/MuiListItem.ts similarity index 100% rename from packages/admin/admin-theme/src/componentsTheme/MuiListItem.ts rename to packages/admin/admin/src/theme/componentsTheme/MuiListItem.ts diff --git a/packages/admin/admin-theme/src/componentsTheme/MuiListItemIcon.tsx b/packages/admin/admin/src/theme/componentsTheme/MuiListItemIcon.tsx similarity index 100% rename from packages/admin/admin-theme/src/componentsTheme/MuiListItemIcon.tsx rename to packages/admin/admin/src/theme/componentsTheme/MuiListItemIcon.tsx diff --git a/packages/admin/admin-theme/src/componentsTheme/MuiMenu.tsx b/packages/admin/admin/src/theme/componentsTheme/MuiMenu.tsx similarity index 100% rename from packages/admin/admin-theme/src/componentsTheme/MuiMenu.tsx rename to packages/admin/admin/src/theme/componentsTheme/MuiMenu.tsx diff --git a/packages/admin/admin-theme/src/componentsTheme/MuiNativeSelect.tsx b/packages/admin/admin/src/theme/componentsTheme/MuiNativeSelect.tsx similarity index 100% rename from packages/admin/admin-theme/src/componentsTheme/MuiNativeSelect.tsx rename to packages/admin/admin/src/theme/componentsTheme/MuiNativeSelect.tsx diff --git a/packages/admin/admin-theme/src/componentsTheme/MuiPaper.ts b/packages/admin/admin/src/theme/componentsTheme/MuiPaper.ts similarity index 100% rename from packages/admin/admin-theme/src/componentsTheme/MuiPaper.ts rename to packages/admin/admin/src/theme/componentsTheme/MuiPaper.ts diff --git a/packages/admin/admin-theme/src/componentsTheme/MuiPopover.ts b/packages/admin/admin/src/theme/componentsTheme/MuiPopover.ts similarity index 100% rename from packages/admin/admin-theme/src/componentsTheme/MuiPopover.ts rename to packages/admin/admin/src/theme/componentsTheme/MuiPopover.ts diff --git a/packages/admin/admin-theme/src/componentsTheme/MuiRadio.tsx b/packages/admin/admin/src/theme/componentsTheme/MuiRadio.tsx similarity index 100% rename from packages/admin/admin-theme/src/componentsTheme/MuiRadio.tsx rename to packages/admin/admin/src/theme/componentsTheme/MuiRadio.tsx diff --git a/packages/admin/admin-theme/src/componentsTheme/MuiSelect.tsx b/packages/admin/admin/src/theme/componentsTheme/MuiSelect.tsx similarity index 100% rename from packages/admin/admin-theme/src/componentsTheme/MuiSelect.tsx rename to packages/admin/admin/src/theme/componentsTheme/MuiSelect.tsx diff --git a/packages/admin/admin-theme/src/componentsTheme/MuiSvgIcon.ts b/packages/admin/admin/src/theme/componentsTheme/MuiSvgIcon.ts similarity index 100% rename from packages/admin/admin-theme/src/componentsTheme/MuiSvgIcon.ts rename to packages/admin/admin/src/theme/componentsTheme/MuiSvgIcon.ts diff --git a/packages/admin/admin-theme/src/componentsTheme/MuiSwitch.ts b/packages/admin/admin/src/theme/componentsTheme/MuiSwitch.ts similarity index 100% rename from packages/admin/admin-theme/src/componentsTheme/MuiSwitch.ts rename to packages/admin/admin/src/theme/componentsTheme/MuiSwitch.ts diff --git a/packages/admin/admin-theme/src/componentsTheme/MuiTab.ts b/packages/admin/admin/src/theme/componentsTheme/MuiTab.ts similarity index 100% rename from packages/admin/admin-theme/src/componentsTheme/MuiTab.ts rename to packages/admin/admin/src/theme/componentsTheme/MuiTab.ts diff --git a/packages/admin/admin-theme/src/componentsTheme/MuiTableCell.ts b/packages/admin/admin/src/theme/componentsTheme/MuiTableCell.ts similarity index 100% rename from packages/admin/admin-theme/src/componentsTheme/MuiTableCell.ts rename to packages/admin/admin/src/theme/componentsTheme/MuiTableCell.ts diff --git a/packages/admin/admin-theme/src/componentsTheme/MuiTablePagination.ts b/packages/admin/admin/src/theme/componentsTheme/MuiTablePagination.ts similarity index 100% rename from packages/admin/admin-theme/src/componentsTheme/MuiTablePagination.ts rename to packages/admin/admin/src/theme/componentsTheme/MuiTablePagination.ts diff --git a/packages/admin/admin-theme/src/componentsTheme/MuiTableRow.ts b/packages/admin/admin/src/theme/componentsTheme/MuiTableRow.ts similarity index 100% rename from packages/admin/admin-theme/src/componentsTheme/MuiTableRow.ts rename to packages/admin/admin/src/theme/componentsTheme/MuiTableRow.ts diff --git a/packages/admin/admin-theme/src/componentsTheme/MuiTabs.ts b/packages/admin/admin/src/theme/componentsTheme/MuiTabs.ts similarity index 100% rename from packages/admin/admin-theme/src/componentsTheme/MuiTabs.ts rename to packages/admin/admin/src/theme/componentsTheme/MuiTabs.ts diff --git a/packages/admin/admin-theme/src/componentsTheme/MuiToggleButton.ts b/packages/admin/admin/src/theme/componentsTheme/MuiToggleButton.ts similarity index 100% rename from packages/admin/admin-theme/src/componentsTheme/MuiToggleButton.ts rename to packages/admin/admin/src/theme/componentsTheme/MuiToggleButton.ts diff --git a/packages/admin/admin-theme/src/componentsTheme/MuiToggleButtonGroup.ts b/packages/admin/admin/src/theme/componentsTheme/MuiToggleButtonGroup.ts similarity index 100% rename from packages/admin/admin-theme/src/componentsTheme/MuiToggleButtonGroup.ts rename to packages/admin/admin/src/theme/componentsTheme/MuiToggleButtonGroup.ts diff --git a/packages/admin/admin-theme/src/componentsTheme/MuiTooltip.ts b/packages/admin/admin/src/theme/componentsTheme/MuiTooltip.ts similarity index 100% rename from packages/admin/admin-theme/src/componentsTheme/MuiTooltip.ts rename to packages/admin/admin/src/theme/componentsTheme/MuiTooltip.ts diff --git a/packages/admin/admin-theme/src/componentsTheme/MuiTypography.ts b/packages/admin/admin/src/theme/componentsTheme/MuiTypography.ts similarity index 100% rename from packages/admin/admin-theme/src/componentsTheme/MuiTypography.ts rename to packages/admin/admin/src/theme/componentsTheme/MuiTypography.ts diff --git a/packages/admin/admin-theme/src/componentsTheme/getCommonSelectTheme.tsx b/packages/admin/admin/src/theme/componentsTheme/getCommonSelectTheme.tsx similarity index 100% rename from packages/admin/admin-theme/src/componentsTheme/getCommonSelectTheme.tsx rename to packages/admin/admin/src/theme/componentsTheme/getCommonSelectTheme.tsx diff --git a/packages/admin/admin-theme/src/componentsTheme/getComponentsTheme.ts b/packages/admin/admin/src/theme/componentsTheme/getComponentsTheme.ts similarity index 100% rename from packages/admin/admin-theme/src/componentsTheme/getComponentsTheme.ts rename to packages/admin/admin/src/theme/componentsTheme/getComponentsTheme.ts diff --git a/packages/admin/admin-theme/src/createCometTheme.ts b/packages/admin/admin/src/theme/createCometTheme.ts similarity index 100% rename from packages/admin/admin-theme/src/createCometTheme.ts rename to packages/admin/admin/src/theme/createCometTheme.ts diff --git a/packages/admin/admin-theme/src/paletteOptions.ts b/packages/admin/admin/src/theme/paletteOptions.ts similarity index 100% rename from packages/admin/admin-theme/src/paletteOptions.ts rename to packages/admin/admin/src/theme/paletteOptions.ts diff --git a/packages/admin/admin-theme/src/shadows.ts b/packages/admin/admin/src/theme/shadows.ts similarity index 100% rename from packages/admin/admin-theme/src/shadows.ts rename to packages/admin/admin/src/theme/shadows.ts diff --git a/packages/admin/admin-theme/src/typographyOptions.ts b/packages/admin/admin/src/theme/typographyOptions.ts similarity index 100% rename from packages/admin/admin-theme/src/typographyOptions.ts rename to packages/admin/admin/src/theme/typographyOptions.ts diff --git a/packages/admin/admin-theme/src/utils/mergeOverrideStyles.ts b/packages/admin/admin/src/theme/utils/mergeOverrideStyles.ts similarity index 100% rename from packages/admin/admin-theme/src/utils/mergeOverrideStyles.ts rename to packages/admin/admin/src/theme/utils/mergeOverrideStyles.ts diff --git a/packages/admin/admin/src/vendors.d.ts b/packages/admin/admin/src/vendors.d.ts index 289b4a926c..19e1eb74f6 100644 --- a/packages/admin/admin/src/vendors.d.ts +++ b/packages/admin/admin/src/vendors.d.ts @@ -1 +1 @@ -/// +/// diff --git a/packages/admin/cms-admin/package.json b/packages/admin/cms-admin/package.json index e462e53d06..1818c5b218 100644 --- a/packages/admin/cms-admin/package.json +++ b/packages/admin/cms-admin/package.json @@ -39,7 +39,6 @@ "@comet/admin-date-time": "workspace:^7.13.0", "@comet/admin-icons": "workspace:^7.13.0", "@comet/admin-rte": "workspace:^7.13.0", - "@comet/admin-theme": "workspace:^7.13.0", "@graphql-tools/graphql-file-loader": "^7.5.17", "@graphql-tools/load": "^7.8.14", "axios": "^0.29.0", diff --git a/packages/admin/cms-admin/src/vendors.d.ts b/packages/admin/cms-admin/src/vendors.d.ts index 128104220a..aae84349b0 100644 --- a/packages/admin/cms-admin/src/vendors.d.ts +++ b/packages/admin/cms-admin/src/vendors.d.ts @@ -1,4 +1,4 @@ -/// +/// import { type HTMLAttributes } from "react"; diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 631f7bd718..bfce02f1f3 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -71,9 +71,6 @@ importers: '@comet/admin-icons': specifier: workspace:* version: link:../../packages/admin/admin-icons - '@comet/admin-theme': - specifier: workspace:* - version: link:../../packages/admin/admin-theme '@comet/cms-admin': specifier: workspace:* version: link:../../packages/admin/cms-admin @@ -681,9 +678,6 @@ importers: '@comet/admin-rte': specifier: workspace:* version: link:../packages/admin/admin-rte - '@comet/admin-theme': - specifier: workspace:* - version: link:../packages/admin/admin-theme '@docusaurus/core': specifier: ^3.7.0 version: 3.7.0(@mdx-js/react@3.1.0(@types/react@18.3.18)(react@18.3.1))(acorn@8.14.0)(eslint@9.20.1(jiti@2.4.2))(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.7.3) @@ -817,9 +811,6 @@ importers: '@comet/admin-icons': specifier: workspace:^7.13.0 version: link:../admin-icons - '@comet/admin-theme': - specifier: workspace:^7.13.0 - version: link:../admin-theme exceljs: specifier: ^4.4.0 version: 4.4.0 @@ -884,6 +875,9 @@ importers: '@mui/system': specifier: ^6.4.3 version: 6.4.3(@emotion/react@11.14.0(@types/react@18.3.18)(react@18.3.1))(@emotion/styled@11.14.0(@emotion/react@11.14.0(@types/react@18.3.18)(react@18.3.1))(@types/react@18.3.18)(react@18.3.1))(@types/react@18.3.18)(react@18.3.1) + '@mui/utils': + specifier: ^6.4.3 + version: 6.4.3(@types/react@18.3.18)(react@18.3.1) '@mui/x-data-grid': specifier: ^7.27.0 version: 7.27.0(@emotion/react@11.14.0(@types/react@18.3.18)(react@18.3.1))(@emotion/styled@11.14.0(@emotion/react@11.14.0(@types/react@18.3.18)(react@18.3.1))(@types/react@18.3.18)(react@18.3.1))(@mui/material@6.4.5(@emotion/react@11.14.0(@types/react@18.3.18)(react@18.3.1))(@emotion/styled@11.14.0(@emotion/react@11.14.0(@types/react@18.3.18)(react@18.3.1))(@types/react@18.3.18)(react@18.3.1))(@types/react@18.3.18)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@mui/system@6.4.3(@emotion/react@11.14.0(@types/react@18.3.18)(react@18.3.1))(@emotion/styled@11.14.0(@emotion/react@11.14.0(@types/react@18.3.18)(react@18.3.1))(@types/react@18.3.18)(react@18.3.1))(@types/react@18.3.18)(react@18.3.1))(@types/react@18.3.18)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) @@ -1327,64 +1321,6 @@ importers: specifier: ^5.7.3 version: 5.7.3 - packages/admin/admin-theme: - dependencies: - '@comet/admin-icons': - specifier: workspace:^7.13.0 - version: link:../admin-icons - '@mui/utils': - specifier: ^6.4.3 - version: 6.4.3(@types/react@18.3.18)(react@18.3.1) - devDependencies: - '@babel/cli': - specifier: ^7.26.4 - version: 7.26.4(@babel/core@7.26.9) - '@babel/core': - specifier: ^7.26.9 - version: 7.26.9 - '@comet/admin-babel-preset': - specifier: workspace:^7.13.0 - version: link:../admin-babel-preset - '@comet/eslint-config': - specifier: workspace:^7.13.0 - version: link:../../eslint-config - '@mui/material': - specifier: ^6.4.5 - version: 6.4.5(@emotion/react@11.14.0(@types/react@18.3.18)(react@18.3.1))(@emotion/styled@11.14.0(@emotion/react@11.14.0(@types/react@18.3.18)(react@18.3.1))(@types/react@18.3.18)(react@18.3.1))(@types/react@18.3.18)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@mui/system': - specifier: ^6.4.3 - version: 6.4.3(@emotion/react@11.14.0(@types/react@18.3.18)(react@18.3.1))(@emotion/styled@11.14.0(@emotion/react@11.14.0(@types/react@18.3.18)(react@18.3.1))(@types/react@18.3.18)(react@18.3.1))(@types/react@18.3.18)(react@18.3.1) - '@mui/x-data-grid': - specifier: ^7.27.0 - version: 7.27.0(@emotion/react@11.14.0(@types/react@18.3.18)(react@18.3.1))(@emotion/styled@11.14.0(@emotion/react@11.14.0(@types/react@18.3.18)(react@18.3.1))(@types/react@18.3.18)(react@18.3.1))(@mui/material@6.4.5(@emotion/react@11.14.0(@types/react@18.3.18)(react@18.3.1))(@emotion/styled@11.14.0(@emotion/react@11.14.0(@types/react@18.3.18)(react@18.3.1))(@types/react@18.3.18)(react@18.3.1))(@types/react@18.3.18)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@mui/system@6.4.3(@emotion/react@11.14.0(@types/react@18.3.18)(react@18.3.1))(@emotion/styled@11.14.0(@emotion/react@11.14.0(@types/react@18.3.18)(react@18.3.1))(@types/react@18.3.18)(react@18.3.1))(@types/react@18.3.18)(react@18.3.1))(@types/react@18.3.18)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@types/react': - specifier: ^18.3.18 - version: 18.3.18 - '@types/react-dom': - specifier: ^18.3.5 - version: 18.3.5(@types/react@18.3.18) - eslint: - specifier: ^9.20.1 - version: 9.20.1(jiti@2.4.2) - npm-run-all2: - specifier: ^5.0.2 - version: 5.0.2 - prettier: - specifier: ^3.5.2 - version: 3.5.2 - react: - specifier: ^18.3.1 - version: 18.3.1 - react-dom: - specifier: ^18.3.1 - version: 18.3.1(react@18.3.1) - rimraf: - specifier: ^6.0.1 - version: 6.0.1 - typescript: - specifier: ^5.7.3 - version: 5.7.3 - packages/admin/cms-admin: dependencies: '@comet/admin': @@ -1399,9 +1335,6 @@ importers: '@comet/admin-rte': specifier: workspace:^7.13.0 version: link:../admin-rte - '@comet/admin-theme': - specifier: workspace:^7.13.0 - version: link:../admin-theme '@graphql-tools/graphql-file-loader': specifier: ^7.5.17 version: 7.5.17(graphql@15.10.1) @@ -2169,9 +2102,6 @@ importers: '@comet/admin-rte': specifier: workspace:* version: link:../packages/admin/admin-rte - '@comet/admin-theme': - specifier: workspace:* - version: link:../packages/admin/admin-theme '@comet/cms-admin': specifier: workspace:* version: link:../packages/admin/cms-admin diff --git a/storybook/.storybook/preview.tsx b/storybook/.storybook/preview.tsx index dd73cdcf6b..80ebe22548 100644 --- a/storybook/.storybook/preview.tsx +++ b/storybook/.storybook/preview.tsx @@ -1,8 +1,7 @@ import "@fontsource-variable/roboto-flex/full.css"; -import { MainContent, MuiThemeProvider } from "@comet/admin"; +import { createCometTheme, MainContent, MuiThemeProvider } from "@comet/admin"; import { DateFnsLocaleProvider } from "@comet/admin-date-time"; -import { createCometTheme } from "@comet/admin-theme"; import { createTheme as createMuiTheme, GlobalStyles } from "@mui/material"; import type { Preview } from "@storybook/react"; import { type Locale as DateFnsLocale } from "date-fns"; diff --git a/storybook/package.json b/storybook/package.json index a73855e6b0..db317adefd 100644 --- a/storybook/package.json +++ b/storybook/package.json @@ -21,7 +21,6 @@ "@comet/admin-date-time": "workspace:*", "@comet/admin-icons": "workspace:*", "@comet/admin-rte": "workspace:*", - "@comet/admin-theme": "workspace:*", "@comet/cms-admin": "workspace:*", "@emotion/react": "^11.14.0", "@emotion/styled": "^11.14.0", diff --git a/storybook/src/admin/theming/ThemableAppHeader.stories.tsx b/storybook/src/admin/theming/ThemableAppHeader.stories.tsx index 46d3a0d73f..1e8b6d22ea 100644 --- a/storybook/src/admin/theming/ThemableAppHeader.stories.tsx +++ b/storybook/src/admin/theming/ThemableAppHeader.stories.tsx @@ -1,5 +1,4 @@ -import { AppHeader, CometLogo, MuiThemeProvider } from "@comet/admin"; -import { createCometTheme } from "@comet/admin-theme"; +import { AppHeader, CometLogo, createCometTheme, MuiThemeProvider } from "@comet/admin"; export default { title: "@comet/admin/theming", diff --git a/storybook/src/docs/form/Layout.stories.tsx b/storybook/src/docs/form/Layout.stories.tsx index 7cc53a3b2a..cfe7540b7e 100644 --- a/storybook/src/docs/form/Layout.stories.tsx +++ b/storybook/src/docs/form/Layout.stories.tsx @@ -1,5 +1,6 @@ import { CancelButton, + createCometTheme, Field, FieldContainer, FinalFormCheckbox, @@ -9,7 +10,6 @@ import { FormSection, OkayButton, } from "@comet/admin"; -import { createCometTheme } from "@comet/admin-theme"; import { Button, // eslint-disable-next-line no-restricted-imports diff --git a/waitForPackages.js b/waitForPackages.js index 7945e2fb0c..69deb3c681 100644 --- a/waitForPackages.js +++ b/waitForPackages.js @@ -4,7 +4,6 @@ const packageFolderMapping = { "@comet/admin-date-time": "packages/admin/admin-date-time", "@comet/admin-icons": "packages/admin/admin-icons", "@comet/admin-rte": "packages/admin/admin-rte", - "@comet/admin-theme": "packages/admin/admin-theme", "@comet/cms-admin": "packages/admin/cms-admin", "@comet/cms-api": "packages/api/cms-api", "@comet/cms-site": "packages/site/cms-site",