fix(client): inline xterm.css to avoid FOUC (#65679)

2026-05-28 10:22:16 +00:00 · 2026-02-13 09:07:12 +01:00
parent 7b3d135df6
commit 26a5b67c36
6 changed files with 234 additions and 21 deletions
@@ -0,0 +1,231 @@
+/**
+ * Copyright (c) 2014 The xterm.js authors. All rights reserved.
+ * Copyright (c) 2012-2013, Christopher Jeffrey (MIT License)
+ * https://github.com/chjj/term.js
+ * @license MIT
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ * Originally forked from (with the author's permission):
+ *   Fabrice Bellard's javascript vt100 for jslinux:
+ *   http://bellard.org/jslinux/
+ *   Copyright (c) 2011 Fabrice Bellard
+ *   The original design remains. The terminal itself
+ *   has been extended to include xterm CSI codes, among
+ *   other features.
+ */
+
+/**
+ *  Default styles for xterm.js
+ */
+
+.xterm {
+  cursor: text;
+  position: relative;
+  user-select: none;
+  -ms-user-select: none;
+  -webkit-user-select: none;
+}
+
+.xterm.focus,
+.xterm:focus {
+  outline: none;
+}
+
+.xterm .xterm-helpers {
+  position: absolute;
+  top: 0;
+  /**
+     * The z-index of the helpers must be higher than the canvases in order for
+     * IMEs to appear on top.
+     */
+  z-index: 5;
+}
+
+.xterm .xterm-helper-textarea {
+  padding: 0;
+  border: 0;
+  margin: 0;
+  /* Move textarea out of the screen to the far left, so that the cursor is not visible */
+  position: absolute;
+  opacity: 0;
+  left: -9999em;
+  top: 0;
+  width: 0;
+  height: 0;
+  z-index: -5;
+  /** Prevent wrapping so the IME appears against the textarea at the correct position */
+  white-space: nowrap;
+  overflow: hidden;
+  resize: none;
+}
+
+.xterm .composition-view {
+  /* TODO: Composition position got messed up somewhere */
+  background: #000;
+  color: #fff;
+  display: none;
+  position: absolute;
+  white-space: nowrap;
+  z-index: 1;
+}
+
+.xterm .composition-view.active {
+  display: block;
+}
+
+.xterm .xterm-viewport {
+  /* On OS X this is required in order for the scroll bar to appear fully opaque */
+  background-color: #000;
+  overflow-y: scroll;
+  cursor: default;
+  position: absolute;
+  right: 0;
+  left: 0;
+  top: 0;
+  bottom: 0;
+}
+
+.xterm .xterm-screen {
+  position: relative;
+}
+
+.xterm .xterm-screen canvas {
+  position: absolute;
+  left: 0;
+  top: 0;
+}
+
+.xterm .xterm-scroll-area {
+  visibility: hidden;
+}
+
+.xterm-char-measure-element {
+  display: inline-block;
+  visibility: hidden;
+  position: absolute;
+  top: 0;
+  left: -9999em;
+  line-height: normal;
+}
+
+.xterm.enable-mouse-events {
+  /* When mouse events are enabled (eg. tmux), revert to the standard pointer cursor */
+  cursor: default;
+}
+
+.xterm.xterm-cursor-pointer,
+.xterm .xterm-cursor-pointer {
+  cursor: pointer;
+}
+
+.xterm.column-select.focus {
+  /* Column selection mode */
+  cursor: crosshair;
+}
+
+.xterm .xterm-accessibility,
+.xterm .xterm-message {
+  position: absolute;
+  left: 0;
+  top: 0;
+  bottom: 0;
+  right: 0;
+  z-index: 10;
+  color: transparent;
+  pointer-events: none;
+}
+
+.xterm .live-region {
+  position: absolute;
+  left: -9999px;
+  width: 1px;
+  height: 1px;
+  overflow: hidden;
+}
+
+.xterm-dim {
+  /* Dim should not apply to background, so the opacity of the foreground color is applied
+     * explicitly in the generated class and reset to 1 here */
+  opacity: 1 !important;
+}
+
+.xterm-underline-1 {
+  text-decoration: underline;
+}
+.xterm-underline-2 {
+  text-decoration: double underline;
+}
+.xterm-underline-3 {
+  text-decoration: wavy underline;
+}
+.xterm-underline-4 {
+  text-decoration: dotted underline;
+}
+.xterm-underline-5 {
+  text-decoration: dashed underline;
+}
+
+.xterm-overline {
+  text-decoration: overline;
+}
+
+.xterm-overline.xterm-underline-1 {
+  text-decoration: overline underline;
+}
+.xterm-overline.xterm-underline-2 {
+  text-decoration: overline double underline;
+}
+.xterm-overline.xterm-underline-3 {
+  text-decoration: overline wavy underline;
+}
+.xterm-overline.xterm-underline-4 {
+  text-decoration: overline dotted underline;
+}
+.xterm-overline.xterm-underline-5 {
+  text-decoration: overline dashed underline;
+}
+
+.xterm-strikethrough {
+  text-decoration: line-through;
+}
+
+.xterm-screen .xterm-decoration-container .xterm-decoration {
+  z-index: 6;
+  position: absolute;
+}
+
+.xterm-screen
+  .xterm-decoration-container
+  .xterm-decoration.xterm-decoration-top-layer {
+  z-index: 7;
+}
+
+.xterm-decoration-overview-ruler {
+  z-index: 8;
+  position: absolute;
+  top: 0;
+  right: 0;
+  pointer-events: none;
+}
+
+.xterm-decoration-top {
+  z-index: 2;
+  position: relative;
+}
@@ -5,6 +5,7 @@ import { useTranslation } from 'react-i18next';

 import { registerTerminal } from '../utils/python-worker-handler';
 import './xterm.css';
+import './xterm-original.css';

 const registerServiceWorker = async () => {
  if ('serviceWorker' in navigator) {
@@ -142,8 +143,6 @@ export const XtermTerminal = ({
      data-playwright-test-label='xterm-terminal'
      style={{ height: dimensions?.height }}
      ref={termContainerRef}
-    >
-      <link rel='stylesheet' href='/css/xterm.css' />
-    </div>
+    ></div>
  );
 };
@@ -9,19 +9,12 @@ const browserScriptDist = resolve(

 const destJsDir = resolve(__dirname, '../static/js');
 const srcJsDir = resolve(browserScriptDist, './js');
-const destCssDir = resolve(__dirname, '../static/css');
-const srcCssDir = resolve(browserScriptDist, './css');

 // Everything is done synchronously to keep the script simple. There's no
 // performance benefit to doing this asynchronously since it's already so fast.
 rmSync(destJsDir, { recursive: true, force: true });
-rmSync(destCssDir, { recursive: true, force: true });
 mkdirSync(destJsDir, { recursive: true });
-mkdirSync(destCssDir, { recursive: true });

 cpSync(srcJsDir, destJsDir, {
  recursive: true
 });
-cpSync(srcCssDir, destCssDir, {
-  recursive: true
-});
@@ -1123,9 +1123,6 @@ importers:
      sass.js:
        specifier: 0.11.1
        version: 0.11.1
-      xterm:
-        specifier: ^5.2.1
-        version: 5.3.0
    devDependencies:
      '@babel/plugin-syntax-dynamic-import':
        specifier: 7.8.3
@@ -9,20 +9,14 @@ const __dirname = import.meta.dirname;
 const distDir = resolve(__dirname, 'dist');

 const destJsDir = resolve(distDir, './js');
-const destCssDir = resolve(distDir, './css');

 rmSync(distDir, { recursive: true, force: true });
 mkdirSync(destJsDir, { recursive: true });
-mkdirSync(destCssDir, { recursive: true });

 cpSync(
  resolve(__dirname, './node_modules/sass.js/dist/sass.sync.js'),
  resolve(destJsDir, 'workers', workerVersion, 'sass.sync.js')
 );
-cpSync(
-  resolve(__dirname, './node_modules/xterm/css/xterm.css'),
-  resolve(destCssDir, 'xterm.css')
-);
 cpSync(
  resolve(
    __dirname,
@@ -54,7 +54,6 @@
  "dependencies": {
    "@freecodecamp/curriculum-helpers": "^7.2.0",
    "pyodide": "^0.23.3",
-    "sass.js": "0.11.1",
-    "xterm": "^5.2.1"
+    "sass.js": "0.11.1"
  }
 }