Skip to content

feat(pwa): per-app PWA icons/manifest, editor updates, and server endpoints #1950

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.

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

Closed
wants to merge 19 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
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
21 changes: 21 additions & 0 deletions .github/workflows/docker-images.yml
Original file line number Diff line number Diff line change
Expand Up @@ -80,18 +80,21 @@ jobs:
# Image names
ALLINONE_IMAGE_NAMES=lowcoderorg/lowcoder-ce:${IMAGE_TAG}
FRONTEND_IMAGE_NAMES=lowcoderorg/lowcoder-ce-frontend:${IMAGE_TAG}
FRONTEND_EE_IMAGE_NAMES=lowcoderorg/lowcoder-enterprise-frontend:${IMAGE_TAG}
APISERVICE_IMAGE_NAMES=lowcoderorg/lowcoder-ce-api-service:${IMAGE_TAG}
NODESERVICE_IMAGE_NAMES=lowcoderorg/lowcoder-ce-node-service:${IMAGE_TAG}

if [[ "${IS_LATEST}" == "true" ]]; then
ALLINONE_IMAGE_NAMES="lowcoderorg/lowcoder-ce:latest,${ALLINONE_IMAGE_NAMES}"
FRONTEND_IMAGE_NAMES="lowcoderorg/lowcoder-ce-frontend:latest,${FRONTEND_IMAGE_NAMES}"
FRONTEND_EE_IMAGE_NAMES="lowcoderorg/lowcoder-enterprise-frontend:latest,${FRONTEND_EE_IMAGE_NAMES}"
APISERVICE_IMAGE_NAMES="lowcoderorg/lowcoder-ce-api-service:latest,${APISERVICE_IMAGE_NAMES}"
NODESERVICE_IMAGE_NAMES="lowcoderorg/lowcoder-ce-node-service:latest,${NODESERVICE_IMAGE_NAMES}"
fi;

echo "ALLINONE_IMAGE_NAMES=${ALLINONE_IMAGE_NAMES}" >> "${GITHUB_ENV}"
echo "FRONTEND_IMAGE_NAMES=${FRONTEND_IMAGE_NAMES}" >> "${GITHUB_ENV}"
echo "FRONTEND_EE_IMAGE_NAMES=${FRONTEND_EE_IMAGE_NAMES}" >> "${GITHUB_ENV}"
echo "APISERVICE_IMAGE_NAMES=${APISERVICE_IMAGE_NAMES}" >> "${GITHUB_ENV}"
echo "NODESERVICE_IMAGE_NAMES=${NODESERVICE_IMAGE_NAMES}" >> "${GITHUB_ENV}"

Expand Down Expand Up @@ -146,6 +149,24 @@ jobs:
push: true
tags: ${{ env.FRONTEND_IMAGE_NAMES }}

- name: Build and push the enterprise edition frontend image
if: ${{ env.BUILD_FRONTEND == 'true' }}
uses: docker/build-push-action@v6
env:
NODE_ENV: production
with:
file: ./deploy/docker/Dockerfile
target: lowcoder-enterprise-frontend
build-args: |
REACT_APP_ENV=production
REACT_APP_EDITION=enterprise
REACT_APP_COMMIT_ID="dev #${{ env.SHORT_SHA }}"
platforms: |
linux/amd64
linux/arm64
push: true
tags: ${{ env.FRONTEND_EE_IMAGE_NAMES }}

- name: Build and push the node service image
if: ${{ env.BUILD_NODESERVICE == 'true' }}
uses: docker/build-push-action@v6
Expand Down
183 changes: 92 additions & 91 deletions client/package.json
Original file line number Diff line number Diff line change
@@ -1,93 +1,94 @@
{
"name": "lowcoder-frontend",
"version": "2.7.3",
"type": "module",
"private": true,
"workspaces": [
"packages/*"
],
"engines": {
"node": "^14.18.0 || >=16.0.0"
},
"scripts": {
"start": "yarn workspace lowcoder start",
"start-win": "LOWCODER_API_SERVICE_URL=http://localhost:3000 yarn start",
"start:ee": "REACT_APP_EDITION=enterprise yarn workspace lowcoder start",
"translate": "node --loader ts-node/esm ./scripts/translate.js",
"build": "yarn node ./scripts/build.js",
"test": "jest && yarn workspace lowcoder-comps test",
"prepare": "yarn workspace lowcoder prepare",
"build:core": "yarn workspace lowcoder-core build",
"test:core": "yarn workspace lowcoder-core test",
"lint": "eslint . --fix"
},
"devDependencies": {
"@babel/preset-env": "^7.20.2",
"@babel/preset-typescript": "^7.18.6",
"@rollup/plugin-typescript": "^12.1.0",
"@testing-library/jest-dom": "^5.16.5",
"@types/file-saver": "^2.0.5",
"@types/jest": "^29.2.2",
"@types/mime": "^2.0.3",
"@types/qrcode.react": "^1.0.2",
"@types/react-grid-layout": "^1.3.0",
"@types/react-helmet": "^6.1.5",
"@types/react-resizable": "^3.0.5",
"@types/react-router-dom": "^5.3.2",
"@types/shelljs": "^0.8.11",
"@types/simplebar": "^5.3.3",
"@types/stylis": "^4.0.2",
"@types/tern": "0.23.4",
"@types/ua-parser-js": "^0.7.36",
"@welldone-software/why-did-you-render": "^6.2.3",
"add": "^2.0.6",
"babel-jest": "^29.3.0",
"babel-preset-react-app": "^10.0.1",
"babel-preset-vite": "^1.1.3",
"husky": "^8.0.1",
"jest": "^29.5.0",
"jest-canvas-mock": "^2.5.2",
"jest-environment-jsdom": "^29.5.0",
"lint-staged": "^13.0.1",
"lowcoder-cli": "workspace:^",
"mq-polyfill": "^1.1.8",
"prettier": "^3.1.0",
"rimraf": "^3.0.2",
"shelljs": "^0.8.5",
"svgo": "^3.0.0",
"ts-node": "^10.4.0",
"typescript": "^4.8.4",
"whatwg-fetch": "^3.6.2"
},
"lint-staged": {
"**/*.{mjs,ts,tsx,json,md,html}": "prettier --write --ignore-unknown",
"**/*.svg": "svgo"
},
"packageManager": "[email protected]",
"resolutions": {
"@types/react": "^18",
"moment": "2.29.2",
"canvas": "https://registry.yarnpkg.com/@favware/skip-dependency/-/skip-dependency-1.2.1.tgz",
"react-virtualized@^9.22.3": "patch:react-virtualized@npm%3A9.22.3#./.yarn/patches/react-virtualized-npm-9.22.3-0fff3cbf64.patch",
"eslint-plugin-only-ascii@^0.0.0": "patch:eslint-plugin-only-ascii@npm%3A0.0.0#./.yarn/patches/eslint-plugin-only-ascii-npm-0.0.0-29e3417685.patch"
},
"dependencies": {
"@lottiefiles/react-lottie-player": "^3.5.3",
"@remixicon/react": "^4.1.1",
"@supabase/supabase-js": "^2.45.4",
"@testing-library/react": "^14.1.2",
"@testing-library/user-event": "^14.5.1",
"@types/styled-components": "^5.1.34",
"antd-mobile": "^5.34.0",
"chalk": "4",
"flag-icons": "^7.2.1",
"number-precision": "^1.6.0",
"react-countup": "^6.5.3",
"react-github-btn": "^1.4.0",
"react-player": "^2.11.0",
"resize-observer-polyfill": "^1.5.1",
"rollup": "^4.22.5",
"simplebar": "^6.2.5",
"tui-image-editor": "^3.15.3"
}
"name": "lowcoder-frontend",
"version": "2.7.3",
"type": "module",
"private": true,
"workspaces": [
"packages/*"
],
"engines": {
"node": "^14.18.0 || >=16.0.0"
},
"scripts": {
"start": "yarn workspace lowcoder start",
"start-win": "LOWCODER_API_SERVICE_URL=http://localhost:8080 LOWCODER_NODE_SERVICE_URL=http://localhost:6060 yarn start",
"start:ee": "REACT_APP_EDITION=enterprise yarn workspace lowcoder start",
"translate": "node --loader ts-node/esm ./scripts/translate.js",
"build": "yarn node ./scripts/build.js",
"build:ee": "REACT_APP_EDITION=enterprise yarn node ./scripts/build.js",
"test": "jest && yarn workspace lowcoder-comps test",
"prepare": "yarn workspace lowcoder prepare",
"build:core": "yarn workspace lowcoder-core build",
"test:core": "yarn workspace lowcoder-core test",
"lint": "eslint . --fix"
},
"devDependencies": {
"@babel/preset-env": "^7.20.2",
"@babel/preset-typescript": "^7.18.6",
"@rollup/plugin-typescript": "^12.1.0",
"@testing-library/jest-dom": "^5.16.5",
"@types/file-saver": "^2.0.5",
"@types/jest": "^29.2.2",
"@types/mime": "^2.0.3",
"@types/qrcode.react": "^1.0.2",
"@types/react-grid-layout": "^1.3.0",
"@types/react-helmet": "^6.1.5",
"@types/react-resizable": "^3.0.5",
"@types/react-router-dom": "^5.3.2",
"@types/shelljs": "^0.8.11",
"@types/simplebar": "^5.3.3",
"@types/stylis": "^4.0.2",
"@types/tern": "0.23.4",
"@types/ua-parser-js": "^0.7.36",
"@welldone-software/why-did-you-render": "^6.2.3",
"add": "^2.0.6",
"babel-jest": "^29.3.0",
"babel-preset-react-app": "^10.0.1",
"babel-preset-vite": "^1.1.3",
"husky": "^8.0.1",
"jest": "^29.5.0",
"jest-canvas-mock": "^2.5.2",
"jest-environment-jsdom": "^29.5.0",
"lint-staged": "^13.0.1",
"lowcoder-cli": "workspace:^",
"mq-polyfill": "^1.1.8",
"prettier": "^3.1.0",
"rimraf": "^3.0.2",
"shelljs": "^0.8.5",
"svgo": "^3.0.0",
"ts-node": "^10.4.0",
"typescript": "^4.8.4",
"whatwg-fetch": "^3.6.2"
},
"lint-staged": {
"**/*.{mjs,ts,tsx,json,md,html}": "prettier --write --ignore-unknown",
"**/*.svg": "svgo"
},
"packageManager": "[email protected]",
"resolutions": {
"@types/react": "^18",
"moment": "2.29.2",
"canvas": "https://registry.yarnpkg.com/@favware/skip-dependency/-/skip-dependency-1.2.1.tgz",
"react-virtualized@^9.22.3": "patch:react-virtualized@npm%3A9.22.3#./.yarn/patches/react-virtualized-npm-9.22.3-0fff3cbf64.patch",
"eslint-plugin-only-ascii@^0.0.0": "patch:eslint-plugin-only-ascii@npm%3A0.0.0#./.yarn/patches/eslint-plugin-only-ascii-npm-0.0.0-29e3417685.patch"
},
"dependencies": {
"@lottiefiles/react-lottie-player": "^3.5.3",
"@remixicon/react": "^4.1.1",
"@supabase/supabase-js": "^2.45.4",
"@testing-library/react": "^14.1.2",
"@testing-library/user-event": "^14.5.1",
"@types/styled-components": "^5.1.34",
"antd-mobile": "^5.34.0",
"chalk": "4",
"flag-icons": "^7.2.1",
"number-precision": "^1.6.0",
"react-countup": "^6.5.3",
"react-github-btn": "^1.4.0",
"react-player": "^2.11.0",
"resize-observer-polyfill": "^1.5.1",
"rollup": "^4.22.5",
"simplebar": "^6.2.5",
"tui-image-editor": "^3.15.3"
}
}
Loading
Loading