refactor: rename openblocks to lowcoder

lowcoder-org · ludomikula · May 16, 2023 · May 10, 2023 · May 11, 2023 · May 11, 2023
commit c1a25c58c2e56b017abc44bc9ec1009bbe0a9f74
diff --git 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:/lowcoder-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)
@@ -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/package.json b/client/package.json
@@ -10,12 +10,12 @@
     "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 lowcoder-comps test",
-    "prepare": "yarn workspace openblocks prepare",
+    "prepare": "yarn workspace lowcoder prepare",
     "build:core": "yarn workspace lowcoder-core build",
     "test:core": "yarn workspace lowcoder-core test"
   },

diff --git a/client/packages/create-openblocks-plugin/index.js b/client/packages/create-openblocks-plugin/index.js
@@ -89,7 +89,7 @@ function executeNodeScript({ cwd, args }, data, source) {
 }
 
 /**
- * create openblocks comps project
+ * create lowcoder comps project
  * 1. create dir
  * 2. create package.json
  * 3. install lowcoder-cli

diff --git a/client/packages/create-openblocks-plugin/package.json b/client/packages/create-openblocks-plugin/package.json
@@ -12,6 +12,6 @@
   },
   "license": "MIT",
   "keywords": [
-    "openblocks"
+    "lowcoder"
   ]
 }
diff --git a/client/packages/openblocks-cli-template-typescript/README-template.md b/client/packages/openblocks-cli-template-typescript/README-template.md
@@ -1,4 +1,4 @@
-# openblocks comp lib
+# lowcoder comp lib
 
 ## Start
 

diff --git a/client/packages/openblocks-cli-template-typescript/index.tsx b/client/packages/openblocks-cli-template-typescript/index.tsx
@@ -1,6 +1,6 @@
 import ReactDOM from "react-dom";
 import { CompIDE } from "lowcoder-sdk";
-import { name, version, openblocks } from "./package.json";
+import { name, version, lowcoder } from "./package.json";
 import compMap from "./src/index";
 
 import "lowcoder-sdk/dist/style.css";

diff --git a/client/packages/openblocks-cli-template-typescript/package.json b/client/packages/openblocks-cli-template-typescript/package.json
@@ -6,7 +6,7 @@
     "start": "vite",
     "build": "lowcoder-cli build"
   },
-  "openblocks": {
+  "lowcoder": {
     "description": "",
     "comps": {
       "hello_world": {
@@ -22,7 +22,7 @@
     "vite": "^3.2.4"
   },
   "keywords": [
-    "openblocks"
+    "lowcoder"
   ],
   "license": "MIT"
 }
diff --git a/client/packages/openblocks-cli/README.md b/client/packages/openblocks-cli/README.md
@@ -1,3 +1,3 @@
 # lowcoder-cli
 
-CLI tool used to start build and publish openblocks component library.
+CLI tool used to start build and publish lowcoder component library.
diff --git a/client/packages/openblocks-cli/actions/build.js b/client/packages/openblocks-cli/actions/build.js
@@ -17,10 +17,10 @@ function validPackageJSON() {
   if (!packageJSON.version) {
     return "- package version is required";
   }
-  if (!packageJSON.openblocks) {
-    return "- openblocks field is required in package.json";
+  if (!packageJSON.lowcoder) {
+    return "- lowcoder field is required in package.json";
   }
-  const openblocks = packageJSON.openblocks;
+  const lowcoder = packageJSON.lowcoder;
   if (!lowcoder.comps || Object.keys(lowcoder.comps).length === 0) {
     return "- not found any comps to build";
   }

diff --git a/client/packages/openblocks-cli/actions/init.js b/client/packages/openblocks-cli/actions/init.js
@@ -74,7 +74,7 @@ export default async function initAction(options) {
   const templatePackageJson = fs.readJsonSync(templatePackageJsonFile);
   const appPackageJson = fs.readJsonSync(paths.appPackageJson);
 
-  appPackageJson.openblocks = templatePackageJson.openblocks || {};
+  appPackageJson.lowcoder = templatePackageJson.lowcoder || {};
   appPackageJson.scripts = {
     start: "vite",
     build: "lowcoder-cli build",

diff --git a/client/packages/openblocks-cli/package.json b/client/packages/openblocks-cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "lowcoder-cli",
-  "description": "CLI tool used to start build publish openblocks components",
+  "description": "CLI tool used to start build publish lowcoder components",
   "version": "0.0.24",
   "license": "MIT",
   "bin": "./index.js",
@@ -46,6 +46,6 @@
     "lowcoder-sdk": "*"
   },
   "keywords": [
-    "openblocks"
+    "lowcoder"
   ]
 }
diff --git a/client/packages/openblocks-comps/README.md b/client/packages/openblocks-comps/README.md
@@ -1,4 +1,4 @@
-# openblocks comp lib
+# lowcoder comp lib
 
 ## Start
 

diff --git a/client/packages/openblocks-comps/index.tsx b/client/packages/openblocks-comps/index.tsx
@@ -1,6 +1,6 @@
 import ReactDOM from "react-dom";
 import { CompIDE } from "lowcoder-sdk";
-import { name, version, openblocks } from "./package.json";
+import { name, version, lowcoder } from "./package.json";
 import compMap from "./src/index";
 
 import "lowcoder-sdk/dist/style.css";

diff --git a/client/packages/openblocks-comps/package.json b/client/packages/openblocks-comps/package.json
@@ -21,7 +21,7 @@
     "react-dom": "17",
     "typescript": "4.8.4"
   },
-  "openblocks": {
+  "lowcoder": {
     "description": "",
     "comps": {
       "chart": {

diff --git a/client/packages/openblocks-comps/src/comps/chartComp/chartConstants.tsx b/client/packages/openblocks-comps/src/comps/chartComp/chartConstants.tsx
@@ -15,7 +15,7 @@ import { ScatterChartConfig } from "./chartConfigs/scatterChartConfig";
 import { SeriesListComp } from "./seriesComp";
 import { EChartsOption } from "echarts";
 import { i18nObjs, trans } from "i18n/comps";
-import { JSONValue } from "openblocks";
+import { JSONValue } from "lowcoder";
 
 export const ChartTypeOptions = [
   {

diff --git a/client/packages/openblocks-core/package.json b/client/packages/openblocks-core/package.json
@@ -21,9 +21,9 @@
     "lodash": "^4.17.21",
     "lru-cache": "^7.14.1"
   },
-  "description": "lowcoder-core is a JavaScript library for building new components in openblocks",
+  "description": "lowcoder-core is a JavaScript library for building new components in lowcoder",
   "keywords": [
-    "openblocks",
+    "lowcoder",
     "components"
   ],
   "types": "lib/index.d.ts",

diff --git a/client/packages/openblocks-dev-utils/package.json b/client/packages/openblocks-dev-utils/package.json
@@ -3,8 +3,8 @@
   "version": "0.0.5",
   "license": "MIT",
   "type": "module",
-  "description": "Openblocks dev utils for openblocks build process and lowcoder-cli",
+  "description": "Openblocks dev utils for lowcoder build process and lowcoder-cli",
   "keywords": [
-    "openblocks"
+    "lowcoder"
   ]
 }
diff --git a/client/packages/openblocks-plugin-demo/README.md b/client/packages/openblocks-plugin-demo/README.md
@@ -1,4 +1,4 @@
-# openblocks comp lib
+# lowcoder comp lib
 
 ## Start
 

diff --git a/client/packages/openblocks-plugin-demo/index.tsx b/client/packages/openblocks-plugin-demo/index.tsx
@@ -1,6 +1,6 @@
 import ReactDOM from "react-dom";
 import { CompIDE } from "lowcoder-sdk";
-import { name, version, openblocks } from "./package.json";
+import { name, version, lowcoder } from "./package.json";
 import compMap from "./src/index";
 
 import "lowcoder-sdk/dist/style.css";

diff --git a/client/packages/openblocks-plugin-demo/package.json b/client/packages/openblocks-plugin-demo/package.json
@@ -12,7 +12,7 @@
   "publishConfig": {
     "registry": "https://registry.npmjs.com"
   },
-  "openblocks": {
+  "lowcoder": {
     "description": "",
     "comps": {
       "hello_world": {

diff --git a/client/packages/openblocks-sdk/package.json b/client/packages/openblocks-sdk/package.json
@@ -53,7 +53,7 @@
     "react-dom": ">=17"
   },
   "keywords": [
-    "openblocks"
+    "lowcoder"
   ],
   "license": "MIT"
 }
diff --git a/client/packages/openblocks-sdk/src/index.ts b/client/packages/openblocks-sdk/src/index.ts
@@ -1,7 +1,7 @@
 // @ts-nocheck
 import "../../lowcoder/src/index.less";
 import "virtual:globals";
-import * as sdk from "openblocks";
-export * from "openblocks";
+import * as sdk from "lowcoder";
+export * from "lowcoder";
 
-window.$openblocks_sdk = sdk;
+window.$lowcoder_sdk = sdk;
diff --git a/client/packages/openblocks/README.md b/client/packages/openblocks/README.md
@@ -1,3 +1,3 @@
-# openblocks
+# lowcoder
 
 The main app of lowcoder.
diff --git a/client/packages/openblocks/package.json b/client/packages/openblocks/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "openblocks",
+  "name": "lowcoder",
   "version": "0.1.0",
   "private": true,
   "type": "module",

diff --git a/client/packages/openblocks/src/components/ResCreatePanel.tsx b/client/packages/openblocks/src/components/ResCreatePanel.tsx
@@ -169,12 +169,12 @@ const ResButton = (props: {
         dataSourceId: QUICK_GRAPHQL_ID,
       },
     },
-    openblocksApi: {
+    lowcoderApi: {
       icon: OPENBLOCKS_API_INFO.icon,
       label: OPENBLOCKS_API_INFO.name,
       type: BottomResTypeEnum.Query,
       extra: {
-        compType: "openblocksApi",
+        compType: "lowcoderApi",
         dataSourceId: OPENBLOCKS_API_ID,
       },
     },
@@ -320,7 +320,7 @@ export function ResCreatePanel(props: ResCreateModalProps) {
                 <ResButton size={buttonSize} identifier={"restApi"} onSelect={onSelect} />
                 <ResButton size={buttonSize} identifier={"graphql"} onSelect={onSelect} />
                 {placement === "editor" && (
-                  <ResButton size={buttonSize} identifier={"openblocksApi"} onSelect={onSelect} />
+                  <ResButton size={buttonSize} identifier={"lowcoderApi"} onSelect={onSelect} />
                 )}
 
                 {datasource.map((i) => (

diff --git a/client/packages/openblocks/src/comps/queries/queryComp/queryPropertyView.tsx b/client/packages/openblocks/src/comps/queries/queryComp/queryPropertyView.tsx
@@ -186,12 +186,12 @@ export const QueryGeneralPropertyView = (props: {
   );
   if (datasourceId === oldOpenblocksId) {
     datasourceId = OPENBLOCKS_API_ID;
-    datasourceType = "openblocksApi";
+    datasourceType = "lowcoderApi";
     dispatch(
       comp.changeValueAction({
         ...comp.toJsonValue(),
         datasourceId: OPENBLOCKS_API_ID,
-        compType: "openblocksApi",
+        compType: "lowcoderApi",
       } as any)
     );
   }

diff --git a/client/packages/openblocks/src/comps/queries/resourceDropdown.tsx b/client/packages/openblocks/src/comps/queries/resourceDropdown.tsx
@@ -97,7 +97,7 @@ const QuickGraphqlValue: ResourceOptionValue = {
 
 const OpenblocksAPIValue: ResourceOptionValue = {
   id: OPENBLOCKS_API_ID,
-  type: "openblocksApi",
+  type: "lowcoderApi",
 };
 
 interface ResourceDropdownProps {

diff --git a/client/packages/openblocks/src/comps/utils/gridCompOperator.ts b/client/packages/openblocks/src/comps/utils/gridCompOperator.ts
@@ -240,7 +240,7 @@ export class GridCompOperator {
       return;
     }
 
-    if (!latestVersion.openblocks?.comps?.[compInfo.compName]) {
+    if (!latestVersion.lowcoder?.comps?.[compInfo.compName]) {
       message.error(trans("comp.compNotFoundInLatestVersion"));
       return;
     }

diff --git a/client/packages/openblocks/src/constants/datasourceConstants.ts b/client/packages/openblocks/src/constants/datasourceConstants.ts
@@ -44,7 +44,7 @@ export const QUICK_REST_API_ID = "#QUICK_REST_API";
 export const QUICK_GRAPHQL_ID = "#QUICK_GRAPHQL";
 export const OPENBLOCKS_API_ID = "#OPENBLOCKS_API";
 export const OPENBLOCKS_API_INFO = {
-  icon: getBottomResIcon("openblocksApi"),
-  name: trans("query.openblocksAPI"),
+  icon: getBottomResIcon("lowcoderApi"),
+  name: trans("query.lowcoderAPI"),
 };
 export const OLD_OPENBLOCKS_DATASOURCE: Partial<DatasourceType>[] = [];
diff --git a/client/packages/openblocks/src/constants/queryConstants.ts b/client/packages/openblocks/src/constants/queryConstants.ts
@@ -19,7 +19,7 @@ export type DatasourceType =
   | "mongodb"
   | "restApi"
   | "postgres"
-  | "openblocksApi"
+  | "lowcoderApi"
   | "redis"
   | "es"
   | "mssql"
@@ -39,7 +39,7 @@ export const QueryMap = {
   restApi: HttpQuery,
   mongodb: MongoQuery,
   postgres: SQLQuery,
-  openblocksApi: OpenBlocksQuery,
+  lowcoderApi: OpenBlocksQuery,
   redis: RedisQuery,
   es: EsQuery,
   mssql: SQLQuery,

diff --git a/client/packages/openblocks/src/i18n/locales/en.ts b/client/packages/openblocks/src/i18n/locales/en.ts
@@ -409,7 +409,7 @@ export const en = {
     transformer: "Transformer",
     quickRestAPI: "REST Query",
     quickGraphql: "GraphQL Query",
-    openblocksAPI: "Openblocks API",
+    lowcoderAPI: "Openblocks API",
     executeJSCode: "Run JavaScript Code",
     importFromQueryLibrary: "Import from Query Library",
     importFromFile: "Import from File",

diff --git a/client/packages/openblocks/src/pages/editor/right/PluginPanel/PluginItem.tsx b/client/packages/openblocks/src/pages/editor/right/PluginPanel/PluginItem.tsx
@@ -62,7 +62,7 @@ export function PluginItem(props: PluginViewProps) {
   );
   const currentVersion = useSelector((state: AppState) => state.npmPlugin.packageVersion[name]);
   const versions = useMemo(() => packageMeta?.versions || {}, [packageMeta?.versions]);
-  const comps = versions[currentVersion]?.openblocks?.comps || {};
+  const comps = versions[currentVersion]?.lowcoder?.comps || {};
   const compNames = Object.keys(comps);
 
   useEffect(() => {

diff --git a/client/packages/openblocks/src/types/remoteComp.ts b/client/packages/openblocks/src/types/remoteComp.ts
@@ -15,7 +15,7 @@ export interface OpenblocksMeta {
 export interface NpmVersionMeta {
   name: string;
   version: string;
-  openblocks: OpenblocksMeta;
+  lowcoder: OpenblocksMeta;
 }
 
 export interface NpmPackageMeta {

diff --git a/client/packages/openblocks/src/util/bottomResUtils.tsx b/client/packages/openblocks/src/util/bottomResUtils.tsx
@@ -131,7 +131,7 @@ export const getBottomResIcon = (
         return <GoogleSheetsIcon />;
       case "graphql":
         return <GraphqlIcon />;
-      case "openblocksApi":
+      case "lowcoderApi":
         return <OpenBlocksQueryIcon />;
       case "snowflake":
         return <SnowflakeIcon />;

diff --git a/client/scripts/build.js b/client/scripts/build.js
@@ -83,8 +83,8 @@ buildVars.forEach(({ name, defaultValue }) => {
   shell.env[name] = shell.env[name] ?? defaultValue;
 });
 
-shell.exec(`BUILD_TARGET=browserCheck yarn workspace openblocks build`, { fatal: true });
-shell.exec(`yarn workspace openblocks build`, { fatal: true });
+shell.exec(`BUILD_TARGET=browserCheck yarn workspace lowcoder build`, { fatal: true });
+shell.exec(`yarn workspace lowcoder build`, { fatal: true });
 
 if (process.env.REACT_APP_BUNDLE_BUILTIN_PLUGIN) {
   for (const pluginName of builtinPlugins) {

diff --git a/client/yarn.lock b/client/yarn.lock
@@ -14457,9 +14457,9 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"openblocks@workspace:packages/lowcoder":
+"lowcoder@workspace:packages/lowcoder":
   version: 0.0.0-use.local
-  resolution: "openblocks@workspace:packages/lowcoder"
+  resolution: "lowcoder@workspace:packages/lowcoder"
   dependencies:
     "@ant-design/icons": ^4.7.0
     "@ant-design/pro-form": ^1.52.9
-Original file line number
+Diff line change
@@ Expand Up / @@ -240,7 +240,7 @@ export class GridCompOperator { @@
           return;
         }
-        if (!latestVersion.openblocks?.comps?.[compInfo.compName]) {
+        if (!latestVersion.lowcoder?.comps?.[compInfo.compName]) {
           message.error(trans("comp.compNotFoundInLatestVersion"));
           return;
         }
@@ Expand Down @@