From 731c54e45298d9dea17e0c0dcab52ce82464f372 Mon Sep 17 00:00:00 2001 From: Adam Matthiesen Date: Fri, 6 Dec 2024 22:26:18 -0800 Subject: [PATCH] Refactor project structure and remove unnecessary files --- docs/typedoc.config.ts | 19 +++++++++------- packages/studiocms/package.json | 4 ++-- packages/studiocms_blog/package.json | 3 ++- packages/studiocms_core/package.json | 3 ++- packages/studiocms_dashboard/package.json | 3 ++- packages/studiocms_devapps/package.json | 3 ++- packages/studiocms_frontend/package.json | 3 ++- packages/studiocms_renderers/package.json | 3 ++- pnpm-lock.yaml | 27 ++++++++++++++++++----- 9 files changed, 46 insertions(+), 22 deletions(-) diff --git a/docs/typedoc.config.ts b/docs/typedoc.config.ts index eb87d0b3b7..c630f1576d 100644 --- a/docs/typedoc.config.ts +++ b/docs/typedoc.config.ts @@ -95,8 +95,9 @@ const TypeDocPlugins = (isProd: boolean, testingMode: boolean): StarlightPlugin[ getFilePathToPackage('studiocms_core', 'src/schemas/config/index.ts'), getFilePathToPackage('studiocms_core', 'src/schemas/config/integrations.ts'), getFilePathToPackage('studiocms_core', 'src/schemas/config/markdoc.ts'), - getFilePathToPackage('studiocms_core', 'src/schemas/config/marked.ts'), getFilePathToPackage('studiocms_core', 'src/schemas/config/rendererConfig.ts'), + getFilePathToPackage('studiocms_core', 'src/schemas/plugins/shared.ts'), + getFilePathToPackage('studiocms_core', 'src/schemas/plugins/index.ts'), getFilePathToPackage('studiocms_core', 'src/lib/index.ts'), getFilePathToPackage('studiocms_core', 'src/lib/configManager.ts'), getFilePathToPackage('studiocms_core', 'src/lib/convertDashboardLinksType.ts'), @@ -115,6 +116,7 @@ const TypeDocPlugins = (isProd: boolean, testingMode: boolean): StarlightPlugin[ getFilePathToPackage('studiocms_core', 'src/db/tables.ts'), getFilePathToPackage('studiocms_core', 'src/db/tsTables.ts'), getFilePathToPackage('studiocms_core', 'src/components/index.ts'), + getFilePathToPackage('studiocms_core', 'src/i18n/index.ts'), ], }) ), @@ -144,6 +146,7 @@ const TypeDocPlugins = (isProd: boolean, testingMode: boolean): StarlightPlugin[ entryPoints: [ getFilePathToPackage('studiocms_frontend', 'src/index.ts'), getFilePathToPackage('studiocms_frontend', 'src/integration.ts'), + getFilePathToPackage('studiocms_frontend', 'src/schema.ts'), getFilePathToPackage('studiocms_frontend', 'src/components/index.ts'), ], }) @@ -159,7 +162,7 @@ const TypeDocPlugins = (isProd: boolean, testingMode: boolean): StarlightPlugin[ getFilePathToPackage('studiocms_imagehandler', 'src/integration.ts'), getFilePathToPackage('studiocms_imagehandler', 'src/components/index.ts'), getFilePathToPackage('studiocms_imagehandler', 'src/components/props.ts'), - getFilePathToPackage('studiocms_imagehandler', 'src/plugins/cloudinary.ts'), + getFilePathToPackage('studiocms_imagehandler', 'src/components/plugins/cloudinary.ts'), ], }) ), @@ -182,7 +185,6 @@ const TypeDocPlugins = (isProd: boolean, testingMode: boolean): StarlightPlugin[ getFilePathToPackage('studiocms_renderers', 'src/lib/markdoc/index.ts'), getFilePathToPackage('studiocms_renderers', 'src/lib/markdoc/markdocHTML.ts'), getFilePathToPackage('studiocms_renderers', 'src/lib/markdoc/markdocReactStatic.ts'), - getFilePathToPackage('studiocms_renderers', 'src/lib/marked/index.ts'), getFilePathToPackage('studiocms_renderers', 'src/lib/mdx/index.ts'), ], }) @@ -208,15 +210,16 @@ const TypeDocPlugins = (isProd: boolean, testingMode: boolean): StarlightPlugin[ entryPoints: [ getFilePathToPackage('studiocms_devapps', 'src/index.ts'), getFilePathToPackage('studiocms_devapps', 'src/integration.ts'), + getFilePathToPackage('studiocms_devapps', 'src/apps/libsqlViewer.ts'), + getFilePathToPackage('studiocms_devapps', 'src/apps/wp-importer.ts'), + getFilePathToPackage('studiocms_devapps', 'src/apps/utils/index.ts'), + getFilePathToPackage('studiocms_devapps', 'src/schema/index.ts'), + getFilePathToPackage('studiocms_devapps', 'src/schema/appsConfig.ts'), + getFilePathToPackage('studiocms_devapps', 'src/schema/wp-api/index.ts'), getFilePathToPackage('studiocms_devapps', 'src/utils/pathGenerator.ts'), getFilePathToPackage('studiocms_devapps', 'src/utils/wp-api/utils.ts'), getFilePathToPackage('studiocms_devapps', 'src/utils/wp-api/converters.ts'), getFilePathToPackage('studiocms_devapps', 'src/utils/wp-api/index.ts'), - getFilePathToPackage('studiocms_devapps', 'src/schema/index.ts'), - getFilePathToPackage('studiocms_devapps', 'src/schema/appsConfig.ts'), - getFilePathToPackage('studiocms_devapps', 'src/schema/wp-api/index.ts'), - getFilePathToPackage('studiocms_devapps', 'src/apps/libsqlViewer.ts'), - getFilePathToPackage('studiocms_devapps', 'src/apps/wp-importer.ts'), ], }) ), diff --git a/packages/studiocms/package.json b/packages/studiocms/package.json index bd774cd827..0bd22d4668 100644 --- a/packages/studiocms/package.json +++ b/packages/studiocms/package.json @@ -64,10 +64,10 @@ }, "peerDependencies": { "@astrojs/db": "catalog:min", - "astro": "catalog:min" + "astro": "catalog:min", + "vite": "catalog:min" }, "devDependencies": { - "vite": "catalog:", "typescript": "catalog:", "@types/semver": "catalog:studiocms" } diff --git a/packages/studiocms_blog/package.json b/packages/studiocms_blog/package.json index 373869d735..173aea3f05 100644 --- a/packages/studiocms_blog/package.json +++ b/packages/studiocms_blog/package.json @@ -63,6 +63,7 @@ "@types/node": "catalog:" }, "peerDependencies": { - "astro": "catalog:min" + "astro": "catalog:min", + "vite": "catalog:min" } } diff --git a/packages/studiocms_core/package.json b/packages/studiocms_core/package.json index f4ead2f7c4..83c0977d17 100644 --- a/packages/studiocms_core/package.json +++ b/packages/studiocms_core/package.json @@ -59,7 +59,8 @@ }, "peerDependencies": { "@astrojs/db": "catalog:min", - "astro": "catalog:min" + "astro": "catalog:min", + "vite": "catalog:min" }, "devDependencies": { "typescript": "catalog:" diff --git a/packages/studiocms_dashboard/package.json b/packages/studiocms_dashboard/package.json index d5078c4bab..01c9e9495f 100644 --- a/packages/studiocms_dashboard/package.json +++ b/packages/studiocms_dashboard/package.json @@ -49,7 +49,8 @@ "peerDependencies": { "astro": "catalog:min", "@astrojs/db": "catalog:", - "@astrojs/web-vitals": "catalog:" + "@astrojs/web-vitals": "catalog:", + "vite": "catalog:min" }, "devDependencies": { "typescript": "catalog:" diff --git a/packages/studiocms_devapps/package.json b/packages/studiocms_devapps/package.json index f36e3808f5..6cefd6e53a 100644 --- a/packages/studiocms_devapps/package.json +++ b/packages/studiocms_devapps/package.json @@ -49,7 +49,8 @@ }, "peerDependencies": { "@astrojs/db": "catalog:min", - "astro": "catalog:min" + "astro": "catalog:min", + "vite": "catalog:min" }, "devDependencies": { "typescript": "catalog:" diff --git a/packages/studiocms_frontend/package.json b/packages/studiocms_frontend/package.json index 80cf70ac17..4b83ea782c 100644 --- a/packages/studiocms_frontend/package.json +++ b/packages/studiocms_frontend/package.json @@ -40,7 +40,8 @@ "astro-integration-kit": "catalog:" }, "peerDependencies": { - "astro": "catalog:min" + "astro": "catalog:min", + "vite": "catalog:min" }, "devDependencies": { "typescript": "catalog:" diff --git a/packages/studiocms_renderers/package.json b/packages/studiocms_renderers/package.json index 5a0b496afc..fc80d0c519 100644 --- a/packages/studiocms_renderers/package.json +++ b/packages/studiocms_renderers/package.json @@ -57,7 +57,8 @@ }, "peerDependencies": { "@astrojs/react": "catalog:", - "astro": "catalog:min" + "astro": "catalog:min", + "vite": "catalog:min" }, "peerDependenciesMeta": { "@astrojs/react": { diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 0d2471d7a2..01b8aee55f 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -48,9 +48,6 @@ catalogs: typescript: specifier: ^5.6.3 version: 5.6.3 - vite: - specifier: ^5.4.8 - version: 5.4.11 docs: '@11ty/eleventy-fetch': specifier: ^4.0.1 @@ -471,6 +468,9 @@ importers: semver: specifier: catalog:studiocms version: 7.6.3 + vite: + specifier: catalog:min + version: 5.4.11(@types/node@22.0.0) devDependencies: '@types/semver': specifier: catalog:studiocms @@ -478,9 +478,6 @@ importers: typescript: specifier: 'catalog:' version: 5.6.3 - vite: - specifier: 'catalog:' - version: 5.4.11(@types/node@22.0.0) packages/studiocms_assets: dependencies: @@ -580,6 +577,9 @@ importers: studiocms: specifier: workspace:* version: link:../studiocms + vite: + specifier: catalog:min + version: 5.4.11(@types/node@20.14.13) devDependencies: '@types/node': specifier: 'catalog:' @@ -623,6 +623,9 @@ importers: unified: specifier: catalog:studiocms-core version: 11.0.5 + vite: + specifier: catalog:min + version: 5.4.11(@types/node@22.0.0) devDependencies: typescript: specifier: 'catalog:' @@ -666,6 +669,9 @@ importers: astro-integration-kit: specifier: 'catalog:' version: 0.16.1(astro@4.16.14(@types/node@22.0.0)(rollup@4.21.0)(typescript@5.6.3)) + vite: + specifier: catalog:min + version: 5.4.11(@types/node@22.0.0) devDependencies: typescript: specifier: 'catalog:' @@ -703,6 +709,9 @@ importers: turndown: specifier: catalog:studiocms-devapps version: 7.2.0 + vite: + specifier: catalog:min + version: 5.4.11(@types/node@22.0.0) devDependencies: typescript: specifier: 'catalog:' @@ -722,6 +731,9 @@ importers: astro-integration-kit: specifier: 'catalog:' version: 0.16.1(astro@4.16.14(@types/node@22.0.0)(rollup@4.21.0)(typescript@5.6.3)) + vite: + specifier: catalog:min + version: 5.4.11(@types/node@22.0.0) devDependencies: typescript: specifier: 'catalog:' @@ -802,6 +814,9 @@ importers: unified: specifier: catalog:studiocms-core version: 11.0.5 + vite: + specifier: catalog:min + version: 5.4.11(@types/node@22.0.0) devDependencies: '@types/react': specifier: catalog:studiocms-renderer