`)}
diff --git a/packages/craftcms-cp/src/components/indicator/indicator.ts b/packages/craftcms-ui/src/components/indicator/indicator.ts
similarity index 100%
rename from packages/craftcms-cp/src/components/indicator/indicator.ts
rename to packages/craftcms-ui/src/components/indicator/indicator.ts
diff --git a/packages/craftcms-cp/src/components/info-icon/info-icon.stories.ts b/packages/craftcms-ui/src/components/info-icon/info-icon.stories.ts
similarity index 100%
rename from packages/craftcms-cp/src/components/info-icon/info-icon.stories.ts
rename to packages/craftcms-ui/src/components/info-icon/info-icon.stories.ts
diff --git a/packages/craftcms-cp/src/components/info-icon/info-icon.ts b/packages/craftcms-ui/src/components/info-icon/info-icon.ts
similarity index 100%
rename from packages/craftcms-cp/src/components/info-icon/info-icon.ts
rename to packages/craftcms-ui/src/components/info-icon/info-icon.ts
diff --git a/packages/craftcms-cp/src/components/input-color/input-color.stories.ts b/packages/craftcms-ui/src/components/input-color/input-color.stories.ts
similarity index 100%
rename from packages/craftcms-cp/src/components/input-color/input-color.stories.ts
rename to packages/craftcms-ui/src/components/input-color/input-color.stories.ts
diff --git a/packages/craftcms-cp/src/components/input-color/input-color.styles.ts b/packages/craftcms-ui/src/components/input-color/input-color.styles.ts
similarity index 100%
rename from packages/craftcms-cp/src/components/input-color/input-color.styles.ts
rename to packages/craftcms-ui/src/components/input-color/input-color.styles.ts
diff --git a/packages/craftcms-cp/src/components/input-color/input-color.test.ts b/packages/craftcms-ui/src/components/input-color/input-color.test.ts
similarity index 100%
rename from packages/craftcms-cp/src/components/input-color/input-color.test.ts
rename to packages/craftcms-ui/src/components/input-color/input-color.test.ts
diff --git a/packages/craftcms-cp/src/components/input-color/input-color.ts b/packages/craftcms-ui/src/components/input-color/input-color.ts
similarity index 99%
rename from packages/craftcms-cp/src/components/input-color/input-color.ts
rename to packages/craftcms-ui/src/components/input-color/input-color.ts
index 1637b2beb41..d888546dc34 100644
--- a/packages/craftcms-cp/src/components/input-color/input-color.ts
+++ b/packages/craftcms-ui/src/components/input-color/input-color.ts
@@ -196,7 +196,6 @@ export default class CraftInputColor extends LionInput {
`.
- **Custom element** — `` (this directory). A
light-DOM controller element that boots a bare `ThumbnailLoader` over its
@@ -32,10 +32,10 @@ the static `retryAll()` retry hook used by previews).
- **The shim scans full collections again.** An interim version of the shim
only scanned `$elements[0]`, dropping the rest of multi-row collections
(`$rows`, `$newElements`); it also imported a bad
- `@craftcms/cp/utilities/thumbnail-loader.ts.mjs` specifier that failed to
+ `@craftcms/ui/utilities/thumbnail-loader.ts.mjs` specifier that failed to
resolve at runtime. Both are fixed (the specifier is now
- `@craftcms/cp/utilities/thumbnail-loader`, matching how `CP.js` imports
- `@craftcms/cp/services/Queue`).
+ `@craftcms/ui/utilities/thumbnail-loader`, an extensionless subpath the
+ package exports map resolves to built output).
## Legacy callers that must keep working
diff --git a/packages/craftcms-cp/src/components/thumbnail-loader/thumbnail-loader.ts b/packages/craftcms-ui/src/components/thumbnail-loader/thumbnail-loader.ts
similarity index 100%
rename from packages/craftcms-cp/src/components/thumbnail-loader/thumbnail-loader.ts
rename to packages/craftcms-ui/src/components/thumbnail-loader/thumbnail-loader.ts
diff --git a/packages/craftcms-cp/src/components/thumbnail/thumbnail.stories.ts b/packages/craftcms-ui/src/components/thumbnail/thumbnail.stories.ts
similarity index 100%
rename from packages/craftcms-cp/src/components/thumbnail/thumbnail.stories.ts
rename to packages/craftcms-ui/src/components/thumbnail/thumbnail.stories.ts
diff --git a/packages/craftcms-cp/src/components/thumbnail/thumbnail.styles.ts b/packages/craftcms-ui/src/components/thumbnail/thumbnail.styles.ts
similarity index 100%
rename from packages/craftcms-cp/src/components/thumbnail/thumbnail.styles.ts
rename to packages/craftcms-ui/src/components/thumbnail/thumbnail.styles.ts
diff --git a/packages/craftcms-cp/src/components/thumbnail/thumbnail.ts b/packages/craftcms-ui/src/components/thumbnail/thumbnail.ts
similarity index 100%
rename from packages/craftcms-cp/src/components/thumbnail/thumbnail.ts
rename to packages/craftcms-ui/src/components/thumbnail/thumbnail.ts
diff --git a/packages/craftcms-cp/src/components/tooltip/Tooltip.mdx b/packages/craftcms-ui/src/components/tooltip/Tooltip.mdx
similarity index 100%
rename from packages/craftcms-cp/src/components/tooltip/Tooltip.mdx
rename to packages/craftcms-ui/src/components/tooltip/Tooltip.mdx
diff --git a/packages/craftcms-cp/src/components/tooltip/tooltip.stories.ts b/packages/craftcms-ui/src/components/tooltip/tooltip.stories.ts
similarity index 100%
rename from packages/craftcms-cp/src/components/tooltip/tooltip.stories.ts
rename to packages/craftcms-ui/src/components/tooltip/tooltip.stories.ts
diff --git a/packages/craftcms-cp/src/components/tooltip/tooltip.test.ts b/packages/craftcms-ui/src/components/tooltip/tooltip.test.ts
similarity index 100%
rename from packages/craftcms-cp/src/components/tooltip/tooltip.test.ts
rename to packages/craftcms-ui/src/components/tooltip/tooltip.test.ts
diff --git a/packages/craftcms-cp/src/components/tooltip/tooltip.ts b/packages/craftcms-ui/src/components/tooltip/tooltip.ts
similarity index 100%
rename from packages/craftcms-cp/src/components/tooltip/tooltip.ts
rename to packages/craftcms-ui/src/components/tooltip/tooltip.ts
diff --git a/packages/craftcms-cp/src/components/visually-hidden/visually-hidden.ts b/packages/craftcms-ui/src/components/visually-hidden/visually-hidden.ts
similarity index 100%
rename from packages/craftcms-cp/src/components/visually-hidden/visually-hidden.ts
rename to packages/craftcms-ui/src/components/visually-hidden/visually-hidden.ts
diff --git a/packages/craftcms-cp/src/constants/appearances.ts b/packages/craftcms-ui/src/constants/appearances.ts
similarity index 100%
rename from packages/craftcms-cp/src/constants/appearances.ts
rename to packages/craftcms-ui/src/constants/appearances.ts
diff --git a/packages/craftcms-cp/src/constants/colors.ts b/packages/craftcms-ui/src/constants/colors.ts
similarity index 100%
rename from packages/craftcms-cp/src/constants/colors.ts
rename to packages/craftcms-ui/src/constants/colors.ts
diff --git a/packages/craftcms-cp/src/constants/size.ts b/packages/craftcms-ui/src/constants/size.ts
similarity index 100%
rename from packages/craftcms-cp/src/constants/size.ts
rename to packages/craftcms-ui/src/constants/size.ts
diff --git a/packages/craftcms-cp/src/constants/statuses.ts b/packages/craftcms-ui/src/constants/statuses.ts
similarity index 100%
rename from packages/craftcms-cp/src/constants/statuses.ts
rename to packages/craftcms-ui/src/constants/statuses.ts
diff --git a/packages/craftcms-cp/src/constants/variants.ts b/packages/craftcms-ui/src/constants/variants.ts
similarity index 100%
rename from packages/craftcms-cp/src/constants/variants.ts
rename to packages/craftcms-ui/src/constants/variants.ts
diff --git a/packages/craftcms-cp/src/constants/volume.ts b/packages/craftcms-ui/src/constants/volume.ts
similarity index 100%
rename from packages/craftcms-cp/src/constants/volume.ts
rename to packages/craftcms-ui/src/constants/volume.ts
diff --git a/packages/craftcms-cp/src/index.ts b/packages/craftcms-ui/src/index.ts
similarity index 97%
rename from packages/craftcms-cp/src/index.ts
rename to packages/craftcms-ui/src/index.ts
index 4ac5c74c693..6e3971c4214 100644
--- a/packages/craftcms-cp/src/index.ts
+++ b/packages/craftcms-ui/src/index.ts
@@ -4,9 +4,7 @@ import '@github/relative-time-element';
import './types/globals.js';
import './types/events.js';
import './types/index.js';
-import './types/queue.js';
-export {CraftAuthChallengeForm} from './components/auth-challenge-form/auth-challenge-form.js';
export {default as CraftActionItem} from './components/action-item/action-item.js';
export {default as CraftActionMenu} from './components/action-menu/action-menu.js';
export {default as CraftAvatar} from './components/avatar/avatar.js';
@@ -83,7 +81,6 @@ export * from './utilities/attrs.js';
export * from './utilities/thumbnail-loader.js';
// Services
-export {QueueService} from './services/Queue.js';
export {ConfigService} from './services/Config.js';
export {AssetIndexer} from './services/AssetIndexer.js';
export type {
diff --git a/packages/craftcms-cp/src/services/AssetIndexer.ts b/packages/craftcms-ui/src/services/AssetIndexer.ts
similarity index 100%
rename from packages/craftcms-cp/src/services/AssetIndexer.ts
rename to packages/craftcms-ui/src/services/AssetIndexer.ts
diff --git a/packages/craftcms-cp/src/services/Config.ts b/packages/craftcms-ui/src/services/Config.ts
similarity index 100%
rename from packages/craftcms-cp/src/services/Config.ts
rename to packages/craftcms-ui/src/services/Config.ts
diff --git a/packages/craftcms-cp/src/services/Csrf.ts b/packages/craftcms-ui/src/services/Csrf.ts
similarity index 100%
rename from packages/craftcms-cp/src/services/Csrf.ts
rename to packages/craftcms-ui/src/services/Csrf.ts
diff --git a/packages/craftcms-cp/src/stories/tokens/Colors.mdx b/packages/craftcms-ui/src/stories/tokens/Colors.mdx
similarity index 100%
rename from packages/craftcms-cp/src/stories/tokens/Colors.mdx
rename to packages/craftcms-ui/src/stories/tokens/Colors.mdx
diff --git a/packages/craftcms-cp/src/stories/tokens/Docs.mdx b/packages/craftcms-ui/src/stories/tokens/Docs.mdx
similarity index 100%
rename from packages/craftcms-cp/src/stories/tokens/Docs.mdx
rename to packages/craftcms-ui/src/stories/tokens/Docs.mdx
diff --git a/packages/craftcms-cp/src/stories/tokens/colorable.stories.ts b/packages/craftcms-ui/src/stories/tokens/colorable.stories.ts
similarity index 100%
rename from packages/craftcms-cp/src/stories/tokens/colorable.stories.ts
rename to packages/craftcms-ui/src/stories/tokens/colorable.stories.ts
diff --git a/packages/craftcms-cp/src/stories/tokens/colors.stories.ts b/packages/craftcms-ui/src/stories/tokens/colors.stories.ts
similarity index 100%
rename from packages/craftcms-cp/src/stories/tokens/colors.stories.ts
rename to packages/craftcms-ui/src/stories/tokens/colors.stories.ts
diff --git a/packages/craftcms-cp/src/stories/tokens/helpers.ts b/packages/craftcms-ui/src/stories/tokens/helpers.ts
similarity index 100%
rename from packages/craftcms-cp/src/stories/tokens/helpers.ts
rename to packages/craftcms-ui/src/stories/tokens/helpers.ts
diff --git a/packages/craftcms-cp/src/stories/tokens/spacing.stories.ts b/packages/craftcms-ui/src/stories/tokens/spacing.stories.ts
similarity index 100%
rename from packages/craftcms-cp/src/stories/tokens/spacing.stories.ts
rename to packages/craftcms-ui/src/stories/tokens/spacing.stories.ts
diff --git a/packages/craftcms-cp/src/stories/tokens/surface.stories.ts b/packages/craftcms-ui/src/stories/tokens/surface.stories.ts
similarity index 100%
rename from packages/craftcms-cp/src/stories/tokens/surface.stories.ts
rename to packages/craftcms-ui/src/stories/tokens/surface.stories.ts
diff --git a/packages/craftcms-cp/src/stories/tokens/text.stories.ts b/packages/craftcms-ui/src/stories/tokens/text.stories.ts
similarity index 100%
rename from packages/craftcms-cp/src/stories/tokens/text.stories.ts
rename to packages/craftcms-ui/src/stories/tokens/text.stories.ts
diff --git a/packages/craftcms-cp/src/stories/tokens/variants.stories.ts b/packages/craftcms-ui/src/stories/tokens/variants.stories.ts
similarity index 100%
rename from packages/craftcms-cp/src/stories/tokens/variants.stories.ts
rename to packages/craftcms-ui/src/stories/tokens/variants.stories.ts
diff --git a/packages/craftcms-cp/src/styles/color-definitions.js b/packages/craftcms-ui/src/styles/color-definitions.js
similarity index 100%
rename from packages/craftcms-cp/src/styles/color-definitions.js
rename to packages/craftcms-ui/src/styles/color-definitions.js
diff --git a/packages/craftcms-cp/src/styles/cp.css b/packages/craftcms-ui/src/styles/cp.css
similarity index 100%
rename from packages/craftcms-cp/src/styles/cp.css
rename to packages/craftcms-ui/src/styles/cp.css
diff --git a/packages/craftcms-cp/src/styles/form.styles.ts b/packages/craftcms-ui/src/styles/form.styles.ts
similarity index 100%
rename from packages/craftcms-cp/src/styles/form.styles.ts
rename to packages/craftcms-ui/src/styles/form.styles.ts
diff --git a/packages/craftcms-cp/src/styles/host.styles.ts b/packages/craftcms-ui/src/styles/host.styles.ts
similarity index 100%
rename from packages/craftcms-cp/src/styles/host.styles.ts
rename to packages/craftcms-ui/src/styles/host.styles.ts
diff --git a/packages/craftcms-cp/src/styles/shared/base.css b/packages/craftcms-ui/src/styles/shared/base.css
similarity index 100%
rename from packages/craftcms-cp/src/styles/shared/base.css
rename to packages/craftcms-ui/src/styles/shared/base.css
diff --git a/packages/craftcms-cp/src/styles/shared/color-palette.css b/packages/craftcms-ui/src/styles/shared/color-palette.css
similarity index 100%
rename from packages/craftcms-cp/src/styles/shared/color-palette.css
rename to packages/craftcms-ui/src/styles/shared/color-palette.css
diff --git a/packages/craftcms-cp/src/styles/shared/colorable.css b/packages/craftcms-ui/src/styles/shared/colorable.css
similarity index 100%
rename from packages/craftcms-cp/src/styles/shared/colorable.css
rename to packages/craftcms-ui/src/styles/shared/colorable.css
diff --git a/packages/craftcms-cp/src/styles/shared/preflight.css b/packages/craftcms-ui/src/styles/shared/preflight.css
similarity index 100%
rename from packages/craftcms-cp/src/styles/shared/preflight.css
rename to packages/craftcms-ui/src/styles/shared/preflight.css
diff --git a/packages/craftcms-cp/src/styles/shared/tokens.css b/packages/craftcms-ui/src/styles/shared/tokens.css
similarity index 100%
rename from packages/craftcms-cp/src/styles/shared/tokens.css
rename to packages/craftcms-ui/src/styles/shared/tokens.css
diff --git a/packages/craftcms-cp/src/styles/shared/variables.css b/packages/craftcms-ui/src/styles/shared/variables.css
similarity index 100%
rename from packages/craftcms-cp/src/styles/shared/variables.css
rename to packages/craftcms-ui/src/styles/shared/variables.css
diff --git a/packages/craftcms-cp/src/styles/static-variants.styles.ts b/packages/craftcms-ui/src/styles/static-variants.styles.ts
similarity index 100%
rename from packages/craftcms-cp/src/styles/static-variants.styles.ts
rename to packages/craftcms-ui/src/styles/static-variants.styles.ts
diff --git a/packages/craftcms-cp/src/styles/variants.styles.ts b/packages/craftcms-ui/src/styles/variants.styles.ts
similarity index 100%
rename from packages/craftcms-cp/src/styles/variants.styles.ts
rename to packages/craftcms-ui/src/styles/variants.styles.ts
diff --git a/packages/craftcms-cp/src/styles/visually-hidden.styles.ts b/packages/craftcms-ui/src/styles/visually-hidden.styles.ts
similarity index 100%
rename from packages/craftcms-cp/src/styles/visually-hidden.styles.ts
rename to packages/craftcms-ui/src/styles/visually-hidden.styles.ts
diff --git a/packages/craftcms-cp/src/types/events.ts b/packages/craftcms-ui/src/types/events.ts
similarity index 100%
rename from packages/craftcms-cp/src/types/events.ts
rename to packages/craftcms-ui/src/types/events.ts
diff --git a/packages/craftcms-cp/src/types/globals.ts b/packages/craftcms-ui/src/types/globals.ts
similarity index 90%
rename from packages/craftcms-cp/src/types/globals.ts
rename to packages/craftcms-ui/src/types/globals.ts
index 8732f156085..f986f4898eb 100644
--- a/packages/craftcms-cp/src/types/globals.ts
+++ b/packages/craftcms-ui/src/types/globals.ts
@@ -1,6 +1,3 @@
-import {QueueService} from '@src/services/Queue';
-import {ConfigService} from '@src/services/Config';
-
/**
* Runtime globals bootstrapped by the Control Panel that aren't ES module
* imports. Declared here so they're available across the package.
@@ -57,11 +54,6 @@ type Site = {
uid: string;
};
-export interface CpServices {
- $queue: QueueService;
- $config: ConfigService;
-}
-
/** Shape of the legacy global `Craft` object that this package relies on. */
export interface CraftGlobal {
setCookie(name: string, value: string): void;
diff --git a/packages/craftcms-cp/src/types/index.ts b/packages/craftcms-ui/src/types/index.ts
similarity index 95%
rename from packages/craftcms-cp/src/types/index.ts
rename to packages/craftcms-ui/src/types/index.ts
index 5b11fbcc2f3..2e9f517ddb0 100644
--- a/packages/craftcms-cp/src/types/index.ts
+++ b/packages/craftcms-ui/src/types/index.ts
@@ -13,7 +13,6 @@ export const AsyncStates = {
export type AsyncState = (typeof AsyncStates)[keyof typeof AsyncStates];
-export * from './queue.js';
export type {
ActionMenuActions,
ActionMenuItem,
diff --git a/packages/craftcms-cp/src/utilities/api/actionClient.ts b/packages/craftcms-ui/src/utilities/api/actionClient.ts
similarity index 100%
rename from packages/craftcms-cp/src/utilities/api/actionClient.ts
rename to packages/craftcms-ui/src/utilities/api/actionClient.ts
diff --git a/packages/craftcms-cp/src/utilities/api/apiClient.ts b/packages/craftcms-ui/src/utilities/api/apiClient.ts
similarity index 100%
rename from packages/craftcms-cp/src/utilities/api/apiClient.ts
rename to packages/craftcms-ui/src/utilities/api/apiClient.ts
diff --git a/packages/craftcms-cp/src/utilities/attrs.test.ts b/packages/craftcms-ui/src/utilities/attrs.test.ts
similarity index 100%
rename from packages/craftcms-cp/src/utilities/attrs.test.ts
rename to packages/craftcms-ui/src/utilities/attrs.test.ts
diff --git a/packages/craftcms-cp/src/utilities/attrs.ts b/packages/craftcms-ui/src/utilities/attrs.ts
similarity index 100%
rename from packages/craftcms-cp/src/utilities/attrs.ts
rename to packages/craftcms-ui/src/utilities/attrs.ts
diff --git a/packages/craftcms-cp/src/utilities/cookies.test.ts b/packages/craftcms-ui/src/utilities/cookies.test.ts
similarity index 100%
rename from packages/craftcms-cp/src/utilities/cookies.test.ts
rename to packages/craftcms-ui/src/utilities/cookies.test.ts
diff --git a/packages/craftcms-cp/src/utilities/cookies.ts b/packages/craftcms-ui/src/utilities/cookies.ts
similarity index 100%
rename from packages/craftcms-cp/src/utilities/cookies.ts
rename to packages/craftcms-ui/src/utilities/cookies.ts
diff --git a/packages/craftcms-cp/src/utilities/dom.test.ts b/packages/craftcms-ui/src/utilities/dom.test.ts
similarity index 100%
rename from packages/craftcms-cp/src/utilities/dom.test.ts
rename to packages/craftcms-ui/src/utilities/dom.test.ts
diff --git a/packages/craftcms-cp/src/utilities/dom.ts b/packages/craftcms-ui/src/utilities/dom.ts
similarity index 100%
rename from packages/craftcms-cp/src/utilities/dom.ts
rename to packages/craftcms-ui/src/utilities/dom.ts
diff --git a/packages/craftcms-cp/src/utilities/escapeHtml.ts b/packages/craftcms-ui/src/utilities/escapeHtml.ts
similarity index 100%
rename from packages/craftcms-cp/src/utilities/escapeHtml.ts
rename to packages/craftcms-ui/src/utilities/escapeHtml.ts
diff --git a/packages/craftcms-cp/src/utilities/format.test.ts b/packages/craftcms-ui/src/utilities/format.test.ts
similarity index 100%
rename from packages/craftcms-cp/src/utilities/format.test.ts
rename to packages/craftcms-ui/src/utilities/format.test.ts
diff --git a/packages/craftcms-cp/src/utilities/format.ts b/packages/craftcms-ui/src/utilities/format.ts
similarity index 100%
rename from packages/craftcms-cp/src/utilities/format.ts
rename to packages/craftcms-ui/src/utilities/format.ts
diff --git a/packages/craftcms-cp/src/utilities/icons.test.ts b/packages/craftcms-ui/src/utilities/icons.test.ts
similarity index 100%
rename from packages/craftcms-cp/src/utilities/icons.test.ts
rename to packages/craftcms-ui/src/utilities/icons.test.ts
diff --git a/packages/craftcms-cp/src/utilities/icons.ts b/packages/craftcms-ui/src/utilities/icons.ts
similarity index 100%
rename from packages/craftcms-cp/src/utilities/icons.ts
rename to packages/craftcms-ui/src/utilities/icons.ts
diff --git a/packages/craftcms-cp/src/utilities/overlay-events.test.ts b/packages/craftcms-ui/src/utilities/overlay-events.test.ts
similarity index 100%
rename from packages/craftcms-cp/src/utilities/overlay-events.test.ts
rename to packages/craftcms-ui/src/utilities/overlay-events.test.ts
diff --git a/packages/craftcms-cp/src/utilities/overlay-events.ts b/packages/craftcms-ui/src/utilities/overlay-events.ts
similarity index 100%
rename from packages/craftcms-cp/src/utilities/overlay-events.ts
rename to packages/craftcms-ui/src/utilities/overlay-events.ts
diff --git a/packages/craftcms-cp/src/utilities/string.test.ts b/packages/craftcms-ui/src/utilities/string.test.ts
similarity index 100%
rename from packages/craftcms-cp/src/utilities/string.test.ts
rename to packages/craftcms-ui/src/utilities/string.test.ts
diff --git a/packages/craftcms-cp/src/utilities/string.ts b/packages/craftcms-ui/src/utilities/string.ts
similarity index 100%
rename from packages/craftcms-cp/src/utilities/string.ts
rename to packages/craftcms-ui/src/utilities/string.ts
diff --git a/packages/craftcms-cp/src/utilities/thumbnail-loader.ts b/packages/craftcms-ui/src/utilities/thumbnail-loader.ts
similarity index 100%
rename from packages/craftcms-cp/src/utilities/thumbnail-loader.ts
rename to packages/craftcms-ui/src/utilities/thumbnail-loader.ts
diff --git a/packages/craftcms-cp/src/utilities/translate.test.ts b/packages/craftcms-ui/src/utilities/translate.test.ts
similarity index 100%
rename from packages/craftcms-cp/src/utilities/translate.test.ts
rename to packages/craftcms-ui/src/utilities/translate.test.ts
diff --git a/packages/craftcms-cp/src/utilities/translate.ts b/packages/craftcms-ui/src/utilities/translate.ts
similarity index 100%
rename from packages/craftcms-cp/src/utilities/translate.ts
rename to packages/craftcms-ui/src/utilities/translate.ts
diff --git a/packages/craftcms-cp/tailwind.css b/packages/craftcms-ui/tailwind.css
similarity index 97%
rename from packages/craftcms-cp/tailwind.css
rename to packages/craftcms-ui/tailwind.css
index e7c21df8fac..725f6bae61e 100644
--- a/packages/craftcms-cp/tailwind.css
+++ b/packages/craftcms-ui/tailwind.css
@@ -6,8 +6,8 @@
*
* Usage in your CSS entry file:
*
- * @import "@craftcms/cp/dist/styles/cp.css"; // loads :root token values
- * @import "@craftcms/cp/tailwind.css"; // @theme inline — generate utilities
+ * @import "@craftcms/ui/dist/styles/cp.css"; // loads :root token values
+ * @import "@craftcms/ui/tailwind.css"; // @theme inline — generate utilities
* @import "tailwindcss"; // Tailwind v4 engine
*
* The --c-* variables must already be in scope (via cp.css) for var() to
diff --git a/packages/craftcms-cp/tsconfig.json b/packages/craftcms-ui/tsconfig.json
similarity index 100%
rename from packages/craftcms-cp/tsconfig.json
rename to packages/craftcms-ui/tsconfig.json
diff --git a/packages/craftcms-cp/vitest.config.ts b/packages/craftcms-ui/vitest.config.ts
similarity index 100%
rename from packages/craftcms-cp/vitest.config.ts
rename to packages/craftcms-ui/vitest.config.ts
diff --git a/packages/craftcms-cp/vitest.shims.d.ts b/packages/craftcms-ui/vitest.shims.d.ts
similarity index 100%
rename from packages/craftcms-cp/vitest.shims.d.ts
rename to packages/craftcms-ui/vitest.shims.d.ts
diff --git a/packages/craftcms-webpack/index.js b/packages/craftcms-webpack/index.js
index ddcab6de53a..9fb42f191ad 100644
--- a/packages/craftcms-webpack/index.js
+++ b/packages/craftcms-webpack/index.js
@@ -284,7 +284,7 @@ const getConfig = ({context, type, watchPaths, postcssConfig, config = {}}) => {
resolve: {
extensions: ['.wasm', '.ts', '.tsx', '.mjs', '.js', '.json', '.vue'],
// Never match the "development" exports condition: workspace packages
- // (e.g. @craftcms/cp) map it to their TypeScript source for Vite's dev
+ // (e.g. @craftcms/ui) map it to their TypeScript source for Vite's dev
// server. The legacy webpack build must always consume built output.
conditionNames: ['webpack', 'browser', 'module', 'import', 'require', 'default'],
},
diff --git a/resources/css/cp.css b/resources/css/cp.css
index bf34ab749ce..11002ca9e64 100644
--- a/resources/css/cp.css
+++ b/resources/css/cp.css
@@ -4,8 +4,8 @@ CP Styles
@layer theme, base, components, cp, utilities;
@import 'tailwindcss/theme.css' layer(theme);
@import 'tailwindcss/utilities.css' layer(utilities);
-@import '@craftcms/cp/styles/cp.css' layer(cp);
-@import '@craftcms/cp/tailwind.css' layer(theme);
+@import '@craftcms/ui/styles/cp.css' layer(cp);
+@import '@craftcms/ui/tailwind.css' layer(theme);
@import './fld.css';
@import './cvd.css';
diff --git a/resources/js/bootstrap/cp.ts b/resources/js/bootstrap/cp.ts
index cef677601a1..b4a7124f90f 100644
--- a/resources/js/bootstrap/cp.ts
+++ b/resources/js/bootstrap/cp.ts
@@ -1,4 +1,5 @@
-import {QueueService, ConfigService} from '@craftcms/cp';
+import {ConfigService} from '@craftcms/ui';
+import {QueueService} from '@/modules/queue/queue';
import {createInertiaApp, router} from '@inertiajs/vue3';
import QueueManager from '@/modules/utilities/components/queue-manager/QueueManager.vue';
import {Axios, Config, Queue} from '@/common/types/keys';
@@ -15,7 +16,7 @@ import AssetIndexes from '@/modules/utilities/components/asset-indexes/AssetInde
import SystemMessages from '@/modules/utilities/components/system-messages/SystemMessages.vue';
import DeprecationErrorsToolbar from '@/modules/utilities/components/deprecation-errors/DeprecationErrorsToolbar.vue';
import CpLink from '@/common/components/CpLink.vue';
-import {setTranslations} from '@craftcms/cp/utilities/translate';
+import {setTranslations} from '@craftcms/ui/utilities/translate';
import {setUrlDefaults} from '@/wayfinder';
import {inertiaPageRegistry, resolveInertiaPage} from './inertia-pages.js';
import AppLayout from '@/common/layouts/AppLayout.vue';
diff --git a/resources/js/bootstrap/icons.ts b/resources/js/bootstrap/icons.ts
index cb164ceaaa4..c50ad761607 100644
--- a/resources/js/bootstrap/icons.ts
+++ b/resources/js/bootstrap/icons.ts
@@ -1,4 +1,4 @@
-import {createUrlIconResolver, getIconUrl, setIconResolver} from '@craftcms/cp';
+import {createUrlIconResolver, getIconUrl, setIconResolver} from '@craftcms/ui';
const LEGACY_NAMES: Record = {
alert: 'triangle-exclamation',
diff --git a/resources/js/common/components/ActionMenu.vue b/resources/js/common/components/ActionMenu.vue
index 3099506a466..c45815150d8 100644
--- a/resources/js/common/components/ActionMenu.vue
+++ b/resources/js/common/components/ActionMenu.vue
@@ -1,6 +1,6 @@
diff --git a/resources/js/common/components/CpSidebar.vue b/resources/js/common/components/CpSidebar.vue
index 81a1d51f6b4..216f21ee518 100644
--- a/resources/js/common/components/CpSidebar.vue
+++ b/resources/js/common/components/CpSidebar.vue
@@ -1,5 +1,5 @@
diff --git a/resources/js/common/layouts/AuthBase.vue b/resources/js/common/layouts/AuthBase.vue
index 1b4490dd3c5..d8d489361e6 100644
--- a/resources/js/common/layouts/AuthBase.vue
+++ b/resources/js/common/layouts/AuthBase.vue
@@ -2,7 +2,7 @@
import {Head} from '@inertiajs/vue3';
import useCraftData from '@/common/composables/useCraftData';
import craftCmsLogoUrl from '@public/images/craftcms.svg';
- import {t} from '@craftcms/cp';
+ import {t} from '@craftcms/ui';
const props = withDefaults(
defineProps<{
diff --git a/resources/js/common/types/globals.d.ts b/resources/js/common/types/globals.d.ts
index c75aa3ca779..2b2ceef0a65 100644
--- a/resources/js/common/types/globals.d.ts
+++ b/resources/js/common/types/globals.d.ts
@@ -1,4 +1,5 @@
-import type {CpServices} from '@craftcms/cp/types/globals.d.ts';
+import type {ConfigService} from '@craftcms/ui';
+import type {QueueService} from '@/modules/queue/queue';
import type {CpComponentRegistry} from '@/bootstrap/components';
import type {InertiaPageRegistry} from '@/bootstrap/inertia-pages';
@@ -54,6 +55,11 @@ type Site = {
uid: string;
};
+interface CpServices {
+ $queue: QueueService;
+ $config: ConfigService;
+}
+
interface CpStatic extends CpServices {
$components: CpComponentRegistry;
$inertia: InertiaPageRegistry;
diff --git a/resources/js/common/types/index.ts b/resources/js/common/types/index.ts
index c61f452caca..3659ed22038 100644
--- a/resources/js/common/types/index.ts
+++ b/resources/js/common/types/index.ts
@@ -1,4 +1,4 @@
-import type {VariantKey} from '@craftcms/cp';
+import type {VariantKey} from '@craftcms/ui';
import type {Component} from 'vue';
export interface BaseOption {
diff --git a/resources/js/common/types/keys.ts b/resources/js/common/types/keys.ts
index 34c5d915f2d..4f1cdfb95b5 100644
--- a/resources/js/common/types/keys.ts
+++ b/resources/js/common/types/keys.ts
@@ -1,7 +1,7 @@
import type {InjectionKey} from 'vue';
-import type {QueueService} from '@craftcms/cp/services/Queue';
+import type {QueueService} from '@/modules/queue/queue';
import type {AxiosInstance} from 'axios';
-import type {ConfigService} from '@craftcms/cp/services/Config';
+import type {ConfigService} from '@craftcms/ui/services/Config';
export const Queue: InjectionKey = Symbol('Queue');
export const Axios: InjectionKey = Symbol('Axios');
diff --git a/resources/js/common/utils/transformBooleanOptions.ts b/resources/js/common/utils/transformBooleanOptions.ts
index e8604715607..497bbc82d61 100644
--- a/resources/js/common/utils/transformBooleanOptions.ts
+++ b/resources/js/common/utils/transformBooleanOptions.ts
@@ -1,4 +1,4 @@
-import {t} from '@craftcms/cp';
+import {t} from '@craftcms/ui';
import type {SelectItem, SelectOption} from '@/common/types';
function addBooleanData(
diff --git a/resources/js/components/Filesystems/LocalFsSettings.vue b/resources/js/components/Filesystems/LocalFsSettings.vue
index 45e2b310d64..12bc7e34517 100644
--- a/resources/js/components/Filesystems/LocalFsSettings.vue
+++ b/resources/js/components/Filesystems/LocalFsSettings.vue
@@ -1,5 +1,5 @@
';\n\n // Create a new iframe\n var $iframe = $('