chore: Reorganize JS packages using NPM workspaces

Author: guilgaly

.github/workflows/release.yml

@@ -74,28 +74,17 @@ jobs:
         with:
           node-version: 20
 
-      - name: Deploy CLI
+      - name: Deploy JS packages
         env:
           AWS_CODEARTIFACT_DOMAIN: ${{ secrets.AWS_CODEARTIFACT_DOMAIN }}
           AWS_CODEARTIFACT_OWNER: ${{ secrets.AWS_CODEARTIFACT_OWNER }}
           AWS_CODEARTIFACT_REGION: ${{ secrets.AWS_CODEARTIFACT_REGION }}
           NODE_AUTH_TOKEN: ${{ steps.repository.outputs.token }}
-        working-directory: ./js-cli
+        working-directory: ./js
         run: |
           npm ci
-          npm run build
           npm version "${{ steps.deploy-jvm.outputs.version }}"
-          npm publish
-
-      - name: Deploy DSL
-        env:
-          AWS_CODEARTIFACT_DOMAIN: ${{ secrets.AWS_CODEARTIFACT_DOMAIN }}
-          AWS_CODEARTIFACT_OWNER: ${{ secrets.AWS_CODEARTIFACT_OWNER }}
-          AWS_CODEARTIFACT_REGION: ${{ secrets.AWS_CODEARTIFACT_REGION }}
-          NODE_AUTH_TOKEN: ${{ steps.repository.outputs.token }}
-        working-directory: ./js-dsl
-        run: |
-          npm ci
-          npm run build
-          npm version "${{ steps.deploy-jvm.outputs.version }}"
-          npm publish
+          npm run build --workspaces
+          for pkg in "cli" "jvm-types" "core" "http"; do
+            npm publish "[email protected]/$pkg"
+          done

.gitignore

@@ -1,13 +1,16 @@
 # sbt
 .bsp/
+version.sbt
 
 # yarn
 node_modules/
 
 # build targets
 target/
 /tmp/
-/js-cli/src/dependencies/versions.ts
+/js/cli/src/dependencies/versions.ts
+/js/jvm-types/index.js
+/js/jvm-types/index.d.ts
 
 # IntelliJ
 *.iml

build-all.sh

@@ -6,9 +6,7 @@ root_dir="$(dirname "$(realpath -- "$0")")"
 
 "$root_dir/build-jvm.sh"
 
-"$root_dir/build-js-cli.sh"
-
-"$root_dir/build-js-dsl.sh"
+"$root_dir/build-js.sh"
 
 # Rebuild js-simulation
 cd "$root_dir/js-simulation"

build-js-cli.sh

@@ -0,0 +1,33 @@
+#!/usr/bin/env bash
+
+set -e
+
+root_dir="$(dirname "$(realpath -- "$0")")"
+
+build_pkg() {
+  pkg=$1
+  target_dir="$root_dir/tmp/$pkg"
+  pkg_archive="$root_dir/js/gatling.io-$pkg-0.0.0.tgz"
+  linked_pkgs=("${@:2}")
+
+  echo "Building $pkg and linking it at $target_dir"
+  mkdir -p "$target_dir"
+
+  cd "$root_dir/js"
+  npm run build "--workspace=$pkg"
+  npm pack "--workspace=$pkg"
+  tar xzf "$pkg_archive" -C "$target_dir"
+  rm "$pkg_archive"
+
+  cd "$target_dir/package"
+  # Multiple packages MUST be linked all at once (executing 'npm link <pkg>' again will remove previous links...)
+  npm link "${linked_pkgs[@]}"
+  npm install
+  npm link
+}
+
+rm -rf "$root_dir/tmp"
+build_pkg "cli"
+build_pkg "jvm-types"
+build_pkg "core" "@gatling.io/jvm-types"
+build_pkg "http" "@gatling.io/jvm-types" "@gatling.io/core"

build-js-dsl.sh

@@ -4,24 +4,17 @@ set -e
 
 root_dir="$(dirname "$(realpath -- "$0")")"
 
+# Publish JVM adapter
 "$root_dir/build-jvm.sh"
 
-# Install and link js-cli
-cd "$root_dir/js-cli"
+# Install and link js
+cd "$root_dir/js"
 npm install
-"$root_dir/build-js-cli.sh"
-cd "$root_dir/tmp/js-cli/package"
-npm link
-
-# Install and link js-dsl
-cd "$root_dir/js-dsl"
-npm install
-"$root_dir/build-js-dsl.sh"
-cd "$root_dir/tmp/js-dsl/package"
-npm link
+"$root_dir/build-js.sh"
 
 # Install js-simulation
 cd "$root_dir/js-simulation"
+# Multiple packages MUST be linked all at once (executing 'npm link <pkg>' again will remove previous links...):
+npm link "@gatling.io/cli" "@gatling.io/core" "@gatling.io/http"
 npm install
-npm link "@gatling/js-cli" "@gatling/js" # Multiple packages MUST be linked all at once (executing npm link again will remove previous links...)
 npm run build # Make sure that js-simulation build works

build-js.sh

@@ -5,18 +5,15 @@ set -e
 root_dir="$(dirname "$(realpath -- "$0")")"
 
 # Publish JVM adapter
+"$root_dir/build-jvm.sh"
+
 cd "$root_dir/jvm"
 sbt gatling-jvm-to-js-adapter/publishLocal
 
-# Install js-cli
-cd "$root_dir/js-cli"
-npm install
-npm run build # Make sure that js-cli build works
-
-# Install and link js-dsl
-cd "$root_dir/js-dsl"
+# Install js
+cd "$root_dir/js"
 npm install
-npm run build # Make sure that js-dsl build works
+npm run build --workspaces # Make sure that js builds works
 
 # Install js-simulation
 cd "$root_dir/js-simulation"