From 85d0189210fd23369b0b3a42d3b2020346065b52 Mon Sep 17 00:00:00 2001 From: adrians5j Date: Sun, 13 Apr 2025 05:44:32 +0200 Subject: [PATCH 1/5] fix: update README.md --- packages/api-serverless-cms/README.md | 15 ++++------ packages/app-serverless-cms/README.md | 40 ++++----------------------- 2 files changed, 11 insertions(+), 44 deletions(-) diff --git a/packages/api-serverless-cms/README.md b/packages/api-serverless-cms/README.md index fc99886f597..7a8728b5fce 100644 --- a/packages/api-serverless-cms/README.md +++ b/packages/api-serverless-cms/README.md @@ -1,15 +1,12 @@ # @webiny/api-serverless-cms -[![](https://img.shields.io/npm/dw/@webiny/api-serverless-cms.svg)](https://www.npmjs.com/package/@webiny/api-serverless-cms) +[![](https://img.shields.io/npm/dw/@webiny/api-serverless-cms.svg)](https://www.npmjs.com/package/@webiny/api-serverless-cms) [![](https://img.shields.io/npm/v/@webiny/api-serverless-cms.svg)](https://www.npmjs.com/package/@webiny/api-serverless-cms) [![code style: prettier](https://img.shields.io/badge/code_style-prettier-ff69b4.svg?style=flat-square)](https://github.com/prettier/prettier) [![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg?style=flat-square)](http://makeapullrequest.com) -## Install -``` -npm install --save @webiny/api-serverless-cms -``` +DEPRECATED: This package is deprecated and will be removed in the future. Please use the `@webiny/api` package instead. -Or if you prefer yarn: -``` -yarn add @webiny/api-serverless-cms -``` +This package contains utilities and components for building Webiny's API app extensions. + +> [!NOTE] +> This package is included in every Webiny project by default, and it's not meant to be used as a standalone package. diff --git a/packages/app-serverless-cms/README.md b/packages/app-serverless-cms/README.md index ebd3b7a529b..83ead807cc8 100644 --- a/packages/app-serverless-cms/README.md +++ b/packages/app-serverless-cms/README.md @@ -1,42 +1,12 @@ # @webiny/app-serverless-cms -[![](https://img.shields.io/npm/dw/@webiny/app-serverless-cms.svg)](https://www.npmjs.com/package/@webiny/app-serverless-cms) +[![](https://img.shields.io/npm/dw/@webiny/app-serverless-cms.svg)](https://www.npmjs.com/package/@webiny/app-serverless-cms) [![](https://img.shields.io/npm/v/@webiny/app-serverless-cms.svg)](https://www.npmjs.com/package/@webiny/app-serverless-cms) [![code style: prettier](https://img.shields.io/badge/code_style-prettier-ff69b4.svg?style=flat-square)](https://github.com/prettier/prettier) [![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg?style=flat-square)](http://makeapullrequest.com) -An app for creating forms that can be embedded into pages created with [Webiny Page Builder](../api-page-builder). +DEPRECATED: This package is deprecated and will be removed in the future. Please use the `@webiny/admin` package instead. -Use together with [@webiny/api-i18n](../api-i18n) package. +This package contains utilities and components for building Webiny's Admin app extensions. -## Install -``` -npm install --save @webiny/app-serverless-cms -``` - -Or if you prefer yarn: -``` -yarn add @webiny/app-serverless-cms -``` - -## Setup -To setup, you must register a set of plugins. For more information on -plugins, please visit [Webiny documentation](https://docs.webiny.com/docs/developer-tutorials/plugins-crash-course). - -#### Admin -``` -import { plugins } from "@webiny/plugins"; -import i18nPlugins from "@webiny/app-serverless-cms/admin/plugins"; - -plugins.register(i18nPlugins); -``` - -Note: the `i18nCmsPlugins` contains plugins for the Page Builder, which will -enable you to embed i18n in your pages. - -#### Site -``` -import { plugins } from "@webiny/plugins"; -import i18nPlugins from "@webiny/app-serverless-cms/site/plugins"; - -plugins.register(i18nPlugins); -``` +> [!NOTE] +> This package is included in every Webiny project by default, and it's not meant to be used as a standalone package. From 6ab6bb683fa905f896773efcd2168159d6553516 Mon Sep 17 00:00:00 2001 From: adrians5j Date: Sun, 13 Apr 2025 05:44:45 +0200 Subject: [PATCH 2/5] fix: update imports to use @webiny/admin package --- .../cwp-template-aws/template/common/apps/admin/package.json | 2 +- .../cwp-template-aws/template/common/apps/admin/src/App.scss | 2 +- .../cwp-template-aws/template/common/apps/admin/src/App.tsx | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/cwp-template-aws/template/common/apps/admin/package.json b/packages/cwp-template-aws/template/common/apps/admin/package.json index 0392ecc03b0..f004cc2f968 100644 --- a/packages/cwp-template-aws/template/common/apps/admin/package.json +++ b/packages/cwp-template-aws/template/common/apps/admin/package.json @@ -8,11 +8,11 @@ "@editorjs/quote": "^2.7.2", "@editorjs/underline": "^1.2.1", "@types/react": "18.2.79", + "@webiny/admin": "latest", "@webiny/app-admin": "latest", "@webiny/app-admin-users-cognito": "latest", "@webiny/app-form-builder": "latest", "@webiny/app-page-builder": "latest", - "@webiny/app-serverless-cms": "latest", "@webiny/cli": "latest", "@webiny/cli-plugin-deploy-pulumi": "latest", "@webiny/plugins": "latest", diff --git a/packages/cwp-template-aws/template/common/apps/admin/src/App.scss b/packages/cwp-template-aws/template/common/apps/admin/src/App.scss index 086b65a2dfd..7f20b3e99a0 100644 --- a/packages/cwp-template-aws/template/common/apps/admin/src/App.scss +++ b/packages/cwp-template-aws/template/common/apps/admin/src/App.scss @@ -14,4 +14,4 @@ $webiny-theme-light-caret-down: url("data:image/svg+xml,%3Csvg%20width%3D%2210px $webiny-theme-typography-font-family: "Source Sans Pro"; // Import admin app styles -@import "~@webiny/app-serverless-cms/styles.scss"; +@import "~@webiny/admin/styles.scss"; diff --git a/packages/cwp-template-aws/template/common/apps/admin/src/App.tsx b/packages/cwp-template-aws/template/common/apps/admin/src/App.tsx index 6526bd7faa8..cc02b6e7b05 100644 --- a/packages/cwp-template-aws/template/common/apps/admin/src/App.tsx +++ b/packages/cwp-template-aws/template/common/apps/admin/src/App.tsx @@ -1,5 +1,5 @@ import React from "react"; -import { Admin } from "@webiny/app-serverless-cms"; +import { Admin } from "@webiny/admin"; import { Cognito } from "@webiny/app-admin-users-cognito"; import { Extensions } from "./Extensions"; From 20fa0b689e97d233713660a430679875f3e62c21 Mon Sep 17 00:00:00 2001 From: adrians5j Date: Sun, 13 Apr 2025 05:47:16 +0200 Subject: [PATCH 3/5] fix: update imports to use @webiny/admin package --- packages/app-admin-auth0/README.md | 2 +- packages/app-admin-auth0/package.json | 2 +- packages/app-admin-auth0/src/Auth0.tsx | 2 +- packages/app-admin-auth0/src/components/LoginContent.tsx | 2 +- packages/app-admin-auth0/src/createAuthentication.tsx | 2 +- .../app-admin-auth0/src/modules/userMenu/exitTenant.tsx | 2 +- packages/app-admin-auth0/src/modules/userMenu/index.tsx | 2 +- packages/app-admin-auth0/src/modules/userMenu/signOut.tsx | 2 +- packages/app-admin-auth0/src/modules/userMenu/userImage.tsx | 2 +- packages/app-admin-auth0/src/modules/userMenu/userInfo.tsx | 2 +- packages/app-admin-auth0/tsconfig.build.json | 2 +- packages/app-admin-auth0/tsconfig.json | 6 +++--- 12 files changed, 14 insertions(+), 14 deletions(-) diff --git a/packages/app-admin-auth0/README.md b/packages/app-admin-auth0/README.md index 82dc3f6920a..3157b464903 100644 --- a/packages/app-admin-auth0/README.md +++ b/packages/app-admin-auth0/README.md @@ -1,3 +1,3 @@ # @webiny/app-admin-auth0 -Plugins for @webiny/app-serverless-cms package that enable Okta authentication. +Plugins for @webiny/admin package that enable Okta authentication. diff --git a/packages/app-admin-auth0/package.json b/packages/app-admin-auth0/package.json index 5d1cec7c0d9..b2d69eba945 100644 --- a/packages/app-admin-auth0/package.json +++ b/packages/app-admin-auth0/package.json @@ -16,7 +16,7 @@ "@webiny/app": "0.0.0", "@webiny/app-admin": "0.0.0", "@webiny/app-security": "0.0.0", - "@webiny/app-serverless-cms": "0.0.0", + "@webiny/admin": "0.0.0", "@webiny/app-tenancy": "0.0.0", "@webiny/app-tenant-manager": "0.0.0", "@webiny/form": "0.0.0", diff --git a/packages/app-admin-auth0/src/Auth0.tsx b/packages/app-admin-auth0/src/Auth0.tsx index 9d4909e049c..5d60eb057e4 100644 --- a/packages/app-admin-auth0/src/Auth0.tsx +++ b/packages/app-admin-auth0/src/Auth0.tsx @@ -2,7 +2,7 @@ import React, { Fragment, useCallback, useEffect, useRef, useState } from "react import gql from "graphql-tag"; import { useApolloClient } from "@apollo/react-hooks"; import get from "lodash/get"; -import { LoginScreenRenderer, useTenancy, useTags } from "@webiny/app-serverless-cms"; +import { LoginScreenRenderer, useTenancy, useTags } from "@webiny/admin"; import { createAuthentication, CreateAuthenticationConfig } from "./createAuthentication"; import { UserMenuModule } from "~/modules/userMenu"; import { AppClientModule } from "~/modules/appClient"; diff --git a/packages/app-admin-auth0/src/components/LoginContent.tsx b/packages/app-admin-auth0/src/components/LoginContent.tsx index 0c649da7f1c..4c4bcbf63af 100644 --- a/packages/app-admin-auth0/src/components/LoginContent.tsx +++ b/packages/app-admin-auth0/src/components/LoginContent.tsx @@ -1,5 +1,5 @@ import React from "react"; -import { makeDecoratable } from "@webiny/app-serverless-cms"; +import { makeDecoratable } from "@webiny/admin"; import { CircularProgress } from "@webiny/ui/Progress"; import { alignCenter, Title } from "~/components/StyledComponents"; import { Typography } from "@webiny/ui/Typography"; diff --git a/packages/app-admin-auth0/src/createAuthentication.tsx b/packages/app-admin-auth0/src/createAuthentication.tsx index 6a759aee9df..40e7d73e938 100644 --- a/packages/app-admin-auth0/src/createAuthentication.tsx +++ b/packages/app-admin-auth0/src/createAuthentication.tsx @@ -14,7 +14,7 @@ import { } from "@auth0/auth0-react"; import { plugins } from "@webiny/plugins"; import { ApolloLinkPlugin } from "@webiny/app/plugins/ApolloLinkPlugin"; -import { useSecurity } from "@webiny/app-serverless-cms"; +import { useSecurity } from "@webiny/admin"; import { useTenancy, withTenant } from "@webiny/app-tenancy"; import { SecurityPermission } from "@webiny/app-security/types"; import { useRouter, UseHistory } from "@webiny/react-router"; diff --git a/packages/app-admin-auth0/src/modules/userMenu/exitTenant.tsx b/packages/app-admin-auth0/src/modules/userMenu/exitTenant.tsx index c49b0c2a6d4..7f5dd0718f8 100644 --- a/packages/app-admin-auth0/src/modules/userMenu/exitTenant.tsx +++ b/packages/app-admin-auth0/src/modules/userMenu/exitTenant.tsx @@ -1,5 +1,5 @@ import React from "react"; -import { makeDecoratable } from "@webiny/app-serverless-cms"; +import { makeDecoratable } from "@webiny/admin"; import { ListItem, ListItemGraphic } from "@webiny/ui/List"; import { Icon } from "@webiny/ui/Icon"; import { ReactComponent as LogoutIcon } from "~/assets/icons/logout_black_24dp.svg"; diff --git a/packages/app-admin-auth0/src/modules/userMenu/index.tsx b/packages/app-admin-auth0/src/modules/userMenu/index.tsx index 7c49d6a99f6..03d4665ef72 100644 --- a/packages/app-admin-auth0/src/modules/userMenu/index.tsx +++ b/packages/app-admin-auth0/src/modules/userMenu/index.tsx @@ -4,7 +4,7 @@ import { UserMenuHandleRenderer, Compose, Plugins -} from "@webiny/app-serverless-cms"; +} from "@webiny/admin"; import { UserInfo } from "~/modules/userMenu/userInfo"; import { SignOut } from "~/modules/userMenu/signOut"; import { UserImage } from "~/modules/userMenu/userImage"; diff --git a/packages/app-admin-auth0/src/modules/userMenu/signOut.tsx b/packages/app-admin-auth0/src/modules/userMenu/signOut.tsx index 5c27d9ae874..30be9ac2494 100644 --- a/packages/app-admin-auth0/src/modules/userMenu/signOut.tsx +++ b/packages/app-admin-auth0/src/modules/userMenu/signOut.tsx @@ -1,5 +1,5 @@ import React from "react"; -import { makeDecoratable } from "@webiny/app-serverless-cms"; +import { makeDecoratable } from "@webiny/admin"; import { ListItem, ListItemGraphic } from "@webiny/ui/List"; import { Icon } from "@webiny/ui/Icon"; import { useSecurity } from "@webiny/app-security/hooks/useSecurity"; diff --git a/packages/app-admin-auth0/src/modules/userMenu/userImage.tsx b/packages/app-admin-auth0/src/modules/userMenu/userImage.tsx index 50cc98639db..2e0b82f91d8 100644 --- a/packages/app-admin-auth0/src/modules/userMenu/userImage.tsx +++ b/packages/app-admin-auth0/src/modules/userMenu/userImage.tsx @@ -1,5 +1,5 @@ import React from "react"; -import { makeDecoratable } from "@webiny/app-serverless-cms"; +import { makeDecoratable } from "@webiny/admin"; import { Avatar } from "@webiny/ui/Avatar"; import { useSecurity } from "@webiny/app-security/hooks/useSecurity"; diff --git a/packages/app-admin-auth0/src/modules/userMenu/userInfo.tsx b/packages/app-admin-auth0/src/modules/userMenu/userInfo.tsx index f25eb9ca76f..59138a891e1 100644 --- a/packages/app-admin-auth0/src/modules/userMenu/userInfo.tsx +++ b/packages/app-admin-auth0/src/modules/userMenu/userInfo.tsx @@ -4,7 +4,7 @@ import { useSecurity } from "@webiny/app-security/hooks/useSecurity"; import { ListItem, ListItemGraphic } from "@webiny/ui/List"; import { Typography } from "@webiny/ui/Typography"; import { Avatar } from "@webiny/ui/Avatar"; -import { makeDecoratable } from "@webiny/app-serverless-cms"; +import { makeDecoratable } from "@webiny/admin"; const avatarImage = css({ height: "40px !important", diff --git a/packages/app-admin-auth0/tsconfig.build.json b/packages/app-admin-auth0/tsconfig.build.json index 0678df3f3f3..9cf42084566 100644 --- a/packages/app-admin-auth0/tsconfig.build.json +++ b/packages/app-admin-auth0/tsconfig.build.json @@ -5,7 +5,7 @@ { "path": "../app/tsconfig.build.json" }, { "path": "../app-admin/tsconfig.build.json" }, { "path": "../app-security/tsconfig.build.json" }, - { "path": "../app-serverless-cms/tsconfig.build.json" }, + { "path": "../admin/tsconfig.build.json" }, { "path": "../app-tenancy/tsconfig.build.json" }, { "path": "../app-tenant-manager/tsconfig.build.json" }, { "path": "../form/tsconfig.build.json" }, diff --git a/packages/app-admin-auth0/tsconfig.json b/packages/app-admin-auth0/tsconfig.json index a6a9d6e0a39..a5a5b1f0b42 100644 --- a/packages/app-admin-auth0/tsconfig.json +++ b/packages/app-admin-auth0/tsconfig.json @@ -5,7 +5,7 @@ { "path": "../app" }, { "path": "../app-admin" }, { "path": "../app-security" }, - { "path": "../app-serverless-cms" }, + { "path": "../admin" }, { "path": "../app-tenancy" }, { "path": "../app-tenant-manager" }, { "path": "../form" }, @@ -27,8 +27,8 @@ "@webiny/app-admin": ["../app-admin/src"], "@webiny/app-security/*": ["../app-security/src/*"], "@webiny/app-security": ["../app-security/src"], - "@webiny/app-serverless-cms/*": ["../app-serverless-cms/src/*"], - "@webiny/app-serverless-cms": ["../app-serverless-cms/src"], + "@webiny/admin/*": ["../admin/src/*"], + "@webiny/admin": ["../admin/src"], "@webiny/app-tenancy/*": ["../app-tenancy/src/*"], "@webiny/app-tenancy": ["../app-tenancy/src"], "@webiny/app-tenant-manager/*": ["../app-tenant-manager/src/*"], From 5e9cf287e8a8f1168d7789fb5c846abd02f8386f Mon Sep 17 00:00:00 2001 From: adrians5j Date: Sun, 13 Apr 2025 05:47:31 +0200 Subject: [PATCH 4/5] fix: update imports to use @webiny/admin package --- packages/app-admin-okta/README.md | 2 +- packages/app-admin-okta/package.json | 2 +- packages/app-admin-okta/src/Okta.tsx | 2 +- packages/app-admin-okta/src/createAuthentication.tsx | 2 +- packages/app-admin-okta/src/modules/userMenu/exitTenant.tsx | 2 +- packages/app-admin-okta/src/modules/userMenu/index.tsx | 2 +- packages/app-admin-okta/src/modules/userMenu/signOut.tsx | 2 +- packages/app-admin-okta/src/modules/userMenu/userImage.tsx | 2 +- packages/app-admin-okta/src/modules/userMenu/userInfo.tsx | 2 +- packages/app-admin-okta/tsconfig.build.json | 2 +- packages/app-admin-okta/tsconfig.json | 6 +++--- packages/app-admin-rmwc/README.md | 2 +- packages/lexical-editor-actions/README.md | 2 +- 13 files changed, 15 insertions(+), 15 deletions(-) diff --git a/packages/app-admin-okta/README.md b/packages/app-admin-okta/README.md index 2ffe20074fa..706b15a9b9c 100644 --- a/packages/app-admin-okta/README.md +++ b/packages/app-admin-okta/README.md @@ -1,3 +1,3 @@ # @webiny/app-admin-okta -Plugins for @webiny/app-serverless-cms package that enable Okta authentication. +Plugins for @webiny/admin package that enable Okta authentication. diff --git a/packages/app-admin-okta/package.json b/packages/app-admin-okta/package.json index 745f0cf6372..87ef5c54bfe 100644 --- a/packages/app-admin-okta/package.json +++ b/packages/app-admin-okta/package.json @@ -18,7 +18,7 @@ "@webiny/app": "0.0.0", "@webiny/app-admin": "0.0.0", "@webiny/app-security": "0.0.0", - "@webiny/app-serverless-cms": "0.0.0", + "@webiny/admin": "0.0.0", "@webiny/app-tenancy": "0.0.0", "@webiny/app-tenant-manager": "0.0.0", "@webiny/form": "0.0.0", diff --git a/packages/app-admin-okta/src/Okta.tsx b/packages/app-admin-okta/src/Okta.tsx index 4e25bd3e283..374aac525fc 100644 --- a/packages/app-admin-okta/src/Okta.tsx +++ b/packages/app-admin-okta/src/Okta.tsx @@ -4,7 +4,7 @@ import OktaSignIn from "@okta/okta-signin-widget"; import get from "lodash/get"; import { useApolloClient } from "@apollo/react-hooks"; import gql from "graphql-tag"; -import { Compose, LoginScreenRenderer, useTags, useTenancy } from "@webiny/app-serverless-cms"; +import { Compose, LoginScreenRenderer, useTags, useTenancy } from "@webiny/admin"; import { createAuthentication, Config } from "./createAuthentication"; import { UserMenuModule } from "~/modules/userMenu"; import { AppClientModule } from "~/modules/appClient"; diff --git a/packages/app-admin-okta/src/createAuthentication.tsx b/packages/app-admin-okta/src/createAuthentication.tsx index 3bbb67cad2e..b7587c19bb7 100644 --- a/packages/app-admin-okta/src/createAuthentication.tsx +++ b/packages/app-admin-okta/src/createAuthentication.tsx @@ -8,7 +8,7 @@ import { OktaAuth, AuthStateManager } from "@okta/okta-auth-js"; import OktaSignIn from "@okta/okta-signin-widget"; import { plugins } from "@webiny/plugins"; import { CircularProgress } from "@webiny/ui/Progress"; -import { useSecurity } from "@webiny/app-serverless-cms"; +import { useSecurity } from "@webiny/admin"; import { ApolloLinkPlugin } from "@webiny/app/plugins/ApolloLinkPlugin"; import { useTenancy, withTenant } from "@webiny/app-tenancy"; import OktaSignInWidget from "./OktaSignInWidget"; diff --git a/packages/app-admin-okta/src/modules/userMenu/exitTenant.tsx b/packages/app-admin-okta/src/modules/userMenu/exitTenant.tsx index c49b0c2a6d4..7f5dd0718f8 100644 --- a/packages/app-admin-okta/src/modules/userMenu/exitTenant.tsx +++ b/packages/app-admin-okta/src/modules/userMenu/exitTenant.tsx @@ -1,5 +1,5 @@ import React from "react"; -import { makeDecoratable } from "@webiny/app-serverless-cms"; +import { makeDecoratable } from "@webiny/admin"; import { ListItem, ListItemGraphic } from "@webiny/ui/List"; import { Icon } from "@webiny/ui/Icon"; import { ReactComponent as LogoutIcon } from "~/assets/icons/logout_black_24dp.svg"; diff --git a/packages/app-admin-okta/src/modules/userMenu/index.tsx b/packages/app-admin-okta/src/modules/userMenu/index.tsx index 8c887ed54e6..39602e99d37 100644 --- a/packages/app-admin-okta/src/modules/userMenu/index.tsx +++ b/packages/app-admin-okta/src/modules/userMenu/index.tsx @@ -4,7 +4,7 @@ import { UserMenuHandleRenderer, Compose, Plugins -} from "@webiny/app-serverless-cms"; +} from "@webiny/admin"; import { UserInfo } from "~/modules/userMenu/userInfo"; import { SignOut } from "~/modules/userMenu/signOut"; import { UserImage } from "~/modules/userMenu/userImage"; diff --git a/packages/app-admin-okta/src/modules/userMenu/signOut.tsx b/packages/app-admin-okta/src/modules/userMenu/signOut.tsx index 5c27d9ae874..30be9ac2494 100644 --- a/packages/app-admin-okta/src/modules/userMenu/signOut.tsx +++ b/packages/app-admin-okta/src/modules/userMenu/signOut.tsx @@ -1,5 +1,5 @@ import React from "react"; -import { makeDecoratable } from "@webiny/app-serverless-cms"; +import { makeDecoratable } from "@webiny/admin"; import { ListItem, ListItemGraphic } from "@webiny/ui/List"; import { Icon } from "@webiny/ui/Icon"; import { useSecurity } from "@webiny/app-security/hooks/useSecurity"; diff --git a/packages/app-admin-okta/src/modules/userMenu/userImage.tsx b/packages/app-admin-okta/src/modules/userMenu/userImage.tsx index 50cc98639db..2e0b82f91d8 100644 --- a/packages/app-admin-okta/src/modules/userMenu/userImage.tsx +++ b/packages/app-admin-okta/src/modules/userMenu/userImage.tsx @@ -1,5 +1,5 @@ import React from "react"; -import { makeDecoratable } from "@webiny/app-serverless-cms"; +import { makeDecoratable } from "@webiny/admin"; import { Avatar } from "@webiny/ui/Avatar"; import { useSecurity } from "@webiny/app-security/hooks/useSecurity"; diff --git a/packages/app-admin-okta/src/modules/userMenu/userInfo.tsx b/packages/app-admin-okta/src/modules/userMenu/userInfo.tsx index 57c544f3916..f12748655e1 100644 --- a/packages/app-admin-okta/src/modules/userMenu/userInfo.tsx +++ b/packages/app-admin-okta/src/modules/userMenu/userInfo.tsx @@ -4,7 +4,7 @@ import { useSecurity } from "@webiny/app-security/hooks/useSecurity"; import { ListItem, ListItemGraphic } from "@webiny/ui/List"; import { Typography } from "@webiny/ui/Typography"; import { Avatar } from "@webiny/ui/Avatar"; -import { makeDecoratable } from "@webiny/app-serverless-cms"; +import { makeDecoratable } from "@webiny/admin"; const avatarImage = css({ height: "40px !important", diff --git a/packages/app-admin-okta/tsconfig.build.json b/packages/app-admin-okta/tsconfig.build.json index 80d92a5a3b4..7e49a566993 100644 --- a/packages/app-admin-okta/tsconfig.build.json +++ b/packages/app-admin-okta/tsconfig.build.json @@ -5,7 +5,7 @@ { "path": "../app/tsconfig.build.json" }, { "path": "../app-admin/tsconfig.build.json" }, { "path": "../app-security/tsconfig.build.json" }, - { "path": "../app-serverless-cms/tsconfig.build.json" }, + { "path": "../admin/tsconfig.build.json" }, { "path": "../app-tenancy/tsconfig.build.json" }, { "path": "../app-tenant-manager/tsconfig.build.json" }, { "path": "../form/tsconfig.build.json" }, diff --git a/packages/app-admin-okta/tsconfig.json b/packages/app-admin-okta/tsconfig.json index 1fef26bec30..683f69f7059 100644 --- a/packages/app-admin-okta/tsconfig.json +++ b/packages/app-admin-okta/tsconfig.json @@ -5,7 +5,7 @@ { "path": "../app" }, { "path": "../app-admin" }, { "path": "../app-security" }, - { "path": "../app-serverless-cms" }, + { "path": "../admin" }, { "path": "../app-tenancy" }, { "path": "../app-tenant-manager" }, { "path": "../form" }, @@ -26,8 +26,8 @@ "@webiny/app-admin": ["../app-admin/src"], "@webiny/app-security/*": ["../app-security/src/*"], "@webiny/app-security": ["../app-security/src"], - "@webiny/app-serverless-cms/*": ["../app-serverless-cms/src/*"], - "@webiny/app-serverless-cms": ["../app-serverless-cms/src"], + "@webiny/admin/*": ["../admin/src/*"], + "@webiny/admin": ["../admin/src"], "@webiny/app-tenancy/*": ["../app-tenancy/src/*"], "@webiny/app-tenancy": ["../app-tenancy/src"], "@webiny/app-tenant-manager/*": ["../app-tenant-manager/src/*"], diff --git a/packages/app-admin-rmwc/README.md b/packages/app-admin-rmwc/README.md index 383fcf7a08f..a87c79bf25f 100644 --- a/packages/app-admin-rmwc/README.md +++ b/packages/app-admin-rmwc/README.md @@ -4,4 +4,4 @@ [![code style: prettier](https://img.shields.io/badge/code_style-prettier-ff69b4.svg?style=flat-square)](https://github.com/prettier/prettier) [![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg?style=flat-square)](http://makeapullrequest.com) -An implementation of core UI components for @webiny/app-serverless-cms using RMWC UI library. +An implementation of core UI components for @webiny/admin using RMWC UI library. diff --git a/packages/lexical-editor-actions/README.md b/packages/lexical-editor-actions/README.md index 623f87fe26d..1179d67b7f5 100644 --- a/packages/lexical-editor-actions/README.md +++ b/packages/lexical-editor-actions/README.md @@ -12,4 +12,4 @@ This package provides actions plugins for Lexical editor. ## Where is it used? -Currently, this packaged is used in [@webiny/app-serverless-cms](../app-serverless-cms). +Currently, this packaged is used in [@webiny/admin](../admin). From 38f2a74ee94d5990e7cb49e0439544800824d0b1 Mon Sep 17 00:00:00 2001 From: adrians5j Date: Sun, 13 Apr 2025 05:49:04 +0200 Subject: [PATCH 5/5] fix: run prettier --- packages/api-i18n-content/tsconfig.json | 6 +++++- packages/api/src/index.ts | 5 ++++- packages/api/tsconfig.json | 2 +- packages/app-admin-auth0/package.json | 2 +- packages/app-admin-auth0/src/modules/userMenu/index.tsx | 7 +------ packages/app-admin-okta/package.json | 2 +- packages/app-admin-okta/src/modules/userMenu/index.tsx | 7 +------ yarn.lock | 6 +++--- 8 files changed, 17 insertions(+), 20 deletions(-) diff --git a/packages/api-i18n-content/tsconfig.json b/packages/api-i18n-content/tsconfig.json index 50dd8316fe8..14ae6ef2bcc 100644 --- a/packages/api-i18n-content/tsconfig.json +++ b/packages/api-i18n-content/tsconfig.json @@ -1,7 +1,11 @@ { "extends": "../../tsconfig.json", "include": ["src", "__tests__"], - "references": [{ "path": "../api-core" }, { "path": "../api-i18n" }, { "path": "../api-security" }], + "references": [ + { "path": "../api-core" }, + { "path": "../api-i18n" }, + { "path": "../api-security" } + ], "compilerOptions": { "rootDirs": ["./src", "./__tests__"], "outDir": "./dist", diff --git a/packages/api/src/index.ts b/packages/api/src/index.ts index 3aed36762c5..bf46ab8ab85 100644 --- a/packages/api/src/index.ts +++ b/packages/api/src/index.ts @@ -10,7 +10,10 @@ import { FormBuilderContext } from "@webiny/api-form-builder/types"; import { CmsContext } from "@webiny/api-headless-cms/types"; import { AcoContext } from "@webiny/api-aco/types"; import { PbAcoContext } from "@webiny/api-page-builder-aco/types"; -import { ContextPluginCallable, createContextPlugin as baseCreateContextPlugin } from "@webiny/api-core"; +import { + ContextPluginCallable, + createContextPlugin as baseCreateContextPlugin +} from "@webiny/api-core"; import { createGraphQLSchemaPlugin as baseCreateGraphQLSchemaPlugin, GraphQLSchemaPluginConfig diff --git a/packages/api/tsconfig.json b/packages/api/tsconfig.json index 304015e6dbb..7677c184b70 100644 --- a/packages/api/tsconfig.json +++ b/packages/api/tsconfig.json @@ -2,7 +2,7 @@ "extends": "../../tsconfig.json", "include": ["src", "__tests__"], "references": [ - { "path": "../api" }, + { "path": "../api-core" }, { "path": "../api-aco" }, { "path": "../api-file-manager" }, { "path": "../api-form-builder" }, diff --git a/packages/app-admin-auth0/package.json b/packages/app-admin-auth0/package.json index b2d69eba945..fa2841ef70a 100644 --- a/packages/app-admin-auth0/package.json +++ b/packages/app-admin-auth0/package.json @@ -13,10 +13,10 @@ "@apollo/react-hooks": "^3.1.5", "@auth0/auth0-react": "^2.2.4", "@emotion/styled": "11.10.6", + "@webiny/admin": "0.0.0", "@webiny/app": "0.0.0", "@webiny/app-admin": "0.0.0", "@webiny/app-security": "0.0.0", - "@webiny/admin": "0.0.0", "@webiny/app-tenancy": "0.0.0", "@webiny/app-tenant-manager": "0.0.0", "@webiny/form": "0.0.0", diff --git a/packages/app-admin-auth0/src/modules/userMenu/index.tsx b/packages/app-admin-auth0/src/modules/userMenu/index.tsx index 03d4665ef72..db3f4a8b8c8 100644 --- a/packages/app-admin-auth0/src/modules/userMenu/index.tsx +++ b/packages/app-admin-auth0/src/modules/userMenu/index.tsx @@ -1,10 +1,5 @@ import React, { Fragment } from "react"; -import { - AddUserMenuItem, - UserMenuHandleRenderer, - Compose, - Plugins -} from "@webiny/admin"; +import { AddUserMenuItem, UserMenuHandleRenderer, Compose, Plugins } from "@webiny/admin"; import { UserInfo } from "~/modules/userMenu/userInfo"; import { SignOut } from "~/modules/userMenu/signOut"; import { UserImage } from "~/modules/userMenu/userImage"; diff --git a/packages/app-admin-okta/package.json b/packages/app-admin-okta/package.json index 87ef5c54bfe..cec45f81f9f 100644 --- a/packages/app-admin-okta/package.json +++ b/packages/app-admin-okta/package.json @@ -15,10 +15,10 @@ "@okta/okta-auth-js": "^5.3.1", "@okta/okta-react": "^6.1.0", "@okta/okta-signin-widget": "^5.9.4", + "@webiny/admin": "0.0.0", "@webiny/app": "0.0.0", "@webiny/app-admin": "0.0.0", "@webiny/app-security": "0.0.0", - "@webiny/admin": "0.0.0", "@webiny/app-tenancy": "0.0.0", "@webiny/app-tenant-manager": "0.0.0", "@webiny/form": "0.0.0", diff --git a/packages/app-admin-okta/src/modules/userMenu/index.tsx b/packages/app-admin-okta/src/modules/userMenu/index.tsx index 39602e99d37..02971d8acaf 100644 --- a/packages/app-admin-okta/src/modules/userMenu/index.tsx +++ b/packages/app-admin-okta/src/modules/userMenu/index.tsx @@ -1,10 +1,5 @@ import React, { Fragment } from "react"; -import { - AddUserMenuItem, - UserMenuHandleRenderer, - Compose, - Plugins -} from "@webiny/admin"; +import { AddUserMenuItem, UserMenuHandleRenderer, Compose, Plugins } from "@webiny/admin"; import { UserInfo } from "~/modules/userMenu/userInfo"; import { SignOut } from "~/modules/userMenu/signOut"; import { UserImage } from "~/modules/userMenu/userImage"; diff --git a/yarn.lock b/yarn.lock index 16d7645d003..f8c18671346 100644 --- a/yarn.lock +++ b/yarn.lock @@ -12341,7 +12341,7 @@ __metadata: languageName: unknown linkType: soft -"@webiny/admin@workspace:packages/admin": +"@webiny/admin@npm:0.0.0, @webiny/admin@workspace:packages/admin": version: 0.0.0-use.local resolution: "@webiny/admin@workspace:packages/admin" dependencies: @@ -13967,10 +13967,10 @@ __metadata: "@apollo/react-hooks": "npm:^3.1.5" "@auth0/auth0-react": "npm:^2.2.4" "@emotion/styled": "npm:11.10.6" + "@webiny/admin": "npm:0.0.0" "@webiny/app": "npm:0.0.0" "@webiny/app-admin": "npm:0.0.0" "@webiny/app-security": "npm:0.0.0" - "@webiny/app-serverless-cms": "npm:0.0.0" "@webiny/app-tenancy": "npm:0.0.0" "@webiny/app-tenant-manager": "npm:0.0.0" "@webiny/form": "npm:0.0.0" @@ -14029,10 +14029,10 @@ __metadata: "@okta/okta-auth-js": "npm:^5.3.1" "@okta/okta-react": "npm:^6.1.0" "@okta/okta-signin-widget": "npm:^5.9.4" + "@webiny/admin": "npm:0.0.0" "@webiny/app": "npm:0.0.0" "@webiny/app-admin": "npm:0.0.0" "@webiny/app-security": "npm:0.0.0" - "@webiny/app-serverless-cms": "npm:0.0.0" "@webiny/app-tenancy": "npm:0.0.0" "@webiny/app-tenant-manager": "npm:0.0.0" "@webiny/form": "npm:0.0.0"