rename to @theia/request

eclipse-theia · May 25, 2022 · e15cbce · e15cbce
1 parent b8076ef
commit e15cbce
Show file tree

Hide file tree

Showing 37 changed files with 34 additions and 35 deletions.
diff --git a/dev-packages/cli/package.json b/dev-packages/cli/package.json
@@ -35,7 +35,7 @@
     "@theia/ffmpeg": "1.25.0",
     "@theia/localization-manager": "1.25.0",
     "@theia/ovsx-client": "1.25.0",
-    "@theia/request-service": "1.25.0",
+    "@theia/request": "1.25.0",
     "@types/chai": "^4.2.7",
     "@types/mocha": "^5.2.7",
     "@types/node-fetch": "^2.5.7",

diff --git a/dev-packages/cli/src/download-plugins.ts b/dev-packages/cli/src/download-plugins.ts
@@ -29,9 +29,9 @@ import * as decompress from 'decompress';
 import { promises as fs } from 'fs';
 import * as path from 'path';
 import * as temp from 'temp';
-import { NodeRequestService } from '@theia/request-service/lib/node-request-service';
+import { NodeRequestService } from '@theia/request/lib/node-request-service';
 import { DEFAULT_SUPPORTED_API_VERSION } from '@theia/application-package/lib/api';
-import { RequestContext } from '@theia/request-service';
+import { RequestContext } from '@theia/request';
 
 temp.track();
 

diff --git a/dev-packages/cli/tsconfig.json b/dev-packages/cli/tsconfig.json
@@ -25,7 +25,7 @@
       "path": "../ovsx-client"
     },
     {
-      "path": "../request-service"
+      "path": "../request"
     }
   ]
 }
diff --git a/dev-packages/ovsx-client/package.json b/dev-packages/ovsx-client/package.json
@@ -29,7 +29,7 @@
     "watch": "theiaext watch"
   },
   "dependencies": {
-    "@theia/request-service": "1.25.0",
+    "@theia/request": "1.25.0",
     "semver": "^5.4.1"
   }
 }
diff --git a/dev-packages/ovsx-client/src/ovsx-client.spec.ts b/dev-packages/ovsx-client/src/ovsx-client.spec.ts
@@ -16,7 +16,7 @@
 
 import * as chai from 'chai';
 import { OVSXClient } from './ovsx-client';
-import { NodeRequestService } from '@theia/request-service/lib/node-request-service';
+import { NodeRequestService } from '@theia/request/lib/node-request-service';
 import { VSXSearchParam } from './ovsx-types';
 
 const expect = chai.expect;

diff --git a/dev-packages/ovsx-client/src/ovsx-client.ts b/dev-packages/ovsx-client/src/ovsx-client.ts
@@ -25,7 +25,7 @@ import {
     VSXSearchParam,
     VSXSearchResult
 } from './ovsx-types';
-import { RequestContext, RequestService } from '@theia/request-service';
+import { RequestContext, RequestService } from '@theia/request';
 
 export interface OVSXClientOptions {
     apiVersion: string

diff --git a/dev-packages/ovsx-client/tsconfig.json b/dev-packages/ovsx-client/tsconfig.json
@@ -10,7 +10,7 @@
   ],
   "references": [
     {
-      "path": "../request-service"
+      "path": "../request"
     }
   ]
 }
diff --git a/dev-packages/request-service/.eslintrc.js → dev-packages/request/.eslintrc.js b/dev-packages/request-service/.eslintrc.js → dev-packages/request/.eslintrc.js
diff --git a/dev-packages/request-service/README.md → dev-packages/request/README.md b/dev-packages/request-service/README.md → dev-packages/request/README.md
diff --git a/dev-packages/request-service/package.json → dev-packages/request/package.json b/dev-packages/request-service/package.json → dev-packages/request/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "@theia/request-service",
+  "name": "@theia/request",
   "version": "1.25.0",
   "description": "Theia Proxy-Aware Request Service",
   "publishConfig": {

diff --git a/...est-service/src/common-request-service.ts → ...ges/request/src/common-request-service.ts b/...est-service/src/common-request-service.ts → ...ges/request/src/common-request-service.ts
diff --git a/dev-packages/request-service/src/index.ts → dev-packages/request/src/index.ts b/dev-packages/request-service/src/index.ts → dev-packages/request/src/index.ts
diff --git a/...quest-service/src/node-request-service.ts → ...kages/request/src/node-request-service.ts b/...quest-service/src/node-request-service.ts → ...kages/request/src/node-request-service.ts
diff --git a/...kages/request-service/src/package.spec.ts → dev-packages/request/src/package.spec.ts b/...kages/request-service/src/package.spec.ts → dev-packages/request/src/package.spec.ts
diff --git a/dev-packages/request-service/src/proxy.ts → dev-packages/request/src/proxy.ts b/dev-packages/request-service/src/proxy.ts → dev-packages/request/src/proxy.ts
diff --git a/dev-packages/request-service/tsconfig.json → dev-packages/request/tsconfig.json b/dev-packages/request-service/tsconfig.json → dev-packages/request/tsconfig.json
diff --git a/packages/core/README.md b/packages/core/README.md
@@ -89,9 +89,9 @@ export class SomeClass {
     - `@theia/application-package` (from [`@theia/application-package@1.25.0`](https://www.npmjs.com/package/@theia/application-package/v/1.25.0))
     - `@theia/application-package/lib/api` (from [`@theia/application-package@1.25.0`](https://www.npmjs.com/package/@theia/application-package/v/1.25.0))
     - `@theia/application-package/lib/environment` (from [`@theia/application-package@1.25.0`](https://www.npmjs.com/package/@theia/application-package/v/1.25.0))
-    - `@theia/request-service` (from [`@theia/request-service@1.25.0`](https://www.npmjs.com/package/@theia/request-service/v/1.25.0))
-    - `@theia/request-service/lib/proxy` (from [`@theia/request-service@1.25.0`](https://www.npmjs.com/package/@theia/request-service/v/1.25.0))
-    - `@theia/request-service/lib/node-request-service` (from [`@theia/request-service@1.25.0`](https://www.npmjs.com/package/@theia/request-service/v/1.25.0))
+    - `@theia/request` (from [`@theia/request@1.25.0`](https://www.npmjs.com/package/@theia/request/v/1.25.0))
+    - `@theia/request/lib/proxy` (from [`@theia/request@1.25.0`](https://www.npmjs.com/package/@theia/request/v/1.25.0))
+    - `@theia/request/lib/node-request-service` (from [`@theia/request@1.25.0`](https://www.npmjs.com/package/@theia/request/v/1.25.0))
     - `fs-extra` (from [`fs-extra@^4.0.2`](https://www.npmjs.com/package/fs-extra))
     - `fuzzy` (from [`fuzzy@^0.1.3`](https://www.npmjs.com/package/fuzzy))
     - `inversify` (from [`inversify@^5.1.1`](https://www.npmjs.com/package/inversify))

diff --git a/packages/core/package.json b/packages/core/package.json
@@ -17,7 +17,7 @@
     "@phosphor/virtualdom": "1",
     "@phosphor/widgets": "1",
     "@theia/application-package": "1.25.0",
-    "@theia/request-service": "1.25.0",
+    "@theia/request": "1.25.0",
     "@types/body-parser": "^1.16.4",
     "@types/cookie": "^0.3.3",
     "@types/dompurify": "^2.2.2",
@@ -103,9 +103,9 @@
         "@theia/application-package",
         "@theia/application-package/lib/api",
         "@theia/application-package/lib/environment",
-        "@theia/request-service",
-        "@theia/request-service/lib/proxy",
-        "@theia/request-service/lib/node-request-service",
+        "@theia/request",
+        "@theia/request/lib/proxy",
+        "@theia/request/lib/node-request-service",
         "fs-extra",
         "fuzzy",
         "inversify",

diff --git a/packages/core/shared/@theia/request-service/index.d.ts b/packages/core/shared/@theia/request-service/index.d.ts
diff --git a/packages/core/shared/@theia/request-service/index.js b/packages/core/shared/@theia/request-service/index.js
diff --git a/packages/core/shared/@theia/request/index.d.ts b/packages/core/shared/@theia/request/index.d.ts
@@ -0,0 +1 @@
+export * from '@theia/request';
diff --git a/packages/core/shared/@theia/request/index.js b/packages/core/shared/@theia/request/index.js
@@ -0,0 +1 @@
+module.exports = require('@theia/request');
diff --git a/packages/core/src/browser/frontend-application-module.ts b/packages/core/src/browser/frontend-application-module.ts
@@ -119,7 +119,7 @@ import {
 } from './breadcrumbs';
 import { RendererHost } from './widgets';
 import { TooltipService, TooltipServiceImpl } from './tooltip-service';
-import { BackendRequestService, RequestService, REQUEST_SERVICE_PATH } from '@theia/request-service';
+import { BackendRequestService, RequestService, REQUEST_SERVICE_PATH } from '@theia/request';
 import { bindFrontendStopwatch, bindBackendStopwatch } from './performance';
 import { SaveResourceService } from './save-resource-service';
 import { UserWorkingDirectoryProvider } from './user-working-directory-provider';

diff --git a/packages/core/src/browser/json-schema-store.ts b/packages/core/src/browser/json-schema-store.ts
@@ -20,7 +20,7 @@ import { FrontendApplicationContribution } from './frontend-application';
 import { MaybePromise } from '../common';
 import { Endpoint } from './endpoint';
 import { timeout, Deferred } from '../common/promise-util';
-import { RequestContext, RequestService } from '@theia/request-service';
+import { RequestContext, RequestService } from '@theia/request';
 
 export interface JsonSchemaConfiguration {
     fileMatch: string | string[];
@@ -124,4 +124,3 @@ export namespace DefaultJsonSchemaContribution {
         schema: any;
     }
 }
-
diff --git a/packages/core/src/browser/request/browser-request-module.ts b/packages/core/src/browser/request/browser-request-module.ts
@@ -15,7 +15,7 @@
  ********************************************************************************/
 
 import { ContainerModule } from 'inversify';
-import { RequestService } from '@theia/request-service';
+import { RequestService } from '@theia/request';
 import { XHRBrowserRequestService } from './browser-request-service';
 
 export default new ContainerModule(bind => {

diff --git a/packages/core/src/browser/request/browser-request-service.ts b/packages/core/src/browser/request/browser-request-service.ts
@@ -15,7 +15,7 @@
  ********************************************************************************/
 
 import { inject, injectable, postConstruct } from 'inversify';
-import { BackendRequestService, RequestConfiguration, RequestContext, RequestOptions, RequestService, CancellationToken } from '@theia/request-service';
+import { BackendRequestService, RequestConfiguration, RequestContext, RequestOptions, RequestService, CancellationToken } from '@theia/request';
 import { PreferenceService } from '../preferences/preference-service';
 
 @injectable()

diff --git a/packages/core/src/electron-browser/request/electron-browser-request-module.ts b/packages/core/src/electron-browser/request/electron-browser-request-module.ts
@@ -16,7 +16,7 @@
 
 import { ContainerModule } from 'inversify';
 import { ProxyingBrowserRequestService } from '../../browser/request/browser-request-service';
-import { RequestService } from '@theia/request-service';
+import { RequestService } from '@theia/request';
 
 export default new ContainerModule(bind => {
     // This version of the request service will always proxy every request through the backend.

diff --git a/packages/core/src/electron-node/request/electron-backend-request-module.ts b/packages/core/src/electron-node/request/electron-backend-request-module.ts
@@ -15,7 +15,7 @@
  ********************************************************************************/
 
 import { ContainerModule } from 'inversify';
-import { RequestService } from '@theia/request-service';
+import { RequestService } from '@theia/request';
 import { ElectronBackendRequestService } from './electron-backend-request-service';
 
 export default new ContainerModule(bind => {

diff --git a/packages/core/src/electron-node/request/electron-backend-request-service.ts b/packages/core/src/electron-node/request/electron-backend-request-service.ts
@@ -15,7 +15,7 @@
  ********************************************************************************/
 
 import { decorate, injectable } from 'inversify';
-import { NodeRequestService } from '@theia/request-service/lib/node-request-service';
+import { NodeRequestService } from '@theia/request/lib/node-request-service';
 
 decorate(injectable(), NodeRequestService);
 

diff --git a/packages/core/src/node/backend-application-module.ts b/packages/core/src/node/backend-application-module.ts
@@ -16,7 +16,7 @@
 
 import { ContainerModule, decorate, injectable } from 'inversify';
 import { ApplicationPackage } from '@theia/application-package';
-import { REQUEST_SERVICE_PATH } from '@theia/request-service';
+import { REQUEST_SERVICE_PATH } from '@theia/request';
 import {
     bindContributionProvider, MessageService, MessageClient, ConnectionHandler, JsonRpcConnectionHandler,
     CommandService, commandServicePath, messageServicePath

diff --git a/packages/core/src/node/request/backend-request-facade.ts b/packages/core/src/node/request/backend-request-facade.ts
@@ -15,7 +15,7 @@
  ********************************************************************************/
 
 import { inject, injectable } from 'inversify';
-import { RequestConfiguration, RequestContext, RequestOptions, RequestService } from '@theia/request-service';
+import { RequestConfiguration, RequestContext, RequestOptions, RequestService } from '@theia/request';
 
 @injectable()
 export class BackendRequestFacade implements RequestService {

diff --git a/packages/core/src/node/request/backend-request-module.ts b/packages/core/src/node/request/backend-request-module.ts
@@ -15,8 +15,8 @@
  ********************************************************************************/
 
 import { ContainerModule, decorate, injectable } from 'inversify';
-import { RequestService } from '@theia/request-service';
-import { NodeRequestService } from '@theia/request-service/lib/node-request-service';
+import { RequestService } from '@theia/request';
+import { NodeRequestService } from '@theia/request/lib/node-request-service';
 
 decorate(injectable(), NodeRequestService);
 

diff --git a/packages/core/src/node/request/proxy-cli-contribution.ts b/packages/core/src/node/request/proxy-cli-contribution.ts
@@ -16,7 +16,7 @@
 
 import { inject, injectable } from 'inversify';
 import { MaybePromise } from '../../common/types';
-import { RequestConfiguration, RequestService } from '@theia/request-service';
+import { RequestConfiguration, RequestService } from '@theia/request';
 import { Argv, Arguments } from 'yargs';
 import { CliContribution } from '../cli';
 

diff --git a/packages/vsx-registry/src/browser/vsx-registry-frontend-module.ts b/packages/vsx-registry/src/browser/vsx-registry-frontend-module.ts
@@ -35,7 +35,7 @@ import { bindExtensionPreferences } from './recommended-extensions/recommended-e
 import { bindPreferenceProviderOverrides } from './recommended-extensions/preference-provider-overrides';
 import { OVSXClientProvider, createOVSXClient } from '../common/ovsx-client-provider';
 import { VSXEnvironment, VSX_ENVIRONMENT_PATH } from '../common/vsx-environment';
-import { RequestService } from '@theia/core/shared/@theia/request-service';
+import { RequestService } from '@theia/core/shared/@theia/request';
 
 export default new ContainerModule((bind, unbind) => {
     bind<OVSXClientProvider>(OVSXClientProvider).toDynamicValue(ctx => {

diff --git a/packages/vsx-registry/src/common/ovsx-client-provider.ts b/packages/vsx-registry/src/common/ovsx-client-provider.ts
@@ -14,7 +14,7 @@
 // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
 // *****************************************************************************
 
-import { RequestService } from '@theia/core/shared/@theia/request-service';
+import { RequestService } from '@theia/core/shared/@theia/request';
 import { OVSXClient } from '@theia/ovsx-client';
 import { VSXEnvironment } from './vsx-environment';
 

diff --git a/packages/vsx-registry/src/node/vsx-registry-backend-module.ts b/packages/vsx-registry/src/node/vsx-registry-backend-module.ts
@@ -21,7 +21,7 @@ import { OVSXClientProvider, createOVSXClient } from '../common/ovsx-client-prov
 import { VSXEnvironment, VSX_ENVIRONMENT_PATH } from '../common/vsx-environment';
 import { VSXEnvironmentImpl } from './vsx-environment-impl';
 import { ConnectionHandler, JsonRpcConnectionHandler } from '@theia/core';
-import { RequestService } from '@theia/core/shared/@theia/request-service';
+import { RequestService } from '@theia/core/shared/@theia/request';
 
 export default new ContainerModule(bind => {
     bind<OVSXClientProvider>(OVSXClientProvider).toDynamicValue(ctx => {

diff --git a/tsconfig.json b/tsconfig.json
@@ -31,7 +31,7 @@
       "path": "dev-packages/private-re-exports"
     },
     {
-      "path": "dev-packages/request-service"
+      "path": "dev-packages/request"
     },
     {
       "path": "examples/api-samples"