Merge branch 'main' into feature/text-chat

mml-io · Sep 4, 2023 · a092727 · a092727
2 parents 7e03a6d + 0b919eb
commit a092727
Show file tree

Hide file tree

Showing 34 changed files with 13,655 additions and 37,244 deletions.
diff --git a/.github/actions/npm-install-build-and-cache/action.yaml b/.github/actions/npm-install-build-and-cache/action.yaml
@@ -0,0 +1,44 @@
+---
+name: NPM Install, Build, and Cache
+description: NPM Install Dependencies, NPM Run Build, and Cache Dependencies & Artifacts
+
+outputs:
+  npm-deps-cache-hit:
+    description: "Whether or not the npm dependencies are cached"
+    value: ${{ steps.cache-npm-deps.outputs.cache-hit }}
+
+runs:
+  using: "composite"
+  steps:
+    - name: Set up nodejs
+      uses: actions/setup-node@v3
+      with:
+        node-version-file: ".nvmrc"
+        cache: npm
+
+    - name: Cache NPM dependencies
+      uses: actions/cache@v3
+      id: cache-npm-deps
+      with:
+        path: |
+          node_modules
+          ~/.cache
+        key: ${{ runner.os }}-npm-v3-${{ hashFiles('package-lock.json') }}
+
+    - name: Install dependencies
+      if: steps.cache-npm-deps.outputs.cache-hit != 'true'
+      shell: bash
+      run: npm ci
+
+    - name: Build
+      shell: bash
+      run: npm run build
+
+    - name: Upload build artifacts
+      uses: actions/upload-artifact@v3
+      with:
+        name: build-artifacts
+        path: |
+          packages/**/build/*
+          e2e-tests/build/*
+        if-no-files-found: error
diff --git a/.github/actions/retrieve-deps-and-build/action.yaml b/.github/actions/retrieve-deps-and-build/action.yaml
@@ -0,0 +1,25 @@
+---
+name: Retrieve Dependencies and Build Artifacts
+description: Retrieve cached NPM Install Dependencies and NPM Run Build Artifacts
+
+runs:
+  using: "composite"
+  steps:
+    - name: Download build artifacts
+      uses: actions/download-artifact@v3
+      with:
+        name: build-artifacts
+
+    - name: Set up nodejs
+      uses: actions/setup-node@v3
+      with:
+        node-version-file: ".nvmrc"
+        cache: npm
+
+    - name: Cache NPM dependencies
+      uses: actions/cache@v3
+      with:
+        path: |
+          node_modules
+          ~/.cache
+        key: ${{ runner.os }}-npm-v3-${{ hashFiles('package-lock.json') }}
diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
@@ -11,58 +11,139 @@ permissions:
   checks: write
 
 jobs:
-  main:
-    name: Main
+  build:
+    name: Build
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository
         uses: actions/checkout@v3
         with:
           persist-credentials: false
 
-      - uses: actions/cache@v3
-        with:
-          path: |
-            ~/.cache
-          key: ${{ runner.os }}
+      - name: "NPM Install, Build, and Cache"
+        id: npm-install-build-and-cache
+        uses: ./.github/actions/npm-install-build-and-cache
 
-      - name: Set up nodejs
-        uses: actions/setup-node@v3
+  test:
+    name: Test
+    needs: build
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v3
         with:
-          node-version-file: ".nvmrc"
-          cache: npm
-
-      - name: Install dependencies
-        run: npm ci
+          persist-credentials: false
 
-      - name: Build
-        run: npm run build
+      - name: "Retrieve Dependencies and Build Artifacts"
+        id: retrieve-deps-and-build
+        uses: ./.github/actions/retrieve-deps-and-build
 
       - name: Test
         run: npm run test-all
 
+  type-check:
+    name: Type Check
+    needs: build
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v3
+        with:
+          persist-credentials: false
+
+      - name: "Retrieve Dependencies and Build Artifacts"
+        id: retrieve-deps-and-build
+        uses: ./.github/actions/retrieve-deps-and-build
+
       - name: Type Check
         run: npm run type-check-all
 
+  lint:
+    name: Lint
+    needs: build
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v3
+        with:
+          persist-credentials: false
+
+      - name: "Retrieve Dependencies and Build Artifacts"
+        id: retrieve-deps-and-build
+        uses: ./.github/actions/retrieve-deps-and-build
+
       - name: Lint
         run: npm run lint-all
 
+  summary:
+    name: Summary
+    needs: [build, test, type-check, lint]
+    runs-on: ubuntu-latest
+    steps:
+      - name: Summary
+        run: |
+          echo "Build: ${{ needs.build.result }}"
+          echo "Test: ${{ needs.test.result }}"
+          echo "Type Check: ${{ needs.type-check.result }}"
+          echo "Lint: ${{ needs.lint.result }}"
+
+  publish-experimental-packages:
+    name: Publish Experimental Packages
+    needs: summary
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v3
+        with:
+          persist-credentials: false
+
+      - name: "Retrieve Dependencies and Build Artifacts"
+        id: retrieve-deps-and-build
+        uses: ./.github/actions/retrieve-deps-and-build
+
       - name: Publish
         run: |
           # Set up git user for lerna to create a local commit with
           git config --global user.email "[email protected]"
           git config --global user.name "lerna-ci-mml"
-          
+
           # Set up npm auth token from secret for publishing
           echo //registry.npmjs.org/:_authToken=${NPM_TOKEN} > .npmrc
-          
-          # Attempt to publish at the current version - this will skip if the version already exists
-          echo "Attempting to publishing latest version"
-          ./node_modules/.bin/lerna publish from-package --no-private --dist-tag latest --ignore-scripts --ignore-changes --no-push --yes
-          
+
           # Publish the current commit as an "experimental" version
           version="0.0.0-experimental-$(git rev-parse --short HEAD)-$(date +'%Y%m%d')"
           echo "Publishing experimental version $version"
           ./node_modules/.bin/lerna publish $version --no-private --dist-tag experimental --ignore-scripts --ignore-changes --no-push --yes
         env:
           NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
+
+
+  publish-release-packages:
+    name: Publish Packages
+    environment: package-release
+    needs: summary
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v3
+        with:
+          persist-credentials: false
+
+      - name: "Retrieve Dependencies and Build Artifacts"
+        id: retrieve-deps-and-build
+        uses: ./.github/actions/retrieve-deps-and-build
+
+      - name: Publish
+        run: |
+          # Set up git user for lerna to create a local commit with
+          git config --global user.email "[email protected]"
+          git config --global user.name "lerna-ci-mml"
+
+          # Set up npm auth token from secret for publishing
+          echo //registry.npmjs.org/:_authToken=${NPM_TOKEN} > .npmrc
+
+          # Attempt to publish at the current version - this will skip if the version already exists
+          echo "Attempting to publishing latest version"
+          ./node_modules/.bin/lerna publish from-package --no-private --dist-tag latest --ignore-scripts --ignore-changes --no-push --yes
+        env:
+          NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml
@@ -1,4 +1,4 @@
-name: Pull Request Test
+name: PR
 
 on:
   pull_request:
@@ -11,40 +11,78 @@ permissions:
   checks: write
 
 jobs:
-  pr:
-    name: Pull Request Test
+  build:
+    name: Build
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository
         uses: actions/checkout@v3
         with:
           persist-credentials: false
 
-      - uses: actions/cache@v3
-        with:
-          path: |
-            ~/.cache
-          key: ${{ runner.os }}
+      - name: "NPM Install, Build, and Cache"
+        id: npm-install-build-and-cache
+        uses: ./.github/actions/npm-install-build-and-cache
 
-      - name: Set up nodejs
-        uses: actions/setup-node@v3
+  test:
+    name: Test
+    needs: build
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v3
         with:
-          node-version-file: ".nvmrc"
-          cache: npm
-
-      - name: Install dependencies
-        run: npm ci
+          persist-credentials: false
 
-      - name: Build
-        run: npm run build
+      - name: "Retrieve Dependencies and Build Artifacts"
+        id: retrieve-deps-and-build
+        uses: ./.github/actions/retrieve-deps-and-build
 
       - name: Test
         run: npm run test-all
 
+  type-check:
+    name: Type Check
+    needs: build
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v3
+        with:
+          persist-credentials: false
+
+      - name: "Retrieve Dependencies and Build Artifacts"
+        id: retrieve-deps-and-build
+        uses: ./.github/actions/retrieve-deps-and-build
+
       - name: Type Check
         run: npm run type-check-all
 
+  lint:
+    name: Lint
+    needs: build
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v3
+        with:
+          persist-credentials: false
+
+      - name: "Retrieve Dependencies and Build Artifacts"
+        id: retrieve-deps-and-build
+        uses: ./.github/actions/retrieve-deps-and-build
+
       - name: Lint
         run: npm run lint-all
 
-
+  summary:
+    name: Summary
+    needs: [build, test, type-check, lint]
+    runs-on: ubuntu-latest
+    steps:
+      - name: Summary
+        run: |
+          echo "Build: ${{ needs.build.result }}"
+          echo "Test: ${{ needs.test.result }}"
+          echo "Type Check: ${{ needs.type-check.result }}"
+          echo "Lint: ${{ needs.lint.result }}"
diff --git a/.nvmrc b/.nvmrc
@@ -1 +1 @@
-v16
+v18.16.0
diff --git a/check-node-version.js b/check-node-version.js
@@ -1,5 +1,7 @@
-const { readFileSync } = require("fs");
-const { resolve } = require("path");
+#!/usr/bin/env node
+
+import { readFileSync } from "fs";
+import { resolve } from "path";
 
 let nvmrc;
 try {
@@ -12,8 +14,8 @@ try {
 const currentVersion = process.version.trim();
 const nvmrcVersion = nvmrc.trim();
 
-if (currentVersion.startsWith(nvmrcVersion)) {
-  console.log(`nvmrc node version (${nvmrcVersion}) matches: ${currentVersion}`);
+if (currentVersion === nvmrcVersion) {
+  console.log(`Node version matches: ${currentVersion}`);
 } else {
   console.error(`Node version mismatch (${currentVersion} != ${nvmrcVersion}).`);
   console.log(`Run 'nvm install ${nvmrcVersion}' to resolve.`);

diff --git a/example/server/build.js → example/server/build.ts b/example/server/build.js → example/server/build.ts
@@ -1,4 +1,4 @@
-import esbuild from "esbuild";
+import * as esbuild from "esbuild";
 
 const buildMode = "--build";
 const watchMode = "--watch";
@@ -14,7 +14,7 @@ if (args.length !== 1) {
 
 const mode = args[0];
 
-const buildOptions = {
+const buildOptions: esbuild.BuildOptions = {
   entryPoints: ["src/index.ts"],
   outdir: "./build",
   bundle: true,