From 0736eea3fd7961b10781e3ce67601caf0e4ccfff Mon Sep 17 00:00:00 2001 From: かっこかり <67428053+kakkokari-gtyih@users.noreply.github.com> Date: Sun, 11 Feb 2024 13:24:25 +0900 Subject: fix: misskey-jsの型定義生成時にバックエンドの依存パッケージもビルドするように (#13249) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * fix(frontend): vue v3.4.16でタイムラインが正常に表示できない問題を修正 * type * fix: misskey-jsの型定義生成時にバックエンドの依存パッケージもビルドするように * Revert "type" This reverts commit bac0951bd1608cbd97ba809a76a664590ce5efb3. * Revert "fix(frontend): vue v3.4.16でタイムラインが正常に表示できない問題を修正" This reverts commit 92b21658287932515cb061ddc2ab5c83b4b78ca2. --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package.json') diff --git a/package.json b/package.json index 3619366519..6136ef39df 100644 --- a/package.json +++ b/package.json @@ -21,7 +21,7 @@ "build-assets": "node ./scripts/build-assets.mjs", "build": "pnpm build-pre && pnpm -r build && pnpm build-assets", "build-storybook": "pnpm --filter frontend build-storybook", - "build-misskey-js-with-types": "pnpm --filter backend build && pnpm --filter backend generate-api-json && ncp packages/backend/built/api.json packages/misskey-js/generator/api.json && pnpm --filter misskey-js update-autogen-code && pnpm --filter misskey-js build && pnpm --filter misskey-js api", + "build-misskey-js-with-types": "pnpm build-pre && pnpm --filter backend... --filter=!misskey-js build && pnpm --filter backend generate-api-json && ncp packages/backend/built/api.json packages/misskey-js/generator/api.json && pnpm --filter misskey-js update-autogen-code && pnpm --filter misskey-js build && pnpm --filter misskey-js api", "start": "pnpm check:connect && cd packages/backend && node ./built/boot/entry.js", "start:test": "cd packages/backend && cross-env NODE_ENV=test node ./built/boot/entry.js", "init": "pnpm migrate", -- cgit v1.2.3-freya From 3dc095d1c9ae075b28efb521cf3d76961efb6593 Mon Sep 17 00:00:00 2001 From: "Acid Chicken (硫酸鶏)" Date: Mon, 12 Feb 2024 01:02:27 +0000 Subject: feat: provide tarball (#13260) * feat: provide tarball * build: pack on build-assets * chore: use ignore-walk * chore: debug * build: dependencies --- package.json | 9 ++++-- .../backend/src/server/web/ClientServerService.ts | 8 ++++++ packages/frontend/src/pages/about.vue | 1 + pnpm-lock.yaml | 28 +++++++++++++++++++ scripts/build-assets.mjs | 4 ++- scripts/tarball.mjs | 32 ++++++++++++++++++++++ 6 files changed, 78 insertions(+), 4 deletions(-) create mode 100644 scripts/tarball.mjs (limited to 'package.json') diff --git a/package.json b/package.json index 6136ef39df..c670e232e4 100644 --- a/package.json +++ b/package.json @@ -48,10 +48,13 @@ "lodash": "4.17.21" }, "dependencies": { - "execa": "8.0.1", "cssnano": "6.0.3", + "execa": "8.0.1", + "fast-glob": "3.3.2", + "ignore-walk": "6.0.4", "js-yaml": "4.1.0", "postcss": "8.4.33", + "tar": "6.2.0", "terser": "5.27.0", "typescript": "5.3.3" }, @@ -61,8 +64,8 @@ "cross-env": "7.0.3", "cypress": "13.6.3", "eslint": "8.56.0", - "start-server-and-test": "2.0.3", - "ncp": "2.0.0" + "ncp": "2.0.0", + "start-server-and-test": "2.0.3" }, "optionalDependencies": { "@tensorflow/tfjs-core": "4.4.0" diff --git a/packages/backend/src/server/web/ClientServerService.ts b/packages/backend/src/server/web/ClientServerService.ts index 8e1a89d55f..a5094e6a86 100644 --- a/packages/backend/src/server/web/ClientServerService.ts +++ b/packages/backend/src/server/web/ClientServerService.ts @@ -51,6 +51,7 @@ const clientAssets = `${_dirname}/../../../../frontend/assets/`; const assets = `${_dirname}/../../../../../built/_frontend_dist_/`; const swAssets = `${_dirname}/../../../../../built/_sw_dist_/`; const viteOut = `${_dirname}/../../../../../built/_vite_/`; +const tarball = `${_dirname}/../../../../../built/tarball/`; @Injectable() export class ClientServerService { @@ -291,6 +292,13 @@ export class ClientServerService { decorateReply: false, }); + fastify.register(fastifyStatic, { + root: tarball, + prefix: '/tarball/', + immutable: true, + decorateReply: false, + }); + fastify.get('/favicon.ico', async (request, reply) => { return reply.sendFile('/favicon.ico', staticAssets); }); diff --git a/packages/frontend/src/pages/about.vue b/packages/frontend/src/pages/about.vue index 69cb6ef647..8e5fcda283 100644 --- a/packages/frontend/src/pages/about.vue +++ b/packages/frontend/src/pages/about.vue @@ -86,6 +86,7 @@ SPDX-License-Identifier: AGPL-3.0-only nodeinfo robots.txt manifest.json + source code diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 640713067f..6435298264 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -18,12 +18,21 @@ importers: execa: specifier: 8.0.1 version: 8.0.1 + fast-glob: + specifier: 3.3.2 + version: 3.3.2 + ignore-walk: + specifier: 6.0.4 + version: 6.0.4 js-yaml: specifier: 4.1.0 version: 4.1.0 postcss: specifier: 8.4.33 version: 8.4.33 + tar: + specifier: 6.2.0 + version: 6.2.0 terser: specifier: 5.27.0 version: 5.27.0 @@ -13488,6 +13497,13 @@ packages: resolution: {integrity: sha512-Ius2VYcGNk7T90CppJqcIkS5ooHUZyIQK+ClZfMfMNFEF9VSE73Fq+906u/CWu92x4gzZMWOwfFYckPObzdEbA==} dev: true + /ignore-walk@6.0.4: + resolution: {integrity: sha512-t7sv42WkwFkyKbivUCglsQW5YWMskWtbEf4MNKX5u/CCWHKSPzN4FtBQGsQZgCLbxOzpVlcbWVK5KB3auIOjSw==} + engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0} + dependencies: + minimatch: 9.0.3 + dev: false + /ignore@5.2.4: resolution: {integrity: sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ==} engines: {node: '>= 4'} @@ -19095,6 +19111,18 @@ packages: mkdirp: 1.0.4 yallist: 4.0.0 + /tar@6.2.0: + resolution: {integrity: sha512-/Wo7DcT0u5HUV486xg675HtjNd3BXZ6xDbzsCUZPt5iw8bTQ63bP0Raut3mvro9u+CUyq7YQd8Cx55fsZXxqLQ==} + engines: {node: '>=10'} + dependencies: + chownr: 2.0.0 + fs-minipass: 2.1.0 + minipass: 5.0.0 + minizlib: 2.1.2 + mkdirp: 1.0.4 + yallist: 4.0.0 + dev: false + /taskkill@5.0.0: resolution: {integrity: sha512-+HRtZ40Vc+6YfCDWCeAsixwxJgMbPY4HHuTgzPYH3JXvqHWUlsCfy+ylXlAKhFNcuLp4xVeWeFBUhDk+7KYUvQ==} engines: {node: '>=14.16'} diff --git a/scripts/build-assets.mjs b/scripts/build-assets.mjs index d2dabe8532..8a8a50d9ba 100644 --- a/scripts/build-assets.mjs +++ b/scripts/build-assets.mjs @@ -12,6 +12,7 @@ import * as terser from 'terser'; import { build as buildLocales } from '../locales/index.js'; import generateDTS from '../locales/generateDTS.js'; import meta from '../package.json' assert { type: "json" }; +import buildTarball from './tarball.mjs'; let locales = buildLocales(); @@ -77,12 +78,13 @@ async function build() { copyBackendViews(), buildBackendScript(), buildBackendStyle(), + buildTarball(), ]); } await build(); -if (process.argv.includes("--watch")) { +if (process.argv.includes('--watch')) { const watcher = fs.watch('./locales'); for await (const event of watcher) { const filename = event.filename?.replaceAll('\\', '/'); diff --git a/scripts/tarball.mjs b/scripts/tarball.mjs new file mode 100644 index 0000000000..936a43d270 --- /dev/null +++ b/scripts/tarball.mjs @@ -0,0 +1,32 @@ +import { createWriteStream } from 'node:fs'; +import { mkdir } from 'node:fs/promises'; +import { resolve } from 'node:path'; +import { fileURLToPath } from 'node:url'; +import glob from 'fast-glob'; +import walk from 'ignore-walk'; +import Pack from 'tar/lib/pack.js'; +import meta from '../package.json' assert { type: "json" }; + +const cwd = fileURLToPath(new URL('..', import.meta.url)); +const ignore = [ + '**/.git/**/*', + '**/*ignore', + '**/.gitmodules', + // Exclude files you don't want to include in the tarball here +]; + +export default async function build() { + const mkdirPromise = mkdir(resolve(cwd, 'built', 'tarball'), { recursive: true }); + const pack = new Pack({ cwd, gzip: true }); + const patterns = await walk({ path: cwd, ignoreFiles: ['.gitignore'] }); + + for await (const entry of glob.stream(patterns, { cwd, ignore, dot: true })) { + pack.add(entry); + } + + pack.end(); + + await mkdirPromise; + + pack.pipe(createWriteStream(resolve(cwd, 'built', 'tarball', `misskey-${meta.version}.tar.gz`))); +} -- cgit v1.2.3-freya From b7a12fbc2b043f79cbea9d560511a7beaf7697e3 Mon Sep 17 00:00:00 2001 From: syuilo <4439005+syuilo@users.noreply.github.com> Date: Fri, 16 Feb 2024 15:40:10 +0900 Subject: 2024.2.0-beta.12 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package.json') diff --git a/package.json b/package.json index c670e232e4..ddc9d9ea51 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "misskey", - "version": "2024.2.0-beta.11", + "version": "2024.2.0-beta.12", "codename": "nasubi", "repository": { "type": "git", -- cgit v1.2.3-freya From 8c1a5823489265d8237fa07f5511ea1ac63abb91 Mon Sep 17 00:00:00 2001 From: tamaina Date: Fri, 16 Feb 2024 15:04:12 +0000 Subject: 2024.2.0-beta.13 --- package.json | 2 +- packages/misskey-js/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'package.json') diff --git a/package.json b/package.json index ddc9d9ea51..f8dd5aeadc 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "misskey", - "version": "2024.2.0-beta.12", + "version": "2024.2.0-beta.13", "codename": "nasubi", "repository": { "type": "git", diff --git a/packages/misskey-js/package.json b/packages/misskey-js/package.json index c3af4a701f..094a6e7214 100644 --- a/packages/misskey-js/package.json +++ b/packages/misskey-js/package.json @@ -1,7 +1,7 @@ { "type": "module", "name": "misskey-js", - "version": "2024.2.0-beta.12", + "version": "2024.2.0-beta.13", "description": "Misskey SDK for JavaScript", "types": "./built/dts/index.d.ts", "exports": { -- cgit v1.2.3-freya From 0b5d3315bcf5682e519a32a1ff4d98bbaf845502 Mon Sep 17 00:00:00 2001 From: syuilo <4439005+syuilo@users.noreply.github.com> Date: Sat, 17 Feb 2024 13:41:24 +0900 Subject: 2024.2.0 --- CHANGELOG.md | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'package.json') diff --git a/CHANGELOG.md b/CHANGELOG.md index 3e35d9e2b6..b6c2822590 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,7 +12,7 @@ --> -## 202x.x.x (Unreleased) +## 2024.2.0 ### Note - 外部サイトからプラグインをインストールする場合のパスが`/install-extentions`から`/install-extensions`に変わります。以前のパスからは自動でリダイレクトされるようになっていますが、新しいパスに変更することをお勧めします。 diff --git a/package.json b/package.json index f8dd5aeadc..3f94448db7 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "misskey", - "version": "2024.2.0-beta.13", + "version": "2024.2.0", "codename": "nasubi", "repository": { "type": "git", -- cgit v1.2.3-freya From d182402cfab631f301a3caff7a19b745f01434b3 Mon Sep 17 00:00:00 2001 From: Marie Date: Mon, 19 Feb 2024 18:46:42 +0100 Subject: fix: icons and update urls --- .gitmodules | 2 +- package.json | 2 +- packages/backend/src/server/web/views/base.pug | 2 +- packages/backend/src/server/web/views/error.pug | 2 +- packages/frontend/src/components/MkSignupDialog.rules.vue | 2 +- packages/frontend/src/components/MkUpdated.vue | 2 +- packages/frontend/src/pages/about-sharkey.vue | 10 +++++----- packages/frontend/src/pages/about.vue | 4 ++-- packages/frontend/src/pages/admin/branding.vue | 4 ++-- packages/frontend/src/pages/admin/settings.vue | 2 +- 10 files changed, 16 insertions(+), 16 deletions(-) (limited to 'package.json') diff --git a/.gitmodules b/.gitmodules index 92d3a87532..a3ca76cc96 100644 --- a/.gitmodules +++ b/.gitmodules @@ -6,4 +6,4 @@ url = https://github.com/misskey-dev/emojis.git [submodule "tossface-emojis"] path = tossface-emojis - url = https://git.joinsharkey.org/Sharkey/tossface-emojis.git + url = https://activitypub.software/TransFem-org/tossface-emojis.git diff --git a/package.json b/package.json index fb7f48d706..970eddd0e1 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,7 @@ "codename": "shonk", "repository": { "type": "git", - "url": "https://git.joinsharkey.org/Sharkey/Sharkey.git" + "url": "https://activitypub.software/TransFem-org/Sharkey.git" }, "packageManager": "pnpm@8.15.1", "workspaces": [ diff --git a/packages/backend/src/server/web/views/base.pug b/packages/backend/src/server/web/views/base.pug index c15e123a15..5fda2ee9ee 100644 --- a/packages/backend/src/server/web/views/base.pug +++ b/packages/backend/src/server/web/views/base.pug @@ -18,7 +18,7 @@ doctype html Thank you for using Sharkey! If you are reading this message... how about joining the development? - https://git.joinsharkey.org/Sharkey/Sharkey + https://activitypub.software/TransFem-org/Sharkey html diff --git a/packages/backend/src/server/web/views/error.pug b/packages/backend/src/server/web/views/error.pug index 00a2a72d7a..39b75abc4c 100644 --- a/packages/backend/src/server/web/views/error.pug +++ b/packages/backend/src/server/web/views/error.pug @@ -13,7 +13,7 @@ doctype html Thank you for using Sharkey! If you are reading this message... how about joining the development? - https://git.joinsharkey.org/Sharkey/Sharkey + https://activitypub.software/TransFem-org/Sharkey html diff --git a/packages/frontend/src/components/MkSignupDialog.rules.vue b/packages/frontend/src/components/MkSignupDialog.rules.vue index 2f419a3a0e..18a9eeda23 100644 --- a/packages/frontend/src/components/MkSignupDialog.rules.vue +++ b/packages/frontend/src/components/MkSignupDialog.rules.vue @@ -45,7 +45,7 @@ SPDX-License-Identifier: AGPL-3.0-only - {{ i18n.ts.basicNotesBeforeCreateAccount }} + {{ i18n.ts.basicNotesBeforeCreateAccount }} {{ i18n.ts.agree }} diff --git a/packages/frontend/src/components/MkUpdated.vue b/packages/frontend/src/components/MkUpdated.vue index 9619bdf6dc..4fb0749931 100644 --- a/packages/frontend/src/components/MkUpdated.vue +++ b/packages/frontend/src/components/MkUpdated.vue @@ -27,7 +27,7 @@ const modal = shallowRef>(); const whatIsNew = () => { modal.value?.close(); - window.open(`https://git.joinsharkey.org/Sharkey/Sharkey/releases/tag/${version}`, '_blank'); + window.open(`https://activitypub.software/TransFem-org/Sharkey/-/releases/${version}`, '_blank'); }; onMounted(() => { diff --git a/packages/frontend/src/pages/about-sharkey.vue b/packages/frontend/src/pages/about-sharkey.vue index a58c5d9f99..d3efb23033 100644 --- a/packages/frontend/src/pages/about-sharkey.vue +++ b/packages/frontend/src/pages/about-sharkey.vue @@ -69,16 +69,16 @@ SPDX-License-Identifier: AGPL-3.0-only - + diff --git a/packages/frontend/src/pages/about.vue b/packages/frontend/src/pages/about.vue index 8ad48e635d..f2aceada7d 100644 --- a/packages/frontend/src/pages/about.vue +++ b/packages/frontend/src/pages/about.vue @@ -58,13 +58,13 @@ SPDX-License-Identifier: AGPL-3.0-only - + {{ i18n.ts.impressum }}
diff --git a/packages/frontend/src/pages/admin/branding.vue b/packages/frontend/src/pages/admin/branding.vue index beb11d2c9d..3b8fd3cd20 100644 --- a/packages/frontend/src/pages/admin/branding.vue +++ b/packages/frontend/src/pages/admin/branding.vue @@ -84,12 +84,12 @@ SPDX-License-Identifier: AGPL-3.0-only - + - + diff --git a/packages/frontend/src/pages/admin/settings.vue b/packages/frontend/src/pages/admin/settings.vue index 88a1e33179..bd53554319 100644 --- a/packages/frontend/src/pages/admin/settings.vue +++ b/packages/frontend/src/pages/admin/settings.vue @@ -36,7 +36,7 @@ SPDX-License-Identifier: AGPL-3.0-only - + -- cgit v1.2.3-freya