refactor: rename /openblocks to /lowcoder

falnyr · falnyr · commit b04b0ff59e50 · 2023-05-12T01:59:17.000+12:00
diff --git 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
+op.mjs
diff --git a/client/config/test/jest.config.js b/client/config/test/jest.config.js
@@ -18,15 +18,15 @@ export default {
     "\\.md\\?url$": path.resolve(dirname, "./mocks/markdown-url-module.js"),
     "^@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"
     ),
-    "lowcoder-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/lowcoder/src"),
     path.resolve(dirname, "../../packages/lowcoder-comps/src"),
     path.resolve(dirname, "../../packages/lowcoder-design/src"),
   ],
diff --git a/client/jest.config.js b/client/jest.config.js
@@ -1,3 +1,3 @@
 export default {
-  projects: ["<rootDir>/packages/openblocks", "<rootDir>/packages/lowcoder-core"],
+  projects: ["<rootDir>/packages/lowcoder", "<rootDir>/packages/lowcoder-core"],
 };
diff --git a/client/packages/openblocks-comps/src/global.ts b/client/packages/openblocks-comps/src/global.ts
@@ -1 +1 @@
-import "../../openblocks/src/global";
+import "../../lowcoder/src/global";
diff --git a/client/packages/openblocks-design/src/app-env.d.ts b/client/packages/openblocks-design/src/app-env.d.ts
@@ -1 +1 @@
-/// <reference path="../../openblocks/src/app-env.d.ts" />
+/// <reference path="../../lowcoder/src/app-env.d.ts" />
diff --git a/client/packages/openblocks-plugin-demo/tsconfig.json b/client/packages/openblocks-plugin-demo/tsconfig.json
@@ -19,14 +19,14 @@
     "baseUrl": "src",
     "paths": {
       "lowcoder-sdk": [
-        "../../openblocks/src/index.sdk.ts",
-        "../node_modules/lowcoder-sdk/src/openblocks/index.sdk.ts"
+        "../../lowcoder/src/index.sdk.ts",
+        "../node_modules/lowcoder-sdk/src/lowcoder/index.sdk.ts"
       ],
       "*": [
         "*",
-        "../../openblocks/src/*",
+        "../../lowcoder/src/*",
         "../../lowcoder-sdk/src/*",
-        "../node_modules/lowcoder-sdk/src/openblocks/*"
+        "../node_modules/lowcoder-sdk/src/lowcoder/*"
       ]
     }
   },
diff --git a/client/packages/openblocks-sdk/src/index.ts b/client/packages/openblocks-sdk/src/index.ts
@@ -1,5 +1,5 @@
 // @ts-nocheck
-import "../../openblocks/src/index.less";
+import "../../lowcoder/src/index.less";
 import "virtual:globals";
 import * as sdk from "openblocks";
 export * from "openblocks";
diff --git a/client/packages/openblocks-sdk/tsconfig.json b/client/packages/openblocks-sdk/tsconfig.json
@@ -23,18 +23,18 @@
     "paths": {
       "*": [
         "*",
-        "../../openblocks/src/*",
+        "../../lowcoder/src/*",
         "../../lowcoder-comps/src/*",
         "../../lowcoder-design/src/*"
       ],
-      "@lowcoder-ee/*": ["../../openblocks/src/*"]
+      "@lowcoder-ee/*": ["../../lowcoder/src/*"]
     }
   },
-  "exclude": ["../openblocks/src/ee/*"],
+  "exclude": ["../lowcoder/src/ee/*"],
   "include": [
     "src",
     "index.tsx",
-    "../openblocks/src",
+    "../lowcoder/src",
     "../lowcoder-comps/src",
     "../lowcoder-design/src"
   ]
diff --git a/client/packages/openblocks-sdk/vite.config.mts b/client/packages/openblocks-sdk/vite.config.mts
@@ -24,8 +24,8 @@ export const viteConfig: UserConfig = {
   resolve: {
     extensions: [".mjs", ".js", ".ts", ".jsx", ".tsx", ".json"],
     alias: {
-      "lowcoder-sdk": path.resolve(__dirname, "../openblocks/src/index.sdk"),
-      "@lowcoder-ee": path.resolve(__dirname, "../openblocks/src"),
+      "lowcoder-sdk": path.resolve(__dirname, "../lowcoder/src/index.sdk"),
+      "@lowcoder-ee": path.resolve(__dirname, "../lowcoder/src"),
     },
   },
   base: ensureLastSlash(process.env.PUBLIC_URL),
@@ -83,7 +83,7 @@ export const viteConfig: UserConfig = {
     }),
     viteTsconfigPaths({
       projects: [
-        "../openblocks/tsconfig.json",
+        "../lowcoder/tsconfig.json",
         "../lowcoder-comps/tsconfig.json",
         "../lowcoder-design/tsconfig.json",
       ],
diff --git a/client/packages/openblocks/src/comps/comps/fileComp/fileComp.test.tsx b/client/packages/openblocks/src/comps/comps/fileComp/fileComp.test.tsx
@@ -100,11 +100,11 @@ function getFile(path: string) {
 
 test("test resolveParsedValue", async () => {
   const files = await Promise.all([
-    getFile("packages/openblocks/src/comps/comps/fileComp/fileComp.test.csv"),
-    getFile("packages/openblocks/src/comps/comps/fileComp/fileComp.test.json"),
-    getFile("packages/openblocks/src/comps/comps/fileComp/fileComp.test.png"),
-    getFile("packages/openblocks/src/comps/comps/fileComp/fileComp.test.txt"),
-    getFile("packages/openblocks/src/comps/comps/fileComp/fileComp.test.xlsx"),
+    getFile("packages/lowcoder/src/comps/comps/fileComp/fileComp.test.csv"),
+    getFile("packages/lowcoder/src/comps/comps/fileComp/fileComp.test.json"),
+    getFile("packages/lowcoder/src/comps/comps/fileComp/fileComp.test.png"),
+    getFile("packages/lowcoder/src/comps/comps/fileComp/fileComp.test.txt"),
+    getFile("packages/lowcoder/src/comps/comps/fileComp/fileComp.test.xlsx"),
   ]);
   const parsedValue = await resolveParsedValue(files as any);
   expect(parsedValue[0]).toMatchObject(expectParseValue);
diff --git a/client/packages/openblocks/src/i18n/locales/en.ts b/client/packages/openblocks/src/i18n/locales/en.ts
@@ -2121,7 +2121,7 @@ export const en = {
     cloneUrl: "/apps/template-import/",
   },
   openBlocksUrl: {
-    createIssue: "https://github.com/lowcoder-dev/openblocks/issues",
+    createIssue: "https://github.com/lowcoder-dev/lowcoder/issues",
     discord: "https://discord.com/invite/z5W2YHXdtt",
   },
   componentDoc: {
diff --git a/client/packages/openblocks/src/i18n/locales/enObj.tsx b/client/packages/openblocks/src/i18n/locales/enObj.tsx
@@ -112,7 +112,7 @@ export const enObj: I18nObjects = {
     ],
   },
   editorTutorials: {
-    mockDataUrl: "https://63621db87521369cd06514c2.mockapi.io/api/openblocks/users",
+    mockDataUrl: "https://63621db87521369cd06514c2.mockapi.io/api/lowcoder/users",
     data: (code) => (
       <>
         The component and query data are listed here, which can be referenced through
diff --git a/client/packages/openblocks/vite.config.mts b/client/packages/openblocks/vite.config.mts
@@ -60,7 +60,7 @@ export const viteConfig: UserConfig = {
     alias: {
       "@lowcoder-ee": path.resolve(
         __dirname,
-        isEE ? `../openblocks/src/${isEEGlobal ? "ee-global" : "ee"}` : "../openblocks/src"
+        isEE ? `../lowcoder/src/${isEEGlobal ? "ee-global" : "ee"}` : "../lowcoder/src"
       ),
     },
   },
@@ -124,7 +124,7 @@ export const viteConfig: UserConfig = {
       },
     }),
     viteTsconfigPaths({
-      projects: ["../openblocks/tsconfig.json", "../lowcoder-design/tsconfig.json"],
+      projects: ["../lowcoder/tsconfig.json", "../lowcoder-design/tsconfig.json"],
     }),
     svgrPlugin({
       svgrOptions: {
diff --git a/client/scripts/build.js b/client/scripts/build.js
@@ -36,7 +36,7 @@ async function downloadBuiltinPlugin(name) {
   const packageRes = await axios.get(`https://registry.npmjs.com/${name}/latest`);
   const tarball = packageRes.data.dist.tarball;
   const tarballFileName = `${name}.tgz`;
-  const targetDir = `./packages/openblocks/build/${name}/latest`;
+  const targetDir = `./packages/lowcoder/build/${name}/latest`;
 
   console.log(chalk.blue`tarball: ${tarball}`);
 
@@ -52,7 +52,7 @@ async function buildBuiltinPlugin(name) {
   console.log();
   console.log(chalk.cyan`plugin ${name} building...`);
 
-  const targetDir = `./packages/openblocks/build/${name}/latest`;
+  const targetDir = `./packages/lowcoder/build/${name}/latest`;
   shell.mkdir("-p", targetDir);
 
   shell.exec(`yarn workspace ${name} build_only`, { fatal: true });
@@ -96,7 +96,7 @@ if (process.argv.includes("--internal-deploy")) {
   const deployDir = shell.env["DEPLOY_DIR"];
   console.log();
   console.log(chalk.cyan`deploying...`);
-  shell.exec("docker cp ./packages/openblocks/build lowcoder-fe:/var/www/", { fatal: true });
+  shell.exec("docker cp ./packages/lowcoder/build lowcoder-fe:/var/www/", { fatal: true });
   shell.exec(
     `docker exec lowcoder-fe /bin/sh -c "cd /var/www/ && rm -rf ${deployDir} && mv build ${deployDir}"`,
     { fatal: true }
diff --git a/client/yarn.lock b/client/yarn.lock
@@ -14457,9 +14457,9 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"openblocks@workspace:packages/openblocks":
+"openblocks@workspace:packages/lowcoder":
   version: 0.0.0-use.local
-  resolution: "openblocks@workspace:packages/openblocks"
+  resolution: "openblocks@workspace:packages/lowcoder"
   dependencies:
     "@ant-design/icons": ^4.7.0
     "@ant-design/pro-form": ^1.52.9

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-import "../../openblocks/src/global";`
	`1`	`+import "../../lowcoder/src/global";`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-/// <reference path="../../openblocks/src/app-env.d.ts" />`
	`1`	`+/// <reference path="../../lowcoder/src/app-env.d.ts" />`