@eggjs/tegg-plugin 3.27.0 → 3.28.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1,9 +1,13 @@
1
1
  "use strict";
2
+ var __importDefault = (this && this.__importDefault) || function (mod) {
3
+ return (mod && mod.__esModule) ? mod : { "default": mod };
4
+ };
2
5
  Object.defineProperty(exports, "__esModule", { value: true });
3
6
  exports.ModuleConfigLoader = void 0;
4
7
  const tegg_1 = require("@eggjs/tegg");
5
8
  const helper_1 = require("@eggjs/tegg/helper");
6
9
  const EggCompatibleProtoImpl_1 = require("./EggCompatibleProtoImpl");
10
+ const extend2_1 = __importDefault(require("extend2"));
7
11
  class ModuleConfigLoader {
8
12
  constructor(app) {
9
13
  this.app = app;
@@ -34,11 +38,14 @@ class ModuleConfigLoader {
34
38
  return func;
35
39
  }
36
40
  loadModuleConfigList() {
41
+ var _a;
37
42
  const result = [];
38
43
  const moduleConfigMap = {};
39
44
  for (const reference of this.app.moduleReferences) {
40
45
  const moduleName = helper_1.ModuleConfigUtil.readModuleNameSync(reference.path);
41
- const config = helper_1.ModuleConfigUtil.loadModuleConfigSync(reference.path, undefined, this.app.config.env) || {};
46
+ const defaultConfig = helper_1.ModuleConfigUtil.loadModuleConfigSync(reference.path, undefined, this.app.config.env);
47
+ // @eggjs/tegg-config moduleConfigs[module].config overwrite
48
+ const config = (0, extend2_1.default)(true, {}, defaultConfig, (_a = this.app.moduleConfigs[moduleName]) === null || _a === void 0 ? void 0 : _a.config);
42
49
  moduleConfigMap[moduleName] = {
43
50
  name: moduleName,
44
51
  reference: {
@@ -77,4 +84,4 @@ class ModuleConfigLoader {
77
84
  }
78
85
  }
79
86
  exports.ModuleConfigLoader = ModuleConfigLoader;
80
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiTW9kdWxlQ29uZmlnTG9hZGVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiTW9kdWxlQ29uZmlnTG9hZGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUFBLHNDQVdxQjtBQUNyQiwrQ0FBc0Q7QUFDdEQscUVBQXVFO0FBR3ZFLE1BQWEsa0JBQWtCO0lBQzdCLFlBQXFCLEdBQWdCO1FBQWhCLFFBQUcsR0FBSCxHQUFHLENBQWE7SUFDckMsQ0FBQztJQUVPLGlCQUFpQixDQUFDLGVBQW1EO1FBQzNFLE1BQU0sYUFBYSxHQUFHLElBQUksb0JBQWEsQ0FBQyxlQUFlLENBQUMsQ0FBQztRQUN6RCxNQUFNLElBQUksR0FBc0I7WUFDOUIsT0FBTyxhQUFhLENBQUM7UUFDdkIsQ0FBUSxDQUFDO1FBQ1QsTUFBTSxJQUFJLEdBQUcsZUFBZSxDQUFDO1FBQzdCLE1BQU0sQ0FBQyxjQUFjLENBQUMsSUFBSSxFQUFFLE1BQU0sRUFBRTtZQUNsQyxLQUFLLEVBQUUsSUFBSTtZQUNYLFFBQVEsRUFBRSxLQUFLO1lBQ2YsVUFBVSxFQUFFLEtBQUs7WUFDakIsWUFBWSxFQUFFLElBQUk7U0FDbkIsQ0FBQyxDQUFDO1FBQ0gsb0JBQWEsQ0FBQyxpQkFBaUIsQ0FBQyxJQUFJLENBQUMsQ0FBQztRQUN0QyxvQkFBYSxDQUFDLFdBQVcsQ0FBQyxJQUFJLEVBQUUsZ0JBQWdCLENBQUMsQ0FBQztRQUNsRCxvQkFBYSxDQUFDLFdBQVcsQ0FBQyxJQUFJLEVBQUU7WUFDOUIsSUFBSTtZQUNKLFFBQVEsRUFBRSxxQkFBYyxDQUFDLFNBQVM7WUFDbEMsV0FBVyxFQUFFLGtCQUFXLENBQUMsTUFBTTtZQUMvQixhQUFhLEVBQUUsb0RBQTJCO1NBQzNDLENBQUMsQ0FBQztRQUNILG9CQUFhLENBQUMsaUJBQWlCLENBQUMsSUFBSSxFQUFFLHFDQUE4QixFQUFFLEtBQUssQ0FBQyxDQUFDO1FBQzdFLG9CQUFhLENBQUMsaUJBQWlCLENBQUMsSUFBSSxFQUFFLGlDQUEwQixF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
87
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiTW9kdWxlQ29uZmlnTG9hZGVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiTW9kdWxlQ29uZmlnTG9hZGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7OztBQUFBLHNDQVdxQjtBQUNyQiwrQ0FBc0Q7QUFDdEQscUVBQXVFO0FBRXZFLHNEQUE2QjtBQUU3QixNQUFhLGtCQUFrQjtJQUM3QixZQUFxQixHQUFnQjtRQUFoQixRQUFHLEdBQUgsR0FBRyxDQUFhO0lBQ3JDLENBQUM7SUFFTyxpQkFBaUIsQ0FBQyxlQUFtRDtRQUMzRSxNQUFNLGFBQWEsR0FBRyxJQUFJLG9CQUFhLENBQUMsZUFBZSxDQUFDLENBQUM7UUFDekQsTUFBTSxJQUFJLEdBQXNCO1lBQzlCLE9BQU8sYUFBYSxDQUFDO1FBQ3ZCLENBQVEsQ0FBQztRQUNULE1BQU0sSUFBSSxHQUFHLGVBQWUsQ0FBQztRQUM3QixNQUFNLENBQUMsY0FBYyxDQUFDLElBQUksRUFBRSxNQUFNLEVBQUU7WUFDbEMsS0FBSyxFQUFFLElBQUk7WUFDWCxRQUFRLEVBQUUsS0FBSztZQUNmLFVBQVUsRUFBRSxLQUFLO1lBQ2pCLFlBQVksRUFBRSxJQUFJO1NBQ25CLENBQUMsQ0FBQztRQUNILG9CQUFhLENBQUMsaUJBQWlCLENBQUMsSUFBSSxDQUFDLENBQUM7UUFDdEMsb0JBQWEsQ0FBQyxXQUFXLENBQUMsSUFBSSxFQUFFLGdCQUFnQixDQUFDLENBQUM7UUFDbEQsb0JBQWEsQ0FBQyxXQUFXLENBQUMsSUFBSSxFQUFFO1lBQzlCLElBQUk7WUFDSixRQUFRLEVBQUUscUJBQWMsQ0FBQyxTQUFTO1lBQ2xDLFdBQVcsRUFBRSxrQkFBVyxDQUFDLE1BQU07WUFDL0IsYUFBYSxFQUFFLG9EQUEyQjtTQUMzQyxDQUFDLENBQUM7UUFDSCxvQkFBYSxDQUFDLGlCQUFpQixDQUFDLElBQUksRUFBRSxxQ0FBOEIsRUFBRSxLQUFLLENBQUMsQ0FBQztRQUM3RSxvQkFBYSxDQUFDLGlCQUFpQixDQUFDLElB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
package/package.json CHANGED
@@ -6,7 +6,7 @@
6
6
  "teggConfig"
7
7
  ]
8
8
  },
9
- "version": "3.27.0",
9
+ "version": "3.28.0",
10
10
  "description": "module plugin for egg",
11
11
  "keywords": [
12
12
  "egg",
@@ -45,18 +45,19 @@
45
45
  "node": ">=14.0.0"
46
46
  },
47
47
  "dependencies": {
48
- "@eggjs/egg-module-common": "^3.27.0",
49
- "@eggjs/tegg": "^3.27.0",
50
- "@eggjs/tegg-background-task": "^3.27.0",
51
- "@eggjs/tegg-common-util": "^3.27.0",
52
- "@eggjs/tegg-dynamic-inject-runtime": "^3.27.0",
53
- "@eggjs/tegg-loader": "^3.27.0",
54
- "@eggjs/tegg-metadata": "^3.27.0",
55
- "@eggjs/tegg-runtime": "^3.27.0",
48
+ "@eggjs/egg-module-common": "^3.28.0",
49
+ "@eggjs/tegg": "^3.28.0",
50
+ "@eggjs/tegg-background-task": "^3.28.0",
51
+ "@eggjs/tegg-common-util": "^3.28.0",
52
+ "@eggjs/tegg-dynamic-inject-runtime": "^3.28.0",
53
+ "@eggjs/tegg-loader": "^3.28.0",
54
+ "@eggjs/tegg-metadata": "^3.28.0",
55
+ "@eggjs/tegg-runtime": "^3.28.0",
56
+ "extend2": "^1.0.0",
56
57
  "sdk-base": "^4.2.0"
57
58
  },
58
59
  "devDependencies": {
59
- "@eggjs/tegg-config": "^3.27.0",
60
+ "@eggjs/tegg-config": "^3.28.0",
60
61
  "@types/mocha": "^10.0.1",
61
62
  "@types/node": "^20.2.4",
62
63
  "cross-env": "^7.0.3",
@@ -72,5 +73,5 @@
72
73
  "publishConfig": {
73
74
  "access": "public"
74
75
  },
75
- "gitHead": "81d3f7480e36ec0d50f5177b3d79064822aac0e4"
76
+ "gitHead": "07d12298ca16c60ee548dc767d115a83f2f82644"
76
77
  }