chore(release): publish

- @standardnotes/[email protected]
 - @standardnotes/[email protected]
 - @standardnotes/[email protected]
 - @standardnotes/[email protected].3
 - @standardnotes/[email protected].6

.dockerignore

@@ -1,15 +0,0 @@
-.git/
-.gitignore
-.eslintcache
-node_modules
-dist
-
-packages/web-server/public/assets
-packages/web-server/tmp
-packages/web-server/vendor/bundles
-
-packages/desktop
-!packages/desktop/package.json
-
-packages/mobile
-!packages/mobile/package.json

.github/dependabot.yml

@@ -9,190 +9,113 @@ updates:
     directory: "/"
     schedule:
       interval: "daily"
-    reviewers:
-      - "moughxyz"
-      - "karolsojko"
 
   - package-ecosystem: "npm"
     directory: "/packages/api"
     schedule:
       interval: "daily"
-    reviewers:
-      - "moughxyz"
-      - "karolsojko"
 
   - package-ecosystem: "npm"
     directory: "/packages/components"
     schedule:
       interval: "daily"
-    reviewers:
-      - "moughxyz"
-      - "karolsojko"
 
   - package-ecosystem: "npm"
     directory: "/packages/desktop"
     schedule:
       interval: "daily"
-    reviewers:
-      - "moughxyz"
-      - "karolsojko"
 
   - package-ecosystem: "npm"
     directory: "/packages/docs"
     schedule:
       interval: "daily"
-    reviewers:
-      - "moughxyz"
-      - "karolsojko"
 
   - package-ecosystem: "npm"
     directory: "/packages/encryption"
     schedule:
       interval: "daily"
-    reviewers:
-      - "moughxyz"
-      - "karolsojko"
 
   - package-ecosystem: "npm"
     directory: "/packages/features"
     schedule:
       interval: "daily"
-    reviewers:
-      - "moughxyz"
-      - "karolsojko"
 
   - package-ecosystem: "npm"
     directory: "/packages/filepicker"
     schedule:
       interval: "daily"
-    reviewers:
-      - "moughxyz"
-      - "karolsojko"
 
   - package-ecosystem: "npm"
     directory: "/packages/files"
     schedule:
       interval: "daily"
-    reviewers:
-      - "moughxyz"
-      - "karolsojko"
 
   - package-ecosystem: "npm"
     directory: "/packages/icons"
     schedule:
       interval: "daily"
-    reviewers:
-      - "moughxyz"
-      - "karolsojko"
 
   - package-ecosystem: "npm"
     directory: "/packages/mobile"
     schedule:
       interval: "daily"
-    reviewers:
-      - "moughxyz"
-      - "karolsojko"
 
   - package-ecosystem: "npm"
     directory: "/packages/models"
     schedule:
       interval: "daily"
-    reviewers:
-      - "moughxyz"
-      - "karolsojko"
 
   - package-ecosystem: "npm"
     directory: "/packages/releases"
     schedule:
       interval: "daily"
-    reviewers:
-      - "moughxyz"
-      - "karolsojko"
 
   - package-ecosystem: "npm"
     directory: "/packages/responses"
     schedule:
       interval: "daily"
-    reviewers:
-      - "moughxyz"
-      - "karolsojko"
 
   - package-ecosystem: "npm"
     directory: "/packages/services"
     schedule:
       interval: "daily"
-    reviewers:
-      - "moughxyz"
-      - "karolsojko"
 
   - package-ecosystem: "npm"
     directory: "/packages/sncrypto-common"
     schedule:
       interval: "daily"
-    reviewers:
-      - "moughxyz"
-      - "karolsojko"
 
   - package-ecosystem: "npm"
     directory: "/packages/sncrypto-web"
     schedule:
       interval: "daily"
-    reviewers:
-      - "moughxyz"
-      - "karolsojko"
 
   - package-ecosystem: "npm"
     directory: "/packages/snjs"
     schedule:
       interval: "daily"
-    reviewers:
-      - "moughxyz"
-      - "karolsojko"
 
   - package-ecosystem: "npm"
     directory: "/packages/styles"
     schedule:
       interval: "daily"
-    reviewers:
-      - "moughxyz"
-      - "karolsojko"
 
   - package-ecosystem: "npm"
     directory: "/packages/toast"
     schedule:
       interval: "daily"
-    reviewers:
-      - "moughxyz"
-      - "karolsojko"
 
   - package-ecosystem: "npm"
     directory: "/packages/utils"
     schedule:
       interval: "daily"
-    reviewers:
-      - "moughxyz"
-      - "karolsojko"
 
   - package-ecosystem: "npm"
     directory: "/packages/web"
     schedule:
       interval: "daily"
-    reviewers:
-      - "moughxyz"
-      - "karolsojko"
-
-  - package-ecosystem: "bundler"
-    directory: "/packages/web-server"
-    schedule:
-      interval: "daily"
-    reviewers:
-      - "moughxyz"
-      - "karolsojko"
 
   - package-ecosystem: "github-actions"
     directory: "/"
     schedule:
       interval: "weekly"
-    reviewers:
-      - "moughxyz"
-      - "karolsojko"

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

@@ -24,7 +24,8 @@ jobs:
         with:
           registry-url: 'https://registry.npmjs.org'
           node-version-file: '.nvmrc'
-      - run: yarn install
+          cache: 'yarn'
+      - run: yarn install --immutable
       - run: yarn build:desktop
       - run: echo APP_VERSION=$(node -p "require('./package.json').version") >> $GITHUB_ENV
 
@@ -59,12 +60,13 @@ jobs:
         with:
           registry-url: 'https://registry.npmjs.org'
           node-version-file: '.nvmrc'
+          cache: 'yarn'
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
       - name: Install FPM
         run: sudo gem install fpm -f
 
-      - run: yarn install
+      - run: yarn install --immutable
       - run: yarn build:desktop
 
       - run: echo APP_VERSION=$(node -p "require('./package.json').version") >> $GITHUB_ENV
@@ -133,7 +135,8 @@ jobs:
         with:
           registry-url: 'https://registry.npmjs.org'
           node-version-file: '.nvmrc'
-      - run: yarn install
+          cache: 'yarn'
+      - run: yarn install --immutable
       - run: yarn build:desktop
       - run: yarn run webpack --config desktop.webpack.prod.js
       - run: echo APP_VERSION=$(node -p "require('./package.json').version") >> $GITHUB_ENV
@@ -162,8 +165,9 @@ jobs:
         with:
           registry-url: 'https://registry.npmjs.org'
           node-version-file: '.nvmrc'
+          cache: 'yarn'
 
-      - run: yarn install
+      - run: yarn install --immutable
 
       - uses: actions/download-artifact@v3
         with:

.github/workflows/desktop.windows.sign.yml

@@ -19,7 +19,8 @@ jobs:
         with:
           registry-url: 'https://registry.npmjs.org'
           node-version-file: '.nvmrc'
-      - run: yarn install
+          cache: 'yarn'
+      - run: yarn install --immutable
       - run: yarn build:desktop
       - run: yarn run webpack --config desktop.webpack.prod.js
       - run: echo APP_VERSION=$(node -p "require('./package.json').version") >> $GITHUB_ENV
@@ -47,6 +48,7 @@ jobs:
         with:
           registry-url: 'https://registry.npmjs.org'
           node-version-file: '.nvmrc'
+          cache: 'yarn'
       - uses: actions/download-artifact@v3
         with:
           name: assets

.github/workflows/docs.deploy.yml

@@ -18,7 +18,7 @@ jobs:
           cache: yarn
 
       - name: Install dependencies
-        run: yarn install
+        run: yarn install --immutable
 
       - name: Build
         run: yarn workspace @standardnotes/docs run build

.github/workflows/mobile.release.prod.yml

@@ -26,7 +26,7 @@ jobs:
           echo "${{ secrets.ANDROID_KEYSTORE }}" > keystore.keystore.asc
           gpg -d --passphrase "${{ secrets.KEYSTORE_PASSPHRASE }}" --batch keystore.keystore.asc > android/app/keystore.keystore
       - name: Install dependencies
-        run: yarn install
+        run: yarn install --immutable
       - run: yarn build:mobile
       - name: Ruby Setup for Fastlane
         uses: ruby/setup-ruby@v1
@@ -82,7 +82,7 @@ jobs:
         run:
           echo "PACKAGE_VERSION=$(grep '"version"' package.json | cut -d '"' -f 4 | cut -d "-" -f 1)" >> $GITHUB_ENV
       - name: Install dependencies
-        run: yarn install && yarn install:pods
+        run: yarn install --immutable && yarn install:pods
       - run: yarn build:mobile
       - name: Set ssh connection to Github
         uses: webfactory/[email protected]

.github/workflows/mobile.release.test.yml

@@ -28,7 +28,7 @@ jobs:
       - name: Ruby Setup for Fastlane
         uses: ruby/setup-ruby@v1
       - name: Install dependencies
-        run: yarn install
+        run: yarn install --immutable
       - run: yarn build:mobile
       - name: fastlane
         uses: maierj/[email protected]
@@ -73,7 +73,7 @@ jobs:
       - name: Ruby Setup for Fastlane
         uses: ruby/setup-ruby@v1
       - name: Install dependencies
-        run: yarn install && yarn install:pods
+        run: yarn install --immutable && yarn install:pods
       - run: yarn build:mobile
       - name: Set ssh connection to Github
         uses: webfactory/[email protected]

.github/workflows/pr.yml

@@ -14,8 +14,6 @@ jobs:
     steps:
       - name: Checkout code
         uses: actions/checkout@v3
-      - name: Set up Ruby
-        uses: ruby/setup-ruby@v1
       - name: Install dependencies
         run: yarn install --immutable
       - name: Build

.github/workflows/publish.yml

@@ -20,9 +20,7 @@ jobs:
         with:
           registry-url: 'https://registry.npmjs.org'
           node-version-file: '.nvmrc'
-
-      - name: Set up Ruby
-        uses: ruby/setup-ruby@v1
+          cache: 'yarn'
 
       - name: Setup git config
         run: |

.github/workflows/snjs.pr.yml

@@ -26,6 +26,8 @@ jobs:
         uses: actions/checkout@v3
       - name: Install dependencies
         run: yarn install --immutable
+      - name: Build
+        run: yarn build:snjs
       - name: Login to Docker Hub
         uses: docker/login-action@v2
         with:

.github/workflows/snjs.upgrade.event.yml

@@ -18,6 +18,7 @@ jobs:
         with:
           registry-url: 'https://registry.npmjs.org'
           node-version-file: '.nvmrc'
+          cache: 'yarn'
       - name: Setup git config
         run: |
           git config --global user.name "standardci"
@@ -44,4 +45,4 @@ jobs:
           commit-message: "${{ 'chore(deps): upgrade snjs' }}"
           delete-branch: true
           committer: standardci <[email protected]>
-          author: standardci <[email protected]>
+          author: standardci <[email protected]>

.github/workflows/web.release.prod.yml

@@ -1,4 +1,4 @@
-name: Web Server Deploy
+name: Web Deploy
 
 concurrency:
   group: prod_environment
@@ -7,9 +7,9 @@ concurrency:
 on:
   push:
     tags:
-      - '*standardnotes/*web-server*'
-      - '!*standardnotes/*web-server*beta*'
-      - '!*standardnotes/*web-server*alpha*'
+      - '*standardnotes/*web*'
+      - '!*standardnotes/*web*beta*'
+      - '!*standardnotes/*web*alpha*'
 
 jobs:
   test:
@@ -17,62 +17,42 @@ jobs:
     steps:
       - name: Checkout code
         uses: actions/checkout@v3
-      - name: Set up Ruby
-        uses: ruby/setup-ruby@v1
       - name: Install dependencies
-        run: yarn install
+        run: yarn install --immutable
       - name: Build
-        run: yarn build:web-server
+        run: yarn build:web
       - name: ESLint
         run: yarn lint
       - name: Test
         run: yarn test
-
   deploy:
-    runs-on: ubuntu-latest
-
     needs: test
 
+    runs-on: ubuntu-latest
+
     steps:
-    - uses: actions/checkout@v3
-
-    - name: Copy robots.txt
-      run: cp packages/web-server/public/robots.txt.production packages/web-server/public/robots.txt
-
-    - name: Publish to Registry
-      uses: elgohr/Publish-Docker-Github-Action@master
-      with:
-        name: standardnotes/web
-        username: ${{ secrets.DOCKER_USERNAME }}
-        password: ${{ secrets.DOCKER_PASSWORD }}
-        tags: "stable,${{ github.sha }}"
-
-    - name: Configure AWS credentials
-      uses: aws-actions/configure-aws-credentials@v1
-      with:
-        aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
-        aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-        aws-region: us-east-1
-
-    - name: Download task definition
-      run: |
-        aws ecs describe-task-definition --task-definition app-prod --query taskDefinition > task-definition.json
-
-    - name: Fill in the new image ID in the Amazon ECS task definition
-      id: task-def
-      uses: aws-actions/amazon-ecs-render-task-definition@v1
-      with:
-        task-definition: task-definition.json
-        container-name: app-prod
-        image: "standardnotes/web:${{ github.sha }}"
-
-    - name: Deploy Amazon ECS task definition
-      uses: aws-actions/amazon-ecs-deploy-task-definition@v1
-      with:
-        task-definition: ${{ steps.task-def.outputs.task-definition }}
-        service: app-prod
-        cluster: prod
-        wait-for-service-stability: true
+      - name: Checkout code
+        uses: actions/checkout@v3
+      - name: Install dependencies
+        run: yarn install --immutable
+      - name: Build
+        run: yarn build:web
+      - name: Configure AWS credentials
+        uses: aws-actions/configure-aws-credentials@v1
+        with:
+          aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
+          aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+          aws-region: us-east-1
+      - name: Deploy static site to S3 bucket
+        run: aws s3 sync packages/web/dist/ s3://app.standardnotes.com --delete
+      - name: Invalidate CloudFront Cache
+        uses: chetan/invalidate-cloudfront-action@master
+        env:
+          DISTRIBUTION: ${{ secrets.WEBAPP_CLOUDFRONT_DISTRIBUTION_ID }}
+          PATHS: '/*'
+          AWS_REGION: 'us-east-1'
+          AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
+          AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
 
   notify_discord:
     needs: deploy

.github/workflows/web.release.test.yml

@@ -1,83 +0,0 @@
-name: Web Server TestFlight
-
-concurrency:
-  group: dev_environment
-  cancel-in-progress: true
-
-on:
-  workflow_dispatch:
-
-jobs:
-  test:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v3
-      - name: Set up Ruby
-        uses: ruby/setup-ruby@v1
-      - name: Install dependencies
-        run: yarn install
-      - name: Build
-        run: yarn build:web-server
-      - name: ESLint
-        run: yarn lint
-      - name: Test
-        run: yarn test
-
-
-  deploy:
-    runs-on: ubuntu-latest
-
-    needs: test
-
-    steps:
-    - uses: actions/checkout@v3
-
-    - name: Copy robots.txt
-      run: cp packages/web-server/public/robots.txt.development packages/web-server/public/robots.txt
-
-    - name: Publish to Registry
-      uses: elgohr/Publish-Docker-Github-Action@master
-      with:
-        name: standardnotes/web
-        username: ${{ secrets.DOCKER_USERNAME }}
-        password: ${{ secrets.DOCKER_PASSWORD }}
-        tags: "latest,${{ github.sha }}"
-
-    - name: Configure AWS credentials
-      uses: aws-actions/configure-aws-credentials@v1
-      with:
-        aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
-        aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-        aws-region: us-east-1
-
-    - name: Download task definition
-      run: |
-        aws ecs describe-task-definition --task-definition app-dev --query taskDefinition > task-definition.json
-
-    - name: Fill in the new image ID in the Amazon ECS task definition
-      id: task-def
-      uses: aws-actions/amazon-ecs-render-task-definition@v1
-      with:
-        task-definition: task-definition.json
-        container-name: app-dev
-        image: "standardnotes/web:${{ github.sha }}"
-
-    - name: Deploy Amazon ECS task definition
-      uses: aws-actions/amazon-ecs-deploy-task-definition@v1
-      with:
-        task-definition: ${{ steps.task-def.outputs.task-definition }}
-        service: app-dev
-        cluster: dev
-        wait-for-service-stability: true
-
-  notify_discord:
-    needs: deploy
-
-    runs-on: ubuntu-latest
-
-    steps:
-    - name: Run Discord Webhook
-      uses: johnnyhuy/actions-discord-git-webhook@main
-      with:
-        webhook_url: ${{ secrets.DISCORD_WEBHOOK_URL }}

.github/workflows/webserver.pr.yml

@@ -1,20 +0,0 @@
-name: Web Server PR
-
-on:
-  pull_request:
-    branches:
-      - main
-    paths:
-      - 'packages/web-server/**'
-
-jobs:
-  TestDockerBuild:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-      - name: Set up Ruby
-        uses: ruby/setup-ruby@v1
-      - name: Copy default configuration
-        run: yarn workspace @standardnotes/web-server run sample:env
-      - name: Test build of the image
-        run: docker build -t standardnotes/web:test-build .

.yarn/versions/eee2d91d.yml

@@ -4,7 +4,6 @@ undecided:
   - "@standardnotes/mobile"
   - "@standardnotes/styles"
   - "@standardnotes/toast"
-  - "@standardnotes/web-server"
   - "@standardnotes/advanced-checklist"
   - "@standardnotes/markdown-visual"
   - "@standardnotes/autobiography-theme"

Dockerfile

@@ -1,35 +0,0 @@
-FROM ruby:2.7.4-alpine3.14
-
-ARG USERNAME=snjs
-ARG UID=1001
-ARG GID=$UID
-
-RUN apk add --update --no-cache \
-    alpine-sdk \
-    nodejs-current \
-    python3 \
-    git \
-    yarn \
-    tzdata
-
-RUN addgroup -S $USERNAME -g $GID && adduser -D -S $USERNAME -G $USERNAME -u $UID
-
-WORKDIR /app
-
-RUN chown -R $UID:$GID .
-
-USER $USERNAME
-
-COPY --chown=$UID:$GID . .
-
-RUN yarn install
-
-RUN gem install bundler
-
-RUN yarn build:web-server
-
-EXPOSE 3000
-
-ENTRYPOINT [ "./docker/entrypoint.sh" ]
-
-CMD [ "start" ]

docker-compose.yml

@@ -1,22 +0,0 @@
-version: '3.8'
-services:
-  app:
-    build: .
-    command: start-local
-    env_file: .env
-    restart: unless-stopped
-    ports:
-      - ${PORT}:3001
-    volumes:
-      - .:/app
-    networks:
-      standardnotes_proxy:
-        aliases:
-          - web
-      web: {}
-
-networks:
-  web:
-    name: web
-  standardnotes_proxy:
-    name: standardnotes

docker/entrypoint.sh

@@ -1,32 +0,0 @@
-#!/bin/sh
-set -e
-
-COMMAND=$1 && shift 1
-
-case "$COMMAND" in
-  'start' )
-    echo "Prestart Step 1/1 - Removing server lock"
-    rm -f /app/packages/web-server/tmp/pids/server.pid
-    echo "Starting Server..."
-    yarn start:server:web
-    ;;
-
-  'start-local' )
-    echo "Prestart Step 1/4 - Removing server lock"
-    rm -f /app/packages/web-server/tmp/pids/server.pid
-    echo "Prestart Step 2/4 - Cleaning assets"
-    yarn clean
-    echo "Prestart Step 3/4 - Installing dependencies"
-    yarn install
-    echo "Prestart Step 4/4 - Building"
-    yarn build
-    echo "Starting Server..."
-    yarn start:server:web
-    ;;
-
-   * )
-    echo "Unknown command"
-    ;;
-esac
-
-exec "$@"

package.json

@@ -19,18 +19,17 @@
     "node": ">=12.19.0 <17.0.0"
   },
   "scripts": {
-    "lint": "yarn workspaces foreach -pt --parallel --jobs 10 --verbose --exclude @standardnotes/components-meta run lint",
-    "test": "yarn workspaces foreach -pt --parallel --jobs 10 --verbose --exclude @standardnotes/components-meta run test",
+    "lint": "yarn workspaces foreach -t --verbose --exclude @standardnotes/components-meta run lint",
+    "test": "yarn workspaces foreach -pt --jobs 10 --verbose --exclude @standardnotes/components-meta run test",
     "clean": "lerna run clean",
-    "build:all": "yarn workspaces foreach -pt --verbose --exclude '{@standardnotes/components-meta,@standardnotes/docs}' run build",
+    "build:all": "yarn workspaces foreach -pt --verbose --exclude '{@standardnotes/docs}' run build",
     "build:components": "yarn workspaces foreach -pt --verbose --interlaced -R --from @standardnotes/components-meta run build",
     "build:web": "yarn workspaces foreach -pt --verbose -R --from @standardnotes/web --exclude @standardnotes/components-meta run build",
     "build:desktop": "yarn workspaces foreach -pt --verbose -R --from @standardnotes/desktop --exclude @standardnotes/components-meta run build",
     "build:mobile": "yarn workspaces foreach -pt --verbose -R --from @standardnotes/mobile --exclude @standardnotes/components-meta run build",
-    "build:web-server": "yarn workspaces foreach -pt --verbose -R --from @standardnotes/web-server --exclude @standardnotes/components-meta run build",
     "build:snjs": "yarn workspaces foreach -pt --verbose -R --from @standardnotes/snjs --exclude @standardnotes/components-meta run build",
-    "start:server:web": "lerna run start --scope=@standardnotes/web-server",
-    "start:server:web:localhost": "lerna run start:no-binding --scope=@standardnotes/web-server",
+    "build:services": "yarn workspaces foreach -pt --verbose -R --from @standardnotes/services --exclude @standardnotes/components-meta run build",
+    "start:server:web": "lerna run start --scope=@standardnotes/web",
     "start:server:e2e": "lerna run start:test-server --scope=@standardnotes/snjs",
     "prepare": "husky install",
     "reset": "find . -type dir -name node_modules | xargs rm -rf && rm -rf yarn.lock && yarn install",

packages/api/CHANGELOG.md

@@ -3,6 +3,18 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.4.9](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-23)
+
+**Note:** Version bump only for package @standardnotes/api
+
+## [1.4.8](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-23)
+
+**Note:** Version bump only for package @standardnotes/api
+
+## [1.4.7](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-05)
+
+**Note:** Version bump only for package @standardnotes/api
+
 ## [1.4.6](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-07-13)
 
 ### Bug Fixes

packages/api/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/api",
-  "version": "1.4.6",
+  "version": "1.4.9",
   "engines": {
     "node": ">=16.0.0 <17.0.0"
   },
@@ -22,7 +22,7 @@
     "prebuild": "yarn clean",
     "build": "tsc -p tsconfig.json",
     "lint": "eslint . --ext .ts",
-    "test:unit": "jest spec --coverage"
+    "test": "jest spec --coverage"
   },
   "devDependencies": {
     "@types/jest": "^28.1.5",

packages/components/CHANGELOG.md

@@ -3,6 +3,16 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.7.9](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-23)
+
+**Note:** Version bump only for package @standardnotes/components-meta
+
+## [2.7.8](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-22)
+
+### Bug Fixes
+
+* trigger the `onChange` event of qr code uploading input when clicking on the button ([#1421](https://github.com/standardnotes/app/issues/1421)) ([2a976a0](https://github.com/standardnotes/app/commit/2a976a0de499ba33186a52a6bd2c10a709b86fee))
+
 ## [2.7.7](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-07-14)
 
 ### Bug Fixes

packages/components/dist/zips/checksums.json

@@ -80,9 +80,9 @@
     "binary": "7c6f499b8107f80ec5fd84e591c2c33291d1fc6db85f098df4f8308a0cda901d"
   },
   "org.standardnotes.token-vault": {
-    "version": "2.2.3",
-    "base64": "bf5c3a2aae3f119043ee744ab5535de4705eeed67d5ecf9e1d7b95817f92bc19",
-    "binary": "8ef8a1eaf19d22b0ac279ad0c4d27b29c057b0f9b0d5c5f4cd6183eb506feaa3"
+    "version": "2.2.4",
+    "base64": "fb004e8cae73b351fdb225ef910102a1b7c9b616b92de52f99d2c82d7b4dd5a1",
+    "binary": "9b00f950c868e20e059a5fe7dbd0dd14eac5d94b31817b8bf3c58c88ab5ce236"
   },
   "org.standardnotes.standard-sheets": {
     "version": "1.5.1",
@@ -90,9 +90,9 @@
     "binary": "54a01414a21e46c67fa59c69189a3d34a6548de7539699f2cf0248f9c5059d37"
   },
   "org.standardnotes.advanced-checklist": {
-    "version": "0.2.3",
-    "base64": "2a2ce988902c9fdb7fe507c826bff13592adfe4fbe1c36e8468155730f507573",
-    "binary": "ae614e38946c480256157554d9af542deb0c9741630ad3242becce391991b994"
+    "version": "0.2.4",
+    "base64": "eaa8225677b18448cf6e8191cbf8a23c012590054d60434730cad20fd5b056f0",
+    "binary": "22db0aba7937234f8e0617a508a46de6a517c3e34be7deee87bc80533065f36c"
   },
   "org.standardnotes.file-safe": {
     "version": "2.0.16",

packages/components/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/components-meta",
-  "version": "2.7.7",
+  "version": "2.7.9",
   "private": true,
   "author": "Standard Notes.",
   "main": "dist",

packages/components/src/Packages/Editors/org.standardnotes.advanced-checklist/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.
 
+## [0.2.4](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-23)
+
+**Note:** Version bump only for package @standardnotes/advanced-checklist
+
 ## [0.2.3](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-07-13)
 
 ### Bug Fixes

packages/components/src/Packages/Editors/org.standardnotes.advanced-checklist/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/advanced-checklist",
-  "version": "0.2.3",
+  "version": "0.2.4",
   "description": "A task editor with grouping functionality.",
   "author": "Standard Notes.",
   "keywords": [

packages/components/src/Packages/Editors/org.standardnotes.token-vault/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.
 
+## [2.2.4](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-22)
+
+### Bug Fixes
+
+* trigger the `onChange` event of qr code uploading input when clicking on the button ([#1421](https://github.com/standardnotes/app/issues/1421)) ([2a976a0](https://github.com/standardnotes/app/commit/2a976a0de499ba33186a52a6bd2c10a709b86fee))
+
 ## [2.2.3](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-07-13)
 
 **Note:** Version bump only for package @standardnotes/authenticator

packages/components/src/Packages/Editors/org.standardnotes.token-vault/app/components/QRCodeReader.jsx

@@ -28,6 +28,12 @@ const convertToGrayScale = (imageData) => {
 }
 
 export default class QRCodeReader extends React.Component {
+  constructor() {
+    super()
+
+    this.fileInputRef = React.createRef(null)
+  }
+
   onImageSelected = (evt) => {
     const file = evt.target.files[0]
     const url = URL.createObjectURL(file)
@@ -70,9 +76,9 @@ export default class QRCodeReader extends React.Component {
   render() {
     return (
       <div className="qr-code-reader-container">
-        <div className="sk-button info">
+        <div className="sk-button info" onClick={() => this.fileInputRef.current.click()}>
           <div className="sk-label">Upload QR Code</div>
-          <input type="file" style={{ display: 'none' }} onChange={this.onImageSelected} />
+          <input type="file" style={{ display: 'none' }} ref={this.fileInputRef} onChange={this.onImageSelected} />
         </div>
       </div>
     )

packages/components/src/Packages/Editors/org.standardnotes.token-vault/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/authenticator",
-  "version": "2.2.3",
+  "version": "2.2.4",
   "main": "dist/dist.js",
   "author": "Standard Notes",
   "private": true,

packages/desktop/CHANGELOG.md

@@ -3,6 +3,92 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [3.23.102](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-24)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.23.101](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-23)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.23.100](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-23)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.23.99](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-22)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.23.98](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-18)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.23.97](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-17)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.23.96](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-17)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.23.95](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-17)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.23.94](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-16)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.23.93](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-15)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.23.92](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-11)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.23.91](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-10)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.23.90](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-09)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.23.89](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-08)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.23.88](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-08)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.23.87](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-06)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.23.86](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-05)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.23.85](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-03)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.23.84](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-03)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.23.83](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-01)
+
+### Bug Fixes
+
+* popover header getting hidden on desktop by titlebar ([#1359](https://github.com/standardnotes/app/issues/1359)) ([5b3cfdd](https://github.com/standardnotes/app/commit/5b3cfddc50aabb4d03761e7e46c3ab1d1bb2c952))
+
+## [3.23.82](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-07-27)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
 ## [3.23.81](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-07-26)
 
 **Note:** Version bump only for package @standardnotes/desktop

packages/desktop/app/javascripts/Renderer/Renderer.ts

@@ -122,6 +122,10 @@ async function configureWindow(remoteBridge: CrossProcessBridge) {
     /* Use custom title bar. Take the sn-titlebar-height off of
     the app content height so its not overflowing */
     sheet.insertRule('body { padding-top: var(--sn-desktop-titlebar-height); }', sheet.cssRules.length)
+    sheet.insertRule(
+      '[data-popover] { padding-top: calc(var(--sn-desktop-titlebar-height) + 0.5rem); }',
+      sheet.cssRules.length,
+    )
     sheet.insertRule(
       `.main-ui-view { height: calc(100vh - var(--sn-desktop-titlebar-height)) !important;
         min-height: calc(100vh - var(--sn-desktop-titlebar-height)) !important; }`,

packages/desktop/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@standardnotes/desktop",
   "main": "./app/dist/index.js",
-  "version": "3.23.81",
+  "version": "3.23.102",
   "license": "AGPL-3.0-or-later",
   "author": "Standard Notes.",
   "private": true,

packages/docs/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.
 
+# [0.2.0](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-17)
+
+### Features
+
+* **docs:** remove matomo in favour of plausible ([6d7bcd7](https://github.com/standardnotes/app/commit/6d7bcd7a8d2dfffb6dc69899406af57e41c071df))
+
 # [0.1.0](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-07-11)
 
 ### Features

packages/docs/README.md

@@ -44,7 +44,6 @@ docs
 │   ├── katex
 │   ├── .nojekyll
 │   ├── CNAME
-│   └── matomo.js
 ├── .gitignore
 ├── .prettierrc
 ├── docusaurus.config.js

packages/docs/docusaurus.config.js

@@ -156,8 +156,8 @@ module.exports = {
   ],
   scripts: [
     {
-      src: `/matomo.js`,
-      async: true,
+      src: 'https://plausible.standardnotes.com/js/plausible.js',
+      "data-domain": 'docs.standardnotes.com',
       defer: true,
     },
   ],

packages/docs/package.json

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

packages/docs/static/matomo.js

@@ -1,11 +0,0 @@
-var _paq = window._paq || [];
-/* tracker methods like "setCustomDimension" should be called before "trackPageView" */
-_paq.push(['trackPageView']);
-_paq.push(['enableLinkTracking']);
-(function() {
-  var u="//matomo.standardnotes.org/";
-  _paq.push(['setTrackerUrl', u+'matomo.php']);
-  _paq.push(['setSiteId', '7']);
-  var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
-  g.type='text/javascript'; g.async=true; g.defer=true; g.src=u+'matomo.js'; s.parentNode.insertBefore(g,s);
-})();

packages/encryption/CHANGELOG.md

@@ -3,6 +3,25 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.14.2](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-23)
+
+**Note:** Version bump only for package @standardnotes/encryption
+
+## [1.14.1](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-23)
+
+**Note:** Version bump only for package @standardnotes/encryption
+
+# [1.14.0](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-05)
+
+### Bug Fixes
+
+* **encryption:** remove compiled encrypted paramters from source ([73e3b38](https://github.com/standardnotes/app/commit/73e3b3813f21f3fe06e5af2cfa2953210bb1de76))
+
+### Features
+
+* **encryption:** refactor circular dependencies on services ([ffb2193](https://github.com/standardnotes/app/commit/ffb21939246eb81eba3230ff8c0d68e7a6cb2bcb))
+* **web:** extract ui-services package ([7e25126](https://github.com/standardnotes/app/commit/7e251262d770cfc9d791115b9c18b862c49e4e03))
+
 ## [1.13.5](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-07-13)
 
 ### Bug Fixes

packages/encryption/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/encryption",
-  "version": "1.13.5",
+  "version": "1.14.2",
   "engines": {
     "node": ">=16.0.0 <17.0.0"
   },
@@ -39,7 +39,6 @@
     "@standardnotes/common": "^1.23.1",
     "@standardnotes/models": "workspace:*",
     "@standardnotes/responses": "workspace:*",
-    "@standardnotes/services": "workspace:*",
     "@standardnotes/sncrypto-common": "workspace:*",
     "@standardnotes/utils": "workspace:*",
     "reflect-metadata": "^0.1.13"

packages/encryption/src/Domain/Backups/BackupFile.ts

@@ -1,9 +0,0 @@
-import { AnyKeyParamsContent, ProtocolVersion } from '@standardnotes/common'
-import { BackupFileDecryptedContextualPayload, BackupFileEncryptedContextualPayload } from '@standardnotes/models'
-
-export type BackupFile = {
-  version?: ProtocolVersion
-  keyParams?: AnyKeyParamsContent
-  auth_params?: AnyKeyParamsContent
-  items: (BackupFileDecryptedContextualPayload | BackupFileEncryptedContextualPayload)[]
-}

packages/encryption/src/Domain/Operator/OperatorWrapper.ts

@@ -1,4 +1,10 @@
-import * as Models from '@standardnotes/models'
+import {
+  DecryptedPayloadInterface,
+  ItemsKeyInterface,
+  RootKeyInterface,
+  ItemContent,
+  EncryptedPayloadInterface,
+} from '@standardnotes/models'
 import {
   DecryptedParameters,
   EncryptedParameters,
@@ -9,8 +15,8 @@ import { isAsyncOperator } from './Functions'
 import { OperatorManager } from './OperatorManager'
 
 export async function encryptPayload(
-  payload: Models.DecryptedPayloadInterface,
-  key: Models.ItemsKeyInterface | Models.RootKeyInterface,
+  payload: DecryptedPayloadInterface,
+  key: ItemsKeyInterface | RootKeyInterface,
   operatorManager: OperatorManager,
 ): Promise<EncryptedParameters> {
   const operator = operatorManager.operatorForVersion(key.keyVersion)
@@ -29,9 +35,9 @@ export async function encryptPayload(
   return encryptionParameters
 }
 
-export async function decryptPayload<C extends Models.ItemContent = Models.ItemContent>(
-  payload: Models.EncryptedPayloadInterface,
-  key: Models.ItemsKeyInterface | Models.RootKeyInterface,
+export async function decryptPayload<C extends ItemContent = ItemContent>(
+  payload: EncryptedPayloadInterface,
+  key: ItemsKeyInterface | RootKeyInterface,
   operatorManager: OperatorManager,
 ): Promise<DecryptedParameters<C> | ErrorDecryptingParameters> {
   const operator = operatorManager.operatorForVersion(payload.version)

packages/encryption/src/Domain/Service/Encryption/EncryptionProvider.ts

@@ -1,12 +1,12 @@
 import { ProtocolVersion } from '@standardnotes/common'
 import {
+  BackupFile,
   DecryptedPayloadInterface,
   EncryptedPayloadInterface,
   ItemContent,
   RootKeyInterface,
 } from '@standardnotes/models'
 import { ClientDisplayableError } from '@standardnotes/responses'
-import { BackupFile } from '../../Backups/BackupFile'
 import { SNRootKeyParams } from '../../Keys/RootKey/RootKeyParams'
 import { KeyedDecryptionSplit } from '../../Split/KeyedDecryptionSplit'
 import { KeyedEncryptionSplit } from '../../Split/KeyedEncryptionSplit'

packages/encryption/src/Domain/Service/RootKey/RootKeyServiceEvent.ts

@@ -0,0 +1,3 @@
+export enum RootKeyServiceEvent {
+  RootKeyStatusChanged = 'RootKeyStatusChanged',
+}

packages/encryption/src/Domain/index.ts

@@ -1,6 +1,4 @@
 export * from './Algorithm'
-export * from './Backups/BackupFile'
-export * from './Backups/BackupFileDecryptor'
 export * from './Backups/BackupFileType'
 export * from './Keys/ItemsKey/ItemsKey'
 export * from './Keys/ItemsKey/ItemsKeyMutator'
@@ -11,7 +9,6 @@ export * from './Keys/RootKey/ProtocolVersionForKeyParams'
 export * from './Keys/RootKey/RootKey'
 export * from './Keys/RootKey/RootKeyParams'
 export * from './Keys/RootKey/ValidKeyParamsKeys'
-export * from './Keys/Utils/DecryptItemsKey'
 export * from './Keys/Utils/KeyRecoveryStrings'
 export * from './Operator/001/Operator001'
 export * from './Operator/002/Operator002'
@@ -22,11 +19,9 @@ export * from './Operator/Operator'
 export * from './Operator/OperatorManager'
 export * from './Operator/OperatorWrapper'
 export * from './Service/Encryption/EncryptionProvider'
-export * from './Service/Encryption/EncryptionService'
 export * from './Service/Functions'
-export * from './Service/Items/ItemsEncryption'
 export * from './Service/RootKey/KeyMode'
-export * from './Service/RootKey/RootKeyEncryption'
+export * from './Service/RootKey/RootKeyServiceEvent'
 export * from './Split/AbstractKeySplit'
 export * from './Split/EncryptionSplit'
 export * from './Split/EncryptionTypeSplit'

packages/features/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.
 
+## [1.50.5](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-23)
+
+**Note:** Version bump only for package @standardnotes/features
+
 ## [1.50.4](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-07-13)
 
 **Note:** Version bump only for package @standardnotes/features

packages/features/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/features",
-  "version": "1.50.4",
+  "version": "1.50.5",
   "engines": {
     "node": ">=16.0.0 <17.0.0"
   },
@@ -22,7 +22,7 @@
     "prebuild": "yarn clean",
     "build": "tsc -p tsconfig.json",
     "lint": "eslint . --ext .ts",
-    "test:unit": "jest"
+    "test": "jest"
   },
   "dependencies": {
     "@standardnotes/auth": "^3.19.4",

packages/filepicker/CHANGELOG.md

@@ -3,6 +3,24 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.22.2](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-23)
+
+**Note:** Version bump only for package @standardnotes/filepicker
+
+## [1.22.1](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-23)
+
+**Note:** Version bump only for package @standardnotes/filepicker
+
+# [1.22.0](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-05)
+
+### Bug Fixes
+
+* **files:** filepicker circular dependency ([183f68c](https://github.com/standardnotes/app/commit/183f68c9c1005567ec50bd1a66ca34f775e393dc))
+
+### Features
+
+* **encryption:** refactor circular dependencies on services ([ffb2193](https://github.com/standardnotes/app/commit/ffb21939246eb81eba3230ff8c0d68e7a6cb2bcb))
+
 ## [1.21.6](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-07-13)
 
 ### Bug Fixes

packages/filepicker/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/filepicker",
-  "version": "1.21.6",
+  "version": "1.22.2",
   "engines": {
     "node": ">=16.0.0 <17.0.0"
   },
@@ -20,7 +20,7 @@
     "prebuild": "yarn clean",
     "build": "tsc -p tsconfig.json",
     "lint": "eslint . --ext .ts",
-    "test:unit": "jest"
+    "test": "jest"
   },
   "devDependencies": {
     "@types/jest": "^28.1.5",
@@ -32,7 +32,7 @@
   },
   "dependencies": {
     "@standardnotes/common": "^1.23.1",
-    "@standardnotes/services": "workspace:*",
+    "@standardnotes/files": "workspace:*",
     "@standardnotes/utils": "workspace:*",
     "@types/wicg-file-system-access": "^2020.9.5",
     "reflect-metadata": "^0.1.13"

packages/filepicker/src/Classic/ClassicReader.ts

@@ -1,5 +1,5 @@
-import { ByteChunker } from './../Chunker/ByteChunker'
-import { OnChunkCallback, FileSelectionResponse } from '../types'
+import { ByteChunker, OnChunkCallback } from '@standardnotes/files'
+import { FileSelectionResponse } from '../types'
 import { readFile as utilsReadFile } from '../utils'
 import { FileReaderInterface } from '../Interface/FileReader'
 

packages/filepicker/src/Interface/FileReader.ts

@@ -1,4 +1,6 @@
-import { OnChunkCallback, FileSelectionResponse } from '../types'
+import { OnChunkCallback } from '@standardnotes/files'
+
+import { FileSelectionResponse } from '../types'
 
 export interface FileReaderInterface {
   selectFiles(): Promise<File[]>

packages/filepicker/src/Streaming/StreamingApi.ts

@@ -5,7 +5,7 @@ import {
   FileHandleRead,
   FileSystemNoSelection,
   FileSystemResult,
-} from '@standardnotes/services'
+} from '@standardnotes/files'
 
 interface WebDirectoryHandle extends DirectoryHandle {
   nativeHandle: FileSystemDirectoryHandle

packages/filepicker/src/Streaming/StreamingReader.ts

@@ -1,6 +1,7 @@
+import { ByteChunker, OnChunkCallback } from '@standardnotes/files'
+
 import { FileReaderInterface } from './../Interface/FileReader'
-import { ByteChunker } from '../Chunker/ByteChunker'
-import { OnChunkCallback, FileSelectionResponse } from '../types'
+import { FileSelectionResponse } from '../types'
 
 interface StreamingFileReaderInterface {
   getFilesFromHandles(handles: FileSystemFileHandle[]): Promise<File[]>

packages/filepicker/src/TypedBytes.ts

@@ -1,7 +0,0 @@
-export type EncryptedBytes = {
-  encryptedBytes: Uint8Array
-}
-
-export type DecryptedBytes = {
-  decryptedBytes: Uint8Array
-}

packages/filepicker/src/index.ts

@@ -5,7 +5,3 @@ export * from './Streaming/StreamingReader'
 export * from './Streaming/StreamingSaver'
 export * from './Streaming/StreamingApi'
 export * from './utils'
-export * from './Chunker/ByteChunker'
-export * from './Chunker/OrderedByteChunker'
-export * from './Cache/FileMemoryCache'
-export * from './TypedBytes'

packages/filepicker/src/types.ts

@@ -1,5 +1,3 @@
-export type OnChunkCallback = (chunk: Uint8Array, index: number, isLast: boolean) => Promise<void>
-
 export type FileSelectionResponse = {
   name: string
   mimeType: string

packages/files/CHANGELOG.md

@@ -3,6 +3,25 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.9.2](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-23)
+
+**Note:** Version bump only for package @standardnotes/files
+
+## [1.9.1](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-23)
+
+**Note:** Version bump only for package @standardnotes/files
+
+# [1.9.0](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-05)
+
+### Bug Fixes
+
+* **files:** filepicker circular dependency ([183f68c](https://github.com/standardnotes/app/commit/183f68c9c1005567ec50bd1a66ca34f775e393dc))
+
+### Features
+
+* **encryption:** refactor circular dependencies on services ([ffb2193](https://github.com/standardnotes/app/commit/ffb21939246eb81eba3230ff8c0d68e7a6cb2bcb))
+* **files:** refactor circular deps ([696b82b](https://github.com/standardnotes/app/commit/696b82b9d392e146db5894462aeb56d91ac2a92c))
+
 ## [1.8.7](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-07-13)
 
 ### Bug Fixes

packages/files/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/files",
-  "version": "1.8.7",
+  "version": "1.9.2",
   "engines": {
     "node": ">=16.0.0 <17.0.0"
   },
@@ -20,7 +20,7 @@
     "prebuild": "yarn clean",
     "build": "tsc -p tsconfig.json",
     "lint": "eslint . --ext .ts",
-    "test:unit": "jest"
+    "test": "jest"
   },
   "devDependencies": {
     "@types/jest": "^28.1.5",
@@ -32,10 +32,8 @@
   "dependencies": {
     "@standardnotes/common": "^1.23.1",
     "@standardnotes/encryption": "workspace:*",
-    "@standardnotes/filepicker": "workspace:*",
     "@standardnotes/models": "workspace:*",
     "@standardnotes/responses": "workspace:*",
-    "@standardnotes/services": "workspace:*",
     "@standardnotes/sncrypto-common": "workspace:*",
     "@standardnotes/utils": "workspace:*",
     "reflect-metadata": "^0.1.13"

packages/files/src/Domain/Api/DirectoryHandle.ts

@@ -0,0 +1,3 @@
+export interface DirectoryHandle {
+  nativeHandle: unknown
+}

packages/files/src/Domain/Api/FileHandleRead.ts

@@ -0,0 +1,3 @@
+export interface FileHandleRead {
+  nativeHandle: unknown
+}

packages/files/src/Domain/Api/FileHandleReadWrite.ts

@@ -0,0 +1,4 @@
+export interface FileHandleReadWrite {
+  nativeHandle: unknown
+  writableStream: unknown
+}

packages/files/src/Domain/Api/FileSystemApi.ts

@@ -1,16 +1,8 @@
-export interface DirectoryHandle {
-  nativeHandle: unknown
-}
-export interface FileHandleReadWrite {
-  nativeHandle: unknown
-  writableStream: unknown
-}
-export interface FileHandleRead {
-  nativeHandle: unknown
-}
-
-export type FileSystemResult = 'aborted' | 'success' | 'failed'
-export type FileSystemNoSelection = 'aborted' | 'failed'
+import { DirectoryHandle } from './DirectoryHandle'
+import { FileHandleRead } from './FileHandleRead'
+import { FileHandleReadWrite } from './FileHandleReadWrite'
+import { FileSystemNoSelection } from './FileSystemNoSelection'
+import { FileSystemResult } from './FileSystemResult'
 
 export interface FileSystemApi {
   selectDirectory(): Promise<DirectoryHandle | FileSystemNoSelection>

packages/files/src/Domain/Api/FileSystemNoSelection.ts

@@ -0,0 +1 @@
+export type FileSystemNoSelection = 'aborted' | 'failed'

packages/files/src/Domain/Api/FileSystemResult.ts

@@ -0,0 +1 @@
+export type FileSystemResult = 'aborted' | 'success' | 'failed'

packages/files/src/Domain/Cache/FileMemoryCache.spec.ts

@@ -1,4 +1,4 @@
-import { EncryptedBytes } from './../TypedBytes'
+import { EncryptedBytes } from '../Types/EncryptedBytes'
 import { FileMemoryCache } from './FileMemoryCache'
 
 describe('file memory cache', () => {

packages/files/src/Domain/Cache/FileMemoryCache.ts

@@ -1,6 +1,7 @@
 import { removeFromArray } from '@standardnotes/utils'
 import { Uuid } from '@standardnotes/common'
-import { EncryptedBytes } from '../TypedBytes'
+
+import { EncryptedBytes } from '../Types/EncryptedBytes'
 
 export class FileMemoryCache {
   private cache: Record<Uuid, EncryptedBytes> = {}

packages/files/src/Domain/Chunker/ByteChunker.ts

@@ -1,4 +1,4 @@
-import { OnChunkCallback } from '../types'
+import { OnChunkCallback } from './OnChunkCallback'
 
 export class ByteChunker {
   public loggingEnabled = false

packages/files/src/Domain/Chunker/OnChunkCallback.ts

@@ -0,0 +1 @@
+export type OnChunkCallback = (chunk: Uint8Array, index: number, isLast: boolean) => Promise<void>

packages/files/src/Domain/Device/FileBackupMetadataFile.ts

@@ -0,0 +1,8 @@
+import { BackupFileEncryptedContextualPayload } from '@standardnotes/models'
+
+export interface FileBackupMetadataFile {
+  info: Record<string, string>
+  file: BackupFileEncryptedContextualPayload
+  itemsKey: BackupFileEncryptedContextualPayload
+  version: '1.0.0'
+}

packages/files/src/Domain/Device/FileBackupsConstantsV1.ts

@@ -0,0 +1,5 @@
+export const FileBackupsConstantsV1 = {
+  Version: '1.0.0',
+  MetadataFileName: 'metadata.sn.json',
+  BinaryFileName: 'file.encrypted',
+}

packages/files/src/Domain/Device/FileBackupsDevice.ts

@@ -0,0 +1,21 @@
+import { Uuid } from '@standardnotes/common'
+import { FileBackupsMapping } from './FileBackupsMapping'
+
+export interface FileBackupsDevice {
+  getFilesBackupsMappingFile(): Promise<FileBackupsMapping>
+  saveFilesBackupsFile(
+    uuid: Uuid,
+    metaFile: string,
+    downloadRequest: {
+      chunkSizes: number[]
+      valetToken: string
+      url: string
+    },
+  ): Promise<'success' | 'failed'>
+  isFilesBackupsEnabled(): Promise<boolean>
+  enableFilesBackups(): Promise<void>
+  disableFilesBackups(): Promise<void>
+  changeFilesBackupsLocation(): Promise<string | undefined>
+  getFilesBackupsLocation(): Promise<string>
+  openFilesBackupsLocation(): Promise<void>
+}

packages/files/src/Domain/Device/FileBackupsMapping.ts

@@ -0,0 +1,17 @@
+import { Uuid } from '@standardnotes/common'
+import { FileBackupsConstantsV1 } from './FileBackupsConstantsV1'
+
+export interface FileBackupsMapping {
+  version: typeof FileBackupsConstantsV1.Version
+  files: Record<
+    Uuid,
+    {
+      backedUpOn: Date
+      absolutePath: string
+      relativePath: string
+      metadataFileName: typeof FileBackupsConstantsV1.MetadataFileName
+      binaryFileName: typeof FileBackupsConstantsV1.BinaryFileName
+      version: typeof FileBackupsConstantsV1.Version
+    }
+  >
+}

packages/files/src/Domain/Operations/DownloadAndDecrypt.spec.ts

@@ -1,9 +1,9 @@
 import { sleep } from '@standardnotes/utils'
 import { PureCryptoInterface, StreamEncryptor } from '@standardnotes/sncrypto-common'
 import { FileDownloadProgress } from '../Types/FileDownloadProgress'
-import { FilesApiInterface } from '@standardnotes/services'
 import { DownloadAndDecryptFileOperation } from './DownloadAndDecrypt'
 import { FileContent } from '@standardnotes/models'
+import { FilesApiInterface } from '../Api/FilesApiInterface'
 
 describe('download and decrypt', () => {
   let apiService: FilesApiInterface

packages/files/src/Domain/Operations/DownloadAndDecrypt.ts

@@ -2,10 +2,11 @@ import { ClientDisplayableError } from '@standardnotes/responses'
 import { AbortFunction, FileDownloader } from '../UseCase/FileDownloader'
 import { FileDecryptor } from '../UseCase/FileDecryptor'
 import { FileDownloadProgress } from '../Types/FileDownloadProgress'
-import { FilesApiInterface } from '@standardnotes/services'
 import { PureCryptoInterface } from '@standardnotes/sncrypto-common'
 import { FileContent } from '@standardnotes/models'
-import { DecryptedBytes, EncryptedBytes } from '@standardnotes/filepicker'
+import { FilesApiInterface } from '../Api/FilesApiInterface'
+import { DecryptedBytes } from '../Types/DecryptedBytes'
+import { EncryptedBytes } from '../Types/EncryptedBytes'
 
 export type DownloadAndDecryptResult = { success: boolean; error?: ClientDisplayableError; aborted?: boolean }
 

packages/files/src/Domain/Operations/EncryptAndUpload.spec.ts

@@ -1,8 +1,9 @@
 import { EncryptAndUploadFileOperation } from './EncryptAndUpload'
 import { PureCryptoInterface, StreamEncryptor } from '@standardnotes/sncrypto-common'
-import { FilesApiInterface } from '@standardnotes/services'
 import { FileContent } from '@standardnotes/models'
 
+import { FilesApiInterface } from '../Api/FilesApiInterface'
+
 describe('encrypt and upload', () => {
   let apiService: FilesApiInterface
   let operation: EncryptAndUploadFileOperation

packages/files/src/Domain/Operations/EncryptAndUpload.ts

@@ -1,10 +1,10 @@
 import { FileUploadProgress } from '../Types/FileUploadProgress'
 import { FileUploadResult } from '../Types/FileUploadResult'
-import { FilesApiInterface } from '@standardnotes/services'
 import { FileUploader } from '../UseCase/FileUploader'
 import { PureCryptoInterface } from '@standardnotes/sncrypto-common'
 import { FileEncryptor } from '../UseCase/FileEncryptor'
 import { FileContent } from '@standardnotes/models'
+import { FilesApiInterface } from '../Api/FilesApiInterface'
 
 export class EncryptAndUploadFileOperation {
   public readonly encryptedChunkSizes: number[] = []

packages/files/src/Domain/Service/FilesClientInterface.ts

@@ -2,7 +2,10 @@ import { EncryptAndUploadFileOperation } from '../Operations/EncryptAndUpload'
 import { FileItem, FileMetadata } from '@standardnotes/models'
 import { ClientDisplayableError } from '@standardnotes/responses'
 import { FileDownloadProgress } from '../Types/FileDownloadProgress'
-import { FileSystemApi, FileBackupMetadataFile, FileHandleRead, FileSystemNoSelection } from '@standardnotes/services'
+import { FileSystemApi } from '../Api/FileSystemApi'
+import { FileHandleRead } from '../Api/FileHandleRead'
+import { FileSystemNoSelection } from '../Api/FileSystemNoSelection'
+import { FileBackupMetadataFile } from '../Device/FileBackupMetadataFile'
 
 export interface FilesClientInterface {
   beginNewFileUpload(sizeInBytes: number): Promise<EncryptAndUploadFileOperation | ClientDisplayableError>

packages/files/src/Domain/Service/ReadAndDecryptBackupFile.ts

@@ -1,8 +1,9 @@
 import { FileContent } from '@standardnotes/models'
-import { FileSystemApi, FileHandleRead } from '@standardnotes/services'
 import { PureCryptoInterface } from '@standardnotes/sncrypto-common'
-import { OrderedByteChunker } from '@standardnotes/filepicker'
 import { FileDecryptor } from '../UseCase/FileDecryptor'
+import { FileSystemApi } from '../Api/FileSystemApi'
+import { FileHandleRead } from '../Api/FileHandleRead'
+import { OrderedByteChunker } from '../Chunker/OrderedByteChunker'
 
 export async function readAndDecryptBackupFile(
   fileHandle: FileHandleRead,

packages/files/src/Domain/Types/DecryptedBytes.ts

@@ -0,0 +1,3 @@
+export type DecryptedBytes = {
+  decryptedBytes: Uint8Array
+}

packages/files/src/Domain/Types/EncryptedBytes.ts

@@ -0,0 +1,3 @@
+export type EncryptedBytes = {
+  encryptedBytes: Uint8Array
+}

packages/files/src/Domain/UseCase/FileDownloader.spec.ts

@@ -1,5 +1,5 @@
 import { FileContent } from '@standardnotes/models'
-import { FilesApiInterface } from '@standardnotes/services'
+import { FilesApiInterface } from '../Api/FilesApiInterface'
 import { FileDownloader } from './FileDownloader'
 
 describe('file downloader', () => {

packages/files/src/Domain/UseCase/FileDownloader.ts

@@ -1,8 +1,8 @@
 import { ClientDisplayableError } from '@standardnotes/responses'
 import { FileDownloadProgress } from '../Types/FileDownloadProgress'
-import { FilesApiInterface } from '@standardnotes/services'
 import { Deferred } from '@standardnotes/utils'
 import { FileContent } from '@standardnotes/models'
+import { FilesApiInterface } from '../Api/FilesApiInterface'
 
 export type AbortSignal = 'aborted'
 export type AbortFunction = () => void

packages/files/src/Domain/UseCase/FileUploader.spec.ts

@@ -1,4 +1,4 @@
-import { FilesApiInterface } from '@standardnotes/services'
+import { FilesApiInterface } from '../Api/FilesApiInterface'
 import { FileUploader } from './FileUploader'
 
 describe('file uploader', () => {

packages/files/src/Domain/UseCase/FileUploader.ts

@@ -1,4 +1,4 @@
-import { FilesApiInterface } from '@standardnotes/services'
+import { FilesApiInterface } from '../Api/FilesApiInterface'
 
 export class FileUploader {
   constructor(private apiService: FilesApiInterface) {}

packages/files/src/Domain/index.ts

@@ -1,12 +1,28 @@
-export * from './Service/FileService'
+export * from './Api/DirectoryHandle'
+export * from './Api/FileHandleRead'
+export * from './Api/FileHandleReadWrite'
+export * from './Api/FileSystemApi'
+export * from './Api/FileSystemNoSelection'
+export * from './Api/FileSystemResult'
+export * from './Api/FilesApiInterface'
+export * from './Cache/FileMemoryCache'
+export * from './Chunker/ByteChunker'
+export * from './Chunker/OnChunkCallback'
+export * from './Chunker/OrderedByteChunker'
+export * from './Device/FileBackupMetadataFile'
+export * from './Device/FileBackupsConstantsV1'
+export * from './Device/FileBackupsDevice'
+export * from './Device/FileBackupsMapping'
 export * from './Service/FilesClientInterface'
+export * from './Service/ReadAndDecryptBackupFile'
 export * from './Operations/DownloadAndDecrypt'
 export * from './Operations/EncryptAndUpload'
 export * from './UseCase/FileDecryptor'
 export * from './UseCase/FileUploader'
 export * from './UseCase/FileEncryptor'
 export * from './UseCase/FileDownloader'
+export * from './Types/DecryptedBytes'
+export * from './Types/EncryptedBytes'
 export * from './Types/FileDownloadProgress'
 export * from './Types/FileUploadProgress'
 export * from './Types/FileUploadResult'
-export * from './Backups/BackupService'

packages/mobile/.eslintignore

@@ -0,0 +1,3 @@
+metro.config.js
+packages/mobile/html/Web.bundle/src/components
+packages/mobile/html/Web.bundle/src/web-src

packages/mobile/.eslintrc

@@ -10,6 +10,5 @@
     "@typescript-eslint/no-var-requires": "off",
     "eqeqeq": ["off"],
     "no-void": ["off"]
-  },
-  "ignorePatterns": ["metro.config.js"]
+  }
 }