diff --git a/package.json b/package.json
index e4cbee185..b8e0dfd16 100644
--- a/package.json
+++ b/package.json
@@ -17,5 +17,12 @@
"prettier": "^3.4.2",
"tailwindcss": "^3.4.13",
"vite": "^6.0"
+ },
+ "dependencies": {
+ "@xterm/addon-fit": "^0.10.0",
+ "@xterm/addon-search": "^0.15.0",
+ "@xterm/addon-web-links": "^0.11.0",
+ "@xterm/xterm": "^5.5.0",
+ "xterm-addon-search-bar": "^0.2.0"
}
}
diff --git a/public/css/filament/server/console.css b/resources/css/console.css
similarity index 95%
rename from public/css/filament/server/console.css
rename to resources/css/console.css
index 51c2d8957..33207307a 100644
--- a/public/css/filament/server/console.css
+++ b/resources/css/console.css
@@ -1,3 +1,4 @@
+@import url('@xterm/xterm/css/xterm.css');
#terminal {
border-top-left-radius: 10px;
diff --git a/resources/js/console.js b/resources/js/console.js
new file mode 100644
index 000000000..9a5c0cfc8
--- /dev/null
+++ b/resources/js/console.js
@@ -0,0 +1,13 @@
+import { Terminal } from '@xterm/xterm';
+import { FitAddon } from '@xterm/addon-fit';
+import { WebLinksAddon } from '@xterm/addon-web-links';
+import { SearchAddon } from '@xterm/addon-search';
+import { SearchBarAddon } from 'xterm-addon-search-bar';
+
+window.Xterm = {
+ Terminal,
+ FitAddon,
+ WebLinksAddon,
+ SearchAddon,
+ SearchBarAddon,
+};
diff --git a/resources/views/filament/components/server-console.blade.php b/resources/views/filament/components/server-console.blade.php
index b7ddf0537..4a1c15851 100644
--- a/resources/views/filament/components/server-console.blade.php
+++ b/resources/views/filament/components/server-console.blade.php
@@ -14,13 +14,7 @@
}
@endif
-
-
-
-
-
-
-
+ @vite(['resources/js/console.js', 'resources/css/console.css'])
@endassets
@@ -82,12 +76,13 @@
theme: theme
};
- const terminal = new Terminal(options);
- const fitAddon = new FitAddon.FitAddon();
- const webLinksAddon = new WebLinksAddon.WebLinksAddon();
- const searchAddon = new SearchAddon.SearchAddon();
- const searchAddonBar = new SearchBarAddon.SearchBarAddon({ searchAddon });
+ const { Terminal, FitAddon, WebLinksAddon, SearchAddon, SearchBarAddon } = window.Xterm;
+ const terminal = new Terminal(options);
+ const fitAddon = new FitAddon();
+ const webLinksAddon = new WebLinksAddon();
+ const searchAddon = new SearchAddon();
+ const searchAddonBar = new SearchBarAddon({ searchAddon });
terminal.loadAddon(fitAddon);
terminal.loadAddon(webLinksAddon);
terminal.loadAddon(searchAddon);
diff --git a/vite.config.js b/vite.config.js
index b77171277..445a94453 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -1,14 +1,16 @@
import { defineConfig } from 'vite';
-import laravel, { refreshPaths } from 'laravel-vite-plugin'
+import laravel, { refreshPaths } from 'laravel-vite-plugin';
export default defineConfig({
plugins: [
laravel({
- input: ['resources/css/app.css', 'resources/js/app.js'],
- refresh: [
- ...refreshPaths,
- 'app/Livewire/**',
+ input: [
+ 'resources/css/app.css',
+ 'resources/js/app.js',
+ 'resources/js/console.js',
+ 'resources/css/console.css',
],
+ refresh: [...refreshPaths, 'app/Livewire/**'],
}),
],
});
diff --git a/yarn.lock b/yarn.lock
index 46c463bac..344c9367f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -329,6 +329,26 @@
resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.6.tgz#628effeeae2064a1b4e79f78e81d87b7e5fc7b50"
integrity sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw==
+"@xterm/addon-fit@^0.10.0":
+ version "0.10.0"
+ resolved "https://registry.yarnpkg.com/@xterm/addon-fit/-/addon-fit-0.10.0.tgz#bebf87fadd74e3af30fdcdeef47030e2592c6f55"
+ integrity sha512-UFYkDm4HUahf2lnEyHvio51TNGiLK66mqP2JoATy7hRZeXaGMRDr00JiSF7m63vR5WKATF605yEggJKsw0JpMQ==
+
+"@xterm/addon-search@^0.15.0":
+ version "0.15.0"
+ resolved "https://registry.yarnpkg.com/@xterm/addon-search/-/addon-search-0.15.0.tgz#5c772d5f14c26546c4bfbeb0c3d4b3333057411f"
+ integrity sha512-ZBZKLQ+EuKE83CqCmSSz5y1tx+aNOCUaA7dm6emgOX+8J9H1FWXZyrKfzjwzV+V14TV3xToz1goIeRhXBS5qjg==
+
+"@xterm/addon-web-links@^0.11.0":
+ version "0.11.0"
+ resolved "https://registry.yarnpkg.com/@xterm/addon-web-links/-/addon-web-links-0.11.0.tgz#f283513b8c713757bad8e3bf04b6becc3b4e585f"
+ integrity sha512-nIHQ38pQI+a5kXnRaTgwqSHnX7KE6+4SVoceompgHL26unAxdfP6IPqUTSYPQgSwM56hsElfoNrrW5V7BUED/Q==
+
+"@xterm/xterm@^5.5.0":
+ version "5.5.0"
+ resolved "https://registry.yarnpkg.com/@xterm/xterm/-/xterm-5.5.0.tgz#275fb8f6e14afa6e8a0c05d4ebc94523ff775396"
+ integrity sha512-hqJHYaQb5OptNunnyAnkHyM8aCjZ1MEIDTQu1iIbbTD/xops91NB5yq1ZK/dC2JDbVWtF23zUtl9JE2NqwT87A==
+
ansi-regex@^5.0.1:
version "5.0.1"
resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304"
@@ -395,6 +415,14 @@ axios@^1.7.4:
form-data "^4.0.0"
proxy-from-env "^1.1.0"
+babel-runtime@^6.26.0:
+ version "6.26.0"
+ resolved "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.26.0.tgz#965c7058668e82b55d7bfe04ff2337bc8b5647fe"
+ integrity sha512-ITKNuq2wKlW1fJg9sSW52eepoYgZBggvOAHC0u/CYu/qxQ9EVzThCgR69BnSXLHjy2f7SY5zaQ4yt7H9ZVxY2g==
+ dependencies:
+ core-js "^2.4.0"
+ regenerator-runtime "^0.11.0"
+
balanced-match@^1.0.0:
version "1.0.2"
resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee"
@@ -508,6 +536,11 @@ concurrently@^9.0.1:
tree-kill "^1.2.2"
yargs "^17.7.2"
+core-js@^2.4.0:
+ version "2.6.12"
+ resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.12.tgz#d9333dfa7b065e347cc5682219d6f690859cc2ec"
+ integrity sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ==
+
cross-spawn@^7.0.0:
version "7.0.6"
resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.6.tgz#8a58fe78f00dcd70c370451759dfbfaf03e8ee9f"
@@ -1027,6 +1060,11 @@ readdirp@~3.6.0:
dependencies:
picomatch "^2.2.1"
+regenerator-runtime@^0.11.0:
+ version "0.11.1"
+ resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz#be05ad7f9bf7d22e056f9726cee5017fbf19e2e9"
+ integrity sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==
+
require-directory@^2.1.1:
version "2.1.1"
resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
@@ -1081,6 +1119,11 @@ run-parallel@^1.1.9:
dependencies:
queue-microtask "^1.2.2"
+rxjs-compat@^6.5.4:
+ version "6.6.7"
+ resolved "https://registry.yarnpkg.com/rxjs-compat/-/rxjs-compat-6.6.7.tgz#6eb4ef75c0a58ea672854a701ccc8d49f41e69cb"
+ integrity sha512-szN4fK+TqBPOFBcBcsR0g2cmTTUF/vaFEOZNuSdfU8/pGFnNmmn2u8SystYXG1QMrjOPBc6XTKHMVfENDf6hHw==
+
rxjs@^7.8.1:
version "7.8.1"
resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-7.8.1.tgz#6f6f3d99ea8044291efd92e7c7fcf562c4057543"
@@ -1325,6 +1368,14 @@ wrap-ansi@^8.1.0:
string-width "^5.0.1"
strip-ansi "^7.0.1"
+xterm-addon-search-bar@^0.2.0:
+ version "0.2.0"
+ resolved "https://registry.yarnpkg.com/xterm-addon-search-bar/-/xterm-addon-search-bar-0.2.0.tgz#e03c020a5ed22f1e8d503946b26a14ade508bc91"
+ integrity sha512-xvXmBA/ShbnzGe5CCy0kqPNNGqjkpuaRgH3Z1iW0V71vCAPRrtJ/v/hMnysZBH7WGUYhlCQr1cJZagW2fBVvSg==
+ dependencies:
+ babel-runtime "^6.26.0"
+ rxjs-compat "^6.5.4"
+
y18n@^5.0.5:
version "5.0.8"
resolved "https://registry.yarnpkg.com/y18n/-/y18n-5.0.8.tgz#7f4934d0f7ca8c56f95314939ddcd2dd91ce1d55"