Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: [BREAKING_CHANGE] use egg-core #44

Merged
merged 16 commits into from
Aug 18, 2016
Merged

feat: [BREAKING_CHANGE] use egg-core #44

merged 16 commits into from
Aug 18, 2016

Conversation

popomore
Copy link
Member

@popomore popomore commented Aug 12, 2016

Checklist
  • npm test passes
  • tests and/or benchmarks are included
  • documentation is changed or added
  • commit message follows commit guidelines
Affected core subsystem(s)

loader, Application

Description of change

直接依赖 egg-core,egg-core 有一些不兼容更新

  • 去除 lib/core 约定,将 app 和 config 移到根目录
  • EggApplication 依赖 EggCore,去除 loader 和 ready 初始化
  • egg-cluster 更新
  • 测试用例修改
  • example 的测试用例

插件

  • egg-i18n 依赖 app.loader.loadDirs
  • egg-logrotater
  • egg-schedule
  • userrole

@popomore
Copy link
Member Author

后来是没开 travis?

@popomore
Copy link
Member Author

deps eggjs/core#6

@popomore
Copy link
Member Author

eggjs/cluster#4

@popomore
Copy link
Member Author

我先发个 0.1.0-beta.1 测试

@popomore
Copy link
Member Author

@fengmk2 这个没有 ci 怎么跑?

@popomore
Copy link
Member Author

latest: 0.0.8
test: 0.1.0-beta.1

@fengmk2
Copy link
Member

fengmk2 commented Aug 16, 2016

private repo 需要收费。。。

@popomore
Copy link
Member Author

恩,我现在本地跑的

@popomore
Copy link
Member Author

eggjs/i18n#2

@popomore
Copy link
Member Author

eggjs/egg-userrole#4

@popomore
Copy link
Member Author

eggjs/schedule#6

@fengmk2
Copy link
Member

fengmk2 commented Aug 16, 2016

可以重新跑了

@popomore
Copy link
Member Author

  • egg@0.1.0-beta.3

@popomore
Copy link
Member Author

eggjs/egg-logrotator#4

@popomore
Copy link
Member Author

加了个 circleci https://circleci.com/gh/eggjs/egg/2

@@ -53,7 +53,7 @@ module.exports = {
* @since 1.0.0
*/
i18n: {
enable: false,
enable: true,
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

这个需要默认开启的?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

原来没开?

@popomore
Copy link
Member Author

@fengmk2 原来 examples 的用例好像就跑不过

@popomore
Copy link
Member Author

view 层好像有些用例 skip 了 @atian25

* @member {Service} Egg#Service
* @since 1.0.0
*/
exports.Service = require('./lib/core/base_service');
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

这个去掉了

@atian25
Copy link
Member

atian25 commented Aug 17, 2016

@popomore view 的测试, 这里是不是不用引入 egg-view-nunjucks 了? 直接在 fixtures 里面实现一个简单的 view 来测试 render 和 renderString. 等你这个 PR ok 了我再补下

@@ -24,7 +25,6 @@ class Application extends EggApplication {
options = options || {};
options.type = 'application';
super(options);
this.loader.loadApplication();
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

都合并到 load 里了

@popomore
Copy link
Member Author

@atian25 恩,是的

@@ -5,7 +5,7 @@ module.exports = function* () {
bar1: yield this.service.foo.bar.get('bar1name'),
bar2: yield this.service.foo.subdir.bar.get('bar2name'),
'foo.subdir2.sub2': yield this.service.foo.subdir2.sub2.get('bar3name'),
subdir11bar: !!this.service.foo.subdir1,
subdir11bar: yield this.service.foo.subdir1.subdir11.bar.get(),
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

支持多层了

@atian25
Copy link
Member

atian25 commented Aug 17, 2016

这个还差啥?

@popomore
Copy link
Member Author

差苏千 review

@popomore popomore changed the title WIP: feat: [BREAKING_CHANGE] use egg-core feat: [BREAKING_CHANGE] use egg-core Aug 18, 2016
@popomore
Copy link
Member Author

这个再看看,没问题先把这个合了,不然越来越大

@atian25
Copy link
Member

atian25 commented Aug 18, 2016

觉得可以先合了

@popomore
Copy link
Member Author

合一把

@atian25 atian25 merged commit 350d0f5 into master Aug 18, 2016
@atian25 atian25 deleted the egg-core branch August 18, 2016 07:42
@atian25
Copy link
Member

atian25 commented Aug 18, 2016

合了. squash 后就只有一条 commit 了, 后面尽量小 commit 好了, 不然好难写 squash message

@popomore
Copy link
Member Author

恩,一个 PR 就一个

@popomore
Copy link
Member Author

popomore commented Aug 18, 2016

先发个 0.2.00.1.0

@atian25
Copy link
Member

atian25 commented Aug 18, 2016

好, 你发吧

@popomore
Copy link
Member Author

latest: 0.1.0
test: 0.1.0

elrrrrrrr pushed a commit to elrrrrrrr/egg that referenced this pull request Feb 21, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants