fix: set correct path

Alwatr · Dec 7, 2022 · d01ce6f · d01ce6f
1 parent 8d44fc0
commit d01ce6f
Show file tree

Hide file tree

Showing 35 changed files with 87 additions and 86 deletions.
diff --git a/.github/workflows/publish-container.yml b/.github/workflows/publish-container.yml
@@ -7,8 +7,8 @@ on:
 
   push:
     paths:
-      - 'packages/container/**'
-      - 'packages/service/**'
+      - 'cloud/container/**'
+      - 'service/**'
       - '.github/workflows/publish-container.yml'
     tags:
       - 'v*.*.*'
@@ -18,8 +18,8 @@ on:
 
   pull_request:
     paths:
-      - 'packages/container/**'
-      - 'packages/service/**'
+      - 'cloud/container/**'
+      - 'service/**'
       - '.github/workflows/publish-container.yml'
 
 env:
@@ -37,35 +37,35 @@ jobs:
       matrix:
         include:
           - image: alpine
-            path: container/alpine
+            path: cloud/container/alpine
             description: A minimal Docker image based on Alpine Linux with a complete package index and only 5 MB in size!
             version:
               short: 3
               full: 3.16
 
           - image: nginx
-            path: container/nginx
+            path: cloud/container/nginx
             description: High performance, optimized NGINX for server web applications and api proxy with fast cache.
             version:
               short: 1
               full: 1.0.0-1.23-alpine
 
           - image: storage-server
-            path: service/storage-server
+            path: services/storage-server
             description: Storage nanoservice with disk backed, Fastest NoSQL Database.
             version:
               short: 0
               full: 0.24.1
 
           - image: comment
-            path: service/comment
+            path: services/comment
             description: Distributed simple and fast comment nanoservice base on @alwatr/storage-server
             version:
               short: 0
               full: 0.24.1
 
           # - image: tdlib
-          #   path: container/tdlib
+          #   path: cloud/container/tdlib
           #   description: Cross-platform library for building Telegram clients.
           #   version:
           #     short: 1
@@ -123,7 +123,7 @@ jobs:
         id: build-and-push
         uses: docker/build-push-action@v3
         with:
-          context: packages/${{matrix.path}}
+          context: ${{matrix.path}}
           push: ${{github.event_name != 'pull_request'}}
           tags: ${{steps.meta.outputs.tags}}
           labels: ${{steps.meta.outputs.labels}}

diff --git a/cloud/lab/zx-example/README.md b/cloud/lab/zx-example/README.md
@@ -14,5 +14,5 @@ yarn build
 ## Usage
 
 ```bash
-./packages/lab/zx-example/zx-example.js
+./cloud/lab/zx-example/zx-example.js
 ```
diff --git a/cloud/lab/zx-example/package.json b/cloud/lab/zx-example/package.json
@@ -24,9 +24,9 @@
   "repository": {
     "type": "git",
     "url": "https://github.com/AliMD/alwatr",
-    "directory": "packages/core/zx-example"
+    "directory": "cloud/lab/zx-example"
   },
-  "homepage": "https://github.com/AliMD/alwatr/tree/main/packages/lab/zx-example#readme",
+  "homepage": "https://github.com/AliMD/alwatr/tree/main/cloud/lab/zx-example#readme",
   "bugs": {
     "url": "https://github.com/AliMD/alwatr/issues"
   },

diff --git a/core/fetch/package.json b/core/fetch/package.json
@@ -27,9 +27,9 @@
   "repository": {
     "type": "git",
     "url": "https://github.com/AliMD/alwatr",
-    "directory": "packages/core/fetch"
+    "directory": "core/fetch"
   },
-  "homepage": "https://github.com/AliMD/alwatr/tree/main/packages/core/fetch#readme",
+  "homepage": "https://github.com/AliMD/alwatr/tree/main/core/fetch#readme",
   "bugs": {
     "url": "https://github.com/AliMD/alwatr/issues"
   },

diff --git a/core/fetch/tsconfig.json b/core/fetch/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../tsconfig.json",
+  "extends": "../../tsconfig.json",
   "compilerOptions": {
     "composite": true,
     "tsBuildInfoFile": ".tsbuildinfo",

diff --git a/core/i18n/package.json b/core/i18n/package.json
@@ -25,9 +25,9 @@
   "repository": {
     "type": "git",
     "url": "https://github.com/AliMD/alwatr",
-    "directory": "packages/core/i18n"
+    "directory": "core/i18n"
   },
-  "homepage": "https://github.com/AliMD/alwatr/tree/main/packages/core/i18n#readme",
+  "homepage": "https://github.com/AliMD/alwatr/tree/main/core/i18n#readme",
   "bugs": {
     "url": "https://github.com/AliMD/alwatr/issues"
   },

diff --git a/core/i18n/tsconfig.json b/core/i18n/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../tsconfig.json",
+  "extends": "../../tsconfig.json",
   "compilerOptions": {
     "composite": true,
     "tsBuildInfoFile": ".tsbuildinfo",

diff --git a/core/logger/package.json b/core/logger/package.json
@@ -25,9 +25,9 @@
   "repository": {
     "type": "git",
     "url": "https://github.com/AliMD/alwatr",
-    "directory": "packages/core/logger"
+    "directory": "core/logger"
   },
-  "homepage": "https://github.com/AliMD/alwatr/tree/main/packages/core/logger#readme",
+  "homepage": "https://github.com/AliMD/alwatr/tree/main/core/logger#readme",
   "bugs": {
     "url": "https://github.com/AliMD/alwatr/issues"
   },

diff --git a/core/logger/tsconfig.json b/core/logger/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../tsconfig.json",
+  "extends": "../../tsconfig.json",
   "compilerOptions": {
     "composite": true,
     "tsBuildInfoFile": ".tsbuildinfo",
@@ -10,6 +10,5 @@
   "include": ["src/**/*"],
   "exclude": [],
   "references": [
-    // { "path": "../x" },
   ]
 }
diff --git a/core/math/package.json b/core/math/package.json
@@ -24,9 +24,9 @@
   "repository": {
     "type": "git",
     "url": "https://github.com/AliMD/alwatr",
-    "directory": "packages/core/math"
+    "directory": "core/math"
   },
-  "homepage": "https://github.com/AliMD/alwatr/tree/main/packages/core/math#readme",
+  "homepage": "https://github.com/AliMD/alwatr/tree/main/core/math#readme",
   "bugs": {
     "url": "https://github.com/AliMD/alwatr/issues"
   },

diff --git a/core/math/tsconfig.json b/core/math/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../tsconfig.json",
+  "extends": "../../tsconfig.json",
   "compilerOptions": {
     "composite": true,
     "tsBuildInfoFile": ".tsbuildinfo",

diff --git a/core/nano-server/package.json b/core/nano-server/package.json
@@ -24,9 +24,9 @@
   "repository": {
     "type": "git",
     "url": "https://github.com/AliMD/alwatr",
-    "directory": "packages/core/nano-server"
+    "directory": "core/nano-server"
   },
-  "homepage": "https://github.com/AliMD/alwatr/tree/main/packages/core/nano-server#readme",
+  "homepage": "https://github.com/AliMD/alwatr/tree/main/core/nano-server#readme",
   "bugs": {
     "url": "https://github.com/AliMD/alwatr/issues"
   },

diff --git a/core/nano-server/tsconfig.json b/core/nano-server/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../tsconfig.json",
+  "extends": "../../tsconfig.json",
   "compilerOptions": {
     "composite": true,
     "tsBuildInfoFile": ".tsbuildinfo",

diff --git a/core/router/package.json b/core/router/package.json
@@ -25,9 +25,9 @@
   "repository": {
     "type": "git",
     "url": "https://github.com/AliMD/alwatr",
-    "directory": "packages/core/router"
+    "directory": "core/router"
   },
-  "homepage": "https://github.com/AliMD/alwatr/tree/main/packages/core/router#readme",
+  "homepage": "https://github.com/AliMD/alwatr/tree/main/core/router#readme",
   "bugs": {
     "url": "https://github.com/AliMD/alwatr/issues"
   },

diff --git a/core/router/tsconfig.json b/core/router/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../tsconfig.json",
+  "extends": "../../tsconfig.json",
   "compilerOptions": {
     "composite": true,
     "tsBuildInfoFile": ".tsbuildinfo",

diff --git a/core/signal/package.json b/core/signal/package.json
@@ -25,9 +25,9 @@
   "repository": {
     "type": "git",
     "url": "https://github.com/AliMD/alwatr",
-    "directory": "packages/core/signal"
+    "directory": "core/signal"
   },
-  "homepage": "https://github.com/AliMD/alwatr/tree/main/packages/core/signal#readme",
+  "homepage": "https://github.com/AliMD/alwatr/tree/main/core/signal#readme",
   "bugs": {
     "url": "https://github.com/AliMD/alwatr/issues"
   },

diff --git a/core/signal/tsconfig.json b/core/signal/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../tsconfig.json",
+  "extends": "../../tsconfig.json",
   "compilerOptions": {
     "composite": true,
     "tsBuildInfoFile": ".tsbuildinfo",

diff --git a/core/storage-client/package.json b/core/storage-client/package.json
@@ -29,9 +29,9 @@
   "repository": {
     "type": "git",
     "url": "https://github.com/AliMD/alwatr",
-    "directory": "packages/core/storage-client"
+    "directory": "core/storage-client"
   },
-  "homepage": "https://github.com/AliMD/alwatr/tree/main/packages/core/storage-client#readme",
+  "homepage": "https://github.com/AliMD/alwatr/tree/main/core/storage-client#readme",
   "bugs": {
     "url": "https://github.com/AliMD/alwatr/issues"
   },

diff --git a/core/storage-client/tsconfig.json b/core/storage-client/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../tsconfig.json",
+  "extends": "../../tsconfig.json",
   "compilerOptions": {
     "composite": true,
     "tsBuildInfoFile": ".tsbuildinfo",

diff --git a/core/storage-engine/package.json b/core/storage-engine/package.json
@@ -29,9 +29,9 @@
   "repository": {
     "type": "git",
     "url": "https://github.com/AliMD/alwatr",
-    "directory": "packages/core/storage-engine"
+    "directory": "core/storage-engine"
   },
-  "homepage": "https://github.com/AliMD/alwatr/tree/main/packages/core/storage-engine#readme",
+  "homepage": "https://github.com/AliMD/alwatr/tree/main/core/storage-engine#readme",
   "bugs": {
     "url": "https://github.com/AliMD/alwatr/issues"
   },

diff --git a/core/storage-engine/tsconfig.json b/core/storage-engine/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../tsconfig.json",
+  "extends": "../../tsconfig.json",
   "compilerOptions": {
     "composite": true,
     "tsBuildInfoFile": ".tsbuildinfo",

diff --git a/core/token/package.json b/core/token/package.json
@@ -33,9 +33,9 @@
   "repository": {
     "type": "git",
     "url": "https://github.com/AliMD/alwatr",
-    "directory": "packages/core/token"
+    "directory": "core/token"
   },
-  "homepage": "https://github.com/AliMD/alwatr/tree/main/packages/core/token#readme",
+  "homepage": "https://github.com/AliMD/alwatr/tree/main/core/token#readme",
   "bugs": {
     "url": "https://github.com/AliMD/alwatr/issues"
   },

diff --git a/core/token/tsconfig.json b/core/token/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../tsconfig.json",
+  "extends": "../../tsconfig.json",
   "compilerOptions": {
     "composite": true,
     "tsBuildInfoFile": ".tsbuildinfo",

diff --git a/demo/tsconfig.json b/demo/tsconfig.json
@@ -8,17 +8,17 @@
   },
   "include": ["**/*.ts"],
   "references": [
-    {"path": "../packages/core/logger"},
-    {"path": "../packages/core/fetch"},
-    {"path": "../packages/core/signal"},
-    {"path": "../packages/ui/icon"},
-    {"path": "../packages/core/router"},
-    {"path": "../packages/core/i18n"},
-    {"path": "../packages/core/math"},
-    {"path": "../packages/core/element"},
-    {"path": "../packages/core/storage-engine"},
-    {"path": "../packages/core/storage-client"},
-    {"path": "../packages/core/token"}
+    {"path": "../core/logger"},
+    {"path": "../core/fetch"},
+    {"path": "../core/signal"},
+    {"path": "../core/router"},
+    {"path": "../core/i18n"},
+    {"path": "../core/math"},
+    {"path": "../ui-kit/element"},
+    {"path": "../ui-kit/icon"},
+    {"path": "../core/storage-engine"},
+    {"path": "../core/storage-client"},
+    {"path": "../core/token"}
   ],
   "exclude": ["*.d.ts", "node_modules"]
 }
diff --git a/lerna.json b/lerna.json
@@ -2,7 +2,7 @@
   "version": "0.25.0",
   "npmClient": "yarn",
   "useWorkspaces": true,
-  "package": ["demo", "packages/*/*"],
+  "package": ["*/*"],
   "command": {
     "version": {
       "conventionalCommits": true,

diff --git a/package.json b/package.json
@@ -11,7 +11,10 @@
     "npm": ">=7.0.0"
   },
   "workspaces": [
-    "packages/*/*",
+    "core/*",
+    "cloud/*/*",
+    "services/*",
+    "ui-kit/*",
     "demo"
   ],
   "scripts": {

diff --git a/service/comment/package.json b/service/comment/package.json
@@ -26,9 +26,9 @@
   "repository": {
     "type": "git",
     "url": "https://github.com/AliMD/alwatr",
-    "directory": "packages/service/comment"
+    "directory": "service/comment"
   },
-  "homepage": "https://github.com/AliMD/alwatr/tree/main/packages/service/comment#readme",
+  "homepage": "https://github.com/AliMD/alwatr/tree/main/service/comment#readme",
   "bugs": {
     "url": "https://github.com/AliMD/alwatr/issues"
   },

diff --git a/service/starter/package.json b/service/starter/package.json
@@ -21,9 +21,9 @@
   "repository": {
     "type": "git",
     "url": "https://github.com/AliMD/alwatr",
-    "directory": "packages/starter/nanoservice"
+    "directory": "starter/nanoservice"
   },
-  "homepage": "https://github.com/AliMD/alwatr/tree/main/packages/starter/nanoservice#readme",
+  "homepage": "https://github.com/AliMD/alwatr/tree/main/starter/nanoservice#readme",
   "bugs": {
     "url": "https://github.com/AliMD/alwatr/issues"
   },

diff --git a/service/storage-server/package.json b/service/storage-server/package.json
@@ -28,9 +28,9 @@
   "repository": {
     "type": "git",
     "url": "https://github.com/AliMD/alwatr",
-    "directory": "packages/service/storage-server"
+    "directory": "service/storage-server"
   },
-  "homepage": "https://github.com/AliMD/alwatr/tree/main/packages/service/storage-server#readme",
+  "homepage": "https://github.com/AliMD/alwatr/tree/main/service/storage-server#readme",
   "bugs": {
     "url": "https://github.com/AliMD/alwatr/issues"
   },