Mizah/mizzkey
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'misskey-dev/develop' into prismisskey

Browse source 
# Conflicts:
#	CHANGELOG.md
#	package.json
#	packages/frontend/src/components/MkInstanceTicker.vue
#	packages/frontend/src/components/global/MkMisskeyFlavoredMarkdown.ts
#	packages/frontend/src/pages/about.vue
#	packages/frontend/src/pages/settings/theme.vue
#	packages/frontend/src/pages/timeline.vue
#	packages/frontend/src/ui/_common_/navbar-for-mobile.vue
#	packages/frontend/src/ui/_common_/navbar.vue
#	packages/frontend/src/ui/universal.vue
#	packages/frontend/src/widgets/WidgetInstanceInfo.vue
This commit is contained in:
mattyatea 2023-09-21 00:20:12 +09:00
commit d9db4449b4
699 changed files with 3682 additions and 3610 deletions
Download patch file Download diff file Expand all files Collapse all files

49
packages/frontend/package.json
View file

@ -1,6 +1,7 @@
{
"name": "frontend",
"private": true,
"type": "module",
"scripts": {
"watch": "vite",
"build": "vite build",
@ -37,7 +38,7 @@
"chartjs-chart-matrix": "2.0.1",
"chartjs-plugin-gradient": "0.6.1",
"chartjs-plugin-zoom": "2.0.1",
"chromatic": "7.1.0",
"chromatic": "7.2.0",
"compare-versions": "6.1.0",
"cropperjs": "2.0.0-beta.4",
"date-fns": "2.30.0",
@ -52,11 +53,11 @@
"matter-js": "0.19.0",
"mfm-js": "0.23.3",
"misskey-js": "workspace:*",
"photoswipe": "5.4.0",
"photoswipe": "5.4.1",
"prismjs": "1.29.0",
"punycode": "2.3.0",
"querystring": "0.2.1",
"rollup": "3.29.1",
"rollup": "3.29.2",
"sanitize-html": "2.11.0",
"sass": "1.67.0",
"strict-event-emitter-types": "2.0.0",
@ -76,30 +77,30 @@
"vuedraggable": "next"
},
"devDependencies": {
"@storybook/addon-actions": "7.4.1",
"@storybook/addon-essentials": "7.4.1",
"@storybook/addon-interactions": "7.4.1",
"@storybook/addon-links": "7.4.1",
"@storybook/addon-storysource": "7.4.1",
"@storybook/addons": "7.4.1",
"@storybook/blocks": "7.4.1",
"@storybook/core-events": "7.4.1",
"@storybook/addon-actions": "7.4.2",
"@storybook/addon-essentials": "7.4.2",
"@storybook/addon-interactions": "7.4.2",
"@storybook/addon-links": "7.4.2",
"@storybook/addon-storysource": "7.4.2",
"@storybook/addons": "7.4.2",
"@storybook/blocks": "7.4.2",
"@storybook/core-events": "7.4.2",
"@storybook/jest": "0.2.2",
"@storybook/manager-api": "7.4.1",
"@storybook/preview-api": "7.4.1",
"@storybook/react": "7.4.1",
"@storybook/react-vite": "7.4.1",
"@storybook/testing-library": "0.2.0",
"@storybook/theming": "7.4.1",
"@storybook/types": "7.4.1",
"@storybook/vue3": "7.4.1",
"@storybook/vue3-vite": "7.4.1",
"@storybook/manager-api": "7.4.2",
"@storybook/preview-api": "7.4.2",
"@storybook/react": "7.4.2",
"@storybook/react-vite": "7.4.2",
"@storybook/testing-library": "0.2.1",
"@storybook/theming": "7.4.2",
"@storybook/types": "7.4.2",
"@storybook/vue3": "7.4.2",
"@storybook/vue3-vite": "7.4.2",
"@testing-library/vue": "7.0.0",
"@types/escape-regexp": "0.0.1",
"@types/estree": "1.0.1",
"@types/matter-js": "0.19.0",
"@types/micromatch": "4.0.2",
"@types/node": "20.6.0",
"@types/node": "20.6.3",
"@types/punycode": "2.1.0",
"@types/sanitize-html": "2.9.0",
"@types/throttle-debounce": "5.0.0",
@ -107,8 +108,8 @@
"@types/uuid": "9.0.4",
"@types/websocket": "1.0.6",
"@types/ws": "8.5.5",
"@typescript-eslint/eslint-plugin": "6.7.0",
"@typescript-eslint/parser": "6.7.0",
"@typescript-eslint/eslint-plugin": "6.7.2",
"@typescript-eslint/parser": "6.7.2",
"@vitest/coverage-v8": "0.34.4",
"@vue/runtime-core": "3.3.4",
"acorn": "8.10.0",
@ -127,7 +128,7 @@
"react": "18.2.0",
"react-dom": "18.2.0",
"start-server-and-test": "2.0.0",
"storybook": "7.4.1",
"storybook": "7.4.2",
"storybook-addon-misskey-theme": "github:misskey-dev/storybook-addon-misskey-theme",
"summaly": "github:misskey-dev/summaly",
"vite-plugin-compression2": "^0.10.4",