Merge pull request #3 from leanprover-community/vite

feat: change from webpack to vite

.gitignore

@@ -2,3 +2,5 @@ node_modules
 client/dist
 server/build
 client/public/package_versions.json
+dist
+**/.DS_Store

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'

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;

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<React.SVGProps<SVGSVGElement>>
+  const src: string
+  export default src
 }

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 {

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; }
 /*
 

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')
+  //   }
+  // }
 }

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')) {

client/public/index.html → index.html

@@ -22,7 +22,7 @@
       +49 211 81-12173<br />
     </p>
   </noscript>
-  <script src="bundle.js"></script>
+  <script type="module" src="/client/src/index.tsx"></script>
 </body>
 
 </html>