mirror/cherrypick
1
1
Fork 0
mirror of https://github.com/kokonect-link/cherrypick synced 2025-01-23 02:04:33 +09:00
Code

Merge branch 'develop' into feat-13070

Browse Source
This commit is contained in:
かっこかり 2024-02-06 21:08:18 +09:00 committed by GitHub
commit 81e49fd8a9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
9 changed files with 2 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
packages/frontend/src/components/MkLaunchPad.vue
View File

@ -119,6 +119,7 @@ function close() {
margin-top: 12px;
font-size: 0.8em;
line-height: 1.5em;
text-align: center;
}
> .indicatorWithValue {

1
packages/frontend/src/pages/drop-and-fusion.game.vue
View File

@ -893,7 +893,6 @@ function getGameImageDriveFile() {
formData.append('file', blob);
formData.append('name', `bubble-game-${Date.now()}.png`);
formData.append('isSensitive', 'false');
formData.append('comment', 'null');
formData.append('i', $i.token);
if (defaultStore.state.uploadFolder) {
formData.append('folderId', defaultStore.state.uploadFolder);

2
packages/frontend/src/pizzax.ts
View File

@ -239,7 +239,7 @@ export class Storage<T extends StateDef> {
/**
* 特定のキーの、簡易的なgetter/setterを作ります
* 主にvue場で設定コントロールのmodelとして使う用
* 主にvue上で設定コントロールのmodelとして使う用
*/
public makeGetterSetter<K extends keyof T>(key: K, getter?: (v: T[K]) => unknown, setter?: (v: unknown) => T[K]): {
get: () => T[K]['default'];

30
packages/misskey-js/generator/src/generator.ts
View File

@ -4,22 +4,6 @@ import { toPascal } from 'ts-case-convert';
import OpenAPIParser from '@readme/openapi-parser';
import openapiTS from 'openapi-typescript';
function generateVersionHeaderComment(openApiDocs: OpenAPIV3_1.Document): string {
const contents = {
version: openApiDocs.info.version,
generatedAt: new Date().toISOString(),
};
const lines: string[] = [];
lines.push('/*');
for (const [key, value] of Object.entries(contents)) {
lines.push(` * ${key}: ${value}`);
}
lines.push(' */');
return lines.join('\n');
}
async function generateBaseTypes(
openApiDocs: OpenAPIV3_1.Document,
openApiJsonPath: string,
@ -36,9 +20,6 @@ async function generateBaseTypes(
}
lines.push('');
lines.push(generateVersionHeaderComment(openApiDocs));
lines.push('');
const generatedTypes = await openapiTS(openApiJsonPath, { exportType: true });
lines.push(generatedTypes);
lines.push('');
@ -59,8 +40,6 @@ async function generateSchemaEntities(
const schemaNames = Object.keys(schemas);
const typeAliasLines: string[] = [];
typeAliasLines.push(generateVersionHeaderComment(openApiDocs));
typeAliasLines.push('');
typeAliasLines.push(`import { components } from '${toImportPath(typeFileName)}';`);
typeAliasLines.push(
...schemaNames.map(it => `export type ${it} = components['schemas']['${it}'];`),
@ -119,9 +98,6 @@ async function generateEndpoints(
const entitiesOutputLine: string[] = [];
entitiesOutputLine.push(generateVersionHeaderComment(openApiDocs));
entitiesOutputLine.push('');
entitiesOutputLine.push(`import { operations } from '${toImportPath(typeFileName)}';`);
entitiesOutputLine.push('');
@ -139,9 +115,6 @@ async function generateEndpoints(
const endpointOutputLine: string[] = [];
endpointOutputLine.push(generateVersionHeaderComment(openApiDocs));
endpointOutputLine.push('');
endpointOutputLine.push('import type {');
endpointOutputLine.push(
...[emptyRequest, emptyResponse, ...entities].map(it => '\t' + it.generateName() + ','),
@ -187,9 +160,6 @@ async function generateApiClientJSDoc(
const endpointOutputLine: string[] = [];
endpointOutputLine.push(generateVersionHeaderComment(openApiDocs));
endpointOutputLine.push('');
endpointOutputLine.push(`import type { SwitchCaseResponseType } from '${toImportPath(apiClientFileName)}';`);
endpointOutputLine.push(`import type { Endpoints } from '${toImportPath(endpointsFileName)}';`);
endpointOutputLine.push('');

5
packages/misskey-js/src/autogen/apiClientJSDoc.ts
View File

@ -1,8 +1,3 @@
/*
* version: 2024.2.0-beta.8
* generatedAt: 2024-02-04T16:51:09.469Z
*/
import type { SwitchCaseResponseType } from '../api.js';
import type { Endpoints } from './endpoint.js';

5
packages/misskey-js/src/autogen/endpoint.ts
View File

@ -1,8 +1,3 @@
/*
* version: 2024.2.0-beta.8
* generatedAt: 2024-02-04T16:51:09.467Z
*/
import type {
EmptyRequest,
EmptyResponse,

5
packages/misskey-js/src/autogen/entities.ts
View File

@ -1,8 +1,3 @@
/*
* version: 2024.2.0-beta.8
* generatedAt: 2024-02-04T16:51:09.466Z
*/
import { operations } from './types.js';
export type EmptyRequest = Record<string, unknown> | undefined;

5
packages/misskey-js/src/autogen/models.ts
View File

@ -1,8 +1,3 @@
/*
* version: 2024.2.0-beta.8
* generatedAt: 2024-02-04T16:51:09.465Z
*/
import { components } from './types.js';
export type Error = components['schemas']['Error'];
export type UserLite = components['schemas']['UserLite'];

5
packages/misskey-js/src/autogen/types.ts
View File

@ -1,11 +1,6 @@
/* eslint @typescript-eslint/naming-convention: 0 */
/* eslint @typescript-eslint/no-explicit-any: 0 */
/*
* version: 2024.2.0-beta.8
* generatedAt: 2024-02-04T16:51:09.378Z
*/
/**
* This file was auto-generated by openapi-typescript.
* Do not make direct changes to the file.