sim1222/misskey
1
0
Fork 0
mirror of https://github.com/sim1222/misskey.git synced 2025-04-29 02:37:22 +09:00
Code Issues Projects Releases Wiki Activity

Merge branch 'develop'

Browse Source
This commit is contained in:
sim1222 2022-09-10 22:48:17 +09:00
commit b730f49652
8 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
packages/client/.eslintrc.js
View File

@ -24,6 +24,7 @@ module.exports = {
// window の禁止理由: グローバルスコープと衝突し、予期せぬ結果を招くため // window の禁止理由: グローバルスコープと衝突し、予期せぬ結果を招くため
// e の禁止理由: error や event など、複数のキーワードの頭文字であり分かりにくいため // e の禁止理由: error や event など、複数のキーワードの頭文字であり分かりにくいため
'id-denylist': ['error', 'window', 'e'], 'id-denylist': ['error', 'window', 'e'],
"forceConsistentCasingInFileNames": true,
'no-shadow': ['warn'], 'no-shadow': ['warn'],
'vue/attributes-order': ['error', { 'vue/attributes-order': ['error', {
'alphabetical': false, 'alphabetical': false,

2
packages/client/src/ui/deckold/antenna-column.vue
View File

@ -11,7 +11,7 @@
<script lang="ts" setup> <script lang="ts" setup>
import { onMounted } from 'vue'; import { onMounted } from 'vue';
import XColumn from './column.vue'; import XColumn from './column.vue';
import XTimeline from '@/components/MKTimeline.vue'; import XTimeline from '@/components/MkTimeline.vue';
import * as os from '@/os'; import * as os from '@/os';
import { updateColumn, Column } from './deck-store'; import { updateColumn, Column } from './deck-store';
import { i18n } from '@/i18n'; import { i18n } from '@/i18n';

2
packages/client/src/ui/deckold/direct-column.vue
View File

@ -9,7 +9,7 @@
<script lang="ts" setup> <script lang="ts" setup>
import { } from 'vue'; import { } from 'vue';
import XColumn from './column.vue'; import XColumn from './column.vue';
import XNotes from '@/components/MKNotes.vue'; import XNotes from '@/components/MkNotes.vue';
import { Column } from './deck-store'; import { Column } from './deck-store';
defineProps<{ defineProps<{

2
packages/client/src/ui/deckold/list-column.vue
View File

@ -11,7 +11,7 @@
<script lang="ts" setup> <script lang="ts" setup>
import { } from 'vue'; import { } from 'vue';
import XColumn from './column.vue'; import XColumn from './column.vue';
import XTimeline from '@/components/MKTimeline.vue'; import XTimeline from '@/components/MkTimeline.vue';
import * as os from '@/os'; import * as os from '@/os';
import { updateColumn, Column } from './deck-store'; import { updateColumn, Column } from './deck-store';
import { i18n } from '@/i18n'; import { i18n } from '@/i18n';

2
packages/client/src/ui/deckold/mentions-column.vue
View File

@ -9,7 +9,7 @@
<script lang="ts" setup> <script lang="ts" setup>
import { } from 'vue'; import { } from 'vue';
import XColumn from './column.vue'; import XColumn from './column.vue';
import XNotes from '@/components/MKNotes.vue'; import XNotes from '@/components/MkNotes.vue';
import { Column } from './deck-store'; import { Column } from './deck-store';
defineProps<{ defineProps<{

2
packages/client/src/ui/deckold/notifications-column.vue
View File

@ -9,7 +9,7 @@
<script lang="ts" setup> <script lang="ts" setup>
import { defineAsyncComponent } from 'vue'; import { defineAsyncComponent } from 'vue';
import XColumn from './column.vue'; import XColumn from './column.vue';
import XNotifications from '@/components/MKNotifications.vue'; import XNotifications from '@/components/MkNotifications.vue';
import * as os from '@/os'; import * as os from '@/os';
import { updateColumn } from './deck-store'; import { updateColumn } from './deck-store';
import { Column } from './deck-store'; import { Column } from './deck-store';

2
packages/client/src/ui/deckold/tl-column.vue
View File

@ -22,7 +22,7 @@
<script lang="ts" setup> <script lang="ts" setup>
import { onMounted } from 'vue'; import { onMounted } from 'vue';
import XColumn from './column.vue'; import XColumn from './column.vue';
import XTimeline from '@/components/MKTimeline.vue'; import XTimeline from '@/components/MkTimeline.vue';
import * as os from '@/os'; import * as os from '@/os';
import { removeColumn, updateColumn, Column } from './deck-store'; import { removeColumn, updateColumn, Column } from './deck-store';
import { $i } from '@/account'; import { $i } from '@/account';

2
packages/client/src/ui/deckold/widgets-column.vue
View File

@ -13,7 +13,7 @@
import { } from 'vue'; import { } from 'vue';
import XColumn from './column.vue'; import XColumn from './column.vue';
import { addColumnWidget, Column, removeColumnWidget, setColumnWidgets, updateColumnWidget } from './deck-store'; import { addColumnWidget, Column, removeColumnWidget, setColumnWidgets, updateColumnWidget } from './deck-store';
import XWidgets from '@/components/MKWidgets.vue'; import XWidgets from '@/components/MkWidgets.vue';
import { i18n } from '@/i18n'; import { i18n } from '@/i18n';
const props = defineProps<{ const props = defineProps<{