diff --git a/apps/web/.github/workflows/release.yml b/apps/web/.github/workflows/release.yml index 209e42103..4c373ec01 100644 --- a/apps/web/.github/workflows/release.yml +++ b/apps/web/.github/workflows/release.yml @@ -44,7 +44,6 @@ jobs: uses: actions/setup-node@v2.1.5 with: node-version: 15.x - - run: npm ci - name: Download notesnook-web build uses: actions/download-artifact@v2 diff --git a/apps/web/desktop/autoupdate.js b/apps/web/desktop/autoupdate.js index 354eae1cb..7aa6e6918 100644 --- a/apps/web/desktop/autoupdate.js +++ b/apps/web/desktop/autoupdate.js @@ -1,7 +1,7 @@ const { autoUpdater } = require("electron-updater"); const { EVENTS } = require("./events"); const { sendMessageToRenderer } = require("./ipc/utils"); -const { getChangelog } = require("../src/utils/version"); +const { getChangelog } = require("./changelog"); async function configureAutoUpdater() { autoUpdater.setFeedURL({ diff --git a/apps/web/desktop/changelog.js b/apps/web/desktop/changelog.js new file mode 100644 index 000000000..59287eab9 --- /dev/null +++ b/apps/web/desktop/changelog.js @@ -0,0 +1,26 @@ +const showdown = require("showdown"); + +var converter = new showdown.Converter(); +converter.setFlavor("github"); + +module.exports.getChangelog = async function (tag) { + try { + if (!tag) return; + + const url = `https://api.github.com/repos/streetwriters/notesnook/releases/tags/v${tag}`; + const response = await fetch(url, { + headers: { Accept: "application/json" }, + }); + if (!response.ok) return "No changelog found."; + + const release = await response.json(); + if (!release) return "No changelog found."; + + const { body } = release; + + const html = converter.makeHtml(body); + return html; + } catch { + return "No changelog found."; + } +}; diff --git a/apps/web/desktop/package.json b/apps/web/desktop/package.json index b818f606b..b807be710 100644 --- a/apps/web/desktop/package.json +++ b/apps/web/desktop/package.json @@ -12,7 +12,8 @@ "electron-better-ipc": "^2.0.1", "electron-serve": "^1.1.0", "electron-updater": "^4.6.5", - "isomorphic-fetch": "^3.0.0" + "isomorphic-fetch": "^3.0.0", + "showdown": "^2.0.3" }, "devDependencies": { "@types/node-fetch": "^2.6.1", diff --git a/apps/web/src/utils/version.js b/apps/web/src/utils/version.js index 2f732b5e0..ecf50f4f4 100644 --- a/apps/web/src/utils/version.js +++ b/apps/web/src/utils/version.js @@ -1,5 +1,3 @@ -import showdown from "showdown"; - export const appVersion = { formatted: format( process.env.REACT_APP_VERSION, @@ -57,27 +55,4 @@ export function getServiceWorkerVersion(serviceWorker) { }); } -var converter = new showdown.Converter(); -converter.setFlavor("github"); - -export async function getChangelog(tag) { - try { - if (!tag) return; - - const url = `https://api.github.com/repos/streetwriters/notesnook/releases/tags/v${tag}`; - const response = await fetch(url, { - headers: { Accept: "application/json" }, - }); - if (!response.ok) return "No changelog found."; - - const release = await response.json(); - if (!release) return "No changelog found."; - - const { body } = release; - - const html = converter.makeHtml(body); - return html; - } catch { - return "No changelog found."; - } -} +export { getChangelog } from "@notesnook/desktop/changelog";