summaryrefslogtreecommitdiff
path: root/packages
diff options
context:
space:
mode:
authorsyuilo <Syuilotan@yahoo.co.jp>2023-02-23 17:36:36 +0900
committerGitHub <noreply@github.com>2023-02-23 17:36:36 +0900
commit71900e0231e94897cb8d3f9ad5c85897db2071a0 (patch)
treedf685b9c75749107eae2928c12c54817411a7c1a /packages
parentMerge branch 'develop' (diff)
downloadmisskey-71900e0231e94897cb8d3f9ad5c85897db2071a0.tar.gz
misskey-71900e0231e94897cb8d3f9ad5c85897db2071a0.tar.bz2
misskey-71900e0231e94897cb8d3f9ad5c85897db2071a0.zip
Release: 13.7.2 (#10035)
* ci: swcにしたためtypecheckは別途実施 * :art: * Update package.json * マイグレーションが失敗することがあるのを修正 * refactor ci * use tsc for build Windowsだとエラーが出るため * feat: swc build in windows (#10032) * feat: add optional swc * fix: windowsで動かない現象を修正 * fix: fix swc path alias * fix: docker build時に`Host key verification failed`と言われてgitリポジトリからパッケージをインストールできないのでssh -> htpsに変更 * use swc * chore(client): tweak custom emoji size * enhance: make pwa icon maskable (#10033) * :art: * feat(server): add @swc/core-android-arm64 to optional (#10034) * feat: add optional swc * fix: windowsで動かない現象を修正 * fix: fix swc path alias * fix: docker build時に`Host key verification failed`と言われてgitリポジトリからパッケージをインストールできないのでssh -> htpsに変更 * feat(server): add @swc/core-android-arm64 to optional * fix: conflict * Update package.json * chore(backend): fix indent * Update CHANGELOG.md * compress png --------- Co-authored-by: CaffeinePower <86540016+cffnpwr@users.noreply.github.com> Co-authored-by: Shogo Sensui <shogosensui@gmail.com> Co-authored-by: tamaina <tamaina@hotmail.co.jp>
Diffstat (limited to '')
-rw-r--r--packages/backend/.swcrc32
-rw-r--r--packages/backend/assets/icons/192.pngbin7629 -> 26568 bytes
-rw-r--r--packages/backend/assets/icons/512.pngbin20527 -> 165827 bytes
-rw-r--r--packages/backend/migration/1676434944993-drop-group.js1
-rw-r--r--packages/backend/package.json21
-rw-r--r--packages/backend/src/server/web/manifest.json6
-rw-r--r--packages/frontend/package.json6
-rw-r--r--packages/frontend/src/components/global/MkCustomEmoji.vue2
-rw-r--r--packages/frontend/src/pages/admin/roles.role.vue1
9 files changed, 41 insertions, 28 deletions
diff --git a/packages/backend/.swcrc b/packages/backend/.swcrc
index 55a88456ef..08d4222d01 100644
--- a/packages/backend/.swcrc
+++ b/packages/backend/.swcrc
@@ -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
}
diff --git a/packages/backend/assets/icons/192.png b/packages/backend/assets/icons/192.png
index 606b46d87c..15fd1e3731 100644
--- a/packages/backend/assets/icons/192.png
+++ b/packages/backend/assets/icons/192.png
Binary files differ
diff --git a/packages/backend/assets/icons/512.png b/packages/backend/assets/icons/512.png
index ba51546427..f2169ec9b0 100644
--- a/packages/backend/assets/icons/512.png
+++ b/packages/backend/assets/icons/512.png
Binary files differ
diff --git a/packages/backend/migration/1676434944993-drop-group.js b/packages/backend/migration/1676434944993-drop-group.js
index bdf3c1034e..df4a3b6839 100644
--- a/packages/backend/migration/1676434944993-drop-group.js
+++ b/packages/backend/migration/1676434944993-drop-group.js
@@ -2,6 +2,7 @@ export class dropGroup1676434944993 {
name = 'dropGroup1676434944993'
async up(queryRunner) {
+ await queryRunner.query(`TRUNCATE TABLE "notification"`, undefined);
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"`);
diff --git a/packages/backend/package.json b/packages/backend/package.json
index 02433ecb58..df78219985 100644
--- a/packages/backend/package.json
+++ b/packages/backend/package.json
@@ -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\"",
@@ -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"
},
@@ -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",
@@ -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"
}
-}
+} \ No newline at end of file
diff --git a/packages/backend/src/server/web/manifest.json b/packages/backend/src/server/web/manifest.json
index 48030a2980..f8b77cbd93 100644
--- a/packages/backend/src/server/web/manifest.json
+++ b/packages/backend/src/server/web/manifest.json
@@ -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": {
diff --git a/packages/frontend/package.json b/packages/frontend/package.json
index f89a946282..24f8d9b6a6 100644
--- a/packages/frontend/package.json
+++ b/packages/frontend/package.json
@@ -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",
@@ -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"
},
@@ -96,4 +96,4 @@
"vue-eslint-parser": "9.1.0",
"vue-tsc": "1.1.4"
}
-}
+} \ No newline at end of file
diff --git a/packages/frontend/src/components/global/MkCustomEmoji.vue b/packages/frontend/src/components/global/MkCustomEmoji.vue
index 82aad44c1f..84aae1cff8 100644
--- a/packages/frontend/src/components/global/MkCustomEmoji.vue
+++ b/packages/frontend/src/components/global/MkCustomEmoji.vue
@@ -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;
diff --git a/packages/frontend/src/pages/admin/roles.role.vue b/packages/frontend/src/pages/admin/roles.role.vue
index 1b9f0e7c53..e7d57ad4f0 100644
--- a/packages/frontend/src/pages/admin/roles.role.vue
+++ b/packages/frontend/src/pages/admin/roles.role.vue
@@ -136,6 +136,7 @@ definePageMetadata(computed(() => ({
.user {
flex: 1;
+ min-width: 0;
}
.unassign {