Move to xterm scoped image addon

thegecko · Nov 1, 2023 · 3a351bd · 3a351bd
1 parent 160d8bd
commit 3a351bd
Show file tree

Hide file tree

Showing 10 changed files with 144 additions and 153 deletions.
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -340,7 +340,7 @@
 							"vscode-textmate",
 							"worker_threads",
 							"@xterm/addon-canvas",
-							"xterm-addon-image",
+							"@xterm/addon-image",
 							"@xterm/addon-search",
 							"@xterm/addon-serialize",
 							"@xterm/addon-unicode11",
@@ -549,10 +549,6 @@
 								"when": "hasBrowser",
 								"pattern": "@xterm/addon-*"
 							}, // node module allowed even in /browser/
-							{
-								"when": "hasBrowser",
-								"pattern": "xterm-addon-image"
-							}, // node module allowed even in /browser/
 							{
 								"when": "hasBrowser",
 								"pattern": "vscode-textmate"
@@ -582,10 +578,6 @@
 								"when": "hasBrowser",
 								"pattern": "@xterm/addon-*"
 							}, // node module allowed even in /browser/
-							{
-								"when": "hasBrowser",
-								"pattern": "xterm-addon-image"
-							}, // node module allowed even in /browser/
 							{
 								"when": "hasBrowser",
 								"pattern": "vscode-textmate"

diff --git a/build/.webignore b/build/.webignore
@@ -18,23 +18,23 @@ jschardet/dist/jschardet.js
 
 vscode-textmate/webpack.config.js
 
-xterm/src/**
+@xterm/xterm/src/**
 
-xterm-addon-canvas/src/**
-xterm-addon-canvas/out/**
+@xterm/addon-canvas/src/**
+@xterm/addon-canvas/out/**
 
-xterm-addon-image/src/**
-xterm-addon-image/out/**
+@xterm/addon-image/src/**
+@xterm/addon-image/out/**
 
-xterm-addon-search/src/**
-xterm-addon-search/out/**
-xterm-addon-search/fixtures/**
+@xterm/addon-search/src/**
+@xterm/addon-search/out/**
+@xterm/addon-search/fixtures/**
 
-xterm-addon-unicode11/src/**
-xterm-addon-unicode11/out/**
+@xterm/addon-unicode11/src/**
+@xterm/addon-unicode11/out/**
 
-xterm-addon-webgl/src/**
-xterm-addon-webgl/out/**
+@xterm/addon-webgl/src/**
+@xterm/addon-webgl/out/**
 
 # This makes sure the model is included in the package
 !@vscode/vscode-languagedetection/model/**

diff --git a/package.json b/package.json
@@ -80,13 +80,14 @@
     "@vscode/windows-mutex": "^0.4.4",
     "@vscode/windows-process-tree": "^0.5.0",
     "@vscode/windows-registry": "^1.1.0",
-    "@xterm/addon-canvas": "0.6.0-beta.1",
-    "@xterm/addon-search": "0.14.0-beta.1",
-    "@xterm/addon-serialize": "0.12.0-beta.1",
-    "@xterm/addon-unicode11": "0.7.0-beta.1",
-    "@xterm/addon-webgl": "0.17.0-beta.1",
-    "@xterm/headless": "5.4.0-beta.1",
-    "@xterm/xterm": "5.4.0-beta.1",
+    "@xterm/addon-canvas": "0.6.0-beta.3",
+    "@xterm/addon-image": "0.7.0-beta.1",
+    "@xterm/addon-search": "0.14.0-beta.3",
+    "@xterm/addon-serialize": "0.12.0-beta.3",
+    "@xterm/addon-unicode11": "0.7.0-beta.3",
+    "@xterm/addon-webgl": "0.17.0-beta.3",
+    "@xterm/headless": "5.4.0-beta.3",
+    "@xterm/xterm": "5.4.0-beta.3",
     "graceful-fs": "4.2.11",
     "http-proxy-agent": "^7.0.0",
     "https-proxy-agent": "^7.0.2",
@@ -103,7 +104,6 @@
     "vscode-oniguruma": "1.7.0",
     "vscode-regexpp": "^3.1.0",
     "vscode-textmate": "9.0.0",
-    "xterm-addon-image": "0.6.0-beta.21",
     "yauzl": "^2.9.2",
     "yazl": "^2.4.3"
   },

diff --git a/remote/package.json b/remote/package.json
@@ -13,13 +13,14 @@
     "@vscode/vscode-languagedetection": "1.0.21",
     "@vscode/windows-process-tree": "^0.5.0",
     "@vscode/windows-registry": "^1.1.0",
-    "@xterm/addon-canvas": "0.6.0-beta.1",
-    "@xterm/addon-search": "0.14.0-beta.1",
-    "@xterm/addon-serialize": "0.12.0-beta.1",
-    "@xterm/addon-unicode11": "0.7.0-beta.1",
-    "@xterm/addon-webgl": "0.17.0-beta.1",
-    "@xterm/headless": "5.4.0-beta.1",
-    "@xterm/xterm": "5.4.0-beta.1",
+    "@xterm/addon-canvas": "0.6.0-beta.3",
+    "@xterm/addon-image": "0.7.0-beta.1",
+    "@xterm/addon-search": "0.14.0-beta.3",
+    "@xterm/addon-serialize": "0.12.0-beta.3",
+    "@xterm/addon-unicode11": "0.7.0-beta.3",
+    "@xterm/addon-webgl": "0.17.0-beta.3",
+    "@xterm/headless": "5.4.0-beta.3",
+    "@xterm/xterm": "5.4.0-beta.3",
     "cookie": "^0.4.0",
     "graceful-fs": "4.2.11",
     "http-proxy-agent": "^7.0.0",
@@ -33,7 +34,6 @@
     "vscode-oniguruma": "1.7.0",
     "vscode-regexpp": "^3.1.0",
     "vscode-textmate": "9.0.0",
-    "xterm-addon-image": "0.6.0-beta.21",
     "yauzl": "^2.9.2",
     "yazl": "^2.4.3"
   }

diff --git a/remote/web/package.json b/remote/web/package.json
@@ -7,15 +7,15 @@
 		"@microsoft/1ds-post-js": "^3.2.13",
 		"@vscode/iconv-lite-umd": "0.7.0",
 		"@vscode/vscode-languagedetection": "1.0.21",
-		"@xterm/addon-canvas": "0.6.0-beta.1",
-		"@xterm/addon-search": "0.14.0-beta.1",
-		"@xterm/addon-unicode11": "0.7.0-beta.1",
-		"@xterm/addon-webgl": "0.17.0-beta.1",
-		"@xterm/xterm": "5.4.0-beta.1",
+		"@xterm/addon-canvas": "0.6.0-beta.3",
+		"@xterm/addon-image": "0.7.0-beta.1",
+		"@xterm/addon-search": "0.14.0-beta.3",
+		"@xterm/addon-unicode11": "0.7.0-beta.3",
+		"@xterm/addon-webgl": "0.17.0-beta.3",
+		"@xterm/xterm": "5.4.0-beta.3",
 		"jschardet": "3.0.0",
 		"tas-client-umd": "0.1.8",
 		"vscode-oniguruma": "1.7.0",
-		"vscode-textmate": "9.0.0",
-		"xterm-addon-image": "0.6.0-beta.21"
+		"vscode-textmate": "9.0.0"
 	}
 }
diff --git a/remote/web/yarn.lock b/remote/web/yarn.lock
@@ -48,30 +48,35 @@
   resolved "https://registry.yarnpkg.com/@vscode/vscode-languagedetection/-/vscode-languagedetection-1.0.21.tgz#89b48f293f6aa3341bb888c1118d16ff13b032d3"
   integrity sha512-zSUH9HYCw5qsCtd7b31yqkpaCU6jhtkKLkvOOA8yTrIRfBSOFb8PPhgmMicD7B/m+t4PwOJXzU1XDtrM9Fd3/g==
 
-"@xterm/addon-canvas@0.6.0-beta.1":
-  version "0.6.0-beta.1"
-  resolved "https://registry.yarnpkg.com/@xterm/addon-canvas/-/addon-canvas-0.6.0-beta.1.tgz#d55e8a2877110f62f39e5d43ce35082d1a70d153"
-  integrity sha512-WQgEQa0t7D0JG6Pkgf0XqFaB9v2RuQq+/GhCZyyFN8jU/5T7zAMuZyuDgunffzB68YLymaMtsXoVeI4KMO9gAQ==
+"@xterm/addon-canvas@0.6.0-beta.3":
+  version "0.6.0-beta.3"
+  resolved "https://registry.yarnpkg.com/@xterm/addon-canvas/-/addon-canvas-0.6.0-beta.3.tgz#8edc590eb6173079fa43eb536377b2f8897cca4a"
+  integrity sha512-iZWtIRU2jaarLGLNhH4z+szObkERN3IEZ90zgAykEBIkxkuTJkq/8UvNaBBsXlrfutr/dlbKeZFEI3H3zSjp2Q==
 
-"@xterm/addon-search@0.14.0-beta.1":
-  version "0.14.0-beta.1"
-  resolved "https://registry.yarnpkg.com/@xterm/addon-search/-/addon-search-0.14.0-beta.1.tgz#92cd959f2200b419d09f30f561bf0d574418571c"
-  integrity sha512-XPY5vn4ML7+W7lYwIeJu3CXh4Pw/oQ853s6gEng9+33VvREuzcPRr3aNBToQ0UMxmEkZmVtcKh2o1hbGl64deQ==
-
-"@xterm/addon-unicode11@0.7.0-beta.1":
+"@xterm/addon-image@0.7.0-beta.1":
   version "0.7.0-beta.1"
-  resolved "https://registry.yarnpkg.com/@xterm/addon-unicode11/-/addon-unicode11-0.7.0-beta.1.tgz#e4480e31632b363fb914e74e6d9f5e138d9c1f3b"
-  integrity sha512-4FUzF1hMCSK0WcpRZ1GxJlCAb+XEiJxUqv01/GQzEaGwbFUHd7Ekh2zxe8+2NvNXp/PpSaCny5kjKoxNxzrhRQ==
+  resolved "https://registry.yarnpkg.com/@xterm/addon-image/-/addon-image-0.7.0-beta.1.tgz#8d1df39db103442d18e61d05f1665f49ac7f19a9"
+  integrity sha512-c+wB+ODtKgWaQHvw1442R63Ivu10cYjelOYob1J6r5VKFD9DQCofyiMC9BLJsS7kJMmg9A7KWtUCTwvcbR3HQg==
+
+"@xterm/addon-search@0.14.0-beta.3":
+  version "0.14.0-beta.3"
+  resolved "https://registry.yarnpkg.com/@xterm/addon-search/-/addon-search-0.14.0-beta.3.tgz#caf4b928888d83511e227efde678473ed403d955"
+  integrity sha512-rl0riCMmP9vSkbeNucNVXlK72K9yT+iabpbeTiCydGBimI2ylhNffuUzNPru/jJZl52PSw3AejkhB98/JWfE8A==
 
-"@xterm/addon-webgl@0.17.0-beta.1":
-  version "0.17.0-beta.1"
-  resolved "https://registry.yarnpkg.com/@xterm/addon-webgl/-/addon-webgl-0.17.0-beta.1.tgz#905a6bb98b14ab5799b8f2349838a6f061b068c1"
-  integrity sha512-SRUh8dFYmD8U37gGGl9+oV+D304wumkV7eoxvD53J5HQERSKAwk3YeIIVUGWu6q6pifjUgGqfiKCIQwbHZ6QIQ==
+"@xterm/addon-unicode11@0.7.0-beta.3":
+  version "0.7.0-beta.3"
+  resolved "https://registry.yarnpkg.com/@xterm/addon-unicode11/-/addon-unicode11-0.7.0-beta.3.tgz#092a3c685307d3c0135404f15e8b2e32495f2d86"
+  integrity sha512-ex2Xf94pXhGTvK7VBp57FRl8gP/aQiFMRddPnwDykQb0qwx/ZAfm+oIByrbGWXm0DZFZUCvmXke2Xk7kMojBEw==
 
-"@xterm/xterm@5.4.0-beta.1":
-  version "5.4.0-beta.1"
-  resolved "https://registry.yarnpkg.com/@xterm/xterm/-/xterm-5.4.0-beta.1.tgz#4937b0c4171e5ee7b05839f4438b4b7192852e0f"
-  integrity sha512-e5dokYOdC0AiBRIRLKCxHqOmLyGsqAdYwalu2d+cTMXRX/gCiTWNmJoVISD6LPUUc6jYKHhfOH/WWa0LYsF8gw==
+"@xterm/addon-webgl@0.17.0-beta.3":
+  version "0.17.0-beta.3"
+  resolved "https://registry.yarnpkg.com/@xterm/addon-webgl/-/addon-webgl-0.17.0-beta.3.tgz#947641632142439d1a8fabcf2850cf3aa6dad0ac"
+  integrity sha512-RCmBVYgZNNUbMSUT5rQZbV8AnNP1IyGeBZh6D4u4qpVSapQN6OlX72raXx7qyy1aoD9dRbE0YhOOHTz8o/wnuA==
+
+"@xterm/xterm@5.4.0-beta.3":
+  version "5.4.0-beta.3"
+  resolved "https://registry.yarnpkg.com/@xterm/xterm/-/xterm-5.4.0-beta.3.tgz#ea91a83cf3d532beabe7420f4e4842fc294efce5"
+  integrity sha512-fj88EsJGLkvK+/IMb1V1irjYRrOBVDM31RK+zKTmqqhFAQih/Zkw7ZRBRm+gfpOfcnIrqA/BNt1l+ZnpDUsVzA==
 
 jschardet@3.0.0:
   version "3.0.0"
@@ -92,8 +97,3 @@ vscode-textmate@9.0.0:
   version "9.0.0"
   resolved "https://registry.yarnpkg.com/vscode-textmate/-/vscode-textmate-9.0.0.tgz#313c6c8792b0507aef35aeb81b6b370b37c44d6c"
   integrity sha512-Cl65diFGxz7gpwbav10HqiY/eVYTO1sjQpmRmV991Bj7wAoOAjGQ97PpQcXorDE2Uc4hnGWLY17xme+5t6MlSg==
-
-xterm-addon-image@0.6.0-beta.21:
-  version "0.6.0-beta.21"
-  resolved "https://registry.yarnpkg.com/xterm-addon-image/-/xterm-addon-image-0.6.0-beta.21.tgz#e3708bc504c56a23ff31f12a2eeb335331a92aac"
-  integrity sha512-8/PTaXVPa4kQ0xzVeuZZk10OpbZBj2cgfwhM2B0ChSPvwrk0lX+ksnXdtDKH3tg+JYvo7fIhNXtkr4NwWt7VJQ==
diff --git a/remote/yarn.lock b/remote/yarn.lock
@@ -113,40 +113,45 @@
   resolved "https://registry.yarnpkg.com/@vscode/windows-registry/-/windows-registry-1.1.0.tgz#03dace7c29c46f658588b9885b9580e453ad21f9"
   integrity sha512-5AZzuWJpGscyiMOed0IuyEwt6iKmV5Us7zuwCDCFYMIq7tsvooO9BUiciywsvuthGz6UG4LSpeDeCxvgMVhnIw==
 
-"@xterm/addon-canvas@0.6.0-beta.1":
-  version "0.6.0-beta.1"
-  resolved "https://registry.yarnpkg.com/@xterm/addon-canvas/-/addon-canvas-0.6.0-beta.1.tgz#d55e8a2877110f62f39e5d43ce35082d1a70d153"
-  integrity sha512-WQgEQa0t7D0JG6Pkgf0XqFaB9v2RuQq+/GhCZyyFN8jU/5T7zAMuZyuDgunffzB68YLymaMtsXoVeI4KMO9gAQ==
-
-"@xterm/addon-search@0.14.0-beta.1":
-  version "0.14.0-beta.1"
-  resolved "https://registry.yarnpkg.com/@xterm/addon-search/-/addon-search-0.14.0-beta.1.tgz#92cd959f2200b419d09f30f561bf0d574418571c"
-  integrity sha512-XPY5vn4ML7+W7lYwIeJu3CXh4Pw/oQ853s6gEng9+33VvREuzcPRr3aNBToQ0UMxmEkZmVtcKh2o1hbGl64deQ==
-
-"@xterm/addon-serialize@0.12.0-beta.1":
-  version "0.12.0-beta.1"
-  resolved "https://registry.yarnpkg.com/@xterm/addon-serialize/-/addon-serialize-0.12.0-beta.1.tgz#8e6d1b7b768b3b3554f94d0cac2780626bec70ee"
-  integrity sha512-4OlJqjGww0cXKgtL1LDH3KMwE1XZ85P9dHEE29lijoamXp2MyoBuRwLYV0r/dR4J0a3ejzbToy95oH17S0cRJQ==
-
-"@xterm/addon-unicode11@0.7.0-beta.1":
-  version "0.7.0-beta.1"
-  resolved "https://registry.yarnpkg.com/@xterm/addon-unicode11/-/addon-unicode11-0.7.0-beta.1.tgz#e4480e31632b363fb914e74e6d9f5e138d9c1f3b"
-  integrity sha512-4FUzF1hMCSK0WcpRZ1GxJlCAb+XEiJxUqv01/GQzEaGwbFUHd7Ekh2zxe8+2NvNXp/PpSaCny5kjKoxNxzrhRQ==
-
-"@xterm/addon-webgl@0.17.0-beta.1":
-  version "0.17.0-beta.1"
-  resolved "https://registry.yarnpkg.com/@xterm/addon-webgl/-/addon-webgl-0.17.0-beta.1.tgz#905a6bb98b14ab5799b8f2349838a6f061b068c1"
-  integrity sha512-SRUh8dFYmD8U37gGGl9+oV+D304wumkV7eoxvD53J5HQERSKAwk3YeIIVUGWu6q6pifjUgGqfiKCIQwbHZ6QIQ==
-
-"@xterm/headless@5.4.0-beta.1":
-  version "5.4.0-beta.1"
-  resolved "https://registry.yarnpkg.com/@xterm/headless/-/headless-5.4.0-beta.1.tgz#c037483de35cd39e504b46159376e870c220fd69"
-  integrity sha512-MeOj9OO17pJteenDYYYxkymtYrb9+1Yshwnjy0sRTA3MOSC5CPW5MajZPriCvs3qSVTxudPLGbLNEVBSX4QEHg==
+"@xterm/addon-canvas@0.6.0-beta.3":
+  version "0.6.0-beta.3"
+  resolved "https://registry.yarnpkg.com/@xterm/addon-canvas/-/addon-canvas-0.6.0-beta.3.tgz#8edc590eb6173079fa43eb536377b2f8897cca4a"
+  integrity sha512-iZWtIRU2jaarLGLNhH4z+szObkERN3IEZ90zgAykEBIkxkuTJkq/8UvNaBBsXlrfutr/dlbKeZFEI3H3zSjp2Q==
 
-"@xterm/xterm@5.4.0-beta.1":
-  version "5.4.0-beta.1"
-  resolved "https://registry.yarnpkg.com/@xterm/xterm/-/xterm-5.4.0-beta.1.tgz#4937b0c4171e5ee7b05839f4438b4b7192852e0f"
-  integrity sha512-e5dokYOdC0AiBRIRLKCxHqOmLyGsqAdYwalu2d+cTMXRX/gCiTWNmJoVISD6LPUUc6jYKHhfOH/WWa0LYsF8gw==
+"@xterm/addon-image@0.7.0-beta.1":
+  version "0.7.0-beta.1"
+  resolved "https://registry.yarnpkg.com/@xterm/addon-image/-/addon-image-0.7.0-beta.1.tgz#8d1df39db103442d18e61d05f1665f49ac7f19a9"
+  integrity sha512-c+wB+ODtKgWaQHvw1442R63Ivu10cYjelOYob1J6r5VKFD9DQCofyiMC9BLJsS7kJMmg9A7KWtUCTwvcbR3HQg==
+
+"@xterm/addon-search@0.14.0-beta.3":
+  version "0.14.0-beta.3"
+  resolved "https://registry.yarnpkg.com/@xterm/addon-search/-/addon-search-0.14.0-beta.3.tgz#caf4b928888d83511e227efde678473ed403d955"
+  integrity sha512-rl0riCMmP9vSkbeNucNVXlK72K9yT+iabpbeTiCydGBimI2ylhNffuUzNPru/jJZl52PSw3AejkhB98/JWfE8A==
+
+"@xterm/addon-serialize@0.12.0-beta.3":
+  version "0.12.0-beta.3"
+  resolved "https://registry.yarnpkg.com/@xterm/addon-serialize/-/addon-serialize-0.12.0-beta.3.tgz#cf3402b8d9ab4ab4291a628f81005a5984976d34"
+  integrity sha512-Vin62EC2FZdlvQnvGBqE4rHwchKMasJqg7C7CFrqvpLwBekPg2tYN5SjyiMtjfN3G95wj0qhqil0hxUVG3JmWw==
+
+"@xterm/addon-unicode11@0.7.0-beta.3":
+  version "0.7.0-beta.3"
+  resolved "https://registry.yarnpkg.com/@xterm/addon-unicode11/-/addon-unicode11-0.7.0-beta.3.tgz#092a3c685307d3c0135404f15e8b2e32495f2d86"
+  integrity sha512-ex2Xf94pXhGTvK7VBp57FRl8gP/aQiFMRddPnwDykQb0qwx/ZAfm+oIByrbGWXm0DZFZUCvmXke2Xk7kMojBEw==
+
+"@xterm/addon-webgl@0.17.0-beta.3":
+  version "0.17.0-beta.3"
+  resolved "https://registry.yarnpkg.com/@xterm/addon-webgl/-/addon-webgl-0.17.0-beta.3.tgz#947641632142439d1a8fabcf2850cf3aa6dad0ac"
+  integrity sha512-RCmBVYgZNNUbMSUT5rQZbV8AnNP1IyGeBZh6D4u4qpVSapQN6OlX72raXx7qyy1aoD9dRbE0YhOOHTz8o/wnuA==
+
+"@xterm/headless@5.4.0-beta.3":
+  version "5.4.0-beta.3"
+  resolved "https://registry.yarnpkg.com/@xterm/headless/-/headless-5.4.0-beta.3.tgz#9fe1920b6eba59066469735bacfbd6d840cadc20"
+  integrity sha512-LfRIURZRpyECQPTfw6PH581ibt6Vt4o/cG7DykfgxRITknFO69yu6DrmTXJy1uTLXkGcXmujn1fCoodjk9z9UA==
+
+"@xterm/xterm@5.4.0-beta.3":
+  version "5.4.0-beta.3"
+  resolved "https://registry.yarnpkg.com/@xterm/xterm/-/xterm-5.4.0-beta.3.tgz#ea91a83cf3d532beabe7420f4e4842fc294efce5"
+  integrity sha512-fj88EsJGLkvK+/IMb1V1irjYRrOBVDM31RK+zKTmqqhFAQih/Zkw7ZRBRm+gfpOfcnIrqA/BNt1l+ZnpDUsVzA==
 
 agent-base@^7.0.1, agent-base@^7.0.2, agent-base@^7.1.0:
   version "7.1.0"
@@ -624,11 +629,6 @@ wrappy@1:
   resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
   integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=
 
-xterm-addon-image@0.6.0-beta.21:
-  version "0.6.0-beta.21"
-  resolved "https://registry.yarnpkg.com/xterm-addon-image/-/xterm-addon-image-0.6.0-beta.21.tgz#e3708bc504c56a23ff31f12a2eeb335331a92aac"
-  integrity sha512-8/PTaXVPa4kQ0xzVeuZZk10OpbZBj2cgfwhM2B0ChSPvwrk0lX+ksnXdtDKH3tg+JYvo7fIhNXtkr4NwWt7VJQ==
-
 yallist@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72"

diff --git a/scripts/update-xterm.js b/scripts/update-xterm.js
@@ -9,11 +9,10 @@ const path = require('path');
 const moduleNames = [
 	'@xterm/xterm',
 	'@xterm/addon-canvas',
+	'@xterm/addon-image',
 	'@xterm/addon-search',
 	'@xterm/addon-unicode11',
 	'@xterm/addon-webgl',
-	// TODO: Pick up scoped image addon when published
-	'xterm-addon-image',
 ];
 
 const backendOnlyModuleNames = [

diff --git a/src/vs/workbench/contrib/terminal/browser/xterm/xtermTerminal.ts b/src/vs/workbench/contrib/terminal/browser/xterm/xtermTerminal.ts
@@ -9,7 +9,7 @@ import type { ISearchOptions, SearchAddon as SearchAddonType } from '@xterm/addo
 import type { Unicode11Addon as Unicode11AddonType } from '@xterm/addon-unicode11';
 import type { WebglAddon as WebglAddonType } from '@xterm/addon-webgl';
 import type { SerializeAddon as SerializeAddonType } from '@xterm/addon-serialize';
-import type { ImageAddon as ImageAddonType } from 'xterm-addon-image';
+import type { ImageAddon as ImageAddonType } from '@xterm/addon-image';
 import * as dom from 'vs/base/browser/dom';
 import { IXtermCore } from 'vs/workbench/contrib/terminal/browser/xterm-private';
 import { ConfigurationTarget, IConfigurationService } from 'vs/platform/configuration/common/configuration';
@@ -791,35 +791,35 @@ export class XtermTerminal extends Disposable implements IXtermTerminal, IDetach
 
 	protected async _getImageAddonConstructor(): Promise<typeof ImageAddonType> {
 		if (!ImageAddon) {
-			ImageAddon = (await importAMDNodeModule<typeof import('xterm-addon-image')>('xterm-addon-image', 'lib/xterm-addon-image.js')).ImageAddon;
+			ImageAddon = (await importAMDNodeModule<typeof import('@xterm/addon-image')>('@xterm/addon-image', 'lib/addon-image.js')).ImageAddon;
 		}
 		return ImageAddon;
 	}
 
 	protected async _getSearchAddonConstructor(): Promise<typeof SearchAddonType> {
 		if (!SearchAddon) {
-			SearchAddon = (await importAMDNodeModule<typeof import('@xterm/addon-search')>('@xterm/addon-search', 'lib/xterm-addon-search.js')).SearchAddon;
+			SearchAddon = (await importAMDNodeModule<typeof import('@xterm/addon-search')>('@xterm/addon-search', 'lib/addon-search.js')).SearchAddon;
 		}
 		return SearchAddon;
 	}
 
 	protected async _getUnicode11Constructor(): Promise<typeof Unicode11AddonType> {
 		if (!Unicode11Addon) {
-			Unicode11Addon = (await importAMDNodeModule<typeof import('@xterm/addon-unicode11')>('@xterm/addon-unicode11', 'lib/xterm-addon-unicode11.js')).Unicode11Addon;
+			Unicode11Addon = (await importAMDNodeModule<typeof import('@xterm/addon-unicode11')>('@xterm/addon-unicode11', 'lib/addon-unicode11.js')).Unicode11Addon;
 		}
 		return Unicode11Addon;
 	}
 
 	protected async _getWebglAddonConstructor(): Promise<typeof WebglAddonType> {
 		if (!WebglAddon) {
-			WebglAddon = (await importAMDNodeModule<typeof import('@xterm/addon-webgl')>('@xterm/addon-webgl', 'lib/xterm-addon-webgl.js')).WebglAddon;
+			WebglAddon = (await importAMDNodeModule<typeof import('@xterm/addon-webgl')>('@xterm/addon-webgl', 'lib/addon-webgl.js')).WebglAddon;
 		}
 		return WebglAddon;
 	}
 
 	protected async _getSerializeAddonConstructor(): Promise<typeof SerializeAddonType> {
 		if (!SerializeAddon) {
-			SerializeAddon = (await importAMDNodeModule<typeof import('@xterm/addon-serialize')>('@xterm/addon-serialize', 'lib/xterm-addon-serialize.js')).SerializeAddon;
+			SerializeAddon = (await importAMDNodeModule<typeof import('@xterm/addon-serialize')>('@xterm/addon-serialize', 'lib/addon-serialize.js')).SerializeAddon;
 		}
 		return SerializeAddon;
 	}