{
diff --git a/packages/frontend-embed/src/ui.vue b/packages/frontend-embed/src/ui.vue
index 3b8449dac8..35d9946b12 100644
--- a/packages/frontend-embed/src/ui.vue
+++ b/packages/frontend-embed/src/ui.vue
@@ -40,7 +40,7 @@ import XNotFound from '@/pages/not-found.vue';
const page = location.pathname.split('/')[2];
const contentId = location.pathname.split('/')[3];
-console.log(page, contentId);
+if (_DEV_) console.log(page, contentId);
const embedParams = inject(DI.embedParams, defaultEmbedParams);
diff --git a/packages/frontend/src/components/MkEmbedCodeGenDialog.vue b/packages/frontend/src/components/MkEmbedCodeGenDialog.vue
index 51630c427c..c1de803007 100644
--- a/packages/frontend/src/components/MkEmbedCodeGenDialog.vue
+++ b/packages/frontend/src/components/MkEmbedCodeGenDialog.vue
@@ -13,7 +13,7 @@ SPDX-License-Identifier: AGPL-3.0-only
@close="cancel()"
@closed="$emit('closed')"
>
- {{ i18n.ts._embedCodeGen.title }}
+ {{ i18n.ts._embedCodeGen.title }}
Promise.all(
'd-cherry',
'd-ice',
'd-u0',
- ].map(name => import(`@/themes/${name}.json5`).then(({ default: _default }): Theme => _default)),
+ ].map(name => import(`@@/themes/${name}.json5`).then(({ default: _default }): Theme => _default)),
);
export const getBuiltinThemesRef = () => {
--
cgit v1.2.3-freya
From 837a8e15d893a670ab2ce51b3ec87e6b62a51da7 Mon Sep 17 00:00:00 2001
From: かっこかり <67428053+kakkokari-gtyih@users.noreply.github.com>
Date: Tue, 10 Sep 2024 18:39:53 +0900
Subject: refactor(frontend): frontend-embed/src/to-be-sharedを共通化 (#14536)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
* refactor(frontend): shouldCollapsedを共通化
* refactor(frontend): config.js, worker-multi-dispatch.js, intl-const.jsを共通化
* fix(frontend-shared): fix type error
* refactor(frontend): is-link.jsと、同一の振る舞いをする記述を共通化
* fix
* fix lint
* lint fixes
---
packages/frontend-embed/src/boot.ts | 2 +-
packages/frontend-embed/src/components/EmAcct.vue | 2 +-
.../src/components/EmImgWithBlurhash.vue | 2 +-
packages/frontend-embed/src/components/EmLink.vue | 2 +-
.../frontend-embed/src/components/EmMention.vue | 2 +-
packages/frontend-embed/src/components/EmMfm.ts | 2 +-
packages/frontend-embed/src/components/EmNote.vue | 4 +-
.../src/components/EmNoteDetailed.vue | 4 +-
.../src/components/EmSubNoteContent.vue | 4 +-
packages/frontend-embed/src/components/EmTime.vue | 2 +-
packages/frontend-embed/src/components/EmUrl.vue | 2 +-
packages/frontend-embed/src/config.ts | 18 -----
packages/frontend-embed/src/i18n.ts | 2 +-
packages/frontend-embed/src/misskey-api.ts | 2 +-
packages/frontend-embed/src/pages/clip.vue | 4 +-
packages/frontend-embed/src/pages/tag.vue | 4 +-
.../frontend-embed/src/pages/user-timeline.vue | 2 +-
.../frontend-embed/src/to-be-shared/collapsed.ts | 22 ------
.../frontend-embed/src/to-be-shared/intl-const.ts | 50 -------------
.../frontend-embed/src/to-be-shared/is-link.ts | 12 ---
.../src/to-be-shared/worker-multi-dispatch.ts | 82 ---------------------
packages/frontend-embed/src/utils.ts | 2 +-
packages/frontend-shared/@types/global.d.ts | 25 +++++++
packages/frontend-shared/eslint.config.js | 6 +-
packages/frontend-shared/js/collapsed.ts | 22 ++++++
packages/frontend-shared/js/config.ts | 28 +++++++
packages/frontend-shared/js/emoji-base.ts | 4 +-
packages/frontend-shared/js/intl-const.ts | 51 +++++++++++++
packages/frontend-shared/js/is-link.ts | 12 +++
.../frontend-shared/js/worker-multi-dispatch.ts | 86 ++++++++++++++++++++++
packages/frontend-shared/tsconfig.json | 7 ++
packages/frontend/src/account.ts | 2 +-
packages/frontend/src/boot/common.ts | 2 +-
packages/frontend/src/boot/main-boot.ts | 2 +-
.../frontend/src/components/MkAccountMoved.vue | 2 +-
.../frontend/src/components/MkCropperDialog.vue | 2 +-
packages/frontend/src/components/MkDonation.vue | 2 +-
.../src/components/MkEmbedCodeGenDialog.vue | 2 +-
.../frontend/src/components/MkFollowButton.vue | 2 +-
.../frontend/src/components/MkImgWithBlurhash.vue | 2 +-
.../frontend/src/components/MkInstanceTicker.vue | 2 +-
packages/frontend/src/components/MkLink.vue | 2 +-
packages/frontend/src/components/MkMention.vue | 2 +-
packages/frontend/src/components/MkNote.vue | 15 +---
.../frontend/src/components/MkNoteDetailed.vue | 11 +--
packages/frontend/src/components/MkPageWindow.vue | 2 +-
packages/frontend/src/components/MkPoll.vue | 2 +-
packages/frontend/src/components/MkPostForm.vue | 2 +-
packages/frontend/src/components/MkPreview.vue | 2 +-
packages/frontend/src/components/MkSignin.vue | 2 +-
.../src/components/MkSignupDialog.form.vue | 2 +-
.../src/components/MkSourceCodeAvailablePopup.vue | 2 +-
.../frontend/src/components/MkSubNoteContent.vue | 2 +-
.../frontend/src/components/MkTutorialDialog.vue | 2 +-
packages/frontend/src/components/MkUpdated.vue | 2 +-
packages/frontend/src/components/MkUrlPreview.vue | 4 +-
.../frontend/src/components/MkUserSelectDialog.vue | 2 +-
.../frontend/src/components/MkUserSetupDialog.vue | 2 +-
.../frontend/src/components/MkVisitorDashboard.vue | 2 +-
packages/frontend/src/components/MkWidgets.vue | 8 +-
.../frontend/src/components/MkYouTubePlayer.vue | 2 +-
packages/frontend/src/components/global/MkA.vue | 2 +-
packages/frontend/src/components/global/MkAcct.vue | 2 +-
packages/frontend/src/components/global/MkAd.vue | 2 +-
.../components/global/MkMisskeyFlavoredMarkdown.ts | 2 +-
.../src/components/global/MkTime.stories.impl.ts | 2 +-
packages/frontend/src/components/global/MkTime.vue | 2 +-
packages/frontend/src/components/global/MkUrl.vue | 2 +-
packages/frontend/src/config.ts | 27 -------
packages/frontend/src/filters/date.ts | 2 +-
packages/frontend/src/filters/number.ts | 2 +-
packages/frontend/src/filters/user.ts | 2 +-
packages/frontend/src/i18n.ts | 2 +-
packages/frontend/src/navbar.ts | 2 +-
packages/frontend/src/pages/_error_.vue | 2 +-
packages/frontend/src/pages/about-misskey.vue | 2 +-
packages/frontend/src/pages/about.overview.vue | 2 +-
packages/frontend/src/pages/admin-user.vue | 2 +-
packages/frontend/src/pages/admin/branding.vue | 2 +-
packages/frontend/src/pages/admin/queue.vue | 2 +-
packages/frontend/src/pages/channel.vue | 2 +-
packages/frontend/src/pages/clip.vue | 2 +-
.../frontend/src/pages/drop-and-fusion.game.vue | 2 +-
packages/frontend/src/pages/flash/flash.vue | 2 +-
packages/frontend/src/pages/gallery/post.vue | 2 +-
.../frontend/src/pages/page-editor/page-editor.vue | 2 +-
packages/frontend/src/pages/page.vue | 2 +-
packages/frontend/src/pages/reversi/game.board.vue | 2 +-
packages/frontend/src/pages/reversi/game.vue | 2 +-
packages/frontend/src/pages/role.vue | 2 +-
packages/frontend/src/pages/settings/general.vue | 2 +-
.../src/pages/settings/preferences-backups.vue | 2 +-
packages/frontend/src/pages/theme-editor.vue | 2 +-
packages/frontend/src/pages/welcome.setup.vue | 2 +-
packages/frontend/src/pages/welcome.vue | 2 +-
packages/frontend/src/scripts/aiscript/api.ts | 2 +-
packages/frontend/src/scripts/collapsed.ts | 22 ------
packages/frontend/src/scripts/gen-search-query.ts | 2 +-
packages/frontend/src/scripts/get-embed-code.ts | 2 +-
packages/frontend/src/scripts/get-note-menu.ts | 2 +-
packages/frontend/src/scripts/get-user-menu.ts | 2 +-
packages/frontend/src/scripts/initialize-sw.ts | 2 +-
packages/frontend/src/scripts/intl-const.ts | 2 +-
packages/frontend/src/scripts/is-link.ts | 12 ---
packages/frontend/src/scripts/media-proxy.ts | 2 +-
packages/frontend/src/scripts/misskey-api.ts | 2 +-
.../frontend/src/scripts/player-url-transform.ts | 2 +-
packages/frontend/src/scripts/popout.ts | 2 +-
packages/frontend/src/scripts/upload.ts | 2 +-
.../frontend/src/scripts/worker-multi-dispatch.ts | 82 ---------------------
packages/frontend/src/store.ts | 4 +-
packages/frontend/src/stream.ts | 2 +-
packages/frontend/src/ui/_common_/common.ts | 2 +-
packages/frontend/src/ui/classic.sidebar.vue | 2 +-
packages/frontend/src/ui/classic.vue | 10 +--
packages/frontend/src/ui/deck/main-column.vue | 7 +-
packages/frontend/src/ui/minimum.vue | 2 +-
packages/frontend/src/ui/universal.vue | 9 +--
packages/frontend/src/ui/visitor.vue | 2 +-
packages/frontend/src/ui/zen.vue | 2 +-
.../frontend/src/widgets/WidgetInstanceInfo.vue | 2 +-
packages/frontend/src/widgets/WidgetRss.vue | 2 +-
packages/frontend/src/widgets/WidgetRssTicker.vue | 2 +-
123 files changed, 356 insertions(+), 484 deletions(-)
delete mode 100644 packages/frontend-embed/src/config.ts
delete mode 100644 packages/frontend-embed/src/to-be-shared/collapsed.ts
delete mode 100644 packages/frontend-embed/src/to-be-shared/intl-const.ts
delete mode 100644 packages/frontend-embed/src/to-be-shared/is-link.ts
delete mode 100644 packages/frontend-embed/src/to-be-shared/worker-multi-dispatch.ts
create mode 100644 packages/frontend-shared/@types/global.d.ts
create mode 100644 packages/frontend-shared/js/collapsed.ts
create mode 100644 packages/frontend-shared/js/config.ts
create mode 100644 packages/frontend-shared/js/intl-const.ts
create mode 100644 packages/frontend-shared/js/is-link.ts
create mode 100644 packages/frontend-shared/js/worker-multi-dispatch.ts
delete mode 100644 packages/frontend/src/config.ts
delete mode 100644 packages/frontend/src/scripts/collapsed.ts
delete mode 100644 packages/frontend/src/scripts/is-link.ts
delete mode 100644 packages/frontend/src/scripts/worker-multi-dispatch.ts
(limited to 'packages/frontend/src/components/MkEmbedCodeGenDialog.vue')
diff --git a/packages/frontend-embed/src/boot.ts b/packages/frontend-embed/src/boot.ts
index 6c73fecd76..fcea7d32ea 100644
--- a/packages/frontend-embed/src/boot.ts
+++ b/packages/frontend-embed/src/boot.ts
@@ -17,7 +17,7 @@ import { applyTheme, assertIsTheme } from '@/theme.js';
import { fetchCustomEmojis } from '@/custom-emojis.js';
import { DI } from '@/di.js';
import { serverMetadata } from '@/server-metadata.js';
-import { url } from '@/config.js';
+import { url } from '@@/js/config.js';
import { parseEmbedParams } from '@@/js/embed-page.js';
import { postMessageToParentWindow, setIframeId } from '@/post-message.js';
diff --git a/packages/frontend-embed/src/components/EmAcct.vue b/packages/frontend-embed/src/components/EmAcct.vue
index 07315e6a8b..6856b8272e 100644
--- a/packages/frontend-embed/src/components/EmAcct.vue
+++ b/packages/frontend-embed/src/components/EmAcct.vue
@@ -13,7 +13,7 @@ SPDX-License-Identifier: AGPL-3.0-only