Merge pull request quoid#144 from quoid/v3.3.0

quoid · web-flow · commit 3ea0ee4a487c · 2021-06-22T12:40:48.000-04:00
V3.3.0
diff --git a/ISSUE_TEMPLATE.md b/ISSUE_TEMPLATE.md
@@ -1,19 +1,22 @@
-<!-- Please fill out the below information before submitting your issue -->
 <!-- 
-If you are having issues with script injection, please include examples of what is not working and try the userscript below:
+Please fill out the below information before submitting your issue.
+
+If you are having issues with script injection, please include examples of what is not working and try the userscript below to determine whether the issue is with the extension or your Javascript.
 
 // ==UserScript==
-// @name        TestScript
-// @description This is your new file, start writing code
-// @match       *://*/*
+// @name          TestScript
+// @description   This is your new file, start writing code
+// @match         <all_urls>
+// @exclude-match *://*.google.com/*
+// @noframes
 // ==/UserScript==
 
-console.log("This is a test script");
+console.log(`This is a test script - ${window.location.href}`);
 -->
 
 _System Information:_
 > macOS version:
 > Userscripts version:
 > Safari version:
 > Is this issue related to script injection?
-> Did the test script run on your machine?
+> Did the test script (pasted above) successfully run on your machine?
diff --git a/README.md b/README.md
@@ -91,8 +91,8 @@ Userscripts Safari currently supports the following userscript metadata:
 - `@match` - Domain match patterns - you can use several instances of this field if you'd like multiple domain matches - view [this article for more information on constructing patterns](https://developer.chrome.com/extensions/match_patterns)
     - **Note:** this extension only supports `http/s`
 - `@exclude-match` - Domain patterns where you do *not* want the script to run
-- `@include` - An alias for `@match` - functions exactly like `@match`
-- `@exclude` - An alias for `@exclude-match` - functions exactly like `@exclude-match`
+- `@include` - Used to match against urls for injection, globs and regular expressions are allowed, [read more here](https://wiki.greasespot.net/Include_and_exclude_rules)
+- `@exclude` - Functions in a similar way as `@include` but rather than injecting, a match against this key's value will prevent injection
 - `@inject-into` - allows the user to choose which context to inject the script into
     - allows the user to choose which context to inject the script into
     - values: auto (default), content, page
diff --git a/extension/Userscripts Extension/Functions.swift b/extension/Userscripts Extension/Functions.swift
diff --git a/extension/Userscripts Extension/index.html b/extension/Userscripts Extension/index.html
diff --git a/extension/Userscripts.xcodeproj/project.pbxproj b/extension/Userscripts.xcodeproj/project.pbxproj
@@ -417,7 +417,7 @@
 				CODE_SIGN_ENTITLEMENTS = "Userscripts Extension/Userscripts Extension.entitlements";
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 27;
+				CURRENT_PROJECT_VERSION = 28;
 				DEVELOPMENT_TEAM = J74Q8V8V8N;
 				ENABLE_HARDENED_RUNTIME = YES;
 				INFOPLIST_FILE = "Userscripts Extension/Info.plist";
@@ -426,7 +426,7 @@
 					"@executable_path/../Frameworks",
 					"@executable_path/../../../../Frameworks",
 				);
-				MARKETING_VERSION = 3.2.1;
+				MARKETING_VERSION = 3.3.0;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.userscripts.macos.Userscripts-Extension";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
@@ -440,7 +440,7 @@
 				CODE_SIGN_ENTITLEMENTS = "Userscripts Extension/Userscripts Extension.entitlements";
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 27;
+				CURRENT_PROJECT_VERSION = 28;
 				DEVELOPMENT_TEAM = J74Q8V8V8N;
 				ENABLE_HARDENED_RUNTIME = YES;
 				INFOPLIST_FILE = "Userscripts Extension/Info.plist";
@@ -449,7 +449,7 @@
 					"@executable_path/../Frameworks",
 					"@executable_path/../../../../Frameworks",
 				);
-				MARKETING_VERSION = 3.2.1;
+				MARKETING_VERSION = 3.3.0;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.userscripts.macos.Userscripts-Extension";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
@@ -466,15 +466,15 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 27;
+				CURRENT_PROJECT_VERSION = 28;
 				DEVELOPMENT_TEAM = J74Q8V8V8N;
 				ENABLE_HARDENED_RUNTIME = YES;
 				INFOPLIST_FILE = Userscripts/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/../Frameworks",
 				);
-				MARKETING_VERSION = 3.2.1;
+				MARKETING_VERSION = 3.3.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.userscripts.macos;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 5.0;
@@ -490,15 +490,15 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 27;
+				CURRENT_PROJECT_VERSION = 28;
 				DEVELOPMENT_TEAM = J74Q8V8V8N;
 				ENABLE_HARDENED_RUNTIME = YES;
 				INFOPLIST_FILE = Userscripts/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/../Frameworks",
 				);
-				MARKETING_VERSION = 3.2.1;
+				MARKETING_VERSION = 3.3.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.userscripts.macos;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 5.0;
diff --git a/src/Components/Sidebar/Item.svelte b/src/Components/Sidebar/Item.svelte
@@ -85,5 +85,5 @@
             on:click={e => toggle(e, data)}
         />
     </div>
-    <div class="item__description">{data.description}</div>
+    <div class="item__description">{data.description || "No description provided"}</div>
 </div>
diff --git a/src/dev.js b/src/dev.js
@@ -18,7 +18,7 @@ const defaultSettings = {
     showCount: "false",
     sortOrder: "lastModifiedDesc",
     tabSize: "4",
-    version: "3.2.1"
+    version: "3.3.0"
 };
 
 // example file contents
diff --git a/src/utils.js b/src/utils.js
@@ -63,9 +63,9 @@ export function validateURL(url) {
 
 export function  newScriptDefault(description, name, type) {
     if (type === "css") {
-        return `/* ==UserStyle==\n@name        ${name}\n@description ${description}\n@match       *://*.*\n==/UserStyle== */`;
+        return `/* ==UserStyle==\n@name        ${name}\n@description ${description}\n@match       <all_urls>\n==/UserStyle== */`;
     } else if (type === "js") {
-        return `// ==UserScript==\n// @name        ${name}\n// @description ${description}\n// @match       *://*.*\n// ==/UserScript==`;
+        return `// ==UserScript==\n// @name        ${name}\n// @description ${description}\n// @match       *://*/*\n// ==/UserScript==`;
     }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -63,9 +63,9 @@ export function validateURL(url) {`
`63`	`63`
`64`	`64`	`export function newScriptDefault(description, name, type) {`
`65`	`65`	`if (type === "css") {`
`66`		- return `/* ==UserStyle==\n@name ${name}\n@description ${description}\n@match ://.\n==/UserStyle== /`;
	`66`	+ return `/* ==UserStyle==\n@name ${name}\n@description ${description}\n@match <all_urls>\n==/UserStyle== */`;
`67`	`67`	`} else if (type === "js") {`
`68`		- return `// ==UserScript==\n// @name ${name}\n// @description ${description}\n// @match ://.*\n// ==/UserScript==`;
	`68`	+ return `// ==UserScript==\n// @name ${name}\n// @description ${description}\n// @match :///*\n// ==/UserScript==`;
`69`	`69`	`}`
`70`	`70`	`}`
`71`	`71`