feat: change serverless plugin

midwayjs · Dec 10, 2019 · b1be100 · b1be100
1 parent 856e8f7
commit b1be100
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 15 deletions.
diff --git a/packages/runtime-mock/src/runtime.ts b/packages/runtime-mock/src/runtime.ts
@@ -102,7 +102,7 @@ export class MockRuntime {
       }
 
       return new Promise((resolve, reject) => {
-        if (this.trigger.useCallback) {
+        if (this.trigger && this.trigger.useCallback) {
           // 这个地方 callback 得调用 resolve
           const cb = this.trigger.createCallback((err, result) => {
             if (err) {

diff --git a/packages/serverless-midway-plugin/src/core/serverless/commonHack.ts b/packages/serverless-midway-plugin/src/core/serverless/commonHack.ts
@@ -1,8 +1,6 @@
 import { IServerless, ICommandOptions, ICommandParam } from '../../interface/midwayServerless';
 export const hackInit = async(serverless: IServerless, commands: ICommandOptions, options: ICommandParam) => {
-  console.log('hack init');
 };
 
 export const hackRun = async (serverless: IServerless, commands: ICommandOptions, options: ICommandParam) => {
-  console.log('hack run');
 };
diff --git a/packages/serverless-midway-plugin/src/provider/aliyun/index.ts b/packages/serverless-midway-plugin/src/provider/aliyun/index.ts
@@ -36,6 +36,7 @@ class ProviderFc extends ProviderBase {
 
         // 执行 package 打包
         await this.callCommand('package', {
+          ...this.options,
           skipZip: true // 跳过压缩成zip
         });
         this.serverless.cli.log('Start deploy by @alicloud/fun');

diff --git a/packages/serverless-midway-plugin/src/provider/default/package/index.ts b/packages/serverless-midway-plugin/src/provider/default/package/index.ts
@@ -123,7 +123,7 @@ export class Package extends CommandBase {
           }
         }
         writeFileSync(pkgJsonPath, JSON.stringify(pkgJson, null, '  '));
-        spinner.text = 'npm install';
+        spinner.text = `${this.options.npm || 'npm'} install`;
         await this.npmInstall();
         for (const localDepName in localDep) {
           spinner.text = localDepName;

diff --git a/packages/serverless-midway-plugin/src/provider/tencent/index.ts b/packages/serverless-midway-plugin/src/provider/tencent/index.ts
@@ -37,9 +37,12 @@ class ProviderTencent extends ProviderBase {
         hooks['package:compileFunctions'].push({
           pluginName: 'ProviderTencent',
           hook: async () => {
-            this.serverless.processedInput.options.package = `.serverless/${artifact}`;
             // 进行构建
-            await this.serverless.pluginManager.invoke.call(this.serverless.pluginManager, ['package'], true);
+            // 执行 package 打包
+            await this.callCommand('package', {
+              ...this.options,
+              package: `.serverless/${artifact}`
+            });
           },
         });
         // 修改打包文件

diff --git a/packages/serverless-midway-plugin/test/deployAliyun/src/index.ts b/packages/serverless-midway-plugin/test/deployAliyun/src/index.ts
@@ -8,6 +8,6 @@ export class HelloService {
   ctx: FaaSContext;  // context
 
   async handler(event, obj = {}) {
-      return 'hello world';
+    return 'hello world';
   }
 }
diff --git a/packages/serverless-midway-plugin/test/deployTencent/serverless.yml b/packages/serverless-midway-plugin/test/deployTencent/serverless.yml
@@ -13,14 +13,6 @@ functions:
           parameters:
             serviceId: ''
           method: get
-  index2:
-    initializer: index.initializer
-    handler: index.handler2
-    events:
-      - apigw:
-          parameters:
-            serviceId: ''
-          method: get
 
 plugins:
   - test