Skip to content

Commit 61169d9

Browse files
authored
Merge pull request #13541 from quarto-dev/revealjs/change-multiplex-url
2 parents b4d7127 + 860692e commit 61169d9

File tree

16 files changed

+333
-13
lines changed

16 files changed

+333
-13
lines changed

.github/workflows/test-smokes.yml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,15 @@ jobs:
8383
with:
8484
node-version: 20
8585

86+
- name: Cache multiplex server node_modules
87+
if: ${{ runner.os != 'Windows' || github.event_name == 'schedule' }}
88+
uses: actions/cache@v4
89+
with:
90+
path: tests/integration/playwright/multiplex-server/node_modules
91+
key: ${{ runner.os }}-multiplex-server-${{ hashFiles('tests/integration/playwright/multiplex-server/package.json') }}
92+
restore-keys: |
93+
${{ runner.os }}-multiplex-server-
94+
8695
- name: Install node dependencies
8796
if: ${{ runner.os != 'Windows' || github.event_name == 'schedule' }}
8897
run: yarn

news/changelog-1.9.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ All changes included in 1.9:
44

55
- ([#13396](https://github.com/quarto-dev/quarto-cli/issues/13396)): Fix `quarto publish connect` regression.
66
- ([#13441](https://github.com/quarto-dev/quarto-cli/pull/13441)): Catch `undefined` exceptions in Pandoc failure to avoid spurious error message.
7+
- ([#13046](https://github.com/quarto-dev/quarto-cli/issues/13046)): Use new url for multiplex socket.io server <https://multiplex.up.railway.app/> as default for `format: revealjs` and `revealjs.multiplex: true`.
78

89
## Dependencies
910

src/format/reveal/format-reveal-multiplex.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ interface RevealMultiplexToken {
104104
url: string;
105105
}
106106

107-
const kDefaultMultiplexUrl = "https://reveal-multiplex.glitch.me/";
107+
const kDefaultMultiplexUrl = "https://multiplex.up.railway.app/";
108108

109109
async function revealMultiplexToken(
110110
format: Format,

src/resources/editor/tools/vs-code.mjs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19300,7 +19300,7 @@ var require_yaml_intelligence_resources = __commonJS({
1930019300
properties: {
1930119301
url: {
1930219302
string: {
19303-
default: "https://reveal-multiplex.glitch.me/",
19303+
default: "https://multiplex.up.railway.app/",
1930419304
description: "Multiplex token server (defaults to Reveal-hosted server)\n"
1930519305
}
1930619306
},

src/resources/editor/tools/yaml/web-worker.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/resources/editor/tools/yaml/yaml-intelligence-resources.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12272,7 +12272,7 @@
1227212272
"properties": {
1227312273
"url": {
1227412274
"string": {
12275-
"default": "https://reveal-multiplex.glitch.me/",
12275+
"default": "https://multiplex.up.railway.app/",
1227612276
"description": "Multiplex token server (defaults to Reveal-hosted server)\n"
1227712277
}
1227812278
},

src/resources/formats/revealjs/plugins/multiplex/plugin.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ config:
55
multiplex:
66
secret: null
77
id: null
8-
url: "https://reveal-multiplex.glitch.me/"
8+
url: "https://multiplex.up.railway.app/"

src/resources/schema/document-reveal-tools.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@
8787
properties:
8888
url:
8989
string:
90-
default: https://reveal-multiplex.glitch.me/
90+
default: https://multiplex.up.railway.app/
9191
description: |
9292
Multiplex token server (defaults to Reveal-hosted server)
9393
id:
Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
---
2+
title: "Multiplex Test Presentation"
3+
format:
4+
revealjs:
5+
multiplex:
6+
url: "http://127.0.0.1:1948/"
7+
# setting secret and id is required to avoid having multiplex server running at render time
8+
secret: "c04998070a4ec17940ab3c52101daefd"
9+
id: "52d3aedefbff55dbe54e1fa5229df99b849a33951c7c09afb6bcf7e6f33233c7"
10+
---
11+
12+
## Slide 1 {#slide-1}
13+
14+
This is the first slide.
15+
16+
## Slide 2 {#slide-2}
17+
18+
This is the second slide with some content.
19+
20+
## Slide 3 {#slide-3}
21+
22+
### Fragment Test
23+
24+
::: {.fragment}
25+
Fragment 1
26+
:::
27+
28+
::: {.fragment}
29+
Fragment 2
30+
:::
31+
32+
## Slide 4 {#slide-4}
33+
34+
Final slide with more content.

tests/integration/playwright-tests.test.ts

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ import { execProcess } from "../../src/core/process.ts";
1616
import { quartoDevCmd } from "../utils.ts";
1717
import { fail } from "testing/asserts";
1818
import { isWindows } from "../../src/deno_ral/platform.ts";
19+
import { join } from "../../src/deno_ral/path.ts";
20+
import { existsSync } from "../../src/deno_ral/fs.ts";
1921

2022
async function fullInit() {
2123
await initYamlIntelligenceResourcesFromFilesystem();
@@ -30,6 +32,19 @@ const globOutput = Deno.args.length
3032
setInitializer(fullInit);
3133
await initState();
3234

35+
// Install multiplex server dependencies if needed
36+
const multiplexServerPath = "integration/playwright/multiplex-server";
37+
const multiplexNodeModules = join(multiplexServerPath, "node_modules");
38+
if (!existsSync(multiplexNodeModules)) {
39+
console.log("Installing multiplex server dependencies...");
40+
await execProcess({
41+
cmd: isWindows ? "npm.cmd" : "npm",
42+
args: ["install", "--loglevel=error"],
43+
cwd: multiplexServerPath,
44+
});
45+
console.log("Multiplex server dependencies installed.");
46+
}
47+
3348
// const promises = [];
3449
const fileNames: string[] = [];
3550
const extraOpts = [
@@ -52,7 +67,7 @@ for (const { path: fileName } of globOutput) {
5267
// mediabag inspection if we don't wait all renders
5368
// individually. This is very slow..
5469
await execProcess({
55-
cmd: quartoDevCmd(),
70+
cmd: quartoDevCmd(),
5671
args: ["render", input, ...options],
5772
});
5873
fileNames.push(fileName);

0 commit comments

Comments
 (0)