Fix: #88 & CDATA inside script/style #122
Merged
Conversation
This file contains 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
SukkaW
commented
Nov 15, 2020
Comment on lines
+65
to
+73
| function stripCdata(css) { | ||
| const leftStrippedCss = css.replace('<![CDATA[', ''); | ||
| if (leftStrippedCss === css) { | ||
| return css; | ||
| } | ||
|
|
||
| const strippedCss = leftStrippedCss.replace(']]>', ''); | ||
| return leftStrippedCss === strippedCss ? css : strippedCss; | ||
| } |
There was a problem hiding this comment.
Although it is not common to escape <style> using CDATA inside XHTML (but still there might be some cases that uses it), it is possible to have CDATA inside <style> node with <svg>. See Styling - SVG 1.1 - W3C.
SukkaW
commented
Nov 15, 2020
Comment on lines
+26
to
+31
| const leftStrippedJs = js.replace(/\/\/\s*<!\[CDATA\[/, '').replace(/\/\*\s*<!\[CDATA\[\s*\*\//, ''); | ||
| if (leftStrippedJs === js) { | ||
| return js; | ||
| } | ||
|
|
||
| const strippedJs = leftStrippedJs.replace(/\/\/\s*\]\]>/, ''); | ||
| const strippedJs = leftStrippedJs.replace(/\/\/\s*\]\]>/, '').replace(/\/\*\s*\]\]>\s*\*\//, ''); |
There was a problem hiding this comment.
Both
// <![CDATA[
const x = 2;
// ]]>and
/* <![CDATA[ */
const x = 2;
/* ]]> */are valid and being used. The PR adds support for handling the second case.
SukkaW
commented
Nov 15, 2020
| @@ -53,7 +53,7 @@ function processScriptNode(scriptNode, terserOptions) { | |||
|
|
|||
| let content = result.code; | |||
| if (isCdataWrapped) { | |||
| content = '//<![CDATA[' + content + '//]]>'; | |||
| content = '/*<![CDATA[*/' + content + '/*]]>*/'; | |||
There was a problem hiding this comment.
Before the PR,
// <![CDATA[
const x = 2;
// ]]>will become
//<![CDATA[const x = 2;//]]>Which the code has been completely commented out.
After the PR
// <![CDATA[
const x = 2;
// ]]>will become
/*<![CDATA[*/const x = 2;/*]]>*/which is the desired behavior.
SukkaW
changed the title
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Closes #88.