merge upstream

Signed-off-by: Uni Sayo <[email protected]>
Devpodio · Apr 2, 2019 · 6c61dea · 6c61dea
1 parent a0e6f40
commit 6c61dea
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 13 deletions.
diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@
 <br/>
 <div id="theia-logo" align="center">
     <br />
-    <img src="./logo/theia-logo.svg" alt="Theia Logo" width="300"/>
+    <h2> DEVPOD </h2>
     <h3>Cloud & Desktop IDE Platform</h3>
 </div>
 
@@ -14,13 +14,13 @@
   [![Open questions](https://img.shields.io/badge/Open-questions-blue.svg?style=flat-curved)](https://github.com/devpodio/devpod/labels/question)
   [![Open bugs](https://img.shields.io/badge/Open-bugs-red.svg?style=flat-curved)](https://github.com/theia-ide/theia/labels/bug)
 
-  Eclipse Theia is an extensible platform to develop full-fledged multi-language Cloud & Desktop IDE-like products with state-of-the-art web  technologies.
+  Devpod is a fork of Eclipse Theia which is an extensible platform to develop full-fledged multi-language Cloud & Desktop IDE-like products with state-of-the-art web  technologies.
 <p><small style="font-weight:bold;">This is a for of Theia Ide that adds PWA for caching and web app</small></p>
 </div>
 
 <div style='margin:0 auto;width:80%;'>
 
-![Theia](https://raw.githubusercontent.com/theia-ide/theia/master/doc/images/theia-screenshot.png)
+![Theia](https://i.gyazo.com/054dc376e2259ab828390b2c79288ed2.png)
 
 </div>
 

diff --git a/packages/plugin-ext-vscode/src/node/plugin-vscode-backend-module.ts b/packages/plugin-ext-vscode/src/node/plugin-vscode-backend-module.ts
@@ -21,8 +21,8 @@ import { PluginVsCodeDirectoryHandler } from './plugin-vscode-directory-handler'
 import { VsCodePluginScanner } from './scanner-vscode';
 import { VsCodePluginDeployerResolver } from './plugin-vscode-resolver';
 import { PluginVsCodeCliContribution } from './plugin-vscode-cli-contribution';
-import { CliContribution } from '@theia/core/lib/node';
-import { PluginHostEnvironmentVariable } from '@theia/plugin-ext/lib/common';
+import { CliContribution } from '@devpodio/core/lib/node';
+import { PluginHostEnvironmentVariable } from '@devpodio/plugin-ext/lib/common';
 
 export default new ContainerModule(bind => {
     bind(PluginDeployerFileHandler).to(PluginVsCodeFileHandler).inSingletonScope();

diff --git a/packages/plugin-ext-vscode/src/node/plugin-vscode-cli-contribution.ts b/packages/plugin-ext-vscode/src/node/plugin-vscode-cli-contribution.ts
@@ -16,8 +16,8 @@
 
 import { injectable } from 'inversify';
 import { Argv, Arguments } from 'yargs';
-import { CliContribution } from '@theia/core/lib/node/cli';
-import { PluginHostEnvironmentVariable } from '@theia/plugin-ext/lib/common';
+import { CliContribution } from '@devpodio/core/lib/node/cli';
+import { PluginHostEnvironmentVariable } from '@devpodio/plugin-ext/lib/common';
 import { VSCODE_DEFAULT_API_VERSION } from './plugin-vscode-init';
 /**
  * CLI Contribution allowing to override the VS Code API version which is returned by `vscode.version` API call.

diff --git a/packages/plugin-ext/src/hosted/node/hosted-instance-manager.ts b/packages/plugin-ext/src/hosted/node/hosted-instance-manager.ts
@@ -130,10 +130,12 @@ export abstract class AbstractHostedInstanceManager implements HostedInstanceMan
         let processOptions: cp.SpawnOptions;
         if (pluginUri.scheme === 'file') {
             processOptions = { ...PROCESS_OPTIONS };
-            processOptions.env.HOSTED_PLUGIN = pluginUri.path.toString();
+            if (processOptions.env) {
+                processOptions.env.HOSTED_PLUGIN = pluginUri.path.toString();
 
-            // Disable all the other plugins on this instance
-            processOptions.env.THEIA_PLUGINS = '';
+                // Disable all the other plugins on this instance
+                processOptions.env.THEIA_PLUGINS = '';
+            }
             command = await this.getStartCommand(port, debugConfig);
         } else {
             throw new Error('Not supported plugin location: ' + pluginUri.toString());

diff --git a/packages/plugin-ext/src/hosted/node/hosted-plugin-process.ts b/packages/plugin-ext/src/hosted/node/hosted-plugin-process.ts
@@ -17,9 +17,9 @@
 import * as path from 'path';
 import * as cp from 'child_process';
 import { injectable, inject, named } from 'inversify';
-import { ILogger, ConnectionErrorHandler, ContributionProvider } from '@theia/core/lib/common';
-import { Emitter } from '@theia/core/lib/common/event';
-import { createIpcEnv } from '@theia/core/lib/node/messaging/ipc-protocol';
+import { ILogger, ConnectionErrorHandler, ContributionProvider } from '@devpodio/core/lib/common';
+import { Emitter } from '@devpodio/core/lib/common/event';
+import { createIpcEnv } from '@devpodio/core/lib/node/messaging/ipc-protocol';
 import { HostedPluginClient, ServerPluginRunner, PluginMetadata, PluginHostEnvironmentVariable } from '../../common/plugin-protocol';
 import { RPCProtocolImpl } from '../../api/rpc-protocol';
 import { MAIN_RPC_CONTEXT } from '../../api/plugin-api';

diff --git a/yarn.lock b/yarn.lock
@@ -699,6 +699,7 @@
 "@types/yargs@^11.1.0":
   version "11.1.2"
   resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-11.1.2.tgz#fd4b676846fe731a5de5c6d2e5ef6a377262fc30"
+  integrity sha512-zG61PAp2OcoIBjRV44wftJj6AJgzJrOc32LCYOBqk9bdgcdzK5DCJHV9QZJ60+Fu+fOn79g8Ks3Gixm4CfkZ+w==
 
 "@webassemblyjs/[email protected]":
   version "1.7.8"