Revert "Merge pull request #2672 from Quramy/change-ng-stories-dir"

This reverts commit 382ac12
storybookjs · Feb 12, 2018 · 68153d8 · 68153d8
1 parent 382ac12
commit 68153d8
Show file tree

Hide file tree

Showing 11 changed files with 39 additions and 51 deletions.
diff --git a/docs/src/pages/basics/guide-angular/index.md b/docs/src/pages/basics/guide-angular/index.md
@@ -63,19 +63,19 @@ To do that, simply create a file at `.storybook/config.js` with the following co
 import { configure } from '@storybook/angular';
 
 function loadStories() {
-  require('../src/stories/index.ts');
+  require('../stories/index.ts');
 }
 
 configure(loadStories, module);
 ```
 
-That'll load stories in `../src/stories/index.ts`.
+That'll load stories in `../stories/index.ts`.
 
 Just like that, you can load stories from wherever you want to.
 
 ## Write your stories
 
-Now you can write some stories inside the `../src/stories/index.ts` file, like this:
+Now you can write some stories inside the `../stories/index.ts` file, like this:
 
 ```js
 import { storiesOf } from '@storybook/angular';

diff --git a/lib/cli/generators/ANGULAR/template/.storybook/config.js b/lib/cli/generators/ANGULAR/template/.storybook/config.js
@@ -3,7 +3,7 @@
 import { configure } from '@storybook/angular';
 
 // automatically import all files ending in *.stories.ts
-const req = require.context('../src/stories', true, /.stories.ts$/);
+const req = require.context('../stories', true, /.stories.ts$/);
 function loadStories() {
   req.keys().forEach((filename) => req(filename));
 }

diff --git a/...LAR/template/src/stories/index.stories.ts → ...ANGULAR/template/stories/index.stories.ts b/...LAR/template/src/stories/index.stories.ts → ...ANGULAR/template/stories/index.stories.ts
diff --git a/lib/cli/test/fixtures/angular-cli/src/tsconfig.app.json b/lib/cli/test/fixtures/angular-cli/src/tsconfig.app.json
diff --git a/lib/cli/test/fixtures/angular-cli/src/tsconfig.json b/lib/cli/test/fixtures/angular-cli/src/tsconfig.json
@@ -0,0 +1,3 @@
+{
+  "extends": "../tsconfig.json"
+}
diff --git a/lib/cli/test/fixtures/angular-cli/tsconfig.json b/lib/cli/test/fixtures/angular-cli/tsconfig.json
@@ -1,19 +1,23 @@
+
+
 {
-  "compileOnSave": false,
   "compilerOptions": {
-    "outDir": "./dist/out-tsc",
-    "sourceMap": true,
+    "baseUrl": "",
     "declaration": false,
-    "moduleResolution": "node",
     "emitDecoratorMetadata": true,
     "experimentalDecorators": true,
+    "lib": ["es6", "dom"],
+    "mapRoot": "./",
+    "module": "es6",
+    "moduleResolution": "node",
+    "outDir": "../dist/out-tsc",
+    "sourceMap": true,
     "target": "es5",
     "typeRoots": [
-      "node_modules/@types"
-    ],
-    "lib": [
-      "es2017",
-      "dom"
+      "../node_modules/@types"
     ]
-  }
+  },
+  "exclude": [
+    "node_modules"
+  ]
 }
diff --git a/lib/cli/test/snapshots/angular-cli/.storybook/config.js b/lib/cli/test/snapshots/angular-cli/.storybook/config.js
@@ -3,7 +3,7 @@
 import { configure } from '@storybook/angular';
 
 // automatically import all files ending in *.stories.ts
-const req = require.context('../src/stories', true, /.stories.ts$/);
+const req = require.context('../stories', true, /.stories.ts$/);
 function loadStories() {
   req.keys().forEach((filename) => req(filename));
 }

diff --git a/lib/cli/test/snapshots/angular-cli/src/tsconfig.app.json b/lib/cli/test/snapshots/angular-cli/src/tsconfig.app.json
diff --git a/lib/cli/test/snapshots/angular-cli/src/tsconfig.json b/lib/cli/test/snapshots/angular-cli/src/tsconfig.json
@@ -0,0 +1,3 @@
+{
+  "extends": "../tsconfig.json"
+}
diff --git a/.../angular-cli/src/stories/index.stories.ts → ...hots/angular-cli/stories/index.stories.ts b/.../angular-cli/src/stories/index.stories.ts → ...hots/angular-cli/stories/index.stories.ts
diff --git a/lib/cli/test/snapshots/angular-cli/tsconfig.json b/lib/cli/test/snapshots/angular-cli/tsconfig.json
@@ -1,19 +1,23 @@
+
+
 {
-  "compileOnSave": false,
   "compilerOptions": {
-    "outDir": "./dist/out-tsc",
-    "sourceMap": true,
+    "baseUrl": "",
     "declaration": false,
-    "moduleResolution": "node",
     "emitDecoratorMetadata": true,
     "experimentalDecorators": true,
+    "lib": ["es6", "dom"],
+    "mapRoot": "./",
+    "module": "es6",
+    "moduleResolution": "node",
+    "outDir": "../dist/out-tsc",
+    "sourceMap": true,
     "target": "es5",
     "typeRoots": [
-      "node_modules/@types"
-    ],
-    "lib": [
-      "es2017",
-      "dom"
+      "../node_modules/@types"
     ]
-  }
+  },
+  "exclude": [
+    "node_modules"
+  ]
 }