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

merge v7.0.0 branch #5222

Merged
merged 23 commits into from
Oct 25, 2023
Merged

merge v7.0.0 branch #5222

merged 23 commits into from
Oct 25, 2023

Conversation

yoshinorin
Copy link
Member

What does it do?

Screenshots

Pull request tasks

  • Add test cases for the changes.
  • Passed the CI test.

stevenjoezhang and others added 8 commits March 15, 2023 20:39
* refactor: esm

* refactor: migrate typescript

* update files

* remove `use strict`

* fix indentation

* refactor: migrate typescript

* refactor: migrate typescript

* update

* export from

* extend/filter

* post

* Schema and SchemaType

* NunjucksError

* declare module

* update tests

* fix export

* update

* update

* number_format

* update highlight

* update

* add secondary argument when create `Permalink` instance

* specify `eslint` target directory

* ignore two rules for testing

* use `@ts-expect-error` for avoiding compile error

* use `any` for avoiding compile error

* chore: add `dist/` to `.gitignore`

* test(eslint): update `.eslintrc`

* refactor: `var` to `const`

* refactor: delete unnecessary `'use strict';`

* test: use `dist/modules/types/moment/SchemaTypeMoment` instead of `warehouse.SchemaTypeMoment`

* fix: export of processors

* test: fix bind

* test: fix processer

* fix fs import

* fix hexo-i18n and hexo-log

* fix param order

* build hexo in benchmark

* fix eslint

* fix export & drop travis

* Update .husky/pre-commit

* add spaces

* refactor: ts debounce fn

* fix: lint errors

* fix: lint errors

---------

Co-authored-by: yoshinorin <[email protected]>
Co-authored-by: Baoshuo <[email protected]>
* release: 7.0.0-rc1

* Update package.json

---------

Co-authored-by: Mimi <[email protected]>
* feat: add exclude_languages feature to prismjs

* feat: add exclude_languages feature to prismjs
* refactor: add types for some explicit any fields

* refactor: add better extend types

* refactor: add type Hexo for ctx

* reafactor: better function type

* style: use import type for type only imports

* fix: wrong type for args and options
* chore: change dependencies version

* chore: ignore pnpm lock file
* test: improve coverage

* test(processors): improve coverage

* test(processors): improve coverage

* test(helpers): improve coverage

* test(console): improve coverage
@github-actions
Copy link

github-actions bot commented Jun 2, 2023

@stevenjoezhang
Copy link
Member

@yoshinorin We could release another candidate version now, e.g. v7.0.0-rc2

@yoshinorin
Copy link
Member Author

@stevenjoezhang

We could release another candidate version now, e.g. v7.0.0-rc2

refs: #5238

Personally, I would like to merge this branch into master and release v7.0.0 without RC. I think #5145 and #4995 are blocking factors for merging this branch into master.

@stevenjoezhang
Copy link
Member

We have to do some rebase later, port those modifications on js files to corresponding ts files

@yoshinorin
Copy link
Member Author

OK. I will release v7.0.0-rc2 for now.

@yoshinorin
Copy link
Member Author

OK. I will release v7.0.0-rc2 for now.

Done 😎

@stevenjoezhang
Copy link
Member

Pending: #5206 may cause ReDoS, we need to investigate the reason or revert it.

@yoshinorin
Copy link
Member Author

yoshinorin commented Aug 2, 2023

@stevenjoezhang
Please PING to me if we need to publish rc3 :)

@yoshinorin yoshinorin changed the title WIP: V7.0.0 v7.0.0 Oct 22, 2023
@yoshinorin
Copy link
Member Author

@hexojs/core
Dear @hexojs/core team.

May we merge this PR into master branch?
I will release a new version v7.0.0 (not a RC version) after merging this. (If you notice to need any changes, please submit a PR)

Thank you :)

@yoshinorin yoshinorin marked this pull request as ready for review October 22, 2023 14:24
SukkaW
SukkaW previously approved these changes Oct 22, 2023
uiolee
uiolee previously approved these changes Oct 22, 2023
@stevenjoezhang stevenjoezhang dismissed stale reviews from uiolee and SukkaW via 2a2cc9a October 23, 2023 05:38
@SukkaW
Copy link
Member

SukkaW commented Oct 23, 2023

Maybe we should also land #5271? cc @D-Sketon I've added more code reviews suggestions.

@yoshinorin yoshinorin changed the title v7.0.0 merge v7.0.0 branch Oct 24, 2023
@yoshinorin
Copy link
Member Author

yoshinorin commented Oct 24, 2023

Maybe we should also land #5271? cc @D-Sketon I've added more code reviews suggestions.

I concern that the newly created PRs from the master branch may conflict with the v7.0.0 branch. To avoid this, we should merge the v7.0.0 branch into the master branch as soon as possible.

It's okay to merge PR #5271 into master after merging the v7.0.0 branch into master. Because, PR #5271 was created based on the v7.0.0 branch. So, probably conflicts does not occur.

Also, we can release a minor version after release v7.0.0 as @D-Sketon suggestion.

After merging v7.0.0 branch into master branch we should to stop a new commit to v7.0.0 branch. Also, we have to change current submitted PR's target branch from v7.0.0 to master.

@yoshinorin
Copy link
Member Author

P.S:

Besides the conflict problem, I think the problem is that we have not been able to release new versions for a long period of time. Therefore, I would like to release v7.0.0 if possible.

@stevenjoezhang stevenjoezhang merged commit cbba306 into master Oct 25, 2023
38 of 39 checks passed
@stevenjoezhang stevenjoezhang deleted the v7.0.0 branch October 25, 2023 05:03
@stevenjoezhang
Copy link
Member

I forgot one thing, squash merge results in a lot of merge conflicts in other pull requests... We might need to do some rebasing on other unmerged PRs

@uiolee
Copy link
Member

uiolee commented Oct 25, 2023

How about drop that commit, and merge it again?

@D-Sketon
Copy link
Member

Maybe merge again is a better choice

@yoshinorin
Copy link
Member Author

How about drop that commit, and merge it again?
Maybe merge again is a better choice

+1

Basically, we should not force-push to master or any shared branches, but, IMHO only this time I think we can might be able to do that only this time. Because, not much time has passed since merge and there are no new commit in the master branch.

  1. use git reset --hard and delete cbba306 locally
  2. force-push 1. to origin/master branch
  3. restore v7.0.0 branch and merge it again (with merge commit)

@yoshinorin
Copy link
Member Author

OK, I'll do that. Please wait...

@yoshinorin yoshinorin restored the v7.0.0 branch October 25, 2023 11:49
@yoshinorin yoshinorin mentioned this pull request Oct 25, 2023
7 tasks
@yoshinorin
Copy link
Member Author

yoshinorin commented Oct 25, 2023

I submitted a new PR #5328 (for with merge commit)

@yoshinorin yoshinorin deleted the v7.0.0 branch October 26, 2023 13:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants