Skip to content

Commit 3d70432

Browse files
cknittcknitt
authored
Upgrade Xote to 7.1.0 (#8595)
1 parent ea68f35 commit 3d70432

5 files changed

Lines changed: 40 additions & 40 deletions

File tree

‎packages/dev-playground/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,6 @@
1717
"@rescript/runtime": "12.3.0",
1818
"rescript": "12.3.0",
1919
"vite": "^8.0.14",
20-
"xote": "6.4.0"
20+
"xote": "7.1.0"
2121
}
2222
}

‎packages/dev-playground/src/Main.res‎

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ module TabButton = {
175175
class={() => Signal.get(activeTab) === tab ? "tab-button tab-button-active" : "tab-button"}
176176
onClick={_ => onSelect(tab)}
177177
>
178-
{Node.text(tabLabel(tab))}
178+
{View.text(tabLabel(tab))}
179179
</button>
180180
}
181181
}
@@ -184,9 +184,9 @@ module Problems = {
184184
@jsx.component
185185
let make = (~compileResult: Signal.t<option<CompilerApi.compileResult>>) => {
186186
<div class="problems">
187-
<div class="problems-title"> {Node.text("Problems")} </div>
187+
<div class="problems-title"> {View.text("Problems")} </div>
188188
<pre class="problems-output">
189-
{Node.signalText(() =>
189+
{View.signalText(() =>
190190
switch Signal.get(compileResult) {
191191
| Some(Ok({warnings})) if warnings->Array.length > 0 => warnings->Array.join("\n")
192192
| Some(Error({warnings})) if warnings->Array.length > 0 => warnings->Array.join("\n")
@@ -219,7 +219,7 @@ module SettingsPanel = {
219219
>
220220
<section class="settings-section">
221221
<label class="setting-label" for_="compiler-version">
222-
{Node.text("Compiler Version")}
222+
{View.text("Compiler Version")}
223223
</label>
224224
<select
225225
id="compiler-version"
@@ -230,17 +230,17 @@ module SettingsPanel = {
230230
switchCompiler(nextVersion)
231231
}}
232232
>
233-
{Node.fragment(
233+
{View.fragment(
234234
CompilerApi.selectableCompilerVersions(
235235
Signal.get(config).compilerVersion,
236-
)->Array.map(version => <option value=version.id> {Node.text(version.label)} </option>),
236+
)->Array.map(version => <option value=version.id> {View.text(version.label)} </option>),
237237
)}
238238
</select>
239239
</section>
240240
<section class="settings-section">
241-
<label class="setting-label"> {Node.text("Loaded Compiler")} </label>
241+
<label class="setting-label"> {View.text("Loaded Compiler")} </label>
242242
<div class="setting-value">
243-
{Node.signalText(() =>
243+
{View.signalText(() =>
244244
switch Signal.get(compilerInfo) {
245245
| Some(info) => `${info.version} / API ${info.apiVersion} / ${info.bundleId}`
246246
| None => "loading"
@@ -249,7 +249,7 @@ module SettingsPanel = {
249249
</div>
250250
</section>
251251
<section class="settings-section">
252-
<label class="setting-label" for_="module-system"> {Node.text("Module System")} </label>
252+
<label class="setting-label" for_="module-system"> {View.text("Module System")} </label>
253253
<select
254254
id="module-system"
255255
value={() => (Signal.get(config).moduleSystem :> string)}
@@ -263,16 +263,16 @@ module SettingsPanel = {
263263
}
264264
}}
265265
>
266-
{Node.fragment(
266+
{View.fragment(
267267
moduleSystems->Array.map(moduleSystem => {
268268
let value = (moduleSystem :> string)
269-
<option value> {Node.text(value)} </option>
269+
<option value> {View.text(value)} </option>
270270
}),
271271
)}
272272
</select>
273273
</section>
274274
<section class="settings-section">
275-
<label class="setting-label" for_="warning-flags"> {Node.text("Warning Flags")} </label>
275+
<label class="setting-label" for_="warning-flags"> {View.text("Warning Flags")} </label>
276276
<input
277277
id="warning-flags"
278278
value={() => Signal.get(config).warnFlags}
@@ -291,7 +291,7 @@ module SettingsPanel = {
291291
compileNow()
292292
}}
293293
>
294-
{Node.text("Reset")}
294+
{View.text("Reset")}
295295
</button>
296296
</section>
297297
<section class="settings-section setting-row">
@@ -305,7 +305,7 @@ module SettingsPanel = {
305305
compileNow()
306306
}}
307307
/>
308-
<label for_="jsx-preserve"> {Node.text("Preserve JSX output")} </label>
308+
<label for_="jsx-preserve"> {View.text("Preserve JSX output")} </label>
309309
</section>
310310
<section class="settings-section setting-row">
311311
<input
@@ -321,12 +321,12 @@ module SettingsPanel = {
321321
compileNow()
322322
}}
323323
/>
324-
<label for_="feature-let-unwrap"> {Node.text("Experimental: let?")} </label>
324+
<label for_="feature-let-unwrap"> {View.text("Experimental: let?")} </label>
325325
</section>
326326
<section class="settings-section">
327-
<label class="setting-label"> {Node.text("Loaded Libraries")} </label>
327+
<label class="setting-label"> {View.text("Loaded Libraries")} </label>
328328
<div class="setting-value">
329-
{Node.signalText(() =>
329+
{View.signalText(() =>
330330
switch Signal.get(compilerInfo) {
331331
| Some(info) => info.libraries->Array.join(", ")
332332
| None => "loading"
@@ -349,7 +349,7 @@ module StatusBadge = {
349349
| Ready => "status"
350350
}}
351351
>
352-
{Node.signalText(() =>
352+
{View.signalText(() =>
353353
switch Signal.get(status) {
354354
| Failed(message) => message
355355
| other => statusLabel(other)
@@ -371,7 +371,7 @@ module App = {
371371
let activeLine = Signal.make(1)
372372
let editorScrollTop = Signal.make(0)
373373
let editorScrollLeft = Signal.make(0)
374-
let highlightedSource: Signal.t<array<Node.node>> = Obj.magic(
374+
let highlightedSource: Signal.t<array<View.node>> = Obj.magic(
375375
Computed.make(() => SourceHighlight.render(Signal.get(source))),
376376
)
377377
let timerId: ref<option<int>> = ref(None)
@@ -596,17 +596,17 @@ module App = {
596596
<main class="app-shell">
597597
<header class="topbar">
598598
<div>
599-
<h1> {Node.text("ReScript Developer Playground")} </h1>
599+
<h1> {View.text("ReScript Developer Playground")} </h1>
600600
</div>
601601
<StatusBadge status />
602602
</header>
603603
<section class="workspace">
604604
<div class="source-column">
605605
<div class="column-header">
606-
<h2> {Node.text("Source")} </h2>
606+
<h2> {View.text("Source")} </h2>
607607
<div class="actions">
608608
<button class="secondary-action" onClick={_ => formatSource()}>
609-
{Node.text("Format")}
609+
{View.text("Format")}
610610
</button>
611611
<button
612612
class="secondary-action"
@@ -619,10 +619,10 @@ module App = {
619619
scheduleCompile()
620620
}}
621621
>
622-
{Node.text("Reset")}
622+
{View.text("Reset")}
623623
</button>
624624
<button class="secondary-action" onClick={_ => shareCurrentUrl()}>
625-
{Node.text("Share")}
625+
{View.text("Share")}
626626
</button>
627627
</div>
628628
</div>
@@ -638,16 +638,16 @@ module App = {
638638
<div class="active-line" ariaHidden=true />
639639
<div class="line-number-gutter" ariaHidden=true>
640640
<pre class="line-numbers">
641-
{Node.signalText(() => lineNumbersText(Signal.get(source)))}
641+
{View.signalText(() => lineNumbersText(Signal.get(source)))}
642642
</pre>
643643
</div>
644644
<pre class="syntax-layer" ariaHidden=true>
645-
{Node.signalFragment(highlightedSource)}
645+
{View.signalFragment(highlightedSource)}
646646
</pre>
647647
<textarea
648648
id="source-editor"
649649
class="editor"
650-
value={ReactiveProp.reactive(source)}
650+
value={MaybeSignal.reactive(source)}
651651
spellcheck=false
652652
onInput={event => {
653653
Signal.set(source, Event.value(event))
@@ -673,7 +673,7 @@ module App = {
673673
</div>
674674
<div class="result-column">
675675
<div class="tabs">
676-
{Node.fragment(
676+
{View.fragment(
677677
tabs->Array.map(tab =>
678678
<TabButton tab activeTab onSelect={tab => Signal.set(activeTab, tab)} />
679679
),
@@ -684,11 +684,11 @@ module App = {
684684
Signal.get(activeTab) === Settings ? "output-panel hidden-panel" : "output-panel"}
685685
>
686686
<div class="result-meta">
687-
{Node.signalText(() => resultSummary(Signal.get(compileResult)))}
687+
{View.signalText(() => resultSummary(Signal.get(compileResult)))}
688688
</div>
689689
<div class="output-shell">
690690
<pre class="output">
691-
{Node.signalText(() =>
691+
{View.signalText(() =>
692692
selectedOutput(Signal.get(compileResult), Signal.get(activeTab))
693693
)}
694694
</pre>
@@ -707,7 +707,7 @@ module App = {
707707
| None => "toast"
708708
}}
709709
>
710-
{Node.signalText(() =>
710+
{View.signalText(() =>
711711
switch Signal.get(shareToast) {
712712
| Some(message) => message
713713
| None => ""
@@ -718,4 +718,4 @@ module App = {
718718
}
719719
}
720720

721-
Node.mountById(<App />, "app")
721+
View.mountById(<App />, "app")

‎packages/dev-playground/src/SourceHighlight.res‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -227,5 +227,5 @@ let tokenClass = kind =>
227227

228228
let render = source =>
229229
tokenize(source)->Array.map(token =>
230-
<span class={tokenClass(token.kind)}> {Node.text(token.text)} </span>
230+
<span class={tokenClass(token.kind)}> {View.text(token.text)} </span>
231231
)

‎packages/dev-playground/src/SourceHighlight.resi‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
let render: string => array<Node.node>
1+
let render: string => array<View.node>

‎yarn.lock‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1423,7 +1423,7 @@ __metadata:
14231423
"@rescript/runtime": "npm:12.3.0"
14241424
rescript: "npm:12.3.0"
14251425
vite: "npm:^8.0.14"
1426-
xote: "npm:6.4.0"
1426+
xote: "npm:7.1.0"
14271427
languageName: unknown
14281428
linkType: soft
14291429

@@ -3559,12 +3559,12 @@ __metadata:
35593559
languageName: node
35603560
linkType: hard
35613561

3562-
"xote@npm:6.4.0":
3563-
version: 6.4.0
3564-
resolution: "xote@npm:6.4.0"
3562+
"xote@npm:7.1.0":
3563+
version: 7.1.0
3564+
resolution: "xote@npm:7.1.0"
35653565
dependencies:
35663566
rescript-signals: "npm:^3.1.0"
3567-
checksum: 10c0/80a580e283b9894223d719c9ab2eae97402097d8b5b49b5a2540de5f0f4d40f990e4c858aa387e9b5fc208bcd00b2b5d363511e582d64e09c47404ae521dad5f
3567+
checksum: 10c0/cf3e95269c5132aa9f03ef8d77365e583ae482ff90e1251c8c20063ee7ec8995e85b6869751db3c3a5df98e8fef60b15537a88f1e0a168ca0e24bed608e84c40
35683568
languageName: node
35693569
linkType: hard
35703570

0 commit comments

Comments
 (0)