Merge tag '10.102.698-m544' into custom/atsuchan

10.102.698-m544
atsu1125 · Apr 21, 2024 · cdf2b2d · cdf2b2d
2 parents 4af7347 + fc5201c
commit cdf2b2d
Show file tree

Hide file tree

Showing 18 changed files with 98 additions and 117 deletions.
diff --git a/.github/workflows/build_memory.yml b/.github/workflows/build_memory.yml
@@ -0,0 +1,24 @@
+name: Build with 1GB
+
+on: [push]
+
+jobs:
+  build_and_test:
+
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        node-version: [20.x]
+
+    steps:
+    - uses: actions/checkout@v4
+    - uses: pnpm/[email protected]
+    - uses: actions/setup-node@v4
+      with:
+        node-version: ${{ matrix.node-version }}
+        cache: 'pnpm'
+    - run: NODE_ENV=production pnpm i --frozen-lockfile
+    - run: NODE_ENV=production NODE_OPTIONS=--max-old-space-size=464 pnpm run build
+    - run: ls built/meta.json
+
diff --git a/.node-version b/.node-version
@@ -1 +1 @@
-18.20.1
+20.12.2
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:18.20.1-bookworm AS builder
+FROM node:20.12.2-bookworm AS builder
 
 ENV NODE_ENV=production
 WORKDIR /misskey
@@ -16,7 +16,7 @@ COPY . ./
 
 RUN pnpm build
 
-FROM node:18.20.1-bookworm-slim AS runner
+FROM node:20.12.2-bookworm-slim AS runner
 
 WORKDIR /misskey
 

diff --git a/Dockerfile-alpine b/Dockerfile-alpine
@@ -1,4 +1,4 @@
-FROM node:18.20.1-alpine3.18 AS base
+FROM node:20.12.2-alpine3.19 AS base
 
 ENV NODE_ENV=production
 

diff --git a/Dockerfile-develop b/Dockerfile-develop
@@ -1,4 +1,4 @@
-FROM node:18.20.1-bookworm AS builder
+FROM node:20.12.2-bookworm AS builder
 
 ENV NODE_ENV=development
 WORKDIR /misskey
@@ -16,7 +16,7 @@ COPY . ./
 
 RUN pnpm build
 
-FROM node:18.20.1-bookworm-slim AS runner
+FROM node:20.12.2-bookworm-slim AS runner
 
 WORKDIR /misskey
 

diff --git a/Dockerfile-fedora b/Dockerfile-fedora
@@ -7,7 +7,7 @@ RUN dnf update -y \
  && dnf groupinstall -y "Development Tools" \
  && dnf install -y wget gcc-c++
 
-ENV NODE_VER="18.20.1"
+ENV NODE_VER="20.12.2"
 RUN ARCH= && \
     unameArch="$(uname -m)" && \
   case "${unameArch##*-}" in \

diff --git a/Dockerfile-split b/Dockerfile-split
@@ -1,4 +1,4 @@
-FROM node:18.20.1-bookworm
+FROM node:20.12.2-bookworm
 
 ENV NODE_ENV=development
 

diff --git a/Dockerfile-ubuntu b/Dockerfile-ubuntu
@@ -6,7 +6,7 @@ RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selectio
 
 ENV NODE_ENV=production
 
-ENV NODE_VER="18.20.1"
+ENV NODE_VER="20.12.2"
 RUN ARCH= && \
     dpkgArch="$(dpkg --print-architecture)" && \
   case "${dpkgArch##*-}" in \

diff --git a/docs/examples/misskey.nginx b/docs/examples/misskey.nginx
@@ -74,6 +74,7 @@ server {
         proxy_cache cache1;
         proxy_cache_lock on;
         proxy_cache_use_stale updating;
+        proxy_force_ranges on;
         add_header X-Cache $upstream_cache_status;
     }
 }
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "misskey",
 	"author": "mei23 <[email protected]>",
-	"version": "10.102.697-m544",
+	"version": "10.102.698-m544",
 	"codename": "m544",
 	"repository": {
 		"type": "git",
@@ -10,7 +10,7 @@
 	"main": "./index.js",
 	"private": true,
 	"engines": {
-		"node": ">=14.15.0"
+		"node": ">=18.17.0"
 	},
 	"scripts": {
 		"start": "node ./index.js",
@@ -34,7 +34,6 @@
 		"@aws-sdk/client-s3": "3.549.0",
 		"@aws-sdk/lib-storage": "3.549.0",
 		"@aws-sdk/node-http-handler": "3.374.0",
-		"@discordapp/twemoji": "15.0.3",
 		"@fortawesome/fontawesome-svg-core": "1.2.36",
 		"@fortawesome/free-brands-svg-icons": "5.15.4",
 		"@fortawesome/free-regular-svg-icons": "5.15.4",
@@ -210,7 +209,7 @@
 		"@types/lodash": "4.17.0",
 		"@types/mocha": "10.0.6",
 		"@types/mongodb": "3.6.20",
-		"@types/node": "18.19.29",
+		"@types/node": "20.12.7",
 		"@types/nodemailer": "6.4.14",
 		"@types/nprogress": "0.2.3",
 		"@types/oauth": "0.9.4",