Skip to content

Commit 3a17ff6

Browse files
authored
Merge pull request #447 from MicroPad/next-dev
v4.2.8
2 parents e6bb4d6 + 35083b6 commit 3a17ff6

5 files changed

Lines changed: 11 additions & 7 deletions

File tree

app/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "micropad",
3-
"version": "4.2.6",
3+
"version": "4.2.8",
44
"private": true,
55
"scripts": {
66
"preinstall": "python3 ../libs/build-libs.py && ./get_precache_files.py > src/extraPrecacheFiles.ts",

app/src/app/components/sync/SyncProErrorComponent.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ export const SyncProErrorComponent = () => (
1717

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

2323
<Button2 className="accent-btn" waves="light" onClick={() => window.open(`${MICROPAD_URL}/sync/manage`, '_blank')}>Upgrade here</Button2>

app/src/app/components/sync/sync-options/SyncOptionsComponent.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ export default class SyncOptionsComponent extends React.Component<ConnectedProps
3636
paddingRight: '16px',
3737
height: 'auto'
3838
}} disabled={syncState.isLoading} onClick={() => addNotepad(syncState.user, notepad.title)}>
39-
Start syncing this notepad
39+
Start syncing this notebook
4040
</Button2></span>}
4141

4242
{

app/src/unsupported-page/feature-detect.ts

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ export async function hasRequiredFeatures(): Promise<boolean> {
33
return true;
44
}
55

6-
return doesSupportSrcDoc() && hasUrlHelperClasses();
6+
return doesSupportSrcDoc() && hasUrlHelperClasses() && supportsWebAssembly();
77
}
88

99
export function shouldIgnoreCompatibility(): boolean {
@@ -22,3 +22,7 @@ function hasUrlHelperClasses(): boolean {
2222
return !!new URLSearchParams(url.search);
2323
} catch (_) { return false; }
2424
}
25+
26+
function supportsWebAssembly(): boolean {
27+
return typeof WebAssembly === 'object' && typeof WebAssembly.instantiate === 'function';
28+
}

app/yarn.lock

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11804,9 +11804,9 @@ __metadata:
1180411804
linkType: hard
1180511805

1180611806
"word-wrap@npm:~1.2.3":
11807-
version: 1.2.3
11808-
resolution: "word-wrap@npm:1.2.3"
11809-
checksum: 30b48f91fcf12106ed3186ae4fa86a6a1842416df425be7b60485de14bec665a54a68e4b5156647dec3a70f25e84d270ca8bc8cd23182ed095f5c7206a938c1f
11807+
version: 1.2.4
11808+
resolution: "word-wrap@npm:1.2.4"
11809+
checksum: 8f1f2e0a397c0e074ca225ba9f67baa23f99293bc064e31355d426ae91b8b3f6b5f6c1fc9ae5e9141178bb362d563f55e62fd8d5c31f2a77e3ade56cb3e35bd1
1181011810
languageName: node
1181111811
linkType: hard
1181211812

0 commit comments

Comments
 (0)