diff --git a/.gitignore b/.gitignore
index 67e8330a..4cfd1b94 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,5 @@ node_modules
client/dist
server/build
client/public/package_versions.json
+dist
+**/.DS_Store
diff --git a/client/public/onigasm.wasm b/client/public/onigasm.wasm
deleted file mode 100644
index 3915937a..00000000
Binary files a/client/public/onigasm.wasm and /dev/null differ
diff --git a/client/src/App.tsx b/client/src/App.tsx
index a658dc44..b8a2562d 100644
--- a/client/src/App.tsx
+++ b/client/src/App.tsx
@@ -7,7 +7,7 @@ import PrivacyPolicy from './PrivacyPolicy'
import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
import { faUpload, faArrowRotateRight, faArrowUpRightFromSquare, faDownload, faBars, faXmark } from '@fortawesome/free-solid-svg-icons'
const Editor = React.lazy(() => import('./Editor'))
-import Logo from "./logo.svg";
+import { ReactComponent as Logo } from './assets/logo.svg'
import { saveAs } from 'file-saver';
import LoadUrl from './LoadUrl'
import Settings from './Settings'
diff --git a/client/src/logo.svg b/client/src/assets/logo.svg
similarity index 99%
rename from client/src/logo.svg
rename to client/src/assets/logo.svg
index 39d546da..2c1b3823 100644
--- a/client/src/logo.svg
+++ b/client/src/assets/logo.svg
@@ -87,4 +87,4 @@
-
\ No newline at end of file
+
diff --git a/client/src/css/App.css b/client/src/css/App.css
index 6e707573..ec7d4710 100644
--- a/client/src/css/App.css
+++ b/client/src/css/App.css
@@ -35,6 +35,7 @@
/* The Lean logo */
.nav .logo {
height: 2.2rem;
+ width: unset;
vertical-align: middle;
margin-left: .5rem;
margin-right: 1rem;
diff --git a/client/src/custom.d.ts b/client/src/custom.d.ts
index 1a3dd3c2..ec884c5e 100644
--- a/client/src/custom.d.ts
+++ b/client/src/custom.d.ts
@@ -1,4 +1,6 @@
-declare module "*.svg" {
- const content: any;
- export default content;
+declare module '*.svg' {
+ import React = require('react')
+ export const ReactComponent: React.FC>
+ const src: string
+ export default src
}
diff --git a/client/src/editor/abbreviation/AbbreviationProvider.ts b/client/src/editor/abbreviation/AbbreviationProvider.ts
index a8444c21..ce7ec5e4 100644
--- a/client/src/editor/abbreviation/AbbreviationProvider.ts
+++ b/client/src/editor/abbreviation/AbbreviationProvider.ts
@@ -28,7 +28,6 @@ export class AbbreviationProvider {
// );
}
- @computed
private get symbolsByAbbreviation(): SymbolsByAbbreviation {
// There are only like 1000 symbols. Building an index is not required yet.
return {
diff --git a/client/src/editor/infoview.css b/client/src/editor/infoview.css
index fee0b4b6..e3222e35 100644
--- a/client/src/editor/infoview.css
+++ b/client/src/editor/infoview.css
@@ -401,7 +401,7 @@ button, select {/* 1 */ text-transform: none; }
/**
* Correct the inability to style clickable types in iOS and Safari.
*/
-button, [type="button"], [type="reset"], [type="submit"] { -webkit-appearance: button; }
+button, [type="button"], [type="reset"], [type="submit"] { appearance: button; -webkit-appearance: button; }
/**
* Remove the inner border and padding in Firefox.
*/
@@ -445,7 +445,7 @@ textarea { overflow: auto; }
* 1. Correct the odd appearance in Chrome and Safari.
* 2. Correct the outline style in Safari.
*/
-[type="search"] { -webkit-appearance: textfield; /* 1 */ outline-offset: -2px; /* 2 */ }
+[type="search"] { appearance: textfield; -webkit-appearance: textfield; /* 1 */ outline-offset: -2px; /* 2 */ }
/**
* Remove the inner padding in Chrome and Safari on macOS.
*/
@@ -867,7 +867,6 @@ Media Query Extensions:
Ref: http://nicolasgallagher.com/micro-clearfix-hack/ */
.cf:before, .cf:after { content: " "; display: table; }
.cf:after { clear: both; }
-.cf { *zoom: 1; }
.cl { clear: left; }
.cr { clear: right; }
.cb { clear: both; }
@@ -1078,7 +1077,7 @@ code, .code { font-family: Consolas, monaco, monospace; }
FORMS
*/
-.input-reset { -webkit-appearance: none; -moz-appearance: none; }
+.input-reset { appearance: none; -webkit-appearance: none; -moz-appearance: none; }
.button-reset::-moz-focus-inner, .input-reset::-moz-focus-inner { border: 0; padding: 0; }
/*
diff --git a/client/src/editor/leanclient.ts b/client/src/editor/leanclient.ts
index cddd5dfa..b5d5bbca 100644
--- a/client/src/editor/leanclient.ts
+++ b/client/src/editor/leanclient.ts
@@ -17,8 +17,8 @@ import {
PublishDiagnosticsParams,
CloseAction, ErrorAction,
RevealOutputChannelOn,
- State
} from 'monaco-languageclient'
+import { State } from 'vscode-languageclient'
import * as ls from 'vscode-languageserver-protocol'
import { toSocket, WebSocketMessageReader, WebSocketMessageWriter } from 'vscode-ws-jsonrpc'
@@ -606,16 +606,16 @@ export class LeanClient implements Disposable {
// return false
// }
- private extractVersion (v: string | undefined): SemVer {
- if (!v) return new SemVer('0.0.0')
- const prefix = 'Lake version'
- if (v.startsWith(prefix)) v = v.slice(prefix.length).trim()
- const pos = v.indexOf('(')
- if (pos > 0) v = v.slice(0, pos).trim()
- try {
- return new SemVer(v)
- } catch {
- return new SemVer('0.0.0')
- }
- }
+ // private extractVersion (v: string | undefined): SemVer {
+ // if (!v) return new SemVer('0.0.0')
+ // const prefix = 'Lake version'
+ // if (v.startsWith(prefix)) v = v.slice(prefix.length).trim()
+ // const pos = v.indexOf('(')
+ // if (pos > 0) v = v.slice(0, pos).trim()
+ // try {
+ // return new SemVer(v)
+ // } catch {
+ // return new SemVer('0.0.0')
+ // }
+ // }
}
diff --git a/client/src/monacoSetup.ts b/client/src/monacoSetup.ts
index 15837c87..487a6cea 100644
--- a/client/src/monacoSetup.ts
+++ b/client/src/monacoSetup.ts
@@ -10,6 +10,8 @@ import * as monaco from 'monaco-editor/esm/vs/editor/editor.api.js'
import { MonacoServices } from 'monaco-languageclient';
import { StandaloneServices } from 'vscode/services';
import getMessageServiceOverride from 'vscode/service-override/messages';
+//@ts-ignore
+import onigasmUrl from 'onigasm/lib/onigasm.wasm?url'
export function monacoSetup () {
@@ -62,7 +64,7 @@ export function monacoSetup () {
// Load onigasm
(async () => {
try {
- await loadWASM('./onigasm.wasm')
+ await loadWASM(onigasmUrl)
} catch (err) {
// Hot module replacement can cause us to run this code twice and that's ok.
if (!(err as Error).message?.startsWith('Onigasm#init has been called')) {
diff --git a/client/public/index.html b/index.html
similarity index 94%
rename from client/public/index.html
rename to index.html
index 39510991..3d538b38 100644
--- a/client/public/index.html
+++ b/index.html
@@ -22,7 +22,7 @@
+49 211 81-12173
-
+