Merge branch 'master' into move-lodash-to-lodash-es

.circleci/config.yml

@@ -68,6 +68,11 @@ jobs:
           command: |
             cd examples/vue-kitchen-sink
             yarn build-storybook
+      - run:
+          name: "Build angular-cli"
+          command: |
+            cd examples/angular-cli
+            yarn build-storybook
 
       - run:
           name: "Run react kitchen-sink"
@@ -81,6 +86,12 @@ jobs:
             cd examples/vue-kitchen-sink
             yarn storybook
           background: true
+      - run:
+          name: "Run angular-cli"
+          command: |
+            cd examples/angular-cli
+            yarn storybook
+          background: true
       - run:
           name: Workaround for https://github.com/GoogleChrome/puppeteer/issues/290
           command: sh ./scripts/workaround-puppeteer-issue-290.sh

.editorconfig

@@ -3,6 +3,6 @@ root = true
 [*]
 end_of_line = lf
 
-[*.{js,json}]
+[*.{js,json,ts}]
 indent_style = space
 indent_size = 2

addons/knobs/package.json

@@ -32,7 +32,7 @@
     "vue": "^2.5.13"
   },
   "peerDependencies": {
-    "@angular/core": "=>4.0.0",
+    "@angular/core": ">=4.0.0",
     "@storybook/addons": "^3.3.0-alpha.6",
     "react": "*",
     "react-dom": "*"

app/angular/package.json

@@ -89,10 +89,10 @@
     "typescript": "^2.4.0"
   },
   "peerDependencies": {
-    "@angular/common": "=>4.0.0",
-    "@angular/compiler": "=>4.0.0",
-    "@angular/core": "=>4.0.0",
-    "@angular/platform-browser": "=>4.0.0",
-    "@angular/platform-browser-dynamic": "=>4.0.0"
+    "@angular/common": ">=4.0.0",
+    "@angular/compiler": ">=4.0.0",
+    "@angular/core": ">=4.0.0",
+    "@angular/platform-browser": ">=4.0.0",
+    "@angular/platform-browser-dynamic": ">=4.0.0"
   }
 }

examples/angular-cli/.storybook/config.js

@@ -3,7 +3,12 @@
 import { configure } from '@storybook/angular';
 
 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$/)
+  req.keys().forEach((filename) => req(filename))
 }
 
 configure(loadStories, module);

examples/angular-cli/package.json

@@ -9,7 +9,7 @@
     "test": "ng test",
     "lint": "ng lint",
     "e2e": "ng e2e",
-    "storybook": "start-storybook -p 9009 -s src/assets",
+    "storybook": "start-storybook -p 9008 -s src/assets",
     "build-storybook": "build-storybook -s src"
   },
   "private": true,

examples/angular-cli/src/stories/index.ts

@@ -25,8 +25,6 @@ import { ServiceComponent } from './moduleMetadata/service.component'
 import { NameComponent } from './name.component';
 import { CustomPipePipe } from './custom.pipe';
 
-import './customControlValueAccessor/custom-cva-component.stories';
-
 storiesOf('Welcome', module)
   .add('to Storybook', () => ({
     component: Welcome,

integration/examples.test.js

@@ -9,6 +9,10 @@ const examples = [
     name: 'vue-kitchen-sink',
     port: 9009,
   },
+  {
+    name: 'angular-cli',
+    port: 9008,
+  },
 ];
 
 examples.forEach(({ name, port }) => {

package.json

@@ -33,7 +33,7 @@
   "devDependencies": {
     "babel-cli": "^6.26.0",
     "babel-core": "^6.26.0",
-    "babel-eslint": "^8.0.3",
+    "babel-eslint": "^8.1.0",
     "babel-plugin-transform-md-import-to-string": "^1.0.6",
     "babel-plugin-transform-runtime": "^6.23.0",
     "babel-polyfill": "^6.26.0",

yarn.lock

@@ -928,14 +928,16 @@ [email protected]:
     babel-types "^6.23.0"
     babylon "^6.17.0"
 
-babel-eslint@^8.0.3:
-  version "8.0.3"
-  resolved "https://registry.yarnpkg.com/babel-eslint/-/babel-eslint-8.0.3.tgz#f29ecf02336be438195325cd47c468da81ee4e98"
+babel-eslint@^8.1.0:
+  version "8.1.0"
+  resolved "https://registry.yarnpkg.com/babel-eslint/-/babel-eslint-8.1.0.tgz#b6f32d598559f96127fa608bd19574626325d5b7"
   dependencies:
     "@babel/code-frame" "7.0.0-beta.31"
     "@babel/traverse" "7.0.0-beta.31"
     "@babel/types" "7.0.0-beta.31"
     babylon "7.0.0-beta.31"
+    eslint-scope "~3.7.1"
+    eslint-visitor-keys "^1.0.0"
 
 babel-generator@^6.18.0, babel-generator@^6.24.1, babel-generator@^6.26.0:
   version "6.26.0"
@@ -4621,13 +4623,17 @@ eslint-restricted-globals@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/eslint-restricted-globals/-/eslint-restricted-globals-0.1.1.tgz#35f0d5cbc64c2e3ed62e93b4b1a7af05ba7ed4d7"
 
-eslint-scope@^3.7.1:
+eslint-scope@^3.7.1, eslint-scope@~3.7.1:
   version "3.7.1"
   resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-3.7.1.tgz#3d63c3edfda02e06e01a452ad88caacc7cdcb6e8"
   dependencies:
     esrecurse "^4.1.0"
     estraverse "^4.1.1"
 
+eslint-visitor-keys@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz#3f3180fb2e291017716acb4c9d6d5b5c34a6a81d"
+
 [email protected]:
   version "4.10.0"
   resolved "https://registry.yarnpkg.com/eslint/-/eslint-4.10.0.tgz#f25d0d7955c81968c2309aa5c9a229e045176bb7"