From 711eb8086afe5fdd247cf162f7d41b83e80f27c3 Mon Sep 17 00:00:00 2001 From: syuilo <4439005+syuilo@users.noreply.github.com> Date: Tue, 20 Aug 2024 16:08:08 +0900 Subject: [PATCH 1/2] =?UTF-8?q?embed=E3=83=89=E3=83=A1=E3=82=A4=E3=83=B3?= =?UTF-8?q?=E3=82=92=E3=81=BE=E3=81=A8=E3=82=81=E3=81=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/frontend/src/_embed_boot_.ts | 4 ++-- .../MkNoteEmbed.vue => embed/components/MkEmNote.vue} | 0 .../src/{pages/embed => embed/pages}/_timeline_ui_.vue | 0 packages/frontend/src/{pages/embed => embed/pages}/clip.vue | 0 packages/frontend/src/{pages/embed => embed/pages}/note.vue | 0 packages/frontend/src/{pages/embed => embed/pages}/tag.vue | 0 .../src/{pages/embed => embed/pages}/user-timeline.vue | 0 .../src/{router/definition.embed.ts => embed/router.ts} | 0 packages/frontend/src/{style.embed.scss => embed/style.scss} | 0 9 files changed, 2 insertions(+), 2 deletions(-) rename packages/frontend/src/{components/MkNoteEmbed.vue => embed/components/MkEmNote.vue} (100%) rename packages/frontend/src/{pages/embed => embed/pages}/_timeline_ui_.vue (100%) rename packages/frontend/src/{pages/embed => embed/pages}/clip.vue (100%) rename packages/frontend/src/{pages/embed => embed/pages}/note.vue (100%) rename packages/frontend/src/{pages/embed => embed/pages}/tag.vue (100%) rename packages/frontend/src/{pages/embed => embed/pages}/user-timeline.vue (100%) rename packages/frontend/src/{router/definition.embed.ts => embed/router.ts} (100%) rename packages/frontend/src/{style.embed.scss => embed/style.scss} (100%) diff --git a/packages/frontend/src/_embed_boot_.ts b/packages/frontend/src/_embed_boot_.ts index 9011b4740d..a72b4d6cec 100644 --- a/packages/frontend/src/_embed_boot_.ts +++ b/packages/frontend/src/_embed_boot_.ts @@ -9,13 +9,13 @@ import 'vite/modulepreload-polyfill'; import '@/style.scss'; import '@/style.embed.scss'; import { createApp, defineAsyncComponent } from 'vue'; -import { common } from '@/boot/common.js'; import type { CommonBootOptions } from '@/boot/common.js'; +import { common } from '@/boot/common.js'; import { setIframeId, postMessageToParentWindow } from '@/scripts/post-message.js'; import { parseEmbedParams } from '@/scripts/embed-page.js'; import { defaultStore } from '@/store.js'; import { useRouter } from '@/router/supplier.js'; -import { createEmbedRouter } from '@/router/definition.embed.js'; +import { createEmbedRouter } from '@/embed/router.js'; const bootOptions: Partial = { routerFactory: createEmbedRouter, diff --git a/packages/frontend/src/components/MkNoteEmbed.vue b/packages/frontend/src/embed/components/MkEmNote.vue similarity index 100% rename from packages/frontend/src/components/MkNoteEmbed.vue rename to packages/frontend/src/embed/components/MkEmNote.vue diff --git a/packages/frontend/src/pages/embed/_timeline_ui_.vue b/packages/frontend/src/embed/pages/_timeline_ui_.vue similarity index 100% rename from packages/frontend/src/pages/embed/_timeline_ui_.vue rename to packages/frontend/src/embed/pages/_timeline_ui_.vue diff --git a/packages/frontend/src/pages/embed/clip.vue b/packages/frontend/src/embed/pages/clip.vue similarity index 100% rename from packages/frontend/src/pages/embed/clip.vue rename to packages/frontend/src/embed/pages/clip.vue diff --git a/packages/frontend/src/pages/embed/note.vue b/packages/frontend/src/embed/pages/note.vue similarity index 100% rename from packages/frontend/src/pages/embed/note.vue rename to packages/frontend/src/embed/pages/note.vue diff --git a/packages/frontend/src/pages/embed/tag.vue b/packages/frontend/src/embed/pages/tag.vue similarity index 100% rename from packages/frontend/src/pages/embed/tag.vue rename to packages/frontend/src/embed/pages/tag.vue diff --git a/packages/frontend/src/pages/embed/user-timeline.vue b/packages/frontend/src/embed/pages/user-timeline.vue similarity index 100% rename from packages/frontend/src/pages/embed/user-timeline.vue rename to packages/frontend/src/embed/pages/user-timeline.vue diff --git a/packages/frontend/src/router/definition.embed.ts b/packages/frontend/src/embed/router.ts similarity index 100% rename from packages/frontend/src/router/definition.embed.ts rename to packages/frontend/src/embed/router.ts diff --git a/packages/frontend/src/style.embed.scss b/packages/frontend/src/embed/style.scss similarity index 100% rename from packages/frontend/src/style.embed.scss rename to packages/frontend/src/embed/style.scss From 5a0a33a8bfc99d390743ca594d539acbe0dd860b Mon Sep 17 00:00:00 2001 From: syuilo <4439005+syuilo@users.noreply.github.com> Date: Tue, 20 Aug 2024 16:10:28 +0900 Subject: [PATCH 2/2] =?UTF-8?q?embed=E3=83=89=E3=83=A1=E3=82=A4=E3=83=B3?= =?UTF-8?q?=E3=82=92=E3=81=BE=E3=81=A8=E3=82=81=E3=81=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/frontend/src/_embed_boot_.ts | 2 +- packages/frontend/src/{ui/embed.vue => embed/ui.vue} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename packages/frontend/src/{ui/embed.vue => embed/ui.vue} (100%) diff --git a/packages/frontend/src/_embed_boot_.ts b/packages/frontend/src/_embed_boot_.ts index a72b4d6cec..33962c3a9b 100644 --- a/packages/frontend/src/_embed_boot_.ts +++ b/packages/frontend/src/_embed_boot_.ts @@ -52,7 +52,7 @@ window.addEventListener('message', setIframeIdHandler); // 起動 common(() => createApp( - defineAsyncComponent(() => import('@/ui/embed.vue')), + defineAsyncComponent(() => import('@/embed/ui.vue')), ), bootOptions).then(async ({ app }) => { //#region Embed Provide app.provide('EMBED_PAGE', true); diff --git a/packages/frontend/src/ui/embed.vue b/packages/frontend/src/embed/ui.vue similarity index 100% rename from packages/frontend/src/ui/embed.vue rename to packages/frontend/src/embed/ui.vue