fix: invoke bug (#110)

midwayjs · Apr 3, 2020 · 7c2d000 · 7c2d000
1 parent eb216d9
commit 7c2d000
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 14 deletions.
diff --git a/packages/faas-cli-command-core/src/core.ts b/packages/faas-cli-command-core/src/core.ts
@@ -338,10 +338,6 @@ export class CommandHookCore implements ICommandHooksCore {
 
   // 加载本地插件
   private async loadLocalPlugin(localPath) {
-    if (this.options.pluginType && this.options.pluginType.indexOf('local') === -1) {
-      this.debug('Skip Local Plugins');
-      return;
-    }
     try {
       if (this.options.config && this.options.config.servicePath && /^\./.test(localPath)) {
         localPath = resolve(this.options.config.servicePath, localPath);
@@ -359,10 +355,6 @@ export class CommandHookCore implements ICommandHooksCore {
 
   // 加载npm包插件
   private async loadNpmPlugins() {
-    if (this.options.pluginType && this.options.pluginType.indexOf('npm') === -1) {
-      this.debug('Skip Npm Plugins');
-      return;
-    }
     for (const npmPath of this.npmPlugin) {
       await this.loadNpm(npmPath, this.options.options.npm || this.options.npm);
     }

diff --git a/packages/faas-cli-command-core/src/interface/commandHookCore.ts b/packages/faas-cli-command-core/src/interface/commandHookCore.ts
@@ -19,7 +19,6 @@ export interface IOptions {
   displayUsage?: any; // 使用帮助的展示处理
   point?: any; // 埋点   (type: string, commandsArray: string[], commandInfo: any, this);
   npm?: string; // 使用何种npm加速
-  pluginType?: string;
 }
 
 export interface ICommandHooksCore {

diff --git a/packages/faas-cli-plugin-invoke/src/index.ts b/packages/faas-cli-plugin-invoke/src/index.ts
@@ -10,8 +10,9 @@ import { writeWrapper } from '@midwayjs/serverless-spec-builder';
 import { createRuntime } from '@midwayjs/runtime-mock';
 import * as FCTrigger from '@midwayjs/serverless-fc-trigger';
 import { resolve, relative, join } from 'path';
+import { tmpdir } from 'os';
 import { FaaSStarterClass, cleanTarget } from './utils';
-import { ensureFileSync, existsSync, writeFileSync, remove, readFileSync, copy } from 'fs-extra';
+import { ensureFileSync, existsSync, writeFileSync, remove, readFileSync, copy, mkdirSync } from 'fs-extra';
 export * from './invoke';
 const commonLock: any = {};
 enum LOCK_TYPE {
@@ -28,7 +29,7 @@ export class FaaSInvokePlugin extends BasePlugin {
   buildLockPath: string;
   entryInfo: any;
   fileChanges: any;
-  defaultTmpFaaSOut = './node_modules/.faas_out';
+  defaultTmpFaaSOut = resolve(tmpdir(), `faas_out_${Date.now()}`);
   commands = {
     invoke: {
       usage: '',
@@ -233,6 +234,9 @@ export class FaaSInvokePlugin extends BasePlugin {
     this.core.debug('Compile', this.codeAnalyzeResult);
     try {
       const dest = join(this.buildDir, 'dist');
+      if (!existsSync(dest)) {
+        mkdirSync(dest);
+      }
       await compileWithOptions(this.baseDir, dest, {
         include: [].concat(this.fileChanges)
       });

diff --git a/packages/faas-cli-plugin-invoke/src/invoke.ts b/packages/faas-cli-plugin-invoke/src/invoke.ts
@@ -35,8 +35,7 @@ export async function invoke (options: InvokeOptions) {
       verbose: options.verbose,
       resultType: 'store'
     },
-    log: console,
-    pluginType: 'local'
+    log: console
   });
   core.addPlugin(FaaSInvokePlugin);
   await core.ready();

diff --git a/packages/faas-util-ts-compile/src/codeAnalysis.ts b/packages/faas-util-ts-compile/src/codeAnalysis.ts
@@ -18,7 +18,7 @@ class CodeAnalysis {
   async start() {
     this.loadSpec();
 
-    const parsedCli = findAndParseTsConfig(this.options.baseDir, undefined, undefined, { include: [].concat(this.options.sourceDir) });
+    const parsedCli = findAndParseTsConfig(this.options.baseDir, undefined, undefined, undefined, { include: [].concat(this.options.sourceDir) });
     const compilerOptions = parsedCli.options;
     const program = ts.createProgram(parsedCli.fileNames, compilerOptions);
     this.checker = program.getTypeChecker();