Merge branch 'develop'

.devcontainer/Dockerfile.base

@@ -1,4 +1,4 @@
-ARG VARIANT=bullseye
+ARG VARIANT=bookworm
 FROM mcr.microsoft.com/vscode/devcontainers/base:${VARIANT}
 
 # Update args in docker-compose.yaml to set the UID/GID of the "vscode" user.
@@ -53,32 +53,30 @@ LABEL zealot.containers.nodejs="$NODEJS_VERSION"
 ARG ASDF_DIR="/home/vscode/.asdf"
 ENV RUBY_YJIT_ENABLE=true
 ENV PATH "${ASDF_DIR}/bin:${ASDF_DIR}/shims:$PATH"
-RUN git clone https://github.com/asdf-vm/asdf.git ${ASDF_DIR}  && \
+RUN git clone --quiet https://github.com/asdf-vm/asdf.git ${ASDF_DIR} && \
     echo ". ${ASDF_DIR}/asdf.sh" >> ~/.bashrc && \
     sed -i -E "s/^plugins=\(.+\)$/plugins=(debian asdf git git-flow tmux yarn ruby gem bundler rails)/g" ~/.zshrc
-# Enable YJIT *NEED* Rsust 1.58.0+
+
+RUN asdf plugin add nodejs && \
+    asdf install nodejs $NODEJS_VERSION && \
+    asdf global nodejs $NODEJS_VERSION
+
+# Enable YJIT *NEED* RUST 1.58.0+
 RUN asdf plugin add rust && \
     asdf install rust latest && \
     asdf global rust latest
-RUN export RUBY_CONFIGURE_OPTS=--enable-yjit && \
+
+RUN export RUBY_CONFIGURE_OPTS="--enable-yjit" && \
     asdf plugin add ruby && \
     asdf install ruby $RUBY_VERSION && \
-    asdf global ruby ${RUBY_VERSION}
-RUN asdf plugin add nodejs && \
-    asdf install nodejs $NODEJS_VERSION && \
-    asdf global nodejs ${NODEJS_VERSION}
-
-LABEL zealot.containers.ruby="$RUBY_VERSION"
-LABEL zealot.containers.nodejs="$NODEJS_VERSION"
+    asdf global ruby $RUBY_VERSION
 
 WORKDIR /workspace
 
 COPY Gemfile Gemfile.lock ./
 RUN gem install bundler foreman && \
-    bundle lock --add-platform ruby && \
-    bundle config set force_ruby_platform true && \
     bundle install
 
 COPY package.json yarn.lock ./
-RUN npm install --global yarn && \
+RUN npm install --global yarn sass esbuild && \
     yarn install

.devcontainer/devcontainer.json

@@ -3,6 +3,10 @@
   "dockerComposeFile": "docker-compose.yml",
   "service": "app",
   "workspaceFolder": "/workspace",
+  "remoteUser": "vscode",
+  "mounts": [
+    "source=${localEnv:HOME}/.ssh,target=/home/vscode/.ssh,type=bind,consistency=cached"
+  ],
 
   "customizations": {
     "vscode": {

.github/workflows/publish_release.yml

@@ -61,7 +61,7 @@ jobs:
           BUILD_DATE=${{ fromJSON(steps.metadata.outputs.json).labels['org.opencontainers.image.created'] }}
 
     - name: Create Release
-      uses: softprops/action-gh-release@v1
+      uses: softprops/action-gh-release@v2
       if: startsWith(github.ref, 'refs/tags/')
       env:
         GITHUB_TOKEN: ${{ secrets.CR_PAT }}

.github/workflows/test_docker_build.yml

@@ -7,7 +7,6 @@ on:
       - '.devcontainer'
       - '.vscode'
       - 'LICENSE'
-      - '*file'
       - 'Procfile*'
       - '*.yaml'
       - '*.yml'

.rubocop.yml

@@ -6,6 +6,7 @@ AllCops:
   TargetRailsVersion: 7.0
   DisabledByDefault: true
   SuggestExtensions: false
+  DisplayStyleGuide: true
   Exclude:
     - 'vendor/**/*'
     - 'node_modules/**/*'

CHANGELOG.md

@@ -1,3 +1,5 @@
 # 变更日志 Changelog
 
-请移步(Detail): https://zealot.ews.im/zh-Hans/docs/user-guide/changelog
+变更日志迁移到[文档](https://zealot.ews.im/docs/user-guide/changelog)
+
+Changelog moved to [new place](https://zealot.ews.im/docs/user-guide/changelog)

Dockerfile

@@ -64,7 +64,7 @@ ARG BUILD_DATE
 ARG VCS_REF
 ARG TAG
 
-ARG ZEALOT_VERSION="5.1.0"
+ARG ZEALOT_VERSION="5.2.0"
 ARG REPLACE_CHINA_MIRROR="true"
 ARG ORIGINAL_REPO_URL="dl-cdn.alpinelinux.org"
 ARG MIRROR_REPO_URL="mirrors.ustc.edu.cn"

Gemfile

@@ -4,8 +4,8 @@ source 'https://rubygems.org'
 
 git_source(:github) { |repo_name| "https://github.com/#{repo_name}" }
 
-gem 'puma', '~> 6.4.0'
-gem 'rails', '~> 7.1.1'
+gem 'puma', '~> 6.4.2'
+gem 'rails', '~> 7.1.3'
 gem 'rails-i18n', '~> 7.0.5'
 gem 'rake', '~> 13.0.4'
 
@@ -18,8 +18,8 @@ gem 'lograge', '~> 0.14.0'
 
 # API
 gem 'active_model_serializers', '~> 0.10.14'
-gem 'graphql', '~> 2.1.7'
-gem 'rack-cors', '~> 2.0.1'
+gem 'graphql', '~> 2.2.10'
+gem 'rack-cors', '~> 2.0.2'
 gem 'health_check', '~> 3.1.0'
 gem 'tiny_appstore_connect', '~> 0.1.12'
 
@@ -38,19 +38,19 @@ gem 'friendly_id', '~> 5.5.1'
 ## 数据分页
 gem 'kaminari', '~> 1.2.2'
 ## 文件上传
-gem 'carrierwave', '~> 2.2.3'
+gem 'carrierwave', '~> 3.0.4'
 gem 'webp-ffi', '~> 0.4.0'
 
 # Helper
 ## HTTP 请求
-gem 'faraday', '~> 2.7.12'
+gem 'faraday', '~> 2.8.1'
 
 ## 用户认证
 gem 'pundit', '~> 2.3.1'
 gem 'devise', '~> 4.9.3'
 gem 'devise-i18n', '~> 1.12.0'
 
-gem 'omniauth', '~> 2.1.1'
+gem 'omniauth', '~> 2.1.2'
 gem 'omniauth-rails_csrf_protection', '~> 1.0.1'
 gem 'omniauth-google-oauth2', '~> 1.0.1'
 gem 'omniauth-gitlab', '~> 3.0.0'
@@ -59,13 +59,13 @@ gem 'gitlab_omniauth-ldap', '~> 2.2.0', require: 'omniauth-ldap'
 gem 'omniauth_openid_connect', '0.7.1'
 
 ## UDID
-gem 'openssl', '~> 3.1.0'
-gem 'plist', '~> 3.7.0'
+gem 'openssl', '~> 3.2.0'
+gem 'plist', '~> 3.7.1'
 
 ## 系统信息
 gem 'sys-filesystem', '~> 1.4.4'
 gem 'vmstat', '~> 2.3.0'
-gem 'pghero', '~> 3.3.4'
+gem 'pghero', '~> 3.4.0'
 
 ## 异常报错上报
 gem 'sentry-ruby'
@@ -87,10 +87,10 @@ gem 'sidekiq-failures', '~> 1.0.4'
 # Assets
 ## jsbundling-rails, cssbundling-rails 仅生成配置文件到项目组，核心还是 package.json 中 build/build:css 部分。
 gem 'propshaft', '0.8.0'
-gem 'jsbundling-rails', '~> 1.2'
+gem 'jsbundling-rails', '~> 1.3'
 gem 'cssbundling-rails', '~> 1.3'
 ## Javascript
-gem 'stimulus-rails', '~> 1.3.0'
+gem 'stimulus-rails', '~> 1.3.3'
 gem 'turbo-rails', '~> 1.5'
 
 # 用于解析 iOS, Android, macOS 和 Windows 应用
@@ -110,7 +110,7 @@ group :development do
 
   # 调试器
   ## VSCode debug: https://marketplace.visualstudio.com/items?itemName=KoichiSasada.vscode-rdbg
-  gem 'debug', '~> 1.8.0'
+  gem 'debug', '~> 1.9.1'
 
   # rails 更友好错误输出
   gem 'awesome_print'