Merge branch 'main' into transfer-repo

speced · Jun 5, 2024 · 27a6425 · 27a6425
2 parents 224a472 + 8baa4c0
commit 27a6425
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 4 deletions.
diff --git a/src/core/xref.js b/src/core/xref.js
@@ -478,7 +478,9 @@ function showErrors({ ambiguous, notFound }) {
  const formUrl = getPrefilledFormURL(originalTerm, query, specs);
  const forParent = query.for ? `, for **"${query.for}"**, ` : "";
  const moreInfo = howToFix(formUrl, originalTerm);
- const hint = docLink`To fix, use the ${"[data-cite]"} attribute to pick the one you mean from the appropriate specification. ${moreInfo}.`;
+ const hint =
+ docLink`To fix, use the ${"[data-cite]"} attribute to pick the one you mean from the appropriate specification.` +
+ String.raw` ${moreInfo}`;
  const msg = `The term "**${originalTerm}**"${forParent} is ambiguous because it's defined in ${specsString}.`;
  const title = "Definition is ambiguous.";
  showError(msg, name, { title, elements: elems, hint });

diff --git a/tools/netlify.cjs b/tools/netlify.cjs
@@ -117,7 +117,7 @@ function buildHTML(profiles, specsByProfile) {
  </style>
  </head>
  <body>
- <form action="https://respec-preview.netlify.com/">
+ <form action="https://respec-preview.netlify.app/">
  <h2>${title}</h2>
  <h3>Commit: ${COMMIT_REF}</h3>
  <fieldset>

diff --git a/tools/respec2html.js b/tools/respec2html.js
@@ -184,7 +184,12 @@ cli
  "Abort if ReSpec generates warnings (or errors).",
  false
  )
- .option("--disable-sandbox", "Disable Chromium sandboxing if needed.", false)
+ .option(
+ "--sandbox",
+ "Disable Chromium sandboxing if needed, with --no-sandbox.",
+ true
+ )
+ .option("--disable-sandbox", "Alias of --no-sandbox.", false)
  .option("--devtools", "Enable debugging and show Chrome's DevTools.", false)
  .option("--verbose", "Log processing status to stdout.", false)
  .option("--localhost", "Spin up a local server to perform processing.", false)
@@ -201,6 +206,11 @@ cli.action(async (source, destination, opts) => {
  process.exit(1);
  }
 
+ if (opts["disable-sandbox"]) {
+ opts.sandbox = false;
+ delete opts["disable-sandbox"];
+ }
+
  try {
  await run(source, destination, opts, log);
  process.exit(0);
@@ -247,7 +257,7 @@ async function run(source, destination, options, log) {
  onError: log.error.bind(log),
  onWarning: log.warn.bind(log),
  onProgress: log.info.bind(log),
- disableSandbox: options["disable-sandbox"],
+ disableSandbox: !options.sandbox,
  devtools: options.devtools,
  });