*: use npm workspaces

epfml · Feb 5, 2024 · 134bbdd · 134bbdd
1 parent 9159787
commit 134bbdd
Show file tree

Hide file tree

Showing 46 changed files with 19,730 additions and 9,529 deletions.
diff --git a/.gitattributes b/.gitattributes
diff --git a/.github/workflows/lint-test-build.yml b/.github/workflows/lint-test-build.yml
@@ -6,7 +6,6 @@ on:
 
 env:
   node_version: 16
-  lib_dir: discojs/
   lib_core_dir: discojs/discojs-core/
   lib_web_dir: discojs/discojs-web/
   lib_node_dir: discojs/discojs-node/
@@ -37,11 +36,8 @@ jobs:
         with:
           node-version: ${{ env.node_version }}
           cache: npm
-          cache-dependency-path: ${{ env.lib_dir }}/package-lock.json
       - run: npm ci
-        working-directory: ${{ env.lib_dir }}
       - run: npm run lint
-      # TODO npx ts-standard
 
   lint-lib-node:
     runs-on: ubuntu-latest
@@ -54,9 +50,8 @@ jobs:
         with:
           node-version: ${{ env.node_version }}
           cache: npm
-          cache-dependency-path: ${{ env.lib_dir }}/package-lock.json
       - run: npm ci
-        working-directory: ${{ env.lib_dir }}
+      - run: npm run build --workspace=@epfml/discojs-core
       - run: npm run lint
 
   lint-lib-web:
@@ -70,9 +65,8 @@ jobs:
         with:
           node-version: ${{ env.node_version }}
           cache: npm
-          cache-dependency-path: ${{ env.lib_dir }}/package-lock.json
       - run: npm ci
-        working-directory: ${{ env.lib_dir }}
+      - run: npm run build --workspace=@epfml/discojs-core
       - run: npm run lint
 
   lint-server:
@@ -88,15 +82,11 @@ jobs:
           node-version: ${{ env.node_version }}
           cache: npm
           cache-dependency-path: |
-            ${{ env.lib_dir }}/package-lock.json
+            package-lock.json
             ${{ env.server_dir }}/package-lock.json
       - run: npm ci
-        working-directory: ${{ env.lib_dir }}
-      - run: npm run build
-        working-directory: ${{ env.lib_node_dir }}
-      - run: npm ci && npm link ../discojs/discojs-node
+      - run: npm run build --workspace=@epfml/discojs-{core,node}
       - run: npx eslint --max-warnings 0 .
-      # TODO npx ts-standard
 
   lint-web-client:
     needs: build-lib-web
@@ -111,13 +101,10 @@ jobs:
           node-version: ${{ env.node_version }}
           cache: npm
           cache-dependency-path: |
-            ${{ env.lib_dir }}/package-lock.json
+            package-lock.json
             ${{ env.client_dir }}/package-lock.json
       - run: npm ci
-        working-directory: ${{ env.lib_dir }}
-      - run: npm run build
-        working-directory: ${{ env.lib_web_dir }}
-      - run: npm ci
+      - run: npm run build --workspace=@epfml/discojs{-core,}
       - run: npm run lint
 
   build-lib-node:
@@ -132,9 +119,8 @@ jobs:
         with:
           node-version: ${{ env.node_version }}
           cache: npm
-          cache-dependency-path: ${{ env.lib_dir }}/package-lock.json
       - run: npm ci
-        working-directory: ${{ env.lib_dir }}
+      - run: npm run build --workspace=@epfml/discojs-core
       - run: npm run build
 
   build-lib-web:
@@ -149,9 +135,8 @@ jobs:
         with:
           node-version: ${{ env.node_version }}
           cache: npm
-          cache-dependency-path: ${{ env.lib_dir }}/package-lock.json
       - run: npm ci
-        working-directory: ${{ env.lib_dir }}
+      - run: npm run build --workspace=@epfml/discojs-core
       - run: npm run build
 
   build-server:
@@ -167,13 +152,10 @@ jobs:
           node-version: ${{ env.node_version }}
           cache: npm
           cache-dependency-path: |
-            ${{ env.lib_dir }}/package-lock.json
+            package-lock.json
             ${{ env.server_dir }}/package-lock.json
       - run: npm ci
-        working-directory: ${{ env.lib_dir }}
-      - run: npm run build
-        working-directory: ${{ env.lib_node_dir }}
-      - run: npm ci && npm link ../discojs/discojs-node
+      - run: npm run build --workspace=@epfml/discojs-{core,node}
       - run: npm run build
 
   build-server-docker:
@@ -199,17 +181,15 @@ jobs:
           node-version: ${{ env.node_version }}
           cache: npm
           cache-dependency-path: |
-            ${{ env.lib_dir }}/package-lock.json
+            package-lock.json
             ${{ env.client_dir }}/package-lock.json
       - run: npm ci
-        working-directory: ${{ env.lib_dir }}
-      - run: npm run build
-        working-directory: ${{ env.lib_web_dir }}
-      - run: npm ci
+      - run: npm run build --workspace=@epfml/discojs{-core,}
       - run: npm run build
 
   test-lib-core:
-    needs: [build-lib-node, build-server-docker, test-server, download-training-data]
+    needs:
+      [build-lib-node, build-server-docker, test-server, download-training-data]
     runs-on: ubuntu-latest
     defaults:
       run:
@@ -224,16 +204,14 @@ jobs:
         with:
           node-version: ${{ env.node_version }}
           cache: npm
-          cache-dependency-path: |
-            ${{ env.lib_dir }}/package-lock.json
       - run: npm ci
-        working-directory: ${{ env.lib_dir }}
-      - run: npm run build
         working-directory: ${{ env.lib_node_dir }}
+      - run: npm run build --workspace=@epfml/discojs-{core,node}
       - run: ../../with_server npm test
 
   test-lib-node:
-    needs: [build-lib-node, build-server-docker, test-server, download-training-data]
+    needs:
+      [build-lib-node, build-server-docker, test-server, download-training-data]
     runs-on: ubuntu-latest
     defaults:
       run:
@@ -248,16 +226,13 @@ jobs:
         with:
           node-version: ${{ env.node_version }}
           cache: npm
-          cache-dependency-path: |
-            ${{ env.lib_dir }}/package-lock.json
       - run: npm ci
-        working-directory: ${{ env.lib_dir }}
-      - run: npm run build
-        working-directory: ${{ env.lib_node_dir }}
+      - run: npm run build --workspace=@epfml/discojs-core
       - run: ../../with_server npm test
 
   test-lib-web:
-    needs: [build-lib-node, build-server-docker, test-server, download-training-data]
+    needs:
+      [build-lib-node, build-server-docker, test-server, download-training-data]
     runs-on: ubuntu-latest
     defaults:
       run:
@@ -272,12 +247,8 @@ jobs:
         with:
           node-version: ${{ env.node_version }}
           cache: npm
-          cache-dependency-path: |
-            ${{ env.lib_dir }}/package-lock.json
       - run: npm ci
-        working-directory: ${{ env.lib_dir }}
-      - run: npm run build
-        working-directory: ${{ env.lib_node_dir }}
+      - run: npm run build --workspace=@epfml/discojs-core
       - run: ../../with_server npm test
 
   test-server:
@@ -297,17 +268,20 @@ jobs:
           node-version: ${{ env.node_version }}
           cache: npm
           cache-dependency-path: |
-            ${{ env.lib_dir }}/package-lock.json
+            package-lock.json
             ${{ env.server_dir }}/package-lock.json
       - run: npm ci
-        working-directory: ${{ env.lib_dir }}
-      - run: npm run build
-        working-directory: ${{ env.lib_node_dir }}
-      - run: npm ci && npm link ../discojs/discojs-node
+      - run: npm run build --workspace=@epfml/discojs-{core,node}
       - run: npm test
 
   test-web-client:
-    needs: [build-web-client, build-server-docker, test-server, download-training-data]
+    needs:
+      [
+        build-web-client,
+        build-server-docker,
+        test-server,
+        download-training-data,
+      ]
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
@@ -320,15 +294,11 @@ jobs:
           node-version: ${{ env.node_version }}
           cache: npm
           cache-dependency-path: |
-            ${{ env.lib_dir }}/package-lock.json
+            package-lock.json
             ${{ env.server_dir }}/package-lock.json
             ${{ env.client_dir }}/package-lock.json
       - run: npm ci
-        working-directory: ${{ env.lib_dir }}
-      - run: npm run build
-        working-directory: ${{ env.lib_web_dir }}
-      - run: npm ci
-        working-directory: web-client/cypress
+      - run: npm run build --workspace=@epfml/discojs{-core,}
       - uses: cypress-io/github-action@v4
         with:
           browser: chromium
@@ -354,14 +324,9 @@ jobs:
           node-version: ${{ env.node_version }}
           cache: npm
           cache-dependency-path: |
-            ${{ env.lib_dir }}/package-lock.json
+            package-lock.json
             ${{ env.server_dir }}/package-lock.json
             ${{ env.cli_dir }}/package-lock.json
       - run: npm ci
-        working-directory: ${{ env.lib_dir }}
-      - run: npm run build
-        working-directory: ${{ env.lib_node_dir }}
-      - run: npm ci && npm link ../${{ env.lib_node_dir }} && npm run build
-        working-directory: ${{ env.server_dir }}
-      - run: npm ci && npm link ../${{ env.server_dir }} ../${{ env.lib_node_dir }}
+      - run: npm run build --workspace=@epfml/{discojs-{core,node},disco-server}
       - run: npm start -- -t cifar10 -u 1 -e 1
diff --git a/Dockerfile b/Dockerfile
@@ -13,19 +13,16 @@ RUN apt-get upgrade -y \
     && curl --silent --location https://deb.nodesource.com/setup_16.x | bash - \
     && apt install -y nodejs 
 
-COPY discojs/package*.json discojs/
-RUN cd discojs/ && npm ci
+COPY package*.json .
+COPY discojs/discojs-core/package.json discojs/discojs-core/
+COPY discojs/discojs-node/package.json discojs/discojs-node/
+COPY server/package*.json server/
+RUN npm ci
 
 COPY discojs/tsconfig.base.json discojs/
-
-COPY discojs/discojs-core/types/ discojs/discojs-core/types/
-COPY discojs/discojs-core/src/ discojs/discojs-core/src/
-
+COPY discojs/discojs-core/ discojs/discojs-core/
 COPY discojs/discojs-node/ discojs/discojs-node/
-RUN cd discojs/discojs-node/ && npm run build
-
-COPY server/package*.json server/
-RUN cd server/ && npm ci && npm link ../discojs/discojs-node
+RUN npm run build --workspace=@epfml/discojs-core --workspace=@epfml/discojs-node
 
 COPY server/ server/
 RUN cd server/ && npm run build

diff --git a/cli/package.json b/cli/package.json
@@ -1,15 +1,17 @@
 {
   "name": "@epfml/disco-cli",
   "private": true,
-  "main": "src/benchmark.ts",
+  "main": "dist/benchmark.ts",
   "scripts": {
-    "start": "ts-node src/benchmark.ts"
+    "build": "tsc",
+    "test": ": nothing",
+    "start": "npm run build && node dist/benchmark.js"
   },
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@epfml/disco-server": "2",
-    "@epfml/discojs-node": "2",
+    "@epfml/disco-server": "*",
+    "@epfml/discojs-node": "*",
     "immutable": "4"
   },
   "devDependencies": {
@@ -21,8 +23,6 @@
     "eslint-plugin-node": "11",
     "eslint-plugin-promise": "5",
     "ts-command-line-args": "2",
-    "ts-node": "10",
-    "ts-node-register": "1",
     "typescript": "<4.5.0"
   }
 }
diff --git a/cli/tsconfig.json b/cli/tsconfig.json
@@ -14,9 +14,7 @@
     "declaration": true,
 
     "baseUrl": "src",
-    "paths": {
-      "@/*": ["*"]
-    }
+    "outDir":  "dist",
   },
   "include": ["src"]
 }
diff --git a/discojs/build.bat b/discojs/build.bat
diff --git a/discojs/build.sh b/discojs/build.sh
diff --git a/discojs/discojs-core/.gitignore b/discojs/discojs-core/.gitignore
diff --git a/discojs/discojs-core/.mocharc.json b/discojs/discojs-core/.mocharc.json
@@ -1,7 +1,5 @@
 {
   "extension": ["ts"],
-  "spec": [
-    "src/**/*.spec.ts"
-  ],
+  "spec": ["src/**/*.spec.ts"],
   "require": "ts-node/register"
 }