chore: drop org in package names in imports

Signed-off-by: Kevin Viglucci <[email protected]>
candlecorp · Apr 25, 2022 · 32b3547 · 32b3547
1 parent 6e9fda5
commit 32b3547
Show file tree

Hide file tree

Showing 39 changed files with 75 additions and 75 deletions.
diff --git a/packages/rsocket-adapter-rxjs/package.json b/packages/rsocket-adapter-rxjs/package.json
@@ -14,8 +14,8 @@
     "test": "echo \"Error: no test specified\" && exit 0"
   },
   "dependencies": {
-    "@rsocket/core": "^1.0.0-alpha.1",
-    "@rsocket/messaging": "^1.0.0-alpha.1",
+    "rsocket-core": "^1.0.0-alpha.1",
+    "rsocket-messaging": "^1.0.0-alpha.1",
     "rxjs": "^7.4.0"
   },
   "devDependencies": {

diff --git a/...rsocket-adapter-rxjs/src/Observer2BufferingSubscriberToPublisher2PrefetchingObservable.ts b/...rsocket-adapter-rxjs/src/Observer2BufferingSubscriberToPublisher2PrefetchingObservable.ts
@@ -21,8 +21,8 @@ import {
   OnNextSubscriber,
   OnTerminalSubscriber,
   Requestable,
-} from "@rsocket/core";
-import { Codec } from "@rsocket/messaging";
+} from "rsocket-core";
+import { Codec } from "rsocket-messaging";
 import {
   asyncScheduler,
   Observable,

diff --git a/packages/rsocket-adapter-rxjs/src/ObserverToBufferingRSocketSubscriber.ts b/packages/rsocket-adapter-rxjs/src/ObserverToBufferingRSocketSubscriber.ts
@@ -20,8 +20,8 @@ import {
   OnNextSubscriber,
   OnTerminalSubscriber,
   Requestable,
-} from "@rsocket/core";
-import { Codec } from "@rsocket/messaging";
+} from "rsocket-core";
+import { Codec } from "rsocket-messaging";
 import { Observer, Subscription } from "rxjs";
 import { applyMixins } from "./Utils";
 

diff --git a/packages/rsocket-adapter-rxjs/src/ObserverToRSocketSubscriber.ts b/packages/rsocket-adapter-rxjs/src/ObserverToRSocketSubscriber.ts
@@ -19,8 +19,8 @@ import {
   OnExtensionSubscriber,
   OnNextSubscriber,
   OnTerminalSubscriber,
-} from "@rsocket/core";
-import { Codec } from "@rsocket/messaging";
+} from "rsocket-core";
+import { Codec } from "rsocket-messaging";
 import { Observer, Subscription } from "rxjs";
 
 export default class ObserverToRSocketSubscriber<T>

diff --git a/...r-rxjs/src/RSocketPublisher2PrefetchingObservableToObserver2BufferingRSocketSubscriber.ts b/...r-rxjs/src/RSocketPublisher2PrefetchingObservableToObserver2BufferingRSocketSubscriber.ts
@@ -21,8 +21,8 @@ import {
   OnTerminalSubscriber,
   Payload,
   Requestable,
-} from "@rsocket/core";
-import { Codec } from "@rsocket/messaging";
+} from "rsocket-core";
+import { Codec } from "rsocket-messaging";
 import { asyncScheduler, SchedulerLike, Subscriber, TeardownLogic } from "rxjs";
 import ObserverToBufferingRSocketSubscriber from "./ObserverToBufferingRSocketSubscriber";
 import RSocketPublisherToPrefetchingObservable from "./RSocketPublisherToPrefetchingObservable";

diff --git a/packages/rsocket-adapter-rxjs/src/RSocketPublisherToObservable.ts b/packages/rsocket-adapter-rxjs/src/RSocketPublisherToObservable.ts
@@ -20,8 +20,8 @@ import {
   OnNextSubscriber,
   OnTerminalSubscriber,
   Payload,
-} from "@rsocket/core";
-import { Codec } from "@rsocket/messaging";
+} from "rsocket-core";
+import { Codec } from "rsocket-messaging";
 import { Observable, Subscriber, TeardownLogic, Unsubscribable } from "rxjs";
 
 export default class RSocketPublisherToObservable<T>

diff --git a/packages/rsocket-adapter-rxjs/src/RSocketPublisherToPrefetchingObservable.ts b/packages/rsocket-adapter-rxjs/src/RSocketPublisherToPrefetchingObservable.ts
@@ -21,8 +21,8 @@ import {
   OnTerminalSubscriber,
   Payload,
   Requestable,
-} from "@rsocket/core";
-import { Codec } from "@rsocket/messaging";
+} from "rsocket-core";
+import { Codec } from "rsocket-messaging";
 import {
   asyncScheduler,
   Observable,

diff --git a/packages/rsocket-adapter-rxjs/src/Requesters.ts b/packages/rsocket-adapter-rxjs/src/Requesters.ts
@@ -19,16 +19,16 @@
 import {
   encodeCompositeMetadata,
   WellKnownMimeType,
-} from "@rsocket/composite-metadata";
+} from "rsocket-composite-metadata";
 import {
   Cancellable,
   OnExtensionSubscriber,
   OnNextSubscriber,
   OnTerminalSubscriber,
   Requestable,
   RSocket,
-} from "@rsocket/core";
-import { Codec } from "@rsocket/messaging";
+} from "rsocket-core";
+import { Codec } from "rsocket-messaging";
 import {
   asyncScheduler,
   concatMap,

diff --git a/packages/rsocket-adapter-rxjs/src/Responders.ts b/packages/rsocket-adapter-rxjs/src/Responders.ts
@@ -24,8 +24,8 @@ import {
   OnTerminalSubscriber,
   Payload,
   Requestable,
-} from "@rsocket/core";
-import { Codec } from "@rsocket/messaging";
+} from "rsocket-core";
+import { Codec } from "rsocket-messaging";
 import { asyncScheduler, Observable, SchedulerLike } from "rxjs";
 import ObserverToBufferingRSocketSubscriber from "./ObserverToBufferingRSocketSubscriber";
 import ObserverToRSocketSubscriber from "./ObserverToRSocketSubscriber";

diff --git a/packages/rsocket-composite-metadata/package.json b/packages/rsocket-composite-metadata/package.json
@@ -14,7 +14,7 @@
     "test": "echo \"Error: no test specified\" && exit 0"
   },
   "dependencies": {
-    "@rsocket/core": "^1.0.0-alpha.1"
+    "rsocket-core": "^1.0.0-alpha.1"
   },
   "devDependencies": {
     "rimraf": "~3.0.2",

diff --git a/packages/rsocket-composite-metadata/src/CompositeMetadata.ts b/packages/rsocket-composite-metadata/src/CompositeMetadata.ts
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import { readUInt24BE, writeUInt24BE } from "@rsocket/core";
+import { readUInt24BE, writeUInt24BE } from "rsocket-core";
 import { WellKnownMimeType } from "./WellKnownMimeType";
 
 export class CompositeMetadata implements Iterable<Entry> {

diff --git a/packages/rsocket-examples/package.json b/packages/rsocket-examples/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "@rsocket/examples",
+  "name": "rsocket-examples",
   "version": "1.0.0-alpha.1",
   "private": true,
   "files": [
@@ -17,13 +17,13 @@
     "start-client-server-rx-composite-metadata-route": "ts-node -r tsconfig-paths/register src/rxjs/ClientServerCompositeMetadataRouteExample.ts"
   },
   "dependencies": {
-    "@rsocket/adapter-rxjs": "^1.0.0-alpha.1",
-    "@rsocket/composite-metadata": "^1.0.0-alpha.1",
-    "@rsocket/core": "^1.0.0-alpha.1",
-    "@rsocket/transport-tcp-client": "^1.0.0-alpha.1",
-    "@rsocket/transport-tcp-server": "^1.0.0-alpha.1",
-    "@rsocket/transport-websocket-client": "^1.0.0-alpha.1",
-    "@rsocket/transport-websocket-server": "^1.0.0-alpha.1",
+    "rsocket-adapter-rxjs": "^1.0.0-alpha.1",
+    "rsocket-composite-metadata": "^1.0.0-alpha.1",
+    "rsocket-core": "^1.0.0-alpha.1",
+    "rsocket-transport-tcp-client": "^1.0.0-alpha.1",
+    "rsocket-transport-tcp-server": "^1.0.0-alpha.1",
+    "rsocket-transport-websocket-client": "^1.0.0-alpha.1",
+    "rsocket-transport-websocket-server": "^1.0.0-alpha.1",
     "ws": "~8.2.3"
   },
   "devDependencies": {

diff --git a/packages/rsocket-examples/src/ClienRequestFnfnWithLeaseExampleTcp.ts b/packages/rsocket-examples/src/ClienRequestFnfnWithLeaseExampleTcp.ts
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-import { RSocket, RSocketConnector } from "@rsocket/core";
-import { TcpClientTransport } from "@rsocket/transport-tcp-client";
+import { RSocket, RSocketConnector } from "rsocket-core";
+import { TcpClientTransport } from "rsocket-transport-tcp-client";
 import { exit } from "process";
 
 let serverCloseable;

diff --git a/packages/rsocket-examples/src/ClientRequestChannelExample.ts b/packages/rsocket-examples/src/ClientRequestChannelExample.ts
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-import { RSocketConnector } from "@rsocket/core";
-import { WebsocketClientTransport } from "@rsocket/transport-websocket-client";
+import { RSocketConnector } from "rsocket-core";
+import { WebsocketClientTransport } from "rsocket-transport-websocket-client";
 import { exit } from "process";
 import WebSocket from "ws";
 

diff --git a/packages/rsocket-examples/src/ClientServerCompositeMetadataRouteExample.ts b/packages/rsocket-examples/src/ClientServerCompositeMetadataRouteExample.ts
@@ -24,16 +24,16 @@ import {
   RSocketConnector,
   RSocketError,
   RSocketServer,
-} from "@rsocket/core";
-import { TcpClientTransport } from "@rsocket/transport-tcp-client";
-import { TcpServerTransport } from "@rsocket/transport-tcp-server";
+} from "rsocket-core";
+import { TcpClientTransport } from "rsocket-transport-tcp-client";
+import { TcpServerTransport } from "rsocket-transport-tcp-server";
 import {
   decodeCompositeMetadata,
   decodeRoutes,
   encodeCompositeMetadata,
   encodeRoute,
   WellKnownMimeType,
-} from "@rsocket/composite-metadata";
+} from "rsocket-composite-metadata";
 import { exit } from "process";
 import MESSAGE_RSOCKET_ROUTING = WellKnownMimeType.MESSAGE_RSOCKET_ROUTING;
 import Logger from "./shared/logger";

diff --git a/packages/rsocket-examples/src/ClientServerRequestChannelResumeExample.ts b/packages/rsocket-examples/src/ClientServerRequestChannelResumeExample.ts
@@ -24,10 +24,10 @@ import {
   RSocket,
   RSocketConnector,
   RSocketServer,
-} from "@rsocket/core";
+} from "rsocket-core";
 import { exit } from "process";
-import { TcpClientTransport } from "@rsocket/transport-tcp-client";
-import { TcpServerTransport } from "@rsocket/transport-tcp-server";
+import { TcpClientTransport } from "rsocket-transport-tcp-client";
+import { TcpServerTransport } from "rsocket-transport-tcp-server";
 
 async function main() {
   const server = new RSocketServer({

diff --git a/packages/rsocket-examples/src/ClientServerRequestResponseExampleTcp.ts b/packages/rsocket-examples/src/ClientServerRequestResponseExampleTcp.ts
@@ -22,9 +22,9 @@ import {
   RSocket,
   RSocketConnector,
   RSocketServer,
-} from "@rsocket/core";
-import { TcpClientTransport } from "@rsocket/transport-tcp-client";
-import { TcpServerTransport } from "@rsocket/transport-tcp-server";
+} from "rsocket-core";
+import { TcpClientTransport } from "rsocket-transport-tcp-client";
+import { TcpServerTransport } from "rsocket-transport-tcp-server";
 import { exit } from "process";
 
 let serverCloseable;

diff --git a/packages/rsocket-examples/src/ClientServerRequestResponseExampleWebSocket.ts b/packages/rsocket-examples/src/ClientServerRequestResponseExampleWebSocket.ts
@@ -21,9 +21,9 @@ import {
   Payload,
   RSocketConnector,
   RSocketServer,
-} from "@rsocket/core";
-import { WebsocketClientTransport } from "@rsocket/transport-websocket-client";
-import { WebsocketServerTransport } from "@rsocket/transport-websocket-server";
+} from "rsocket-core";
+import { WebsocketClientTransport } from "rsocket-transport-websocket-client";
+import { WebsocketServerTransport } from "rsocket-transport-websocket-server";
 import { exit } from "process";
 import WebSocket from "ws";
 

diff --git a/packages/rsocket-examples/src/ClientServerRequestStreamExampleWebSocket.ts b/packages/rsocket-examples/src/ClientServerRequestStreamExampleWebSocket.ts
@@ -21,9 +21,9 @@ import {
   Payload,
   RSocketConnector,
   RSocketServer,
-} from "@rsocket/core";
-import { WebsocketClientTransport } from "@rsocket/transport-websocket-client";
-import { WebsocketServerTransport } from "@rsocket/transport-websocket-server";
+} from "rsocket-core";
+import { WebsocketClientTransport } from "rsocket-transport-websocket-client";
+import { WebsocketServerTransport } from "rsocket-transport-websocket-server";
 import { exit } from "process";
 import WebSocket from "ws";
 import Logger from "./shared/logger";

diff --git a/packages/rsocket-examples/src/rxjs/ClientServerCompositeMetadataRouteExample.ts b/packages/rsocket-examples/src/rxjs/ClientServerCompositeMetadataRouteExample.ts
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-import { RSocketConnector, RSocketServer } from "@rsocket/core";
-import { Codec, RSocketRequester, RSocketResponder } from "@rsocket/messaging";
+import { RSocketConnector, RSocketServer } from "rsocket-core";
+import { Codec, RSocketRequester, RSocketResponder } from "rsocket-messaging";
 import {
   RxRequestersFactory,
   RxRespondersFactory,
-} from "@rsocket/adapter-rxjs";
-import { TcpClientTransport } from "@rsocket/transport-tcp-client";
-import { TcpServerTransport } from "@rsocket/transport-tcp-server";
+} from "rsocket-adapter-rxjs";
+import { TcpClientTransport } from "rsocket-transport-tcp-client";
+import { TcpServerTransport } from "rsocket-transport-tcp-server";
 import { exit } from "process";
 import {
   firstValueFrom,

diff --git a/packages/rsocket-messaging/package.json b/packages/rsocket-messaging/package.json
@@ -14,8 +14,8 @@
     "test": "echo \"Error: no test specified\" && exit 0"
   },
   "dependencies": {
-    "@rsocket/composite-metadata": "^1.0.0-alpha.1",
-    "@rsocket/core": "^1.0.0-alpha.1"
+    "rsocket-composite-metadata": "^1.0.0-alpha.1",
+    "rsocket-core": "^1.0.0-alpha.1"
   },
   "devDependencies": {
     "rimraf": "~3.0.2",

diff --git a/packages/rsocket-messaging/src/index.ts b/packages/rsocket-messaging/src/index.ts
@@ -21,7 +21,7 @@ import {
   decodeRoutes,
   encodeRoutes,
   WellKnownMimeType,
-} from "@rsocket/composite-metadata";
+} from "rsocket-composite-metadata";
 import {
   Cancellable,
   ErrorCodes,
@@ -33,7 +33,7 @@ import {
   Requestable,
   RSocket,
   RSocketError,
-} from "@rsocket/core";
+} from "rsocket-core";
 
 export interface Codec<D> {
   mimeType: string;

diff --git a/packages/rsocket-tcp-client/package.json b/packages/rsocket-tcp-client/package.json
@@ -14,7 +14,7 @@
     "test": "jest"
   },
   "dependencies": {
-    "@rsocket/core": "^1.0.0-alpha.1"
+    "rsocket-core": "^1.0.0-alpha.1"
   },
   "devDependencies": {
     "rimraf": "~3.0.2",

diff --git a/packages/rsocket-tcp-client/src/TcpClientTransport.ts b/packages/rsocket-tcp-client/src/TcpClientTransport.ts
@@ -23,7 +23,7 @@ import {
   FrameHandler,
   Multiplexer,
   Outbound,
-} from "@rsocket/core";
+} from "rsocket-core";
 import net, { SocketConnectOpts } from "net";
 import { TcpDuplexConnection } from "./TcpDuplexConnection";
 

diff --git a/packages/rsocket-tcp-client/src/TcpDuplexConnection.ts b/packages/rsocket-tcp-client/src/TcpDuplexConnection.ts
@@ -25,7 +25,7 @@ import {
   Multiplexer,
   Outbound,
   serializeFrameWithLength,
-} from "@rsocket/core";
+} from "rsocket-core";
 import net from "net";
 
 export class TcpDuplexConnection

diff --git a/packages/rsocket-tcp-client/src/__tests__/TcpClientTransport.spec.ts b/packages/rsocket-tcp-client/src/__tests__/TcpClientTransport.spec.ts
@@ -3,7 +3,7 @@ import { TcpDuplexConnection } from "../TcpDuplexConnection";
 import * as net from "net";
 import sinon from "sinon";
 import EventEmitter from "events";
-import { Demultiplexer, FrameHandler, Multiplexer } from "@rsocket/core/src";
+import { Demultiplexer, FrameHandler, Multiplexer } from "rsocket-core/src";
 import { mock } from "jest-mock-extended";
 
 describe("TcpClientTransport", function () {

diff --git a/packages/rsocket-tcp-client/src/__tests__/TcpDuplexConnection.spec.ts b/packages/rsocket-tcp-client/src/__tests__/TcpDuplexConnection.spec.ts
@@ -11,7 +11,7 @@ import {
   Multiplexer,
   serializeFrameWithLength,
   SetupFrame,
-} from "@rsocket/core";
+} from "rsocket-core";
 import { MockSocket } from "../__mocks__/net";
 import { TcpDuplexConnection } from "../TcpDuplexConnection";
 

diff --git a/packages/rsocket-tcp-server/package.json b/packages/rsocket-tcp-server/package.json
@@ -14,7 +14,7 @@
     "test": "jest"
   },
   "dependencies": {
-    "@rsocket/core": "^1.0.0-alpha.1"
+    "rsocket-core": "^1.0.0-alpha.1"
   },
   "devDependencies": {
     "rimraf": "~3.0.2",

diff --git a/packages/rsocket-tcp-server/src/TcpDuplexConnection.ts b/packages/rsocket-tcp-server/src/TcpDuplexConnection.ts
@@ -25,7 +25,7 @@ import {
   Multiplexer,
   Outbound,
   serializeFrameWithLength,
-} from "@rsocket/core";
+} from "rsocket-core";
 import net from "net";
 
 export class TcpDuplexConnection

diff --git a/packages/rsocket-tcp-server/src/TcpServerTransport.ts b/packages/rsocket-tcp-server/src/TcpServerTransport.ts
@@ -24,7 +24,7 @@ import {
   Multiplexer,
   Outbound,
   ServerTransport,
-} from "@rsocket/core";
+} from "rsocket-core";
 import net from "net";
 import { TcpDuplexConnection } from "./TcpDuplexConnection";
 

diff --git a/packages/rsocket-tcp-server/src/__tests__/TcpServerTransport.spec.ts b/packages/rsocket-tcp-server/src/__tests__/TcpServerTransport.spec.ts
@@ -1,7 +1,7 @@
 // import { TcpDuplexConnection } from "../TcpDuplexConnection";
 // import sinon from "sinon";
 // import EventEmitter from "events";
-// import { DuplexConnection } from "@rsocket/core/src";
+// import { DuplexConnection } from "rsocket-core/src";
 
 describe("TcpClientTransport", function () {
   describe("connect", () => {

diff --git a/packages/rsocket-websocket-client/package.json b/packages/rsocket-websocket-client/package.json
@@ -14,7 +14,7 @@
     "test": "jest"
   },
   "dependencies": {
-    "@rsocket/core": "^1.0.0-alpha.1"
+    "rsocket-core": "^1.0.0-alpha.1"
   },
   "devDependencies": {
     "rimraf": "~3.0.2",

diff --git a/packages/rsocket-websocket-client/src/WebsocketClientTransport.ts b/packages/rsocket-websocket-client/src/WebsocketClientTransport.ts
@@ -23,7 +23,7 @@ import {
   FrameHandler,
   Multiplexer,
   Outbound,
-} from "@rsocket/core";
+} from "rsocket-core";
 import { WebsocketDuplexConnection } from "./WebsocketDuplexConnection";
 
 export type ClientOptions = {