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

Fix hot reload #1310

Merged
merged 1 commit into from
Apr 4, 2019
Merged

Fix hot reload #1310

merged 1 commit into from
Apr 4, 2019

Conversation

DylanPiercey
Copy link
Contributor

Description

Currently marko.load can cause issues with hot reloading, especially when precompiled files from Marko CLI are discovered (or if there is a naming conflict between a marko file and a js file).

This PR ensures that if you are using the require hook that any subsequently loaded template also uses the require hook and makes the hot-reload functionality also use the require hook if available.

Fixes #1282.

Checklist:

  • I have read the CONTRIBUTING document and have signed (or will sign) the CLA.
  • I have updated/added documentation affected by my changes.
  • I have added tests to cover my changes.

@codecov
Copy link

codecov bot commented Apr 4, 2019

Codecov Report

Merging #1310 into master will decrease coverage by <.01%.
The diff coverage is 100%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #1310      +/-   ##
==========================================
- Coverage   90.56%   90.55%   -0.01%     
==========================================
  Files         339      339              
  Lines       12423    12423              
==========================================
- Hits        11251    11250       -1     
- Misses       1172     1173       +1
Impacted Files Coverage Δ
src/node-require/index.js 95.16% <100%> (-0.16%) ⬇️
src/hot-reload.js 80.19% <100%> (-0.62%) ⬇️

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 3c764ea...80c185d. Read the comment docs.

@mlrawlings mlrawlings merged commit c44aa04 into master Apr 4, 2019
@coveralls
Copy link

Coverage Status

Coverage decreased (-0.008%) to 90.558% when pulling 80c185d on fix-hot-reload into 3c764ea on master.

1 similar comment
@coveralls
Copy link

Coverage Status

Coverage decreased (-0.008%) to 90.558% when pulling 80c185d on fix-hot-reload into 3c764ea on master.

@DylanPiercey DylanPiercey deleted the fix-hot-reload branch July 8, 2019 17:22
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.

3 participants