Get rid of package.json generation and yeoman generator

.gitignore

@@ -9,8 +9,7 @@ jdt.ls-java-project
 lerna-debug.log
 .nyc_output
 coverage
-packages/*/package.json
-examples/*/package.json
 examples/*/src-gen
+examples/*/webpack.config.js
 .browser_modules
 **/docs/api

.travis.yml

@@ -1,5 +1,5 @@
 language: node_js
-os: linux
+node_js: '8'
 git:
   depth: 1
 cache:
@@ -42,12 +42,10 @@ jobs:
   allow_failures:
     - os: osx
   include:
-  - stage: test
-    node_js: '6'
-  - stage: test
-    node_js: '8'
+  - state: test
+    os: linux
   - stage: deploy
-    node_js: '6'
+    os: linux
     before_script: skip
     script: skip
     install: skip
@@ -60,8 +58,7 @@ jobs:
       on:
         branch: master
       skip_cleanup: true
-  - stage: slow test
-    node_js: '8'
+  - stage: OSx test
     os: osx
     env: CXX=c++
     before_script: skip

dev-packages/cli/README.md

@@ -0,0 +1,22 @@
+# Theia CLI
+
+`theia` is a command line wrapper around tools used to create, build and run Theia applications.
+
+## Commands
+
+- `theia clean` - remove the built output (`lib` folder)
+- `theia copy` - copy static resources to the built output
+- `theia generate` - generate configurations for the given target
+    - `theia generate --target=browser`
+    - `theia generate --target=electron`
+- `theia rebuild` - rebuild native modules for the given target
+    - `theia rebuild --target=browser`
+    - `theia rebuild --target=electron`
+- `theia build` - package the frontend code with webpack
+    - arguments passed to webpack, e.g. `theia build --watch` to package the frontned code incrementally
+- `theia browser` - start the backend node process
+    - by default on port `3000`
+    - arguments passed to node process, e.g. `theia browser --port=3001` to start the backend on port `3001`
+- `theia electron` - start the backend electron process
+    - by default on port `localhost`
+    - arguments passed to electron process, e.g. `theia electron --host=myhost` to start the backend on host `myhost`

dev-packages/cli/bin/theia

@@ -0,0 +1,2 @@
+#!/usr/bin/env node
+require('../lib/theia')

dev-packages/cli/package.json

@@ -0,0 +1,55 @@
+{
+  "name": "@theia/cli",
+  "version": "0.1.1",
+  "description": "Theia CLI.",
+  "publishConfig": {
+    "access": "public"
+  },
+  "license": "Apache-2.0",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/theia-ide/theia.git"
+  },
+  "bugs": {
+    "url": "https://github.com/theia-ide/theia/issues"
+  },
+  "homepage": "https://github.com/theia-ide/theia",
+  "files": [
+    "bin",
+    "lib"
+  ],
+  "bin": {
+    "theia": "./bin/theia"
+  },
+  "scripts": {
+    "prepare": "yarn run clean && yarn run build",
+    "clean": "rimraf lib",
+    "build": "tsc",
+    "watch": "tsc -w",
+    "test": "echo 'skip'",
+    "docs": "echo 'skip'"
+  },
+  "dependencies": {
+    "@types/request": "^2.0.3",
+    "@types/semver": "^5.4.0",
+    "@types/yargs": "^8.0.2",
+    "bunyan": "^1.8.10",
+    "circular-dependency-plugin": "^2.0.0",
+    "copy-webpack-plugin": "^4.0.1",
+    "css-loader": "^0.28.1",
+    "electron": "1.7.6",
+    "electron-rebuild": "^1.5.11",
+    "file-loader": "^0.11.1",
+    "font-awesome-webpack": "0.0.5-beta.2",
+    "ignore-loader": "^0.1.2",
+    "less": "^2.7.2",
+    "request": "^2.82.0",
+    "rimraf": "^2.6.1",
+    "semver": "^5.4.1",
+    "source-map-loader": "^0.2.1",
+    "source-map-support": "^0.4.18",
+    "url-loader": "^0.5.8",
+    "webpack": "^2.2.1",
+    "yargs": "^9.0.1"
+  }
+}

generator-theia/src/common/abstract-generator.ts → dev-packages/cli/src/generator/abstract-generator.ts

@@ -6,39 +6,21 @@
  */
 
 import * as os from 'os';
-import * as path from 'path';
-import Base = require('yeoman-generator');
-
+import * as fs from 'fs-extra';
 import { Model } from "./generator-model";
 
-export type FileSystem = Base.MemFsEditor;
-
 export abstract class AbstractGenerator {
 
     constructor(
         protected readonly model: Model
     ) { }
 
-    abstract generate(fs: FileSystem): void;
-
-    protected srcGen(...paths: string[]): string {
-        return path.join('src-gen', ...paths);
-    }
-
-    protected backend(...paths: string[]): string {
-        return this.srcGen('backend', ...paths);
-    }
-
-    protected frontend(...paths: string[]): string {
-        return this.srcGen('frontend', ...paths);
-    }
-
     protected compileFrontendModuleImports(modules: Map<string, string>): string {
-        return this.compileModuleImports(modules, 'require')
+        return this.compileModuleImports(modules, 'require');
     }
 
     protected compileBackendModuleImports(modules: Map<string, string>): string {
-        return this.compileModuleImports(modules, 'require')
+        return this.compileModuleImports(modules, 'require');
     }
 
     protected compileModuleImports(modules: Map<string, string>, fn: 'import' | 'require'): string {
@@ -55,29 +37,17 @@ export abstract class AbstractGenerator {
         return os.EOL + lines.join(os.EOL);
     }
 
-    protected compileCopyright(): string {
-        const copyright = this.model.config.copyright;
-        return copyright ? copyright + os.EOL : '';
+    protected ifBrowser(value: string, defaultValue: string = '') {
+        return this.model.ifBrowser(value, defaultValue);
     }
 
-    protected node_modulesPath(): string {
-        return this.model.config.node_modulesPath;
-    }
-
-    protected isWeb(): boolean {
-        return this.model.target === 'web';
-    }
-
-    protected isElectron(): boolean {
-        return this.model.target === 'electron-renderer';
-    }
-
-    protected ifWeb(value: string, defaultValue: string = '') {
-        return this.isWeb() ? value : defaultValue;
+    protected ifElectron(value: string, defaultValue: string = '') {
+        return this.model.ifElectron(value, defaultValue);
     }
 
-    protected ifElectron(value: string, defaultValue: string = '') {
-        return this.isElectron() ? value : defaultValue;
+    protected write(path: string, content: string): void {
+        fs.ensureFileSync(path);
+        fs.writeFileSync(path, content);
     }
 
-}
+}

generator-theia/src/common/abstract-backend-generator.ts → dev-packages/cli/src/generator/backend-generator.ts

@@ -5,18 +5,18 @@
  * You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
  */
 
-import { AbstractGenerator, FileSystem } from "../common";
+import { AbstractGenerator } from "./abstract-generator";
 
-export abstract class AbstractBackendGenerator extends AbstractGenerator {
+export class BackendGenerator extends AbstractGenerator {
 
-    protected doGenerate(fs: FileSystem, backendModules: Map<string, string>): void {
-        fs.write(this.backend('server.js'), this.compileServer(backendModules));
-        fs.write(this.backend('main.js'), this.compileMain(backendModules));
+    generate(): void {
+        const backendModules = this.model.targetBackendModules;
+        this.write(this.model.backend('server.js'), this.compileServer(backendModules));
+        this.write(this.model.backend('main.js'), this.compileMain(backendModules));
     }
 
     protected compileServer(backendModules: Map<string, string>): string {
-        return `${this.compileCopyright()}
-// @ts-check
+        return `// @ts-check
 require('reflect-metadata');
 const path = require('path');
 const express = require('express');
@@ -57,8 +57,7 @@ module.exports = (port, host) => Promise.resolve()${this.compileBackendModuleImp
     }
 
     protected compileMain(backendModules: Map<string, string>): string {
-        return `${this.compileCopyright()}
-// @ts-check
+        return `// @ts-check
 
 const { port, hostname } = require('yargs').argv;
 console.info("Starting express on port '" + port + "'.")

dev-packages/cli/src/generator/common-app-generator.ts

@@ -0,0 +1,34 @@
+/*
+ * Copyright (C) 2017 TypeFox and others.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+ */
+
+import { ProjectOptions, Model } from "./generator-model";
+import { WebpackGenerator } from "./webpack-generator";
+import { BackendGenerator } from "./backend-generator";
+import { FrontendGenerator } from "./frontend-generator";
+
+export class CommonAppGenerator {
+
+    protected readonly model: Model;
+    protected readonly webpack: WebpackGenerator;
+    protected readonly backend: BackendGenerator;
+    protected readonly frontend: FrontendGenerator;
+
+    constructor(options: ProjectOptions) {
+        this.model = new Model(options);
+        this.webpack = new WebpackGenerator(this.model)
+        this.backend = new BackendGenerator(this.model);
+        this.frontend = new FrontendGenerator(this.model);
+    }
+
+    async generate(): Promise<void> {
+        await this.model.ready;
+        this.webpack.generate();
+        this.backend.generate();
+        this.frontend.generate();
+    }
+
+}

generator-theia/src/common/abstract-frontend-generator.ts → dev-packages/cli/src/generator/frontend-generator.ts

@@ -5,20 +5,25 @@
  * You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
  */
 
-import { AbstractGenerator, FileSystem } from "../common";
+import { AbstractGenerator } from "./abstract-generator";
 
-export abstract class AbstractFrontendGenerator extends AbstractGenerator {
+export class FrontendGenerator extends AbstractGenerator {
 
-    protected doGenerate(fs: FileSystem, frontendModules: Map<string, string>): void {
-        fs.write(this.frontend('index.html'), this.compileIndexHtml(frontendModules))
-        fs.write(this.frontend('index.js'), this.compileIndexJs(frontendModules));
+    generate(): void {
+        const frontendModules = this.model.targetFrontendModules;
+        this.write(this.model.frontend('index.html'), this.compileIndexHtml(frontendModules))
+        this.write(this.model.frontend('index.js'), this.compileIndexJs(frontendModules));
+        if (this.model.isElectron()) {
+            this.write(this.model.frontend('electron-main.js'), this.compileElectronMain());
+        }
     }
 
     protected compileIndexHtml(frontendModules: Map<string, string>): string {
         return `<!DOCTYPE html>
 <html>
 
-<head>${this.compileIndexHead(frontendModules)}
+<head>${this.compileIndexHead(frontendModules)}${this.ifBrowser(`
+  <script type="text/javascript" src="./require.js" charset="utf-8"></script>`)}
   <script type="text/javascript" src="./bundle.js" charset="utf-8"></script>
 </head>
 
@@ -36,8 +41,7 @@ export abstract class AbstractFrontendGenerator extends AbstractGenerator {
     }
 
     protected compileIndexJs(frontendModules: Map<string, string>): string {
-        return `${this.compileCopyright()}
-// @ts-check
+        return `// @ts-check
 require('reflect-metadata');
 const { Container } = require('inversify');
 const { FrontendApplication } = require('@theia/core/lib/browser');
@@ -70,4 +74,34 @@ module.exports = Promise.resolve()${this.compileFrontendModuleImports(frontendMo
     });`;
     }
 
-}
+    protected compileElectronMain(): string {
+        return `// @ts-check
+// Workaround for https://github.com/electron/electron/issues/9225. Chrome has an issue where
+// in certain locales (e.g. PL), image metrics are wrongly computed. We explicitly set the
+// LC_NUMERIC to prevent this from happening (selects the numeric formatting category of the
+// C locale, http://en.cppreference.com/w/cpp/locale/LC_categories).
+if (process.env.LC_ALL) {
+    process.env.LC_ALL = 'C';
+}
+process.env.LC_NUMERIC = 'C';
+const electron = require('electron');
+const path = require('path');
+electron.app.on('window-all-closed', function () {
+    if (process.platform !== 'darwin') {
+        electron.app.quit();
+    }
+});
+electron.app.on('ready', function () {
+    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}\`);
+    }).catch(() => {
+        electron.app.exit(1);
+    });
+    mainWindow.on('closed', function () {
+        electron.app.exit(0);
+    });
+});`;
+    }
+
+}