From a165a93adfa35fec483c9557ade389534f95471f Mon Sep 17 00:00:00 2001 From: Nick Webster Date: Mon, 17 Jul 2023 23:01:02 +1200 Subject: [PATCH 1/4] Require wasm support to run MicroPad --- app/package.json | 2 +- app/src/unsupported-page/feature-detect.ts | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/app/package.json b/app/package.json index 14e38fc4..df63feef 100644 --- a/app/package.json +++ b/app/package.json @@ -1,6 +1,6 @@ { "name": "micropad", - "version": "4.2.6", + "version": "4.2.7", "private": true, "scripts": { "preinstall": "python3 ../libs/build-libs.py && ./get_precache_files.py > src/extraPrecacheFiles.ts", diff --git a/app/src/unsupported-page/feature-detect.ts b/app/src/unsupported-page/feature-detect.ts index e6e040a2..cd762670 100644 --- a/app/src/unsupported-page/feature-detect.ts +++ b/app/src/unsupported-page/feature-detect.ts @@ -3,7 +3,7 @@ export async function hasRequiredFeatures(): Promise { return true; } - return doesSupportSrcDoc() && hasUrlHelperClasses(); + return doesSupportSrcDoc() && hasUrlHelperClasses() && supportsWebAssembly(); } export function shouldIgnoreCompatibility(): boolean { @@ -22,3 +22,7 @@ function hasUrlHelperClasses(): boolean { return !!new URLSearchParams(url.search); } catch (_) { return false; } } + +function supportsWebAssembly(): boolean { + return typeof WebAssembly === 'object' && typeof WebAssembly.instantiate === 'function'; +} From 3fd1a356d7c9934e00491996fb8365d129bbd6d3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 18 Jul 2023 22:03:10 +0000 Subject: [PATCH 2/4] Bump word-wrap from 1.2.3 to 1.2.4 in /app Bumps [word-wrap](https://github.com/jonschlinkert/word-wrap) from 1.2.3 to 1.2.4. - [Release notes](https://github.com/jonschlinkert/word-wrap/releases) - [Commits](https://github.com/jonschlinkert/word-wrap/compare/1.2.3...1.2.4) --- updated-dependencies: - dependency-name: word-wrap dependency-type: indirect ... Signed-off-by: dependabot[bot] --- app/yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/yarn.lock b/app/yarn.lock index cd266c4f..7761d625 100644 --- a/app/yarn.lock +++ b/app/yarn.lock @@ -11804,9 +11804,9 @@ __metadata: linkType: hard "word-wrap@npm:~1.2.3": - version: 1.2.3 - resolution: "word-wrap@npm:1.2.3" - checksum: 30b48f91fcf12106ed3186ae4fa86a6a1842416df425be7b60485de14bec665a54a68e4b5156647dec3a70f25e84d270ca8bc8cd23182ed095f5c7206a938c1f + version: 1.2.4 + resolution: "word-wrap@npm:1.2.4" + checksum: 8f1f2e0a397c0e074ca225ba9f67baa23f99293bc064e31355d426ae91b8b3f6b5f6c1fc9ae5e9141178bb362d563f55e62fd8d5c31f2a77e3ade56cb3e35bd1 languageName: node linkType: hard From 3d1425f3f6d4b6ccfefd0e56ce080f1f4b894a9f Mon Sep 17 00:00:00 2001 From: Nick Webster Date: Fri, 11 Aug 2023 22:49:52 +1200 Subject: [PATCH 3/4] Making terminology more consistent --- app/src/app/components/sync/SyncProErrorComponent.tsx | 2 +- .../app/components/sync/sync-options/SyncOptionsComponent.tsx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/app/components/sync/SyncProErrorComponent.tsx b/app/src/app/components/sync/SyncProErrorComponent.tsx index 12d3d8f5..82eb5287 100644 --- a/app/src/app/components/sync/SyncProErrorComponent.tsx +++ b/app/src/app/components/sync/SyncProErrorComponent.tsx @@ -17,7 +17,7 @@ export const SyncProErrorComponent = () => (

The bad news is that these notepads take up a lot more resources to keep in-sync.
- To sync this notepad you'll need to upgrade to {SYNC_NAME} Pro for less than the price of a cup of coffee: + To sync this notebook you'll need to upgrade to {SYNC_NAME} Pro for less than the price of a cup of coffee:

window.open(`${MICROPAD_URL}/sync/manage`, '_blank')}>Upgrade here diff --git a/app/src/app/components/sync/sync-options/SyncOptionsComponent.tsx b/app/src/app/components/sync/sync-options/SyncOptionsComponent.tsx index 1a019787..178d83a0 100644 --- a/app/src/app/components/sync/sync-options/SyncOptionsComponent.tsx +++ b/app/src/app/components/sync/sync-options/SyncOptionsComponent.tsx @@ -36,7 +36,7 @@ export default class SyncOptionsComponent extends React.Component addNotepad(syncState.user, notepad.title)}> - Start syncing this notepad + Start syncing this notebook } { From 35083b6d4bbb5eb8dd7ff1c73a21add73cc0dd98 Mon Sep 17 00:00:00 2001 From: Nick Webster Date: Fri, 11 Aug 2023 22:50:36 +1200 Subject: [PATCH 4/4] Bumping version number --- app/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/package.json b/app/package.json index df63feef..238caef2 100644 --- a/app/package.json +++ b/app/package.json @@ -1,6 +1,6 @@ { "name": "micropad", - "version": "4.2.7", + "version": "4.2.8", "private": true, "scripts": { "preinstall": "python3 ../libs/build-libs.py && ./get_precache_files.py > src/extraPrecacheFiles.ts",