Merge pull request #107 from mbc-net/develop

upgrade serverless to support mutil node version
mbc-net · Jan 2, 2025 · 7a23448 · 7a23448
2 parents d26aec8 + 6b92773
commit 7a23448
Show file tree

Hide file tree

Showing 6 changed files with 155 additions and 14 deletions.
diff --git a/.github/workflows/run-test-and-publish-main.yaml b/.github/workflows/run-test-and-publish-main.yaml
@@ -14,13 +14,16 @@ jobs:
   unit_tests:
     name: Unit Test
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        node-version: [18.x, 20.x, 22.x]
     steps:
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - uses: actions/setup-node@v4
         with:
-          node-version: 18
+          node-version: ${{ matrix.node-version }}
           cache: npm
 
       - name: Install dependencies
@@ -36,7 +39,7 @@ jobs:
         uses: dorny/test-reporter@v1
         if: success() || failure()
         with:
-          name: Unit Tests Reporter
+          name: Unit Tests Reporter-${{ matrix.node-version }}
           path: report/unit.xml
           reporter: jest-junit
           fail-on-error: 'true'
@@ -45,13 +48,16 @@ jobs:
     name: E2e Test For Core package
     needs: unit_tests
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        node-version: [18.x, 20.x, 22.x]
     steps:
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - uses: actions/setup-node@v4
         with:
-          node-version: 18
+          node-version: ${{ matrix.node-version }}
           cache: npm
 
       - name: Install dependencies
@@ -67,14 +73,14 @@ jobs:
         name: 'upload artifact'
         if: success() || failure()
         with:
-          name: my-artifacts
+          name: core-report-artifact-${{ matrix.node-version }}
           path: ./packages/core/test/scripts/*.out.txt
 
       - name: E2E Test Report
         uses: dorny/test-reporter@v1
         if: success() || failure()
         with:
-          name: E2E Core Tests Reporter
+          name: E2E Core Tests Reporter-${{ matrix.node-version }}
           path: report/e2e-core.xml
           reporter: jest-junit
           fail-on-error: 'true'

diff --git a/.github/workflows/run-test-develop.yaml b/.github/workflows/run-test-develop.yaml
@@ -14,13 +14,16 @@ jobs:
   unit_tests:
     name: Unit Test
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        node-version: [18.x, 20.x, 22.x]
     steps:
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - uses: actions/setup-node@v4
         with:
-          node-version: 18
+          node-version: ${{ matrix.node-version }}
           cache: npm
 
       - name: Install dependencies
@@ -36,7 +39,7 @@ jobs:
         uses: dorny/test-reporter@v1
         if: success() || failure()
         with:
-          name: Unit Tests Reporter
+          name: Unit Tests Reporter-${{ matrix.node-version }}
           path: report/unit.xml
           reporter: jest-junit
           fail-on-error: 'true'
@@ -45,13 +48,16 @@ jobs:
     name: E2e Test For Core package
     needs: unit_tests
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        node-version: [18.x, 20.x, 22.x]
     steps:
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - uses: actions/setup-node@v4
         with:
-          node-version: 18
+          node-version: ${{ matrix.node-version }}
           cache: npm
 
       - name: Install dependencies
@@ -67,14 +73,14 @@ jobs:
         name: 'upload artifact'
         if: success() || failure()
         with:
-          name: my-artifacts
+          name: core-report-artifact-${{ matrix.node-version }}
           path: ./packages/core/test/scripts/*.out.txt
 
       - name: E2E Test Report
         uses: dorny/test-reporter@v1
         if: success() || failure()
         with:
-          name: E2E Core Tests Reporter
+          name: E2E Core Tests Reporter-${{ matrix.node-version }}
           path: report/e2e-core.xml
           reporter: jest-junit
           fail-on-error: 'true'
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/cli/templates/package.json b/packages/cli/templates/package.json
@@ -73,7 +73,7 @@
     "nestjs-spelunker": "^1.3.0",
     "prettier": "^3.1.1",
     "run-script-os": "^1.1.6",
-    "serverless": "^3.38.0",
+    "serverless": "^3.40.0",
     "serverless-dynamodb": "^0.2.47",
     "serverless-localstack": "^1.1.2",
     "serverless-offline": "^13.3.2",

diff --git a/packages/core/package.json b/packages/core/package.json
@@ -66,7 +66,7 @@
     "ulid": "^2.3.0"
   },
   "devDependencies": {
-    "serverless": "^3.38.0",
+    "serverless": "^3.40.0",
     "serverless-dynamodb": "^0.2.47",
     "serverless-localstack": "^1.1.2",
     "serverless-offline": "^13.3.2",

diff --git a/packages/sequence/src/sequence-master-factory.ts b/packages/sequence/src/sequence-master-factory.ts
@@ -25,7 +25,7 @@ export class SequenceMasterDataProvider implements IMasterDataProvider {
       if (!item) {
         return this.defaultValue
       }
-      return item
+      return item.attributes
     } catch (error) {
       return this.defaultValue
     }