Fixed some follow ups after restructuring and issues around generator-theia

.travis.yml

@@ -21,6 +21,7 @@ before_script:
 before_install:
   - "npm install -g npm@^4"
   - "google-chrome-stable --headless --disable-gpu --remote-debugging-port=9222 http://localhost &"
+bundler_args: --retry 0
 notifications:
   webhooks:
     urls:

.vscode/launch.json

@@ -4,6 +4,24 @@
     // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
     "version": "0.2.0",
     "configurations": [
+        {
+            "type": "node",
+            "request": "launch",
+            "name": "Launch Electron Backend",
+            "runtimeExecutable": "${workspaceRoot}/node_modules/.bin/electron",
+            "program": "${workspaceRoot}/examples/electron/src-gen/frontend/electron-main.js",
+            "protocol": "legacy",
+            "args": [
+                "--loglevel=debug"
+            ],
+            "sourceMaps": true,
+            "outFiles": [
+                "${workspaceRoot}/examples/electron/src-gen/frontend/electron-main.js",
+                "${workspaceRoot}/examples/electron/src-gen/backend/main.js",
+                "${workspaceRoot}/examples/browser/lib/**/*.js",
+                "${workspaceRoot}/packages/*/lib/**/*.js"
+            ]
+        },
         {
             "type": "node",
             "request": "launch",

doc/Developing.md

@@ -41,16 +41,28 @@ This command does a few things:
 
 ## Run the browser-based example application
 
-We can start the application with:
+We can start the application from the examples/browser directory with:
 
     npm start
 
 This command starts the backend application, a small web server and a browser
 tab with the frontend.
 
+If you rebuild native node packages for electron then 
+rollback these changes before starting the browser example
+by running from the root directory:
+
+    npm run rebuild:web
+
 ## Run the electron-based example application
 
-It can also be started with:
+From the root directory run:
+
+    npm run rebuild:electron
+
+This command rebuilds native node packages against the version of node used by electron.
+
+It can also be started from the examples/electron directory with:
 
     npm start
 
@@ -116,16 +128,17 @@ To build and run the browser example:
 
     git clone https://github.com/theia-ide/theia \
     && cd theia \
-    && npm install --unsafe-perm\
-    && cd ../../examples/browser \
+    && npm install --unsafe-perm \
+    && cd examples/browser \
     && npm run start
 
 To build and run the electron example:
 
     git clone https://github.com/theia-ide/theia \
     && cd theia \
-    && npm install --unsafe-perm\
-    && cd ../../examples/electron \
+    && npm install --unsafe-perm \
+    && npm run rebuild:electron \
+    && cd examples/electron \
     && npm run start
 
 ## Code coverage

doc/Internals.md

@@ -35,7 +35,7 @@ import { ILoggerServer, ILoggerClient } from '../../application/common/logger-pr
 
 export const loggerServerModule = new ContainerModule(bind => {
     bind(ConnectionHandler).toDynamicValue(ctx =>
-        new JsonRpcConnectionHandler<ILoggerClient>("/logger", client => {
+        new JsonRpcConnectionHandler<ILoggerClient>("/services/logger", client => {
             const loggerServer = ctx.container.get<ILoggerServer>(ILoggerServer);
             loggerServer.setClient(client);
             return loggerServer;
@@ -124,7 +124,7 @@ To dig more into ContributionProvider see this [section](#contribution-providers
 So now:
 
 ``` typescript
-new JsonRpcConnectionHandler<ILoggerClient>("/logger", client => {
+new JsonRpcConnectionHandler<ILoggerClient>("/services/logger", client => {
 ```
 
 This does a few things if we look at this class implementation:
@@ -198,20 +198,15 @@ And it returns the loggerServer as the object that will be exposed over JSON-RPC
 
 This connects the factory to the connection.
 
-So now all is set for backend/frontend communication.
-
-The only point left is that if you're using the webpack dev server which
-you probably are you need to add something like this:
+The endpoints with `services/*` path are served by the webpack dev server, see `webpack.config.js`:
 
 ``` javascript
-            '/logger/*': {
-                target: 'ws://localhost:3000',
-                ws: true
-            },
+    '/services/*': {
+        target: 'ws://localhost:3000',
+        ws: true
+    },
 ```
 
-To webpack.config.js so that the requests are proxied to the backend properly.
-
 ## Connecting to a service
 
 So now that we have a backend service let's see how to connect to it from
@@ -234,7 +229,7 @@ export const loggerFrontendModule = new ContainerModule(bind => {
     bind(ILoggerServer).toDynamicValue(ctx => {
         const loggerWatcher = ctx.container.get(LoggerWatcher);
         const connection = ctx.container.get(WebSocketConnectionProvider);
-        return connection.createProxy<ILoggerServer>("/logger", loggerWatcher.getLoggerClient());
+        return connection.createProxy<ILoggerServer>("/services/logger", loggerWatcher.getLoggerClient());
     }).inSingletonScope();
 });
 ```
@@ -245,7 +240,7 @@ The important bit here are those lines:
     bind(ILoggerServer).toDynamicValue(ctx => {
         const loggerWatcher = ctx.container.get(LoggerWatcher);
         const connection = ctx.container.get(WebSocketConnectionProvider);
-        return connection.createProxy<ILoggerServer>("/logger", loggerWatcher.getLoggerClient());
+        return connection.createProxy<ILoggerServer>("/services/logger", loggerWatcher.getLoggerClient());
     }).inSingletonScope();
 
 ```
@@ -269,7 +264,7 @@ See more information about how events works in theia [here](events).
 Here we're getting the websocket connection, this will be used to create a proxy from.
 
 ``` typescript
-        return connection.createProxy<ILoggerServer>("/logger", loggerWatcher.getLoggerClient());
+        return connection.createProxy<ILoggerServer>("/services/logger", loggerWatcher.getLoggerClient());
 ```
 
 So here at the last line we're binding the ILoggerServer interface to a

examples/browser/webpack.config.js

@@ -13,7 +13,6 @@ const CopyWebpackPlugin = require('copy-webpack-plugin');
 const CircularDependencyPlugin = require('circular-dependency-plugin');
 
 const outputPath = path.resolve(__dirname, 'lib');
-const emptyPath = path.resolve(__dirname, 'webpack_empty.js');
 
 const monacoEditorPath = '../../node_modules/monaco-editor-core/min/vs';
 const monacoLanguagesPath = '../../node_modules/monaco-languages/release';
@@ -64,18 +63,13 @@ module.exports = {
     resolve: {
         extensions: ['.js'],
         alias: {
-            'vs': path.resolve(outputPath, monacoEditorPath),
-            'dtrace-provider': emptyPath,
-            'safe-json-stringify': emptyPath,
-            'mv': emptyPath,
-            'source-map-support': emptyPath
+            'vs': path.resolve(outputPath, monacoEditorPath)
         }
     },
     devtool: 'source-map',
     plugins: [
-        // @ts-ignore
         new webpack.HotModuleReplacementPlugin(),
-        CopyWebpackPlugin([
+        new CopyWebpackPlugin([
             {
                 from: requirePath,
                 to: '.'
@@ -124,8 +118,6 @@ module.exports = {
             '*': 'http://' + host + ':' + port,
         },
         historyApiFallback: true,
-        hot: true,
-        inline: true,
         stats: {
             colors: true,
             warnings: false

examples/electron/webpack.config.js

@@ -27,7 +27,6 @@ module.exports = {
         filename: 'bundle.js',
         path: outputPath,
         libraryTarget: 'umd'
-
     },
     target: 'electron',
     node: {
@@ -64,9 +63,8 @@ module.exports = {
     },
     devtool: 'source-map',
     plugins: [
-        // @ts-ignore
         new webpack.HotModuleReplacementPlugin(),
-        CopyWebpackPlugin([
+        new CopyWebpackPlugin([
             {
                 from: monacoEditorPath,
                 to: 'vs'

generator-theia/src/common/abstract-backend-generator.ts

@@ -42,11 +42,16 @@ function start() {
     application.use(express.static(path.join(__dirname, '../../lib'), {
         index: 'index.html'
     }));
-    application.start();
+    return application.start(${this.ifWeb(`${this.model.config.port}, '${this.model.config.host}'`)})
 }
 
-Promise.resolve()${this.compileBackendModuleImports(backendModules)}
-.then(start);`;
+module.exports = Promise.resolve()${this.compileBackendModuleImports(backendModules)}
+    .then(start).catch(reason => {
+        console.error('Failed to start the backend application.');
+        if (reason) {
+            console.error(reason);
+        }
+    });`;
     }
 
 }

generator-theia/src/common/abstract-frontend-generator.ts

@@ -60,8 +60,13 @@ function start() {
     application.start();
 }
 
-Promise.resolve()${this.compileFrontendModuleImports(frontendModules)}
-.then(start);`;
+module.exports = Promise.resolve()${this.compileFrontendModuleImports(frontendModules)}
+    .then(start).catch(reason => {
+        console.error('Failed to start the frontend application.');
+        if (reason) {
+            console.error(reason);
+        }
+    });`;
     }
 
 }

generator-theia/src/common/abstract-generator.ts

@@ -51,7 +51,7 @@ export abstract class AbstractGenerator {
                 return `Promise.resolve(${invocation})`;
             }
             return invocation;
-        }).map(statement => `.then(function () { return ${statement}.then(load) })`);
+        }).map(statement => `    .then(function () { return ${statement}.then(load) })`);
         return os.EOL + lines.join(os.EOL);
     }
 
@@ -60,4 +60,20 @@ export abstract class AbstractGenerator {
         return copyright ? copyright + os.EOL : '';
     }
 
+    protected isWeb(): boolean {
+        return this.model.target === 'web';
+    }
+
+    protected isElectron(): boolean {
+        return this.model.target === 'electron';
+    }
+
+    protected ifWeb(value: string, defaultValue: string = '') {
+        return this.isWeb() ? value : defaultValue;
+    }
+
+    protected ifElectron(value: string, defaultValue: string = '') {
+        return this.isElectron() ? value : defaultValue;
+    }
+
 }