From 850b08391ccaba5bb4ed3c8e89dcbd5342828540 Mon Sep 17 00:00:00 2001
From: Norbert de Langen <ndelangen@me.com>
Date: Wed, 15 Aug 2018 11:51:16 +0200
Subject: [PATCH] FIX angular example with a hack?

---
 examples/angular-cli/.storybook/config.ts |  7 ++++++-
 examples/angular-cli/jest-config/setup.ts |  4 ----
 examples/angular-cli/package.json         | 22 +---------------------
 lib/cli/test/snapshots/sfc_vue/.babelrc   |  4 +---
 yarn.lock                                 |  8 +++++++-
 5 files changed, 15 insertions(+), 30 deletions(-)

diff --git a/examples/angular-cli/.storybook/config.ts b/examples/angular-cli/.storybook/config.ts
index 2fef94e1cea..e14ddae245a 100644
--- a/examples/angular-cli/.storybook/config.ts
+++ b/examples/angular-cli/.storybook/config.ts
@@ -2,18 +2,23 @@ import { configure } from '@storybook/angular';
 import { setOptions } from '@storybook/addon-options';
 import addCssWarning from '../src/cssWarning';
 
+const path =require('path');
+const rc = require('require-context');
+
 addCssWarning();
 
 setOptions({
   hierarchyRootSeparator: /\|/,
 });
 
+const pathToStories = path.join(__dirname, '../src/stories');
+
 function loadStories() {
   // put welcome screen at the top of the list so it's the first one displayed
   require('../src/stories');
 
   // automatically import all story ts files that end with *.stories.ts
-  const req = require.context('../src/stories', true, /\.stories\.ts$/);
+  const req = rc(pathToStories, true, /\.stories\.ts$/);
   req.keys().forEach(filename => req(filename));
 }
 
diff --git a/examples/angular-cli/jest-config/setup.ts b/examples/angular-cli/jest-config/setup.ts
index 3a096f3a66d..8e775bc4c0d 100644
--- a/examples/angular-cli/jest-config/setup.ts
+++ b/examples/angular-cli/jest-config/setup.ts
@@ -1,6 +1,2 @@
 import 'jest-preset-angular';
 import './globalMocks';
-
-import registerRequireContextHook from 'babel-plugin-require-context-hook/register';
-
-registerRequireContextHook();
diff --git a/examples/angular-cli/package.json b/examples/angular-cli/package.json
index 2ba9933a8cd..efc746ec70d 100644
--- a/examples/angular-cli/package.json
+++ b/examples/angular-cli/package.json
@@ -16,27 +16,6 @@
     "test:generate-output": "jest --json --outputFile=addon-jest.testresults.json || true",
     "test:watch": "jest --watch"
   },
-  "jest": {
-    "coveragePathIgnorePatterns": [
-      "/jest-config/",
-      "/node_modules/"
-    ],
-    "preset": "jest-preset-angular",
-    "setupTestFrameworkScriptFile": "./jest-config/setup.ts",
-    "snapshotSerializers": [
-      "<rootDir>/../../node_modules/jest-preset-angular/AngularSnapshotSerializer.js",
-      "<rootDir>/../../node_modules/jest-preset-angular/HTMLCommentSerializer.js"
-    ],
-    "testPathIgnorePatterns": [
-      "/node_modules/",
-      "/build/",
-      "/storybook-static/",
-      "angularshots.test.js"
-    ],
-    "transform": {
-      "^.+\\.(ts|js|html)$": "<rootDir>/../../node_modules/jest-preset-angular/preprocessor.js"
-    }
-  },
   "dependencies": {
     "@angular/common": "^6.1.1",
     "@angular/compiler": "^6.1.1",
@@ -78,6 +57,7 @@
     "jest": "^23.4.2",
     "jest-preset-angular": "^6.0.0",
     "protractor": "~5.4.0",
+    "require-context": "^1.1.0",
     "ts-node": "~7.0.0",
     "typescript": "^3.0.1"
   }
diff --git a/lib/cli/test/snapshots/sfc_vue/.babelrc b/lib/cli/test/snapshots/sfc_vue/.babelrc
index 32df804ee90..cbd6309067d 100644
--- a/lib/cli/test/snapshots/sfc_vue/.babelrc
+++ b/lib/cli/test/snapshots/sfc_vue/.babelrc
@@ -10,9 +10,7 @@
   "plugins": ["@babel/plugin-transform-runtime"],
   "env": {
     "test": {
-      "presets": [
-        "@babel/preset-env"
-      ],
+      "presets": ["@babel/preset-env"],
       "plugins": ["istanbul"]
     }
   }
diff --git a/yarn.lock b/yarn.lock
index d03249939f6..a52a07d8a9e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -12266,7 +12266,7 @@ node-dir@0.1.8:
   version "0.1.8"
   resolved "https://registry.yarnpkg.com/node-dir/-/node-dir-0.1.8.tgz#55fb8deb699070707fb67f91a460f0448294c77d"
 
-node-dir@^0.1.10:
+node-dir@^0.1.10, node-dir@^0.1.17:
   version "0.1.17"
   resolved "https://registry.yarnpkg.com/node-dir/-/node-dir-0.1.17.tgz#5f5665d93351335caabef8f1c554516cf5f1e4e5"
   dependencies:
@@ -15552,6 +15552,12 @@ request@^2.74.0, request@^2.79.0, request@^2.81.0, request@^2.83.0, request@^2.8
     tunnel-agent "^0.6.0"
     uuid "^3.3.2"
 
+require-context@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/require-context/-/require-context-1.1.0.tgz#f77e60dddb0a296946e6915bf580c73dbe75ab4d"
+  dependencies:
+    node-dir "^0.1.17"
+
 require-directory@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"