feat: introduce experimentalFeatures root option (#123)

midwayjs · Apr 10, 2020 · e20417f · e20417f
1 parent 89130f1
commit e20417f
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 7 deletions.
diff --git a/packages/faas-cli-command-core/src/interface/commandHookCore.ts b/packages/faas-cli-command-core/src/interface/commandHookCore.ts
@@ -44,21 +44,29 @@ export interface ICoreInstance {
   store: IStore<any>;
   debug: any;
   service: {
+    experimentalFeatures?: {
+      [featureName: string]: any;
+    },
     service?: {
       name: string;
     };
     provider: {
       name: string;
     };
     functions: object;
-    layers?: object;
+    layers?: {
+      [layerName: string]: {
+        path: string;
+      };
+    };
     resources: object;
     custom: any;
     package?: any;
     aggregation?: {
       [aggregationName: string]: {
         deployOrigin?: boolean;
         functions: string[];
+        functionsPattern?: string;
       };
     };
     globalDependencies?: any;

diff --git a/packages/faas-cli-plugin-invoke/package.json b/packages/faas-cli-plugin-invoke/package.json
@@ -7,7 +7,7 @@
     "@midwayjs/faas-util-ts-compile": "^0.2.70",
     "@midwayjs/fcli-command-core": "^0.2.70",
     "@midwayjs/locate": "^1.0.3",
-    "@midwayjs/mwcc": "^0.1.11",
+    "@midwayjs/mwcc": "^0.2.2",
     "@midwayjs/runtime-engine": "^0.2.65",
     "@midwayjs/runtime-mock": "^0.2.65",
     "@midwayjs/serverless-fc-starter": "^0.2.65",

diff --git a/packages/faas-cli-plugin-package/package.json b/packages/faas-cli-plugin-package/package.json
@@ -7,7 +7,7 @@
     "@midwayjs/faas-util-ts-compile": "^0.2.70",
     "@midwayjs/fcli-command-core": "^0.2.70",
     "@midwayjs/locate": "^1.0.3",
-    "@midwayjs/mwcc": "^0.1.11",
+    "@midwayjs/mwcc": "^0.2.2",
     "archiver": "^3.1.1",
     "fs-extra": "^8.1.0",
     "globby": "^10.0.1",

diff --git a/packages/faas-cli-plugin-package/src/index.ts b/packages/faas-cli-plugin-package/src/index.ts
@@ -23,14 +23,13 @@ import {
   copyFiles,
   CodeAny
 } from '@midwayjs/faas-util-ts-compile';
-import { compileInProject } from '@midwayjs/mwcc';
+import { compileInProject, MwccConfig } from '@midwayjs/mwcc';
 import { exec } from 'child_process';
 import * as archiver from 'archiver';
 import { AnalyzeResult, Locator } from '@midwayjs/locate';
 import { tmpdir } from 'os';
 
 export class PackagePlugin extends BasePlugin {
-  core: any;
   options: any;
   servicePath = this.core.config.servicePath;
   // 代表构建产物的路径，非 ts 构建路径
@@ -42,7 +41,7 @@ export class PackagePlugin extends BasePlugin {
   codeAnalyzeResult: AnalyzeResult;
   integrationDistTempDirectory = 'integration_dist'; // 一体化构建的临时目录
   zipCodeDefaultName = 'serverless.zip';
-  mwccHintConfig = {};
+  mwccHintConfig: MwccConfig = {};
 
   commands = {
     package: {

diff --git a/packages/faas-util-ts-compile/package.json b/packages/faas-util-ts-compile/package.json
@@ -4,7 +4,7 @@
   "main": "dist/index",
   "typings": "dist/index.d.ts",
   "dependencies": {
-    "@midwayjs/mwcc": "^0.1.11",
+    "@midwayjs/mwcc": "^0.2.2",
     "fs-extra": "^8.1.0",
     "globby": "^10.0.1",
     "midway-bin": "^2.0.0",