[extension-generator] added testSupport option

Signed-off-by: Anton Kosiakov <anton.kosyakov@typefox.io>
eclipse-theia · Jul 15, 2017 · 0387e4a · 0387e4a
1 parent db155d4
commit 0387e4a
Show file tree

Hide file tree

Showing 18 changed files with 96 additions and 26 deletions.
diff --git a/config/generator-theia/package.json b/config/generator-theia/package.json
@@ -11,7 +11,7 @@
     "yeoman-generator"
   ],
   "scripts": {
-    "prepublish": "npm run clean && npm run compile",
+    "prepublishOnly": "npm run clean && npm run compile",
     "compile": "tsc",
     "watch": "tsc -w",
     "clean": "rimraf generators"
@@ -25,4 +25,4 @@
     "rimraf": "^2.6.1",
     "typescript": "^2.4.1"
   }
-}
+}
diff --git a/config/generator-theia/src/common/abstract-app-generator.ts b/config/generator-theia/src/common/abstract-app-generator.ts
@@ -25,6 +25,7 @@ export abstract class AbstractAppGenerator extends BaseGenerator {
     }
 
     configuring(): void {
+        this.config.save();
         this.model.readLocalExtensionPackages((extension, path) => {
             const extensionPath = paths.join(process.cwd(), `${path}/package.json`);
             return this.fs.readJSON(extensionPath, undefined);

diff --git a/config/generator-theia/src/common/generator-model.ts b/config/generator-theia/src/common/generator-model.ts
@@ -35,6 +35,9 @@ export interface Config {
     copyright: string;
 }
 
+export interface ExtensionConfig {
+    testSupport: boolean;
+}
 
 export function sortByKey(object: { [key: string]: any }): { [key: string]: any } {
     return Object.keys(object).sort().reduce((sorted, key) => {
@@ -50,6 +53,9 @@ export class Model {
         host: 'localhost',
         copyright: ''
     }
+    extensionConfig: ExtensionConfig = {
+        testSupport: true
+    }
 
     protected _frontendModules: Map<string, string> | undefined;
     protected _frontendElectronModules: Map<string, string> | undefined;

diff --git a/config/generator-theia/src/extension/.yo-rc.json b/config/generator-theia/src/extension/.yo-rc.json
@@ -0,0 +1,5 @@
+{
+  "generator-theia": {
+    "testSupport": false
+  }
+}
diff --git a/config/generator-theia/src/extension/extension-generator.ts b/config/generator-theia/src/extension/extension-generator.ts
@@ -15,6 +15,12 @@ export class TheiaExtensionGenerator extends BaseGenerator {
 
     initializing(): void {
         this.model.pck = this.fs.readJSON(`extension.package.json`) || {};
+        this.config.defaults(this.model.extensionConfig);
+        Object.assign(this.model.extensionConfig, this.config.getAll());
+    }
+
+    configuring(): void {
+        this.config.save();
     }
 
     writing(): void {

diff --git a/config/generator-theia/src/extension/extension-package-generator.ts b/config/generator-theia/src/extension/extension-package-generator.ts
@@ -6,7 +6,7 @@
  */
 
 import Base = require('yeoman-generator');
-import { AbstractGenerator, sortByKey } from '../common';
+import { AbstractGenerator, sortByKey, NodePackage } from '../common';
 
 export class ExtensionPackageGenerator extends AbstractGenerator {
 
@@ -18,6 +18,38 @@ export class ExtensionPackageGenerator extends AbstractGenerator {
     }
 
     protected compilePackage(): object {
+        const pck = this.compileCommonPackage()
+        if (!this.model.extensionConfig.testSupport) {
+            return pck
+        }
+        return {
+            ...pck,
+            "nyc": pck.nyc || {
+                "extends": "../nyc.json"
+            },
+            "scripts": {
+                ...pck.scripts,
+                "clean": "npm run compile:clean && npm run test:clean",
+                "test": "nyc mocha --opts ../mocha.opts src/**/*.spec.ts",
+                "test:watch": "mocha -w --opts ../mocha.opts src/**/*.spec.ts",
+                "test:clean": "rimraf .nyc_output && rimraf coverage",
+                ...this.model.pck.scripts
+            },
+            "devDependencies": sortByKey({
+                ...pck.devDependencies,
+                "@types/chai": "^4.0.1",
+                "@types/chai-as-promised": "0.0.31",
+                "@types/mocha": "^2.2.41",
+                "chai": "^4.1.0",
+                "chai-as-promised": "^7.1.1",
+                "mocha": "^3.4.2",
+                "nyc": "^11.0.3",
+                ...this.model.pck.devDependencies
+            })
+        };
+    }
+
+    protected compileCommonPackage(): NodePackage {
         return {
             ...this.model.pck,
             "license": this.model.pck.license || "Apache-2.0",
@@ -33,30 +65,17 @@ export class ExtensionPackageGenerator extends AbstractGenerator {
                 "lib",
                 "src"
             ],
-            "nyc": this.model.pck.nyc || {
-                "extends": "../nyc.json"
-            },
             "scripts": {
-                "clean": "npm run compile:clean && npm run test:clean",
+                "clean": "npm run compile:clean",
                 "build": "concurrently -n compile,lint -c blue,green \"npm run compile\" \"npm run lint\"",
                 "compile": "tsc -p compile.tsconfig.json",
                 "compile:clean": "rimraf lib",
                 "lint": "tslint -c ../tslint.json --project compile.tsconfig.json",
                 "watch": "tsc -w -p compile.tsconfig.json",
-                "test": "nyc mocha --opts ../mocha.opts src/**/*.spec.ts",
-                "test:watch": "mocha -w --opts ../mocha.opts src/**/*.spec.ts",
-                "test:clean": "rimraf .nyc_output && rimraf coverage",
                 ...this.model.pck.scripts
             },
             "devDependencies": sortByKey({
-                "@types/chai": "^4.0.1",
-                "@types/chai-as-promised": "0.0.31",
-                "@types/mocha": "^2.2.41",
-                "chai": "^4.1.0",
-                "chai-as-promised": "^7.1.1",
                 "concurrently": "^3.5.0",
-                "mocha": "^3.4.2",
-                "nyc": "^11.0.3",
                 "rimraf": "^2.6.1",
                 "tslint": "^4.5.1",
                 "typescript": "^2.4.1",

diff --git a/packages/core/.yo-rc.json b/packages/core/.yo-rc.json
@@ -1,3 +1,5 @@
 {
-  "generator-theia": {}
+  "generator-theia": {
+    "testSupport": true
+  }
 }
diff --git a/packages/cpp/.yo-rc.json b/packages/cpp/.yo-rc.json
@@ -0,0 +1,5 @@
+{
+  "generator-theia": {
+    "testSupport": false
+  }
+}
diff --git a/packages/editor/.yo-rc.json b/packages/editor/.yo-rc.json
@@ -1,3 +1,5 @@
 {
-  "generator-theia": {}
+  "generator-theia": {
+    "testSupport": false
+  }
 }
diff --git a/packages/filesystem/.yo-rc.json b/packages/filesystem/.yo-rc.json
@@ -1,3 +1,5 @@
 {
-  "generator-theia": {}
+  "generator-theia": {
+    "testSupport": true
+  }
 }
diff --git a/packages/java/.yo-rc.json b/packages/java/.yo-rc.json
@@ -0,0 +1,5 @@
+{
+  "generator-theia": {
+    "testSupport": false
+  }
+}
diff --git a/packages/languages/.yo-rc.json b/packages/languages/.yo-rc.json
@@ -1,3 +1,5 @@
 {
-  "generator-theia": {}
+  "generator-theia": {
+    "testSupport": false
+  }
 }
diff --git a/packages/monaco/.yo-rc.json b/packages/monaco/.yo-rc.json
@@ -1,3 +1,5 @@
 {
-  "generator-theia": {}
+  "generator-theia": {
+    "testSupport": false
+  }
 }
diff --git a/packages/navigator/.yo-rc.json b/packages/navigator/.yo-rc.json
@@ -1,3 +1,5 @@
 {
-  "generator-theia": {}
+  "generator-theia": {
+    "testSupport": false
+  }
 }
diff --git a/packages/preferences/.yo-rc.json b/packages/preferences/.yo-rc.json
@@ -1,3 +1,5 @@
 {
-  "generator-theia": {}
+  "generator-theia": {
+    "testSupport": true
+  }
 }
diff --git a/packages/python/.yo-rc.json b/packages/python/.yo-rc.json
@@ -0,0 +1,5 @@
+{
+  "generator-theia": {
+    "testSupport": false
+  }
+}
diff --git a/packages/terminal/.yo-rc.json b/packages/terminal/.yo-rc.json
@@ -1,3 +1,5 @@
 {
-  "generator-theia": {}
+  "generator-theia": {
+    "testSupport": false
+  }
 }
diff --git a/packages/workspace/.yo-rc.json b/packages/workspace/.yo-rc.json
@@ -1,3 +1,5 @@
 {
-  "generator-theia": {}
+  "generator-theia": {
+    "testSupport": false
+  }
 }