chore: refactor plugins into yarn workspace - a single command to pub…

…lish all base plugins
janhq · Sep 28, 2023 · 918c7e3 · 918c7e3
1 parent d2be2b0
commit 918c7e3
Show file tree

Hide file tree

Showing 21 changed files with 30 additions and 11 deletions.
diff --git a/electron/core/data-plugin/index.ts → electron/core/plugins/data-plugin/index.ts b/electron/core/data-plugin/index.ts → electron/core/plugins/data-plugin/index.ts
diff --git a/electron/core/data-plugin/module.ts → electron/core/plugins/data-plugin/module.ts b/electron/core/data-plugin/module.ts → electron/core/plugins/data-plugin/module.ts
diff --git a/electron/core/data-plugin/package.json → ...ron/core/plugins/data-plugin/package.json b/electron/core/data-plugin/package.json → ...ron/core/plugins/data-plugin/package.json
@@ -9,8 +9,9 @@
     "init"
   ],
   "scripts": {
-    "build": "tsc",
-    "package": "rimraf ./data-plugin*.tgz && tsc -b . && webpack --config webpack.config.js && npm pack"
+    "build": "tsc -b .",
+    "build:package": "rimraf ./data-plugin*.tgz && npm run build && webpack --config webpack.config.js && npm pack",
+    "build:publish": "yarn build:package && cpx *.tgz ../../pre-install"
   },
   "exports": {
     ".": "./dist/index.js",
@@ -22,7 +23,8 @@
     "ts-node": "^10.9.1",
     "typescript": "^5.2.2",
     "webpack": "^5.88.2",
-    "webpack-cli": "^5.1.4"
+    "webpack-cli": "^5.1.4",
+    "cpx": "^1.5.0"
   },
   "bundledDependencies": [
     "sql.js",

diff --git a/electron/core/data-plugin/tsconfig.json → ...on/core/plugins/data-plugin/tsconfig.json b/electron/core/data-plugin/tsconfig.json → ...on/core/plugins/data-plugin/tsconfig.json
diff --git a/electron/core/data-plugin/types/index.d.ts → ...core/plugins/data-plugin/types/index.d.ts b/electron/core/data-plugin/types/index.d.ts → ...core/plugins/data-plugin/types/index.d.ts
diff --git a/electron/core/data-plugin/webpack.config.js → ...ore/plugins/data-plugin/webpack.config.js b/electron/core/data-plugin/webpack.config.js → ...ore/plugins/data-plugin/webpack.config.js
diff --git a/electron/core/inference-plugin/index.js → ...on/core/plugins/inference-plugin/index.js b/electron/core/inference-plugin/index.js → ...on/core/plugins/inference-plugin/index.js
diff --git a/electron/core/inference-plugin/module.js → ...n/core/plugins/inference-plugin/module.js b/electron/core/inference-plugin/module.js → ...n/core/plugins/inference-plugin/module.js
diff --git a/electron/core/inference-plugin/package.json → ...ore/plugins/inference-plugin/package.json b/electron/core/inference-plugin/package.json → ...ore/plugins/inference-plugin/package.json
@@ -9,8 +9,9 @@
     "init"
   ],
   "scripts": {
-    "prepare": "webpack --config webpack.config.js",
-    "package": "rimraf ./*.tgz && cpx \"module.js\" \"dist\" && npm pack"
+    "build": "webpack --config webpack.config.js",
+    "build:package": "rimraf ./*.tgz && npm run build && cpx \"module.js\" \"dist\" && npm pack",
+    "build:publish": "yarn build:package && cpx *.tgz ../../pre-install"
   },
   "devDependencies": {
     "cpx": "^1.5.0",

diff --git a/...n/core/inference-plugin/webpack.config.js → ...lugins/inference-plugin/webpack.config.js b/...n/core/inference-plugin/webpack.config.js → ...lugins/inference-plugin/webpack.config.js
diff --git a/...ron/core/model-management-plugin/index.js → .../plugins/model-management-plugin/index.js b/...ron/core/model-management-plugin/index.js → .../plugins/model-management-plugin/index.js
diff --git a/...on/core/model-management-plugin/module.js → ...plugins/model-management-plugin/module.js b/...on/core/model-management-plugin/module.js → ...plugins/model-management-plugin/module.js
diff --git a/...core/model-management-plugin/package.json → ...gins/model-management-plugin/package.json b/...core/model-management-plugin/package.json → ...gins/model-management-plugin/package.json
@@ -9,8 +9,9 @@
     "init"
   ],
   "scripts": {
-    "prepare": "webpack --config webpack.config.js",
-    "package": "rimraf ./*.tgz && cpx \"module.js\" \"dist\" && npm pack"
+    "build": "webpack --config webpack.config.js",
+    "build:package": "rimraf ./*.tgz && npm run build && cpx \"module.js\" \"dist\" && npm pack",
+    "build:publish": "yarn build:package && cpx *.tgz ../../pre-install"
   },
   "devDependencies": {
     "cpx": "^1.5.0",

diff --git a/...model-management-plugin/webpack.config.js → ...model-management-plugin/webpack.config.js b/...model-management-plugin/webpack.config.js → ...model-management-plugin/webpack.config.js
diff --git a/electron/core/plugins/package.json b/electron/core/plugins/package.json
@@ -0,0 +1,17 @@
+{
+  "name": "jan-plugins",
+  "private": true,
+  "workspaces": {
+    "packages": [
+      "*"
+    ],
+    "nohoist": [
+      "**"
+    ]
+  },
+  "scripts": {
+    "build": "yarn workspaces -pt run build",
+    "build:package": "yarn build && yarn workspaces -pt run build:package",
+    "build:publish": "yarn build:package && yarn workspaces -pt run build:publish"
+  }
+}
diff --git a/electron/core/pre-install/.gitkeep b/electron/core/pre-install/.gitkeep
diff --git a/electron/core/pre-install/data-plugin.tgz b/electron/core/pre-install/data-plugin.tgz
diff --git a/electron/core/pre-install/inference-plugin.tgz b/electron/core/pre-install/inference-plugin.tgz
diff --git a/electron/core/pre-install/model-management-plugin.tgz b/electron/core/pre-install/model-management-plugin.tgz
diff --git a/electron/tsconfig.json b/electron/tsconfig.json
@@ -9,5 +9,6 @@
     "noEmitOnError": true,
     "allowJs": true,
     "typeRoots": ["node_modules/@types"]
-  }
+  },
+  "exclude": ["core", "build", "node_modules"]
 }
diff --git a/package.json b/package.json
@@ -8,8 +8,6 @@
     ],
     "nohoist": [
       "electron",
-      "electron/plugins",
-      "electron/plugins/**",
       "electron/**",
       "web",
       "web/**"
@@ -29,6 +27,5 @@
     "cpx": "^1.5.0",
     "wait-on": "^7.0.1"
   },
-  "dependencies": {},
   "version": "0.0.0"
 }