fix: can't get appConfig in appConfig #14
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
|
这个不用补吧，已经没问题了 |
Current coverage is 99.83% (diff: 100%)@@ master #14 diff @@
==========================================
Files 16 16
Lines 611 611
Methods 0 0
Messages 0 0
Branches 0 0
==========================================
Hits 610 610
Misses 1 1
Partials 0 0
|
| @@ -36,7 +36,8 @@ module.exports = { | |||
| // app config.{env} | |||
| for (const filename of names) { | |||
| for (const unit of this.getLoadUnits()) { | |||
| const config = this._loadConfig(unit.path, filename, appConfig, unit.type); | |||
| const isApp = unit.type === 'app'; | |||
| const config = this._loadConfig(unit.path, filename, isApp ? '' : appConfig, unit.type); | |||
|
+1 自己合吧，我手机 |
| @@ -36,7 +36,8 @@ module.exports = { | |||
| // app config.{env} | |||
| for (const filename of names) { | |||
| for (const unit of this.getLoadUnits()) { | |||
| const config = this._loadConfig(unit.path, filename, appConfig, unit.type); | |||
| const isApp = unit.type === 'app'; | |||
| const config = this._loadConfig(unit.path, filename, isApp ? undefined : appConfig, unit.type); | |||
There was a problem hiding this comment.
喔, 明白了. 我之前理解错了, 应该是:
{app_root}/config/config.default.js会先执行一次, 且只会执行一次- 然后在 plugin / framework 中的 config 执行, 传递上面的结果为第二个参数
fengmk2
added a commit
that referenced
this pull request
Jan 13, 2023
```bash
egg start timeline:
▇▇▇▇▇▇▇▇▇▇▇▇▇▇▇▇▇▇ [289ms] - #0 Process Start
▇▇▇▇▇▇▇▇▇▇▇▇▇▇▇▇▇▇▇▇▇▇▇▇▇▇▇▇▇▇▇ [510ms] - #1 Application Start
▇ [2ms] - #2 Load Plugin
▇ [1ms] - #3 Load Config
▇ [0ms] - #4 Require(0) ~/eggjs/egg-core/test/fixtures/egg/config/config.default.js
▇ [0ms] - #5 Require(1) ~/eggjs/egg-core/test/fixtures/egg/config/config.unittest.js
▇ [0ms] - #6 Load extend/application.js
▇ [0ms] - #7 Require(2) ~/eggjs/egg-core/test/fixtures/egg/app/extend/application.js
▇ [1ms] - #8 Load extend/context.js
▇ [0ms] - #9 Load extend/request.js
▇ [0ms] - #10 Load extend/response.js
▇ [1ms] - #11 Load app.js
▇ [0ms] - #12 Require(3) ~/eggjs/egg-core/test/fixtures/egg/node_modules/session/app.js
▇ [0ms] - #13 Require(4) app.js
▇▇▇▇▇▇ [101ms] - #14 readyCallback in a
▇▇▇▇▇▇▇▇▇▇▇▇▇▇▇▇▇▇▇▇▇▇▇▇▇▇▇▇▇▇▇ [501ms] - #15 readyCallback in b
▇ [4ms] - #16 Load Middleware
▇ [4ms] - #17 Load "middlewares" to Application
▇ [2ms] - #18 Load Service
▇ [2ms] - #19 Load "service" to Context
▇ [0ms] - #20 Load Controller
▇ [0ms] - #21 Load "controller" to Application
▇ [0ms] - #22 Load Router
```
fengmk2
added a commit
that referenced
this pull request
Jan 13, 2023
```bash
egg start timeline:
▇▇▇▇▇▇▇▇▇▇▇▇▇▇▇▇▇▇ [289ms] - #0 Process Start
▇▇▇▇▇▇▇▇▇▇▇▇▇▇▇▇▇▇▇▇▇▇▇▇▇▇▇▇▇▇▇ [510ms] - #1 Application Start
▇ [2ms] - #2 Load Plugin
▇ [1ms] - #3 Load Config
▇ [0ms] - #4 Require(0) ~/eggjs/egg-core/test/fixtures/egg/config/config.default.js
▇ [0ms] - #5 Require(1) ~/eggjs/egg-core/test/fixtures/egg/config/config.unittest.js
▇ [0ms] - #6 Load extend/application.js
▇ [0ms] - #7 Require(2) ~/eggjs/egg-core/test/fixtures/egg/app/extend/application.js
▇ [1ms] - #8 Load extend/context.js
▇ [0ms] - #9 Load extend/request.js
▇ [0ms] - #10 Load extend/response.js
▇ [1ms] - #11 Load app.js
▇ [0ms] - #12 Require(3) ~/eggjs/egg-core/test/fixtures/egg/node_modules/session/app.js
▇ [0ms] - #13 Require(4) app.js
▇▇▇▇▇▇ [101ms] - #14 readyCallback in a
▇▇▇▇▇▇▇▇▇▇▇▇▇▇▇▇▇▇▇▇▇▇▇▇▇▇▇▇▇▇▇ [501ms] - #15 readyCallback in b
▇ [4ms] - #16 Load Middleware
▇ [4ms] - #17 Load "middlewares" to Application
▇ [2ms] - #18 Load Service
▇ [2ms] - #19 Load "service" to Context
▇ [0ms] - #20 Load Controller
▇ [0ms] - #21 Load "controller" to Application
▇ [0ms] - #22 Load Router
```
atian25
pushed a commit
that referenced
this pull request
Jan 13, 2023
[skip ci] ## [5.3.0](v5.2.0...v5.3.0) (2023-01-13) ### Features * support show app.timing in timline string ([#260](#260)) ([5b7af12](5b7af12)), closes [#0](https://github.com/eggjs/egg-core/issues/0) [#1](#1) [#2](#2) [#3](#3) [#4](#4) [#5](#5) [#6](#6) [#7](#7) [#8](#8) [#9](#9) [#10](#10) [#11](#11) [#12](#12) [#13](#13) [#14](#14) [#15](#15) [#16](#16) [#17](#17) [#18](#18) [#19](#19) [#20](#20) [#21](#21) [#22](#22)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Checklist
npm testpassesAffected core subsystem(s)
loadConfig
Description of change
app config 里不能取 app config