From 3ccdd2f8628d68482b5deabb06190544a710d7a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= Date: Thu, 22 Feb 2024 21:59:36 +0100 Subject: [PATCH] use our prettier format style --- .../devops/tsconfig/index.js | 8 +- src/Umbraco.Web.UI.Client/tsconfig.json | 358 ++++++------------ 2 files changed, 126 insertions(+), 240 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/devops/tsconfig/index.js b/src/Umbraco.Web.UI.Client/devops/tsconfig/index.js index a02205ac65..e05b6550ab 100644 --- a/src/Umbraco.Web.UI.Client/devops/tsconfig/index.js +++ b/src/Umbraco.Web.UI.Client/devops/tsconfig/index.js @@ -1,5 +1,5 @@ import { writeFileSync } from 'fs'; -import { format } from 'prettier'; +import { format, resolveConfig } from 'prettier'; import { createImportMap } from '../importmap/index.js'; const tsconfigPath = 'tsconfig.json'; @@ -55,8 +55,8 @@ for (const [key, value] of Object.entries(importmap.imports)) { tsConfigBase.compilerOptions.paths = paths; const content = tsconfigComment + JSON.stringify(tsConfigBase, null, ' '); -const formattedContent = await format(content, { - parser: 'json', -}); + +const config = await resolveConfig('./.prettierrc.json'); +const formattedContent = await format(content, { ...config, parser: 'json' }); writeFileSync(tsconfigPath, formattedContent); diff --git a/src/Umbraco.Web.UI.Client/tsconfig.json b/src/Umbraco.Web.UI.Client/tsconfig.json index 24441d9e5f..c5b50ee612 100644 --- a/src/Umbraco.Web.UI.Client/tsconfig.json +++ b/src/Umbraco.Web.UI.Client/tsconfig.json @@ -1,240 +1,126 @@ // Don't edit this file directly. It is generated by /devops/tsconfig/index.js { - "compilerOptions": { - "module": "esnext", - "target": "ES2020", - "lib": ["es2020", "dom", "dom.iterable"], - "outDir": "./types", - "allowSyntheticDefaultImports": true, - "experimentalDecorators": true, - "forceConsistentCasingInFileNames": true, - "useDefineForClassFields": false, - "baseUrl": ".", - "incremental": true, - "skipLibCheck": true, - "moduleResolution": "bundler", - "allowImportingTsExtensions": true, - "resolveJsonModule": true, - "isolatedModules": true, - "noEmit": true, - "strict": true, - "noFallthroughCasesInSwitch": true, - "noImplicitReturns": true, - "paths": { - "@umbraco-cms/internal/test-utils": ["./utils/test-utils.ts"], - "@umbraco-cms/backoffice/app": ["./src/apps/app/index.ts"], - "@umbraco-cms/backoffice/class-api": ["./src/libs/class-api/index.ts"], - "@umbraco-cms/backoffice/context-api": [ - "./src/libs/context-api/index.ts" - ], - "@umbraco-cms/backoffice/controller-api": [ - "./src/libs/controller-api/index.ts" - ], - "@umbraco-cms/backoffice/element-api": [ - "./src/libs/element-api/index.ts" - ], - "@umbraco-cms/backoffice/extension-api": [ - "./src/libs/extension-api/index.ts" - ], - "@umbraco-cms/backoffice/localization-api": [ - "./src/libs/localization-api/index.ts" - ], - "@umbraco-cms/backoffice/observable-api": [ - "./src/libs/observable-api/index.ts" - ], - "@umbraco-cms/backoffice/auth": ["./src/shared/auth/index.ts"], - "@umbraco-cms/backoffice/event": ["./src/packages/core/event/index.ts"], - "@umbraco-cms/backoffice/lit-element": [ - "./src/packages/core/lit-element/index.ts" - ], - "@umbraco-cms/backoffice/icon": ["./src/shared/icon-registry/index.ts"], - "@umbraco-cms/backoffice/models": ["./src/shared/models/index.ts"], - "@umbraco-cms/backoffice/resources": ["./src/shared/resources/index.ts"], - "@umbraco-cms/backoffice/router": ["./src/shared/router/index.ts"], - "@umbraco-cms/backoffice/style": ["./src/shared/style/index.ts"], - "@umbraco-cms/backoffice/utils": ["./src/shared/utils/index.ts"], - "@umbraco-cms/backoffice/action": ["./src/packages/core/action/index.ts"], - "@umbraco-cms/backoffice/collection": [ - "./src/packages/core/collection/index.ts" - ], - "@umbraco-cms/backoffice/components": [ - "./src/packages/core/components/index.ts" - ], - "@umbraco-cms/backoffice/content-type": [ - "./src/packages/core/content-type/index.ts" - ], - "@umbraco-cms/backoffice/culture": [ - "./src/packages/core/culture/index.ts" - ], - "@umbraco-cms/backoffice/data-type": [ - "./src/packages/core/data-type/index.ts" - ], - "@umbraco-cms/backoffice/debug": ["./src/packages/core/debug/index.ts"], - "@umbraco-cms/backoffice/entity-action": [ - "./src/packages/core/entity-action/index.ts" - ], - "@umbraco-cms/backoffice/entity-bulk-action": [ - "./src/packages/core/entity-bulk-action/index.ts" - ], - "@umbraco-cms/backoffice/extension-registry": [ - "./src/packages/core/extension-registry/index.ts" - ], - "@umbraco-cms/backoffice/server-file-system": [ - "./src/packages/core/server-file-system/index.ts" - ], - "@umbraco-cms/backoffice/id": ["./src/packages/core/id/index.ts"], - "@umbraco-cms/backoffice/localization": [ - "./src/packages/core/localization/index.ts" - ], - "@umbraco-cms/backoffice/menu": ["./src/packages/core/menu/index.ts"], - "@umbraco-cms/backoffice/modal": ["./src/packages/core/modal/index.ts"], - "@umbraco-cms/backoffice/notification": [ - "./src/packages/core/notification/index.ts" - ], - "@umbraco-cms/backoffice/picker-input": [ - "./src/packages/core/picker-input/index.ts" - ], - "@umbraco-cms/backoffice/property": [ - "./src/packages/core/property/index.ts" - ], - "@umbraco-cms/backoffice/property-action": [ - "./src/packages/core/property-action/index.ts" - ], - "@umbraco-cms/backoffice/property-editor": [ - "./src/packages/core/property-editor/index.ts" - ], - "@umbraco-cms/backoffice/section": [ - "./src/packages/core/section/index.ts" - ], - "@umbraco-cms/backoffice/sorter": ["./src/packages/core/sorter/index.ts"], - "@umbraco-cms/backoffice/store": ["./src/packages/core/store/index.ts"], - "@umbraco-cms/backoffice/themes": ["./src/packages/core/themes/index.ts"], - "@umbraco-cms/backoffice/tree": ["./src/packages/core/tree/index.ts"], - "@umbraco-cms/backoffice/variant": [ - "./src/packages/core/variant/index.ts" - ], - "@umbraco-cms/backoffice/workspace": [ - "./src/packages/core/workspace/index.ts" - ], - "@umbraco-cms/backoffice/repository": [ - "./src/packages/core/repository/index.ts" - ], - "@umbraco-cms/backoffice/temporary-file": [ - "./src/packages/core/temporary-file/index.ts" - ], - "@umbraco-cms/backoffice/block": ["./src/packages/block/index.ts"], - "@umbraco-cms/backoffice/audit-log": [ - "./src/packages/audit-log/index.ts" - ], - "@umbraco-cms/backoffice/dictionary": [ - "./src/packages/dictionary/index.ts" - ], - "@umbraco-cms/backoffice/document": [ - "./src/packages/documents/documents/index.ts" - ], - "@umbraco-cms/backoffice/document-blueprint": [ - "./src/packages/documents/document-blueprints/index.ts" - ], - "@umbraco-cms/backoffice/document-type": [ - "./src/packages/documents/document-types/index.ts" - ], - "@umbraco-cms/backoffice/media": ["./src/packages/media/media/index.ts"], - "@umbraco-cms/backoffice/media-type": [ - "./src/packages/media/media-types/index.ts" - ], - "@umbraco-cms/backoffice/member": [ - "./src/packages/members/member/index.ts" - ], - "@umbraco-cms/backoffice/member-group": [ - "./src/packages/members/member-group/index.ts" - ], - "@umbraco-cms/backoffice/member-type": [ - "./src/packages/members/member-type/index.ts" - ], - "@umbraco-cms/backoffice/package": [ - "./src/packages/packages/package/index.ts" - ], - "@umbraco-cms/backoffice/language": ["./src/packages/language/index.ts"], - "@umbraco-cms/backoffice/dynamic-root": [ - "./src/packages/dynamic-root/index.ts" - ], - "@umbraco-cms/backoffice/log-viewer": [ - "./src/packages/log-viewer/index.ts" - ], - "@umbraco-cms/backoffice/relation-type": [ - "./src/packages/relations/relation-types/index.ts" - ], - "@umbraco-cms/backoffice/relations": [ - "./src/packages/relations/relations/index.ts" - ], - "@umbraco-cms/backoffice/tags": ["./src/packages/tags/index.ts"], - "@umbraco-cms/backoffice/static-file": [ - "./src/packages/static-file/index.ts" - ], - "@umbraco-cms/backoffice/partial-view": [ - "./src/packages/templating/partial-views/index.ts" - ], - "@umbraco-cms/backoffice/stylesheet": [ - "./src/packages/templating/stylesheets/index.ts" - ], - "@umbraco-cms/backoffice/template": [ - "./src/packages/templating/templates/index.ts" - ], - "@umbraco-cms/backoffice/user-group": [ - "./src/packages/user/user-group/index.ts" - ], - "@umbraco-cms/backoffice/current-user": [ - "./src/packages/user/current-user/index.ts" - ], - "@umbraco-cms/backoffice/user": ["./src/packages/user/user/index.ts"], - "@umbraco-cms/backoffice/user-permission": [ - "./src/packages/user/user-permission/index.ts" - ], - "@umbraco-cms/backoffice/code-editor": [ - "./src/packages/templating/code-editor/index.ts" - ], - "@umbraco-cms/backoffice/external/backend-api": [ - "./src/external/backend-api/index.ts" - ], - "@umbraco-cms/backoffice/external/dompurify": [ - "./src/external/dompurify/index.ts" - ], - "@umbraco-cms/backoffice/external/lit": ["./src/external/lit/index.ts"], - "@umbraco-cms/backoffice/external/lodash": [ - "./src/external/lodash/index.ts" - ], - "@umbraco-cms/backoffice/external/marked": [ - "./src/external/marked/index.ts" - ], - "@umbraco-cms/backoffice/external/monaco-editor": [ - "./src/external/monaco-editor/index.ts" - ], - "@umbraco-cms/backoffice/external/openid": [ - "./src/external/openid/index.ts" - ], - "@umbraco-cms/backoffice/external/router-slot": [ - "./src/external/router-slot/index.ts" - ], - "@umbraco-cms/backoffice/external/rxjs": ["./src/external/rxjs/index.ts"], - "@umbraco-cms/backoffice/external/tinymce": [ - "./src/external/tinymce/index.ts" - ], - "@umbraco-cms/backoffice/external/uui": ["./src/external/uui/index.ts"], - "@umbraco-cms/backoffice/external/uuid": ["./src/external/uuid/index.ts"] - } - }, - "include": [ - "src/**/*.ts", - "apps/**/*.ts", - "e2e/**/*.ts", - "index.ts", - "storybook/stories/**/*.ts", - "examples/**/*.ts" - ], - "references": [ - { - "path": "./tsconfig.node.json" - } - ] + "compilerOptions": { + "module": "esnext", + "target": "ES2020", + "lib": ["es2020", "dom", "dom.iterable"], + "outDir": "./types", + "allowSyntheticDefaultImports": true, + "experimentalDecorators": true, + "forceConsistentCasingInFileNames": true, + "useDefineForClassFields": false, + "baseUrl": ".", + "incremental": true, + "skipLibCheck": true, + "moduleResolution": "bundler", + "allowImportingTsExtensions": true, + "resolveJsonModule": true, + "isolatedModules": true, + "noEmit": true, + "strict": true, + "noFallthroughCasesInSwitch": true, + "noImplicitReturns": true, + "paths": { + "@umbraco-cms/internal/test-utils": ["./utils/test-utils.ts"], + "@umbraco-cms/backoffice/app": ["./src/apps/app/index.ts"], + "@umbraco-cms/backoffice/class-api": ["./src/libs/class-api/index.ts"], + "@umbraco-cms/backoffice/context-api": ["./src/libs/context-api/index.ts"], + "@umbraco-cms/backoffice/controller-api": ["./src/libs/controller-api/index.ts"], + "@umbraco-cms/backoffice/element-api": ["./src/libs/element-api/index.ts"], + "@umbraco-cms/backoffice/extension-api": ["./src/libs/extension-api/index.ts"], + "@umbraco-cms/backoffice/localization-api": ["./src/libs/localization-api/index.ts"], + "@umbraco-cms/backoffice/observable-api": ["./src/libs/observable-api/index.ts"], + "@umbraco-cms/backoffice/auth": ["./src/shared/auth/index.ts"], + "@umbraco-cms/backoffice/event": ["./src/packages/core/event/index.ts"], + "@umbraco-cms/backoffice/lit-element": ["./src/packages/core/lit-element/index.ts"], + "@umbraco-cms/backoffice/icon": ["./src/shared/icon-registry/index.ts"], + "@umbraco-cms/backoffice/models": ["./src/shared/models/index.ts"], + "@umbraco-cms/backoffice/resources": ["./src/shared/resources/index.ts"], + "@umbraco-cms/backoffice/router": ["./src/shared/router/index.ts"], + "@umbraco-cms/backoffice/style": ["./src/shared/style/index.ts"], + "@umbraco-cms/backoffice/utils": ["./src/shared/utils/index.ts"], + "@umbraco-cms/backoffice/action": ["./src/packages/core/action/index.ts"], + "@umbraco-cms/backoffice/collection": ["./src/packages/core/collection/index.ts"], + "@umbraco-cms/backoffice/components": ["./src/packages/core/components/index.ts"], + "@umbraco-cms/backoffice/content-type": ["./src/packages/core/content-type/index.ts"], + "@umbraco-cms/backoffice/culture": ["./src/packages/core/culture/index.ts"], + "@umbraco-cms/backoffice/data-type": ["./src/packages/core/data-type/index.ts"], + "@umbraco-cms/backoffice/debug": ["./src/packages/core/debug/index.ts"], + "@umbraco-cms/backoffice/entity-action": ["./src/packages/core/entity-action/index.ts"], + "@umbraco-cms/backoffice/entity-bulk-action": ["./src/packages/core/entity-bulk-action/index.ts"], + "@umbraco-cms/backoffice/extension-registry": ["./src/packages/core/extension-registry/index.ts"], + "@umbraco-cms/backoffice/server-file-system": ["./src/packages/core/server-file-system/index.ts"], + "@umbraco-cms/backoffice/id": ["./src/packages/core/id/index.ts"], + "@umbraco-cms/backoffice/localization": ["./src/packages/core/localization/index.ts"], + "@umbraco-cms/backoffice/menu": ["./src/packages/core/menu/index.ts"], + "@umbraco-cms/backoffice/modal": ["./src/packages/core/modal/index.ts"], + "@umbraco-cms/backoffice/notification": ["./src/packages/core/notification/index.ts"], + "@umbraco-cms/backoffice/picker-input": ["./src/packages/core/picker-input/index.ts"], + "@umbraco-cms/backoffice/property": ["./src/packages/core/property/index.ts"], + "@umbraco-cms/backoffice/property-action": ["./src/packages/core/property-action/index.ts"], + "@umbraco-cms/backoffice/property-editor": ["./src/packages/core/property-editor/index.ts"], + "@umbraco-cms/backoffice/section": ["./src/packages/core/section/index.ts"], + "@umbraco-cms/backoffice/sorter": ["./src/packages/core/sorter/index.ts"], + "@umbraco-cms/backoffice/store": ["./src/packages/core/store/index.ts"], + "@umbraco-cms/backoffice/themes": ["./src/packages/core/themes/index.ts"], + "@umbraco-cms/backoffice/tree": ["./src/packages/core/tree/index.ts"], + "@umbraco-cms/backoffice/variant": ["./src/packages/core/variant/index.ts"], + "@umbraco-cms/backoffice/workspace": ["./src/packages/core/workspace/index.ts"], + "@umbraco-cms/backoffice/repository": ["./src/packages/core/repository/index.ts"], + "@umbraco-cms/backoffice/temporary-file": ["./src/packages/core/temporary-file/index.ts"], + "@umbraco-cms/backoffice/block": ["./src/packages/block/index.ts"], + "@umbraco-cms/backoffice/audit-log": ["./src/packages/audit-log/index.ts"], + "@umbraco-cms/backoffice/dictionary": ["./src/packages/dictionary/index.ts"], + "@umbraco-cms/backoffice/document": ["./src/packages/documents/documents/index.ts"], + "@umbraco-cms/backoffice/document-blueprint": ["./src/packages/documents/document-blueprints/index.ts"], + "@umbraco-cms/backoffice/document-type": ["./src/packages/documents/document-types/index.ts"], + "@umbraco-cms/backoffice/media": ["./src/packages/media/media/index.ts"], + "@umbraco-cms/backoffice/media-type": ["./src/packages/media/media-types/index.ts"], + "@umbraco-cms/backoffice/member": ["./src/packages/members/member/index.ts"], + "@umbraco-cms/backoffice/member-group": ["./src/packages/members/member-group/index.ts"], + "@umbraco-cms/backoffice/member-type": ["./src/packages/members/member-type/index.ts"], + "@umbraco-cms/backoffice/package": ["./src/packages/packages/package/index.ts"], + "@umbraco-cms/backoffice/language": ["./src/packages/language/index.ts"], + "@umbraco-cms/backoffice/dynamic-root": ["./src/packages/dynamic-root/index.ts"], + "@umbraco-cms/backoffice/log-viewer": ["./src/packages/log-viewer/index.ts"], + "@umbraco-cms/backoffice/relation-type": ["./src/packages/relations/relation-types/index.ts"], + "@umbraco-cms/backoffice/relations": ["./src/packages/relations/relations/index.ts"], + "@umbraco-cms/backoffice/tags": ["./src/packages/tags/index.ts"], + "@umbraco-cms/backoffice/static-file": ["./src/packages/static-file/index.ts"], + "@umbraco-cms/backoffice/partial-view": ["./src/packages/templating/partial-views/index.ts"], + "@umbraco-cms/backoffice/stylesheet": ["./src/packages/templating/stylesheets/index.ts"], + "@umbraco-cms/backoffice/template": ["./src/packages/templating/templates/index.ts"], + "@umbraco-cms/backoffice/user-group": ["./src/packages/user/user-group/index.ts"], + "@umbraco-cms/backoffice/current-user": ["./src/packages/user/current-user/index.ts"], + "@umbraco-cms/backoffice/user": ["./src/packages/user/user/index.ts"], + "@umbraco-cms/backoffice/user-permission": ["./src/packages/user/user-permission/index.ts"], + "@umbraco-cms/backoffice/code-editor": ["./src/packages/templating/code-editor/index.ts"], + "@umbraco-cms/backoffice/external/backend-api": ["./src/external/backend-api/index.ts"], + "@umbraco-cms/backoffice/external/dompurify": ["./src/external/dompurify/index.ts"], + "@umbraco-cms/backoffice/external/lit": ["./src/external/lit/index.ts"], + "@umbraco-cms/backoffice/external/lodash": ["./src/external/lodash/index.ts"], + "@umbraco-cms/backoffice/external/marked": ["./src/external/marked/index.ts"], + "@umbraco-cms/backoffice/external/monaco-editor": ["./src/external/monaco-editor/index.ts"], + "@umbraco-cms/backoffice/external/openid": ["./src/external/openid/index.ts"], + "@umbraco-cms/backoffice/external/router-slot": ["./src/external/router-slot/index.ts"], + "@umbraco-cms/backoffice/external/rxjs": ["./src/external/rxjs/index.ts"], + "@umbraco-cms/backoffice/external/tinymce": ["./src/external/tinymce/index.ts"], + "@umbraco-cms/backoffice/external/uui": ["./src/external/uui/index.ts"], + "@umbraco-cms/backoffice/external/uuid": ["./src/external/uuid/index.ts"] + } + }, + "include": [ + "src/**/*.ts", + "apps/**/*.ts", + "e2e/**/*.ts", + "index.ts", + "storybook/stories/**/*.ts", + "examples/**/*.ts" + ], + "references": [ + { + "path": "./tsconfig.node.json" + } + ] }