Merge branch 'next' into feature/typescript-mithril

storybookjs · Oct 18, 2019 · 0f6cd02 · 0f6cd02
2 parents c925c87 + 667a9e0
commit 0f6cd02
Show file tree

Hide file tree

Showing 141 changed files with 1,448 additions and 834 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -1,14 +1,11 @@
-version: 2
+version: 2.1
 
 aliases:
   - &defaults
     working_directory: /tmp/storybook
     docker:
       - image: circleci/node:10
 
-dependencies:
-  pre:
-    - yarn global add npm
 jobs:
   build:
     <<: *defaults
@@ -17,7 +14,7 @@ jobs:
       - restore_cache:
           name: Restore core dependencies cache
           keys:
-            - core-dependencies-v3-{{ checksum "yarn.lock" }}
+            - core-dependencies-v4-{{ checksum "yarn.lock" }}
       - run:
           name: Install dependencies
           command: yarn install
@@ -29,9 +26,11 @@ jobs:
           command: yarn bootstrap --core
       - save_cache:
           name: Cache core dependencies
-          key: core-dependencies-v3-{{ checksum "yarn.lock" }}
+          key: core-dependencies-v4-{{ checksum "yarn.lock" }}
           paths:
-            - ~/.cache/yarn
+            - ~/.cache
+            - node_modules
+            - /root/.cache
       - persist_to_workspace:
           root: .
           paths:
@@ -47,9 +46,6 @@ jobs:
       - checkout
       - attach_workspace:
           at: .
-      - run:
-          name: Generate static examples
-          command: yarn build-storybooks
       - run:
           name: Run chromatic on the pre-built storybook
           command: yarn chromatic
@@ -66,97 +62,50 @@ jobs:
             yarn packtracker
   examples:
     <<: *defaults
+    parallelism: 4
     steps:
       - checkout
       - attach_workspace:
           at: .
       - run:
-          name: Workaround for https://github.com/GoogleChrome/puppeteer/issues/290
-          command: sh ./scripts/workaround-puppeteer-issue-290.sh
-      - run:
-          name: Build react kitchen-sink
-          command: |
-            cd examples/cra-kitchen-sink
-            yarn build-storybook
-      - run:
-          name: Build react typescript kitchen-sink
-          command: |
-            cd examples/cra-ts-kitchen-sink
-            yarn build-storybook
-      - run:
-          name: Build vue kitchen-sink
-          command: |
-            cd examples/vue-kitchen-sink
-            yarn build-storybook
-      - run:
-          name: Build svelte kitchen-sink
-          command: |
-            cd examples/svelte-kitchen-sink
-            yarn build-storybook
-      - run:
-          name: Build angular-cli
+          name: examples
           command: |
-            cd examples/angular-cli
-            yarn build-storybook
-      - run:
-          name: Build ember-cli
-          command: |
-            cd examples/ember-cli
-            yarn build-storybook
-      - run:
-          name: Build polymer-cli
-          command: |
-            cd examples/polymer-cli
-            yarn build-storybook
-      - run:
-          name: Build marko-cli
-          command: |
-            cd examples/marko-cli
-            yarn build-storybook
-      - run:
-          name: Build mithril kitchen-sink
-          command: |
-            cd examples/mithril-kitchen-sink
-            yarn build-storybook
-      - run:
-          name: Build html kitchen-sink
-          command: |
-            cd examples/html-kitchen-sink
-            yarn build-storybook
-      - run:
-          name: Build riot kitchen-sink
-          command: |
-            cd examples/riot-kitchen-sink
-            yarn build-storybook
-      - run:
-          name: Build preact kitchen-sink
-          command: |
-            cd examples/preact-kitchen-sink
-            yarn build-storybook
-      - run:
-          name: Build cra react15
-          command: |
-            cd examples/cra-react15
-            yarn build-storybook
-      - run:
-          name: Build official-storybook
-          command: |
-            cd examples/official-storybook
-            yarn build-storybook
-      # - run:
-      #     name: Run image snapshots
-      #     command: yarn test --image
-      - store_artifacts:
-          path: examples/official-storybook/image-snapshots/__image_snapshots__
-          destination: official_storybook_image_snapshots
+            yarn build-storybooks
       - persist_to_workspace:
           root: .
           paths:
+            - built-storybooks
+  e2e:
+    working_directory: /tmp/storybook
+    docker:
+      - image: cypress/base:8
+        environment:
+          TERM: xterm
+    steps:
+      - checkout
+      - attach_workspace:
+          at: .
+      - run:
+          name: install cypress
+          command: yarn cypress install
+      - save_cache:
+          name: Cache core dependencies
+          key: core-dependencies-v4-{{ checksum "yarn.lock" }}
+          paths:
+            - ~/.cache
             - node_modules
-            - examples
-            - addons
-            - app
-            - lib
+            - /root/.cache
+      - run:
+          name: running example
+          command: yarn serve-storybooks
+          background: true
+      - run:
+          name: await running examples
+          command: yarn await-serve-storybooks
+      - run:
+          name: cypress run
+          command: yarn cypress run
+
   smoke-tests:
     <<: *defaults
     steps:
@@ -253,18 +202,13 @@ jobs:
       - restore_cache:
           name: Restore core dependencies cache
           keys:
-            - core-dependencies-v3-{{ checksum "yarn.lock" }}
+            - core-dependencies-v4-{{ checksum "yarn.lock" }}
       - run:
           name: Install dependencies
-          command: yarn install
+          command: yarn bootstrap --install
       - run:
           name: Trigger build
           command: ./scripts/build-frontpage.js
-      - save_cache:
-          name: Cache core dependencies
-          key: core-dependencies-v3-{{ checksum "yarn.lock" }}
-          paths:
-            - ~/.cache/yarn
   docs:
     <<: *defaults
     steps:
@@ -287,12 +231,7 @@ jobs:
           name: Cache docs dependencies
           key: docs-dependencies-v2-{{ checksum "docs/yarn.lock" }}
           paths:
-            - ~/.cache/yarn
-      - persist_to_workspace:
-          root: .
-          paths:
-            - docs/public
-            - docs/node_modules
+            - ~/.cache
   lint:
     <<: *defaults
     steps:
@@ -325,19 +264,18 @@ jobs:
           name: Upload coverage
           command: yarn coverage
 workflows:
-  version: 2
-  build_test_deploy:
+  test:
     jobs:
       - build
-      - docs
-      - frontpage
       - lint:
           requires:
-            - docs
             - build
       - examples:
           requires:
             - build
+      - e2e:
+          requires:
+            - examples
       - smoke-tests:
           requires:
             - build
@@ -355,4 +293,8 @@ workflows:
             - test
       - chromatic:
           requires:
-            - build
+            - examples
+  deploy:
+    jobs:
+      - docs
+      - frontpage
diff --git a/.github/workflows/tests-unit.yml b/.github/workflows/tests-unit.yml
@@ -7,17 +7,11 @@ jobs:
 
     name: Test on node ${{ matrix.node_version }} and ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
-    strategy:
-      matrix:
-        node-version: [10]
-        os: [ubuntu-latest]
-
     steps:
     - uses: actions/checkout@v1
-    - name: Use Node.js ${{ matrix.node_version }}
-      uses: actions/setup-node@v1
+    - uses: actions/setup-node@v1
       with:
-        version: ${{ matrix.node_version }}
+        node-version: '10.x'
     - name: install, bootstrap
       run: |
         yarn bootstrap --core

diff --git a/.gitignore b/.gitignore
@@ -32,3 +32,5 @@ htpasswd
 storybook-out
 /addons/docs/common/config-*
 built-storybooks
+cypress/videos
+cypress/screenshots
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,14 @@
+## 5.3.0-alpha.22 (October 18, 2019)
+
+### Features
+
+* CLI: Add component meta to framework templates ([#8462](https://github.com/storybookjs/storybook/pull/8462))
+
+### Maintenance
+
+* Build: Add cypress to Storybook CI ([#8397](https://github.com/storybookjs/storybook/pull/8397))
+* Incorrect minimal required node version ([#8427](https://github.com/storybookjs/storybook/pull/8427))
+
 ## 5.3.0-alpha.21 (October 17, 2019)
 
 ### Features

diff --git a/addons/a11y/package.json b/addons/a11y/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-a11y",
-  "version": "5.3.0-alpha.21",
+  "version": "5.3.0-alpha.22",
   "description": "a11y addon for storybook",
   "keywords": [
     "a11y",
@@ -33,12 +33,12 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/addons": "5.3.0-alpha.21",
-    "@storybook/api": "5.3.0-alpha.21",
-    "@storybook/client-logger": "5.3.0-alpha.21",
-    "@storybook/components": "5.3.0-alpha.21",
-    "@storybook/core-events": "5.3.0-alpha.21",
-    "@storybook/theming": "5.3.0-alpha.21",
+    "@storybook/addons": "5.3.0-alpha.22",
+    "@storybook/api": "5.3.0-alpha.22",
+    "@storybook/client-logger": "5.3.0-alpha.22",
+    "@storybook/components": "5.3.0-alpha.22",
+    "@storybook/core-events": "5.3.0-alpha.22",
+    "@storybook/theming": "5.3.0-alpha.22",
     "axe-core": "^3.3.2",
     "core-js": "^3.0.1",
     "global": "^4.3.2",

diff --git a/addons/actions/package.json b/addons/actions/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-actions",
-  "version": "5.3.0-alpha.21",
+  "version": "5.3.0-alpha.22",
   "description": "Action Logger addon for storybook",
   "keywords": [
     "storybook"
@@ -28,12 +28,12 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/addons": "5.3.0-alpha.21",
-    "@storybook/api": "5.3.0-alpha.21",
-    "@storybook/client-api": "5.3.0-alpha.21",
-    "@storybook/components": "5.3.0-alpha.21",
-    "@storybook/core-events": "5.3.0-alpha.21",
-    "@storybook/theming": "5.3.0-alpha.21",
+    "@storybook/addons": "5.3.0-alpha.22",
+    "@storybook/api": "5.3.0-alpha.22",
+    "@storybook/client-api": "5.3.0-alpha.22",
+    "@storybook/components": "5.3.0-alpha.22",
+    "@storybook/core-events": "5.3.0-alpha.22",
+    "@storybook/theming": "5.3.0-alpha.22",
     "core-js": "^3.0.1",
     "fast-deep-equal": "^2.0.1",
     "global": "^4.3.2",

diff --git a/addons/backgrounds/package.json b/addons/backgrounds/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-backgrounds",
-  "version": "5.3.0-alpha.21",
+  "version": "5.3.0-alpha.22",
   "description": "A storybook addon to show different backgrounds for your preview",
   "keywords": [
     "addon",
@@ -32,12 +32,12 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/addons": "5.3.0-alpha.21",
-    "@storybook/api": "5.3.0-alpha.21",
-    "@storybook/client-logger": "5.3.0-alpha.21",
-    "@storybook/components": "5.3.0-alpha.21",
-    "@storybook/core-events": "5.3.0-alpha.21",
-    "@storybook/theming": "5.3.0-alpha.21",
+    "@storybook/addons": "5.3.0-alpha.22",
+    "@storybook/api": "5.3.0-alpha.22",
+    "@storybook/client-logger": "5.3.0-alpha.22",
+    "@storybook/components": "5.3.0-alpha.22",
+    "@storybook/core-events": "5.3.0-alpha.22",
+    "@storybook/theming": "5.3.0-alpha.22",
     "core-js": "^3.0.1",
     "memoizerific": "^1.11.3",
     "react": "^16.8.3",

diff --git a/addons/centered/package.json b/addons/centered/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-centered",
-  "version": "5.3.0-alpha.21",
+  "version": "5.3.0-alpha.22",
   "description": "Storybook decorator to center components",
   "keywords": [
     "addon",
@@ -29,7 +29,7 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/addons": "5.3.0-alpha.21",
+    "@storybook/addons": "5.3.0-alpha.22",
     "core-js": "^3.0.1",
     "global": "^4.3.2",
     "util-deprecate": "^1.0.2"