diff --git a/client/.gitignore b/client/.gitignore index 6dc91ad5b..fff164f7f 100644 --- a/client/.gitignore +++ b/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 \ No newline at end of file +op.mjs diff --git a/client/README.md b/client/README.md index b5b16013f..bde7319b3 100644 --- a/client/README.md +++ b/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. diff --git a/client/config/test/jest.config.js b/client/config/test/jest.config.js index 1f1196b72..0c5a5e088 100644 --- a/client/config/test/jest.config.js +++ b/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 }) => { @@ -16,19 +16,19 @@ export default { 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: ["/src"], modulePaths: [ "/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")], diff --git a/client/jest.config.js b/client/jest.config.js index 53ea0fdba..5369bf475 100644 --- a/client/jest.config.js +++ b/client/jest.config.js @@ -1,3 +1,3 @@ export default { - projects: ["/packages/openblocks", "/packages/openblocks-core"], + projects: ["/packages/lowcoder", "/packages/lowcoder-core"], }; diff --git a/client/package.json b/client/package.json index 7f210c8ef..534136699 100644 --- a/client/package.json +++ b/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", @@ -49,8 +49,8 @@ "jest": "^29.3.0", "jest-environment-jsdom": "^29.0.3", "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", diff --git a/client/packages/create-lowcoder-plugin/README.md b/client/packages/create-lowcoder-plugin/README.md new file mode 100644 index 000000000..6052a5500 --- /dev/null +++ b/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 +``` diff --git a/client/packages/create-openblocks-plugin/index.js b/client/packages/create-lowcoder-plugin/index.js similarity index 93% rename from client/packages/create-openblocks-plugin/index.js rename to client/packages/create-lowcoder-plugin/index.js index 3229dd890..b47bfa9f8 100755 --- a/client/packages/create-openblocks-plugin/index.js +++ b/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; diff --git a/client/packages/create-openblocks-plugin/package.json b/client/packages/create-lowcoder-plugin/package.json similarity index 64% rename from client/packages/create-openblocks-plugin/package.json rename to client/packages/create-lowcoder-plugin/package.json index e4db470c4..b3800683f 100644 --- a/client/packages/create-openblocks-plugin/package.json +++ b/client/packages/create-lowcoder-plugin/package.json @@ -1,6 +1,6 @@ { - "name": "create-openblocks-plugin", - "version": "0.0.3", + "name": "create-lowcoder-plugin", + "version": "0.0.4", "bin": "./index.js", "type": "module", "dependencies": { @@ -8,10 +8,10 @@ "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" ] } diff --git a/client/packages/create-openblocks-plugin/README.md b/client/packages/create-openblocks-plugin/README.md deleted file mode 100644 index c4fb22512..000000000 --- a/client/packages/create-openblocks-plugin/README.md +++ /dev/null @@ -1,11 +0,0 @@ -# create-openblocks-plugin - -## Usage - -```bash -yarn create openblocks-plugin my-openblocks-plugin - -# or - -npm create openblocks-plugin my-openblocks-plugin -``` diff --git a/client/packages/openblocks-cli-template-typescript/.gitignore b/client/packages/lowcoder-cli-template-typescript/.gitignore similarity index 100% rename from client/packages/openblocks-cli-template-typescript/.gitignore rename to client/packages/lowcoder-cli-template-typescript/.gitignore diff --git a/client/packages/openblocks-cli-template-typescript/README-template.md b/client/packages/lowcoder-cli-template-typescript/README-template.md similarity index 93% rename from client/packages/openblocks-cli-template-typescript/README-template.md rename to client/packages/lowcoder-cli-template-typescript/README-template.md index 3257ea6bb..7c74d491a 100644 --- a/client/packages/openblocks-cli-template-typescript/README-template.md +++ b/client/packages/lowcoder-cli-template-typescript/README-template.md @@ -1,4 +1,4 @@ -# openblocks comp lib +# lowcoder comp lib ## Start diff --git a/client/packages/lowcoder-cli-template-typescript/README.md b/client/packages/lowcoder-cli-template-typescript/README.md new file mode 100644 index 000000000..e95b8830e --- /dev/null +++ b/client/packages/lowcoder-cli-template-typescript/README.md @@ -0,0 +1,5 @@ +# lowcoder-cli-template-typescript + +This is the official typescript template of lowcoder-cli. + +This template will be used by default. diff --git a/client/packages/openblocks-cli-template-typescript/icons/demo-icon.svg b/client/packages/lowcoder-cli-template-typescript/icons/demo-icon.svg similarity index 100% rename from client/packages/openblocks-cli-template-typescript/icons/demo-icon.svg rename to client/packages/lowcoder-cli-template-typescript/icons/demo-icon.svg diff --git a/client/packages/openblocks-cli-template-typescript/index.html b/client/packages/lowcoder-cli-template-typescript/index.html similarity index 92% rename from client/packages/openblocks-cli-template-typescript/index.html rename to client/packages/lowcoder-cli-template-typescript/index.html index 877ecc060..12f0761f4 100644 --- a/client/packages/openblocks-cli-template-typescript/index.html +++ b/client/packages/lowcoder-cli-template-typescript/index.html @@ -4,7 +4,7 @@ - Openblocks Comp Playground + Lowcoder Comp Playground