Skip to content

[pull] main from 142vip:main #3

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.

Sign up for GitHub

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

Open
pull wants to merge 2 commits into
base: main
Choose a base branch
from
Open

[pull] main from 142vip:main #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e9c4951
fix: 修复镜像构建异常，简化构建步骤、处理逻辑
mmdapl Jun 24, 2026
93b8f97
fix: 修复首页`git`仓库提交折线图显示异常
mmdapl Aug 3, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@
# CONTAINER_BUILD: 采用容器构建
#

FROM registry.cn-hangzhou.aliyuncs.com/142vip-infra/node:20.18.0-alpine AS build_base
FROM registry.cn-hangzhou.aliyuncs.com/142vip-infra/node:25.9.0-base AS build_base

# 是否配置代理
ARG NEED_PROXY_BUILD=false
ARG NEED_PROXY

ENV NODE_OPTIONS="--max-old-space-size=200000"
# 设置环境变量，支持容器构建时使用layer缓存，参考：https://pnpm.io/zh/docker
Expand All @@ -25,7 +25,7 @@ COPY . .

# 基于容器自动构建
RUN --mount=type=cache,id=pnpm,target=/pnpm/store sh ./scripts/ci --ignore-scripts && \
if [ "$NEED_PROXY_BUILD" = "false" ]; \
if [ "$NEED_PROXY" = "false" ]; \
then \
pnpm build; \
else \
Expand Down
6 changes: 5 additions & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -521,7 +521,11 @@ Nuxt.js是在vue框架上进行封装的，主要是用来解决单体页面的
## 趋势

<div style="text-align: center" align="center">
<img alt="Star History Chart" src="https://api.star-history.com/svg?repos=142vip/JavaScriptCollection,142vip/core-x,142vip/408CSFamily&type=Date" />
<img
src="https://api.star-history.com/svg?repos=142vip%2Fcore-x%2C142vip%2F408csfamily%2C142vip%2Fjavascriptcollection&type=Date&sealed_token=iaO-GLnvLpYHibmRk7lxdWHU5MRcN8yp072DbAkSuka6yVP87RCc245bDe_8qXluQuI-105rgdN5qw_G7omm8P05FDOB4ir6De_EdwCOyZUuxWCQE-LfbA"
alt="Star History"
style="border-radius: 5px"
>
</div>

## 联系作者
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
"@142vip/eslint-config": "0.0.1-alpha.5",
"@142vip/fairy-cli": "0.0.3-alpha.30",
"@142vip/open-source": "0.0.1-alpha.3",
"@142vip/utils": "0.0.1-alpha.50",
"@142vip/utils": "0.0.1-alpha.52",
"@142vip/vuepress": "0.0.1-alpha.18",
"only-allow": "1.2.1",
"simple-git-hooks": "2.13.0",
Expand Down
98 changes: 14 additions & 84 deletions pnpm-lock.yaml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion scripts/core/build-image.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ export async function buildImageMain() {
imageName: realImageName,
buildArgs: [
// 参数中是否包含 --proxy
['NEED_PROXY_BUILD', VipNodeJS.getProcessArgv().includes('--proxy')],
['NEED_PROXY', VipNodeJS.getProcessArgv().includes('--proxy')],
['APP_NAME', name],
['APP_VERSION', version],
['APP_DESCRIPTION', description],
Expand Down
Loading