merge v7.0.0 branch by yoshinorin · Pull Request #5222 · hexojs/hexo

yoshinorin · 2023-06-02T17:36:20Z

What does it do?

Screenshots

Pull request tasks

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

* 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 <yoshinorin.net@outlook.com> Co-authored-by: Baoshuo <i@baoshuo.ren>

* release: 7.0.0-rc1 * Update package.json --------- Co-authored-by: Mimi <1119186082@qq.com>

* 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 · 2023-06-02T17:36:32Z

Publish flamegraph to https://5c245c1798f0e2409f97c610f93b8ab051868e06-14-hexo.surge.sh/flamegraph.html

* feat: add url_for and full_url_for tag plugins * style: fix lint

stevenjoezhang · 2023-07-09T17:21:27Z

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

yoshinorin · 2023-07-10T15:31:24Z

@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 · 2023-07-10T16:21:41Z

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

yoshinorin · 2023-07-11T13:38:27Z

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

yoshinorin · 2023-07-11T13:54:26Z

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

Done 😎

stevenjoezhang · 2023-07-28T01:28:12Z

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

This reverts commit c62909d.

yoshinorin · 2023-08-02T16:50:52Z

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

useful for plugin written in typescript or let IDE detecting it

Co-authored-by: uiolee <22849383+uiolee@users.noreply.github.com>

yoshinorin · 2023-10-22T13:44:55Z

@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 :)

SukkaW · 2023-10-23T06:29:31Z

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

yoshinorin · 2023-10-24T12:33:32Z

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 · 2023-10-24T12:43:48Z

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 · 2023-10-25T05:13:42Z

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 · 2023-10-25T06:36:55Z

How about drop that commit, and merge it again?

D-Sketon · 2023-10-25T07:16:30Z

Maybe merge again is a better choice

yoshinorin · 2023-10-25T11:22:13Z

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.

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

yoshinorin · 2023-10-25T11:46:24Z

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

yoshinorin · 2023-10-25T11:53:33Z

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

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

release: v7.0.0-rc1 (#5176)

46fbdcf

* release: 7.0.0-rc1 * Update package.json --------- Co-authored-by: Mimi <1119186082@qq.com>

feat: add exclude_languages feature to prismjs (#5182)

8251df3

* feat: add exclude_languages feature to prismjs * feat: add exclude_languages feature to prismjs

Refactor types (#5178)

725422a

* 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

fix(backtick_code): handle empty code blocks (#5206)

c62909d

chore: change dependencies version (#5202)

f791362

* chore: change dependencies version * chore: ignore pnpm lock file

feat(tags/post_link): use slug when title is empty (#5220)

5837bb8

test: improve coverage (#5221)

5ee3e6d

* test: improve coverage * test(processors): improve coverage * test(processors): improve coverage * test(helpers): improve coverage * test(console): improve coverage

D-Sketon and others added 2 commits June 3, 2023 21:53

feat: add url_for and full_url_for tag plugins (#5198)

c9ad8c6

* feat: add url_for and full_url_for tag plugins * style: fix lint

feat: allow top-level await in plugins or scripts (#5228)

7157e85

D-Sketon added 2 commits July 10, 2023 01:28

fix(moize): helper function not working fine with relative_url (#5217)

3eaafb4

test: improve coverage (#5223)

04bc704

release: v7.0.0-rc2 (#5238)

b3b444d

stevenjoezhang added 2 commits July 25, 2023 23:16

fix typo (#5245)

0257bb3

feat(post): remove front-matter property link (#5253)

99e94cc

stevenjoezhang and others added 2 commits August 2, 2023 00:49

Revert "fix(backtick_code): handle empty code blocks (#5206)" (#5257)

5d8dcec

This reverts commit c62909d.

fix(post): skip_render not working in post_asset_folder (#5258)

35ceaae

dimaslanjaka and others added 4 commits August 10, 2023 19:04

feat: define global variable hexo (#5242)

24a7b61

useful for plugin written in typescript or let IDE detecting it

chore(lint-staged): remove git-exec-and-restage (#5281)

d29d774

ci: reduce the running of ci (#5282)

7b588e7

perf(post): cache tags getter (#5145)

3059fa0

Co-authored-by: uiolee <22849383+uiolee@users.noreply.github.com>

yoshinorin changed the title ~~WIP: V7.0.0~~ v7.0.0 Oct 22, 2023

Merge branch 'master' into v7.0.0

fcc6168

yoshinorin marked this pull request as ready for review October 22, 2023 14:24

SukkaW previously approved these changes Oct 22, 2023

View reviewed changes

uiolee previously approved these changes Oct 22, 2023

View reviewed changes

revert: Access data files from source folder (#1969) (#5325)

2a2cc9a

stevenjoezhang dismissed stale reviews from uiolee and SukkaW via 2a2cc9a October 23, 2023 05:38

stevenjoezhang approved these changes Oct 23, 2023

View reviewed changes

yoshinorin changed the title ~~v7.0.0~~ merge v7.0.0 branch Oct 24, 2023

uiolee approved these changes Oct 24, 2023

View reviewed changes

stevenjoezhang merged commit cbba306 into master Oct 25, 2023

stevenjoezhang deleted the v7.0.0 branch October 25, 2023 05:03

yoshinorin restored the v7.0.0 branch October 25, 2023 11:49

yoshinorin mentioned this pull request Oct 25, 2023

merge v7.0.0 branch #5328

Merged

7 tasks

yoshinorin deleted the v7.0.0 branch October 26, 2023 13:10

Uh oh!

Conversation

yoshinorin commented Jun 2, 2023

What does it do?

Screenshots

Pull request tasks

Uh oh!

github-actions bot commented Jun 2, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

stevenjoezhang commented Jul 9, 2023

Uh oh!

yoshinorin commented Jul 10, 2023

Uh oh!

stevenjoezhang commented Jul 10, 2023

Uh oh!

yoshinorin commented Jul 11, 2023

Uh oh!

yoshinorin commented Jul 11, 2023

Uh oh!

stevenjoezhang commented Jul 28, 2023

Uh oh!

yoshinorin commented Aug 2, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

yoshinorin commented Oct 22, 2023

Uh oh!

SukkaW commented Oct 23, 2023

Uh oh!

yoshinorin commented Oct 24, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

yoshinorin commented Oct 24, 2023

Uh oh!

stevenjoezhang commented Oct 25, 2023

Uh oh!

uiolee commented Oct 25, 2023

Uh oh!

D-Sketon commented Oct 25, 2023

Uh oh!

yoshinorin commented Oct 25, 2023

Uh oh!

yoshinorin commented Oct 25, 2023

Uh oh!

yoshinorin commented Oct 25, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

github-actions bot commented Jun 2, 2023 •

edited

Loading

yoshinorin commented Aug 2, 2023 •

edited

Loading

yoshinorin commented Oct 24, 2023 •

edited

Loading

yoshinorin commented Oct 25, 2023 •

edited

Loading