Merge remote-tracking branch 'upstream/main' into mxsdev/module-servi…

…ce-adapter
seamapi · Jan 19, 2024 · 003944b · 003944b
2 parents 2859825 + 660af81
commit 003944b
Show file tree

Hide file tree

Showing 13 changed files with 221 additions and 205 deletions.
diff --git a/.github/workflows/_build.yml b/.github/workflows/_build.yml
@@ -1,38 +1,38 @@
 ---
-  name: _build
+name: _build
 
-  on:
-    workflow_call:
-      inputs:
-        node_version:
-          description: The Node.js version.
-          type: string
-          required: false
-          default: "20"
-      outputs:
-        artifact_name:
-          description: The artifact name.
-          value: build-${{ github.sha }}
+on:
+  workflow_call:
+    inputs:
+      node_version:
+        description: The Node.js version.
+        type: string
+        required: false
+        default: "20"
+    outputs:
+      artifact_name:
+        description: The artifact name.
+        value: build-${{ github.sha }}
 
-  jobs:
-    build:
-      name: Package
-      runs-on: ubuntu-latest
-      timeout-minutes: 30
-      steps:
-        - name: Checkout
-          uses: actions/checkout@v3
-        - name: Setup
-          uses: ./.github/actions/setup
-          with:
-            node_version: ${{ inputs.node_version }}
-        - name: Build
-          run: npm run build
-        - name: Package
-          run: npm pack
-        - name: Upload artifact
-          uses: actions/upload-artifact@v3
-          with:
-            name: build-${{ github.sha }}
-            if-no-files-found: error
-            path: "*.tgz"
+jobs:
+  build:
+    name: Package
+    runs-on: ubuntu-latest
+    timeout-minutes: 30
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+      - name: Setup
+        uses: ./.github/actions/setup
+        with:
+          node_version: ${{ inputs.node_version }}
+      - name: Build
+        run: npm run build
+      - name: Package
+        run: npm pack
+      - name: Upload artifact
+        uses: actions/upload-artifact@v3
+        with:
+          name: build-${{ github.sha }}
+          if-no-files-found: error
+          path: "*.tgz"
diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
@@ -1,133 +1,133 @@
 ---
-  name: Check
+name: Check
 
-  on:
-    push:
-      branches:
-        - "**"
+on:
+  push:
+    branches:
+      - "**"
 
-  jobs:
-    test:
-      name: Test (Node.js v${{ matrix.node }} on ${{ matrix.os_name }})
-      runs-on: ${{ matrix.os }}
-      timeout-minutes: 30
-      strategy:
-        fail-fast: false
-        matrix:
-          os:
-            - ubuntu-latest
-          node:
-            - "18"
-            - "20"
-          include:
-            - os: ubuntu-latest
-              os_name: Linux
-      steps:
-        - name: Checkout
-          uses: actions/checkout@v3
-        - name: Setup
-          uses: ./.github/actions/setup
-          with:
-            node_version: ${{ matrix.node }}
-        - name: Test
-          run: npm test
-    lint:
-      name: Lint (Node.js v${{ matrix.node }})
-      runs-on: ubuntu-latest
-      timeout-minutes: 30
-      strategy:
-        fail-fast: false
-        matrix:
-          node:
-            - "18"
-            - "20"
-      steps:
-        - name: Checkout
-          uses: actions/checkout@v3
-        - name: Setup
-          uses: ./.github/actions/setup
-          with:
-            node_version: ${{ matrix.node }}
-            node_auth_token: ${{ secrets.GH_TOKEN }}
-        - name: Lint
-          run: npm run lint
-    build:
-      name: Build
-      uses: ./.github/workflows/_build.yml
-    install:
-      name: Install (Node.js v${{ matrix.node }} on ${{ matrix.os_name }})
-      runs-on: ${{ matrix.os }}
-      timeout-minutes: 30
-      needs: build
-      strategy:
-        fail-fast: false
-        matrix:
-          os:
-            - ubuntu-latest
-          node:
-            - "18"
-            - "20"
-          include:
-            - os: ubuntu-latest
-              os_name: Linux
-      steps:
-        - name: Setup Node.js
-          uses: actions/setup-node@v3
-          with:
-            node-version: ${{ matrix.node }}
-        - name: Download artifact
-          uses: actions/download-artifact@v3
-          with:
-            name: ${{ needs.build.outputs.artifact_name }}
-            path: .
-        - name: Find packages
-          uses: tj-actions/glob@v16
-          id: packages
-          with:
-            files: "*.tgz"
-        - name: Create package.json
-          uses: DamianReeves/[email protected]
-          with:
-            write-mode: overwrite
-            path: package.json
-            contents: |
-              {"type":"module"}
-        - name: Create index.js
-          uses: DamianReeves/[email protected]
-          with:
-            write-mode: overwrite
-            path: index.js
-            contents: |
-              import 'edgespec'
-        - name: Install
-          run: npm install --ignore-scripts --save ${{ steps.packages.outputs.paths }}
-        - name: Rebuild Node.js modules
-          shell: bash
-          run: npm rebuild
-        - name: Run postinstall script
-          shell: bash
-          run: npm run postinstall --if-present
-        - name: Run prepare script
-          shell: bash
-          run: npm run prepare --if-present
-        - name: Run
-          run: node index.js
-    typecheck:
-      name: Typecheck (Node.js v${{ matrix.node }})
-      runs-on: ubuntu-latest
-      timeout-minutes: 30
-      strategy:
-        fail-fast: false
-        matrix:
-          node:
-            - "18"
-            - "20"
-      steps:
-        - name: Checkout
-          uses: actions/checkout@v3
-        - name: Setup
-          uses: ./.github/actions/setup
-          with:
-            node_version: ${{ matrix.node }}
-        - name: Check types
-          run: npm run typecheck
+jobs:
+  test:
+    name: Test (Node.js v${{ matrix.node }} on ${{ matrix.os_name }})
+    runs-on: ${{ matrix.os }}
+    timeout-minutes: 30
+    strategy:
+      fail-fast: false
+      matrix:
+        os:
+          - ubuntu-latest
+        node:
+          - "18"
+          - "20"
+        include:
+          - os: ubuntu-latest
+            os_name: Linux
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+      - name: Setup
+        uses: ./.github/actions/setup
+        with:
+          node_version: ${{ matrix.node }}
+      - name: Test
+        run: npm test
+  lint:
+    name: Lint (Node.js v${{ matrix.node }})
+    runs-on: ubuntu-latest
+    timeout-minutes: 30
+    strategy:
+      fail-fast: false
+      matrix:
+        node:
+          - "18"
+          - "20"
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+      - name: Setup
+        uses: ./.github/actions/setup
+        with:
+          node_version: ${{ matrix.node }}
+          node_auth_token: ${{ secrets.GH_TOKEN }}
+      - name: Lint
+        run: npm run lint
+  build:
+    name: Build
+    uses: ./.github/workflows/_build.yml
+  install:
+    name: Install (Node.js v${{ matrix.node }} on ${{ matrix.os_name }})
+    runs-on: ${{ matrix.os }}
+    timeout-minutes: 30
+    needs: build
+    strategy:
+      fail-fast: false
+      matrix:
+        os:
+          - ubuntu-latest
+        node:
+          - "18"
+          - "20"
+        include:
+          - os: ubuntu-latest
+            os_name: Linux
+    steps:
+      - name: Setup Node.js
+        uses: actions/setup-node@v3
+        with:
+          node-version: ${{ matrix.node }}
+      - name: Download artifact
+        uses: actions/download-artifact@v3
+        with:
+          name: ${{ needs.build.outputs.artifact_name }}
+          path: .
+      - name: Find packages
+        uses: tj-actions/glob@v16
+        id: packages
+        with:
+          files: "*.tgz"
+      - name: Create package.json
+        uses: DamianReeves/[email protected]
+        with:
+          write-mode: overwrite
+          path: package.json
+          contents: |
+            {"type":"module"}
+      - name: Create index.js
+        uses: DamianReeves/[email protected]
+        with:
+          write-mode: overwrite
+          path: index.js
+          contents: |
+            import 'edgespec'
+      - name: Install
+        run: npm install --ignore-scripts --save ${{ steps.packages.outputs.paths }}
+      - name: Rebuild Node.js modules
+        shell: bash
+        run: npm rebuild
+      - name: Run postinstall script
+        shell: bash
+        run: npm run postinstall --if-present
+      - name: Run prepare script
+        shell: bash
+        run: npm run prepare --if-present
+      - name: Run
+        run: node index.js
+  typecheck:
+    name: Typecheck (Node.js v${{ matrix.node }})
+    runs-on: ubuntu-latest
+    timeout-minutes: 30
+    strategy:
+      fail-fast: false
+      matrix:
+        node:
+          - "18"
+          - "20"
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+      - name: Setup
+        uses: ./.github/actions/setup
+        with:
+          node_version: ${{ matrix.node }}
+      - name: Check types
+        run: npm run typecheck
diff --git a/ava.config.js b/ava.config.js
@@ -2,7 +2,7 @@ export default () => {
   return {
     files: ["**/*.test.ts"],
     watchMode: {
-      ignoreChanges: [".next", ".nsm", "**/bundled*.*s"]
+      ignoreChanges: [".next", ".nsm", "**/bundled*.*s"],
     },
     nodeArguments: ["--import=tsx"],
     extensions: {

diff --git a/src/cli/cli.js b/src/cli/cli.js
@@ -63,4 +63,4 @@ main().catch((e) => {
     `Error while running edgespec CLI: ${e.toString()}\n\n${e.stack}`
   )
   process.exit(1)
-})
+})
diff --git a/src/routes/create-route-map-from-directory.ts b/src/routes/create-route-map-from-directory.ts
@@ -1,6 +1,8 @@
 import { getMatchingFilePaths } from "make-vfs"
 
-export const createRouteMapFromDirectory = async (directoryPath: string): Promise<Record<string, string>> => {
+export const createRouteMapFromDirectory = async (
+  directoryPath: string
+): Promise<Record<string, string>> => {
   const filePaths = await getMatchingFilePaths({
     dirPath: directoryPath,
     extensions: ["ts"],
-Original file line number
+Diff line change
@@ Expand Up / @@ -63,4 +63,4 @@ main().catch((e) => { @@
         `Error while running edgespec CLI: ${e.toString()}\n\n${e.stack}`
       )
       process.exit(1)
-    })
+    })