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

Strict regexes #40

Merged
merged 6 commits into from
Jun 28, 2022
Merged

Strict regexes #40

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d4e7198
Upgrade package-lock.json to version 2
jgonggrijp Jun 26, 2022
71783c5
Strip leading slashes in patterns for #29 test
jgonggrijp Jun 26, 2022
c863688
Experimentally change order in #29 test fixture
jgonggrijp Jun 26, 2022
bed0349
Un-fold matchers in lib/util.js (#29)
jgonggrijp Jun 26, 2022
338868b
Make regexes in lib/util.js mutually exclusive, more accurate (fix #29)
jgonggrijp Jun 26, 2022
7eefa18
Update documentation of #29 test
jgonggrijp Jun 26, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 28 additions & 7 deletions lib/util.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,22 +38,43 @@ module.exports = util = {
*/
matchers: [
// script with quoted src
{ pattern: /(<script\s[^>]*?src=["'])([\s\S]+?)(["'][^>]*>\s*<\/script>)/gi, fallback: true },
{
pattern: /(<script\s[^>]*?src\s*=\s*["'])([^"']+)(["'][^>]*>\s*<\/script\s*>)/gi,
fallback: true
},
// script with unquoted src
{ pattern: /(<script\s[^>]*?src=)([\s\S]+?)((?:>|\s[^>]*>)\s*<\/script>)/gi, fallback: true },
{
pattern: /(<script\s[^>]*?src\s*=\s*)([^\s"'>]+)([^>]*>\s*<\/script>)/gi,
fallback: true
},

// link with quoted href and optional end tag
{ pattern: /(<link\s[^>]*?href=["'])([\s\S]+?)(["'][^>]*>(?:\s*<\/link>)?)/gi, fallback: true },
{
pattern: /(<link\s[^>]*?href\s*=\s*["'])([^"']+)(["'][^>]*>(?:\s*<\/link\s*>)?)/gi,
fallback: true
},
// link with unquoted href and optional end tag
{ pattern: /(<link\s[^>]*?href=)([\s\S]+?)((?:>|\s[^>]*>)(?:\s*<\/link>)?)/gi, fallback: true },
{
pattern: /(<link\s[^>]*?href\s*=\s*)([^\s"'>]+)([^>]*>(?:\s*<\/link\s*>)?)/gi,
fallback: true
},

// img with quoted src
{ pattern: /(<img\s[^>]*?src=["'])(.+?)(["'][^>]*>)/gi, fallback: false },
{
pattern: /(<img\s[^>]*?src\s*=\s*["'])([^"']+)(["'][^>]*>)/gi,
fallback: false
},
// img with unquoted src
{ pattern: /(<img\s[^>]*?src=)(.+?)((?:>|\s[^>]*>))/gi, fallback: false },
{
pattern: /(<img\s[^>]*?src\s*=\s*)([^\s"'>]+)([^>]*>)/gi,
fallback: false
},

// URL matcher for CSS
{ pattern: /(url\(['"]?)(.+?)(['"]?\))/gi, fallback: false }
{
pattern: /(url\s*\(\s*['"]?)(.+?)(['"]?\s*\))/gi,
fallback: false
}
],

findFileInfo: function(url, opts) {
Expand Down
Loading