This repository was archived by the owner on Jan 11, 2023. It is now read-only.
Fix 2 issues with custom html files in export #1118
Closed
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This reverts commit 2f48c89.
1. While exporting, if a route such as `[slug].html.js` is made that serves it's own html pages(with correct Content-Type header), those pages url's were being rewritten even though they were valid. Example: `simple.html` was being rewritten to `simple.html/index.html`. We now check for a `.html` on the end of the path before adding a `/index.html` to the end 2. When parsing exported html, the `<base>` element was checked for in the head of the doc. If this element didn't exist(for example if you generate your own html and miss adding this element) the error message is not clear what is wrong and is hard to track down. This change should avoid that confusion and use a sane default if not available.
jamesjnadeau
changed the title
benmccann
reviewed
May 15, 2020
src/api/export.ts
Outdated
| @@ -186,7 +187,7 @@ async function _export({ | |||
| const cleaned = clean_html(body); | |||
|
|
|||
| const base_match = /<base ([\s\S]+?)>/m.exec(cleaned); | |||
| const base_href = base_match && get_href(base_match[1]); | |||
| const base_href = base_match ? get_href(base_match[1]) : '/' | |||
There was a problem hiding this comment.
nit: don't need the extra space before base_match and should add a semi-colon to the end of the line
|
Some portion of this has been resolved in the recently merged #1049 - which is also part of what's making this PR conflict. So that should be bullet point 1 addressed. |
|
Issue #1202 has been opened, which sounds like the second, unaddressed issue this PR is intended to fix. |
1. While exporting, if a route such as `[slug].html.js` is made that serves it's own html pages(with correct Content-Type header), those pages url's were being rewritten even though they were valid. Example: `simple.html` was being rewritten to `simple.html/index.html`. We now check for a `.html` on the end of the path before adding a `/index.html` to the end 2. When parsing exported html, the `<base>` element was checked for in the head of the doc. If this element didn't exist(for example if you generate your own html and miss adding this element) the error message is not clear what is wrong and is hard to track down. This change should avoid that confusion and use a sane default if not available.
|
This patch looks wonky now, when all I did was try to merge in master and rebase, oh well, i'm going to close this and submit the one liner in another pull request so it's easier for you folks to review. |
4 tasks
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
While exporting, if a route such as
[slug].html.jsis made that serves it's own html pages(with correct Content-Type header), those pages url's were being rewritten even though they were valid. Example:simple.htmlwas being rewritten tosimple.html/index.html. We now check for a.htmlon the end of the path before adding a/index.htmlto the endWhen parsing exported html, the
<base>element was checked for in the head of the doc. If this element didn't exist(for example if you generate your own html and miss adding this element) the error message is not clear what is wrong and is hard to track down. This change should avoid that confusion and use a sane default if not available.Tests
npm testoryarn test)I added a
test.htmlfile to the export test that should test both of these scenarios