chore: add inner desktop as workspace so version gets bumped automatically

README.md

@@ -82,14 +82,12 @@ You can then access the app at `http://localhost:3001` (please check Docker cont
 
 ### Running Locally
 
-This repo contains the core code used in the web app, as well as the Electron-based [desktop application](https://github.com/standardnotes/desktop).
-
 **Instructions:**
 
 1. Ensure you have [Yarn](https://classic.yarnpkg.com) installed
-1. Clone the repo
+2. Clone the repo
-1. `yarn install`
+3. `yarn install`
-1. `yarn start`
+4. `yarn start`
 
 Then open your browser to `http://localhost:3001`.
 
@@ -101,14 +99,6 @@ You can also set the `DEFAULT_SYNC_SERVER` environment variable to set the defau
 DEFAULT_SYNC_SERVER=https://sync.myserver
 ```
 
----
-
-### Other repositories:
-
-- Desktop app: https://github.com/standardnotes/desktop
-- Mobile (iOS & Android): https://github.com/standardnotes/mobile
-- Extensions: https://github.com/sn-extensions
-
 ## Contributing
 
 For contributing we highly recommend you use our docker-compose setup that is provided in this repository.

package.json

@@ -5,6 +5,7 @@
   "workspaces": {
     "packages": [
       "packages/*",
+      "packages/desktop/app",
       "packages/components/src/*"
     ]
   },

packages/desktop/README.md

@@ -2,8 +2,6 @@
 
 <div align="center">
 
-[![latest release version](https://img.shields.io/github/v/release/standardnotes/desktop)](https://github.com/standardnotes/desktop/releases)
-[![License](https://img.shields.io/github/license/standardnotes/desktop?color=blue)](https://github.com/standardnotes/desktop/blob/master/LICENSE)
 [![Slack](https://img.shields.io/badge/slack-standardnotes-CC2B5E.svg?style=flat&logo=slack)](https://standardnotes.com/slack)
 [![Twitter Follow](https://img.shields.io/badge/follow-%40standardnotes-blue.svg?style=flat&logo=twitter)](https://twitter.com/standardnotes)
 
@@ -76,6 +74,6 @@ Followed by
 
 ## Installation
 
-On Linux, download the latest AppImage from the [Releases](https://github.com/standardnotes/desktop/releases/latest) page, and give it executable permission:
+On Linux, download the latest AppImage from the [Releases](https://github.com/standardnotes/app/releases/latest) page, and give it executable permission:
 
 `chmod u+x standard-notes*.AppImage`

packages/desktop/app/javascripts/Main/Menus/Menus.ts

@@ -238,8 +238,9 @@ const Urls = {
   Website: 'https://standardnotes.com',
   GitHub: 'https://github.com/standardnotes',
   Slack: 'https://standardnotes.com/slack',
+  Discord: 'https://standardnotes.com/discord',
   Twitter: 'https://twitter.com/StandardNotes',
-  GitHubReleases: 'https://github.com/standardnotes/desktop/releases',
+  GitHubReleases: 'https://github.com/standardnotes/app/releases',
 }
 
 function macAppMenu(appName: string): MenuItemConstructorOptions {
@@ -596,6 +597,12 @@ function helpMenu(window: Electron.BrowserWindow, shell: Electron.Shell) {
           void shell.openExternal(Urls.GitHub)
         },
       },
+      {
+        label: str().discord,
+        click() {
+          void shell.openExternal(Urls.Discord)
+        },
+      },
       {
         label: str().slack,
         click() {

packages/desktop/app/javascripts/Main/Strings/english.ts

@@ -18,6 +18,7 @@ export function createEnglishStrings(): Strings {
       emailSupport: 'Email Support',
       website: 'Website',
       gitHub: 'GitHub',
+      discord: 'Discord',
       slack: 'Slack',
       twitter: 'Twitter',
       toggleErrorConsole: 'Toggle Error Console',

packages/desktop/app/javascripts/Main/Strings/types.ts

@@ -23,6 +23,7 @@ interface AppMenuStrings {
   emailSupport: string
   website: string
   gitHub: string
+  discord: string
   slack: string
   twitter: string
   toggleErrorConsole: string

packages/desktop/app/javascripts/Main/UpdateManager.ts

@@ -144,7 +144,7 @@ export function setupUpdates(window: BrowserWindow, appState: AppState, backupsM
 }
 
 export function openChangelog(state: UpdateState): void {
-  const url = 'https://github.com/standardnotes/desktop/releases'
+  const url = 'https://github.com/standardnotes/app/releases'
   if (state.latestVersion) {
     void shell.openExternal(`${url}/tag/v${state.latestVersion}`)
   } else {

packages/desktop/app/package.json

@@ -1,10 +1,10 @@
 {
-  "name": "standard-notes",
+  "name": "@standardnotes/inner-desktop",
   "productName": "Standard Notes",
   "private": true,
   "description": "An end-to-end encrypted notes app for digitalists and professionals.",
   "author": "Standard Notes <help@standardnotes.com>",
-  "version": "3.20.2",
+  "version": "3.22.3-alpha.18",
   "main": "./dist/index.js",
   "installConfig": {
     "selfReferences": true

packages/desktop/desktop.webpack.common.js

@@ -94,7 +94,7 @@ module.exports = function ({ onlyTranspileTypescript = false, experimentalFeatur
             from: 'app/node_modules',
             to: 'node_modules',
             globOptions: {
-              ignore: ['**/standard-notes/**'],
+              ignore: ['**/@standardnotes/inner-desktop/**'],
             },
           },
           {

packages/mobile/package.json

@@ -2,7 +2,7 @@
   "name": "@standardnotes/mobile",
   "version": "3.23.1-alpha.8",
   "user-version": "3.23.0",
-  "author": "Standard Notes",
+  "author": "Standard Notes.",
   "private": true,
   "license": "AGPL-3.0-or-later",
   "scripts": {

yarn.lock

@@ -5459,6 +5459,14 @@ __metadata:
   languageName: unknown
   linkType: soft
 
+"@standardnotes/inner-desktop@workspace:packages/desktop/app":
+  version: 0.0.0-use.local
+  resolution: "@standardnotes/inner-desktop@workspace:packages/desktop/app"
+  dependencies:
+    keytar: ^7.9.0
+  languageName: unknown
+  linkType: soft
+
 "@standardnotes/markdown-basic@workspace:packages/components/src/org.standardnotes.simple-markdown-editor":
   version: 0.0.0-use.local
   resolution: "@standardnotes/markdown-basic@workspace:packages/components/src/org.standardnotes.simple-markdown-editor"
@@ -30379,14 +30387,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"standard-notes@workspace:packages/desktop/app":
-  version: 0.0.0-use.local
-  resolution: "standard-notes@workspace:packages/desktop/app"
-  dependencies:
-    keytar: ^7.9.0
-  languageName: unknown
-  linkType: soft
-
 "stat-mode@npm:^1.0.0":
   version: 1.0.0
   resolution: "stat-mode@npm:1.0.0"