clipper(web): remove node-sass and sass-loader

Signed-off-by: 01zulfi <85733202+01zulfi@users.noreply.github.com>

.github/pull_request_template.md

@@ -0,0 +1,30 @@
+## Description
+<!-- Add a detailed summary of what this feature/bugfix does -->
+
+## Type of Change
+- [ ] Bug fix
+- [ ] Feature
+
+## Visuals
+- [ ] Attached relevant screenshots / screen recording / GIF
+- [ ] N/A (not a feature or no UI changes)
+
+## Testing
+- [ ] Ran all E2E tests
+- [ ] Ran all integration tests
+- [ ] Added/updated tests for this change (if needed)
+- [ ] N/A (tests not needed — explanation provided below)
+
+### If tests were not added, explain why
+<!-- explanation -->
+
+## Platform
+<!-- Describe which platforms this PR is related to -->
+
+- [ ] Web
+- [ ] Mobile
+- [ ] Desktop
+
+## Sign-off
+- [ ] QA passed
+- [ ] UI/UX passed

apps/desktop/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "@notesnook/desktop",
-  "version": "3.3.9",
+  "version": "3.3.10",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@notesnook/desktop",
-      "version": "3.3.9",
+      "version": "3.3.10",
       "hasInstallScript": true,
       "license": "GPL-3.0-or-later",
       "dependencies": {

apps/desktop/package.json

@@ -2,7 +2,7 @@
   "name": "@notesnook/desktop",
   "productName": "Notesnook",
   "description": "Your private note taking space",
-  "version": "3.3.9",
+  "version": "3.3.10",
   "appAppleId": "1544027013",
   "private": true,
   "main": "./dist/cjs/index.js",

apps/mobile/android/app/build.gradle

@@ -125,7 +125,7 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled true
-        versionCode 3095
+        versionCode 3096
         versionName getNpmVersion()
         testBuildType System.getProperty('testBuildType', 'debug')
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'

apps/mobile/app/hooks/use-app-events.tsx

@@ -537,7 +537,6 @@ const initializeDatabase = async (password?: string) => {
     Notifications.restorePinnedNotes();
     expiringNotesTimer();
     deleteDCacheFiles();
-    db.attachments.removeOrphaned();
   }
   Walkthrough.init();
 };

apps/mobile/ios/Notesnook.xcodeproj/project.pbxproj

@@ -1029,7 +1029,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 2175;
+				CURRENT_PROJECT_VERSION = 2176;
 				DEVELOPMENT_TEAM = 53CWBG3QUC;
 				ENABLE_BITCODE = NO;
 				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64;
@@ -1104,7 +1104,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 3.3.15;
+				MARKETING_VERSION = 3.3.16;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -1135,7 +1135,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 2175;
+				CURRENT_PROJECT_VERSION = 2176;
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 53CWBG3QUC;
 				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64;
@@ -1210,7 +1210,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 3.3.15;
+				MARKETING_VERSION = 3.3.16;
 				ONLY_ACTIVE_ARCH = NO;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
@@ -1367,7 +1367,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 2175;
+				CURRENT_PROJECT_VERSION = 2176;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				DEVELOPMENT_TEAM = 53CWBG3QUC;
 				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64;
@@ -1379,7 +1379,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 3.3.15;
+				MARKETING_VERSION = 3.3.16;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = org.streetwriters.notesnook.notewidget;
@@ -1410,7 +1410,7 @@
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
 				CODE_SIGN_STYLE = Manual;
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 2175;
+				CURRENT_PROJECT_VERSION = 2176;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 53CWBG3QUC;
@@ -1423,7 +1423,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 3.3.15;
+				MARKETING_VERSION = 3.3.16;
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = org.streetwriters.notesnook.notewidget;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -1453,7 +1453,7 @@
 				CODE_SIGN_ENTITLEMENTS = "Make Note/Make Note.entitlements";
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 2175;
+				CURRENT_PROJECT_VERSION = 2176;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				DEVELOPMENT_TEAM = 53CWBG3QUC;
 				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64;
@@ -1534,7 +1534,7 @@
 					"@executable_path/../../Frameworks",
 				);
 				LIBRARY_SEARCH_PATHS = "$(SDKROOT)/usr/lib/swift$(inherited)";
-				MARKETING_VERSION = 3.3.15;
+				MARKETING_VERSION = 3.3.16;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = org.streetwriters.notesnook.share;
@@ -1565,7 +1565,7 @@
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
 				CODE_SIGN_STYLE = Manual;
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 2175;
+				CURRENT_PROJECT_VERSION = 2176;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 53CWBG3QUC;
@@ -1647,7 +1647,7 @@
 					"@executable_path/../../Frameworks",
 				);
 				LIBRARY_SEARCH_PATHS = "$(SDKROOT)/usr/lib/swift$(inherited)";
-				MARKETING_VERSION = 3.3.15;
+				MARKETING_VERSION = 3.3.16;
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = org.streetwriters.notesnook.share;
 				PRODUCT_NAME = "$(TARGET_NAME)";

apps/mobile/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@notesnook/mobile",
-  "version": "3.3.15",
+  "version": "3.3.16",
   "private": true,
   "license": "GPL-3.0-or-later",
   "scripts": {
@@ -208,4 +208,4 @@
   "engines": {
     "node": ">=20"
   }
-}
+}

apps/web/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "@notesnook/web",
-  "version": "3.3.9",
+  "version": "3.3.10",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@notesnook/web",
-      "version": "3.3.9",
+      "version": "3.3.10",
       "hasInstallScript": true,
       "license": "GPL-3.0-or-later",
       "dependencies": {

apps/web/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@notesnook/web",
   "description": "Your private note taking space",
-  "version": "3.3.9",
+  "version": "3.3.10",
   "private": true,
   "main": "./src/app.js",
   "homepage": "https://notesnook.com/",

apps/web/src/app-effects.tsx

@@ -70,7 +70,6 @@ export default function AppEffects() {
         await scheduleFullBackups();
         await scheduleExpiredNotesDeletion();
 
-        db.attachments.removeOrphaned().catch(logger.error);
         if (useSettingStore.getState().isFullOfflineMode)
           // NOTE: we deliberately don't await here because we don't want to pause execution.
           db.attachments.cacheAttachments().catch(logger.error);

apps/web/src/common/desktop-bridge/index.desktop.ts

@@ -26,6 +26,7 @@ import { checkForUpdate } from "../../utils/updater";
 import { showToast } from "../../utils/toast";
 import { db } from "../db";
 import { logManager } from "@notesnook/core";
+import { store as settingStore } from "../../stores/setting-store";
 
 export const desktop: ReturnType<typeof createTRPCProxyClient<AppRouter>> =
   createTRPCProxyClient<AppRouter>({
@@ -66,15 +67,19 @@ function attachListeners() {
     attachListener(AppEvents.updateError)
   );
 
-  desktop.window.onClose.subscribe(undefined, {
-    async onData() {
-      await db.sql().destroy();
-      await logManager?.close();
-    }
-  });
+  // desktop.window.onClose.subscribe(undefined, {
+  //   async onData() {
+  //     try {
+  //       await db.sql().destroy();
+  //       await logManager?.close();
+  //     } catch {
+  //       // ignore
+  //     }
+  //   }
+  // });
 
   TaskScheduler.register("updateCheck", "0 0 */12 * * * *", () => {
-    checkForUpdate();
+    checkForUpdate(settingStore.get().autoUpdates);
   });
 }
 

apps/web/src/hooks/use-auto-updater.ts

@@ -18,11 +18,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 import { useEffect } from "react";
-
 import { checkForUpdate } from "../utils/updater";
 import { AppEventManager, AppEvents } from "../common/app-events";
 import BaseStore from "../stores";
 import createStore from "../common/store";
+import { useStore as useSettingStore } from "../stores/setting-store";
 
 type CompletedUpdateStatus = { type: "completed"; version: string };
 type DownloadingUpdateStatus = { type: "downloading"; progress: number };
@@ -103,8 +103,13 @@ export function useAutoUpdater() {
       updateDownloadProgress
     );
 
-    checkingForUpdate();
-    checkForUpdate().catch(console.error);
+    const settingStoreUnsub = useSettingStore.subscribe(
+      (s) => s.autoUpdates,
+      (autoUpdates) => {
+        checkingForUpdate();
+        checkForUpdate(autoUpdates).catch(console.error);
+      }
+    );
 
     return () => {
       checkingForUpdateEvent.unsubscribe();
@@ -112,6 +117,7 @@ export function useAutoUpdater() {
       updateNotAvailableEvent.unsubscribe();
       updateCompletedEvent.unsubscribe();
       updateProgressEvent.unsubscribe();
+      settingStoreUnsub();
     };
   }, []);
 

apps/web/src/stores/setting-store.ts

@@ -87,7 +87,7 @@ class SettingStore extends BaseStore<SettingStore> {
     ImageCompressionOptions.ASK_EVERY_TIME
   );
   desktopIntegrationSettings?: DesktopIntegration;
-  autoUpdates = true;
+  autoUpdates = false;
   isFlatpak = false;
   isSnap = false;
   proxyRules?: string;

apps/web/src/utils/updater.ts

@@ -21,9 +21,12 @@ import { AppEventManager, AppEvents } from "../common/app-events";
 import { desktop } from "../common/desktop-bridge";
 import { appVersion, getServiceWorkerVersion } from "./version";
 
-export async function checkForUpdate() {
-  if (IS_DESKTOP_APP) await desktop?.updater.check.query().catch(console.error);
-  else {
+export async function checkForUpdate(checkOnDesktop = true) {
+  if (IS_DESKTOP_APP && checkOnDesktop) {
+    await desktop?.updater.check.query().catch(console.error);
+  }
+
+  if (!IS_DESKTOP_APP) {
     AppEventManager.publish(AppEvents.checkingForUpdate);
 
     const registrations =

extensions/web-clipper/package.json

@@ -98,9 +98,7 @@
     "fs-extra": "^10.0.0",
     "html-loader": "^3.1.0",
     "html-webpack-plugin": "^5.5.0",
-    "node-sass": "^9.0.0",
     "prettier": "^2.5.1",
-    "sass-loader": "^13.2.0",
     "source-map-loader": "^3.0.1",
     "style-loader": "^3.3.1",
     "terser-webpack-plugin": "^5.3.1",

extensions/web-clipper/webpack.config.js

@@ -92,12 +92,6 @@ var options = {
           },
           {
             loader: "css-loader"
-          },
-          {
-            loader: "sass-loader",
-            options: {
-              sourceMap: true
-            }
           }
         ]
       },

fastlane/metadata/android/en-US/changelogs/15484.txt

@@ -0,0 +1,7 @@
+- Add support audio playback in editor
+- Sort tags assigned to a note on top when viewing and managing note tags
+- Fix account password changing and account recovery
+- Allow attaching image as file
+- Minor bug fixes and performance improvements
+
+Thank you for using Notesnook!

packages/core/__tests__/lookup.test.js

@@ -153,4 +153,17 @@ describe("notesWithHighlighting", () => {
       const item = await filtered.item(0);
       expect(item.item).toBeDefined();
     }));
+
+  test("search notes with brackets in query should load the item", () =>
+    noteTest({
+      title: "[with brackets]"
+    }).then(async ({ db }) => {
+      await db.notes.add(TEST_NOTE);
+      const filtered = await db.lookup.notesWithHighlighting(
+        "[with brackets]",
+        db.notes.all
+      );
+      const item = await filtered.item(0);
+      expect(item.item).toBeDefined();
+    }));
 });

packages/core/src/api/lookup.ts

@@ -1154,7 +1154,7 @@ function textContainsTokens(text: string, tokens: QueryTokens) {
   const lowerCasedText = text.toLowerCase();
 
   const createTagPattern = (token: string) => {
-    const escapedToken = token.replace(/[()]/g, "\\$&");
+    const escapedToken = token.replace(/[()[\]]/g, "\\$&");
     return `<${MATCH_TAG_NAME}\\s+id="(.+?)">${escapedToken}<\\/${MATCH_TAG_NAME}>`;
   };