A fully open source & end-to-end encrypted note taking alternative to Evernote.
TypeScript asp-net-coredotnet-coreelectronfosshacktoberfestnote-managmentnote-takingnote-taking-appnotebooknotesnotes-appopen-sourceopensourceprivacyproductivityreactreact-nativereactjsself-hosted
desktop: ready beta for deployment
Abdullah Atta8f379d253e84
diff --git a/.github/workflows/desktop.publish.yml b/.github/workflows/desktop.publish.ymlindex 00df46c9c..2c57f4113 100644--- a/.github/workflows/desktop.publish.yml+++ b/.github/workflows/desktop.publish.yml@@ -82,6 +82,7 @@ jobs:name: Notesnook Desktop v${{ steps.app_metadata.outputs.app_version }}tag_name: v${{ steps.app_metadata.outputs.app_version }}files: ./notesnook_build_v${{ steps.app_metadata.outputs.app_version }}.zip+ prerelease: ${{ endsWith(steps.app_metadata.outputs.app_version, '-beta') }}build-macos:name: Build for macOSdiff --git a/.github/workflows/web.v3-beta.publish.yml b/.github/workflows/web.v3-beta.publish.ymlindex ad7205292..d8fcd3177 100644--- a/.github/workflows/web.v3-beta.publish.yml+++ b/.github/workflows/web.v3-beta.publish.yml@@ -25,8 +25,8 @@ jobs:echo "CLOUDFLARE_ACCOUNT_ID=${{ secrets.CLOUDFLARE_ACCOUNT_ID }}" >> $GITHUB_ENVecho "CLOUDFLARE_API_TOKEN=${{ secrets.CLOUDFLARE_API_TOKEN }}" >> $GITHUB_ENV- - name: Generate beta build- run: npm run build:beta:web+ - name: Build+ run: npm run build:web- name: Publish to Cloudflare Pagesuses: unlike-ltd/[email protected]@@ -37,4 +37,4 @@ jobs:cloudflare-project-name: notesnook-v3-betadirectory: ./apps/web/buildgithub-token: ${{ secrets.GITHUB_TOKEN }}- github-environment: 'v3'+ github-environment: "v3"diff --git a/apps/desktop/package-lock.json b/apps/desktop/package-lock.jsonindex 7caa26300..7dc6be0c1 100644--- a/apps/desktop/package-lock.json+++ b/apps/desktop/package-lock.json@@ -1,12 +1,12 @@{"name": "@notesnook/desktop",- "version": "2.6.17",+ "version": "3.0.0-beta","lockfileVersion": 3,"requires": true,"packages": {"": {"name": "@notesnook/desktop",- "version": "2.6.17",+ "version": "3.0.0-beta","hasInstallScript": true,"license": "GPL-3.0-or-later","dependencies": {diff --git a/apps/desktop/package.json b/apps/desktop/package.jsonindex 83d5f2afa..2c5833ae1 100644--- a/apps/desktop/package.json+++ b/apps/desktop/package.json@@ -2,7 +2,7 @@"name": "@notesnook/desktop","productName": "Notesnook","description": "Your private note taking space",- "version": "2.6.17",+ "version": "3.0.0-beta","appAppleId": "1544027013","private": true,"main": "./dist/index.js",@@ -56,6 +56,7 @@"artifactName": "notesnook_${os}_${arch}.${ext}","npmRebuild": false,"asar": false,+ "generateUpdatesFilesForAllChannels": true,"files": ["!*.chunk.js.map","!*.chunk.js.LICENSE.txt",diff --git a/apps/desktop/src/utils/autoupdater.ts b/apps/desktop/src/utils/autoupdater.tsindex c04f8562b..a7b92c360 100644--- a/apps/desktop/src/utils/autoupdater.ts+++ b/apps/desktop/src/utils/autoupdater.ts@@ -19,16 +19,22 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.import { autoUpdater } from "electron-updater";import { config } from "./config";+import { version } from "../../package.json";+const CHANNEL = version.endsWith("-beta") ? "beta" : "latest";async function configureAutoUpdater() {autoUpdater.setFeedURL({provider: "generic",url: `https://notesnook.com/releases/${process.platform}/`,- useMultipleRangeRequest: false+ useMultipleRangeRequest: false,+ channel: CHANNEL,+ requestHeaders: {+ RELEASE_CHANNEL: CHANNEL+ }});autoUpdater.autoDownload = config.automaticUpdates;- autoUpdater.allowDowngrade = false;+ autoUpdater.allowDowngrade = CHANNEL === "beta";autoUpdater.allowPrerelease = false;autoUpdater.autoInstallOnAppQuit = true;}diff --git a/apps/web/package-lock.json b/apps/web/package-lock.jsonindex 115a2de96..081f10fae 100644--- a/apps/web/package-lock.json+++ b/apps/web/package-lock.json@@ -1,12 +1,12 @@{"name": "@notesnook/web",- "version": "2.6.17",+ "version": "3.0.0-beta","lockfileVersion": 3,"requires": true,"packages": {"": {"name": "@notesnook/web",- "version": "2.6.17",+ "version": "3.0.0-beta","license": "GPL-3.0-or-later","dependencies": {"@aws-sdk/util-base64-browser": "^3.208.0",diff --git a/apps/web/package.json b/apps/web/package.jsonindex d79fe7141..515b3d97c 100644--- a/apps/web/package.json+++ b/apps/web/package.json@@ -1,7 +1,7 @@{"name": "@notesnook/web","description": "Your private note taking space",- "version": "2.6.17",+ "version": "3.0.0-beta","private": true,"main": "./src/app.js","homepage": "https://notesnook.com/",@@ -130,7 +130,6 @@"start:test": "serve -s build/ -p 3000","build": "cross-env PLATFORM=web vite build","build:test": "cross-env PLATFORM=web TEST=true vite build",- "build:beta": "cross-env PLATFORM=web BETA=true vite build","build:desktop": "cross-env PLATFORM=desktop vite build","analyze": "cross-env ANALYZING=true PLATFORM=web vite build","test": "playwright test -u"diff --git a/apps/web/vite.config.ts b/apps/web/vite.config.tsindex 5aa39c055..77a89f817 100644--- a/apps/web/vite.config.ts+++ b/apps/web/vite.config.ts@@ -37,7 +37,8 @@ const gitHash = (() => {return process.env.GIT_HASH || "gitless";}})();-const appVersion = version.replaceAll(".", "");+const appVersion = version.replaceAll(".", "").replace("-beta", "");+const isBeta = version.endsWith("-beta");const isTesting =process.env.TEST === "true" || process.env.NODE_ENV === "development";const isDesktop = process.env.PLATFORM === "desktop";@@ -71,7 +72,7 @@ export default defineConfig({IS_DESKTOP_APP: isDesktop,PLATFORM: `"${process.env.PLATFORM}"`,IS_TESTING: process.env.TEST === "true",- IS_BETA: process.env.BETA === "true",+ IS_BETA: isBeta,IS_THEME_BUILDER: isThemeBuilder},logLevel: process.env.NODE_ENV === "production" ? "warn" : "info",