Skip to content

fix: make @grant none work correctly #693

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
ACTCD merged 1 commit into from
Aug 22, 2024
Merged

fix: make @grant none work correctly #693

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 11 additions & 5 deletions xcode/Ext-Safari/Functions.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1247,13 +1247,19 @@ func getCode(_ filenames: [String], _ isTop: Bool)-> [String: Any]? {

// attempt to get all @grant value
var grants = metadata["grant"] ?? []
// remove duplicates, if any exist

if !grants.isEmpty {
grants = Array(Set(grants))
if grants.contains("none") {
// `@grant none` takes precedence
grants = []
} else {
// remove duplicates
grants = Array(Set(grants))
// filter out grant values that are not in validGrant set
grants = grants.filter{validGrants.contains($0)}
}
}

// filter out grant values that are not in validGrant set
grants = grants.filter{validGrants.contains($0)}


// set GM.info data
let description = metadata["description"]?[0] ?? ""
Expand Down