fix: fix invoke lock (#91)

* fix: fix invoke lock * fix: change dynamic require
midwayjs · Mar 18, 2020 · 2a7b847 · 2a7b847
1 parent 22f8d99
commit 2a7b847
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/packages/faas-cli-plugin-test/src/index.ts b/packages/faas-cli-plugin-test/src/index.ts
@@ -1,6 +1,4 @@
 import { BasePlugin } from '@midwayjs/fcli-command-core';
-import { TestCommand, CovCommand } from 'midway-bin';
-import * as co from 'co';
 import { existsSync } from 'fs';
 import { join } from 'path';
 
@@ -41,6 +39,9 @@ export class TestPlugin extends BasePlugin {
         this.core.cli.log('Testing all *.test.js/ts...');
       }
       const options = this.options;
+      const TestCommand = require('midway-bin/lib/cmd/test');
+      const CovCommand = require('midway-bin/lib/cmd/cov');
+      const co = require('co');
       const Command = options.cov ? CovCommand : TestCommand;
       const tester = new Command();
       await co(function*() {

diff --git a/packages/faas-util-ts-compile/src/index.ts b/packages/faas-util-ts-compile/src/index.ts
@@ -1,6 +1,5 @@
 import { join, relative, resolve } from 'path';
 import { readFileSync, existsSync } from 'fs-extra';
-import { BuildCommand } from 'midway-bin';
 export * from './utils';
 import { combineTsConfig } from './utils';
 
@@ -61,6 +60,7 @@ export const tsCompile = async (
     incremental?: boolean;
   } = {}
 ) => {
+  const BuildCommand = require('midway-bin/lib/cmd/build');
   const builder = new BuildCommand();
   let tsJson = null;
   if (options.tsConfigName) {

diff --git a/packages/serverless-invoke/src/core.ts b/packages/serverless-invoke/src/core.ts
@@ -135,6 +135,7 @@ export abstract class InvokeCore implements IInvoke {
         { cwd: baseDir }
       );
       if (!fileChanges || !fileChanges.length) {
+        lockMap[buildLogPath] = true;
         this.debug('Auto skip ts compile');
         return;
       }