From 207f5d318d885351441f6de030cb6fd897861ed9 Mon Sep 17 00:00:00 2001 From: echosoar <82163514@qq.com> Date: Fri, 6 Mar 2020 18:29:52 +0800 Subject: [PATCH 1/2] fix: compile skip check --- packages/serverless-invoke/src/core.ts | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/packages/serverless-invoke/src/core.ts b/packages/serverless-invoke/src/core.ts index 5c2efa05..727c0ed2 100644 --- a/packages/serverless-invoke/src/core.ts +++ b/packages/serverless-invoke/src/core.ts @@ -8,7 +8,7 @@ import { FaaSStarterClass, cleanTarget, compareFileChange } from './utils'; import { join, resolve, relative } from 'path'; import { existsSync, move, writeFileSync, ensureFileSync } from 'fs-extra'; -import { loadSpec } from '@midwayjs/fcli-command-core'; +import { loadSpec, getSpecFile } from '@midwayjs/fcli-command-core'; import { writeWrapper } from '@midwayjs/serverless-spec-builder'; import { AnalyzeResult, Locator } from '@midwayjs/locate'; import { @@ -36,6 +36,7 @@ export abstract class InvokeCore implements IInvoke { spec: any; buildDir: string; wrapperInfo: any; + specFile: string; codeAnalyzeResult: AnalyzeResult; constructor(options: InvokeOptions) { @@ -44,6 +45,7 @@ export abstract class InvokeCore implements IInvoke { this.baseDir = this.options.baseDir; this.buildDir = resolve(this.baseDir, options.buildDir || 'dist'); this.spec = loadSpec(this.baseDir); + this.specFile = getSpecFile(this.baseDir); } protected async getStarter() { @@ -98,7 +100,7 @@ export abstract class InvokeCore implements IInvoke { const buildLogPath = resolve(this.buildDir, '.faasTSBuildTime.log'); if (existsSync(buildLogPath)) { const fileChanges = await compareFileChange( - [ `${relative(baseDir, this.codeAnalyzeResult.tsCodeRoot)}/**/*` ], + [ this.specFile, `${relative(baseDir, this.codeAnalyzeResult.tsCodeRoot)}/**/*` ], [ buildLogPath ], { cwd: baseDir } ); From e1d16824aa06c6c9973f469271729e9d950b130d Mon Sep 17 00:00:00 2001 From: echosoar <82163514@qq.com> Date: Fri, 6 Mar 2020 18:59:19 +0800 Subject: [PATCH 2/2] fix: get yml file path --- packages/serverless-invoke/src/core.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/serverless-invoke/src/core.ts b/packages/serverless-invoke/src/core.ts index 727c0ed2..f3f29275 100644 --- a/packages/serverless-invoke/src/core.ts +++ b/packages/serverless-invoke/src/core.ts @@ -45,7 +45,7 @@ export abstract class InvokeCore implements IInvoke { this.baseDir = this.options.baseDir; this.buildDir = resolve(this.baseDir, options.buildDir || 'dist'); this.spec = loadSpec(this.baseDir); - this.specFile = getSpecFile(this.baseDir); + this.specFile = getSpecFile(this.baseDir).path; } protected async getStarter() {