fix: update remove flow (#18)

* fix: update remove flow

* ci: update config

* fix: update deps

* test: update

.github/workflows/release.yml

@@ -43,6 +43,6 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
           GIT_AUTHOR_NAME: slsplus
-          GIT_AUTHOR_EMAIL: yuga.sun.bj@gmail.com
+          GIT_AUTHOR_EMAIL: slsplus.sz@gmail.com
           GIT_COMMITTER_NAME: slsplus
-          GIT_COMMITTER_EMAIL: yuga.sun.bj@gmail.com
+          GIT_COMMITTER_EMAIL: slsplus.sz@gmail.com

.github/workflows/test.yml

@@ -38,7 +38,7 @@ jobs:
         run: |
           npm update --no-save
           npm update --save-dev --no-save
-      - name: Running integration tests
+      - name: Running tests
         run: npm run test
         env:
           SERVERLESS_PLATFORM_VENDOR: tencent

tests/integration.test.js → __tests__/index.test.js

@@ -1,18 +1,10 @@
-const path = require('path')
-require('dotenv').config({
-  path: path.join(__dirname, '..', '.env.test')
-})
-const { generateId, getServerlessSdk } = require('./utils')
+const { generateId, getServerlessSdk } = require('./lib/utils')
 const axios = require('axios')
 
-// set enough timeout for deployment to finish
-jest.setTimeout(600000)
-
-// the yaml file we're testing against
 const instanceYaml = {
   org: 'orgDemo',
   app: 'appDemo',
-  component: 'nextjs',
+  component: 'nextjs@dev',
   name: `nextjs-integration-tests-${generateId()}`,
   stage: 'dev',
   inputs: {
@@ -22,15 +14,13 @@ const instanceYaml = {
   }
 }
 
-// get credentials from process.env but need to init empty credentials object
 const credentials = {
   tencent: {
     SecretId: process.env.TENCENT_SECRET_ID,
     SecretKey: process.env.TENCENT_SECRET_KEY,
   }
 }
 
-// get serverless construct sdk
 const sdk = getServerlessSdk(instanceYaml.org)
 
 it('should successfully deploy nextjs app', async () => {

jest.config.js

@@ -0,0 +1,14 @@
+const { join } = require('path')
+require('dotenv').config({ path: join(__dirname, '.env.test') })
+
+const config = {
+  verbose: true,
+  silent: false,
+  testTimeout: 600000,
+  testEnvironment: 'node',
+  testRegex: '(/__tests__/.*|(\\.|/)(test|spec))\\.(js|ts)$',
+  testPathIgnorePatterns: ['/node_modules/', '/__tests__/lib/'],
+  moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'json', 'node']
+}
+
+module.exports = config

package.json

@@ -6,7 +6,7 @@
   },
   "description": "Tencent Cloud Next.js Serverless Component",
   "scripts": {
-    "test": "jest ./tests/integration.test.js --testEnvironment node",
+    "test": "jest",
     "commitlint": "commitlint -f HEAD@{15}",
     "lint": "eslint --ext .js,.ts,.tsx .",
     "lint:fix": "eslint --fix --ext .js,.ts,.tsx .",

serverless.component.yml

@@ -1,5 +1,5 @@
 name: nextjs
-version: 0.1.9
+version: 0.1.10
 author: 'Tencent Cloud, Inc.'
 org: 'Tencent Cloud, Inc.'
 description: Deploy a serverless Next.js application onto Tencent SCF and API Gateway.

src/package.json

@@ -2,7 +2,7 @@
   "dependencies": {
     "adm-zip": "^0.4.16",
     "download": "^8.0.0",
-    "tencent-component-toolkit": "^1.19.8",
+    "tencent-component-toolkit": "^1.20.5",
     "type": "^2.1.0"
   }
 }

src/serverless.js

@@ -358,10 +358,6 @@ class ServerlessComopnent extends Component {
       const scf = new Scf(credentials, curRegion)
       const apigw = new Apigw(credentials, curRegion)
       const handler = async () => {
-        await scf.remove({
-          functionName: curState.functionName,
-          namespace: curState.namespace
-        })
         // if disable apigw, no need to remove
         if (state.apigwDisabled !== true) {
           await apigw.remove({
@@ -372,6 +368,10 @@ class ServerlessComopnent extends Component {
             customDomains: curState.customDomains
           })
         }
+        await scf.remove({
+          functionName: curState.functionName,
+          namespace: curState.namespace
+        })
       }
       removeHandlers.push(handler())
     }