Merge branch 'main' into feat/conventional-commit

Author: falnyr

.github/dependabot.yml

@@ -5,16 +5,16 @@ updates:
   - package-ecosystem: "maven"
     directory: "/server/api-service"
     schedule:
-      interval: "weekly"
+      interval: "monthly"
   - package-ecosystem: "npm"
     directory: "/server/node-service"
     schedule:
-      interval: "weekly"
+      interval: "monthly"
   - package-ecosystem: "npm"
     directory: "/client"
     schedule:
-      interval: "weekly"
+      interval: "monthly"
   - package-ecosystem: "docker"
     directory: "/deploy/docker"
     schedule:
-      interval: "weekly"
+      interval: "monthly"

.github/workflows/client.yml

@@ -0,0 +1,37 @@
+name: Client
+on:
+  pull_request:
+    types: [opened, synchronize, reopened]
+    paths:
+      - 'client/**'
+
+permissions:
+  contents: read
+
+jobs:
+  test:
+    name: Tests
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        node-version: [ 20.x ]
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+      - name: Use Node.js ${{ matrix.node-version }}
+        uses: actions/setup-node@v3
+        with:
+          node-version: ${{ matrix.node-version }}
+          cache: 'yarn'
+          cache-dependency-path: 'client/yarn.lock'
+      - name: Install dependencies
+        uses: borales/actions-yarn@v4
+        with:
+          cmd: install
+          dir: client
+      - name: Run tests
+        uses: borales/actions-yarn@v4
+        with:
+          cmd: test
+          dir: client

.github/workflows/codeql.yml

@@ -14,9 +14,6 @@ name: "CodeQL"
 on:
   push:
     branches: [ "main" ]
-  pull_request:
-    # The branches below must be a subset of the branches above
-    branches: [ "main" ]
   schedule:
     - cron: '20 15 * * 5'
 
@@ -57,7 +54,7 @@ jobs:
 
         # Details on CodeQL's query packs refer to : https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
         # queries: security-extended,security-and-quality
-    
+
     - if: matrix.language == 'java'
       name: Build Java
       run: |

.github/workflows/sonarcloud.yml

@@ -3,7 +3,7 @@ on:
   push:
     branches:
       - main
-  pull_request:
+  pull_request_target:
     types: [opened, synchronize, reopened]
 
 permissions:

app.json

@@ -1,5 +1,5 @@
 {
-  "name": "Lowcoder",
+  "name": "lowcoder",
   "description": "Lowcoder is a developer-friendly open-source low code platform to build internal apps within minutes.",
   "repository": "https://github.com/lowcoder-org/lowcoder",
   "logo": "https://cdn-files.openblocks.dev/logo.png",

client/.gitignore

@@ -14,7 +14,7 @@
 
 # production
 /build
-/packages/openblocks/build
+/packages/lowcoder/build
 
 # misc
 .DS_Store
@@ -52,4 +52,4 @@ TODO
 /ossutil_output
 package-lock.json
 
-op.mjs
+op.mjs

client/README.md

@@ -9,7 +9,7 @@
 Simply run below command to start a backend server.
 
 ```bash
-docker run -d --name openblocks -p 3000:3000 -v "$PWD/stacks:/openblocks-stacks" lowcoderorg/lowcoder-ce
+docker run -d --name lowcoder -p 3000:3000 -v "$PWD/stacks:/lowcoder-stacks" lowcoderorg/lowcoder-ce
 ```
 
 For more information, view our [docs](../docs/self-hosting)
@@ -20,13 +20,13 @@ For more information, view our [docs](../docs/self-hosting)
 2. Use the command below to build Docker image :
 
 ```bash
-docker build -f ./deploy/docker/Dockerfile -t openblocks-dev .
+docker build -f ./deploy/docker/Dockerfile -t lowcoder-dev .
 ```
 
 3. Start
 
 ```bash
-docker run -d --name openblocks-dev -p 3000:3000 -v "$PWD/stacks:/openblocks-stacks" openblocks-dev
+docker run -d --name lowcoder-dev -p 3000:3000 -v "$PWD/stacks:/lowcoder-stacks" lowcoder-dev
 ```
 
 ### Start develop
@@ -43,4 +43,4 @@ In addition, before submitting a pull request, please make sure the following is
 
 1. If you’ve fixed a bug or added code that should be tested and add unit test suite.
 2. Run `yarn test` and ensure all test suites pass.
-3. If you add new dependency, use yarn workspace openblocks some-package to make sure yarn.lock is also updated.
+3. If you add new dependency, use yarn workspace lowcoder some-package to make sure yarn.lock is also updated.

client/config/test/jest.config.js

@@ -1,6 +1,6 @@
 import path from "node:path";
-import { buildVars } from "openblocks-dev-utils/buildVars.js";
-import { currentDirName } from "openblocks-dev-utils/util.js";
+import { buildVars } from "lowcoder-dev-utils/buildVars.js";
+import { currentDirName } from "lowcoder-dev-utils/util.js";
 
 const globals = {};
 buildVars.forEach(({ name, defaultValue }) => {
@@ -13,22 +13,25 @@ const dirname = currentDirName(import.meta.url);
 
 export default {
   testEnvironment: "jsdom",
+  testEnvironmentOptions: {
+    url: 'http://localhost'
+  },
   moduleNameMapper: {
     "react-markdown": path.resolve(dirname, "./mocks/react-markdown.js"),
     "\\.md\\?url$": path.resolve(dirname, "./mocks/markdown-url-module.js"),
-    "^@openblocks-ee(.*)$": path.resolve(
+    "^@lowcoder-ee(.*)$": path.resolve(
       dirname,
-      isEE ? "../../packages/openblocks/src/ee/$1" : "../../packages/openblocks/src/$1"
+      isEE ? "../../packages/lowcoder/src/ee/$1" : "../../packages/lowcoder/src/$1"
     ),
-    "openblocks-sdk": path.resolve(dirname, "../../packages/openblocks/src/index.sdk"),
+    "lowcoder-sdk": path.resolve(dirname, "../../packages/lowcoder/src/index.sdk"),
   },
   globals,
   // roots: ["<rootDir>/src"],
   modulePaths: [
     "<rootDir>/src",
-    path.resolve(dirname, "../../packages/openblocks/src"),
-    path.resolve(dirname, "../../packages/openblocks-comps/src"),
-    path.resolve(dirname, "../../packages/openblocks-design/src"),
+    path.resolve(dirname, "../../packages/lowcoder/src"),
+    path.resolve(dirname, "../../packages/lowcoder-comps/src"),
+    path.resolve(dirname, "../../packages/lowcoder-design/src"),
   ],
   setupFiles: [path.resolve(dirname, "./jest.setup.js")],
   setupFilesAfterEnv: [path.resolve(dirname, "./jest.setup-after-env.js")],

client/jest.config.js

@@ -1,3 +1,3 @@
 export default {
-  projects: ["<rootDir>/packages/openblocks", "<rootDir>/packages/openblocks-core"],
+  projects: ["<rootDir>/packages/lowcoder", "<rootDir>/packages/lowcoder-core"],
 };

client/package.json

@@ -10,14 +10,14 @@
     "node": "^14.18.0 || >=16.0.0"
   },
   "scripts": {
-    "start": "yarn workspace openblocks start",
-    "start:ee": "REACT_APP_EDITION=enterprise yarn workspace openblocks start",
-    "start:ee-global": "REACT_APP_EDITION=enterprise-global yarn workspace openblocks start",
+    "start": "yarn workspace lowcoder start",
+    "start:ee": "REACT_APP_EDITION=enterprise yarn workspace lowcoder start",
+    "start:ee-global": "REACT_APP_EDITION=enterprise-global yarn workspace lowcoder start",
     "build": "yarn node ./scripts/build.js",
-    "test": "jest && yarn workspace openblocks-comps test",
-    "prepare": "yarn workspace openblocks prepare",
-    "build:core": "yarn workspace openblocks-core build",
-    "test:core": "yarn workspace openblocks-core test"
+    "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"
   },
   "devDependencies": {
     "@babel/preset-env": "^7.20.2",
@@ -46,11 +46,11 @@
     "babel-jest": "^29.3.0",
     "babel-preset-react-app": "^10.0.1",
     "husky": "^8.0.1",
-    "jest": "^29.3.0",
-    "jest-environment-jsdom": "^29.0.3",
+    "jest": "^29.5.0",
+    "jest-environment-jsdom": "^29.5.0",
     "lint-staged": "^13.0.1",
+    "lowcoder-dev-utils": "workspace:^",
     "mq-polyfill": "^1.1.8",
-    "openblocks-dev-utils": "workspace:^",
     "prettier": "^2.7.0",
     "rimraf": "^3.0.2",
     "rollup": "^2.79.0",

client/packages/create-lowcoder-plugin/README.md

@@ -0,0 +1,11 @@
+# create-lowcoder-plugin
+
+## Usage
+
+```bash
+yarn create lowcoder-plugin my-lowcoder-plugin
+
+# or
+
+npm create lowcoder-plugin my-lowcoder-plugin
+```

client/packages/create-openblocks-plugin/index.js renamed to client/packages/create-lowcoder-plugin/index.js

@@ -5,14 +5,14 @@ import { spawn } from "cross-spawn";
 import { writeFileSync, existsSync } from "node:fs";
 import chalk from "chalk";
 import { createCommand } from "commander";
-import { readJson, currentDirName } from "openblocks-dev-utils/util.js";
+import { readJson, currentDirName } from "lowcoder-dev-utils/util.js";
 
 const currentDir = currentDirName(import.meta.url);
 const pkg = readJson(path.resolve(currentDir, "./package.json"));
 
 const isUsingYarn = (process.env.npm_config_user_agent || "").indexOf("yarn") === 0;
-const cliPackageName = "openblocks-cli";
-const sdkPackageName = "openblocks-sdk";
+const cliPackageName = "lowcoder-cli";
+const sdkPackageName = "lowcoder-sdk";
 
 let verbose = false;
 let registry;
@@ -89,11 +89,11 @@ function executeNodeScript({ cwd, args }, data, source) {
 }
 
 /**
- * create openblocks comps project
+ * create lowcoder comps project
  * 1. create dir
  * 2. create package.json
- * 3. install openblocks-cli
- * 4. run `openblocks-cli init`
+ * 3. install lowcoder-cli
+ * 4. run `lowcoder-cli init`
  */
 async function createProject(projectName, options) {
   const { template, force } = options;

client/packages/create-openblocks-plugin/package.json renamed to client/packages/create-lowcoder-plugin/package.json

@@ -1,17 +1,17 @@
 {
-  "name": "create-openblocks-plugin",
-  "version": "0.0.3",
+  "name": "create-lowcoder-plugin",
+  "version": "0.0.4",
   "bin": "./index.js",
   "type": "module",
   "dependencies": {
     "chalk": "4",
     "commander": "^9.4.1",
     "cross-spawn": "^7.0.3",
     "fs-extra": "^10.1.0",
-    "openblocks-dev-utils": "workspace:^"
+    "lowcoder-dev-utils": "workspace:^"
   },
   "license": "MIT",
   "keywords": [
-    "openblocks"
+    "lowcoder"
   ]
 }

client/packages/create-openblocks-plugin/README.md

@@ -1,4 +1,4 @@
-# openblocks comp lib
+# lowcoder comp lib
 
 ## Start
 

client/packages/openblocks-cli-template-typescript/.gitignore renamed to client/packages/lowcoder-cli-template-typescript/.gitignore

@@ -0,0 +1,5 @@
+# lowcoder-cli-template-typescript
+
+This is the official typescript template of lowcoder-cli.
+
+This template will be used by default.

client/packages/openblocks-cli-template-typescript/README-template.md renamed to client/packages/lowcoder-cli-template-typescript/README-template.md

@@ -4,7 +4,7 @@
     <meta charset="UTF-8" />
     <meta http-equiv="X-UA-Compatible" content="IE=edge" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>Openblocks Comp Playground</title>
+    <title>Lowcoder Comp Playground</title>
     <style>
       #root {
         height: 100vh;

client/packages/lowcoder-cli-template-typescript/README.md

@@ -1,17 +1,17 @@
 import ReactDOM from "react-dom";
-import { CompIDE } from "openblocks-sdk";
-import { name, version, openblocks } from "./package.json";
+import { CompIDE } from "lowcoder-sdk";
+import { name, version, lowcoder } from "./package.json";
 import compMap from "./src/index";
 
-import "openblocks-sdk/dist/style.css";
+import "lowcoder-sdk/dist/style.css";
 
 function CompDevApp() {
   return (
     <CompIDE
       compMap={compMap}
       packageName={name}
       packageVersion={version}
-      compMeta={openblocks.comps}
+      compMeta={lowcoder.comps}
     />
   );
 }

client/packages/openblocks-cli-template-typescript/icons/demo-icon.svg renamed to client/packages/lowcoder-cli-template-typescript/icons/demo-icon.svg

@@ -1,28 +1,28 @@
 {
-  "name": "openblocks-cli-template-typescript",
-  "version": "0.0.11",
+  "name": "lowcoder-cli-template-typescript",
+  "version": "0.0.12",
   "type": "module",
   "scripts": {
     "start": "vite",
-    "build": "openblocks-cli build"
+    "build": "lowcoder-cli build"
   },
-  "openblocks": {
+  "lowcoder": {
     "description": "",
     "comps": {
       "hello_world": {
         "name": "__i18n_helloWorldCompName__",
-        "icon": "./icons/demo-icon.png"
+        "icon": "./icons/demo-icon.svg"
       }
     }
   },
   "devDependencies": {
-    "openblocks-cli": "workspace:^",
-    "openblocks-sdk": "workspace:^",
+    "lowcoder-cli": "workspace:^",
+    "lowcoder-sdk": "workspace:^",
     "typescript": "^4.8.4",
     "vite": "^3.2.4"
   },
   "keywords": [
-    "openblocks"
+    "lowcoder"
   ],
   "license": "MIT"
 }

client/packages/openblocks-cli-template-typescript/index.html renamed to client/packages/lowcoder-cli-template-typescript/index.html

@@ -9,7 +9,7 @@ import {
   NameConfig,
   eventHandlerControl,
   withMethodExposing,
-} from "openblocks-sdk";
+} from "lowcoder-sdk";
 
 import styles from "./styles.module.css";
 

client/packages/openblocks-cli-template-typescript/index.tsx renamed to client/packages/lowcoder-cli-template-typescript/index.tsx

@@ -0,0 +1,3 @@
+/// <reference types="lowcoder-cli/client" />
+
+declare module "lowcoder-sdk";