From 9e5030ef86c1e75f4533a1c21d115e923d441ffb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= Date: Sun, 15 Sep 2024 20:50:43 +0200 Subject: [PATCH] fix json schema --- .../devops/json-schema-generator/index.js | 3 +-- src/Umbraco.Web.UI.Client/package.json | 4 ++-- .../src/{ => json-schema}/all-packages.ts | 2 +- src/Umbraco.Web.UI.Client/src/json-schema/tsconfig.json | 6 ++++++ .../src/{ => json-schema}/umbraco-package-schema.ts | 0 .../src/packages/core/collection/types.ts | 2 ++ src/Umbraco.Web.UI.Client/src/packages/core/tree/types.ts | 1 + .../src/packages/core/workspace/extensions/types.ts | 3 ++- 8 files changed, 15 insertions(+), 6 deletions(-) rename src/Umbraco.Web.UI.Client/src/{ => json-schema}/all-packages.ts (100%) create mode 100644 src/Umbraco.Web.UI.Client/src/json-schema/tsconfig.json rename src/Umbraco.Web.UI.Client/src/{ => json-schema}/umbraco-package-schema.ts (100%) diff --git a/src/Umbraco.Web.UI.Client/devops/json-schema-generator/index.js b/src/Umbraco.Web.UI.Client/devops/json-schema-generator/index.js index 709dc41862..b99703317a 100644 --- a/src/Umbraco.Web.UI.Client/devops/json-schema-generator/index.js +++ b/src/Umbraco.Web.UI.Client/devops/json-schema-generator/index.js @@ -1,8 +1,7 @@ import { writeFileSync } from 'fs'; -import { format, resolveConfig } from 'prettier'; import { createImportMap } from '../importmap/index.js'; -const tsPath = './src/all-packages.ts'; +const tsPath = './src/json-schema/all-packages.ts'; const importmap = createImportMap({ rootDir: './src', diff --git a/src/Umbraco.Web.UI.Client/package.json b/src/Umbraco.Web.UI.Client/package.json index 8f15da7d4e..357bbf4ffd 100644 --- a/src/Umbraco.Web.UI.Client/package.json +++ b/src/Umbraco.Web.UI.Client/package.json @@ -161,8 +161,8 @@ "generate:icons": "node ./devops/icons/index.js", "generate:overrides": "node ./devops/tsc/index.js", "generate:jsonschema:imports": "node ./devops/json-schema-generator/index.js", - "generate:jsonschema:dist": "typescript-json-schema --required --include \"./src/umbraco-package-schema.ts\" --out dist-cms/umbraco-package-schema.json tsconfig.json UmbracoPackage", - "generate:jsonschema": "typescript-json-schema --required --include \"./src/umbraco-package-schema.ts\"", + "generate:jsonschema:dist": "typescript-json-schema --required --include \"./src/json-schema/umbraco-package-schema.ts\" --out dist-cms/umbraco-package-schema.json tsconfig.json UmbracoPackage", + "generate:jsonschema": "typescript-json-schema --required --include \"./src/json-schema/umbraco-package-schema.ts\"", "lint:errors": "npm run lint -- --quiet", "lint:fix": "npm run lint -- --fix", "lint": "eslint src", diff --git a/src/Umbraco.Web.UI.Client/src/all-packages.ts b/src/Umbraco.Web.UI.Client/src/json-schema/all-packages.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/all-packages.ts rename to src/Umbraco.Web.UI.Client/src/json-schema/all-packages.ts index 4514c57c76..6193b58352 100644 --- a/src/Umbraco.Web.UI.Client/src/all-packages.ts +++ b/src/Umbraco.Web.UI.Client/src/json-schema/all-packages.ts @@ -1,9 +1,9 @@ - import '@umbraco-cms/backoffice/app'; import '@umbraco-cms/backoffice/class-api'; import '@umbraco-cms/backoffice/context-api'; import '@umbraco-cms/backoffice/controller-api'; import '@umbraco-cms/backoffice/element-api'; + import '@umbraco-cms/backoffice/extension-api'; import '@umbraco-cms/backoffice/formatting-api'; import '@umbraco-cms/backoffice/localization-api'; diff --git a/src/Umbraco.Web.UI.Client/src/json-schema/tsconfig.json b/src/Umbraco.Web.UI.Client/src/json-schema/tsconfig.json new file mode 100644 index 0000000000..d5c13e9caa --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/json-schema/tsconfig.json @@ -0,0 +1,6 @@ +{ + "extends": "../../tsconfig.json", + "include": ["./*.ts", "./**/*.ts", "./**/*.json", "./**/*.js"], + "exclude": ["./**/*.test.ts", "./**/*.stories.ts", "tsconfig.json", "rollup.config.js"] + +} diff --git a/src/Umbraco.Web.UI.Client/src/umbraco-package-schema.ts b/src/Umbraco.Web.UI.Client/src/json-schema/umbraco-package-schema.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/umbraco-package-schema.ts rename to src/Umbraco.Web.UI.Client/src/json-schema/umbraco-package-schema.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/collection/types.ts b/src/Umbraco.Web.UI.Client/src/packages/core/collection/types.ts index eccd1bcfc4..82eceb01ec 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/collection/types.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/collection/types.ts @@ -2,6 +2,8 @@ import type { ManifestCollection } from './extensions/index.js'; import type { Observable } from '@umbraco-cms/backoffice/external/rxjs'; import type { UmbPaginationManager } from '@umbraco-cms/backoffice/utils'; +export type * from './extensions/index.js'; + export interface UmbCollectionBulkActionPermissions { allowBulkCopy: boolean; allowBulkDelete: boolean; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/tree/types.ts b/src/Umbraco.Web.UI.Client/src/packages/core/tree/types.ts index f190e15127..42ade241fd 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/tree/types.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/tree/types.ts @@ -1,4 +1,5 @@ import type { UmbEntityModel } from '@umbraco-cms/backoffice/entity'; +export type * from './extensions/index.js'; export interface UmbTreeItemModelBase extends UmbEntityModel { name: string; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/extensions/types.ts b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/extensions/types.ts index 26f2be39c0..8466792b3d 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/extensions/types.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/extensions/types.ts @@ -14,11 +14,12 @@ import type { } from './workspace-view.model.js'; import type { ManifestWorkspace, ManifestWorkspaceRoutableKind } from './workspace.model.js'; +export type * from './workspace-action-menu-item.model.js'; export type * from './workspace-action.model.js'; +export type * from './workspace-context.model.js'; export type * from './workspace-footer-app.model.js'; export type * from './workspace-view.model.js'; export type * from './workspace.model.js'; -export type * from './workspace-action-menu-item.model.js'; export type ManifestWorkspaceFooterApps = | ManifestWorkspaceFooterApp