Merge pull request #2180 from xtermjs/remove_package_scope

Remove @xtermjs package scope

addons/xterm-addon-attach/package.json

@@ -1,15 +1,15 @@
 {
-  "name": "@xtermjs/addon-attach",
-  "version": "0.1.0-beta8",
+  "name": "xterm-addon-attach",
+  "version": "0.1.0-beta10",
   "author": {
     "name": "The xterm.js authors",
     "url": "https://xtermjs.org/"
   },
   "main": "lib/AttachAddon.js",
-  "types": "typings/attach.d.ts",
+  "types": "typings/xterm-addon-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"

addons/xterm-addon-attach/src/tsconfig.json

@@ -14,6 +14,6 @@
   },
   "include": [
     "./**/*",
-    "../../../../typings/xterm.d.ts"
+    "../../../typings/xterm.d.ts"
   ]
 }

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`.

addons/xterm-addon-fit/package.json

@@ -1,15 +1,15 @@
 {
-  "name": "@xtermjs/addon-fit",
-  "version": "0.1.0-beta7",
+  "name": "xterm-addon-fit",
+  "version": "0.1.0-beta2",
   "author": {
     "name": "The xterm.js authors",
     "url": "https://xtermjs.org/"
   },
   "main": "lib/FitAddon.js",
-  "types": "typings/fit.d.ts",
+  "types": "typings/xterm-addon-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"

addons/xterm-addon-fit/src/tsconfig.json

@@ -14,6 +14,6 @@
   },
   "include": [
     "./**/*",
-    "../../../../typings/xterm.d.ts"
+    "../../../typings/xterm.d.ts"
   ]
 }

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.

addons/xterm-addon-search/package.json

@@ -1,15 +1,15 @@
 {
-  "name": "@xtermjs/addon-search",
-  "version": "0.1.0-beta4",
+  "name": "xterm-addon-search",
+  "version": "0.1.0-beta5",
   "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"

addons/xterm-addon-search/src/tsconfig.json

@@ -13,6 +13,6 @@
   },
   "include": [
     "./**/*",
-    "../../../../typings/xterm.d.ts"
+    "../../../typings/xterm.d.ts"
   ]
 }

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.
    */

addons/xterm-addon-web-links/package.json

@@ -1,15 +1,15 @@
 {
-  "name": "@xtermjs/addon-web-links",
-  "version": "0.1.0-beta7",
+  "name": "xterm-addon-web-links",
+  "version": "0.1.0-beta9",
   "author": {
     "name": "The xterm.js authors",
     "url": "https://xtermjs.org/"
   },
   "main": "lib/WebLinksAddon.js",
-  "types": "typings/web-links.d.ts",
+  "types": "typings/xterm-addon-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"

addons/xterm-addon-web-links/src/tsconfig.json

@@ -14,6 +14,6 @@
   },
   "include": [
     "./**/*",
-    "../../../../typings/xterm.d.ts"
+    "../../../typings/xterm.d.ts"
   ]
 }

addons/xterm-addon-web-links/typings/xterm-addon-web-links.d.ts

@@ -4,14 +4,9 @@
  */
 
 
-import { Terminal, IDisposable, ILinkMatcherOptions } from 'xterm';
-
-declare module '@xtermjs/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;
-  }
+import { Terminal, ILinkMatcherOptions, ITerminalAddon } from 'xterm';
 
+declare module 'xterm-addon-web-links' {
   /**
    * An xterm.js addon that enables web links.
    */

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 <reference> above, it's looks a
 // little weird here as we're importing "this" module

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": [

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",

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" }
   ]
 }