[generator-theia] fixed reading metadata before install

Signed-off-by: Anton Kosiakov <anton.kosyakov@typefox.io>

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

@@ -20,16 +20,16 @@ export abstract class AbstractAppGenerator extends BaseGenerator {
     protected readonly model = new Model();
     protected readonly pck = new AppPackageGenerator(this.model);
 
-    initializing(prefix = 'theia', defaults: object = this.model.config): void {
-        this.model.pck = this.fs.readJSON(`${prefix}.package.json`) || {};
-        this.config.defaults(defaults);
+    initializing(): void {
+        this.model.pck = this.fs.readJSON('theia.package.json') || {};
+        this.config.defaults(this.model.config);
         Object.assign(this.model.config, this.config.getAll());
     }
 
     configuring(): void {
         this.config.save();
         this.model.readLocalExtensionPackages((extension, path) => {
-            const extensionPath = paths.join(process.cwd(), `${path}/package.json`);
+            const extensionPath = paths.join(process.cwd(), path, 'extension.package.json');
             return this.fs.readJSON(extensionPath, undefined);
         })
         this.model.readExtensionPackages((extension, version) => {

scripts/generate.js

@@ -14,14 +14,19 @@ function generate(name, cwd, prefix, target) {
         const command = 'yo';
         const args = ['theia:' + target, '--force'];
         console.log(`${name}: ${command} ${args.join(' ')}`);
-        const process = cp.spawn(command, args, { cwd });
-        process.on('error', err =>
+        const p = cp.spawn(command, args, { cwd });
+        p.on('exit', code => {
+            if (code !== 0) {
+                process.exit(code)
+            }
+        });
+        p.on('error', err =>
             console.error(`${name}: ${err.message}`)
         );
-        process.stdout.on('data', data =>
+        p.stdout.on('data', data =>
             console.log(`${name}: ${data}`)
         );
-        process.stderr.on('data', data =>
+        p.stderr.on('data', data =>
             console.error(`${name}: ${data}`)
         );
     }