feat: support ts from env and pkg #71
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
28 tasks
atian25
commented
Mar 29, 2018
lib/format_options.js
Outdated
| @@ -39,6 +40,21 @@ module.exports = function formatOptions(options) { | |||
| } | |||
| options.customEgg = options.framework = framework; | |||
|
|
|||
| // typescript | |||
| if (!options.hasOwnProperty('typescript')) { | |||
| if (process.env.EGG_TYPESCRIPT) { | |||
There was a problem hiding this comment.
这里应该不存在命令行的情况， mm.app 都是手动调用的。
egg-bin 那边想影响这个，只能通过环境变量的方式默认配置
|
win 的那个测试还是没搞不明白 |
|
这个 win 是一直挂的？ |
|
嗯，master 前几天也是这里挂的。单独 only 好像没事，一起跑就挂 |
Codecov Report
@@ Coverage Diff @@
## master #71 +/- ##
===========================================
- Coverage 94.89% 42.25% -52.65%
===========================================
Files 12 10 -2
Lines 588 568 -20
===========================================
- Hits 558 240 -318
- Misses 30 328 +298
Continue to review full report at Codecov.
|
atian25
force-pushed
the
ts
branch
7 times, most recently
from
c46a902 to
50ee2d2
Compare
popomore
approved these changes
Mar 30, 2018
lib/format_options.js
Outdated
| @@ -39,6 +40,21 @@ module.exports = function formatOptions(options) { | |||
| } | |||
| options.customEgg = options.framework = framework; | |||
|
|
|||
| // typescript | |||
| if (!options.hasOwnProperty('typescript')) { | |||
There was a problem hiding this comment.
options. typescript === undefined ?
There was a problem hiding this comment.
'typescript; in options?
测试是不是就提供环境变量就好了
test/format_options.test.js
Outdated
| const baseDir = path.join(__dirname, 'fixtures/demo'); | ||
| mm(process, 'cwd', () => baseDir); | ||
| mm(process.env, 'EGG_TYPESCRIPT', true); | ||
| const opts = formatOptions(); |
lib/format_options.js
Outdated
| @@ -39,6 +40,21 @@ module.exports = function formatOptions(options) { | |||
| } | |||
| options.customEgg = options.framework = framework; | |||
|
|
|||
| // typescript | |||
| if (!options.hasOwnProperty('typescript')) { | |||
| if (process.env.EGG_TYPESCRIPT) { | |||
lib/format_options.js
Outdated
| const pkgFile = path.join(options.baseDir, 'package.json'); | ||
| if (fs.existsSync(pkgFile)) { | ||
| const pkgInfo = require(pkgFile); | ||
| if (pkgInfo && pkgInfo.egg && pkgInfo.egg.typescript) { |
There was a problem hiding this comment.
pkgInfo.egg.typescript === true
atian25
commented
Mar 30, 2018
| // typescript | ||
| if (!('typescript' in options)) { | ||
| // process.env maybe force to string type | ||
| if (String(process.env.EGG_TYPESCRIPT).toLowerCase() === 'true') { |
There was a problem hiding this comment.
这里 env 配置的时候，都会转换为 string 的，所以要这么处理
|
@popomore 可以再看看 |
|
可以合并了，覆盖率没更新 |
|
3.17.0 |
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)
Description of change