Skip to content

Connect, collaborate, and grow with a community of TypeScript developers

fixed some stuff (#181)

ggrandi7b916764bd48
diff --git a/package.json b/package.json
index 4bc96cd6..b1410f76 100644
--- a/package.json
+++ b/package.json
@@ -13,7 +13,8 @@
"refresh": "pnpm reset && pnpm prisma db seed",
"typecheck": "tsc --noEmit",
"prepare": "husky install",
- "dl-monaco": "node scripts/dl-monaco.mjs"
+ "dl-monaco": "node scripts/dl-monaco.mjs",
+ "dl-monaco:force": "node scripts/dl-monaco.mjs --force"
},
"type": "module",
"dependencies": {
@@ -111,6 +112,4 @@
"lint-staged": {
"src/**/*.{ts,tsx,css}": "prettier --write"
}
-
-
}
diff --git a/scripts/dl-monaco.mjs b/scripts/dl-monaco.mjs
index af5a0f67..a870467b 100644
--- a/scripts/dl-monaco.mjs
+++ b/scripts/dl-monaco.mjs
@@ -1,15 +1,16 @@
+//@ts-check
+
import url from 'node:url';
import fs from 'node:fs/promises';
import path from 'node:path';
-//@ts-check
-const typescriptVersion = '5.1.6';
+/** @link https://typescript.azureedge.net/indexes/releases.json */
+const typescriptVersion = '5.0.2';
/** @link https://github.com/microsoft/TypeScript-Make-Monaco-Builds */
const baseUrl = `https://typescript.azureedge.net/cdn/${typescriptVersion}/monaco`;
/**
- *
* @param {readonly [remoteUrl: string, diskPath:string]} param0
*/
async function downloadAndSaveFile([remoteUrl, diskPath]) {
@@ -26,25 +27,25 @@ async function downloadAndSaveFile([remoteUrl, diskPath]) {
const files = /** @type {const} */ ([
['/esm/vs/editor/editor.api.d.ts', './monaco-editor.d.ts'],
- // TODO switch to the local versions
- // ['/min/vs/loader.js', './public/vs/loader.js'],
- // ['/min/vs/editor/editor.main.js', './public/vs/editor/editor.main.js'],
- // ['/min/vs/editor/editor.main.nls.js', './public/vs/editor/editor.main.nls.js'],
- // [
- // '/min/vs/basic-languages/typescript/typescript.js',
- // './public/vs/basic-languages/typescript/typescript.js',
- // ],
- // ['/min/vs/language/typescript/tsMode.js', './public/vs/language/typescript/tsMode.js'],
- // ['/min/vs/base/worker/workerMain.js', './public/vs/base/worker/workerMain.js'],
- // [
- // '/min/vs/base/common/worker/simpleWorker.nls.js',
- // './public/vs/base/common/worker/simpleWorker.nls.js',
- // ],
- // ['/min/vs/language/typescript/tsWorker.js', './public/vs/language/typescript/tsWorker.js'],
- // [
- // '/min/vs/base/common/worker/simpleWorker.nls.js',
- // './public/vs/base/common/worker/simpleWorker.nls.js',
- // ],
+ ['/min/vs/loader.js', './public/vs/loader.js'],
+ ['/min/vs/editor/editor.main.js', './public/vs/editor/editor.main.js'],
+ ['/min/vs/editor/editor.main.css', './public/vs/editor/editor.main.css'],
+ ['/min/vs/editor/editor.main.nls.js', './public/vs/editor/editor.main.nls.js'],
+ [
+ '/min/vs/basic-languages/typescript/typescript.js',
+ './public/vs/basic-languages/typescript/typescript.js',
+ ],
+ ['/min/vs/language/typescript/tsMode.js', './public/vs/language/typescript/tsMode.js'],
+ ['/min/vs/base/worker/workerMain.js', './public/vs/base/worker/workerMain.js'],
+ [
+ '/min/vs/base/common/worker/simpleWorker.nls.js',
+ './public/vs/base/common/worker/simpleWorker.nls.js',
+ ],
+ ['/min/vs/language/typescript/tsWorker.js', './public/vs/language/typescript/tsWorker.js'],
+ [
+ '/min/vs/base/common/worker/simpleWorker.nls.js',
+ './public/vs/base/common/worker/simpleWorker.nls.js',
+ ],
]);
export const download = async (force = false) => {
@@ -62,5 +63,5 @@ export const download = async (force = false) => {
};
if (process.argv[1] === url.fileURLToPath(import.meta.url)) {
- download(true);
+ download(process.argv[2] === '--force');
}
diff --git a/src/components/challenge/editor/index.tsx b/src/components/challenge/editor/index.tsx
index a7522f67..2b92a8ca 100644
--- a/src/components/challenge/editor/index.tsx
+++ b/src/components/challenge/editor/index.tsx
@@ -3,6 +3,7 @@
import Editor, { loader } from '@monaco-editor/react';
import clsx from 'clsx';
import { Loader2, Settings } from 'lucide-react';
+import { initVimMode } from 'monaco-vim';
import type * as monaco from 'monaco-editor';
import { useSession } from 'next-auth/react';
import { useTheme } from 'next-themes';
@@ -25,12 +26,16 @@ import { useEditorSettingsStore } from '../settings-store';
import { USER_CODE_START, USER_CODE_START_REGEX } from './constants';
import { libSource } from './editor-types';
import { createTwoslashInlayProvider } from './twoslash';
-import { VimStatusBar } from './vimMode';
import { type ChallengeRouteData } from '~/app/challenge/[id]/getChallengeRouteData';
+import dynamic from 'next/dynamic';
+
+const VimStatusBar = dynamic(() => import('./vimMode').then((v) => v.VimStatusBar), {
+ ssr: false,
+});
loader.config({
paths: {
- vs: 'https://typescript.azureedge.net/cdn/5.1.6/monaco/min/vs',
+ vs: '/vs',
},
});
@@ -300,7 +305,7 @@ export const CodePanel = (props: Props) => {
'sticky bottom-0 flex items-center justify-end p-2 dark:bg-[#1e1e1e]',
)}
>
- {editorState && <VimStatusBar editor={editorState} />}
+ {editorState && <VimStatusBar editor={editorState} initVimMode={initVimMode} />}
<div className="flex items-center justify-center gap-4">
{props.extraButton}
<TooltipProvider>
diff --git a/src/components/challenge/editor/vimMode.tsx b/src/components/challenge/editor/vimMode.tsx
index e4406df6..f812c4d5 100644
--- a/src/components/challenge/editor/vimMode.tsx
+++ b/src/components/challenge/editor/vimMode.tsx
@@ -1,14 +1,15 @@
'use client';
import type * as monaco from 'monaco-editor';
-import { initVimMode, type VimMode } from 'monaco-vim';
+import { type initVimMode, type VimMode } from 'monaco-vim';
import { useEffect, useRef } from 'react';
import { useEditorSettingsStore } from '../settings-store';
-interface Props {
+interface VimStatusBarProps {
editor: monaco.editor.IStandaloneCodeEditor;
+ initVimMode: typeof initVimMode;
}
-export const VimStatusBar = ({ editor }: Props) => {
+export const VimStatusBar = ({ editor, initVimMode }: VimStatusBarProps) => {
const statusBarRef = useRef<HTMLDivElement | null>(null);
const vimModeRef = useRef<VimMode>();
const { settings } = useEditorSettingsStore();
@@ -25,7 +26,7 @@ export const VimStatusBar = ({ editor }: Props) => {
statusBarRef.current.textContent = '';
}
}
- }, [editor, settings.bindings]);
+ }, [editor, initVimMode, settings.bindings]);
return (
<div className="flex w-full">