From d4be839d8d85b405284a19d6f54d693c8bad37ca Mon Sep 17 00:00:00 2001 From: Daniel Imms Date: Tue, 4 Jun 2019 11:07:11 -0700 Subject: [PATCH] Remove @xtermjs package scope Too big of a change for now, I think we should do this when/if we move to GH package registry (we would have to I think). --- .../addon-attach => xterm-addon-attach}/.gitignore | 0 .../addon-attach => xterm-addon-attach}/.npmignore | 0 .../{@xtermjs/addon-attach => xterm-addon-attach}/LICENSE | 0 .../addon-attach => xterm-addon-attach}/package.json | 4 ++-- .../src/AttachAddon.api.ts | 0 .../src/AttachAddon.ts | 0 .../addon-attach => xterm-addon-attach}/src/tsconfig.json | 2 +- .../typings/xterm-addon-attach.d.ts} | 2 +- addons/{@xtermjs/addon-fit => xterm-addon-fit}/.gitignore | 0 addons/{@xtermjs/addon-fit => xterm-addon-fit}/.npmignore | 0 addons/{@xtermjs/addon-fit => xterm-addon-fit}/LICENSE | 0 .../{@xtermjs/addon-fit => xterm-addon-fit}/package.json | 4 ++-- .../addon-fit => xterm-addon-fit}/src/FitAddon.ts | 0 .../addon-fit => xterm-addon-fit}/src/tsconfig.json | 2 +- .../typings/xterm-addon-fit.d.ts} | 2 +- .../addon-search => xterm-addon-search}/.gitignore | 0 .../addon-search => xterm-addon-search}/.npmignore | 0 .../{@xtermjs/addon-search => xterm-addon-search}/LICENSE | 0 .../addon-search => xterm-addon-search}/package.json | 6 +++--- .../src/SearchAddon.ts | 0 .../addon-search => xterm-addon-search}/src/tsconfig.json | 2 +- .../typings/xterm-addon-search.d.ts} | 2 +- .../addon-web-links => xterm-addon-web-links}/.gitignore | 0 .../addon-web-links => xterm-addon-web-links}/.npmignore | 0 .../addon-web-links => xterm-addon-web-links}/LICENSE | 0 .../addon-web-links => xterm-addon-web-links}/README.md | 0 .../package.json | 4 ++-- .../src/WebLinksAddon.api.ts | 0 .../src/WebLinksAddon.ts | 0 .../src/tsconfig.json | 2 +- .../typings/xterm-addon-web-links.d.ts} | 2 +- demo/client.ts | 8 ++++---- demo/tsconfig.json | 8 ++++---- package.json | 2 +- tsconfig.all.json | 8 ++++---- 35 files changed, 30 insertions(+), 30 deletions(-) rename addons/{@xtermjs/addon-attach => xterm-addon-attach}/.gitignore (100%) rename addons/{@xtermjs/addon-attach => xterm-addon-attach}/.npmignore (100%) rename addons/{@xtermjs/addon-attach => xterm-addon-attach}/LICENSE (100%) rename addons/{@xtermjs/addon-attach => xterm-addon-attach}/package.json (74%) rename addons/{@xtermjs/addon-attach => xterm-addon-attach}/src/AttachAddon.api.ts (100%) rename addons/{@xtermjs/addon-attach => xterm-addon-attach}/src/AttachAddon.ts (100%) rename addons/{@xtermjs/addon-attach => xterm-addon-attach}/src/tsconfig.json (88%) rename addons/{@xtermjs/addon-attach/typings/attach.d.ts => xterm-addon-attach/typings/xterm-addon-attach.d.ts} (95%) rename addons/{@xtermjs/addon-fit => xterm-addon-fit}/.gitignore (100%) rename addons/{@xtermjs/addon-fit => xterm-addon-fit}/.npmignore (100%) rename addons/{@xtermjs/addon-fit => xterm-addon-fit}/LICENSE (100%) rename addons/{@xtermjs/addon-fit => xterm-addon-fit}/package.json (74%) rename addons/{@xtermjs/addon-fit => xterm-addon-fit}/src/FitAddon.ts (100%) rename addons/{@xtermjs/addon-fit => xterm-addon-fit}/src/tsconfig.json (88%) rename addons/{@xtermjs/addon-fit/typings/fit.d.ts => xterm-addon-fit/typings/xterm-addon-fit.d.ts} (96%) rename addons/{@xtermjs/addon-search => xterm-addon-search}/.gitignore (100%) rename addons/{@xtermjs/addon-search => xterm-addon-search}/.npmignore (100%) rename addons/{@xtermjs/addon-search => xterm-addon-search}/LICENSE (100%) rename addons/{@xtermjs/addon-search => xterm-addon-search}/package.json (64%) rename addons/{@xtermjs/addon-search => xterm-addon-search}/src/SearchAddon.ts (100%) rename addons/{@xtermjs/addon-search => xterm-addon-search}/src/tsconfig.json (87%) rename addons/{@xtermjs/addon-search/typings/search.d.ts => xterm-addon-search/typings/xterm-addon-search.d.ts} (97%) rename addons/{@xtermjs/addon-web-links => xterm-addon-web-links}/.gitignore (100%) rename addons/{@xtermjs/addon-web-links => xterm-addon-web-links}/.npmignore (100%) rename addons/{@xtermjs/addon-web-links => xterm-addon-web-links}/LICENSE (100%) rename addons/{@xtermjs/addon-web-links => xterm-addon-web-links}/README.md (100%) rename addons/{@xtermjs/addon-web-links => xterm-addon-web-links}/package.json (73%) rename addons/{@xtermjs/addon-web-links => xterm-addon-web-links}/src/WebLinksAddon.api.ts (100%) rename addons/{@xtermjs/addon-web-links => xterm-addon-web-links}/src/WebLinksAddon.ts (100%) rename addons/{@xtermjs/addon-web-links => xterm-addon-web-links}/src/tsconfig.json (88%) rename addons/{@xtermjs/addon-web-links/typings/web-links.d.ts => xterm-addon-web-links/typings/xterm-addon-web-links.d.ts} (95%) diff --git a/addons/@xtermjs/addon-attach/.gitignore b/addons/xterm-addon-attach/.gitignore similarity index 100% rename from addons/@xtermjs/addon-attach/.gitignore rename to addons/xterm-addon-attach/.gitignore diff --git a/addons/@xtermjs/addon-attach/.npmignore b/addons/xterm-addon-attach/.npmignore similarity index 100% rename from addons/@xtermjs/addon-attach/.npmignore rename to addons/xterm-addon-attach/.npmignore diff --git a/addons/@xtermjs/addon-attach/LICENSE b/addons/xterm-addon-attach/LICENSE similarity index 100% rename from addons/@xtermjs/addon-attach/LICENSE rename to addons/xterm-addon-attach/LICENSE diff --git a/addons/@xtermjs/addon-attach/package.json b/addons/xterm-addon-attach/package.json similarity index 74% rename from addons/@xtermjs/addon-attach/package.json rename to addons/xterm-addon-attach/package.json index 84664474..20d0ec21 100644 --- a/addons/@xtermjs/addon-attach/package.json +++ b/addons/xterm-addon-attach/package.json @@ -1,5 +1,5 @@ { - "name": "@xtermjs/addon-attach", + "name": "xterm-addon-attach", "version": "0.1.0-beta8", "author": { "name": "The xterm.js authors", @@ -9,7 +9,7 @@ "types": "typings/attach.d.ts", "license": "MIT", "scripts": { - "prepublishOnly": "../../../node_modules/.bin/tsc -p src" + "prepublishOnly": "../../node_modules/.bin/tsc -p src" }, "peerDependencies": { "xterm": "^3.14.0" diff --git a/addons/@xtermjs/addon-attach/src/AttachAddon.api.ts b/addons/xterm-addon-attach/src/AttachAddon.api.ts similarity index 100% rename from addons/@xtermjs/addon-attach/src/AttachAddon.api.ts rename to addons/xterm-addon-attach/src/AttachAddon.api.ts diff --git a/addons/@xtermjs/addon-attach/src/AttachAddon.ts b/addons/xterm-addon-attach/src/AttachAddon.ts similarity index 100% rename from addons/@xtermjs/addon-attach/src/AttachAddon.ts rename to addons/xterm-addon-attach/src/AttachAddon.ts diff --git a/addons/@xtermjs/addon-attach/src/tsconfig.json b/addons/xterm-addon-attach/src/tsconfig.json similarity index 88% rename from addons/@xtermjs/addon-attach/src/tsconfig.json rename to addons/xterm-addon-attach/src/tsconfig.json index d7338b28..9a92ab48 100644 --- a/addons/@xtermjs/addon-attach/src/tsconfig.json +++ b/addons/xterm-addon-attach/src/tsconfig.json @@ -14,6 +14,6 @@ }, "include": [ "./**/*", - "../../../../typings/xterm.d.ts" + "../../../typings/xterm.d.ts" ] } diff --git a/addons/@xtermjs/addon-attach/typings/attach.d.ts b/addons/xterm-addon-attach/typings/xterm-addon-attach.d.ts similarity index 95% rename from addons/@xtermjs/addon-attach/typings/attach.d.ts rename to addons/xterm-addon-attach/typings/xterm-addon-attach.d.ts index 90538bf6..8c667140 100644 --- a/addons/@xtermjs/addon-attach/typings/attach.d.ts +++ b/addons/xterm-addon-attach/typings/xterm-addon-attach.d.ts @@ -5,7 +5,7 @@ import { Terminal, ILinkMatcherOptions, ITerminalAddon } from 'xterm'; -declare module '@xtermjs/addon-attach' { +declare module 'xterm-addon-attach' { export interface IAttachOptions { /** * Whether input should be written to the backend. Defaults to `true`. diff --git a/addons/@xtermjs/addon-fit/.gitignore b/addons/xterm-addon-fit/.gitignore similarity index 100% rename from addons/@xtermjs/addon-fit/.gitignore rename to addons/xterm-addon-fit/.gitignore diff --git a/addons/@xtermjs/addon-fit/.npmignore b/addons/xterm-addon-fit/.npmignore similarity index 100% rename from addons/@xtermjs/addon-fit/.npmignore rename to addons/xterm-addon-fit/.npmignore diff --git a/addons/@xtermjs/addon-fit/LICENSE b/addons/xterm-addon-fit/LICENSE similarity index 100% rename from addons/@xtermjs/addon-fit/LICENSE rename to addons/xterm-addon-fit/LICENSE diff --git a/addons/@xtermjs/addon-fit/package.json b/addons/xterm-addon-fit/package.json similarity index 74% rename from addons/@xtermjs/addon-fit/package.json rename to addons/xterm-addon-fit/package.json index a9cedf14..fe1f4cb7 100644 --- a/addons/@xtermjs/addon-fit/package.json +++ b/addons/xterm-addon-fit/package.json @@ -1,5 +1,5 @@ { - "name": "@xtermjs/addon-fit", + "name": "xterm-addon-fit", "version": "0.1.0-beta7", "author": { "name": "The xterm.js authors", @@ -9,7 +9,7 @@ "types": "typings/fit.d.ts", "license": "MIT", "scripts": { - "prepublishOnly": "../../../node_modules/.bin/tsc -p src" + "prepublishOnly": "../../node_modules/.bin/tsc -p src" }, "peerDependencies": { "xterm": "^3.14.0" diff --git a/addons/@xtermjs/addon-fit/src/FitAddon.ts b/addons/xterm-addon-fit/src/FitAddon.ts similarity index 100% rename from addons/@xtermjs/addon-fit/src/FitAddon.ts rename to addons/xterm-addon-fit/src/FitAddon.ts diff --git a/addons/@xtermjs/addon-fit/src/tsconfig.json b/addons/xterm-addon-fit/src/tsconfig.json similarity index 88% rename from addons/@xtermjs/addon-fit/src/tsconfig.json rename to addons/xterm-addon-fit/src/tsconfig.json index cff0857b..6b914e81 100644 --- a/addons/@xtermjs/addon-fit/src/tsconfig.json +++ b/addons/xterm-addon-fit/src/tsconfig.json @@ -14,6 +14,6 @@ }, "include": [ "./**/*", - "../../../../typings/xterm.d.ts" + "../../../typings/xterm.d.ts" ] } diff --git a/addons/@xtermjs/addon-fit/typings/fit.d.ts b/addons/xterm-addon-fit/typings/xterm-addon-fit.d.ts similarity index 96% rename from addons/@xtermjs/addon-fit/typings/fit.d.ts rename to addons/xterm-addon-fit/typings/xterm-addon-fit.d.ts index 5592a205..c3b0b4af 100644 --- a/addons/@xtermjs/addon-fit/typings/fit.d.ts +++ b/addons/xterm-addon-fit/typings/xterm-addon-fit.d.ts @@ -5,7 +5,7 @@ import { Terminal, ITerminalAddon } from 'xterm'; -declare module '@xtermjs/addon-fit' { +declare module 'xterm-addon-fit' { /** * An xterm.js addon that enables resizing the terminal to the dimensions of * its containing element. diff --git a/addons/@xtermjs/addon-search/.gitignore b/addons/xterm-addon-search/.gitignore similarity index 100% rename from addons/@xtermjs/addon-search/.gitignore rename to addons/xterm-addon-search/.gitignore diff --git a/addons/@xtermjs/addon-search/.npmignore b/addons/xterm-addon-search/.npmignore similarity index 100% rename from addons/@xtermjs/addon-search/.npmignore rename to addons/xterm-addon-search/.npmignore diff --git a/addons/@xtermjs/addon-search/LICENSE b/addons/xterm-addon-search/LICENSE similarity index 100% rename from addons/@xtermjs/addon-search/LICENSE rename to addons/xterm-addon-search/LICENSE diff --git a/addons/@xtermjs/addon-search/package.json b/addons/xterm-addon-search/package.json similarity index 64% rename from addons/@xtermjs/addon-search/package.json rename to addons/xterm-addon-search/package.json index 10ab67b5..e52d1a52 100644 --- a/addons/@xtermjs/addon-search/package.json +++ b/addons/xterm-addon-search/package.json @@ -1,15 +1,15 @@ { - "name": "@xtermjs/addon-search", + "name": "xterm-addon-search", "version": "0.1.0-beta4", "author": { "name": "The xterm.js authors", "url": "https://xtermjs.org/" }, "main": "lib/SearchAddon.js", - "types": "typings/search.d.ts", + "types": "typings/xterm-addon-search.d.ts", "license": "MIT", "scripts": { - "prepublishOnly": "../../../node_modules/.bin/tsc -p src" + "prepublishOnly": "../../node_modules/.bin/tsc -p src" }, "peerDependencies": { "xterm": "^3.14.0" diff --git a/addons/@xtermjs/addon-search/src/SearchAddon.ts b/addons/xterm-addon-search/src/SearchAddon.ts similarity index 100% rename from addons/@xtermjs/addon-search/src/SearchAddon.ts rename to addons/xterm-addon-search/src/SearchAddon.ts diff --git a/addons/@xtermjs/addon-search/src/tsconfig.json b/addons/xterm-addon-search/src/tsconfig.json similarity index 87% rename from addons/@xtermjs/addon-search/src/tsconfig.json rename to addons/xterm-addon-search/src/tsconfig.json index 4d23cc99..fcf70ba9 100644 --- a/addons/@xtermjs/addon-search/src/tsconfig.json +++ b/addons/xterm-addon-search/src/tsconfig.json @@ -13,6 +13,6 @@ }, "include": [ "./**/*", - "../../../../typings/xterm.d.ts" + "../../../typings/xterm.d.ts" ] } diff --git a/addons/@xtermjs/addon-search/typings/search.d.ts b/addons/xterm-addon-search/typings/xterm-addon-search.d.ts similarity index 97% rename from addons/@xtermjs/addon-search/typings/search.d.ts rename to addons/xterm-addon-search/typings/xterm-addon-search.d.ts index 276f0559..94bc5297 100644 --- a/addons/@xtermjs/addon-search/typings/search.d.ts +++ b/addons/xterm-addon-search/typings/xterm-addon-search.d.ts @@ -5,7 +5,7 @@ import { Terminal, ILinkMatcherOptions, IDisposable, ITerminalAddon } from 'xterm'; -declare module '@xtermjs/addon-search' { +declare module 'xterm-addon-search' { /** * Options for a search. */ diff --git a/addons/@xtermjs/addon-web-links/.gitignore b/addons/xterm-addon-web-links/.gitignore similarity index 100% rename from addons/@xtermjs/addon-web-links/.gitignore rename to addons/xterm-addon-web-links/.gitignore diff --git a/addons/@xtermjs/addon-web-links/.npmignore b/addons/xterm-addon-web-links/.npmignore similarity index 100% rename from addons/@xtermjs/addon-web-links/.npmignore rename to addons/xterm-addon-web-links/.npmignore diff --git a/addons/@xtermjs/addon-web-links/LICENSE b/addons/xterm-addon-web-links/LICENSE similarity index 100% rename from addons/@xtermjs/addon-web-links/LICENSE rename to addons/xterm-addon-web-links/LICENSE diff --git a/addons/@xtermjs/addon-web-links/README.md b/addons/xterm-addon-web-links/README.md similarity index 100% rename from addons/@xtermjs/addon-web-links/README.md rename to addons/xterm-addon-web-links/README.md diff --git a/addons/@xtermjs/addon-web-links/package.json b/addons/xterm-addon-web-links/package.json similarity index 73% rename from addons/@xtermjs/addon-web-links/package.json rename to addons/xterm-addon-web-links/package.json index 546fc12a..83ea31c6 100644 --- a/addons/@xtermjs/addon-web-links/package.json +++ b/addons/xterm-addon-web-links/package.json @@ -1,5 +1,5 @@ { - "name": "@xtermjs/addon-web-links", + "name": "xterm-addon-web-links", "version": "0.1.0-beta7", "author": { "name": "The xterm.js authors", @@ -9,7 +9,7 @@ "types": "typings/web-links.d.ts", "license": "MIT", "scripts": { - "prepublishOnly": "../../../node_modules/.bin/tsc -p src" + "prepublishOnly": "../../node_modules/.bin/tsc -p src" }, "peerDependencies": { "xterm": "^3.14.0" diff --git a/addons/@xtermjs/addon-web-links/src/WebLinksAddon.api.ts b/addons/xterm-addon-web-links/src/WebLinksAddon.api.ts similarity index 100% rename from addons/@xtermjs/addon-web-links/src/WebLinksAddon.api.ts rename to addons/xterm-addon-web-links/src/WebLinksAddon.api.ts diff --git a/addons/@xtermjs/addon-web-links/src/WebLinksAddon.ts b/addons/xterm-addon-web-links/src/WebLinksAddon.ts similarity index 100% rename from addons/@xtermjs/addon-web-links/src/WebLinksAddon.ts rename to addons/xterm-addon-web-links/src/WebLinksAddon.ts diff --git a/addons/@xtermjs/addon-web-links/src/tsconfig.json b/addons/xterm-addon-web-links/src/tsconfig.json similarity index 88% rename from addons/@xtermjs/addon-web-links/src/tsconfig.json rename to addons/xterm-addon-web-links/src/tsconfig.json index cff0857b..6b914e81 100644 --- a/addons/@xtermjs/addon-web-links/src/tsconfig.json +++ b/addons/xterm-addon-web-links/src/tsconfig.json @@ -14,6 +14,6 @@ }, "include": [ "./**/*", - "../../../../typings/xterm.d.ts" + "../../../typings/xterm.d.ts" ] } diff --git a/addons/@xtermjs/addon-web-links/typings/web-links.d.ts b/addons/xterm-addon-web-links/typings/xterm-addon-web-links.d.ts similarity index 95% rename from addons/@xtermjs/addon-web-links/typings/web-links.d.ts rename to addons/xterm-addon-web-links/typings/xterm-addon-web-links.d.ts index fdad5465..83a3474d 100644 --- a/addons/@xtermjs/addon-web-links/typings/web-links.d.ts +++ b/addons/xterm-addon-web-links/typings/xterm-addon-web-links.d.ts @@ -6,7 +6,7 @@ import { Terminal, IDisposable, ILinkMatcherOptions } from 'xterm'; -declare module '@xtermjs/addon-web-links' { +declare module 'xterm-addon-web-links' { // TODO: This is temporary, link to xterm when the new version is published export interface ITerminalAddon extends IDisposable { activate(terminal: Terminal): void; diff --git a/demo/client.ts b/demo/client.ts index 6a6de69b..1841e991 100644 --- a/demo/client.ts +++ b/demo/client.ts @@ -12,10 +12,10 @@ import { Terminal } from '../out/public/Terminal'; // Use webpacked version (yarn package) // import { Terminal } from '../lib/xterm'; -import { AttachAddon } from '@xtermjs/addon-attach'; -import { FitAddon } from '@xtermjs/addon-fit'; -import { SearchAddon, ISearchOptions } from '@xtermjs/addon-search'; -import { WebLinksAddon } from '@xtermjs/addon-web-links'; +import { AttachAddon } from 'xterm-addon-attach'; +import { FitAddon } from 'xterm-addon-fit'; +import { SearchAddon, ISearchOptions } from 'xterm-addon-search'; +import { WebLinksAddon } from 'xterm-addon-web-links'; // Pulling in the module's types relies on the above, it's looks a // little weird here as we're importing "this" module diff --git a/demo/tsconfig.json b/demo/tsconfig.json index b30e275d..2bf76f67 100644 --- a/demo/tsconfig.json +++ b/demo/tsconfig.json @@ -6,10 +6,10 @@ "sourceMap": true, "baseUrl": ".", "paths": { - "@xtermjs/addon-attach": ["../addons/@xtermjs/addon-attach"], - "@xtermjs/addon-fit": ["../addons/@xtermjs/addon-fit"], - "@xtermjs/addon-search": ["../addons/@xtermjs/addon-search"], - "@xtermjs/addon-web-links": ["../addons/@xtermjs/addon-web-links"] + "xterm-addon-attach": ["../addons/xterm-addon-attach"], + "xterm-addon-fit": ["../addons/xterm-addon-fit"], + "xterm-addon-search": ["../addons/xterm-addon-search"], + "xterm-addon-web-links": ["../addons/xterm-addon-web-links"] } }, "include": [ diff --git a/package.json b/package.json index 56b0bc43..16ebca92 100644 --- a/package.json +++ b/package.json @@ -19,7 +19,7 @@ "prepare": "npm run build", "prepublishOnly": "npm run package", "watch": "tsc -b -w ./tsconfig.all.json --preserveWatchOutput", - "clean": "rm -rf lib out addons/@xtermjs/*/lib" + "clean": "rm -rf lib out addons/*/lib" }, "devDependencies": { "@types/chai": "^3.4.34", diff --git a/tsconfig.all.json b/tsconfig.all.json index 8d38d012..4de8e9b5 100644 --- a/tsconfig.all.json +++ b/tsconfig.all.json @@ -3,9 +3,9 @@ "include": [], "references": [ { "path": "./src" }, - { "path": "./addons/@xtermjs/addon-attach/src" }, - { "path": "./addons/@xtermjs/addon-fit/src" }, - { "path": "./addons/@xtermjs/addon-search/src" }, - { "path": "./addons/@xtermjs/addon-web-links/src" } + { "path": "./addons/xterm-addon-attach/src" }, + { "path": "./addons/xterm-addon-fit/src" }, + { "path": "./addons/xterm-addon-search/src" }, + { "path": "./addons/xterm-addon-web-links/src" } ] }