1 Commits

Author SHA1 Message Date
renovate[bot]
5a11bc6b4d fix(deps): update react monorepo to v19 2025-03-28 21:11:57 +00:00
7 changed files with 26 additions and 34 deletions

View File

@@ -78,34 +78,26 @@ jobs:
- run: echo "outputs.create_tag_versionNumber - ${{ needs.build.outputs.create_tag_versionNumber }}" - run: echo "outputs.create_tag_versionNumber - ${{ needs.build.outputs.create_tag_versionNumber }}"
- run: echo "outputs.tag - ${{ needs.build.outputs.tag }}" - run: echo "outputs.tag - ${{ needs.build.outputs.tag }}"
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3
# Create Docker Image # Create Docker Image
- name: Docker login - name: Docker login
run: docker login -u ${{ secrets.DOCKER_USER }} -p ${{ secrets.DOCKER_PASSWORD }} run: docker login -u ${{ secrets.DOCKER_USER }} -p ${{ secrets.DOCKER_PASSWORD }}
# - name: Build wxmp image - name: Build wxmp image
# working-directory: website
# run: docker image build -t wxmp .
- name: Build and push multi-platform image
working-directory: website working-directory: website
run: docker image build -t wxmp .
- name: Tags & Push image (latest)
run: | run: |
docker buildx build \ echo "outputs.tag - ${{ needs.build.outputs.version }}"
--platform linux/amd64,linux/arm64 \ docker tag wxmp ${{ secrets.DOCKER_USER }}/wxmp:latest
-t ${{ secrets.DOCKER_USER }}/wxmp:latest \ docker push ${{ secrets.DOCKER_USER }}/wxmp:latest
--push .
- name: Tags & Push image
- name: Build and push multi-platform image (with tag)
if: needs.build.outputs.successful if: needs.build.outputs.successful
working-directory: website
run: | run: |
docker buildx build \ echo "outputs.tag - ${{ needs.build.outputs.version }}"
--platform linux/amd64,linux/arm64 \ docker tag wxmp ${{ secrets.DOCKER_USER }}/wxmp:${{needs.build.outputs.version}}
-t ${{ secrets.DOCKER_USER }}/wxmp:${{ needs.build.outputs.version }} \ docker push ${{ secrets.DOCKER_USER }}/wxmp:${{needs.build.outputs.version}}
--push .
# # Create Docker Image in GitHub # # Create Docker Image in GitHub
# - name: Login to GitHub registry # - name: Login to GitHub registry

View File

@@ -2,7 +2,7 @@
"name": "wxmp", "name": "wxmp",
"description": "微信公众号 Markdown 编辑器", "description": "微信公众号 Markdown 编辑器",
"homepage": "https://github.com/jaywcjlove/wxmp.git", "homepage": "https://github.com/jaywcjlove/wxmp.git",
"version": "2.4.1", "version": "2.4.0",
"main": "main.js", "main": "main.js",
"author": "Kenny Wong <398188662@qq.com>", "author": "Kenny Wong <398188662@qq.com>",
"private": true, "private": true,
@@ -18,13 +18,13 @@
"build": "npm run copy && cross-env NODE_ENV=production electron-builder build --publish=never --config config.json" "build": "npm run copy && cross-env NODE_ENV=production electron-builder build --publish=never --config config.json"
}, },
"dependencies": { "dependencies": {
"@wcj/wxmp-main": "2.4.1" "@wcj/wxmp-main": "2.4.0"
}, },
"devDependencies": { "devDependencies": {
"@wcj/wxmp-preload": "2.4.1", "@wcj/wxmp-preload": "2.4.0",
"cpy-cli": "^5.0.0", "cpy-cli": "^5.0.0",
"electron": "20.1.3", "electron": "20.1.3",
"electron-builder": "23.3.3", "electron-builder": "23.3.3",
"website": "2.4.1" "website": "2.4.0"
} }
} }

View File

@@ -1,6 +1,6 @@
{ {
"name": "@wcj/wxmp-main", "name": "@wcj/wxmp-main",
"version": "2.4.1", "version": "2.4.0",
"main": "./lib/index.js", "main": "./lib/index.js",
"private": true, "private": true,
"scripts": { "scripts": {

View File

@@ -1,6 +1,6 @@
{ {
"name": "@wcj/wxmp-preload", "name": "@wcj/wxmp-preload",
"version": "2.4.1", "version": "2.4.0",
"main": "./lib/index.js", "main": "./lib/index.js",
"private": true, "private": true,
"scripts": { "scripts": {

View File

@@ -1,4 +1,4 @@
{ {
"version": "2.4.1", "version": "2.4.0",
"packages": ["website", "electron/*"] "packages": ["website", "electron/*"]
} }

View File

@@ -19,8 +19,8 @@
"husky": "^8.0.1", "husky": "^8.0.1",
"lerna": "^8.0.0", "lerna": "^8.0.0",
"prettier": "^3.0.2", "prettier": "^3.0.2",
"react": "~18.2.0", "react": "~19.1.0",
"react-dom": "~18.2.0", "react-dom": "~19.1.0",
"tsbb": "~4.4.0" "tsbb": "~4.4.0"
}, },
"workspaces": { "workspaces": {

View File

@@ -1,6 +1,6 @@
{ {
"name": "website", "name": "website",
"version": "2.4.1", "version": "2.4.0",
"private": true, "private": true,
"scripts": { "scripts": {
"start": "kkt start", "start": "kkt start",
@@ -28,8 +28,8 @@
"@uiw/react-markdown-editor": "^6.0.0", "@uiw/react-markdown-editor": "^6.0.0",
"@wcj/dark-mode": "^1.0.15", "@wcj/dark-mode": "^1.0.15",
"css-tree": "^2.2.1", "css-tree": "^2.2.1",
"react": "~18.2.0", "react": "~19.1.0",
"react-dom": "~18.2.0", "react-dom": "~19.1.0",
"react-hot-toast": "^2.3.0", "react-hot-toast": "^2.3.0",
"react-router-dom": "^6.3.0", "react-router-dom": "^6.3.0",
"rehype-attr": "^3.0.0", "rehype-attr": "^3.0.0",
@@ -48,8 +48,8 @@
"@kkt/raw-modules": "^7.2.0", "@kkt/raw-modules": "^7.2.0",
"@kkt/scope-plugin-options": "^7.2.0", "@kkt/scope-plugin-options": "^7.2.0",
"@types/css-tree": "^2.3.1", "@types/css-tree": "^2.3.1",
"@types/react": "^18.0.17", "@types/react": "^19.0.0",
"@types/react-dom": "^18.0.6", "@types/react-dom": "^19.0.0",
"kkt": "^7.2.0", "kkt": "^7.2.0",
"markdown-react-code-preview-loader": "^2.1.2" "markdown-react-code-preview-loader": "^2.1.2"
}, },