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,7 +41,7 @@ This command does a few things:
 
 ## Run the browser-based example application
 
-We can start the application with:
+We can start the application from examples/browser directory with:
 
     npm start
 
@@ -50,7 +50,16 @@ tab with the frontend.
 
 ## 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.
+To rollback changes run:
+
+    npm run rebuild:web
+
+It can also be started with from examples/electron directory:
 
     npm start
 
@@ -116,16 +125,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

@@ -198,20 +198,6 @@ 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:
-
-``` javascript
-            '/logger/*': {
-                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

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;
+    }
+
 }

generator-theia/src/common/app-package-generator.ts

@@ -15,9 +15,6 @@ export class AppPackageGenerator extends AbstractGenerator {
         fs.writeJSON('package.json', this.compilePackage());
         if (!fs.exists('webpack.config.js')) {
             fs.write('webpack.config.js', this.compileWebpackConfig());
-            if (this.isWeb()) {
-                fs.write('webpack_empty.js', '');
-            }
         }
     }
 
@@ -29,22 +26,22 @@ export class AppPackageGenerator extends AbstractGenerator {
             "start:backend:debug": "npm run build:backend && node ./src-gen/backend/main.js --loglevel=debug | bunyan",
             "start:frontend": "webpack-dev-server --open",
         } : {
-                "postinstall": "electron-rebuild",
                 "start": "npm run build:backend && electron ./src-gen/frontend/electron-main.js | bunyan",
-                "start:debug": "npm run build:backend && electron ./src-gen/frontend/electron-main.js --loglevel=debug | bunyan",
+                "start:debug": "npm run build:backend && electron ./src-gen/frontend/electron-main.js --loglevel=debug | bunyan"
             }
         const devDependencies = this.isWeb() ? {
             "webpack-dev-server": "^2.5.0"
         } : {
-                "electron": "^1.6.11"
+                "electron": "^1.6.11",
+                "electron-rebuild": "^1.5.11"
             }
         return {
             ...this.model.pck,
             "dependencies": sortByKey({
                 ...dependendencies,
                 ...this.model.pck.dependencies
             }),
-            "scripts": {
+            "scripts": sortByKey({
                 "clean": "rimraf lib",
                 "cold:start": "npm run clean && npm start",
                 "build": "npm run build:frontend && npm run build:backend",
@@ -53,7 +50,7 @@ export class AppPackageGenerator extends AbstractGenerator {
                 "watch": "npm run build:frontend && webpack --watch",
                 ...scripts,
                 ...this.model.pck.scripts
-            },
+            }),
             "devDependencies": sortByKey({
                 "rimraf": "^2.6.1",
                 "concurrently": "^3.5.0",
@@ -74,22 +71,6 @@ export class AppPackageGenerator extends AbstractGenerator {
         }
     }
 
-    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;
-    }
-
     protected compileWebpackConfig(): string {
         return `${this.compileCopyright()}
 // @ts-check
@@ -99,8 +80,7 @@ const merge = require('webpack-merge');
 const CopyWebpackPlugin = require('copy-webpack-plugin');
 const CircularDependencyPlugin = require('circular-dependency-plugin');
 
-const outputPath = path.resolve(__dirname, 'lib');${this.ifWeb(`
-const emptyPath = path.resolve(__dirname, 'webpack_empty.js');`)}
+const outputPath = path.resolve(__dirname, 'lib');
 
 const monacoEditorPath = '../../node_modules/monaco-editor-core/min/vs';
 const monacoLanguagesPath = '../../node_modules/monaco-languages/release';
@@ -118,8 +98,7 @@ module.exports = {
     output: {
         filename: 'bundle.js',
         path: outputPath${this.ifElectron(`,
-        libraryTarget: 'umd'
-        `)}
+        libraryTarget: 'umd'`)}
     },
     target: '${this.model.target}',
     node: {${this.ifElectron(`
@@ -155,18 +134,13 @@ module.exports = {
     resolve: {
         extensions: ['.js'],
         alias: {
-            'vs': path.resolve(outputPath, monacoEditorPath)${this.ifWeb(`,
-            '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([${this.ifWeb(`
+        new CopyWebpackPlugin([${this.ifWeb(`
             {
                 from: requirePath,
                 to: '.'
@@ -215,8 +189,6 @@ module.exports = {
             '*': 'http://' + host + ':' + port,
         },
         historyApiFallback: true,
-        hot: true,
-        inline: true,
         stats: {
             colors: true,
             warnings: false

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

@@ -136,7 +136,7 @@ export class Model {
                 for (const extension of extensions) {
                     const modulePath = extension[primary] || (secondary && extension[secondary]);
                     if (typeof modulePath === 'string') {
-                        const extensionPath = path.join(extensionPackage.name, modulePath);
+                        const extensionPath = path.join(extensionPackage.name, modulePath).split(path.sep).join('/')
                         result.set(`${primary}_${moduleIndex}`, extensionPath);
                         moduleIndex = moduleIndex + 1;
                     }

generator-theia/src/electron/electron-frontend-generator.ts

@@ -28,21 +28,20 @@ process.env.LC_NUMERIC = 'C';
 const electron = require('electron');
 const path = require('path');
 
-let mainWindow = undefined;
-
 electron.app.on('window-all-closed', function () {
     if (process.platform !== 'darwin') {
         electron.app.quit();
     }
 });
 
 electron.app.on('ready', function () {
-    require("../backend/main");
-    mainWindow = new electron.BrowserWindow({ width: 1024, height: 728 });
-    mainWindow.webContents.openDevTools();
-    mainWindow.loadURL(\`file://\${path.join(__dirname, '../../lib/index.html')}\`);
+    const mainWindow = new electron.BrowserWindow({ width: 1024, height: 728 });
+    require("../backend/main").then(server => {
+        mainWindow.loadURL(\`file://\${path.join(__dirname, '../../lib/index.html')}?port=\${server.address().port}\`);
+        mainWindow.webContents.openDevTools();
+    });
     mainWindow.on('closed', function () {
-        mainWindow = undefined;
+        electron.app.exit(0);
     });
 });`;
     }