Skip to content

Commit 6e3219c

Browse files
committed
update monaco
1 parent b46925b commit 6e3219c

File tree

7 files changed

+174
-312
lines changed

7 files changed

+174
-312
lines changed

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,15 +43,15 @@
4343
"babel-preset-solid": "1.2.6",
4444
"dedent": "^0.7.0",
4545
"mitt": "^3.0.0",
46-
"monaco-editor": "^0.30.1",
46+
"monaco-editor": "^0.31.1",
4747
"monaco-editor-textmate": "^3.0.0",
4848
"monaco-textmate": "^3.0.1",
4949
"onigasm": "^2.2.5",
5050
"prettier": "^2.5.1",
5151
"register-service-worker": "^1.7.2",
5252
"rollup": "^2.62.0",
5353
"solid-dismiss": "^1.0.26",
54-
"solid-heroicons": "^1.1.0",
54+
"solid-heroicons": "^1.1.1",
5555
"solid-js": "1.2.6"
5656
}
5757
}

playground/app.tsx

Lines changed: 16 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,5 @@
11
import { compressToURL as encode } from '@amoutonbrady/lz-string';
2-
import {
3-
Show,
4-
onCleanup,
5-
createEffect,
6-
createSignal,
7-
JSX,
8-
} from 'solid-js';
2+
import { Show, onCleanup, createEffect, createSignal, JSX } from 'solid-js';
93

104
import editorWorker from 'monaco-editor/esm/vs/editor/editor.worker?worker';
115
import tsWorker from 'monaco-editor/esm/vs/language/typescript/ts.worker?worker';
@@ -59,7 +53,6 @@ export const App = (): JSX.Element => {
5953
const initialTabs = parseHash(url.hash && url.hash.slice(1), defaultTabs) || defaultTabs;
6054
const [tabs, setTabs] = createTabList(initialTabs);
6155
const [current, setCurrent] = createSignal('main.tsx');
62-
const [isReady, setIsReady] = createSignal(false);
6356

6457
const params = Object.fromEntries(url.searchParams.entries());
6558
const [version, setVersion] = createSignal(params.version || pkg.dependencies['solid-js']);
@@ -81,17 +74,13 @@ export const App = (): JSX.Element => {
8174
.then((data) => {
8275
setTabs(processImport(data));
8376
})
84-
.then(() => setIsReady(true))
8577
.catch((e) => console.error('Failed to import browser data', e));
86-
} else {
87-
setIsReady(true);
8878
}
8979

90-
const [noHeader, noInteractive, isHorizontal, noActionBar, noEditableTabs] = [
80+
const [noHeader, noInteractive, isHorizontal, noEditableTabs] = [
9181
'noHeader',
9282
'noInteractive',
9383
'isHorizontal',
94-
'noActionBar',
9584
'noEditableTabs',
9685
].map((key) => key in params);
9786

@@ -104,7 +93,6 @@ export const App = (): JSX.Element => {
10493

10594
const header = !noHeader;
10695
const interactive = !noInteractive;
107-
const actionBar = !noActionBar;
10896
const editableTabs = !noEditableTabs;
10997

11098
const { zoomState, updateZoomScale } = useZoom();
@@ -150,23 +138,20 @@ export const App = (): JSX.Element => {
150138
fallback={<div classList={{ 'md:col-span-2': !isHorizontal }}></div>}
151139
/>
152140

153-
<Show when={isReady()}>
154-
<Repl
155-
compiler={compiler}
156-
formatter={formatter}
157-
isHorizontal={isHorizontal}
158-
interactive={interactive}
159-
actionBar={actionBar}
160-
editableTabs={editableTabs}
161-
dark={dark()}
162-
tabs={tabs()}
163-
setTabs={setTabs}
164-
current={current()}
165-
setCurrent={setCurrent}
166-
version={version()}
167-
id="repl"
168-
/>
169-
</Show>
141+
<Repl
142+
compiler={compiler}
143+
formatter={formatter}
144+
isHorizontal={isHorizontal}
145+
interactive={interactive}
146+
editableTabs={editableTabs}
147+
dark={dark()}
148+
tabs={tabs()}
149+
setTabs={setTabs}
150+
current={current()}
151+
setCurrent={setCurrent}
152+
version={version()}
153+
id="repl"
154+
/>
170155

171156
<Show when={newUpdate()} children={<Update onDismiss={() => setNewUpdate(false)} />} />
172157
</div>

pnpm-lock.yaml

Lines changed: 24 additions & 48 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)