From 5c091631bb600ad910803645a31fbf55b0119fa7 Mon Sep 17 00:00:00 2001
From: Tomer Epstein <tomer.epstein@sap.com>
Date: Thu, 19 Dec 2019 15:09:06 +0200
Subject: [PATCH 01/11] overide env.getNpmPaths

---
 backend/package.json                     |  5 +++--
 backend/src/yeomanui.ts                  | 28 ++++++++++++++++++++++--
 backend/tests/yeomanui.spec.ts           |  2 +-
 frontend/src/App.vue                     |  4 ++--
 frontend/src/components/Header.vue       |  6 +----
 frontend/tests/App.spec.js               |  2 +-
 frontend/tests/components/Header.spec.js | 11 +---------
 7 files changed, 35 insertions(+), 23 deletions(-)

diff --git a/backend/package.json b/backend/package.json
index 315e49409..7079c5f97 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -5,7 +5,7 @@
 	"license": "Apache 2.0",
 	"description": "Provide rich user experience for Yeoman generators using VSCode extension or the browser",
 	"repository": "https://github.com/SAP/yeoman-ui",
-	"version": "0.0.12",
+	"version": "0.0.13",
 	"engines": {
 		"vscode": "^1.38.0"
 	},
@@ -53,7 +53,8 @@
 		"strip-ansi": "^6.0.0",
 		"ws": "^7.2.0",
 		"yeoman-environment": "^2.6.0",
-		"fs-extra": "^8.1.0"
+		"fs-extra": "^8.1.0",
+		"array-uniq": "^2.1.0"
 	},
 	"devDependencies": {
 		"@types/fs-extra": "^8.0.1",
diff --git a/backend/src/yeomanui.ts b/backend/src/yeomanui.ts
index b78958643..8f619bf25 100644
--- a/backend/src/yeomanui.ts
+++ b/backend/src/yeomanui.ts
@@ -13,6 +13,9 @@ import { IRpc } from "@sap-devx/webview-rpc/out.ext/rpc-common";
 import Generator = require("yeoman-generator");
 import { GeneratorType, GeneratorFilter } from "./filter";
 
+const uniq = require('array-uniq');
+const win32 = process.platform === 'win32';
+
 export interface IGeneratorChoice {
   name: string;
   message: string;
@@ -73,7 +76,28 @@ export class YeomanUI {
     // on the other hand, we never look for newly installed generators...
 
     const promise: Promise<IPrompt> = new Promise(resolve => {
+      const cwd = path.join(os.homedir(), "projects");
       const env: Environment.Options = Environment.createEnv();
+      const envGetNpmPaths: Function = env.getNpmPaths;
+      env.getNpmPaths = function (localOnly:any = false) {
+        // Start with the local paths derived by cwd in vscode 
+        // (as opposed to cwd of the plugin host process which is what is used by yeoman/environment)
+        const localPaths: any[] = [];
+    
+        // Walk up the CWD and add `node_modules/` folder lookup on each level
+        cwd.split(path.sep).forEach((part, i, parts) => {
+          let lookup = path.join(...parts.slice(0, i + 1), 'node_modules');
+    
+          if (!win32) {
+            lookup = `/${lookup}`;
+          }
+    
+          localPaths.push(lookup);
+        });
+        const defaultPaths = envGetNpmPaths.call(this, localOnly);
+        
+        return uniq(localPaths.concat(defaultPaths));
+      };
       env.lookup(async () => this.onEnvLookup(env, resolve, this.genFilter));
     });
 
@@ -141,7 +165,7 @@ export class YeomanUI {
         }
 
         console.log("done running yeomanui");
-        message = `${generatorName} is done. Destination directory is ${destinationRoot}`;
+        message = `The '${generatorName}' project has been generated. You can find it at ${destinationRoot}`;
         this.doGeneratorDone(true, message);
       });
     } catch (err) {
@@ -211,7 +235,7 @@ export class YeomanUI {
       message: "",
       choices: _.compact(generatorChoices)
     };
-    resolve({ name: "Generator Selection", questions: [generatorQuestion] });
+    resolve({ name: "Select Generator", questions: [generatorQuestion] });
   }
 
   private async getGeneratorChoice(genName: string, filter?: GeneratorFilter): Promise<IGeneratorChoice | undefined> {
diff --git a/backend/tests/yeomanui.spec.ts b/backend/tests/yeomanui.spec.ts
index be98768dc..fbaf1674b 100644
--- a/backend/tests/yeomanui.spec.ts
+++ b/backend/tests/yeomanui.spec.ts
@@ -139,7 +139,7 @@ describe('yeomanui unit test', () => {
                 message: "",
                 choices: []
               };
-            expect(result).to.be.deep.equal({ name: "Generator Selection", questions: [generatorQuestion] });
+            expect(result).to.be.deep.equal({ name: "Select Generator", questions: [generatorQuestion] });
         });
 
         it("get generators with type project", async () => {
diff --git a/frontend/src/App.vue b/frontend/src/App.vue
index e1d8d487d..3194bfbe2 100644
--- a/frontend/src/App.vue
+++ b/frontend/src/App.vue
@@ -189,7 +189,7 @@ export default {
                   delete currentPrompt.status
                 }
               } else {
-                // first prompt (Generator Selection)
+                // first prompt (Select Generator)
                 prompt.active = true
                 this.prompts.push(prompt)
               }
@@ -253,7 +253,7 @@ export default {
     },
     generatorDone(success, message) {
       if (this.currentPrompt.status === "pending") {
-        this.currentPrompt.name = "Done"
+        this.currentPrompt.name = "Confirmation"
       }
       this.doneMessage = message
       this.isDone = true
diff --git a/frontend/src/components/Header.vue b/frontend/src/components/Header.vue
index 0c49563d3..97471035a 100644
--- a/frontend/src/components/Header.vue
+++ b/frontend/src/components/Header.vue
@@ -1,11 +1,7 @@
 <template>
   <div>
     <b-navbar>
-      <b-navbar-brand>Yeoman UI Wizzard: {{generatorName}}</b-navbar-brand>
-
-      <b-navbar-nav>
-        <b-nav-text>{{ stepName }}</b-nav-text>
-      </b-navbar-nav>
+      <b-navbar-brand>Yeoman UI Wizard: {{generatorName}}</b-navbar-brand>
 
       <!-- Right aligned nav items -->
       <b-navbar-nav class="ml-auto">
diff --git a/frontend/tests/App.spec.js b/frontend/tests/App.spec.js
index 9622a998f..d3b2a46e2 100644
--- a/frontend/tests/App.spec.js
+++ b/frontend/tests/App.spec.js
@@ -344,7 +344,7 @@ describe('App.vue', () => {
 
       expect(wrapper.vm.doneMessage).toBe('testMessage')
       expect(wrapper.vm.isDone).toBeTruthy()
-      expect(wrapper.vm.currentPrompt.name).toBe('Done')
+      expect(wrapper.vm.currentPrompt.name).toBe('Confirmation')
     })
   })
 })
\ No newline at end of file
diff --git a/frontend/tests/components/Header.spec.js b/frontend/tests/components/Header.spec.js
index 14bd85012..29b4d7861 100644
--- a/frontend/tests/components/Header.spec.js
+++ b/frontend/tests/components/Header.spec.js
@@ -24,16 +24,7 @@ describe('Header.vue', () => {
     test('generator brand', () => {
         const testGen = 'testGenerator'
         wrapper = initComponent(Header, { generatorName: testGen })
-        expect(wrapper.find(BNavbarBrand).text()).toBe(`Yeoman UI Wizzard: ${testGen}`)
-    })
-
-    test('find step text and step text name', () => {
-        const testPrompt = 'testPrompt'
-        const testStepName = 'testStepName'
-        const testNumOfSteps = 3
-        wrapper = initComponent(Header, { stepName: testStepName })
-        const bNavTexts = wrapper.findAll(BNavText)
-        expect(bNavTexts.wrappers[0].element.textContent).toBe(`${testStepName}`)
+        expect(wrapper.find(BNavbarBrand).text()).toBe(`Yeoman UI Wizard: ${testGen}`)
     })
 
     test('click triggers collapseLog method', async () => {

From 5f5e424f2d86daf2baa508997083bd0350952161 Mon Sep 17 00:00:00 2001
From: Tomer Epstein <tomer.epstein@sap.com>
Date: Thu, 19 Dec 2019 16:35:14 +0200
Subject: [PATCH 02/11] overide env.getNpmPaths

---
 backend/package.json    | 3 +--
 backend/src/yeomanui.ts | 9 ++++-----
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/backend/package.json b/backend/package.json
index 7079c5f97..1c2531a0b 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -53,8 +53,7 @@
 		"strip-ansi": "^6.0.0",
 		"ws": "^7.2.0",
 		"yeoman-environment": "^2.6.0",
-		"fs-extra": "^8.1.0",
-		"array-uniq": "^2.1.0"
+		"fs-extra": "^8.1.0"
 	},
 	"devDependencies": {
 		"@types/fs-extra": "^8.0.1",
diff --git a/backend/src/yeomanui.ts b/backend/src/yeomanui.ts
index 8f619bf25..d1ecda49b 100644
--- a/backend/src/yeomanui.ts
+++ b/backend/src/yeomanui.ts
@@ -13,8 +13,7 @@ import { IRpc } from "@sap-devx/webview-rpc/out.ext/rpc-common";
 import Generator = require("yeoman-generator");
 import { GeneratorType, GeneratorFilter } from "./filter";
 
-const uniq = require('array-uniq');
-const win32 = process.platform === 'win32';
+const isWin32 = process.platform === 'win32';
 
 export interface IGeneratorChoice {
   name: string;
@@ -78,7 +77,7 @@ export class YeomanUI {
     const promise: Promise<IPrompt> = new Promise(resolve => {
       const cwd = path.join(os.homedir(), "projects");
       const env: Environment.Options = Environment.createEnv();
-      const envGetNpmPaths: Function = env.getNpmPaths;
+      const envGetNpmPaths: () => any = env.getNpmPaths;
       env.getNpmPaths = function (localOnly:any = false) {
         // Start with the local paths derived by cwd in vscode 
         // (as opposed to cwd of the plugin host process which is what is used by yeoman/environment)
@@ -88,7 +87,7 @@ export class YeomanUI {
         cwd.split(path.sep).forEach((part, i, parts) => {
           let lookup = path.join(...parts.slice(0, i + 1), 'node_modules');
     
-          if (!win32) {
+          if (!isWin32) {
             lookup = `/${lookup}`;
           }
     
@@ -96,7 +95,7 @@ export class YeomanUI {
         });
         const defaultPaths = envGetNpmPaths.call(this, localOnly);
         
-        return uniq(localPaths.concat(defaultPaths));
+        return  _.uniq(localPaths.concat(defaultPaths));
       };
       env.lookup(async () => this.onEnvLookup(env, resolve, this.genFilter));
     });

From 6811a40b8cb36c3db8ac584c248670da941b5acb Mon Sep 17 00:00:00 2001
From: i040767 <ido.perez@sap.com>
Date: Thu, 19 Dec 2019 21:33:38 +0200
Subject: [PATCH 03/11] fix rpc lib

---
 backend/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/package.json b/backend/package.json
index 1c2531a0b..242de0234 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -47,7 +47,7 @@
 		"lint": "tslint '*/*.{ts,tsx}' -c ./tslint.yml"
 	},
 	"dependencies": {
-		"@sap-devx/webview-rpc": "^0.1.3",
+		"@sap-devx/webview-rpc": "^0.2.0",
 		"datauri": "^2.0.0",
 		"lodash": "^4.17.15",
 		"strip-ansi": "^6.0.0",

From 393b5ccabcd6162a4447ea03a5b55567ed3e100e Mon Sep 17 00:00:00 2001
From: Tomer Epstein <tomer.epstein@sap.com>
Date: Sun, 22 Dec 2019 10:55:38 +0200
Subject: [PATCH 04/11] overide env.getNpmPaths

---
 backend/src/yeomanui.ts | 49 +++++++++++++++++++++++------------------
 1 file changed, 27 insertions(+), 22 deletions(-)

diff --git a/backend/src/yeomanui.ts b/backend/src/yeomanui.ts
index d1ecda49b..0d5b3fc7b 100644
--- a/backend/src/yeomanui.ts
+++ b/backend/src/yeomanui.ts
@@ -75,34 +75,39 @@ export class YeomanUI {
     // on the other hand, we never look for newly installed generators...
 
     const promise: Promise<IPrompt> = new Promise(resolve => {
-      const cwd = path.join(os.homedir(), "projects");
-      const env: Environment.Options = Environment.createEnv();
-      const envGetNpmPaths: () => any = env.getNpmPaths;
-      env.getNpmPaths = function (localOnly:any = false) {
-        // Start with the local paths derived by cwd in vscode 
-        // (as opposed to cwd of the plugin host process which is what is used by yeoman/environment)
-        const localPaths: any[] = [];
-    
-        // Walk up the CWD and add `node_modules/` folder lookup on each level
-        cwd.split(path.sep).forEach((part, i, parts) => {
-          let lookup = path.join(...parts.slice(0, i + 1), 'node_modules');
-    
-          if (!isWin32) {
-            lookup = `/${lookup}`;
-          }
-    
-          localPaths.push(lookup);
-        });
-        const defaultPaths = envGetNpmPaths.call(this, localOnly);
-        
-        return  _.uniq(localPaths.concat(defaultPaths));
-      };
+      const env: Environment.Options = this.getEnv();
       env.lookup(async () => this.onEnvLookup(env, resolve, this.genFilter));
     });
 
     return promise;
   }
 
+  private getEnv(): Environment.Options {
+    const cwd = path.join(os.homedir(), "projects");
+    const env: Environment.Options = Environment.createEnv();
+    const envGetNpmPaths: () => any = env.getNpmPaths;
+    env.getNpmPaths = function (localOnly:any = false) {
+      // Start with the local paths derived by cwd in vscode 
+      // (as opposed to cwd of the plugin host process which is what is used by yeoman/environment)
+      const localPaths: any[] = [];
+  
+      // Walk up the CWD and add `node_modules/` folder lookup on each level
+      cwd.split(path.sep).forEach((part, i, parts) => {
+        let lookup = path.join(...parts.slice(0, i + 1), 'node_modules');
+  
+        if (!isWin32) {
+          lookup = `/${lookup}`;
+        }
+  
+        localPaths.push(lookup);
+      });
+      const defaultPaths = envGetNpmPaths.call(this, localOnly);
+      
+      return  _.uniq(localPaths.concat(defaultPaths));
+    };
+    return env;
+}
+
   public async runGenerator(generatorName: string) {
 
     // TODO: ensure generatorName is a valid dir name

From 119ba2c5207c259f1378afec68e7a6f4f429dfc5 Mon Sep 17 00:00:00 2001
From: Tomer Epstein <tomer.epstein@sap.com>
Date: Thu, 19 Dec 2019 15:09:06 +0200
Subject: [PATCH 05/11] overide env.getNpmPaths

---
 backend/package.json                     |  5 +++--
 backend/src/yeomanui.ts                  | 28 ++++++++++++++++++++++--
 backend/tests/yeomanui.spec.ts           |  2 +-
 frontend/src/App.vue                     |  4 ++--
 frontend/src/components/Header.vue       |  6 +----
 frontend/tests/App.spec.js               |  2 +-
 frontend/tests/components/Header.spec.js | 11 +---------
 7 files changed, 35 insertions(+), 23 deletions(-)

diff --git a/backend/package.json b/backend/package.json
index 1b0da4055..55ea7353e 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -5,7 +5,7 @@
 	"license": "Apache 2.0",
 	"description": "Provide rich user experience for Yeoman generators using VSCode extension or the browser",
 	"repository": "https://github.com/SAP/yeoman-ui",
-	"version": "0.0.12",
+	"version": "0.0.13",
 	"engines": {
 		"vscode": "^1.38.0"
 	},
@@ -53,7 +53,8 @@
 		"strip-ansi": "^6.0.0",
 		"ws": "^7.2.0",
 		"yeoman-environment": "^2.6.0",
-		"fs-extra": "^8.1.0"
+		"fs-extra": "^8.1.0",
+		"array-uniq": "^2.1.0"
 	},
 	"devDependencies": {
 		"@types/fs-extra": "^8.0.1",
diff --git a/backend/src/yeomanui.ts b/backend/src/yeomanui.ts
index 9d98b5e6b..c9c831d97 100644
--- a/backend/src/yeomanui.ts
+++ b/backend/src/yeomanui.ts
@@ -13,6 +13,9 @@ import { IRpc } from "@sap-devx/webview-rpc/out.ext/rpc-common";
 import Generator = require("yeoman-generator");
 import { GeneratorType, GeneratorFilter } from "./filter";
 
+const uniq = require('array-uniq');
+const win32 = process.platform === 'win32';
+
 export interface IGeneratorChoice {
   name: string;
   message: string;
@@ -74,7 +77,28 @@ export class YeomanUI {
     // on the other hand, we never look for newly installed generators...
 
     const promise: Promise<IPrompt> = new Promise(resolve => {
+      const cwd = path.join(os.homedir(), "projects");
       const env: Environment.Options = Environment.createEnv();
+      const envGetNpmPaths: Function = env.getNpmPaths;
+      env.getNpmPaths = function (localOnly:any = false) {
+        // Start with the local paths derived by cwd in vscode 
+        // (as opposed to cwd of the plugin host process which is what is used by yeoman/environment)
+        const localPaths: any[] = [];
+    
+        // Walk up the CWD and add `node_modules/` folder lookup on each level
+        cwd.split(path.sep).forEach((part, i, parts) => {
+          let lookup = path.join(...parts.slice(0, i + 1), 'node_modules');
+    
+          if (!win32) {
+            lookup = `/${lookup}`;
+          }
+    
+          localPaths.push(lookup);
+        });
+        const defaultPaths = envGetNpmPaths.call(this, localOnly);
+        
+        return uniq(localPaths.concat(defaultPaths));
+      };
       env.lookup(async () => this.onEnvLookup(env, resolve, this.genFilter));
     });
 
@@ -142,7 +166,7 @@ export class YeomanUI {
         }
 
         console.log("done running yeomanui");
-        message = `${generatorName} is done. Destination directory is ${destinationRoot}`;
+        message = `The '${generatorName}' project has been generated. You can find it at ${destinationRoot}`;
         this.doGeneratorDone(true, message);
       });
     } catch (err) {
@@ -212,7 +236,7 @@ export class YeomanUI {
       message: "",
       choices: _.compact(generatorChoices)
     };
-    resolve({ name: "Generator Selection", questions: [generatorQuestion] });
+    resolve({ name: "Select Generator", questions: [generatorQuestion] });
   }
 
   private async getGeneratorChoice(genName: string, filter?: GeneratorFilter): Promise<IGeneratorChoice | undefined> {
diff --git a/backend/tests/yeomanui.spec.ts b/backend/tests/yeomanui.spec.ts
index be98768dc..fbaf1674b 100644
--- a/backend/tests/yeomanui.spec.ts
+++ b/backend/tests/yeomanui.spec.ts
@@ -139,7 +139,7 @@ describe('yeomanui unit test', () => {
                 message: "",
                 choices: []
               };
-            expect(result).to.be.deep.equal({ name: "Generator Selection", questions: [generatorQuestion] });
+            expect(result).to.be.deep.equal({ name: "Select Generator", questions: [generatorQuestion] });
         });
 
         it("get generators with type project", async () => {
diff --git a/frontend/src/App.vue b/frontend/src/App.vue
index e1d8d487d..3194bfbe2 100644
--- a/frontend/src/App.vue
+++ b/frontend/src/App.vue
@@ -189,7 +189,7 @@ export default {
                   delete currentPrompt.status
                 }
               } else {
-                // first prompt (Generator Selection)
+                // first prompt (Select Generator)
                 prompt.active = true
                 this.prompts.push(prompt)
               }
@@ -253,7 +253,7 @@ export default {
     },
     generatorDone(success, message) {
       if (this.currentPrompt.status === "pending") {
-        this.currentPrompt.name = "Done"
+        this.currentPrompt.name = "Confirmation"
       }
       this.doneMessage = message
       this.isDone = true
diff --git a/frontend/src/components/Header.vue b/frontend/src/components/Header.vue
index 0c49563d3..97471035a 100644
--- a/frontend/src/components/Header.vue
+++ b/frontend/src/components/Header.vue
@@ -1,11 +1,7 @@
 <template>
   <div>
     <b-navbar>
-      <b-navbar-brand>Yeoman UI Wizzard: {{generatorName}}</b-navbar-brand>
-
-      <b-navbar-nav>
-        <b-nav-text>{{ stepName }}</b-nav-text>
-      </b-navbar-nav>
+      <b-navbar-brand>Yeoman UI Wizard: {{generatorName}}</b-navbar-brand>
 
       <!-- Right aligned nav items -->
       <b-navbar-nav class="ml-auto">
diff --git a/frontend/tests/App.spec.js b/frontend/tests/App.spec.js
index 9622a998f..d3b2a46e2 100644
--- a/frontend/tests/App.spec.js
+++ b/frontend/tests/App.spec.js
@@ -344,7 +344,7 @@ describe('App.vue', () => {
 
       expect(wrapper.vm.doneMessage).toBe('testMessage')
       expect(wrapper.vm.isDone).toBeTruthy()
-      expect(wrapper.vm.currentPrompt.name).toBe('Done')
+      expect(wrapper.vm.currentPrompt.name).toBe('Confirmation')
     })
   })
 })
\ No newline at end of file
diff --git a/frontend/tests/components/Header.spec.js b/frontend/tests/components/Header.spec.js
index 14bd85012..29b4d7861 100644
--- a/frontend/tests/components/Header.spec.js
+++ b/frontend/tests/components/Header.spec.js
@@ -24,16 +24,7 @@ describe('Header.vue', () => {
     test('generator brand', () => {
         const testGen = 'testGenerator'
         wrapper = initComponent(Header, { generatorName: testGen })
-        expect(wrapper.find(BNavbarBrand).text()).toBe(`Yeoman UI Wizzard: ${testGen}`)
-    })
-
-    test('find step text and step text name', () => {
-        const testPrompt = 'testPrompt'
-        const testStepName = 'testStepName'
-        const testNumOfSteps = 3
-        wrapper = initComponent(Header, { stepName: testStepName })
-        const bNavTexts = wrapper.findAll(BNavText)
-        expect(bNavTexts.wrappers[0].element.textContent).toBe(`${testStepName}`)
+        expect(wrapper.find(BNavbarBrand).text()).toBe(`Yeoman UI Wizard: ${testGen}`)
     })
 
     test('click triggers collapseLog method', async () => {

From b3a6a72fe251c008e229cb2f52d0b6298fae8d9f Mon Sep 17 00:00:00 2001
From: Tomer Epstein <tomer.epstein@sap.com>
Date: Thu, 19 Dec 2019 16:35:14 +0200
Subject: [PATCH 06/11] overide env.getNpmPaths

---
 backend/package.json    | 3 +--
 backend/src/yeomanui.ts | 9 ++++-----
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/backend/package.json b/backend/package.json
index 55ea7353e..242de0234 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -53,8 +53,7 @@
 		"strip-ansi": "^6.0.0",
 		"ws": "^7.2.0",
 		"yeoman-environment": "^2.6.0",
-		"fs-extra": "^8.1.0",
-		"array-uniq": "^2.1.0"
+		"fs-extra": "^8.1.0"
 	},
 	"devDependencies": {
 		"@types/fs-extra": "^8.0.1",
diff --git a/backend/src/yeomanui.ts b/backend/src/yeomanui.ts
index c9c831d97..52e507c1d 100644
--- a/backend/src/yeomanui.ts
+++ b/backend/src/yeomanui.ts
@@ -13,8 +13,7 @@ import { IRpc } from "@sap-devx/webview-rpc/out.ext/rpc-common";
 import Generator = require("yeoman-generator");
 import { GeneratorType, GeneratorFilter } from "./filter";
 
-const uniq = require('array-uniq');
-const win32 = process.platform === 'win32';
+const isWin32 = process.platform === 'win32';
 
 export interface IGeneratorChoice {
   name: string;
@@ -79,7 +78,7 @@ export class YeomanUI {
     const promise: Promise<IPrompt> = new Promise(resolve => {
       const cwd = path.join(os.homedir(), "projects");
       const env: Environment.Options = Environment.createEnv();
-      const envGetNpmPaths: Function = env.getNpmPaths;
+      const envGetNpmPaths: () => any = env.getNpmPaths;
       env.getNpmPaths = function (localOnly:any = false) {
         // Start with the local paths derived by cwd in vscode 
         // (as opposed to cwd of the plugin host process which is what is used by yeoman/environment)
@@ -89,7 +88,7 @@ export class YeomanUI {
         cwd.split(path.sep).forEach((part, i, parts) => {
           let lookup = path.join(...parts.slice(0, i + 1), 'node_modules');
     
-          if (!win32) {
+          if (!isWin32) {
             lookup = `/${lookup}`;
           }
     
@@ -97,7 +96,7 @@ export class YeomanUI {
         });
         const defaultPaths = envGetNpmPaths.call(this, localOnly);
         
-        return uniq(localPaths.concat(defaultPaths));
+        return  _.uniq(localPaths.concat(defaultPaths));
       };
       env.lookup(async () => this.onEnvLookup(env, resolve, this.genFilter));
     });

From 3e84681a9e448881ae70d38edae06e2ac007b566 Mon Sep 17 00:00:00 2001
From: Tomer Epstein <tomer.epstein@sap.com>
Date: Sun, 22 Dec 2019 10:55:38 +0200
Subject: [PATCH 07/11] overide env.getNpmPaths

---
 backend/src/yeomanui.ts | 49 +++++++++++++++++++++++------------------
 1 file changed, 27 insertions(+), 22 deletions(-)

diff --git a/backend/src/yeomanui.ts b/backend/src/yeomanui.ts
index 52e507c1d..5f5838a40 100644
--- a/backend/src/yeomanui.ts
+++ b/backend/src/yeomanui.ts
@@ -76,34 +76,39 @@ export class YeomanUI {
     // on the other hand, we never look for newly installed generators...
 
     const promise: Promise<IPrompt> = new Promise(resolve => {
-      const cwd = path.join(os.homedir(), "projects");
-      const env: Environment.Options = Environment.createEnv();
-      const envGetNpmPaths: () => any = env.getNpmPaths;
-      env.getNpmPaths = function (localOnly:any = false) {
-        // Start with the local paths derived by cwd in vscode 
-        // (as opposed to cwd of the plugin host process which is what is used by yeoman/environment)
-        const localPaths: any[] = [];
-    
-        // Walk up the CWD and add `node_modules/` folder lookup on each level
-        cwd.split(path.sep).forEach((part, i, parts) => {
-          let lookup = path.join(...parts.slice(0, i + 1), 'node_modules');
-    
-          if (!isWin32) {
-            lookup = `/${lookup}`;
-          }
-    
-          localPaths.push(lookup);
-        });
-        const defaultPaths = envGetNpmPaths.call(this, localOnly);
-        
-        return  _.uniq(localPaths.concat(defaultPaths));
-      };
+      const env: Environment.Options = this.getEnv();
       env.lookup(async () => this.onEnvLookup(env, resolve, this.genFilter));
     });
 
     return promise;
   }
 
+  private getEnv(): Environment.Options {
+    const cwd = path.join(os.homedir(), "projects");
+    const env: Environment.Options = Environment.createEnv();
+    const envGetNpmPaths: () => any = env.getNpmPaths;
+    env.getNpmPaths = function (localOnly:any = false) {
+      // Start with the local paths derived by cwd in vscode 
+      // (as opposed to cwd of the plugin host process which is what is used by yeoman/environment)
+      const localPaths: any[] = [];
+  
+      // Walk up the CWD and add `node_modules/` folder lookup on each level
+      cwd.split(path.sep).forEach((part, i, parts) => {
+        let lookup = path.join(...parts.slice(0, i + 1), 'node_modules');
+  
+        if (!isWin32) {
+          lookup = `/${lookup}`;
+        }
+  
+        localPaths.push(lookup);
+      });
+      const defaultPaths = envGetNpmPaths.call(this, localOnly);
+      
+      return  _.uniq(localPaths.concat(defaultPaths));
+    };
+    return env;
+}
+
   public async runGenerator(generatorName: string) {
 
     // TODO: ensure generatorName is a valid dir name

From 0e1d9b6656a0cdf2f6d73a919e76556be96d2edd Mon Sep 17 00:00:00 2001
From: Stanislav Lvovsky <stanislav.lvovsky@sap.com>
Date: Sun, 22 Dec 2019 11:17:00 +0200
Subject: [PATCH 08/11] update dependencies

---
 backend/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/package.json b/backend/package.json
index 242de0234..d446072ae 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -52,7 +52,7 @@
 		"lodash": "^4.17.15",
 		"strip-ansi": "^6.0.0",
 		"ws": "^7.2.0",
-		"yeoman-environment": "^2.6.0",
+		"yeoman-environment": "^2.7.0",
 		"fs-extra": "^8.1.0"
 	},
 	"devDependencies": {

From 31f74ad8c813b4ea6eebc93a06b5e627dd671d86 Mon Sep 17 00:00:00 2001
From: Stanislav Lvovsky <stanislav.lvovsky@sap.com>
Date: Sun, 22 Dec 2019 15:55:53 +0200
Subject: [PATCH 09/11] add lookup test

---
 backend/.nycrc.json            |  8 ++--
 backend/src/yeomanui.ts        | 26 +++++-------
 backend/tests/yeomanui.spec.ts | 75 ++++++++++++++++++++++++++++++++--
 3 files changed, 86 insertions(+), 23 deletions(-)

diff --git a/backend/.nycrc.json b/backend/.nycrc.json
index d698f9e7a..290e52927 100644
--- a/backend/.nycrc.json
+++ b/backend/.nycrc.json
@@ -7,8 +7,8 @@
     "temp-dir": "./reports/.nyc_output",
     "report-dir": "./reports/coverage",
     "check-coverage": true,
-    "branches": 22,
-    "lines": 41,
-    "functions": 30,
-    "statements": 41
+    "branches": 29,
+    "lines": 44,
+    "functions": 33,
+    "statements": 44
   }
diff --git a/backend/src/yeomanui.ts b/backend/src/yeomanui.ts
index 5f5838a40..81bfab6e7 100644
--- a/backend/src/yeomanui.ts
+++ b/backend/src/yeomanui.ts
@@ -13,8 +13,6 @@ import { IRpc } from "@sap-devx/webview-rpc/out.ext/rpc-common";
 import Generator = require("yeoman-generator");
 import { GeneratorType, GeneratorFilter } from "./filter";
 
-const isWin32 = process.platform === 'win32';
-
 export interface IGeneratorChoice {
   name: string;
   message: string;
@@ -41,6 +39,9 @@ export class YeomanUI {
   private static defaultMessage = 
     "Some quick example text of the generator description. This is a long text so that the example will look good.";
   private static YEOMAN_PNG = "yeoman.png";
+  private static isWin32 = (process.platform === 'win32');
+  private static CWD = path.join(os.homedir(), 'projects');
+  private static NODE_MODULES = 'node_modules';
 
   private rpc: IRpc;
   private logger: YouiLog;
@@ -84,35 +85,28 @@ export class YeomanUI {
   }
 
   private getEnv(): Environment.Options {
-    const cwd = path.join(os.homedir(), "projects");
     const env: Environment.Options = Environment.createEnv();
     const envGetNpmPaths: () => any = env.getNpmPaths;
-    env.getNpmPaths = function (localOnly:any = false) {
+    env.getNpmPaths = function (localOnly:boolean = false) {
       // Start with the local paths derived by cwd in vscode 
       // (as opposed to cwd of the plugin host process which is what is used by yeoman/environment)
-      const localPaths: any[] = [];
-  
       // Walk up the CWD and add `node_modules/` folder lookup on each level
-      cwd.split(path.sep).forEach((part, i, parts) => {
-        let lookup = path.join(...parts.slice(0, i + 1), 'node_modules');
-  
-        if (!isWin32) {
-          lookup = `/${lookup}`;
-        }
-  
-        localPaths.push(lookup);
+      const parts: string[] = YeomanUI.CWD.split(path.sep);
+      const localPaths = _.map(parts, (part, index) => {
+        const resrpath = path.join(...parts.slice(0, index + 1), YeomanUI.NODE_MODULES);
+        return YeomanUI.isWin32 ? resrpath : path.join(path.sep, resrpath);
       });
       const defaultPaths = envGetNpmPaths.call(this, localOnly);
       
       return  _.uniq(localPaths.concat(defaultPaths));
     };
     return env;
-}
+  }
 
   public async runGenerator(generatorName: string) {
 
     // TODO: ensure generatorName is a valid dir name
-    const destinationRoot: string = path.join(os.homedir(), "projects", generatorName);
+    const destinationRoot: string = path.join(YeomanUI.CWD, generatorName);
 
     // TODO: wait for dir to be created
     fs.mkdir(destinationRoot, { recursive: true }, (err) => {
diff --git a/backend/tests/yeomanui.spec.ts b/backend/tests/yeomanui.spec.ts
index fbaf1674b..376aa6752 100644
--- a/backend/tests/yeomanui.spec.ts
+++ b/backend/tests/yeomanui.spec.ts
@@ -84,6 +84,10 @@ describe('yeomanui unit test', () => {
         }  
     }
 
+    const rpc = new TestRpc();
+    const logger = new TestLog();
+    const yeomanUi: YeomanUI = new YeomanUI(rpc, logger);
+
     before(() => {
         sandbox = sinon.createSandbox();
     });
@@ -105,9 +109,6 @@ describe('yeomanui unit test', () => {
     });
 
     describe("getGenerators", () => {
-        const rpc = new TestRpc();
-        const logger = new TestLog();
-        const yeomanUi: YeomanUI = new YeomanUI(rpc, logger);
         let envMock: any;
 
         const environment = {
@@ -340,4 +341,72 @@ describe('yeomanui unit test', () => {
             expect(test3Choice.name).to.be.equal("test4");
         });
     });
+
+    describe("getEnv", () => {
+        const yeomanUi: YeomanUI = new YeomanUI(rpc, logger);
+        const testEnv = yeomanUi["getEnv"]();
+        const nodemodules = YeomanUI["NODE_MODULES"];
+        testEnv.getNpmPaths = (localOnly: boolean = false): string[] => {
+            return localOnly ? 
+                [path.join("localPath1", nodemodules), path.join("localPath2", nodemodules)] : 
+                [path.join("path1", nodemodules), path.join("path2", nodemodules), path.join("localPath1", nodemodules), path.join("localPath2", nodemodules)];
+        };
+
+        beforeEach(() => {
+            YeomanUI["CWD"] = path.join("root/project/folder");
+            yeomanEnvMock.expects("createEnv").returns(testEnv);
+        });
+
+        it("env.getNpmPaths - localOnly is false, isWin32 is true", () => {
+            YeomanUI["isWin32"] = true;
+            const env = yeomanUi["getEnv"]();
+            const res = env.getNpmPaths();
+            expect(res).to.have.lengthOf(7);
+            expect(res).to.include(path.join("root", nodemodules));
+            expect(res).to.include(path.join("root", "project", nodemodules));
+            expect(res).to.include(path.join("root", "project", "folder", nodemodules));
+            expect(res).to.include(path.join("path1", nodemodules));
+            expect(res).to.include(path.join("path2", nodemodules));
+            expect(res).to.include(path.join("localPath1", nodemodules));
+            expect(res).to.include(path.join("localPath2", nodemodules));
+        });
+
+        it("env.getNpmPaths - localOnly is true, isWin32 is true", () => {
+            YeomanUI["isWin32"] = true;
+            const env = yeomanUi["getEnv"]();
+            const res = env.getNpmPaths(true);
+            expect(res).to.have.lengthOf(5);
+            expect(res).to.include(path.join("root", nodemodules));
+            expect(res).to.include(path.join("root", "project", nodemodules));
+            expect(res).to.include(path.join("root", "project", "folder", nodemodules));
+            expect(res).to.include(path.join("localPath1", nodemodules));
+            expect(res).to.include(path.join("localPath2", nodemodules));
+        });
+
+        it("env.getNpmPaths - localOnly is false, isWin32 is false", () => {
+            YeomanUI["isWin32"] = false;
+            const env = yeomanUi["getEnv"]();
+            const res = env.getNpmPaths();
+            expect(res).to.have.lengthOf(7);
+            expect(res).to.include(path.join(path.sep, "root", nodemodules));
+            expect(res).to.include(path.join(path.sep, "root", "project", nodemodules));
+            expect(res).to.include(path.join(path.sep, "root", "project", "folder", nodemodules));
+            expect(res).to.include(path.join("path1", nodemodules));
+            expect(res).to.include(path.join("path2", nodemodules));
+            expect(res).to.include(path.join("localPath1", nodemodules));
+            expect(res).to.include(path.join("localPath2", nodemodules));
+        });
+
+        it("env.getNpmPaths - localOnly is true, isWin32 is false", () => {
+            YeomanUI["isWin32"] = false;
+            const env = yeomanUi["getEnv"]();
+            const res = env.getNpmPaths(true);
+            expect(res).to.have.lengthOf(5);
+            expect(res).to.include(path.join(path.sep, "root", nodemodules));
+            expect(res).to.include(path.join(path.sep, "root", "project", nodemodules));
+            expect(res).to.include(path.join(path.sep, "root", "project", "folder", nodemodules));
+            expect(res).to.include(path.join("localPath1", nodemodules));
+            expect(res).to.include(path.join("localPath2", nodemodules));
+        });
+    });
 });

From 43d0e9b57f3bb6207628d785e4f5a333a9fcc488 Mon Sep 17 00:00:00 2001
From: Stanislav Lvovsky <stanislav.lvovsky@sap.com>
Date: Mon, 23 Dec 2019 07:28:49 +0200
Subject: [PATCH 10/11] merge

---
 backend/src/yeomanui.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/backend/src/yeomanui.ts b/backend/src/yeomanui.ts
index a81181aef..8f5bb25ca 100644
--- a/backend/src/yeomanui.ts
+++ b/backend/src/yeomanui.ts
@@ -149,7 +149,7 @@ export class YeomanUI {
 
       this.promptCount = 0;
       this.gen = (gen as Generator);
-      this.gen.destinationRoot(destinationRoot);
+      this.gen.destinationRoot(YeomanUI.CWD);
       /* Generator.run() returns promise. Sending a callback is deprecated:
            https://yeoman.github.io/generator/Generator.html#run
          ... but .d.ts hasn't been updated for a while:
@@ -163,7 +163,7 @@ export class YeomanUI {
         }
 
         console.log("done running yeomanui");
-        message = `The '${generatorName}' project has been generated. You can find it at ${destinationRoot}`;
+        message = `The '${generatorName}' project has been generated. You can find it at ${YeomanUI.CWD}`;
         this.doGeneratorDone(true, message);
       });
     } catch (err) {

From bcc7636d972d43208c7b145251b8382ec021be86 Mon Sep 17 00:00:00 2001
From: Stanislav Lvovsky <stanislav.lvovsky@sap.com>
Date: Mon, 23 Dec 2019 09:14:04 +0200
Subject: [PATCH 11/11] remove unused line

---
 backend/src/yeomanui.ts | 2 --
 1 file changed, 2 deletions(-)

diff --git a/backend/src/yeomanui.ts b/backend/src/yeomanui.ts
index 8f5bb25ca..32c6fdcc9 100644
--- a/backend/src/yeomanui.ts
+++ b/backend/src/yeomanui.ts
@@ -13,8 +13,6 @@ import { IRpc } from "@sap-devx/webview-rpc/out.ext/rpc-common";
 import Generator = require("yeoman-generator");
 import { GeneratorType, GeneratorFilter } from "./filter";
 
-const isWin32 = process.platform === 'win32';
-
 export interface IGeneratorChoice {
   name: string;
   message: string;