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/scripts | |
| parent | fix _misskey_content of quote renotes (#8533) (diff) | |
| download | sharkey-a89003b57a27379f056e4f1be907e41e91b7b598.tar.gz sharkey-a89003b57a27379f056e4f1be907e41e91b7b598.tar.bz2 sharkey-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/scripts')
| -rw-r--r-- | packages/client/src/scripts/autocomplete.ts | 6 | ||||
| -rw-r--r-- | packages/client/src/scripts/emojilist.ts | 2 | ||||
| -rw-r--r-- | packages/client/src/scripts/get-note-menu.ts | 4 | ||||
| -rw-r--r-- | packages/client/src/scripts/get-user-menu.ts | 3 | ||||
| -rw-r--r-- | packages/client/src/scripts/hpml/lib.ts | 4 | ||||
| -rw-r--r-- | packages/client/src/scripts/reaction-picker.ts | 4 | ||||
| -rw-r--r-- | packages/client/src/scripts/theme.ts | 38 |
7 files changed, 31 insertions, 30 deletions
diff --git a/packages/client/src/scripts/autocomplete.ts b/packages/client/src/scripts/autocomplete.ts index f4a3a4c0fc..bf60e5805a 100644 --- a/packages/client/src/scripts/autocomplete.ts +++ b/packages/client/src/scripts/autocomplete.ts @@ -1,5 +1,5 @@ -import { nextTick, Ref, ref } from 'vue'; -import * as getCaretCoordinates from 'textarea-caret'; +import { nextTick, Ref, ref, defineAsyncComponent } from 'vue'; +import getCaretCoordinates from 'textarea-caret'; import { toASCII } from 'punycode/'; import { popup } from '@/os'; @@ -157,7 +157,7 @@ export class Autocomplete { const _y = ref(y); const _q = ref(q); - const { dispose } = await popup(import('@/components/autocomplete.vue'), { + const { dispose } = await popup(defineAsyncComponent(() => import('@/components/autocomplete.vue')), { textarea: this.textarea, close: this.close, type: type, diff --git a/packages/client/src/scripts/emojilist.ts b/packages/client/src/scripts/emojilist.ts index bd8689e4f8..4196170d24 100644 --- a/packages/client/src/scripts/emojilist.ts +++ b/packages/client/src/scripts/emojilist.ts @@ -8,4 +8,4 @@ export type UnicodeEmojiDef = { } // initial converted from https://github.com/muan/emojilib/commit/242fe68be86ed6536843b83f7e32f376468b38fb -export const emojilist = require('../emojilist.json') as UnicodeEmojiDef[]; +export const emojilist = (await import('../emojilist.json')).default as UnicodeEmojiDef[]; diff --git a/packages/client/src/scripts/get-note-menu.ts b/packages/client/src/scripts/get-note-menu.ts index b19656d3cc..a50001b24e 100644 --- a/packages/client/src/scripts/get-note-menu.ts +++ b/packages/client/src/scripts/get-note-menu.ts @@ -1,4 +1,4 @@ -import { Ref } from 'vue'; +import { defineAsyncComponent, Ref } from 'vue'; import * as misskey from 'misskey-js'; import { $i } from '@/account'; import { i18n } from '@/i18n'; @@ -253,7 +253,7 @@ export function getNoteMenu(props: { text: i18n.ts.reportAbuse, action: () => { const u = appearNote.url || appearNote.uri || `${url}/notes/${appearNote.id}`; - os.popup(import('@/components/abuse-report-window.vue'), { + os.popup(defineAsyncComponent(() => import('@/components/abuse-report-window.vue')), { user: appearNote.user, initialComment: `Note: ${u}\n-----\n` }, {}, 'closed'); diff --git a/packages/client/src/scripts/get-user-menu.ts b/packages/client/src/scripts/get-user-menu.ts index 192d14b83e..b9e4066e42 100644 --- a/packages/client/src/scripts/get-user-menu.ts +++ b/packages/client/src/scripts/get-user-menu.ts @@ -6,6 +6,7 @@ import * as os from '@/os'; import { userActions } from '@/store'; import { router } from '@/router'; import { $i, iAmModerator } from '@/account'; +import { defineAsyncComponent } from 'vue'; export function getUserMenu(user) { const meId = $i ? $i.id : null; @@ -127,7 +128,7 @@ export function getUserMenu(user) { } function reportAbuse() { - os.popup(import('@/components/abuse-report-window.vue'), { + os.popup(defineAsyncComponent(() => import('@/components/abuse-report-window.vue')), { user: user, }, {}, 'closed'); } diff --git a/packages/client/src/scripts/hpml/lib.ts b/packages/client/src/scripts/hpml/lib.ts index 2a1ac73a40..01a44ffcdf 100644 --- a/packages/client/src/scripts/hpml/lib.ts +++ b/packages/client/src/scripts/hpml/lib.ts @@ -1,9 +1,9 @@ -import * as tinycolor from 'tinycolor2'; +import tinycolor from 'tinycolor2'; import { Hpml } from './evaluator'; import { values, utils } from '@syuilo/aiscript'; import { Fn, HpmlScope } from '.'; import { Expr } from './expr'; -import * as seedrandom from 'seedrandom'; +import seedrandom from 'seedrandom'; /* TODO: https://www.chartjs.org/docs/latest/configuration/canvas-background.html#color // https://stackoverflow.com/questions/38493564/chart-area-background-color-chartjs diff --git a/packages/client/src/scripts/reaction-picker.ts b/packages/client/src/scripts/reaction-picker.ts index 3ac1f63430..b7699cae4a 100644 --- a/packages/client/src/scripts/reaction-picker.ts +++ b/packages/client/src/scripts/reaction-picker.ts @@ -1,4 +1,4 @@ -import { Ref, ref } from 'vue'; +import { defineAsyncComponent, Ref, ref } from 'vue'; import { popup } from '@/os'; class ReactionPicker { @@ -12,7 +12,7 @@ class ReactionPicker { } public async init() { - await popup(import('@/components/emoji-picker-dialog.vue'), { + await popup(defineAsyncComponent(() => import('@/components/emoji-picker-dialog.vue')), { src: this.src, asReactionPicker: true, manualShowing: this.manualShowing diff --git a/packages/client/src/scripts/theme.ts b/packages/client/src/scripts/theme.ts index 2cb78fae5c..b61b1684a8 100644 --- a/packages/client/src/scripts/theme.ts +++ b/packages/client/src/scripts/theme.ts @@ -1,5 +1,5 @@ import { globalEvents } from '@/events'; -import * as tinycolor from 'tinycolor2'; +import tinycolor from 'tinycolor2'; export type Theme = { id: string; @@ -10,29 +10,29 @@ export type Theme = { props: Record<string, string>; }; -export const lightTheme: Theme = require('@/themes/_light.json5'); -export const darkTheme: Theme = require('@/themes/_dark.json5'); +export const lightTheme: Theme = await import('@/themes/_light.json5'); +export const darkTheme: Theme = await import('@/themes/_dark.json5'); export const themeProps = Object.keys(lightTheme.props).filter(key => !key.startsWith('X')); export const builtinThemes = [ - require('@/themes/l-light.json5'), - require('@/themes/l-coffee.json5'), - require('@/themes/l-apricot.json5'), - require('@/themes/l-rainy.json5'), - require('@/themes/l-vivid.json5'), - require('@/themes/l-cherry.json5'), - require('@/themes/l-sushi.json5'), + await import('@/themes/l-light.json5'), + await import('@/themes/l-coffee.json5'), + await import('@/themes/l-apricot.json5'), + await import('@/themes/l-rainy.json5'), + await import('@/themes/l-vivid.json5'), + await import('@/themes/l-cherry.json5'), + await import('@/themes/l-sushi.json5'), - require('@/themes/d-dark.json5'), - require('@/themes/d-persimmon.json5'), - require('@/themes/d-astro.json5'), - require('@/themes/d-future.json5'), - require('@/themes/d-botanical.json5'), - require('@/themes/d-cherry.json5'), - require('@/themes/d-ice.json5'), - require('@/themes/d-pumpkin.json5'), - require('@/themes/d-black.json5'), + await import('@/themes/d-dark.json5'), + await import('@/themes/d-persimmon.json5'), + await import('@/themes/d-astro.json5'), + await import('@/themes/d-future.json5'), + await import('@/themes/d-botanical.json5'), + await import('@/themes/d-cherry.json5'), + await import('@/themes/d-ice.json5'), + await import('@/themes/d-pumpkin.json5'), + await import('@/themes/d-black.json5'), ] as Theme[]; let timeout = null; |