Merge branch 'master' into improv/autocomplete-types

packages/components/forma-36-react-datepicker/CHANGELOG.md

@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [0.1.1-alpha.35](https://github.com/contentful/forma-36/compare/@contentful/forma-36-react-datepicker@0.1.1-alpha.34...@contentful/forma-36-react-datepicker@0.1.1-alpha.35) (2020-01-20)
+
+**Note:** Version bump only for package @contentful/forma-36-react-datepicker
+
+
+
+
+
 ## [0.1.1-alpha.34](https://github.com/contentful/forma-36/compare/@contentful/forma-36-react-datepicker@0.1.1-alpha.33...@contentful/forma-36-react-datepicker@0.1.1-alpha.34) (2020-01-20)
 
 **Note:** Version bump only for package @contentful/forma-36-react-datepicker

packages/components/forma-36-react-datepicker/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contentful/forma-36-react-datepicker",
-  "version": "0.1.1-alpha.34",
+  "version": "0.1.1-alpha.35",
   "license": "MIT",
   "main": "dist/index.js",
   "module": "dist/forma-36-react-datepicker.esm.js",
@@ -31,7 +31,7 @@
     "trailingComma": "es5"
   },
   "devDependencies": {
-    "@contentful/forma-36-react-components": "^3.28.11",
+    "@contentful/forma-36-react-components": "^3.28.12",
     "@testing-library/jest-dom": "^4.2.3",
     "@testing-library/react": "^9.3.2",
     "@types/jest": "^24.0.21",

packages/components/forma-36-react-timepicker/CHANGELOG.md

@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [0.2.0-alpha.32](https://github.com/contentful/forma-36/compare/@contentful/forma-36-react-timepicker@0.2.0-alpha.31...@contentful/forma-36-react-timepicker@0.2.0-alpha.32) (2020-01-20)
+
+**Note:** Version bump only for package @contentful/forma-36-react-timepicker
+
+
+
+
+
 # [0.2.0-alpha.31](https://github.com/contentful/forma-36/compare/@contentful/forma-36-react-timepicker@0.2.0-alpha.30...@contentful/forma-36-react-timepicker@0.2.0-alpha.31) (2020-01-20)
 
 **Note:** Version bump only for package @contentful/forma-36-react-timepicker

packages/components/forma-36-react-timepicker/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contentful/forma-36-react-timepicker",
-  "version": "0.2.0-alpha.31",
+  "version": "0.2.0-alpha.32",
   "license": "MIT",
   "author": "Johannes Bugiel",
   "main": "dist/index.js",
@@ -30,7 +30,7 @@
     "trailingComma": "es5"
   },
   "devDependencies": {
-    "@contentful/forma-36-react-components": "^3.28.11",
+    "@contentful/forma-36-react-components": "^3.28.12",
     "@contentful/forma-36-tokens": "^0.5.1",
     "@testing-library/jest-dom": "^4.2.3",
     "@testing-library/react": "^9.3.2",

packages/forma-36-react-components/CHANGELOG.md

@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [3.28.12](https://github.com/contentful/forma-36/compare/@contentful/forma-36-react-components@3.28.11...@contentful/forma-36-react-components@3.28.12) (2020-01-20)
+
+**Note:** Version bump only for package @contentful/forma-36-react-components
+
+
+
+
+
 ## [3.28.11](https://github.com/contentful/forma-36/compare/@contentful/forma-36-react-components@3.28.10...@contentful/forma-36-react-components@3.28.11) (2020-01-20)
 
 **Note:** Version bump only for package @contentful/forma-36-react-components

packages/forma-36-react-components/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@contentful/forma-36-react-components",
   "description": "Contentful UI Component Library",
-  "version": "3.28.11",
+  "version": "3.28.12",
   "main": "dist/index.js",
   "module": "dist/esm/index.js",
   "style": "dist/styles.css",
@@ -25,12 +25,12 @@
     "@babel/preset-typescript": "7.3.3",
     "@contentful/forma-36-fcss": "^0.0.34",
     "@contentful/forma-36-tokens": "^0.5.1",
-    "@storybook/addon-a11y": "^5.2.1",
-    "@storybook/addon-actions": "^5.2.1",
-    "@storybook/addon-knobs": "^5.2.1",
-    "@storybook/addon-notes": "^5.2.1",
-    "@storybook/addon-storysource": "^5.2.1",
-    "@storybook/react": "^5.2.1",
+    "@storybook/addon-a11y": "^5.3.7",
+    "@storybook/addon-actions": "^5.3.7",
+    "@storybook/addon-knobs": "^5.3.7",
+    "@storybook/addon-notes": "^5.3.7",
+    "@storybook/addon-storysource": "^5.3.7",
+    "@storybook/react": "^5.3.7",
     "@testing-library/jest-dom": "^4.2.4",
     "@testing-library/react": "^9.4.0",
     "@types/classnames": "2.2.7",
@@ -96,7 +96,7 @@
     "storybook-prop-types-addon": "1.0.2",
     "style-loader": "^0.23.1",
     "travis-deploy-once": "^4.4.1",
-    "typescript": "3.4.5",
+    "typescript": "3.7.5",
     "webpack": "^4.39.3",
     "webpack-cli": "^3.3.5"
   },

packages/forma-36-react-components/tools/.storybook/main.js

@@ -0,0 +1,21 @@
+const path = require('path');
+
+module.exports = {
+  stories: ['./docs/**/*.stories.tsx', '../../src/components/**/*.stories.tsx'],
+  addons: [
+    '@storybook/addon-knobs',
+    'storybook-prop-types-addon',
+    '@storybook/addon-a11y',
+    {
+      name: '@storybook/addon-storysource',
+      options: {
+        rule: {
+          test: /\.stories\.(js|ts)x?$/,
+          include: [path.resolve(__dirname, '../../src/components')], // You can specify directories
+        },
+      },
+    },
+    '@storybook/addon-actions',
+    '@storybook/addon-notes',
+  ],
+};

packages/forma-36-react-components/tools/.storybook/manager.js

@@ -0,0 +1,7 @@
+import { addons } from '@storybook/addons';
+import { create } from '@storybook/theming/create';
+import contentfulTheme from './contentful-theme';
+
+addons.setConfig({
+  contentfulTheme,
+});

packages/forma-36-react-components/tools/.storybook/preview.js

@@ -0,0 +1,15 @@
+import { configure, addParameters, addDecorator } from '@storybook/react';
+// import './storybook.global.css';
+
+// Storybook Addon Dependencies
+import { withKnobs } from '@storybook/addon-knobs';
+import { withPropTypes } from 'storybook-prop-types-addon';
+import { withA11y } from '@storybook/addon-a11y';
+
+// Setup Addons
+addDecorator(withKnobs);
+addDecorator(withPropTypes);
+addDecorator(withA11y);
+
+// Setup Storybook options
+addParameters({ info: { header: false, source: false } });

packages/forma-36-react-components/tools/.storybook/webpack.config.js

@@ -3,7 +3,7 @@ const webpack = require('webpack');
 
 module.exports = ({ config, mode }) => {
   // Need to remove Storybook's CSS loader before adding our own
-  config.module.rules.splice(2, 1);
+  config.module.rules.splice(3, 1);
 
   // TypeScript
   config.resolve.extensions.push('.ts', '.tsx', '.js', '.json', '.css');
@@ -67,16 +67,5 @@ module.exports = ({ config, mode }) => {
     ],
   });
 
-  config.module.rules.push({
-    test: /\.stories\.(js|ts)x?$/,
-    loaders: [
-      {
-        loader: require.resolve('@storybook/addon-storysource/loader'),
-        options: { parser: 'typescript' },
-      },
-    ],
-    enforce: 'pre',
-  });
-
   return config;
 };