Merge branch 'main' of github.com:standardnotes/app

packages/clipper/CHANGELOG.md

@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.1.27](https://github.com/standardnotes/app/compare/@standardnotes/clipper@1.1.26...@standardnotes/clipper@1.1.27) (2023-05-18)
+
+**Note:** Version bump only for package @standardnotes/clipper
+
+## [1.1.26](https://github.com/standardnotes/app/compare/@standardnotes/clipper@1.1.25...@standardnotes/clipper@1.1.26) (2023-05-18)
+
+**Note:** Version bump only for package @standardnotes/clipper
+
 ## [1.1.25](https://github.com/standardnotes/app/compare/@standardnotes/clipper@1.1.24...@standardnotes/clipper@1.1.25) (2023-05-18)
 
 **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.25",
+  "version": "1.1.27",
   "private": true,
   "scripts": {
     "build-mv2": "yarn clean && webpack --config ./webpack.config.prod.js",

packages/desktop/CHANGELOG.md

@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [3.106.36](https://github.com/standardnotes/app/compare/@standardnotes/desktop@3.160.2...@standardnotes/desktop@3.106.36) (2023-05-18)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.106.35](https://github.com/standardnotes/app/compare/@standardnotes/desktop@3.160.1...@standardnotes/desktop@3.106.35) (2023-05-18)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
 ## [3.106.34](https://github.com/standardnotes/app/compare/@standardnotes/desktop@3.160.0...@standardnotes/desktop@3.106.34) (2023-05-18)
 
 **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.106.34",
+  "version": "3.106.36",
   "license": "AGPL-3.0-or-later",
   "author": "Standard Notes.",
   "private": true,

packages/mobile/CHANGELOG.md

@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [3.53.36](https://github.com/standardnotes/app/compare/@standardnotes/mobile@3.160.2...@standardnotes/mobile@3.53.36) (2023-05-18)
+
+**Note:** Version bump only for package @standardnotes/mobile
+
+## [3.53.35](https://github.com/standardnotes/app/compare/@standardnotes/mobile@3.53.34...@standardnotes/mobile@3.53.35) (2023-05-18)
+
+**Note:** Version bump only for package @standardnotes/mobile
+
 ## [3.53.34](https://github.com/standardnotes/app/compare/@standardnotes/mobile@3.53.33...@standardnotes/mobile@3.53.34) (2023-05-18)
 
 **Note:** Version bump only for package @standardnotes/mobile

packages/mobile/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/mobile",
-  "version": "3.53.34",
+  "version": "3.53.36",
   "author": "Standard Notes.",
   "private": true,
   "license": "AGPL-3.0-or-later",

packages/releases/CHANGELOG.md

@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.4.304](https://github.com/standardnotes/app/compare/@standardnotes/releases@1.4.303...@standardnotes/releases@1.4.304) (2023-05-18)
+
+**Note:** Version bump only for package @standardnotes/releases
+
+## [1.4.303](https://github.com/standardnotes/app/compare/@standardnotes/releases@1.4.302...@standardnotes/releases@1.4.303) (2023-05-18)
+
+**Note:** Version bump only for package @standardnotes/releases
+
 ## [1.4.302](https://github.com/standardnotes/app/compare/@standardnotes/releases@1.4.301...@standardnotes/releases@1.4.302) (2023-05-18)
 
 **Note:** Version bump only for package @standardnotes/releases

packages/releases/package.json

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

packages/snjs/CHANGELOG.md

@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.168.12](https://github.com/standardnotes/app/compare/@standardnotes/snjs@2.168.11...@standardnotes/snjs@2.168.12) (2023-05-18)
+
+**Note:** Version bump only for package @standardnotes/snjs
+
 ## [2.168.11](https://github.com/standardnotes/app/compare/@standardnotes/snjs@2.168.10...@standardnotes/snjs@2.168.11) (2023-05-16)
 
 **Note:** Version bump only for package @standardnotes/snjs

packages/snjs/mocha/files.test.js

@@ -62,7 +62,7 @@ describe('files', function () {
     localStorage.clear()
   })
 
-  it('should create valet token from server', async function () {
+  it('should create valet token from server - @paidfeature', async function () {
     await setup({ fakeCrypto: true, subscription: true })
 
     const remoteIdentifier = Utils.generateUuid()
@@ -80,7 +80,7 @@ describe('files', function () {
     expect(tokenOrError.tag).to.equal('no-subscription')
   })
 
-  it('should not create valet token from server when user has an expired subscription', async function () {
+  it('should not create valet token from server when user has an expired subscription - @paidfeature', async function () {
     await setup({ fakeCrypto: true, subscription: false })
 
     await Factory.publishMockedEvent('SUBSCRIPTION_PURCHASED', {
@@ -107,7 +107,7 @@ describe('files', function () {
     expect(tokenOrError.tag).to.equal('expired-subscription')
   })
 
-  it('creating two upload sessions successively should succeed', async function () {
+  it('creating two upload sessions successively should succeed - @paidfeature', async function () {
     await setup({ fakeCrypto: true, subscription: true })
 
     const firstToken = await application.apiService.createFileValetToken(Utils.generateUuid(), 'write')
@@ -121,7 +121,7 @@ describe('files', function () {
     expect(secondSession.uploadId).to.be.ok
   })
 
-  it('should encrypt and upload small file', async function () {
+  it('should encrypt and upload small file - @paidfeature', async function () {
     await setup({ fakeCrypto: false, subscription: true })
 
     const response = await fetch('/packages/snjs/mocha/assets/small_file.md')
@@ -134,7 +134,7 @@ describe('files', function () {
     expect(downloadedBytes).to.eql(buffer)
   })
 
-  it('should encrypt and upload big file', async function () {
+  it('should encrypt and upload big file - @paidfeature', async function () {
     await setup({ fakeCrypto: false, subscription: true })
 
     const response = await fetch('/packages/snjs/mocha/assets/two_mb_file.md')
@@ -147,7 +147,7 @@ describe('files', function () {
     expect(downloadedBytes).to.eql(buffer)
   })
 
-  it('should delete file', async function () {
+  it('should delete file - @paidfeature', async function () {
     await setup({ fakeCrypto: false, subscription: true })
 
     const response = await fetch('/packages/snjs/mocha/assets/small_file.md')

packages/snjs/mocha/settings.test.js

@@ -116,7 +116,7 @@ describe('settings service', function () {
     expect(settings.getSettingValue(SettingName.create(SettingName.NAMES.MfaSecret).getValue())).to.not.be.ok
   })
 
-  it('reads a subscription setting', async () => {
+  it('reads a subscription setting - @paidfeature', async () => {
     await Factory.publishMockedEvent('SUBSCRIPTION_PURCHASED', {
       userEmail: context.email,
       subscriptionId: subscriptionId++,
@@ -139,7 +139,7 @@ describe('settings service', function () {
     expect(setting).to.be.a('string')
   })
 
-  it('persist irreplaceable subscription settings between subsequent subscriptions', async () => {
+  it('persist irreplaceable subscription settings between subsequent subscriptions - @paidfeature', async () => {
     await reInitializeApplicationWithRealCrypto()
 
     await Factory.publishMockedEvent('SUBSCRIPTION_PURCHASED', {

packages/snjs/mocha/subscriptions.test.js

@@ -49,7 +49,7 @@ describe('subscriptions', function () {
     await Factory.sleep(2)
   })
 
-  it('should invite a user by email to a shared subscription', async () => {
+  it('should invite a user by email to a shared subscription - @paidfeature', async () => {
     await subscriptionManager.inviteToSubscription('test@test.te')
 
     const existingInvites = await subscriptionManager.listSubscriptionInvitations()
@@ -59,7 +59,7 @@ describe('subscriptions', function () {
     expect(newlyCreatedInvite.status).to.equal('sent')
   })
 
-  it('should not invite a user by email if the limit of shared subscription is breached', async () => {
+  it('should not invite a user by email if the limit of shared subscription is breached - @paidfeature', async () => {
     await subscriptionManager.inviteToSubscription('test1@test.te')
     await subscriptionManager.inviteToSubscription('test2@test.te')
     await subscriptionManager.inviteToSubscription('test3@test.te')
@@ -77,7 +77,7 @@ describe('subscriptions', function () {
     expect(existingInvites.length).to.equal(5)
   })
 
-  it('should cancel a user invitation to a shared subscription', async () => {
+  it('should cancel a user invitation to a shared subscription - @paidfeature', async () => {
     await subscriptionManager.inviteToSubscription('test@test.te')
     await subscriptionManager.inviteToSubscription('test2@test.te')
 
@@ -96,7 +96,7 @@ describe('subscriptions', function () {
     expect(existingInvites.filter(invite => invite.status === 'canceled').length).to.equal(1)
   })
 
-  it('should invite a user by email if the limit of shared subscription is restored', async () => {
+  it('should invite a user by email if the limit of shared subscription is restored - @paidfeature', async () => {
     await subscriptionManager.inviteToSubscription('test1@test.te')
     await subscriptionManager.inviteToSubscription('test2@test.te')
     await subscriptionManager.inviteToSubscription('test3@test.te')

packages/snjs/mocha/test.html

@@ -16,6 +16,7 @@
     const urlParams = new URLSearchParams(window.location.search);
     const syncServerHostName = urlParams.get('sync_server_host_name') ?? 'syncing-server-proxy';
     const bail = urlParams.get('bail') === 'false' ? false : true;
+    const skipPaidFeatures = urlParams.get('skip_paid_features') === 'true' ? true : false;
 
     Object.assign(window, SNCrypto);
 
@@ -29,9 +30,14 @@
       console.error(error);
     };
 
-    mocha.setup('bdd');
+    mocha.setup({
-    mocha.timeout(5000);
+      ui: 'bdd',
-    mocha.bail(bail);
+      timeout: 5000,
+      bail: bail,
+    });
+    if (skipPaidFeatures) {
+      mocha.grep('@paidfeature').invert();
+    }
   </script>
   <script type="module" src="memory.test.js"></script>
   <script type="module" src="protocol.test.js"></script>

packages/snjs/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/snjs",
-  "version": "2.168.11",
+  "version": "2.168.12",
   "engines": {
     "node": ">=16.0.0 <17.0.0"
   },

packages/web/CHANGELOG.md

@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [3.160.3](https://github.com/standardnotes/app/compare/@standardnotes/web@3.160.2...@standardnotes/web@3.160.3) (2023-05-18)
+
+**Note:** Version bump only for package @standardnotes/web
+
+## [3.160.2](https://github.com/standardnotes/app/compare/@standardnotes/web@3.160.1...@standardnotes/web@3.160.2) (2023-05-18)
+
+**Note:** Version bump only for package @standardnotes/web
+
 ## [3.160.1](https://github.com/standardnotes/app/compare/@standardnotes/web@3.160.0...@standardnotes/web@3.160.1) (2023-05-18)
 
 **Note:** Version bump only for package @standardnotes/web

packages/web/CHANGELOG.md.json

@@ -1,5 +1,27 @@
 {
   "versions": [
+    {
+      "version": "3.160.3",
+      "title": "[3.160.3](https://github.com/standardnotes/app/compare/@standardnotes/web@3.160.2...@standardnotes/web@3.160.3) (2023-05-18)",
+      "date": null,
+      "body": "**Note:** Version bump only for package @standardnotes/web",
+      "parsed": {
+        "_": [
+          "Note: Version bump only for package @standardnotes/web"
+        ]
+      }
+    },
+    {
+      "version": "3.160.2",
+      "title": "[3.160.2](https://github.com/standardnotes/app/compare/@standardnotes/web@3.160.1...@standardnotes/web@3.160.2) (2023-05-18)",
+      "date": null,
+      "body": "**Note:** Version bump only for package @standardnotes/web",
+      "parsed": {
+        "_": [
+          "Note: Version bump only for package @standardnotes/web"
+        ]
+      }
+    },
     {
       "version": "3.160.1",
       "title": "[3.160.1](https://github.com/standardnotes/app/compare/@standardnotes/web@3.160.0...@standardnotes/web@3.160.1) (2023-05-18)",

packages/web/package.json

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