Merge pull request #18 from jtpio/lerna

Switch to using lerna

Author: jtpio

.github/workflows/build.yml

@@ -22,8 +22,8 @@ jobs:
       run: python -m pip install jupyterlab nbresuse
     - name: Build and install the extension
       run: |
-        jlpm && jlpm run build
-        jupyter labextension link ./system-monitor-base  --no-build
-        jupyter labextension install jupyterlab-topbar-extension ./system-monitor
+        jlpm
+        jlpm run build
+        jlpm run install
     - name: Browser check
       run: python -m jupyterlab.browser_check

README.md

@@ -69,16 +69,15 @@ You can change the label and refresh rate in JupyterLab's advanced settings edit
 
 ```bash
 # create a new conda environment
-conda create -n jupyterlab-system-monitor jupyterlab nodejs
+conda create -n jupyterlab-system-monitor jupyterlab nodejs nbresuse
 conda activate jupyterlab-system-monitor
 
-# package to retrieve the system metrics
-python -m pip install nbresuse
+# Install dependencies
+jlpm
 
-# required to place indicators in the top area
-jupyter labextension install jupyterlab-topbar-extension
+# Build Typescript source
+jlpm run build
 
-# local install of the extension
-jupyter labextension link system-monitor-base
-jupyter labextension install system-monitor
+# Link and install the extensions
+jlpm run install
 ```

lerna.json

@@ -0,0 +1,8 @@
+{
+  "packages": [
+    "packages/*"
+  ],
+  "npmClient": "jlpm",
+  "useWorkspaces": true,
+  "version": "independent"
+}

package.json

@@ -1,11 +1,18 @@
 {
   "private": true,
-  "workspaces": [
-    "system-monitor",
-    "system-monitor-base"
-  ],
   "scripts": {
-    "build": "tsc --build system-monitor-base system-monitor"
+    "bootstrap": "lerna bootstrap",
+    "build": "lerna run build",
+    "clean": "lerna run clean",
+    "link": "lerna run link",
+    "install": "lerna run link && jupyter labextension install jupyterlab-topbar-extension"
+  },
+  "workspaces": {
+    "packages": [
+      "packages/*"
+    ]
+  },
+  "devDependencies": {
+    "lerna": "^3.20.2"
   }
 }
-

system-monitor-base/package.json renamed to packages/system-monitor-base/package.json

@@ -26,6 +26,7 @@
   },
   "scripts": {
     "build": "tsc",
+    "link": "jupyter labextension link . --no-build",
     "prettier": "prettier --write '**/*{.ts,.tsx,.js,.jsx,.css,.json,.md}'",
     "clean": "rimraf lib && rimraf tsconfig.tsbuildinfo",
     "prepare": "npm run clean && npm run build",
@@ -34,13 +35,13 @@
   "dependencies": {
     "@jupyterlab/apputils": "^2.0.0",
     "@jupyterlab/statusbar": "^2.0.0",
-    "react": "^16.9.0",
-    "react-dom": "^16.9.0",
+    "react": "~16.9.0",
+    "react-dom": "~16.9.0",
     "react-sparklines": "^1.7.0"
   },
   "devDependencies": {
-    "@types/react": "^16.9.0",
-    "@types/react-dom": "^16.9.0",
+    "@types/react": "~16.9.0",
+    "@types/react-dom": "~16.9.0",
     "@types/react-sparklines": "^1.7.0",
     "husky": "^3.0.0",
     "lint-staged": "^8.1.5",

system-monitor-base/src/index.ts renamed to packages/system-monitor-base/src/index.ts

@@ -1,5 +1,5 @@
 {
-  "extends": "../tsconfigbase",
+  "extends": "../../tsconfigbase",
   "compilerOptions": {
     "outDir": "lib",
     "rootDir": "src",

system-monitor-base/src/memoryView.tsx renamed to packages/system-monitor-base/src/memoryView.tsx

@@ -26,6 +26,7 @@
   },
   "scripts": {
     "build": "tsc",
+    "link": "jupyter labextension link . --no-build",
     "prettier": "prettier --write '**/*{.ts,.tsx,.js,.jsx,.css,.json,.md}'",
     "clean": "rimraf lib && rimraf tsconfig.tsbuildinfo",
     "prepare": "npm run clean && npm run build",

system-monitor-base/style/index.css renamed to packages/system-monitor-base/style/index.css

@@ -1,5 +1,5 @@
 {
-  "extends": "../tsconfigbase",
+  "extends": "../../tsconfigbase",
   "compilerOptions": {
     "outDir": "lib",
     "rootDir": "src",