- New better highlighting

- Strip size
raindropio · Jun 9, 2024 · 09f663c · 09f663c
1 parent 56daf50
commit 09f663c
Show file tree

Hide file tree

Showing 9 changed files with 481 additions and 16 deletions.
diff --git a/build/common.js b/build/common.js
@@ -46,7 +46,12 @@ module.exports = ({ production, filename='[name].[contenthash]', sentry={} }, {
 		minimizer: [
 			new TerserJSPlugin({
 				parallel: true,
-				extractComments: false
+				extractComments: false,
+				terserOptions: {
+					output: {
+						comments: false
+					}
+				}
 			}),
 			new CssMinimizerPlugin({
 				minimizerOptions: {

diff --git a/build/xcode/Save to Raindrop.io/App/Info.plist b/build/xcode/Save to Raindrop.io/App/Info.plist
@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
 	<key>CFBundleShortVersionString</key>
-	<string>5.6.32</string>
+	<string>5.6.33</string>
 	<key>CFBundleURLTypes</key>
 	<array>
 		<dict>
@@ -32,7 +32,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>343</string>
+	<string>344</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.productivity</string>
 	<key>LSMinimumSystemVersion</key>

diff --git a/build/xcode/Save to Raindrop.io/Extension/Info.plist b/build/xcode/Save to Raindrop.io/Extension/Info.plist
@@ -17,9 +17,9 @@
 	<key>CFBundlePackageType</key>
 	<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
 	<key>CFBundleShortVersionString</key>
-	<string>5.6.32</string>
+	<string>5.6.33</string>
 	<key>CFBundleVersion</key>
-	<string>343</string>
+	<string>344</string>
 	<key>LSMinimumSystemVersion</key>
 	<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
 	<key>NSExtension</key>

diff --git a/build/xcode/Save to Raindrop.io/Save to Raindrop.io.xcodeproj/project.pbxproj b/build/xcode/Save to Raindrop.io/Save to Raindrop.io.xcodeproj/project.pbxproj
@@ -439,7 +439,7 @@
 				CODE_SIGN_ENTITLEMENTS = Extension/Extension.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 343;
+				CURRENT_PROJECT_VERSION = 344;
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_TEAM = 7459JWM5TY;
 				ENABLE_HARDENED_RUNTIME = YES;
@@ -450,7 +450,7 @@
 					"@executable_path/../../../../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)";
-				MARKETING_VERSION = 5.6.32;
+				MARKETING_VERSION = 5.6.33;
 				PRODUCT_BUNDLE_IDENTIFIER = io.raindrop.safari.extension;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -465,7 +465,7 @@
 				CODE_SIGN_ENTITLEMENTS = Extension/Extension.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 343;
+				CURRENT_PROJECT_VERSION = 344;
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_TEAM = 7459JWM5TY;
 				ENABLE_HARDENED_RUNTIME = YES;
@@ -476,7 +476,7 @@
 					"@executable_path/../../../../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)";
-				MARKETING_VERSION = 5.6.32;
+				MARKETING_VERSION = 5.6.33;
 				PRODUCT_BUNDLE_IDENTIFIER = io.raindrop.safari.extension;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -495,7 +495,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 343;
+				CURRENT_PROJECT_VERSION = 344;
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_TEAM = 7459JWM5TY;
 				ENABLE_HARDENED_RUNTIME = YES;
@@ -506,7 +506,7 @@
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)";
-				MARKETING_VERSION = 5.6.32;
+				MARKETING_VERSION = 5.6.33;
 				PRODUCT_BUNDLE_IDENTIFIER = io.raindrop.safari;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 5.0;
@@ -523,7 +523,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 343;
+				CURRENT_PROJECT_VERSION = 344;
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_TEAM = 7459JWM5TY;
 				ENABLE_HARDENED_RUNTIME = YES;
@@ -534,7 +534,7 @@
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)";
-				MARKETING_VERSION = 5.6.32;
+				MARKETING_VERSION = 5.6.33;
 				PRODUCT_BUNDLE_IDENTIFIER = io.raindrop.safari;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 5.0;

diff --git a/...eproj/project.xcworkspace/xcuserdata/exentrich.xcuserdatad/UserInterfaceState.xcuserstate b/...eproj/project.xcworkspace/xcuserdata/exentrich.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "app",
-	"version": "5.6.32",
+	"version": "5.6.34",
 	"description": "",
 	"author": "",
 	"license": "ISC",

diff --git a/src/target/extension/background/highlights/highlight.js b/src/target/extension/background/highlights/highlight.js
diff --git a/src/target/extension/background/highlights/index.js b/src/target/extension/background/highlights/index.js
@@ -43,8 +43,9 @@ async function onMessage({ type, payload }, sender) {
 //Reload highlights when tab url change
 async function onTabActivated({ tabId }) {
     if (!tabId) return
+
     const tab = await browser.tabs.get(tabId)
-    
+
     if (!tab || !tab.url || !tab.active || tab.status != 'complete')
         return
 

diff --git a/src/target/extension/background/highlights/logic.js b/src/target/extension/background/highlights/logic.js
@@ -160,6 +160,12 @@ async function send(tab, type, payload) {
 
 //is injected
 async function isInjected(tab) {
+    if (!await browser.permissions.contains({
+        permissions: ['scripting'],
+        origins: [tab.url]
+    }))
+        return false
+
     const [res] = await browser.scripting.executeScript({
         target: { tabId: tab.id },
         func: function() { return window.__hi },