From 1ebef7ec292f83ff6d9af7f8d910f836252833a7 Mon Sep 17 00:00:00 2001 From: KaWaite <34051327+KaWaite@users.noreply.github.com> Date: Fri, 28 Jul 2023 21:45:56 +0900 Subject: [PATCH] chore(web): unsafe plugin support (#576) Co-authored-by: YK <81808708+yk-eukarya@users.noreply.github.com> --- server/.env.example | 2 +- web/src/beta/components/TabButton/index.tsx | 10 ++-- .../Editor/tabs/widgets/Nav/Devices/index.tsx | 12 ++--- .../lib/core/Crust/Infobox/Block/builtin.ts | 19 -------- .../{ => builtin}/DataList/index.stories.tsx | 0 .../Block/{ => builtin}/DataList/index.tsx | 4 +- .../{ => builtin}/HTML/index.stories.tsx | 0 .../Block/{ => builtin}/HTML/index.tsx | 4 +- .../{ => builtin}/Image/index.stories.tsx | 0 .../Block/{ => builtin}/Image/index.tsx | 4 +- .../Block/{ => builtin}/Location/icon.svg | 0 .../{ => builtin}/Location/index.stories.tsx | 0 .../Block/{ => builtin}/Location/index.tsx | 4 +- .../{ => builtin}/Text/index.stories.tsx | 0 .../Block/{ => builtin}/Text/index.tsx | 4 +- .../{ => builtin}/Video/index.stories.tsx | 0 .../Block/{ => builtin}/Video/index.tsx | 4 +- .../core/Crust/Infobox/Block/builtin/index.ts | 47 +++++++++++++++++++ .../Infobox/Block/builtin/unsafeBlocks.ts | 35 ++++++++++++++ .../lib/core/Crust/Infobox/Block/index.tsx | 8 ++-- .../{ => builtin}/Button/MenuButton.tsx | 4 +- .../{ => builtin}/Button/index.stories.tsx | 2 +- .../Widget/{ => builtin}/Button/index.tsx | 5 +- .../{ => builtin}/LegacyMenu/MenuButton.tsx | 2 +- .../LegacyMenu/index.stories.tsx | 2 +- .../Widget/{ => builtin}/LegacyMenu/index.tsx | 2 +- .../{ => builtin}/Navigator/UI/hooks.ts | 0 .../Navigator/UI/index.stories.tsx | 0 .../{ => builtin}/Navigator/UI/index.test.tsx | 0 .../{ => builtin}/Navigator/UI/index.tsx | 2 +- .../{ => builtin}/Navigator/UI/types.ts | 0 .../{ => builtin}/Navigator/UI/utils.test.ts | 0 .../{ => builtin}/Navigator/UI/utils.ts | 0 .../Widget/{ => builtin}/Navigator/hooks.ts | 4 +- .../{ => builtin}/Navigator/index.stories.tsx | 2 +- .../Widget/{ => builtin}/Navigator/index.tsx | 4 +- .../SplashScreen/index.stories.tsx | 2 +- .../{ => builtin}/SplashScreen/index.tsx | 6 +-- .../{ => builtin}/Storytelling/hooks.ts | 2 +- .../Storytelling/index.stories.tsx | 2 +- .../{ => builtin}/Storytelling/index.tsx | 4 +- .../Timeline/UI/ScaleList.test.tsx | 0 .../{ => builtin}/Timeline/UI/ScaleList.tsx | 0 .../{ => builtin}/Timeline/UI/constants.ts | 0 .../Widget/{ => builtin}/Timeline/UI/hooks.ts | 0 .../Timeline/UI/index.stories.tsx | 0 .../{ => builtin}/Timeline/UI/index.test.tsx | 0 .../{ => builtin}/Timeline/UI/index.tsx | 0 .../Widget/{ => builtin}/Timeline/UI/types.ts | 0 .../{ => builtin}/Timeline/UI/utils.test.ts | 0 .../Widget/{ => builtin}/Timeline/UI/utils.ts | 0 .../Widget/{ => builtin}/Timeline/hooks.ts | 6 +-- .../{ => builtin}/Timeline/index.stories.tsx | 2 +- .../Widget/{ => builtin}/Timeline/index.tsx | 6 +-- .../Widget/{builtin.ts => builtin/index.ts} | 31 ++++++++---- .../Widgets/Widget/builtin/unsafeWidgets.ts | 37 +++++++++++++++ web/src/beta/lib/core/Crust/types.ts | 18 +++++++ .../beta/lib/unsafeBuiltinPlugins/.gitignore | 4 ++ .../beta/lib/unsafeBuiltinPlugins/README.md | 34 ++++++++++++++ .../beta/lib/unsafeBuiltinPlugins/index.ts | 5 ++ web/src/services/config/index.ts | 4 +- web/src/services/i18n/translations/en.yml | 2 - web/src/services/i18n/translations/ja.yml | 2 - web/tsconfig.json | 3 ++ 64 files changed, 263 insertions(+), 93 deletions(-) delete mode 100644 web/src/beta/lib/core/Crust/Infobox/Block/builtin.ts rename web/src/beta/lib/core/Crust/Infobox/Block/{ => builtin}/DataList/index.stories.tsx (100%) rename web/src/beta/lib/core/Crust/Infobox/Block/{ => builtin}/DataList/index.tsx (96%) rename web/src/beta/lib/core/Crust/Infobox/Block/{ => builtin}/HTML/index.stories.tsx (100%) rename web/src/beta/lib/core/Crust/Infobox/Block/{ => builtin}/HTML/index.tsx (98%) rename web/src/beta/lib/core/Crust/Infobox/Block/{ => builtin}/Image/index.stories.tsx (100%) rename web/src/beta/lib/core/Crust/Infobox/Block/{ => builtin}/Image/index.tsx (97%) rename web/src/beta/lib/core/Crust/Infobox/Block/{ => builtin}/Location/icon.svg (100%) rename web/src/beta/lib/core/Crust/Infobox/Block/{ => builtin}/Location/index.stories.tsx (100%) rename web/src/beta/lib/core/Crust/Infobox/Block/{ => builtin}/Location/index.tsx (96%) rename web/src/beta/lib/core/Crust/Infobox/Block/{ => builtin}/Text/index.stories.tsx (100%) rename web/src/beta/lib/core/Crust/Infobox/Block/{ => builtin}/Text/index.tsx (98%) rename web/src/beta/lib/core/Crust/Infobox/Block/{ => builtin}/Video/index.stories.tsx (100%) rename web/src/beta/lib/core/Crust/Infobox/Block/{ => builtin}/Video/index.tsx (97%) create mode 100644 web/src/beta/lib/core/Crust/Infobox/Block/builtin/index.ts create mode 100644 web/src/beta/lib/core/Crust/Infobox/Block/builtin/unsafeBlocks.ts rename web/src/beta/lib/core/Crust/Widgets/Widget/{ => builtin}/Button/MenuButton.tsx (98%) rename web/src/beta/lib/core/Crust/Widgets/Widget/{ => builtin}/Button/index.stories.tsx (95%) rename web/src/beta/lib/core/Crust/Widgets/Widget/{ => builtin}/Button/index.tsx (86%) rename web/src/beta/lib/core/Crust/Widgets/Widget/{ => builtin}/LegacyMenu/MenuButton.tsx (99%) rename web/src/beta/lib/core/Crust/Widgets/Widget/{ => builtin}/LegacyMenu/index.stories.tsx (98%) rename web/src/beta/lib/core/Crust/Widgets/Widget/{ => builtin}/LegacyMenu/index.tsx (97%) rename web/src/beta/lib/core/Crust/Widgets/Widget/{ => builtin}/Navigator/UI/hooks.ts (100%) rename web/src/beta/lib/core/Crust/Widgets/Widget/{ => builtin}/Navigator/UI/index.stories.tsx (100%) rename web/src/beta/lib/core/Crust/Widgets/Widget/{ => builtin}/Navigator/UI/index.test.tsx (100%) rename web/src/beta/lib/core/Crust/Widgets/Widget/{ => builtin}/Navigator/UI/index.tsx (99%) rename web/src/beta/lib/core/Crust/Widgets/Widget/{ => builtin}/Navigator/UI/types.ts (100%) rename web/src/beta/lib/core/Crust/Widgets/Widget/{ => builtin}/Navigator/UI/utils.test.ts (100%) rename web/src/beta/lib/core/Crust/Widgets/Widget/{ => builtin}/Navigator/UI/utils.ts (100%) rename web/src/beta/lib/core/Crust/Widgets/Widget/{ => builtin}/Navigator/hooks.ts (96%) rename web/src/beta/lib/core/Crust/Widgets/Widget/{ => builtin}/Navigator/index.stories.tsx (87%) rename web/src/beta/lib/core/Crust/Widgets/Widget/{ => builtin}/Navigator/index.tsx (88%) rename web/src/beta/lib/core/Crust/Widgets/Widget/{ => builtin}/SplashScreen/index.stories.tsx (96%) rename web/src/beta/lib/core/Crust/Widgets/Widget/{ => builtin}/SplashScreen/index.tsx (96%) rename web/src/beta/lib/core/Crust/Widgets/Widget/{ => builtin}/Storytelling/hooks.ts (99%) rename web/src/beta/lib/core/Crust/Widgets/Widget/{ => builtin}/Storytelling/index.stories.tsx (95%) rename web/src/beta/lib/core/Crust/Widgets/Widget/{ => builtin}/Storytelling/index.tsx (98%) rename web/src/beta/lib/core/Crust/Widgets/Widget/{ => builtin}/Timeline/UI/ScaleList.test.tsx (100%) rename web/src/beta/lib/core/Crust/Widgets/Widget/{ => builtin}/Timeline/UI/ScaleList.tsx (100%) rename web/src/beta/lib/core/Crust/Widgets/Widget/{ => builtin}/Timeline/UI/constants.ts (100%) rename web/src/beta/lib/core/Crust/Widgets/Widget/{ => builtin}/Timeline/UI/hooks.ts (100%) rename web/src/beta/lib/core/Crust/Widgets/Widget/{ => builtin}/Timeline/UI/index.stories.tsx (100%) rename web/src/beta/lib/core/Crust/Widgets/Widget/{ => builtin}/Timeline/UI/index.test.tsx (100%) rename web/src/beta/lib/core/Crust/Widgets/Widget/{ => builtin}/Timeline/UI/index.tsx (100%) rename web/src/beta/lib/core/Crust/Widgets/Widget/{ => builtin}/Timeline/UI/types.ts (100%) rename web/src/beta/lib/core/Crust/Widgets/Widget/{ => builtin}/Timeline/UI/utils.test.ts (100%) rename web/src/beta/lib/core/Crust/Widgets/Widget/{ => builtin}/Timeline/UI/utils.ts (100%) rename web/src/beta/lib/core/Crust/Widgets/Widget/{ => builtin}/Timeline/hooks.ts (97%) rename web/src/beta/lib/core/Crust/Widgets/Widget/{ => builtin}/Timeline/index.stories.tsx (93%) rename web/src/beta/lib/core/Crust/Widgets/Widget/{ => builtin}/Timeline/index.tsx (91%) rename web/src/beta/lib/core/Crust/Widgets/Widget/{builtin.ts => builtin/index.ts} (70%) create mode 100644 web/src/beta/lib/core/Crust/Widgets/Widget/builtin/unsafeWidgets.ts create mode 100644 web/src/beta/lib/unsafeBuiltinPlugins/.gitignore create mode 100644 web/src/beta/lib/unsafeBuiltinPlugins/README.md create mode 100644 web/src/beta/lib/unsafeBuiltinPlugins/index.ts diff --git a/server/.env.example b/server/.env.example index 660da16c9e..39303e2761 100644 --- a/server/.env.example +++ b/server/.env.example @@ -76,5 +76,5 @@ REEARTH_SES_NAME= #REEARTH_GCS_PUBLICATIONCACHECONTROL= # Extension plugin url as csv -# each path should contais `reearth.yml` file +# each path should contain `reearth.yml` file REEARTH_EXT_PLUGIN=http://fileserve.local:8090/pluging-01,http://fileserve.local:8090/pluging-02 diff --git a/web/src/beta/components/TabButton/index.tsx b/web/src/beta/components/TabButton/index.tsx index 135f8a3ce8..6684de430f 100644 --- a/web/src/beta/components/TabButton/index.tsx +++ b/web/src/beta/components/TabButton/index.tsx @@ -1,9 +1,9 @@ import type { FC } from "react"; +import Text from "@reearth/beta/components/Text"; import { styled } from "@reearth/services/theme"; import Icon, { Icons } from "../Icon"; -import Text from "../Text"; export type Props = { label: string; @@ -14,7 +14,7 @@ export type Props = { const TabButton: FC = ({ label, icon, onClick, selected }) => { return ( -