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

Escape "</script" when inlining strings #384

Merged
merged 3 commits into from Jan 24, 2017
Merged

Escape "</script" when inlining strings #384

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
58bf969
Escape "</script" when inlining strings
kangax Jan 20, 2017
570daa7
Fix lint
kangax Jan 20, 2017
e927380
Use jsesc
kangax Jan 24, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
11 changes: 11 additions & 0 deletions packages/babel-plugin-minify-constant-folding/__tests__/constant-folding-test.js
View file
Open in desktop
Expand Up @@ -60,4 +60,15 @@ describe("constant-folding-plugin", () => {
`);
expect(transform(source)).toBe(source);
});

it("should handle script escape", () => {
const source = unpad(`
"</" + "script"
`);

const expected = unpad(`
"<\\\\/script";
`);
expect(transform(source)).toBe(expected);
});
});
6 changes: 6 additions & 0 deletions packages/babel-plugin-minify-constant-folding/src/index.js
View file
Open in desktop
Expand Up @@ -112,6 +112,12 @@ module.exports = ({ types: t, traverse }) => {
}
}

// https://github.com/babel/babili/issues/382
if (typeof res.value === "string" &&
res.value.indexOf("</script") > -1) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we use includes instead of indexof since we are already targeting node 4?

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

includes was introduced in node 6

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah...I know that..But we are transpiling the code to node 4.. So it shouldnt be a problem

res.value = res.value.replace(/<\/script/g, "<\\/script");
}

const node = t.valueToNode(res.value);
node[seen] = true;
path.replaceWith(node);
Expand Down