@midwayjs/core 3.0.0-beta.8 → 3.0.0-beta.9

package/CHANGELOG.md

@@ -3,6 +3,17 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [3.0.0-beta.9](https://github.com/midwayjs/midway/compare/v3.0.0-beta.8...v3.0.0-beta.9) (2021-12-09)
+
+
+### Bug Fixes
+
+* faas missing config in framework ([#1413](https://github.com/midwayjs/midway/issues/1413)) ([7ab16a2](https://github.com/midwayjs/midway/commit/7ab16a24b29d5254a762bfffcdf18385effdf639))
+
+
+
+
+
 # [3.0.0-beta.8](https://github.com/midwayjs/midway/compare/v3.0.0-beta.7...v3.0.0-beta.8) (2021-12-08)
 
 

package/dist/common/webRouterCollector.js

@@ -6,6 +6,7 @@ const util_1 = require("../util");
 const container_1 = require("../context/container");
 const fileDetector_1 = require("./fileDetector");
 const util = require("util");
+const error_1 = require("../error");
 const debug = util.debuglog('midway:debug');
 class WebRouterCollector {
     constructor(baseDir = '', options = {}) {
@@ -70,6 +71,9 @@ class WebRouterCollector {
         if (controllerIgnoreGlobalPrefix) {
             prefix = ignorePrefix;
         }
+        if (/\*/.test(prefix)) {
+            throw new error_1.MidwayCommonError(`Router prefix ${prefix} can't set string with *`);
+        }
         // set prefix
         if (!this.routes.has(prefix)) {
             this.routes.set(prefix, []);

package/dist/context/container.js

@@ -64,8 +64,13 @@ class ContainerConfiguration {
         });
     }
     addImportConfigs(importConfigs) {
-        if (importConfigs && importConfigs.length) {
-            this.container.get(configService_1.MidwayConfigService).add(importConfigs);
+        if (importConfigs) {
+            if (Array.isArray(importConfigs)) {
+                this.container.get(configService_1.MidwayConfigService).add(importConfigs);
+            }
+            else {
+                this.container.get(configService_1.MidwayConfigService).addObject(importConfigs);
+            }
         }
     }
     addImports(imports = []) {

package/dist/interface.d.ts

@@ -400,9 +400,9 @@ export interface IMidwayBootstrapOptions {
     moduleDetector?: 'file' | IFileDetector | false;
     logger?: boolean | ILogger;
     ignore?: string[];
-    globalConfig?: {
+    globalConfig?: Array<{
         [environmentName: string]: Record<string, any>;
-    };
+    }> | Record<string, any>;
 }
 export interface IConfigurationOptions {
     logger?: ILogger;

package/dist/setup.js

@@ -75,7 +75,12 @@ async function initializeGlobalApplicationContext(globalOptions) {
     // bind user code module
     await applicationContext.ready();
     if (globalOptions.globalConfig) {
-        configService.add([globalOptions.globalConfig]);
+        if (Array.isArray(globalOptions.globalConfig)) {
+            configService.add(globalOptions.globalConfig);
+        }
+        else {
+            configService.addObject(globalOptions.globalConfig);
+        }
     }
     // merge config
     await configService.load();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@midwayjs/core",
-  "version": "3.0.0-beta.8",
+  "version": "3.0.0-beta.9",
   "description": "midway core",
   "main": "dist/index",
   "typings": "dist/index.d.ts",
@@ -21,7 +21,7 @@
   ],
   "license": "MIT",
   "devDependencies": {
-    "@midwayjs/decorator": "^3.0.0-beta.8",
+    "@midwayjs/decorator": "^3.0.0-beta.9",
     "koa": "^2.13.4",
     "midway-test-component": "*",
     "mm": "3",
@@ -32,7 +32,7 @@
   },
   "dependencies": {
     "@midwayjs/glob": "^1.0.2",
-    "@midwayjs/logger": "^3.0.0-beta.8",
+    "@midwayjs/logger": "^3.0.0-beta.9",
     "class-transformer": "^0.5.1",
     "extend2": "^1.0.0",
     "picomatch": "^2.2.2",
@@ -46,5 +46,5 @@
   "engines": {
     "node": ">=12"
   },
-  "gitHead": "bfafbdf8798f48d4daac5dd88ad53c6b2f33c110"
+  "gitHead": "d23e4a4fee58097b98461625c428a37d55535cec"
 }