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/theme.ts | |
| 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/scripts/theme.ts')
| -rw-r--r-- | packages/client/src/scripts/theme.ts | 38 |
1 files changed, 19 insertions, 19 deletions
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; |