From 7ada0c9fff30e2b5b4684170d9c3441bc4695cfe Mon Sep 17 00:00:00 2001 From: Mikiko <112603073+wenzhuo2022@users.noreply.github.com> Date: Fri, 9 Feb 2024 15:17:21 +0800 Subject: [PATCH 1/2] [ci skip]Update README-CN.md (#3696) Update the qrcode of wechat --- README-CN.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README-CN.md b/README-CN.md index 38cf7686fb..ac0611da9d 100644 --- a/README-CN.md +++ b/README-CN.md @@ -95,7 +95,8 @@ ILLA CLI 使您能够以超乎想象的速度部署 ILLA Builder。 [单击此 加入微信群: -![IMG_5405](https://github.com/illacloud/illa-builder/assets/112603073/9fd62305-13d0-487c-b9cd-ed7fb88d7448) +![IMG_5468](https://github.com/illacloud/illa-builder/assets/112603073/bbdc47f4-97bd-4258-bc89-893ce28cbe53) + Discord与Github社区入口 From 02fa4ebd63bb485b5fc62f694b35645335a982f6 Mon Sep 17 00:00:00 2001 From: AruSeito <41471697+AruSeito@users.noreply.github.com> Date: Sun, 18 Feb 2024 16:39:17 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=F0=9F=90=9B=20number=20input?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfile | 3 +-- apps/builder/package.json | 2 +- packages/illa-design | 2 +- packages/illa-public-component | 2 +- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index da7fde4b72..edc4ce4356 100644 --- a/Dockerfile +++ b/Dockerfile @@ -11,8 +11,7 @@ RUN apk add --no-cache \ ## copy frontend COPY nginx.conf /etc/nginx/nginx.conf COPY illa-builder-frontend.conf /etc/nginx/conf.d/illa-builder-frontend.conf -COPY ./apps/builder/dist/index.html /opt/illa/illa-builder-frontend/index.html -COPY ./apps/builder/dist/assets /opt/illa/illa-builder-frontend/assets +COPY ./apps/builder/dist /opt/illa/illa-builder-frontend RUN rm /etc/nginx/conf.d/default.conf # test nginx diff --git a/apps/builder/package.json b/apps/builder/package.json index 1787a3d65a..1cf1b92a6a 100644 --- a/apps/builder/package.json +++ b/apps/builder/package.json @@ -5,7 +5,7 @@ "private": true, "author": "ILLA Cloud ", "license": "Apache-2.0", - "version": "4.5.1", + "version": "4.5.2", "scripts": { "dev": "vite --strictPort --force", "build-cloud": "NODE_OPTIONS=--max-old-space-size=12288 vite build --mode cloud", diff --git a/packages/illa-design b/packages/illa-design index 311ab35dc5..3e1775f5a2 160000 --- a/packages/illa-design +++ b/packages/illa-design @@ -1 +1 @@ -Subproject commit 311ab35dc5008f86d951ca0d2c23e3568804e8c6 +Subproject commit 3e1775f5a2a1c797dd227b805eff780b7a47aec1 diff --git a/packages/illa-public-component b/packages/illa-public-component index 177c18b561..df60cc54ee 160000 --- a/packages/illa-public-component +++ b/packages/illa-public-component @@ -1 +1 @@ -Subproject commit 177c18b561897996c03d867c33214282269f2265 +Subproject commit df60cc54ee3333fb69e052be31132f87b0849066