fix(devkit): devkitTreeFromAngularDevkitTree exists function should also work on dirs

ISSUES CLOSED: #5318

e2e/angular/src/storybook.test.ts

@@ -17,6 +17,42 @@ describe('Storybook schematics', () => {
 
   afterEach(() => removeProject({ onlyOnCI: true }));
 
+  it('aaashould not overwrite global storybook config files', () => {
+    const angularStorybookLib = uniq('test-ui-lib-angular');
+    runCLI(
+      `generate @nrwl/angular:lib ${angularStorybookLib} --no-interactive`
+    );
+    runCLI(
+      `generate @nrwl/angular:storybook-configuration ${angularStorybookLib} --generateStories --no-interactive`
+    );
+
+    checkFilesExist(`.storybook/main.js`);
+    writeFileSync(
+      tmpProjPath(`.storybook/main.js`),
+      `
+        module.exports = {
+          stories: [],
+          addons: ['@storybook/addon-knobs/register'],
+        };      
+
+        console.log('hi there');
+      `
+    );
+
+    // generate another lib with storybook config
+    const anotherAngularStorybookLib = uniq('test-ui-lib-angular2');
+    runCLI(
+      `generate @nrwl/angular:lib ${anotherAngularStorybookLib} --no-interactive`
+    );
+    runCLI(
+      `generate @nrwl/angular:storybook-configuration ${anotherAngularStorybookLib} --generateStories --no-interactive`
+    );
+
+    expect(readFile(`.storybook/main.js`)).toContain(
+      `console.log('hi there');`
+    );
+  });
+
   describe('build storybook', () => {
     it('should execute e2e tests using Cypress running against Storybook', () => {
       const myapp = uniq('myapp');

packages/devkit/src/utils/invoke-nx-generator.ts

@@ -86,7 +86,11 @@ class DevkitTreeFromAngularDevkitTree {
   }
 
   exists(filePath: string): boolean {
+    if (this.isFile(filePath)) {
       return this.tree.exists(filePath);
+    } else {
+      return this.children(filePath).length > 0;
+    }
   }
 
   isFile(filePath: string): boolean {