Fixes in workspaces anc comp includes

FalkWolsky · FalkWolsky · commit 9595937f29ba · 2023-12-07T17:40:58.000+01:00
diff --git a/.DS_Store b/.DS_Store
diff --git a/.gitignore b/.gitignore
@@ -5,4 +5,7 @@ client/.yarn/cache/*.zip
 server/node-service/.yarn/cache/*.zip
 .metadata/
 .DS_Store
-client/node_modules/
+client/node_modules/
+client/packages/lowcoder-plugin-demo/.yarn/install-state.gz
+client/packages/lowcoder-plugin-demo/yarn.lock
+client/packages/lowcoder-plugin-demo/.yarn/cache/@types-node-npm-16.18.68-56f72825c0-094ae9ed80.zip
diff --git a/client/packages/create-lowcoder-plugin/package.json b/client/packages/create-lowcoder-plugin/package.json
@@ -7,11 +7,12 @@
     "chalk": "4",
     "commander": "^9.4.1",
     "cross-spawn": "^7.0.3",
-    "fs-extra": "^10.1.0",
-    "lowcoder-dev-utils": "workspace:^"
+    "fs-extra": "^10.1.0"
   },
-  "devDependencies": {
-    "lowcoder-dev-utils": "workspace:^"
+  "peerDependencies": {
+    "lowcoder-cli": "*",
+    "lowcoder-dev-utils": "*",
+    "lowcoder-sdk": "*"
   },
   "license": "MIT",
   "keywords": [
diff --git a/client/packages/lowcoder-cli-template-typescript/package.json b/client/packages/lowcoder-cli-template-typescript/package.json
@@ -16,12 +16,14 @@
     }
   },
   "devDependencies": {
-    "lowcoder-cli": "workspace:^",
-    "lowcoder-dev-utils": "workspace:^",
-    "lowcoder-sdk": "workspace:^",
     "typescript": "^4.8.4",
     "vite": "^4.5.1"
   },
+  "peerDependencies": {
+    "lowcoder-cli": "*",
+    "lowcoder-dev-utils": "*",
+    "lowcoder-sdk": "*"
+  },
   "keywords": [
     "Lowcoder, Component, Template, Plugin"
   ],
diff --git a/client/packages/lowcoder-cli/package.json b/client/packages/lowcoder-cli/package.json
@@ -39,10 +39,10 @@
   },
   "devDependencies": {
     "@types/axios": "^0.14.0",
-    "lowcoder-dev-utils": "workspace:^",
     "typescript": "^4.8.4"
   },
   "peerDependencies": {
+    "lowcoder-dev-utils": "*",
     "lowcoder-sdk": "*"
   },
   "keywords": [
diff --git a/client/packages/lowcoder-comps/package.json b/client/packages/lowcoder-comps/package.json
@@ -16,9 +16,6 @@
     "big.js": "^6.2.1",
     "echarts-extension-gmap": "^1.6.0",
     "echarts-wordcloud": "^2.1.0",
-    "lowcoder-cli": "workspace:^",
-    "lowcoder-core": "workspace:^",
-    "lowcoder-sdk": "workspace:^",
     "mermaid": "^10.2.4",
     "react": "17",
     "react-dom": "17",
@@ -74,5 +71,10 @@
     "jest-canvas-mock": "^2.5.2",
     "vite": "^4.5.1",
     "vite-tsconfig-paths": "^3.6.0"
+  },
+  "peerDependencies": {
+    "lowcoder-cli": "*",
+    "lowcoder-dev-utils": "*",
+    "lowcoder-sdk": "*"
   }
 }
diff --git a/client/packages/lowcoder-plugin-demo/.yarn/cache/lowcoder-dev-utils-npm-0.0.6-fb750dfbcd-3a4c6445d9.zip b/client/packages/lowcoder-plugin-demo/.yarn/cache/lowcoder-dev-utils-npm-0.0.6-fb750dfbcd-3a4c6445d9.zip
diff --git a/client/packages/lowcoder-plugin-demo/.yarn/install-state.gz b/client/packages/lowcoder-plugin-demo/.yarn/install-state.gz
diff --git a/client/packages/lowcoder-plugin-demo/package.json b/client/packages/lowcoder-plugin-demo/package.json
@@ -6,13 +6,26 @@
   "dependencies": {
     "@types/react": "17",
     "@types/react-dom": "17",
-    "lowcoder-dev-utils": "^0.0.6",
-    "lowcoder-sdk": "^2.1.9",
+    "lowcoder-sdk": "2.1.9",
     "react": "17",
     "react-dom": "17",
     "typescript": "5.3.3",
     "vite": "^5.0.6"
   },
+  "devDependencies": {
+    "@types/node": "16",
+    "@types/react": "17",
+    "@types/react-dom": "17",
+    "react": "17",
+    "react-dom": "17",
+    "typescript": "5.3.3",
+    "vite": "^5.0.6"
+  },
+  "peerDependencies": {
+    "lowcoder-cli": "*",
+    "lowcoder-dev-utils": "*",
+    "lowcoder-sdk": "*"
+  },
   "lowcoder": {
     "description": "",
     "comps": {
diff --git a/client/packages/lowcoder-plugin-demo/yarn.lock b/client/packages/lowcoder-plugin-demo/yarn.lock
@@ -286,6 +286,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@types/node@npm:16":
+  version: 16.18.68
+  resolution: "@types/node@npm:16.18.68"
+  checksum: 094ae9ed80eed2af4bd34d551467e307f2ecb6efb0f8b872feebfb9da5ea4b446c5883c9abe2349f8ea2b78bdacd8726a946c27c2a246676c4c330e41ccb9284
+  languageName: node
+  linkType: hard
+
 "@types/prop-types@npm:*":
   version: 15.7.11
   resolution: "@types/prop-types@npm:15.7.11"
@@ -785,29 +792,26 @@ __metadata:
   languageName: node
   linkType: hard
 
-"lowcoder-dev-utils@npm:^0.0.6":
-  version: 0.0.6
-  resolution: "lowcoder-dev-utils@npm:0.0.6"
-  checksum: 3a4c6445d9c277e842cb67606d4f492b00cba396fe7781e21183551d5c765bfe225b33de5b28460d4fbf090817483e49b9db31b9c18d4309b54254bcdaedb5cf
-  languageName: node
-  linkType: hard
-
 "lowcoder-plugin-demo@workspace:.":
   version: 0.0.0-use.local
   resolution: "lowcoder-plugin-demo@workspace:."
   dependencies:
+    "@types/node": 16
     "@types/react": 17
     "@types/react-dom": 17
-    lowcoder-dev-utils: ^0.0.6
-    lowcoder-sdk: ^2.1.9
+    lowcoder-sdk: 2.1.9
     react: 17
     react-dom: 17
     typescript: 5.3.3
     vite: ^5.0.6
+  peerDependencies:
+    lowcoder-cli: "*"
+    lowcoder-dev-utils: "*"
+    lowcoder-sdk: "*"
   languageName: unknown
   linkType: soft
 
-"lowcoder-sdk@npm:^2.1.9":
+"lowcoder-sdk@npm:2.1.9":
   version: 2.1.9
   resolution: "lowcoder-sdk@npm:2.1.9"
   peerDependencies:
diff --git a/client/packages/lowcoder-sdk/package.json b/client/packages/lowcoder-sdk/package.json
@@ -35,7 +35,6 @@
     "@rollup/plugin-url": "^7.0.0",
     "@svgr/rollup": "^6.3.1",
     "@vitejs/plugin-react": "^2.2.0",
-    "lowcoder-dev-utils": "workspace:^",
     "rollup": "^2",
     "rollup-plugin-cleaner": "^1.0.0",
     "rollup-plugin-node-builtins": "^2.1.2",
@@ -53,6 +52,8 @@
     "typedoc": "^0.25.4"
   },
   "peerDependencies": {
+    "lowcoder-cli": "*",
+    "lowcoder-dev-utils": "*",
     "react": ">=17",
     "react-dom": ">=17"
   },
diff --git a/client/yarn.lock b/client/yarn.lock
