From acfecf8ebfa13822f12d85ec52a26102d4ab6dc5 Mon Sep 17 00:00:00 2001 From: "soar.gy" Date: Wed, 11 Dec 2019 19:41:47 +0800 Subject: [PATCH] fix: layer wrapper --- .../serverless-midway-plugin/src/provider/aliyun/wrapper.ts | 2 +- .../src/provider/tencent/wrapper.ts | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/packages/serverless-midway-plugin/src/provider/aliyun/wrapper.ts b/packages/serverless-midway-plugin/src/provider/aliyun/wrapper.ts index 5f420b11..63479236 100644 --- a/packages/serverless-midway-plugin/src/provider/aliyun/wrapper.ts +++ b/packages/serverless-midway-plugin/src/provider/aliyun/wrapper.ts @@ -1,6 +1,6 @@ export const wrapperContent = `const { FaaSStarter } = require('@midwayjs/faas'); const { asyncWrapper, start } = require('@midwayjs/serverless-fc-starter'); -<% layerDeps.forEach(function(layer){ %>const <%=layer.name%> = require('<%=layer.path%>').default; +<% layerDeps.forEach(function(layer){ %>const <%=layer.name%> = require('<%=layer.path%>'); <% }); %> let starter; diff --git a/packages/serverless-midway-plugin/src/provider/tencent/wrapper.ts b/packages/serverless-midway-plugin/src/provider/tencent/wrapper.ts index b9dbfd44..cec8b015 100644 --- a/packages/serverless-midway-plugin/src/provider/tencent/wrapper.ts +++ b/packages/serverless-midway-plugin/src/provider/tencent/wrapper.ts @@ -1,12 +1,16 @@ export const wrapperContent = `const { FaaSStarter } = require('@midwayjs/faas'); const { asyncWrapper, start } = require('@midwayjs/serverless-scf-starter'); +<% layerDeps.forEach(function(layer){ %>const <%=layer.name%> = require('<%=layer.path%>'); +<% }); %> let starter; let runtime; let inited = false; const initializeMethod = async (config = {}) => { - runtime = await start(); + runtime = await start({ + layers: [<%= layers.join(", ") %>] + }); starter = new FaaSStarter({ config, baseDir: __dirname }); await starter.start(); inited = true;