fix unicode support (#6)

apps/app/package.json

@@ -42,6 +42,7 @@
     "node-fetch": "^2.6.7",
     "node-loader": "^2.0.0",
     "node-pty": "^0.10.1",
+    "os-locale": "^6.0.2",
     "vm": "^0.1.0",
     "webpack": "^5.72.0",
     "winston": "^3.8.2"

apps/app/src/nativeBridge/modules/terminalModule.ts

@@ -1,6 +1,7 @@
-import { BrowserWindow } from 'electron';
+import { app, BrowserWindow } from 'electron';
 import { IPty } from 'node-pty';
 import os from 'os';
+import { osLocaleSync } from 'os-locale';
 
 import { moduleEvent, moduleFunction, NativeBridgeModule, nativeBridgeModule } from '../module';
 import { Logger } from './common/logger';
@@ -19,10 +20,18 @@ class PTYInstance {
       (process.platform === 'win32' ? 'cmd.exe' : '/bin/bash');
 
     this.ptyProcess = require('node-pty').spawn(shell, [], {
-      name: 'xterm-color',
+      name: 'xterm-256color',
       cols: cols,
       rows: rows,
       cwd: startupDirectory || os.homedir() || process.cwd(),
+      env: {
+        ...process.env,
+        LANG: `${osLocaleSync().replace(/-/, '_')}.UTF-8`,
+        TERM: 'xterm-256color',
+        COLORTERM: 'truecolor',
+        TERM_PROGRAM: app.name,
+        TERM_PROGRAM_VERSION: app.getVersion(),
+      },
     });
 
     Logger.getInstance().log('info', `Created new terminal with id: ${id}, size: ${cols}x${rows}, shell: ${shell}`);

apps/app/webpack.preload.config.js

@@ -13,6 +13,10 @@ module.exports = {
     electron: 'commonjs electron',
   },
   plugins: [
+    new webpack.NormalModuleReplacementPlugin(
+      /^os-locale$/,
+      path.resolve(__dirname, './dist/nativeBridge/emptyPolyfill.js'),
+    ),
     new webpack.NormalModuleReplacementPlugin(
       /^winston$/,
       path.resolve(__dirname, './dist/nativeBridge/emptyPolyfill.js'),

apps/terminal/components/Terminal/index.tsx

@@ -4,6 +4,7 @@ import { DEFAULT_CONFIG } from '@terminalone/types';
 import { useEffect, useRef } from 'react';
 import { Terminal as XTerm } from 'xterm';
 import { FitAddon } from 'xterm-addon-fit';
+import { Unicode11Addon } from 'xterm-addon-unicode11';
 import { WebglAddon } from 'xterm-addon-webgl';
 
 import { useConfigContext } from '../../hooks/ConfigContext';
@@ -28,13 +29,19 @@ const Terminal = ({ active, shellName }: { active: boolean; shellName: string })
     const xtermDiv = terminalRef.current;
 
     // TODO: refactor this into multiple effects
-    const xterm = new XTerm();
+    const xterm = new XTerm({
+      allowProposedApi: true,
+    });
 
     const webglAddon = new WebglAddon();
     xterm.loadAddon(webglAddon);
 
     const fitAddon = new FitAddon();
     xterm.loadAddon(fitAddon);
+
+    xterm.loadAddon(new Unicode11Addon());
+    xterm.unicode.activeVersion = '11';
+
     xterm.open(xtermDiv);
 
     const terminalId = (nextId++).toString();

apps/terminal/package.json

@@ -23,6 +23,7 @@
     "xterm": "^5.1.0",
     "xterm-addon-canvas": "^0.3.0",
     "xterm-addon-fit": "^0.7.0",
+    "xterm-addon-unicode11": "^0.5.0",
     "xterm-addon-webgl": "^0.14.0"
   },
   "devDependencies": {

package.json

@@ -1,7 +1,7 @@
 {
   "name": "@terminalone/monorepo",
   "productName": "Terminal One",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "description": "A fast, elegant and intelligent cross-platform terminal.",
   "author": "Kun Chen",
   "license": "MIT",

packages/types/config.ts

@@ -124,8 +124,8 @@ export const validateConfig = (config: unknown): Config => {
 
 export const DEFAULT_CONFIG: ResolvedConfig = {
   scrollback: 10000,
-  cursorBlink: false,
-  cursorStyle: 'block',
+  cursorBlink: true,
+  cursorStyle: 'bar',
   cursorWidth: 1,
   fontSize: 16,
   fontFamily: 'Consolas, Menlo, monospace',