diff options
| author | tamaina <tamaina@hotmail.co.jp> | 2022-05-01 22:51:07 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-01 22:51:07 +0900 |
| commit | a89003b57a27379f056e4f1be907e41e91b7b598 (patch) | |
| tree | 17dce756b9011254237713abbfda2fe2347a4393 /packages/client/src/components | |
| parent | fix _misskey_content of quote renotes (#8533) (diff) | |
| download | misskey-a89003b57a27379f056e4f1be907e41e91b7b598.tar.gz misskey-a89003b57a27379f056e4f1be907e41e91b7b598.tar.bz2 misskey-a89003b57a27379f056e4f1be907e41e91b7b598.zip | |
refactor: use Vite to build instead of webpack (#8575)
* update stream.ts
* https://github.com/misskey-dev/misskey/pull/7769#issuecomment-917542339
* fix lint
* clean up?
* add app
* fix
* nanka iroiro
* wip
* wip
* fix lint
* fix loginId
* fix
* refactor
* refactor
* remove follow action
* clean up
* Revert "remove follow action"
This reverts commit defbb416480905af2150d1c92f10d8e1d1288c0a.
* Revert "clean up"
This reverts commit f94919cb9cff41e274044fc69c56ad36a33974f2.
* remove fetch specification
* renoteの条件追加
* apiFetch => cli
* bypass fetch?
* fix
* refactor: use path alias
* temp: add submodule
* remove submodule
* enhane: unison-reloadに指定したパスに移動できるように
* null
* null
* feat: ログインするアカウントのIDをクエリ文字列で指定する機能
* null
* await?
* rename
* rename
* Update read.ts
* merge
* get-note-summary
* fix
* swパッケージに
* add missing packages
* fix getNoteSummary
* add webpack-cli
* :v:
* remove plugins
* sw-inject分離したがテストしてない
* fix notification.vue
* remove a blank line
* disconnect intersection observer
* disconnect2
* fix notification.vue
* remove a blank line
* disconnect intersection observer
* disconnect2
* fix
* :v:
* clean up config
* typesを戻した
* Update packages/client/src/components/notification.vue
Co-authored-by: Acid Chicken (硫酸鶏) <root@acid-chicken.com>
* disconnect
* oops
* Failed to load the script unexpectedly回避
sw.jsとlib.tsを分離してみた
* truncate notification
* Update packages/client/src/ui/_common_/common.vue
Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
* clean up
* clean up
* キャッシュ対策
* Truncate push notification message
* クライアントがあったらストリームに接続しているということなので通知しない判定の位置を修正
* components/drive-file-thumbnail.vue
* components/drive-select-dialog.vue
* components/drive-window.vue
* merge
* fix
* Service Workerのビルドにesbuildを使うようにする
* return createEmptyNotification()
* fix
* i18n.ts
* update
* :v:
* remove ts-loader
* fix
* fix
* enhance: Service Workerを常に登録するように
* pollEnded
* URLをsw.jsに戻す
* clean up
* wip
* wip
* wip
* wip
* wip
* wip
* :v:
* use import
* fix
* install rollup
* use defineAsyncComponent.
* fix emojilist
* wip use defineAsyncComponent
* popup(import -> popup(defineAsyncComponent(() => import
* draggable?
* fix init import
* clean up
* fix router
* add comment
* :v:
* :v:
* :v:
* remove webpack
* update vite
* fix boot sequence
* Revert "fix boot sequence"
This reverts commit e893dbf37aed83bf9f12e427d98c78a7065b4a39.
* revert boot import
* never make two app div
* ;
* remove console.log
* change clientEntry sequence
* fix
* Revert "fix"
This reverts commit 12741b3d89950a31dbb1bb81477ddb27b0e9951a.
* fix
* add comment https://github.com/misskey-dev/misskey/pull/8575#issuecomment-1114239210
* add log
* add comment
Co-authored-by: Acid Chicken (硫酸鶏) <root@acid-chicken.com>
Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
Diffstat (limited to 'packages/client/src/components')
| -rw-r--r-- | packages/client/src/components/abuse-report.vue | 8 | ||||
| -rw-r--r-- | packages/client/src/components/analog-clock.vue | 2 | ||||
| -rw-r--r-- | packages/client/src/components/chart.vue | 12 | ||||
| -rw-r--r-- | packages/client/src/components/drive.file.vue | 4 | ||||
| -rw-r--r-- | packages/client/src/components/drive.folder.vue | 4 | ||||
| -rw-r--r-- | packages/client/src/components/emoji-picker.vue | 2 | ||||
| -rw-r--r-- | packages/client/src/components/form/range.vue | 4 | ||||
| -rw-r--r-- | packages/client/src/components/global/header.vue | 2 | ||||
| -rw-r--r-- | packages/client/src/components/global/url.vue | 4 | ||||
| -rw-r--r-- | packages/client/src/components/link.vue | 4 | ||||
| -rw-r--r-- | packages/client/src/components/mention.vue | 2 | ||||
| -rw-r--r-- | packages/client/src/components/post-form-attaches.vue | 2 | ||||
| -rw-r--r-- | packages/client/src/components/post-form.vue | 4 | ||||
| -rw-r--r-- | packages/client/src/components/signin.vue | 4 | ||||
| -rw-r--r-- | packages/client/src/components/signup.vue | 2 | ||||
| -rw-r--r-- | packages/client/src/components/ui/folder.vue | 2 | ||||
| -rw-r--r-- | packages/client/src/components/widgets.vue | 2 |
17 files changed, 33 insertions, 31 deletions
diff --git a/packages/client/src/components/abuse-report.vue b/packages/client/src/components/abuse-report.vue index b67cef209b..46d45b690f 100644 --- a/packages/client/src/components/abuse-report.vue +++ b/packages/client/src/components/abuse-report.vue @@ -43,20 +43,20 @@ export default defineComponent({ MkSwitch, }, - emits: ['resolved'], - props: { report: { type: Object, required: true, } - } + }, + + emits: ['resolved'], data() { return { forward: this.report.forwarded, }; - } + }, methods: { acct, diff --git a/packages/client/src/components/analog-clock.vue b/packages/client/src/components/analog-clock.vue index 59b8e97304..18dd1e3f41 100644 --- a/packages/client/src/components/analog-clock.vue +++ b/packages/client/src/components/analog-clock.vue @@ -42,7 +42,7 @@ <script lang="ts" setup> import { ref, computed, onMounted, onBeforeUnmount } from 'vue'; -import * as tinycolor from 'tinycolor2'; +import tinycolor from 'tinycolor2'; withDefaults(defineProps<{ thickness: number; diff --git a/packages/client/src/components/chart.vue b/packages/client/src/components/chart.vue index cc1aa9c20a..a7d5206c71 100644 --- a/packages/client/src/components/chart.vue +++ b/packages/client/src/components/chart.vue @@ -29,7 +29,9 @@ import { import 'chartjs-adapter-date-fns'; import { enUS } from 'date-fns/locale'; import zoomPlugin from 'chartjs-plugin-zoom'; -import gradient from 'chartjs-plugin-gradient'; +// https://github.com/misskey-dev/misskey/pull/8575#issuecomment-1114242002 +// We can't use gradient because Vite throws a error. +//import gradient from 'chartjs-plugin-gradient'; import * as os from '@/os'; import { defaultStore } from '@/store'; import MkChartTooltip from '@/components/chart-tooltip.vue'; @@ -50,7 +52,7 @@ Chart.register( SubTitle, Filler, zoomPlugin, - gradient, + //gradient, ); const sum = (...arr) => arr.reduce((r, a) => r.map((b, i) => a[i] + b)); @@ -221,7 +223,7 @@ export default defineComponent({ borderJoinStyle: 'round', borderRadius: props.bar ? 3 : undefined, backgroundColor: props.bar ? (x.color ? x.color : getColor(i)) : alpha(x.color ? x.color : getColor(i), 0.1), - gradient: props.bar ? undefined : { + /*gradient: props.bar ? undefined : { backgroundColor: { axis: 'y', colors: { @@ -229,7 +231,7 @@ export default defineComponent({ [maxes[i]]: alpha(x.color ? x.color : getColor(i), 0.2), }, }, - }, + },*/ barPercentage: 0.9, categoryPercentage: 0.9, fill: x.type === 'area', @@ -340,7 +342,7 @@ export default defineComponent({ }, } } : undefined, - gradient, + //gradient, }, }, plugins: [{ diff --git a/packages/client/src/components/drive.file.vue b/packages/client/src/components/drive.file.vue index 262eae0de1..e2f78a84ec 100644 --- a/packages/client/src/components/drive.file.vue +++ b/packages/client/src/components/drive.file.vue @@ -31,7 +31,7 @@ </template> <script lang="ts" setup> -import { computed, ref } from 'vue'; +import { computed, defineAsyncComponent, ref } from 'vue'; import * as Misskey from 'misskey-js'; import copyToClipboard from '@/scripts/copy-to-clipboard'; import MkDriveFileThumbnail from './drive-file-thumbnail.vue'; @@ -133,7 +133,7 @@ function rename() { } function describe() { - os.popup(import('@/components/media-caption.vue'), { + os.popup(defineAsyncComponent(() => import('@/components/media-caption.vue')), { title: i18n.ts.describeFile, input: { placeholder: i18n.ts.inputNewDescription, diff --git a/packages/client/src/components/drive.folder.vue b/packages/client/src/components/drive.folder.vue index 57621bf097..e7003a8074 100644 --- a/packages/client/src/components/drive.folder.vue +++ b/packages/client/src/components/drive.folder.vue @@ -27,7 +27,7 @@ </template> <script lang="ts" setup> -import { computed, ref } from 'vue'; +import { computed, defineAsyncComponent, ref } from 'vue'; import * as Misskey from 'misskey-js'; import * as os from '@/os'; import { i18n } from '@/i18n'; @@ -230,7 +230,7 @@ function onContextmenu(ev: MouseEvent) { text: i18n.ts.openInWindow, icon: 'fas fa-window-restore', action: () => { - os.popup(import('./drive-window.vue'), { + os.popup(defineAsyncComponent(() => import('./drive-window.vue')), { initialFolder: props.folder }, { }, 'closed'); diff --git a/packages/client/src/components/emoji-picker.vue b/packages/client/src/components/emoji-picker.vue index 8601ea121c..ae74f04c02 100644 --- a/packages/client/src/components/emoji-picker.vue +++ b/packages/client/src/components/emoji-picker.vue @@ -61,7 +61,7 @@ </div> <div> <header class="_acrylic">{{ i18n.ts.emoji }}</header> - <XSection v-for="category in categories" :emojis="emojilist.filter(e => e.category === category).map(e => e.char)" @chosen="chosen">{{ category }}</XSection> + <XSection v-for="category in categories" :key="category" :emojis="emojilist.filter(e => e.category === category).map(e => e.char)" @chosen="chosen">{{ category }}</XSection> </div> </div> <div class="tabs"> diff --git a/packages/client/src/components/form/range.vue b/packages/client/src/components/form/range.vue index a82348d317..07f2c23124 100644 --- a/packages/client/src/components/form/range.vue +++ b/packages/client/src/components/form/range.vue @@ -16,7 +16,7 @@ </template> <script lang="ts"> -import { computed, defineComponent, onMounted, onUnmounted, ref, watch } from 'vue'; +import { computed, defineAsyncComponent, defineComponent, onMounted, onUnmounted, ref, watch } from 'vue'; import * as os from '@/os'; export default defineComponent({ @@ -112,7 +112,7 @@ export default defineComponent({ ev.preventDefault(); const tooltipShowing = ref(true); - os.popup(import('@/components/ui/tooltip.vue'), { + os.popup(defineAsyncComponent(() => import('@/components/ui/tooltip.vue')), { showing: tooltipShowing, text: computed(() => { return props.textConverter(finalValue.value); diff --git a/packages/client/src/components/global/header.vue b/packages/client/src/components/global/header.vue index e558614c12..63db19a520 100644 --- a/packages/client/src/components/global/header.vue +++ b/packages/client/src/components/global/header.vue @@ -38,7 +38,7 @@ <script lang="ts"> import { computed, defineComponent, onMounted, onUnmounted, PropType, ref, inject } from 'vue'; -import * as tinycolor from 'tinycolor2'; +import tinycolor from 'tinycolor2'; import { popupMenu } from '@/os'; import { url } from '@/config'; import { scrollToTop } from '@/scripts/scroll'; diff --git a/packages/client/src/components/global/url.vue b/packages/client/src/components/global/url.vue index 55f6c5d5f9..34ba9024cc 100644 --- a/packages/client/src/components/global/url.vue +++ b/packages/client/src/components/global/url.vue @@ -18,7 +18,7 @@ </template> <script lang="ts"> -import { defineComponent, ref } from 'vue'; +import { defineAsyncComponent, defineComponent, ref } from 'vue'; import { toUnicode as decodePunycode } from 'punycode/'; import { url as local } from '@/config'; import * as os from '@/os'; @@ -50,7 +50,7 @@ export default defineComponent({ const el = ref(); useTooltip(el, (showing) => { - os.popup(import('@/components/url-preview-popup.vue'), { + os.popup(defineAsyncComponent(() => import('@/components/url-preview-popup.vue')), { showing, url: props.url, source: el.value, diff --git a/packages/client/src/components/link.vue b/packages/client/src/components/link.vue index 317c931cec..846a9a3a76 100644 --- a/packages/client/src/components/link.vue +++ b/packages/client/src/components/link.vue @@ -8,7 +8,7 @@ </template> <script lang="ts" setup> -import { } from 'vue'; +import { defineAsyncComponent } from 'vue'; import { url as local } from '@/config'; import { useTooltip } from '@/scripts/use-tooltip'; import * as os from '@/os'; @@ -26,7 +26,7 @@ const target = self ? null : '_blank'; const el = $ref(); useTooltip($$(el), (showing) => { - os.popup(import('@/components/url-preview-popup.vue'), { + os.popup(defineAsyncComponent(() => import('@/components/url-preview-popup.vue')), { showing, url: props.url, source: el, diff --git a/packages/client/src/components/mention.vue b/packages/client/src/components/mention.vue index 479acfbc8f..39a333c5e8 100644 --- a/packages/client/src/components/mention.vue +++ b/packages/client/src/components/mention.vue @@ -16,7 +16,7 @@ <script lang="ts"> import { defineComponent } from 'vue'; -import * as tinycolor from 'tinycolor2'; +import tinycolor from 'tinycolor2'; import { toUnicode } from 'punycode'; import { host as localHost } from '@/config'; import { $i } from '@/account'; diff --git a/packages/client/src/components/post-form-attaches.vue b/packages/client/src/components/post-form-attaches.vue index 9dd69a0ee5..47e2e6ce0f 100644 --- a/packages/client/src/components/post-form-attaches.vue +++ b/packages/client/src/components/post-form-attaches.vue @@ -88,7 +88,7 @@ export default defineComponent({ }, async describe(file) { - os.popup(import("@/components/media-caption.vue"), { + os.popup(defineAsyncComponent(() => import("@/components/media-caption.vue")), { title: this.$ts.describeFile, input: { placeholder: this.$ts.inputNewDescription, diff --git a/packages/client/src/components/post-form.vue b/packages/client/src/components/post-form.vue index 241c726c11..6d79736003 100644 --- a/packages/client/src/components/post-form.vue +++ b/packages/client/src/components/post-form.vue @@ -62,7 +62,7 @@ </template> <script lang="ts" setup> -import { inject, watch, nextTick, onMounted } from 'vue'; +import { inject, watch, nextTick, onMounted, defineAsyncComponent } from 'vue'; import * as mfm from 'mfm-js'; import * as misskey from 'misskey-js'; import insertTextAtCursor from 'insert-text-at-cursor'; @@ -384,7 +384,7 @@ function setVisibility() { return; } - os.popup(import('./visibility-picker.vue'), { + os.popup(defineAsyncComponent(() => import('./visibility-picker.vue')), { currentVisibility: visibility, currentLocalOnly: localOnly, src: visibilityButton, diff --git a/packages/client/src/components/signin.vue b/packages/client/src/components/signin.vue index f640e948ad..bdf247a56f 100644 --- a/packages/client/src/components/signin.vue +++ b/packages/client/src/components/signin.vue @@ -46,7 +46,7 @@ </template> <script lang="ts"> -import { defineComponent } from 'vue'; +import { defineAsyncComponent, defineComponent } from 'vue'; import { toUnicode } from 'punycode/'; import MkButton from '@/components/ui/button.vue'; import MkInput from '@/components/form/input.vue'; @@ -224,7 +224,7 @@ export default defineComponent({ }, resetPassword() { - os.popup(import('@/components/forgot-password.vue'), {}, { + os.popup(defineAsyncComponent(() => import('@/components/forgot-password.vue')), {}, { }, 'closed'); } } diff --git a/packages/client/src/components/signup.vue b/packages/client/src/components/signup.vue index 38a9fd55f1..62f370ffa8 100644 --- a/packages/client/src/components/signup.vue +++ b/packages/client/src/components/signup.vue @@ -67,7 +67,7 @@ <script lang="ts"> import { defineComponent, defineAsyncComponent } from 'vue'; -const getPasswordStrength = require('syuilo-password-strength'); +const getPasswordStrength = await import('syuilo-password-strength'); import { toUnicode } from 'punycode/'; import { host, url } from '@/config'; import MkButton from './ui/button.vue'; diff --git a/packages/client/src/components/ui/folder.vue b/packages/client/src/components/ui/folder.vue index fe1602b2bb..7daa82cbd3 100644 --- a/packages/client/src/components/ui/folder.vue +++ b/packages/client/src/components/ui/folder.vue @@ -23,7 +23,7 @@ <script lang="ts"> import { defineComponent } from 'vue'; -import * as tinycolor from 'tinycolor2'; +import tinycolor from 'tinycolor2'; const localStoragePrefix = 'ui:folder:'; diff --git a/packages/client/src/components/widgets.vue b/packages/client/src/components/widgets.vue index da9d935281..6e4122427b 100644 --- a/packages/client/src/components/widgets.vue +++ b/packages/client/src/components/widgets.vue @@ -37,7 +37,7 @@ import { widgets as widgetDefs } from '@/widgets'; export default defineComponent({ components: { - XDraggable: defineAsyncComponent(() => import('vuedraggable').then(x => x.default)), + XDraggable: defineAsyncComponent(() => import('vuedraggable')), MkSelect, MkButton, }, |