Merge branch 'release/@standardnotes/app-monorepo@0.0.2'

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

@@ -150,6 +150,7 @@ jobs:
       - uses: actions/setup-node@v2
         with:
           registry-url: 'https://registry.npmjs.org'
+
       - uses: actions/download-artifact@v3
         with:
           name: assets

.github/workflows/version-bump.yml

@@ -32,23 +32,6 @@ jobs:
       - name: Install Dependencies
         run: yarn install
 
-      - name: Get Changed Components Files
-        id: changed-component-files
-        uses: tj-actions/changed-files@v23
-        with:
-          files: packages/components/**
-
-      - name: Compile Components
-        if: steps.changed-component-files.outputs.any_changed == 'true'
-        run: yarn components:clean && yarn components:compile
-        working-directory: packages/components
-      - name: Package and Commit Components
-        if: steps.changed-component-files.outputs.any_changed == 'true'
-        run: |
-          node packages/components/scripts/package.mjs
-          git add .
-          (git commit -m 'chore(release): components') || true
-
       - name: Bump Prod Version Graduate
         continue-on-error: true
         id: graduateRelease

packages/components/CHANGELOG.md

@@ -3,7 +3,11 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
-## 2.1.3 (2022-06-17)
+## [2.1.3-alpha.1](https://github.com/standardnotes/app/compare/@standardnotes/components-meta@2.1.3-alpha.0...@standardnotes/components-meta@2.1.3-alpha.1) (2022-06-17)
+
+**Note:** Version bump only for package @standardnotes/components-meta
+
+## [2.1.3-alpha.0](https://github.com/standardnotes/app/compare/@standardnotes/components-meta@2.1.2...@standardnotes/components-meta@2.1.3-alpha.0) (2022-06-17)
 
 **Note:** Version bump only for package @standardnotes/components-meta
 

packages/components/dist/zips/checksums.json

@@ -66,8 +66,8 @@
   },
   "org.standardnotes.fancy-markdown-editor": {
     "version": "1.3.9",
-    "base64": "fb48346eb2318fbdd6b3b4cb6131493b62f8249d7b226f30d8a13fbc57f05ca4",
-    "binary": "38583962f0c67eaeb565de9ad369b72fe326dbe711ffe8607c96e7e706feb0e9"
+    "base64": "ac09dd57a3aa47e73b1065c480b05a1473d73a3066d0a0208032eaf43b7dd668",
+    "binary": "553f180a97076b947210105841a83bab7ec856220c0d4f737e2eb467d1634fa7"
   },
   "org.standardnotes.markdown-visual-editor": {
     "version": "1.0.10",

packages/components/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/components-meta",
-  "version": "2.1.3",
+  "version": "2.1.3-alpha.1",
   "private": true,
   "author": "Standard Notes",
   "main": "dist",
@@ -15,7 +15,8 @@
     "components:lint": "yarn workspaces foreach --parallel --jobs 10 --verbose --exclude @standardnotes/components-meta run components:lint",
     "components:test": "yarn workspaces foreach --parallel --jobs 10 --verbose --exclude @standardnotes/components-meta run components:test",
     "components:compile": "yarn workspaces foreach --parallel --jobs 10 --verbose --exclude @standardnotes/components-meta run components:compile",
-    "package": "node scripts/package.mjs"
+    "package": "node scripts/package.mjs",
+    "version": "./scripts/VERSION.sh"
   },
   "devDependencies": {
     "@standardnotes/deterministic-zip": "^1.2.0",

packages/components/scripts/VERSION.sh

@@ -0,0 +1,11 @@
+#!/bin/bash
+
+echo 'Compiling components from' $(pwd)
+
+yarn components:clean && yarn components:compile
+
+echo "Packaging component assets and zips..."
+
+node scripts/package.mjs
+git add dist
+(git commit -m 'chore(release): components') || true

packages/desktop/CHANGELOG.md

@@ -3,7 +3,11 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
-## [3.22.7](https://github.com/standardnotes/app/compare/@standardnotes/desktop@3.22.6...@standardnotes/desktop@3.22.7) (2022-06-17)
+## [3.22.7-alpha.1](https://github.com/standardnotes/app/compare/@standardnotes/desktop@3.22.7-alpha.0...@standardnotes/desktop@3.22.7-alpha.1) (2022-06-17)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.22.7-alpha.0](https://github.com/standardnotes/app/compare/@standardnotes/desktop@3.22.6...@standardnotes/desktop@3.22.7-alpha.0) (2022-06-17)
 
 **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.22.7",
+  "version": "3.22.7-alpha.1",
   "license": "AGPL-3.0-or-later",
   "author": "Standard Notes",
   "private": true,

packages/desktop/scripts/sums.mjs

@@ -6,14 +6,9 @@ import { fileURLToPath } from 'url'
 const __filename = fileURLToPath(import.meta.url)
 const ScriptsDir = path.dirname(__filename)
 
-import { doesFileExist } from '../../../scripts/ScriptUtils.mjs'
+import { doesFileExist, listDirFiles } from '../../../scripts/ScriptUtils.mjs'
 
 function sha256(filePath) {
-  if (!doesFileExist(filePath)) {
-    console.log('Attempting to hash non-existing file', filePath)
-    return null
-  }
-
   return new Promise((resolve) => {
     try {
       fs.createReadStream(filePath)
@@ -31,43 +26,6 @@ function sha256(filePath) {
   })
 }
 
-async function getFileNames() {
-  const packageJson = await fs.promises.readFile(path.join(ScriptsDir, '../package.json'))
-  const version = JSON.parse(packageJson).version
-  return [
-    `standard-notes-${version}-mac-x64.zip`,
-    `standard-notes-${version}-mac-x64.dmg`,
-    `standard-notes-${version}-mac-x64.dmg.blockmap`,
-
-    `standard-notes-${version}-mac-arm64.zip`,
-    `standard-notes-${version}-mac-arm64.dmg`,
-    `standard-notes-${version}-mac-arm64.dmg.blockmap`,
-
-    `standard-notes-${version}-linux-i386.AppImage`,
-    `standard-notes-${version}-linux-x86_64.AppImage`,
-    `standard-notes-${version}-linux-amd64.snap`,
-
-    `standard-notes-${version}-linux-arm64.deb`,
-    `standard-notes-${version}-linux-arm64.AppImage`,
-
-    `standard-notes-${version}-win-x64.exe`,
-    `standard-notes-${version}-win-x64.exe.blockmap`,
-
-    `standard-notes-${version}-win.exe`,
-    `standard-notes-${version}-win.exe.blockmap`,
-
-    `standard-notes-${version}-win-ia32.exe`,
-    `standard-notes-${version}-win-ia32.exe.blockmap`,
-
-    'latest-linux-ia32.yml',
-    'latest-linux.yml',
-    'latest-linux-arm64.yml',
-    'latest-mac.yml',
-    'latest.yml',
-    'builder-effective-config.yaml',
-  ]
-}
-
 process.on('uncaughtException', function (err) {
   console.log('Caught exception: ' + err)
 })
@@ -75,26 +33,37 @@ process.on('uncaughtException', function (err) {
   console.log('Writing SHA256 sums to dist/SHA256SUMS')
 
   try {
-    const files = await getFileNames()
+    const distDir = path.join(ScriptsDir, '../dist')
+    const fileNames = listDirFiles(distDir)
+    const filePaths = fileNames.map((fileName) => path.join(distDir, fileName))
 
-    let hashes = await Promise.all(
-      files.map(async (fileName) => {
-        const filePath = path.join(ScriptsDir, `../dist/${fileName}`)
-        try {
-          const hash = await sha256(filePath)
-          const entry = `${hash}  ${fileName}`
-          return entry
-        } catch (error) {
-          console.error('Unable to hash file', filePath)
-          return null
-        }
-      }),
-    )
+    const entries = []
 
-    hashes = hashes.join('\n')
+    for (const filePath of filePaths) {
+      if (!doesFileExist(filePath)) {
+        console.log('Attempting to hash non-existing file', filePath)
+        continue
+      }
+      if (fs.lstatSync(filePath).isDirectory()) {
+        console.log('Attempting to hash directory', filePath)
+        continue
+      }
+
+      try {
+        const hash = await sha256(filePath)
+        const fileName = path.basename(filePath)
+        const entry = `${hash}  ${fileName}`
+        entries.push(entry)
+      } catch (error) {
+        console.error('Unable to hash file', filePath)
+        continue
+      }
+    }
+
+    const hashes = entries.join('\n')
     await fs.promises.writeFile(path.join(ScriptsDir, '../dist/SHA256SUMS'), hashes)
     console.log(`Successfully wrote SHA256SUMS:\n${hashes}`)
   } catch (err) {
-    console.error(err)
+    console.error('Error generating checksums', err)
   }
 })()

packages/mobile/CHANGELOG.md

@@ -3,7 +3,11 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
-## 3.23.4 (2022-06-17)
+## [3.23.4-alpha.1](https://github.com/standardnotes/app/compare/@standardnotes/mobile@3.23.4-alpha.0...@standardnotes/mobile@3.23.4-alpha.1) (2022-06-17)
+
+**Note:** Version bump only for package @standardnotes/mobile
+
+## [3.23.4-alpha.0](https://github.com/standardnotes/app/compare/@standardnotes/mobile@3.23.3...@standardnotes/mobile@3.23.4-alpha.0) (2022-06-17)
 
 **Note:** Version bump only for package @standardnotes/mobile
 

packages/mobile/package.json

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

packages/web-server/CHANGELOG.md

@@ -3,7 +3,11 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
-## 1.2.10 (2022-06-17)
+## [1.2.10-alpha.1](https://github.com/standardnotes/app/compare/@standardnotes/web-server@1.2.10-alpha.0...@standardnotes/web-server@1.2.10-alpha.1) (2022-06-17)
+
+**Note:** Version bump only for package @standardnotes/web-server
+
+## [1.2.10-alpha.0](https://github.com/standardnotes/app/compare/@standardnotes/web-server@1.2.9...@standardnotes/web-server@1.2.10-alpha.0) (2022-06-17)
 
 **Note:** Version bump only for package @standardnotes/web-server
 

packages/web-server/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/web-server",
-  "version": "1.2.10",
+  "version": "1.2.10-alpha.1",
   "license": "AGPL-3.0-or-later",
   "private": true,
   "author": "Standard Notes.",

scripts/ScriptUtils.mjs

@@ -19,3 +19,7 @@ export const emptyExistingDir = (dir) => {
     fs.rmSync(dir, { recursive: true })
   }
 }
+
+export const listDirFiles = (dir) => {
+  return fs.readdirSync(dir)
+}

scripts/git-flow.sh

@@ -0,0 +1,3 @@
+git flow release start @standardnotes/app-monorepo@VERSION
+git flow release finish @standardnotes/app-monorepo@VERSION
+git push origin main && git push origin develop && git push origin @standardnotes/app-monorepo@VERSION

yarn.lock

@@ -6894,12 +6894,12 @@ __metadata:
   linkType: hard
 
 "@types/jest@npm:*":
-  version: 28.1.1
-  resolution: "@types/jest@npm:28.1.1"
+  version: 28.1.2
+  resolution: "@types/jest@npm:28.1.2"
   dependencies:
-    jest-matcher-utils: ^27.0.0
-    pretty-format: ^27.0.0
-  checksum: 0a8b045a7b660372decc807c390d3f99a2b12bb1659a1cd593afe04557f4b7c235b0576a5e35b1577710d20e42759d3d8755eb8bed6edc8733f47007e75a5509
+    jest-matcher-utils: ^28.0.0
+    pretty-format: ^28.0.0
+  checksum: 53ec95b0b27c61380225b94f8660e661e8c6c6fc69b7130531fb5d72ebf5c8838a4266b8a6d7b3a77b3bcdabed632de0c21c9592a2529c1efe80a0f0a995a3aa
   languageName: node
   linkType: hard
 
@@ -7388,13 +7388,13 @@ __metadata:
   linkType: soft
 
 "@types/react@npm:*":
-  version: 18.0.13
-  resolution: "@types/react@npm:18.0.13"
+  version: 18.0.14
+  resolution: "@types/react@npm:18.0.14"
   dependencies:
     "@types/prop-types": "*"
     "@types/scheduler": "*"
     csstype: ^3.0.2
-  checksum: ef976dbcd5605f3b8db2b286b1b35471d574dca711a2b6928c164075efd3ee731b3f32708f1ae09cfb04b003f9a4a9774cc386c32688f7fae864ea53a1c238f6
+  checksum: 608eb57a383eedc54c79949673e5e8314f6b0c61542bff58721c8c47a18c23e2832e77c656050c2c2c004b62cf25582136c7c56fe1b6263a285c065fae31dbcf
   languageName: node
   linkType: hard
 
@@ -7420,13 +7420,13 @@ __metadata:
   linkType: hard
 
 "@types/react@npm:^17, @types/react@npm:^17.0.40, @types/react@npm:^17.0.42":
-  version: 17.0.46
-  resolution: "@types/react@npm:17.0.46"
+  version: 17.0.47
+  resolution: "@types/react@npm:17.0.47"
   dependencies:
     "@types/prop-types": "*"
     "@types/scheduler": "*"
     csstype: ^3.0.2
-  checksum: 10e41e74aef40363a47a7aeb11b0179854eca0e0635300aac54a81f10ab0cbd7b8d099fed19ae919e25ceae42518db8a25d481625c23b97d7fdc10d1934b710c
+  checksum: 2e7fe0eb630cb77da03b6da308c58728c01b38e878118e9ff5cd8045181c8d4f32dc936e328f46a62cadb56e1fe4c5a911b5113584f93a99e1f35df7f059246b
   languageName: node
   linkType: hard
 
@@ -7565,11 +7565,11 @@ __metadata:
   linkType: hard
 
 "@types/testing-library__jest-dom@npm:^5.9.1":
-  version: 5.14.3
-  resolution: "@types/testing-library__jest-dom@npm:5.14.3"
+  version: 5.14.4
+  resolution: "@types/testing-library__jest-dom@npm:5.14.4"
   dependencies:
     "@types/jest": "*"
-  checksum: 203443d0e7e5929fbc9e441146f92d85efa033b4697e427ed0164df1c40b720b6bb9bbd96a3171ea5fd8d9301b538fd0f49d4f35594d142afd0f6d2ecac25785
+  checksum: 1d67a421757e5e6c32f232f848418b79658dc32d202f5b5f89e79dc49e6e8f24f0415db0f9fafe38c43c843d7f532cac53aa401f0129ae4b45c8d57e5974fbe3
   languageName: node
   linkType: hard
 
@@ -14078,6 +14078,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"diff-sequences@npm:^28.1.1":
+  version: 28.1.1
+  resolution: "diff-sequences@npm:28.1.1"
+  checksum: e2529036505567c7ca5a2dea86b6bcd1ca0e3ae63bf8ebf529b8a99cfa915bbf194b7021dc1c57361a4017a6d95578d4ceb29fabc3232a4f4cb866a2726c7690
+  languageName: node
+  linkType: hard
+
 "diff@npm:^4.0.1":
   version: 4.0.2
   resolution: "diff@npm:4.0.2"
@@ -14609,9 +14616,9 @@ __metadata:
   linkType: hard
 
 "electron-to-chromium@npm:^1.4.147":
-  version: 1.4.158
-  resolution: "electron-to-chromium@npm:1.4.158"
-  checksum: cc23bf4172936122cf36084c2eeb68684170d32a2e0f4becb73fb9ab965a60a0e04e7b9e763858b24154b766ca851582d655209fb35479f04032394d926375c6
+  version: 1.4.160
+  resolution: "electron-to-chromium@npm:1.4.160"
+  checksum: cd1058ddf8c4d1a38d2826938f9e99945bb45f96ea5eca5af96a2df4a40f23eec19e187cda739b4438174352129bcb733950f366a494d0a923385a46868a0d38
   languageName: node
   linkType: hard
 
@@ -19748,6 +19755,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"jest-diff@npm:^28.1.1":
+  version: 28.1.1
+  resolution: "jest-diff@npm:28.1.1"
+  dependencies:
+    chalk: ^4.0.0
+    diff-sequences: ^28.1.1
+    jest-get-type: ^28.0.2
+    pretty-format: ^28.1.1
+  checksum: d9e0355880bee8728f7615ac0f03c66dcd4e93113935cca056a5f5a2f20ac2c7812aca6ad68e79bd1b11f2428748bd9123e6b1c7e51c93b4da3dfa5a875339f7
+  languageName: node
+  linkType: hard
+
 "jest-docblock@npm:^27.5.1":
   version: 27.5.1
   resolution: "jest-docblock@npm:27.5.1"
@@ -19813,6 +19832,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"jest-get-type@npm:^28.0.2":
+  version: 28.0.2
+  resolution: "jest-get-type@npm:28.0.2"
+  checksum: 5281d7c89bc8156605f6d15784f45074f4548501195c26e9b188742768f72d40948252d13230ea905b5349038865a1a8eeff0e614cc530ff289dfc41fe843abd
+  languageName: node
+  linkType: hard
+
 "jest-haste-map@npm:^26.5.2":
   version: 26.6.2
   resolution: "jest-haste-map@npm:26.6.2"
@@ -19909,6 +19935,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"jest-matcher-utils@npm:^28.0.0":
+  version: 28.1.1
+  resolution: "jest-matcher-utils@npm:28.1.1"
+  dependencies:
+    chalk: ^4.0.0
+    jest-diff: ^28.1.1
+    jest-get-type: ^28.0.2
+    pretty-format: ^28.1.1
+  checksum: cb73ccd347638cd761ef7e0b606fbd71c115bd8febe29413f7b105fff6855d4356b8094c6b72393c5457db253b9c163498f188f25f9b6308c39c510e4c2886ee
+  languageName: node
+  linkType: hard
+
 "jest-message-util@npm:^27.5.1":
   version: 27.5.1
   resolution: "jest-message-util@npm:27.5.1"
@@ -21065,8 +21103,8 @@ __metadata:
   linkType: hard
 
 "lint-staged@npm:*, lint-staged@npm:>=12, lint-staged@npm:^13.0.1":
-  version: 13.0.1
-  resolution: "lint-staged@npm:13.0.1"
+  version: 13.0.2
+  resolution: "lint-staged@npm:13.0.2"
   dependencies:
     cli-truncate: ^3.1.0
     colorette: ^2.0.17
@@ -21083,7 +21121,7 @@ __metadata:
     yaml: ^2.1.1
   bin:
     lint-staged: bin/lint-staged.js
-  checksum: a321b351bbdc7dba09c9f026e385b887dabaaea1258eb478fbbe73dc395e11ebe26c946f8514426c7fc7e3e0efbe0761fe64f70e0d26361f912af79f80bf3e4e
+  checksum: b5ccf8e11b69f6fd8b79b629580c1463524aeca069a8f97a28291de2fafa474c28871428b56f251cf95a02d84e7b0fc0dfd6443532e16fdac3f9cba9228cfc9e
   languageName: node
   linkType: hard
 
@@ -26321,7 +26359,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"pretty-format@npm:^28.1.1":
+"pretty-format@npm:^28.0.0, pretty-format@npm:^28.1.1":
   version: 28.1.1
   resolution: "pretty-format@npm:28.1.1"
   dependencies:
@@ -32124,11 +32162,11 @@ __metadata:
   linkType: hard
 
 "uglify-js@npm:^3.1.4, uglify-js@npm:^3.15.4":
-  version: 3.16.0
-  resolution: "uglify-js@npm:3.16.0"
+  version: 3.16.1
+  resolution: "uglify-js@npm:3.16.1"
   bin:
     uglifyjs: bin/uglifyjs
-  checksum: be0207e57ef70b13e92196cd0351f28908b80121d809901b511593c0bd1043d9c0b21d22f2a83001da873407a02572b67ccd21ce5e053cf7c787b2ca8a3773fb
+  checksum: e4108b35af7bcc9cf3be5366614bb1df2c78695aa14dee85b48cb9036a4478e60e91afe2375917e3284b61ef056fcab3a1d4bfc7c563e57bc77fd5ac89463a4c
   languageName: node
   linkType: hard