Skip to content

Framework: Replace element-closest with registered vendor script #9750

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

Merged
aduth merged 7 commits into from
Sep 17, 2018
Merged

Framework: Replace element-closest with registered vendor script #9750

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
d0cb647
Framework: Replace element-closest with registered vendor script
aduth Sep 12, 2018
68bc9e7
Scripts: Add support for license ignore
aduth Sep 12, 2018
92bc67d
Framework: Re-pin to newer version of JSDOM
aduth Sep 12, 2018
02abe3f
Testing: Add dummy testURL for Jest config
aduth Sep 12, 2018
437b39b
Licenses: Add BSD-3-Clause W3C variant as an allowed license
pento Sep 13, 2018
2cc72cc
Package: Scripts: Use String#includes for improved code clarity
aduth Sep 17, 2018
4376ae2
Package: Scripts: Add CHANGELOG notes for improved license file detec…
aduth Sep 17, 2018
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
Prev Previous commit
Next Next commit
Package: Scripts: Use String#includes for improved code clarity
  • Loading branch information
@aduth
aduth committed Sep 17, 2018
commit 2cc72cc6824056c37635de94b9260ebce4b46f7e
4 changes: 2 additions & 2 deletions packages/scripts/scripts/check-licenses.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ const checkLicense = ( allowedLicense, licenseType ) => {
}

// We can skip the parsing below if there isn't an 'OR' in the license.
if ( licenseType.indexOf( 'OR' ) < 0 ) {
if ( ! licenseType.includes( 'OR' ) ) {
return false;
}

Expand Down Expand Up @@ -226,7 +226,7 @@ modules.forEach( ( path ) => {
let licenseType = typeof license === 'object' ? license.type : license;

// Check if the license we've detected is telling us to look in the license file, instead.
if ( licenseType && licenseFiles.find( ( licenseFile ) => licenseType.indexOf( licenseFile ) >= 0 ) ) {
if ( licenseType && licenseFiles.find( ( licenseFile ) => licenseType.includes( licenseFile ) ) ) {
licenseType = undefined;
Copy link
Member Author

@aduth aduth Sep 13, 2018

Choose a reason for hiding this comment

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

What if the license property is pointing a file describing a truly incompatible license? Wouldn't this wrongly allow the license to be considered valid? I expect this to be even more common for non-standard licenses.

Copy link
Member Author

@aduth aduth Sep 13, 2018

Choose a reason for hiding this comment

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

Oh! I missed the code immediately following this, where we try to infer the license type from the presence of a file.

Copy link
Member

@pento pento Sep 14, 2018

Choose a reason for hiding this comment

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

🙂

}

Expand Down