Merge branch 'feature-viewer3' of https://github.com/Imiss-U1025/lowcoder into feature-viewer3

Imiss-U1025 · Imiss-U1025 · commit 647d7f4acbe5 · 2024-09-27T12:17:57.000-04:00
diff --git a/archive_folder/index.cjs b/archive_folder/index.cjs
diff --git a/viewer/config/test/jest.config.js b/viewer/config/test/jest.config.js
@@ -27,7 +27,7 @@ export default {
   modulePaths: [
     "<rootDir>/src",
     path.resolve(currentDir, "../../packages/lowcoder/src"),
-    path.resolve(currentDir, "../../packages/lowcoder-comps/src"),
+    // path.resolve(currentDir, "../../packages/lowcoder-comps/src"),
     path.resolve(currentDir, "../../packages/lowcoder-design/src"),
   ],
   setupFiles: [path.resolve(currentDir, "./jest.setup.js")],
diff --git a/viewer/packages/lowcoder-core/package.json b/viewer/packages/lowcoder-core/package.json
@@ -31,8 +31,7 @@
     "lib"
   ],
   "exports": {
-    "import": "./lib/index.js",
-    "require": "./lib/index.cjs"
+    "import": "./lib/index.js"
   },
   "author": "Lowcoder"
 }
diff --git a/viewer/packages/lowcoder-core/rollup.config.js b/viewer/packages/lowcoder-core/rollup.config.js
@@ -2,18 +2,20 @@ import commonjs from "@rollup/plugin-commonjs";
 import resolve from "@rollup/plugin-node-resolve";
 import typescript from "@rollup/plugin-typescript";
 import dts from "rollup-plugin-dts";
+import { visualizer } from 'rollup-plugin-visualizer';
+import { terser } from 'rollup-plugin-terser';
 
 const config = [
   {
     input: "src/index.ts",
-    plugins: [resolve({ browser: true }), commonjs(), typescript()],
+    plugins: [resolve({ browser: true }), commonjs(), typescript(), terser(), visualizer({ open: true })],
     output: {
       dir: "lib",
       format: "esm",
     },
     external: ["lodash", "stylis"],
   },
-  {
+  /* {
     input: "src/index.ts",
     plugins: [
       resolve({ browser: true }),
@@ -25,7 +27,7 @@ const config = [
       file: "lib/index.cjs",
     },
     external: ["lodash", "stylis"],
-  },
+  }, */
   {
     input: "lib/dts/index.d.ts",
     plugins: [
diff --git a/viewer/packages/lowcoder/tsconfig.paths.json b/viewer/packages/lowcoder/tsconfig.paths.json
@@ -3,7 +3,7 @@
     "paths": {
       "@lowcoder-ee/*": ["*"],
       "lowcoder-sdk": ["index.sdk"],
-      "*": ["*", "../../lowcoder-comps/src/*", "../../lowcoder-design/src/*"],
+      "*": ["*", "../../lowcoder-design/src/*"],
       "package": ["./package/*"]
     }
   }
diff --git a/viewer/scripts/build.js b/viewer/scripts/build.js
@@ -15,7 +15,7 @@ export function currentDirName(importMetaUrl) {
   return dirname(fileURLToPath(importMetaUrl));
 }
 
-const builtinPlugins = ["lowcoder-comps"];
+// const builtinPlugins = ["lowcoder-comps"];
 const curDirName = currentDirName(import.meta.url);
 
 async function downloadFile(url, dest) {
@@ -94,11 +94,11 @@ buildVars.forEach(({ name, defaultValue }) => {
 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) {
+/* if (process.env.REACT_APP_BUNDLE_BUILTIN_PLUGIN) {
   for (const pluginName of builtinPlugins) {
     await buildBuiltinPlugin(pluginName);
   }
-}
+} */
 
 if (process.argv.includes("--internal-deploy")) {
   const deployDir = shell.env["DEPLOY_DIR"];

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`"paths": {`
`4`	`4`	`"@lowcoder-ee/": [""],`
`5`	`5`	`"lowcoder-sdk": ["index.sdk"],`
`6`		`- "": ["", "../../lowcoder-comps/src/", "../../lowcoder-design/src/"],`
	`6`	`+ "": ["", "../../lowcoder-design/src/*"],`
`7`	`7`	`"package": ["./package/*"]`
`8`	`8`	`}`
`9`	`9`	`}`