[pull] main from TryGhost:main

.dependency-cruiser.cjs

@@ -103,14 +103,15 @@ module.exports = {
             to: {path: '^@tryghost/(admin-x-framework|admin-x-design-system)'}
         },
         // ============================================================
-        // apps/ — admin-x-design-system/ is a leaf; must not depend on higher layers
+        // apps/ — admin-x-design-system/ may consume Shade while it is being retired,
+        // but must not depend on application/framework layers
         // ============================================================
         {
-            name: 'admin-x-design-system-is-leaf',
-            comment: 'admin-x-design-system/ must not depend on shade or admin-x-framework.',
+            name: 'admin-x-design-system-does-not-depend-on-framework',
+            comment: 'admin-x-design-system/ must not depend on admin-x-framework.',
             severity: 'error',
             from: {path: '^apps/admin-x-design-system/'},
-            to: {path: '^@tryghost/(shade|admin-x-framework)'}
+            to: {path: '^@tryghost/admin-x-framework'}
         },
         // ============================================================
         // apps/ — admin-x-framework/ must not depend on feature apps
@@ -152,4 +153,3 @@ module.exports = {
         exclude: {path: '(^|/)(node_modules|coverage|coverage-next|test|built|dist)/'}
     }
 };
-

apps/admin-x-design-system/package.json

@@ -25,9 +25,6 @@
         "types"
     ],
     "devDependencies": {
-        "@codemirror/lang-html": "catalog:",
-        "@codemirror/state": "catalog:",
-        "@dnd-kit/utilities": "3.2.2",
         "@internal/cfg-eslint-react": "workspace:*",
         "@storybook/addon-docs": "catalog:",
         "@storybook/addon-links": "catalog:",
@@ -38,6 +35,7 @@
         "@types/react": "catalog:",
         "@types/react-dom": "catalog:",
         "@types/validator": "catalog:",
+        "@typescript/native": "catalog:",
         "@vitejs/plugin-react": "catalog:",
         "autoprefixer": "10.5.2",
         "chai": "catalog:",
@@ -52,26 +50,21 @@
         "sinon": "catalog:",
         "storybook": "catalog:",
         "tailwindcss": "catalog:",
-        "@typescript/native": "catalog:",
         "typescript": "catalog:",
         "validator": "catalog:",
         "vite": "catalog:",
         "vite-plugin-svgr": "catalog:",
         "vitest": "catalog:"
     },
     "dependencies": {
-        "@dnd-kit/core": "6.3.1",
-        "@dnd-kit/sortable": "7.0.2",
         "@ebay/nice-modal-react": "catalog:",
         "@radix-ui/react-form": "catalog:",
         "@radix-ui/react-separator": "catalog:",
         "@radix-ui/react-tabs": "catalog:",
         "@radix-ui/react-tooltip": "catalog:",
         "@sentry/react": "catalog:",
         "@tryghost/shade": "workspace:*",
-        "@uiw/react-codemirror": "catalog:",
         "clsx": "catalog:",
-        "react-colorful": "5.7.0",
         "react-hot-toast": "catalog:"
     },
     "peerDependencies": {

apps/admin-x-design-system/src/design-system-app.tsx

@@ -1,6 +1,6 @@
 import clsx from 'clsx';
 import React from 'react';
-import {FetchKoenigLexical} from './global/form/html-editor';
+import type {FetchKoenigLexical} from './providers/design-system-provider';
 import DesignSystemProvider from './providers/design-system-provider';
 
 export interface DesignSystemAppProps extends React.HTMLProps<HTMLDivElement> {