Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release: 13.7.2 #10035

Merged
merged 16 commits into from
Feb 23, 2023
Merged
29 changes: 26 additions & 3 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,6 @@ jobs:
- backend
- frontend
- sw
lint:
- eslint
steps:
- uses: actions/[email protected]
with:
Expand All @@ -53,4 +51,29 @@ jobs:
cache: 'pnpm'
- run: corepack enable
- run: pnpm i --frozen-lockfile
- run: pnpm --filter ${{ matrix.workspace }} run ${{ matrix.lint }}
- run: pnpm --filter ${{ matrix.workspace }} run eslint

typecheck:
needs: [pnpm_install]
runs-on: ubuntu-latest
continue-on-error: true
strategy:
matrix:
workspace:
- backend
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ここswとfrontendがないですが🤔🤔🤔

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

リリース通るために外したのでしょうか(なんかだめな気がしますが、まあ理解はできます)

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

frontendは性質上型を付けるのが難しい場合が非常に多いので除外してます

steps:
- uses: actions/[email protected]
with:
fetch-depth: 0
submodules: true
- uses: pnpm/action-setup@v2
with:
version: 7
run_install: false
- uses: actions/[email protected]
with:
node-version: 18.x
cache: 'pnpm'
- run: corepack enable
- run: pnpm i --frozen-lockfile
- run: pnpm --filter ${{ matrix.workspace }} run typecheck
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "misskey",
"version": "13.7.1",
"version": "13.7.2",
"codename": "nasubi",
"repository": {
"type": "git",
Expand Down
32 changes: 15 additions & 17 deletions packages/backend/.swcrc
Original file line number Diff line number Diff line change
@@ -1,25 +1,23 @@
{
"$schema": "https://json.schemastore.org/swcrc",
"jsc": {
"parser": {
"syntax": "typescript",
"dynamicImport": true,
"decorators": true
},
"transform": {
"legacyDecorator": true,
"decoratorMetadata": true
},
"$schema": "https://json.schemastore.org/swcrc",
"jsc": {
"parser": {
"syntax": "typescript",
"dynamicImport": true,
"decorators": true
},
"transform": {
"legacyDecorator": true,
"decoratorMetadata": true
},
"experimental": {
"keepImportAssertions": true
},
"baseUrl": ".",
"baseUrl": "src",
"paths": {
"@/*": [
"./src/*"
]
"@/*": ["*"]
},
"target": "es2021"
},
"minify": false
},
"minify": false
}
Binary file modified packages/backend/assets/icons/192.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified packages/backend/assets/icons/512.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions packages/backend/migration/1676434944993-drop-group.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ export class dropGroup1676434944993 {
name = 'dropGroup1676434944993'

async up(queryRunner) {
await queryRunner.query(`TRUNCATE TABLE "notification"`, undefined);
tamaina marked this conversation as resolved.
Show resolved Hide resolved
await queryRunner.query(`ALTER TABLE "antenna" DROP CONSTRAINT "FK_ccbf5a8c0be4511133dcc50ddeb"`);
await queryRunner.query(`ALTER TABLE "notification" DROP CONSTRAINT "FK_8fe87814e978053a53b1beb7e98"`);
await queryRunner.query(`ALTER TABLE "antenna" DROP COLUMN "userGroupJoiningId"`);
Expand Down
21 changes: 16 additions & 5 deletions packages/backend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"migrate": "pnpm typeorm migration:run -d ormconfig.js",
"build": "swc src -d built -D",
"watch:swc": "swc src -d built -D -w",
"build:tsc": "tsc -p tsconfig.json || echo done. && tsc-alias -p tsconfig.json",
"build:tsc": "tsc -p tsconfig.json && tsc-alias -p tsconfig.json",
"watch": "node watch.mjs",
"typecheck": "tsc --noEmit",
"eslint": "eslint --quiet \"src/**/*.ts\"",
Expand All @@ -21,6 +21,17 @@
"test-and-coverage": "pnpm jest-and-coverage"
},
"optionalDependencies": {
"@swc/core-android-arm64": "^1.3.11",
"@swc/core-darwin-arm64": "^1.3.36",
"@swc/core-darwin-x64": "^1.3.36",
"@swc/core-linux-arm-gnueabihf": "^1.3.36",
"@swc/core-linux-arm64-gnu": "^1.3.36",
"@swc/core-linux-arm64-musl": "^1.3.36",
"@swc/core-linux-x64-gnu": "^1.3.36",
"@swc/core-linux-x64-musl": "^1.3.36",
"@swc/core-win32-arm64-msvc": "^1.3.36",
"@swc/core-win32-ia32-msvc": "^1.3.36",
"@swc/core-win32-x64-msvc": "^1.3.36",
"@tensorflow/tfjs": "4.2.0",
"@tensorflow/tfjs-node": "4.2.0"
},
Expand Down Expand Up @@ -118,9 +129,11 @@
"systeminformation": "5.17.9",
"tinycolor2": "1.6.0",
"tmp": "0.2.1",
"tsc-alias": "1.8.2",
"tsconfig-paths": "4.1.2",
"twemoji-parser": "14.0.0",
"typeorm": "0.3.11",
"typescript": "4.9.5",
"ulid": "2.3.0",
"unzipper": "0.10.11",
"uuid": "9.0.0",
Expand Down Expand Up @@ -181,8 +194,6 @@
"eslint-plugin-import": "2.27.5",
"execa": "6.1.0",
"jest": "29.4.3",
"jest-mock": "29.4.3",
"tsc-alias": "1.8.2",
"typescript": "4.9.5"
"jest-mock": "29.4.3"
}
}
}
6 changes: 4 additions & 2 deletions packages/backend/src/server/web/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,14 @@
{
"src": "/static-assets/icons/192.png",
"sizes": "192x192",
"type": "image/png"
"type": "image/png",
"purpose": "maskable"
},
{
"src": "/static-assets/icons/512.png",
"sizes": "512x512",
"type": "image/png"
"type": "image/png",
"purpose": "maskable"
}
],
"share_target": {
Expand Down
6 changes: 3 additions & 3 deletions packages/frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"autosize": "5.0.2",
"blurhash": "2.0.5",
"broadcast-channel": "4.20.2",
"browser-image-resizer": "git+https://github.com/misskey-dev/browser-image-resizer#v2.2.1-misskey.3",
"browser-image-resizer": "github:misskey-dev/browser-image-resizer#v2.2.1-misskey.3",
"canvas-confetti": "1.6.0",
"chart.js": "4.2.1",
"chartjs-adapter-date-fns": "3.0.0",
Expand Down Expand Up @@ -63,9 +63,9 @@
"typescript": "4.9.5",
"uuid": "9.0.0",
"vanilla-tilt": "1.8.0",
"vue-plyr": "7.0.0",
"vite": "4.1.2",
"vue": "3.2.47",
"vue-plyr": "7.0.0",
"vue-prism-editor": "2.0.0-alpha.2",
"vuedraggable": "next"
},
Expand Down Expand Up @@ -96,4 +96,4 @@
"vue-eslint-parser": "9.1.0",
"vue-tsc": "1.1.4"
}
}
}
2 changes: 1 addition & 1 deletion packages/frontend/src/components/global/MkCustomEmoji.vue
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ let errored = $ref(url.value == null);

<style lang="scss" module>
.root {
height: 2.5em;
height: 2em;
vertical-align: middle;
transition: transform 0.2s ease;

Expand Down
1 change: 1 addition & 0 deletions packages/frontend/src/pages/admin/roles.role.vue
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,7 @@ definePageMetadata(computed(() => ({

.user {
flex: 1;
min-width: 0;
}

.unassign {
Expand Down
Loading