Skip to content

Commit c2d8759

Browse files
acid-chickenacid-chicken
committed
build(#10336): update dependencies
1 parent bf5fff8 commit c2d8759

File tree

435 files changed

+6893
-2952
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

435 files changed

+6893
-2952
lines changed

‎packages/frontend/.storybook/generate.tsx

+105-41
Original file line numberDiff line numberDiff line change
@@ -305,30 +305,6 @@ function toStories(component: string): string {
305305
(
306306
<identifier name='args' />
307307
) as estree.Identifier,
308-
(
309-
<object-pattern
310-
properties={[
311-
(
312-
<property
313-
key={
314-
(
315-
<identifier name='argTypes' />
316-
) as estree.Identifier
317-
}
318-
value={
319-
(
320-
<identifier name='argTypes' />
321-
) as estree.Identifier
322-
}
323-
kind={
324-
'init' as const
325-
}
326-
shorthand
327-
/>
328-
) as estree.AssignmentProperty,
329-
]}
330-
/>
331-
) as estree.ObjectPattern,
332308
]}
333309
body={
334310
(
@@ -378,35 +354,123 @@ function toStories(component: string): string {
378354
<property
379355
key={
380356
(
381-
<identifier name='props' />
357+
<identifier name='setup' />
358+
) as estree.Identifier
359+
}
360+
value={
361+
(
362+
<function-expression
363+
params={[]}
364+
body={
365+
(
366+
<block-statement
367+
body={[
368+
(
369+
<return-statement
370+
argument={
371+
(
372+
<object-expression
373+
properties={[
374+
(
375+
<property
376+
key={
377+
(
378+
<identifier name='args' />
379+
) as estree.Identifier
380+
}
381+
value={
382+
(
383+
<identifier name='args' />
384+
) as estree.Identifier
385+
}
386+
kind={
387+
'init' as const
388+
}
389+
shorthand
390+
/>
391+
) as estree.Property,
392+
]}
393+
/>
394+
) as estree.ObjectExpression
395+
}
396+
/>
397+
) as estree.ReturnStatement,
398+
]}
399+
/>
400+
) as estree.BlockStatement
401+
}
402+
/>
403+
) as estree.FunctionExpression
404+
}
405+
method
406+
kind={
407+
'init' as const
408+
}
409+
/>
410+
) as estree.Property,
411+
(
412+
<property
413+
key={
414+
(
415+
<identifier name='computed' />
382416
) as estree.Identifier
383417
}
384418
value={
385419
(
386-
<call-expression
387-
callee={
420+
<object-expression
421+
properties={[
388422
(
389-
<member-expression
390-
object={
423+
<property
424+
key={
391425
(
392-
<identifier name='Object' />
426+
<identifier name='props' />
393427
) as estree.Identifier
394428
}
395-
property={
429+
value={
396430
(
397-
<identifier name='keys' />
398-
) as estree.Identifier
431+
<function-expression
432+
params={[]}
433+
body={
434+
(
435+
<block-statement
436+
body={[
437+
(
438+
<return-statement
439+
argument={
440+
(
441+
<object-expression
442+
properties={[
443+
(
444+
<spread-element
445+
argument={
446+
(
447+
<identifier name='args' />
448+
) as estree.Identifier
449+
}
450+
/>
451+
) as estree.SpreadElement,
452+
]}
453+
/>
454+
) as estree.ObjectExpression
455+
}
456+
/>
457+
) as estree.ReturnStatement,
458+
]}
459+
/>
460+
) as estree.BlockStatement
461+
}
462+
/>
463+
) as estree.FunctionExpression
464+
}
465+
method
466+
kind={
467+
'init' as const
399468
}
400469
/>
401-
) as estree.MemberExpression
402-
}
403-
arguments={[
404-
(
405-
<identifier name='argTypes' />
406-
) as estree.Identifier,
470+
) as estree.Property,
407471
]}
408472
/>
409-
) as estree.CallExpression
473+
) as estree.ObjectExpression
410474
}
411475
kind={
412476
'init' as const
@@ -423,7 +487,7 @@ function toStories(component: string): string {
423487
value={
424488
(
425489
<literal
426-
value={`<${identifier.name} v-bind="$props" />`}
490+
value={`<${identifier.name} v-bind="props" />`}
427491
/>
428492
) as estree.Literal
429493
}

‎packages/frontend/.storybook/main.ts

+6
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ const config = {
88
'@storybook/addon-links',
99
'@storybook/addon-essentials',
1010
'@storybook/addon-interactions',
11+
'@storybook/addon-storysource',
1112
'../node_modules/storybook-addon-misskey-theme',
1213
],
1314
framework: {
@@ -22,10 +23,15 @@ const config = {
2223
},
2324
async viteFinal(config, options) {
2425
const { plugins, build: { rollupOptions, ...build }, ...original } = getConfig();
26+
console.dir(config, {depth:Infinity});
27+
console.dir(original, {depth:Infinity});
2528
const x = mergeConfig(config, {
2629
...original,
2730
build,
2831
assetsInclude: [resolve(__dirname, '../node_modules/@tabler/icons-webfont/**/*.{css,eot,ttf,woff,woff2}')],
32+
server: {
33+
hmr: false,
34+
},
2935
});
3036
return x;
3137
},

‎packages/frontend/.storybook/preview.ts

+15-6
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,18 @@
11
import { addons } from '@storybook/addons';
22
import { FORCE_REMOUNT } from '@storybook/core-events';
3-
import { type Preview, forceReRender, setup } from '@storybook/vue3';
3+
import { type Preview, setup } from '@storybook/vue3';
44
import { initialize, mswDecorator } from 'msw-storybook-addon';
55
import locale from './locale';
66
import { commonHandlers, onUnhandledRequest } from './mocks';
77
import themes from './themes';
88
import '../src/style.scss';
99

10-
let initialized = false;
10+
// TODO: HMR が壊れているのを直す
11+
import.meta.hot.invalidate();
12+
13+
const appInitialized = Symbol();
14+
15+
let moduleInitialized = false;
1116
let unobserve = () => {};
1217

1318
function loadTheme(applyTheme: typeof import('../src/scripts/theme')['applyTheme']) {
@@ -48,7 +53,11 @@ queueMicrotask(() => {
4853
import('../src/scripts/theme'),
4954
]).then(([{ default: components }, { default: directives }, { default: widgets }, { applyTheme }]) => {
5055
setup((app) => {
51-
initialized = true;
56+
moduleInitialized = true;
57+
if (app[appInitialized]) {
58+
return;
59+
}
60+
app[appInitialized] = true;
5261
loadTheme(applyTheme);
5362
components(app);
5463
directives(app);
@@ -59,17 +68,17 @@ queueMicrotask(() => {
5968

6069
const preview = {
6170
decorators: [
62-
mswDecorator,
6371
(Story, context) => {
6472
const story = Story();
65-
if (!initialized) {
73+
if (!moduleInitialized) {
6674
const channel = addons.getChannel();
6775
(globalThis.requestIdleCallback || setTimeout)(() => {
6876
channel.emit(FORCE_REMOUNT, { storyId: context.id });
6977
});
7078
}
7179
return story;
72-
}
80+
},
81+
mswDecorator,
7382
],
7483
parameters: {
7584
msw: {

‎packages/frontend/package.json

+15-14
Original file line numberDiff line numberDiff line change
@@ -72,21 +72,22 @@
7272
"vuedraggable": "next"
7373
},
7474
"devDependencies": {
75-
"@storybook/addon-essentials": "^7.0.0-rc.4",
76-
"@storybook/addon-interactions": "^7.0.0-rc.4",
77-
"@storybook/addon-links": "^7.0.0-rc.4",
75+
"@storybook/addon-essentials": "7.0.0-rc.6",
76+
"@storybook/addon-interactions": "7.0.0-rc.6",
77+
"@storybook/addon-links": "7.0.0-rc.6",
78+
"@storybook/addon-storysource": "7.0.0-rc.6",
7879
"@storybook/addons": "7.0.0-rc.5",
79-
"@storybook/blocks": "^7.0.0-rc.4",
80-
"@storybook/core-events": "^7.0.0-rc.4",
81-
"@storybook/manager-api": "^7.0.0-rc.4",
82-
"@storybook/preview-api": "^7.0.0-rc.4",
83-
"@storybook/react": "^7.0.0-rc.4",
84-
"@storybook/react-vite": "^7.0.0-rc.4",
80+
"@storybook/blocks": "7.0.0-rc.6",
81+
"@storybook/core-events": "7.0.0-rc.6",
82+
"@storybook/manager-api": "7.0.0-rc.6",
83+
"@storybook/preview-api": "7.0.0-rc.6",
84+
"@storybook/react": "7.0.0-rc.6",
85+
"@storybook/react-vite": "7.0.0-rc.6",
8586
"@storybook/testing-library": "^0.0.14-next.1",
86-
"@storybook/theming": "^7.0.0-rc.4",
87-
"@storybook/types": "^7.0.0-rc.4",
88-
"@storybook/vue3": "^7.0.0-rc.4",
89-
"@storybook/vue3-vite": "^7.0.0-rc.4",
87+
"@storybook/theming": "7.0.0-rc.6",
88+
"@storybook/types": "7.0.0-rc.6",
89+
"@storybook/vue3": "7.0.0-rc.6",
90+
"@storybook/vue3-vite": "7.0.0-rc.6",
9091
"@testing-library/vue": "^6.6.1",
9192
"@types/escape-regexp": "0.0.1",
9293
"@types/estree": "^1.0.0",
@@ -119,7 +120,7 @@
119120
"react": "^18.2.0",
120121
"react-dom": "^18.2.0",
121122
"start-server-and-test": "2.0.0",
122-
"storybook": "^7.0.0-rc.4",
123+
"storybook": "7.0.0-rc.6",
123124
"storybook-addon-misskey-theme": "github:misskey-dev/storybook-addon-misskey-theme",
124125
"summaly": "github:misskey-dev/summaly",
125126
"vitest": "^0.29.2",

‎packages/frontend/src/components/MkAbuseReport.stories.ts

+14-3
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,24 @@ const meta = {
77
component: MkAbuseReport,
88
} satisfies Meta<typeof MkAbuseReport>;
99
export const Default = {
10-
render(args, { argTypes }) {
10+
render(args) {
1111
return {
1212
components: {
1313
MkAbuseReport,
1414
},
15-
props: Object.keys(argTypes),
16-
template: '<MkAbuseReport v-bind="$props" />',
15+
setup() {
16+
return {
17+
args,
18+
};
19+
},
20+
computed: {
21+
props() {
22+
return {
23+
...args,
24+
};
25+
},
26+
},
27+
template: '<MkAbuseReport v-bind="props" />',
1728
};
1829
},
1930
parameters: {

‎packages/frontend/src/components/MkAbuseReportWindow.stories.ts

+14-3
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,24 @@ const meta = {
77
component: MkAbuseReportWindow,
88
} satisfies Meta<typeof MkAbuseReportWindow>;
99
export const Default = {
10-
render(args, { argTypes }) {
10+
render(args) {
1111
return {
1212
components: {
1313
MkAbuseReportWindow,
1414
},
15-
props: Object.keys(argTypes),
16-
template: '<MkAbuseReportWindow v-bind="$props" />',
15+
setup() {
16+
return {
17+
args,
18+
};
19+
},
20+
computed: {
21+
props() {
22+
return {
23+
...args,
24+
};
25+
},
26+
},
27+
template: '<MkAbuseReportWindow v-bind="props" />',
1728
};
1829
},
1930
parameters: {

‎packages/frontend/src/components/MkAchievements.stories.ts

+14-3
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,24 @@ const meta = {
77
component: MkAchievements,
88
} satisfies Meta<typeof MkAchievements>;
99
export const Default = {
10-
render(args, { argTypes }) {
10+
render(args) {
1111
return {
1212
components: {
1313
MkAchievements,
1414
},
15-
props: Object.keys(argTypes),
16-
template: '<MkAchievements v-bind="$props" />',
15+
setup() {
16+
return {
17+
args,
18+
};
19+
},
20+
computed: {
21+
props() {
22+
return {
23+
...args,
24+
};
25+
},
26+
},
27+
template: '<MkAchievements v-bind="props" />',
1728
};
1829
},
1930
parameters: {

0 commit comments

Comments
 (0)