chore(release): publish

- @standardnotes/[email protected]
 - @standardnotes/[email protected]
 - @standardnotes/[email protected]
 - @standardnotes/[email protected]
 - @standardnotes/[email protected].9

.github/workflows/desktop.release.reuse.yml

@@ -13,6 +13,7 @@ jobs:
     env:
       CSC_LINK: ${{ secrets.MAC_CI_KEYS }}
       CSC_KEY_PASSWORD: ${{ secrets.MAC_CI_KEYS_PASSWORD }}
+      APPLE_TEAM_ID: ${{ secrets.APPLE_TEAM_ID }}
       NOTARIZE_APPLE_ID: ${{ secrets.NOTARIZE_APPLE_ID }}
       NOTARIZE_APPLE_ID_PASSWORD: ${{ secrets.NOTARIZE_APPLE_ID_PASSWORD }}
     defaults:

packages/clipper/CHANGELOG.md

@@ -3,6 +3,34 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.1.306](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-11-02)
+
+**Note:** Version bump only for package @standardnotes/clipper
+
+## [1.1.305](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-11-01)
+
+**Note:** Version bump only for package @standardnotes/clipper
+
+## [1.1.304](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-11-01)
+
+**Note:** Version bump only for package @standardnotes/clipper
+
+## [1.1.303](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-11-01)
+
+**Note:** Version bump only for package @standardnotes/clipper
+
+## [1.1.302](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-10-31)
+
+**Note:** Version bump only for package @standardnotes/clipper
+
+## [1.1.301](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-10-31)
+
+**Note:** Version bump only for package @standardnotes/clipper
+
+## [1.1.300](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-10-31)
+
+**Note:** Version bump only for package @standardnotes/clipper
+
 ## [1.1.299](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-10-31)
 
 **Note:** Version bump only for package @standardnotes/clipper

packages/clipper/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@standardnotes/clipper",
   "description": "Web clipper browser extension for Standard Notes",
-  "version": "1.1.299",
+  "version": "1.1.306",
   "private": true,
   "scripts": {
     "build-mv2": "yarn clean && webpack --config ./webpack.config.prod.js",

packages/desktop/CHANGELOG.md

@@ -3,6 +3,34 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [3.108.240](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-11-02)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.108.239](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-11-01)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.108.238](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-11-01)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.108.237](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-11-01)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.108.236](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-10-31)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.108.235](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-10-31)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.108.234](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-10-31)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
 ## [3.108.233](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-10-31)
 
 **Note:** Version bump only for package @standardnotes/desktop

packages/desktop/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@standardnotes/desktop",
   "main": "./app/dist/index.js",
-  "version": "3.108.233",
+  "version": "3.108.240",
   "license": "AGPL-3.0",
   "author": "Standard Notes.",
   "private": true,
@@ -53,6 +53,7 @@
   "devDependencies": {
     "@babel/core": "*",
     "@babel/preset-env": "*",
+    "@electron/notarize": "^2.1.0",
     "@types/fs-extra": "^11.0.1",
     "@types/lodash": "^4.14.189",
     "@types/mime-types": "^2.1.1",
@@ -63,7 +64,6 @@
     "babel-loader": "^9.1.0",
     "copy-webpack-plugin": "^11.0.0",
     "electron-builder": "23.6.0",
-    "electron-notarize": "^1.2.1",
     "eslint": "*",
     "eslint-config-prettier": "^8.9.0",
     "eslint-plugin-import": "^2.26.0",

packages/desktop/scripts/notarizeMac.js

@@ -2,7 +2,7 @@
 
 const fs = require('fs')
 const path = require('path')
-const electronNotarize = require('electron-notarize')
+const electronNotarize = require('@electron/notarize')
 
 module.exports = async function (params) {
   const platformName = params.electronPlatformName
@@ -21,6 +21,7 @@ module.exports = async function (params) {
   try {
     electronNotarize
       .notarize({
+        teamId: process.env.APPLE_TEAM_ID,
         appBundleId: appId,
         appPath: appPath,
         appleId: process.env.NOTARIZE_APPLE_ID,

packages/mobile/CHANGELOG.md

@@ -3,6 +3,46 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [3.56.221](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-11-02)
+
+### Bug Fixes
+
+* Fixed white flash issue when starting app on iOS ([d28b200](https://github.com/standardnotes/app/commit/d28b20008c6c1dcf8876ca4613e468fa5511ae3e))
+
+## [3.56.220](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-11-01)
+
+**Note:** Version bump only for package @standardnotes/mobile
+
+## [3.56.219](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-11-01)
+
+**Note:** Version bump only for package @standardnotes/mobile
+
+## [3.56.218](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-11-01)
+
+**Note:** Version bump only for package @standardnotes/mobile
+
+## [3.56.217](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-11-01)
+
+**Note:** Version bump only for package @standardnotes/mobile
+
+## [3.56.216](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-10-31)
+
+**Note:** Version bump only for package @standardnotes/mobile
+
+## [3.56.215](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-10-31)
+
+**Note:** Version bump only for package @standardnotes/mobile
+
+## [3.56.214](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-10-31)
+
+### Bug Fixes
+
+* Fixed issue where a brief flash of white would appear when starting the app on mobile ([572c9b7](https://github.com/standardnotes/app/commit/572c9b7dfaa42773c050772940e383df2940a79f))
+
+## [3.56.213](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-10-31)
+
+**Note:** Version bump only for package @standardnotes/mobile
+
 ## [3.56.212](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-10-31)
 
 **Note:** Version bump only for package @standardnotes/mobile

packages/mobile/fastlane/Fastfile

@@ -64,6 +64,7 @@ platform :ios do
         skip_metadata: true,
         skip_screenshots: true,
         skip_binary_upload: true,
+        skip_app_version_update: true,
         run_precheck_before_submit: false,
         submission_information: { add_id_info_uses_idfa: false },
         release_notes: {

packages/mobile/html/Web.bundle/src/index.html

@@ -25,6 +25,11 @@
         };
     </script>
     <script src="web-src/app.js"></script>
+    <style>
+        body {
+            background-color: black;
+        }
+    </style>
 </head>
 
 <body>

packages/mobile/ios/LaunchScreen.storyboard

@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="17156" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="22155" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17125"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22131"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
-        <capability name="System colors in document resources" minToolsVersion="11.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>
@@ -17,7 +16,7 @@
                         <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <viewLayoutGuide key="safeArea" id="Bcu-3y-fUS"/>
-                        <color key="backgroundColor" systemColor="systemBackgroundColor"/>
+                        <color key="backgroundColor" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                     </view>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="iYj-Kq-Ea1" userLabel="First Responder" sceneMemberID="firstResponder"/>
@@ -25,9 +24,4 @@
             <point key="canvasLocation" x="53" y="375"/>
         </scene>
     </scenes>
-    <resources>
-        <systemColor name="systemBackgroundColor">
-            <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
-        </systemColor>
-    </resources>
 </document>

packages/mobile/ios/Podfile.lock

@@ -800,4 +800,4 @@ SPEC CHECKSUMS:
 
 PODFILE CHECKSUM: c3b827e3c92cdf3199eddc52083480826e717b88
 
-COCOAPODS: 1.11.3
+COCOAPODS: 1.14.2

packages/mobile/ios/StandardNotes.xcodeproj/project.pbxproj

@@ -991,6 +991,7 @@
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					" ",
+					"-Wl -ld_classic ",
 				);
 				REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
 				SDKROOT = iphoneos;
@@ -1059,6 +1060,7 @@
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					" ",
+					"-Wl -ld_classic ",
 				);
 				REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
 				SDKROOT = iphoneos;

packages/mobile/ios/StandardNotes/AppDelegate.mm

@@ -24,14 +24,14 @@
   
   [self clearWebEditorCache];
   
-  NSString *CFBundleIdentifier = [[[NSBundle mainBundle] infoDictionary] objectForKey:@"CFBundleIdentifier"];
-  
-  NSDictionary * initialProperties = @{@"env" : [CFBundleIdentifier isEqualToString:@"com.standardnotes.standardnotes.dev"] ? @"dev" : @"prod"};
-  
   self.moduleName = @"StandardNotes";
   self.initialProps = @{};
   
-  return [super application:application didFinishLaunchingWithOptions:launchOptions];
+  BOOL success = [super application:application didFinishLaunchingWithOptions:launchOptions];
+  if (success) {
+    self.window.rootViewController.view.backgroundColor = [UIColor colorWithWhite:0.0 alpha:1.0];
+  }
+  return success;
 }
 
 - (NSURL *)sourceURLForBridge:(RCTBridge *)bridge

packages/mobile/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/mobile",
-  "version": "3.56.212",
+  "version": "3.56.221",
   "author": "Standard Notes.",
   "private": true,
   "license": "AGPL-3.0",

packages/releases/CHANGELOG.md

@@ -3,6 +3,42 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.4.596](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-11-02)
+
+**Note:** Version bump only for package @standardnotes/releases
+
+## [1.4.595](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-11-01)
+
+**Note:** Version bump only for package @standardnotes/releases
+
+## [1.4.594](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-11-01)
+
+**Note:** Version bump only for package @standardnotes/releases
+
+## [1.4.593](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-11-01)
+
+**Note:** Version bump only for package @standardnotes/releases
+
+## [1.4.592](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-11-01)
+
+**Note:** Version bump only for package @standardnotes/releases
+
+## [1.4.591](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-10-31)
+
+**Note:** Version bump only for package @standardnotes/releases
+
+## [1.4.590](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-10-31)
+
+**Note:** Version bump only for package @standardnotes/releases
+
+## [1.4.589](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-10-31)
+
+**Note:** Version bump only for package @standardnotes/releases
+
+## [1.4.588](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-10-31)
+
+**Note:** Version bump only for package @standardnotes/releases
+
 ## [1.4.587](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-10-31)
 
 **Note:** Version bump only for package @standardnotes/releases

packages/releases/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/releases",
-  "version": "1.4.587",
+  "version": "1.4.596",
   "license": "AGPL-3.0",
   "main": "dist/releases.json",
   "types": "dist/index.d.ts",

packages/ui-services/CHANGELOG.md

@@ -3,6 +3,12 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.33.1](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-10-31)
+
+### Bug Fixes
+
+* Fixed issue where exporting multiple files with the same name would error ([f408950](https://github.com/standardnotes/app/commit/f408950aa4e59389db81a4ca2b9db5ea49147aaf))
+
 # [1.33.0](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-10-30)
 
 ### Features

packages/ui-services/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/ui-services",
-  "version": "1.33.0",
+  "version": "1.33.1",
   "engines": {
     "node": ">=16.0.0 <17.0.0"
   },

packages/ui-services/src/Archive/ArchiveManager.ts

@@ -19,9 +19,9 @@ function zippableFileName(name: string, suffix = '', format = 'txt'): string {
   return sanitizedName.slice(0, maxFileNameLength - nameEnd.length) + nameEnd
 }
 
-export function parseAndCreateZippableFileName(name: string) {
+export function parseAndCreateZippableFileName(name: string, suffix = '') {
   const { name: parsedName, ext } = parseFileName(name)
-  return zippableFileName(parsedName, '', ext)
+  return zippableFileName(parsedName, suffix, ext)
 }
 
 type ZippableData = {

packages/web/CHANGELOG.md

@@ -3,6 +3,38 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [3.181.9](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-11-02)
+
+**Note:** Version bump only for package @standardnotes/web
+
+## [3.181.8](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-11-01)
+
+**Note:** Version bump only for package @standardnotes/web
+
+## [3.181.7](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-11-01)
+
+**Note:** Version bump only for package @standardnotes/web
+
+## [3.181.6](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-11-01)
+
+**Note:** Version bump only for package @standardnotes/web
+
+## [3.181.5](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-10-31)
+
+**Note:** Version bump only for package @standardnotes/web
+
+## [3.181.4](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-10-31)
+
+### Bug Fixes
+
+* Fixed issue where exporting multiple files with the same name would error ([f408950](https://github.com/standardnotes/app/commit/f408950aa4e59389db81a4ca2b9db5ea49147aaf))
+
+## [3.181.3](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-10-31)
+
+### Bug Fixes
+
+* Fixed issue where a brief flash of white would appear when starting the app on mobile ([572c9b7](https://github.com/standardnotes/app/commit/572c9b7dfaa42773c050772940e383df2940a79f))
+
 ## [3.181.2](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-10-31)
 
 **Note:** Version bump only for package @standardnotes/web

packages/web/CHANGELOG.md.json

@@ -1,5 +1,88 @@
 {
   "versions": [
+    {
+      "version": "3.181.9",
+      "title": "[3.181.9](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-11-02)",
+      "date": null,
+      "body": "**Note:** Version bump only for package @standardnotes/web",
+      "parsed": {
+        "_": [
+          "Note: Version bump only for package @standardnotes/web"
+        ]
+      }
+    },
+    {
+      "version": "3.181.8",
+      "title": "[3.181.8](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-11-01)",
+      "date": null,
+      "body": "**Note:** Version bump only for package @standardnotes/web",
+      "parsed": {
+        "_": [
+          "Note: Version bump only for package @standardnotes/web"
+        ]
+      }
+    },
+    {
+      "version": "3.181.7",
+      "title": "[3.181.7](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-11-01)",
+      "date": null,
+      "body": "**Note:** Version bump only for package @standardnotes/web",
+      "parsed": {
+        "_": [
+          "Note: Version bump only for package @standardnotes/web"
+        ]
+      }
+    },
+    {
+      "version": "3.181.6",
+      "title": "[3.181.6](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-11-01)",
+      "date": null,
+      "body": "**Note:** Version bump only for package @standardnotes/web",
+      "parsed": {
+        "_": [
+          "Note: Version bump only for package @standardnotes/web"
+        ]
+      }
+    },
+    {
+      "version": "3.181.5",
+      "title": "[3.181.5](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-10-31)",
+      "date": null,
+      "body": "**Note:** Version bump only for package @standardnotes/web",
+      "parsed": {
+        "_": [
+          "Note: Version bump only for package @standardnotes/web"
+        ]
+      }
+    },
+    {
+      "version": "3.181.4",
+      "title": "[3.181.4](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-10-31)",
+      "date": null,
+      "body": "### Bug Fixes\n\n* Fixed issue where exporting multiple files with the same name would error ([f408950](https://github.com/standardnotes/app/commit/f408950aa4e59389db81a4ca2b9db5ea49147aaf))",
+      "parsed": {
+        "_": [
+          "Fixed issue where exporting multiple files with the same name would error (f408950)"
+        ],
+        "Bug Fixes": [
+          "Fixed issue where exporting multiple files with the same name would error (f408950)"
+        ]
+      }
+    },
+    {
+      "version": "3.181.3",
+      "title": "[3.181.3](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-10-31)",
+      "date": null,
+      "body": "### Bug Fixes\n\n* Fixed issue where a brief flash of white would appear when starting the app on mobile ([572c9b7](https://github.com/standardnotes/app/commit/572c9b7dfaa42773c050772940e383df2940a79f))",
+      "parsed": {
+        "_": [
+          "Fixed issue where a brief flash of white would appear when starting the app on mobile (572c9b7)"
+        ],
+        "Bug Fixes": [
+          "Fixed issue where a brief flash of white would appear when starting the app on mobile (572c9b7)"
+        ]
+      }
+    },
     {
       "version": "3.181.2",
       "title": "[3.181.2](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-10-31)",

packages/web/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/web",
-  "version": "3.181.2",
+  "version": "3.181.9",
   "license": "AGPL-3.0",
   "main": "dist/app.js",
   "author": "Standard Notes.",

packages/web/src/javascripts/Components/NotesOptions/NotesOptions.tsx

@@ -1,7 +1,7 @@
 import Icon from '@/Components/Icon/Icon'
 import { observer } from 'mobx-react-lite'
 import { useState, useEffect, useMemo, useCallback } from 'react'
-import { NoteType, Platform, SNNote } from '@standardnotes/snjs'
+import { NoteType, Platform, SNNote, pluralize } from '@standardnotes/snjs'
 import {
   CHANGE_EDITOR_WIDTH_COMMAND,
   OPEN_NOTE_HISTORY_COMMAND,
@@ -99,6 +99,13 @@ const NotesOptions = ({ notes, closeMenu }: NotesOptionsProps) => {
   }, [])
 
   const downloadSelectedItems = useCallback(async () => {
+    if (notes.length === 0) {
+      return
+    }
+    const toast = addToast({
+      type: ToastType.Progress,
+      message: `Exporting ${notes.length} ${pluralize(notes.length, 'note', 'notes')}...`,
+    })
     try {
       const result = await createNoteExport(application, notes)
       if (!result) {
@@ -113,12 +120,14 @@ const NotesOptions = ({ notes, closeMenu }: NotesOptionsProps) => {
         filename: fileName,
         isNativeMobileWeb: application.isNativeMobileWeb(),
       })
+      dismissToast(toast)
     } catch (error) {
       console.error(error)
       addToast({
         type: ToastType.Error,
         message: 'Could not export notes',
       })
+      dismissToast(toast)
     }
   }, [application, notes])
 

packages/web/src/javascripts/Components/SuperEditor/BlocksEditor.tsx

@@ -28,7 +28,7 @@ import TableActionMenuPlugin from './Plugins/TableCellActionMenuPlugin'
 import ToolbarPlugin from './Plugins/ToolbarPlugin/ToolbarPlugin'
 import { useMediaQuery, MutuallyExclusiveMediaQueryBreakpoints } from '@/Hooks/useMediaQuery'
 import { CheckListPlugin } from './Plugins/List/CheckListPlugin'
-import { LinePlaceholderPlugin } from './Plugins/LinePlaceholderPlugin'
+import { EmptyLinePlaceholderPlugin } from './Plugins/EmptyLinePlaceholderPlugin'
 
 type BlocksEditorProps = {
   onChange?: (value: string, preview: string) => void
@@ -114,7 +114,7 @@ export const BlocksEditor: FunctionComponent<BlocksEditorProps> = ({
       <CollapsiblePlugin />
       <TabIndentationPlugin />
       <RemoveBrokenTablesPlugin />
-      <LinePlaceholderPlugin />
+      <EmptyLinePlaceholderPlugin />
       {!readonly && floatingAnchorElem && (
         <>
           <DraggableBlockPlugin anchorElem={floatingAnchorElem} />

packages/web/src/javascripts/Components/SuperEditor/Plugins/EmptyLinePlaceholderPlugin.tsx

@@ -11,7 +11,7 @@ import { useCallback, useEffect, useRef } from 'react'
 import { getSelectedNode } from '../Lexical/Utils/getSelectedNode'
 import { mergeRegister } from '@lexical/utils'
 
-export const LinePlaceholderPlugin = () => {
+export const EmptyLinePlaceholderPlugin = () => {
   const [editor] = useLexicalComposerContext()
 
   const placeholderElementRef = useRef<HTMLDivElement>(null)
@@ -43,7 +43,7 @@ export const LinePlaceholderPlugin = () => {
       if (!text && editor.isEditable()) {
         placeholder.style.top = `${rect.y}px`
         placeholder.style.left = `${rect.x - parentRect.x + rootRect.x}px`
-        placeholder.style.opacity = '1'
+        placeholder.style.opacity = '0.65'
       } else {
         placeholder.style.opacity = '0'
       }
@@ -82,9 +82,11 @@ export const LinePlaceholderPlugin = () => {
   }, [cursorUpdate, editor])
 
   return (
-    <div className="pointer-events-none fixed text-passive-1 opacity-0" ref={placeholderElementRef}>
-      Type <span className="rounded border border-border bg-passive-4-opacity-variant px-[3px] py-0.5">/</span> for
-      commands...
+    <div
+      className="super-empty-line-placeholder pointer-events-none fixed text-passive-1 opacity-0"
+      ref={placeholderElementRef}
+    >
+      Type <span className="rounded bg-passive-4-opacity-variant p-0.5">/</span> for commands...
     </div>
   )
 }

packages/web/src/javascripts/Components/SuperEditor/Plugins/ToolbarPlugin/ToolbarPlugin.tsx

@@ -580,11 +580,10 @@ const ToolbarPlugin = () => {
           'bg-contrast',
           !isEditable ? 'hidden opacity-0' : '',
           isMobile && !canShowToolbarOnMobile ? 'hidden' : '',
-          !isMobile &&
-            'border-b border-border translucent-ui:border-[--popover-border-color] translucent-ui:bg-[--popover-background-color] translucent-ui:[backdrop-filter:var(--popover-backdrop-filter)]',
+          !isMobile && 'border-b border-border bg-default',
           !isMobile
             ? !isToolbarFixedToTop
-              ? 'fixed left-0 top-0 z-tooltip translate-x-[--translate-x] translate-y-[--translate-y] rounded border py-0.5 opacity-0'
+              ? 'fixed left-0 top-0 z-tooltip translate-x-[--translate-x] translate-y-[--translate-y] rounded border py-0.5 opacity-0 translucent-ui:border-[--popover-border-color] translucent-ui:bg-[--popover-background-color] translucent-ui:[backdrop-filter:var(--popover-backdrop-filter)]'
               : 'w-full px-1 py-1'
             : '',
         )}

packages/web/src/javascripts/Utils/NoteExportUtils.ts

@@ -1,8 +1,16 @@
 import { WebApplication } from '@/Application/WebApplication'
 import { HeadlessSuperConverter } from '@/Components/SuperEditor/Tools/HeadlessSuperConverter'
-import { NoteType, PrefKey, SNNote, PrefDefaults, FileItem, PrefValue, pluralize } from '@standardnotes/snjs'
-import { WebApplicationInterface, parseAndCreateZippableFileName, sanitizeFileName } from '@standardnotes/ui-services'
+import { NoteType, PrefKey, SNNote, PrefDefaults, FileItem, PrefValue } from '@standardnotes/snjs'
+import { WebApplicationInterface, parseAndCreateZippableFileName } from '@standardnotes/ui-services'
 import { ZipDirectoryEntry } from '@zip.js/zip.js'
+// @ts-expect-error Using inline loaders to load CSS as string
+import superEditorCSS from '!css-loader!sass-loader!../Components/SuperEditor/Lexical/Theme/editor.scss'
+// @ts-expect-error Using inline loaders to load CSS as string
+import snColorsCSS from '!css-loader!sass-loader!@standardnotes/styles/src/Styles/_colors.scss'
+// @ts-expect-error Using inline loaders to load CSS as string
+import exportOverridesCSS from '!css-loader!sass-loader!../Components/SuperEditor/Lexical/Theme/export-overrides.scss'
+import { getBase64FromBlob } from './Utils'
+import { parseFileName } from '@standardnotes/filepicker'
 
 export const getNoteFormat = (application: WebApplicationInterface, note: SNNote) => {
   if (note.noteType === NoteType.Super) {
@@ -25,15 +33,6 @@ export const getNoteFileName = (application: WebApplicationInterface, note: SNNo
 
 const headlessSuperConverter = new HeadlessSuperConverter()
 
-// @ts-expect-error Using inline loaders to load CSS as string
-import superEditorCSS from '!css-loader!sass-loader!../Components/SuperEditor/Lexical/Theme/editor.scss'
-// @ts-expect-error Using inline loaders to load CSS as string
-import snColorsCSS from '!css-loader!sass-loader!@standardnotes/styles/src/Styles/_colors.scss'
-// @ts-expect-error Using inline loaders to load CSS as string
-import exportOverridesCSS from '!css-loader!sass-loader!../Components/SuperEditor/Lexical/Theme/export-overrides.scss'
-import { getBase64FromBlob } from './Utils'
-import { ToastType, addToast, dismissToast } from '@standardnotes/toast'
-
 const superHTML = (note: SNNote, content: string) => `<!DOCTYPE html>
 <html>
   <head>
@@ -175,11 +174,6 @@ export const createNoteExport = async (
     return
   }
 
-  const toast = addToast({
-    type: ToastType.Progress,
-    message: `Exporting ${notes.length} ${pluralize(notes.length, 'note', 'notes')}...`,
-  })
-
   const superExportFormatPref = application.getPreference(
     PrefKey.SuperNoteExportFormat,
     PrefDefaults[PrefKey.SuperNoteExportFormat],
@@ -192,7 +186,6 @@ export const createNoteExport = async (
   if (notes.length === 1 && !noteRequiresFolder(notes[0], superExportFormatPref, superEmbedBehaviorPref)) {
     const blob = await getNoteBlob(application, notes[0], superEmbedBehaviorPref)
     const fileName = getNoteFileName(application, notes[0])
-    dismissToast(toast)
     return {
       blob,
       fileName,
@@ -211,31 +204,37 @@ export const createNoteExport = async (
     await addEmbeddedFilesToFolder(application, notes[0], root)
 
     const zippedBlob = await zipFS.exportBlob()
-    dismissToast(toast)
     return {
       blob: zippedBlob,
       fileName: fileName + '.zip',
     }
   }
 
+  const filenameCounts: Record<string, number> = {}
+
   for (const note of notes) {
     const blob = await getNoteBlob(application, note, superEmbedBehaviorPref)
-    const fileName = parseAndCreateZippableFileName(getNoteFileName(application, note))
+    const _name = getNoteFileName(application, note)
+
+    filenameCounts[_name] = filenameCounts[_name] == undefined ? 0 : filenameCounts[_name] + 1
+
+    const currentFileNameIndex = filenameCounts[_name]
+
+    const fileName = parseAndCreateZippableFileName(_name, currentFileNameIndex > 0 ? ` - ${currentFileNameIndex}` : '')
 
     if (!noteRequiresFolder(note, superExportFormatPref, superEmbedBehaviorPref)) {
       root.addBlob(fileName, blob)
       continue
     }
 
-    const folder = root.addDirectory(sanitizeFileName(note.title))
+    const { name } = parseFileName(fileName)
+    const folder = root.addDirectory(name)
     folder.addBlob(fileName, blob)
     await addEmbeddedFilesToFolder(application, note, folder)
   }
 
   const zippedBlob = await zipFS.exportBlob()
 
-  dismissToast(toast)
-
   return {
     blob: zippedBlob,
     fileName: `Standard Notes Export - ${application.archiveService.formattedDateForExports()}.zip`,

yarn.lock

@@ -2035,6 +2035,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@electron/notarize@npm:^2.1.0":
+  version: 2.1.0
+  resolution: "@electron/notarize@npm:2.1.0"
+  dependencies:
+    debug: ^4.1.1
+    fs-extra: ^9.0.1
+    promise-retry: ^2.0.1
+  checksum: ac58f39f4b2370ea929837cef50ebeedb4108ed9bd2a3fef0b89254891014a745da2db703b18b8e0d097a17000cc8fa984bcff3f087368986cb4a59753365a2f
+  languageName: node
+  linkType: hard
+
 "@electron/remote@npm:^2.0.12":
   version: 2.0.12
   resolution: "@electron/remote@npm:2.0.12"
@@ -4288,6 +4299,7 @@ __metadata:
   dependencies:
     "@babel/core": "*"
     "@babel/preset-env": "*"
+    "@electron/notarize": ^2.1.0
     "@electron/remote": ^2.0.12
     "@standardnotes/domain-core": ^1.40.0
     "@standardnotes/electron-clear-data": 1.1.1
@@ -4308,7 +4320,6 @@ __metadata:
     electron: 27.0.0
     electron-builder: 23.6.0
     electron-log: ^4.4.8
-    electron-notarize: ^1.2.1
     electron-updater: ^6.1.4
     eslint: "*"
     eslint-config-prettier: ^8.9.0
@@ -10474,16 +10485,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"electron-notarize@npm:^1.2.1":
-  version: 1.2.2
-  resolution: "electron-notarize@npm:1.2.2"
-  dependencies:
-    debug: ^4.1.1
-    fs-extra: ^9.0.1
-  checksum: 98909bc90f0840a4bd3da0edc6895d719eb0d17942812a8c8f5a130d323c7fbaafd819245cfe9a6c5b5abfa8dd3b0eb2bd8ee9c0b2dcf0c3b238b6845730c368
-  languageName: node
-  linkType: hard
-
 "electron-osx-sign@npm:^0.6.0":
   version: 0.6.0
   resolution: "electron-osx-sign@npm:0.6.0"