chore: Configs extend root config

packages/storybook/src/schematics/configuration/configuration.ts

@@ -8,12 +8,14 @@ import {
   schematic,
   SchematicContext,
   Tree,
-  url
+  url,
+  template
 } from '@angular-devkit/schematics';
 import {
   getProjectConfig,
   updateWorkspace,
-  addPackageWithNgAdd
+  addPackageWithNgAdd,
+  offsetFromRoot
 } from '@nrwl/workspace';
 import { StorybookStoriesSchema } from '../../../../angular/src/schematics/stories/stories';
 import { parseJsonAtPath } from '../../utils/utils';
@@ -23,7 +25,8 @@ import { StorybookConfigureSchema } from './schema';
 export default function(schema: StorybookConfigureSchema): Rule {
   return chain([
     schematic('ng-add', {}),
-    createStorybookDir(schema.name),
+    createRootStorybookDir(),
+    createLibStorybookDir(schema.name),
     configureTsConfig(schema.name),
     addStorybookTask(schema.name),
     schema.configureCypress
@@ -41,13 +44,28 @@ export default function(schema: StorybookConfigureSchema): Rule {
   ]);
 }
 
-function createStorybookDir(projectName: string): Rule {
+function createRootStorybookDir(): Rule {
   return (tree: Tree, context: SchematicContext) => {
     context.logger.debug('adding .storybook folder to lib');
 
+    return chain([mergeWith(apply(url('./root-files'), []))])(tree, context);
+  };
+}
+
+function createLibStorybookDir(projectName: string): Rule {
+  return (tree: Tree, context: SchematicContext) => {
+    context.logger.debug('adding .storybook folder to lib');
+    const projectConfig = getProjectConfig(tree, projectName);
+
     return chain([
       mergeWith(
-        apply(url('./files'), [move(getProjectConfig(tree, projectName).root)])
+        apply(url('./lib-files'), [
+          template({
+            tmpl: '',
+            offsetFromRoot: offsetFromRoot(projectConfig.root)
+          }),
+          move(projectConfig.root)
+        ])
       )
     ])(tree, context);
   };

packages/storybook/src/schematics/configuration/lib-files/.storybook/addons.js__tmpl__

@@ -0,0 +1 @@
+import '<%= offsetFromRoot %>../.storybook/addons';

packages/storybook/src/schematics/configuration/lib-files/.storybook/config.js__tmpl__

@@ -0,0 +1,8 @@
+import { configure } from '<%= offsetFromRoot %>../.storybook/config';
+
+function loadStories() {
+  const req = require.context('../src/lib', true, /\.stories\.ts$/);
+  req.keys().forEach(filename => req(filename));
+}
+
+configure(loadStories, module);

packages/storybook/src/schematics/configuration/lib-files/.storybook/webpack.config.js__tmpl__

@@ -0,0 +1,6 @@
+const rootWebpackConfig = require('<%= offsetFromRoot %>../.storybook/webpack.config');
+// Export a function. Accept the base config as the only param.
+module.exports = async ({ config, mode }) => {
+  config = await rootWebpackConfig({ config, mode });
+  return config;
+};

packages/storybook/src/schematics/configuration/files/.storybook/config.js → packages/storybook/src/schematics/configuration/root-files/.storybook/config.js

@@ -2,10 +2,12 @@ import { configure, addDecorator } from '@storybook/angular';
 import { withKnobs } from '@storybook/addon-knobs';
 
 function loadStories() {
-  const req = require.context('../src/lib', true, /\.stories\.ts$/);
+  const req = require.context('..', true, /\.stories\.ts$/);
   req.keys().forEach(filename => req(filename));
 }
 
 addDecorator(withKnobs);
 
 configure(loadStories, module);
+
+export { configure };

packages/storybook/src/schematics/configuration/root-files/.storybook/tsconfig.json

@@ -0,0 +1,5 @@
+{
+  "extends": "../tsconfig.json",
+  "exclude": ["../**/test.ts", "../**/*.spec.ts"],
+  "include": ["../**/*"]
+}