Skip to content

v4.2.8 #447

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
NickGeek merged 5 commits into from
Aug 11, 2023
Merged

v4.2.8 #447

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a165a93
Require wasm support to run MicroPad
NickGeek Jul 17, 2023
3fd1a35
Bump word-wrap from 1.2.3 to 1.2.4 in /app
dependabot[bot] Jul 18, 2023
1ce688f
Merge pull request #446 from MicroPad/dependabot/npm_and_yarn/app/wor…
NickGeek Jul 19, 2023
3d1425f
Making terminology more consistent
NickGeek Aug 11, 2023
35083b6
Bumping version number
NickGeek Aug 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "micropad",
"version": "4.2.6",
"version": "4.2.8",
"private": true,
"scripts": {
"preinstall": "python3 ../libs/build-libs.py && ./get_precache_files.py > src/extraPrecacheFiles.ts",
Expand Down
2 changes: 1 addition & 1 deletion app/src/app/components/sync/SyncProErrorComponent.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ export const SyncProErrorComponent = () => (

<p>
The bad news is that these notepads take up a lot more resources to keep in-sync.<br />
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:
</p>

<Button2 className="accent-btn" waves="light" onClick={() => window.open(`${MICROPAD_URL}/sync/manage`, '_blank')}>Upgrade here</Button2>
Expand Down
2 changes: 1 addition & 1 deletion app/src/app/components/sync/sync-options/SyncOptionsComponent.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ export default class SyncOptionsComponent extends React.Component<ConnectedProps
paddingRight: '16px',
height: 'auto'
}} disabled={syncState.isLoading} onClick={() => addNotepad(syncState.user, notepad.title)}>
Start syncing this notepad
Start syncing this notebook
</Button2></span>}

{
Expand Down
6 changes: 5 additions & 1 deletion app/src/unsupported-page/feature-detect.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ export async function hasRequiredFeatures(): Promise<boolean> {
return true;
}

return doesSupportSrcDoc() && hasUrlHelperClasses();
return doesSupportSrcDoc() && hasUrlHelperClasses() && supportsWebAssembly();
}

export function shouldIgnoreCompatibility(): boolean {
Expand All @@ -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';
}
6 changes: 3 additions & 3 deletions app/yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down