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.

Sign up for GitHub

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

Jump to bottom

chore: 3.3.x to master #6169

Merged
merged 10 commits into from
Feb 26, 2021
Merged

chore: 3.3.x to master #6169

merged 10 commits into from
Feb 26, 2021

Conversation

ycjcl868
Copy link
Contributor

@ycjcl868 ycjcl868 commented Feb 23, 2021 •
edited
Loading

image

Checklist
  • npm test passes
  • tests are included
  • documentation is changed or added
  • commit message follows commit guidelines
Description of change

ycjcl868 and others added 4 commits February 23, 2021 17:43
@ycjcl868
fix(ssr): render not work in dev (#6165)
bede27c 
* fix(ssr): render not work in dev

* chore: comment

* fix: ssr

* chore: writeToDisk
@ycjcl868
chore release script (#6167)
36846f4 
* chore: release script

* chore: script
@ycjcl868
chore: otp
705e89e
@ycjcl868
release: v3.3.9
1e606f0
@sorrycc
Copy link
Member

sorrycc commented Feb 23, 2021

有代码冲突。

@ycjcl868
Copy link
Contributor Author

我先合下 master

@codecov
Copy link

codecov bot commented Feb 24, 2021 •
edited
Loading

Codecov Report

Merging #6169 (39112f4) into master (d5110ab) will decrease coverage by 0.02%.
The diff coverage is 33.33%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #6169      +/-   ##
==========================================
- Coverage   85.71%   85.68%   -0.03%     
==========================================
  Files         151      151              
  Lines        3394     3395       +1     
  Branches      912      913       +1     
==========================================
  Hits         2909     2909              
- Misses        475      476       +1     
  Partials       10       10
Impacted Files Coverage Δ
packages/bundler-webpack/src/index.ts 36.06% <0.00%> (-0.61%) ⬇️
...c/plugins/commands/build/applyHtmlWebpackPlugin.ts 73.33% <100.00%> (ø)

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update d5110ab...39112f4. Read the comment docs.

@ycjcl868
Copy link
Contributor Author

可以合了

sorrycc
sorrycc reviewed Feb 24, 2021
View reviewed changes
package.json Outdated Show resolved Hide resolved
sorrycc
sorrycc reviewed Feb 24, 2021
View reviewed changes
scripts/release.js Outdated Show resolved Hide resolved
sorrycc
sorrycc reviewed Feb 26, 2021
View reviewed changes
scripts/release.js Outdated Show resolved Hide resolved
@sorrycc sorrycc merged commit c284053 into master Feb 26, 2021
@delete-merged-branch delete-merged-branch bot deleted the 3.3.x branch February 26, 2021 07:26
This was referenced Mar 11, 2021
Closed
Closed
@sorrycc sorrycc restored the 3.3.x branch March 12, 2021 07:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@sorrycc sorrycc sorrycc left review comments

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@ycjcl868 @sorrycc