Merge pull request #40 from mmmurray/next

mmmurray · web-flow · commit e6f3b12a5587 · 2019-06-23T16:24:34.000+01:00
Upgrade dependencies
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,6 @@
-.cache
-*.log
+.DS_Store
 coverage
 lib
 node_modules
+tsconfig.json
+yarn-error.log
diff --git a/.travis.yml b/.travis.yml
@@ -1,10 +1,19 @@
 language: node_js
 node_js:
-  - 'node'
+  - '10'
 cache:
   yarn: true
   directories:
     - 'node_modules'
 branches:
   only:
     - 'master'
+jobs:
+  include:
+    - stage: release
+      node_js: '10'
+      deploy:
+        provider: script
+        skip_cleanup: true
+        script:
+          - 'yarn release'
diff --git a/jest.config.js b/jest.config.js
diff --git a/mmm.config.js b/mmm.config.js
@@ -0,0 +1,13 @@
+module.exports = {
+  transformJestConfig: config => ({
+    ...config,
+    coverageThreshold: {
+      global: {
+        branches: 0,
+        functions: 0,
+        lines: 0,
+        statements: 0,
+      },
+    },
+  }),
+}
diff --git a/package.json b/package.json
@@ -1,38 +1,58 @@
 {
   "name": "react-responsive-layout",
-  "version": "0.2.0",
+  "version": "0.0.0-semantically-released",
   "author": "Mark Murray",
   "license": "MIT",
   "repository": "git@github.com:mmmurray/react-responsive-layout.git",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "scripts": {
-    "build": "rm -rf lib && mmm build",
+    "build": "mmm build",
+    "commit": "mmm commit",
     "jest": "mmm jest",
-    "prepare": "yarn build",
-    "prettier": "mmm format",
+    "release": "mmm release",
     "storybook": "start-storybook -p 9001 -c storybook",
-    "test": "mmm coverage"
+    "test": "mmm test",
+    "test:coverage": "mmm test:coverage",
+    "test:lint": "mmm test:lint"
   },
   "peerDependencies": {
     "react": ">=16.8.0"
   },
   "devDependencies": {
-    "@babel/core": "7.2.2",
-    "@storybook/addon-knobs": "4.1.11",
-    "@storybook/addon-options": "4.1.11",
-    "@storybook/components": "4.1.11",
-    "@storybook/react": "4.1.11",
-    "@types/react": "16.8.1",
-    "@types/storybook__addon-knobs": "4.0.0",
-    "@types/storybook__react": "4.0.1",
-    "babel-loader": "8.0.6",
-    "emotion": "9.2.12",
-    "mmm-scripts": "0.0.16",
-    "react": "16.8.6",
-    "react-dom": "16.8.0-alpha.1",
-    "react-emotion": "9.2.12",
-    "ts-loader": "5.3.3",
-    "typescript": "3.3.1"
-  }
+    "@babel/core": "^7.4.5",
+    "@storybook/addon-knobs": "^5.1.9",
+    "@storybook/react": "^5.1.9",
+    "@storybook/theming": "^5.1.9",
+    "@types/react": "^16.8.22",
+    "@types/storybook__addon-knobs": "^5.0.1",
+    "@types/storybook__react": "^4.0.2",
+    "babel-loader": "^8.0.6",
+    "emotion": "^9.2.12",
+    "mmm-scripts": "^0.4.2",
+    "react": "^16.8.6",
+    "react-dom": "^16.8.6",
+    "react-emotion": "^9.2.12",
+    "ts-loader": "^6.0.4",
+    "typescript": "^3.5.2"
+  },
+  "commitlint": {
+    "extends": [
+      "@commitlint/config-conventional"
+    ]
+  },
+  "config": {
+    "commitizen": {
+      "path": "./node_modules/cz-conventional-changelog"
+    }
+  },
+  "eslintConfig": {
+    "extends": "eslint-config-mmm/ts-react"
+  },
+  "husky": {
+    "hooks": {
+      "commit-msg": "mmm precommit"
+    }
+  },
+  "prettier": "mmm-scripts/prettier.config"
 }
diff --git a/src/stories/belt.stories.tsx b/src/stories/belt.stories.tsx
@@ -1,7 +1,7 @@
 import { number } from '@storybook/addon-knobs'
 import { storiesOf } from '@storybook/react'
 import * as React from 'react'
-import { Belt, Columns } from '../src'
+import { Belt, Columns } from '..'
 import Box from './helpers/box'
 
 storiesOf('Belt', module)
diff --git a/src/stories/box.stories.tsx b/src/stories/box.stories.tsx
diff --git a/src/stories/columns.stories.tsx b/src/stories/columns.stories.tsx
@@ -1,6 +1,6 @@
 import { storiesOf } from '@storybook/react'
 import * as React from 'react'
-import { Columns } from '../src'
+import { Columns } from '..'
 import Box from './helpers/box'
 
 storiesOf('Columns', module)
diff --git a/src/stories/helpers/box.tsx b/src/stories/helpers/box.tsx
@@ -1,6 +1,6 @@
 import * as React from 'react'
 import { SFC } from 'react'
-import { useCSS, useMediaQuery } from '../../src'
+import { useCSS, useMediaQuery } from '../..'
 import useCurrentWidth from './use-current-width'
 
 type BoxProps = {
diff --git a/src/stories/helpers/use-current-width.ts b/src/stories/helpers/use-current-width.ts
@@ -1,7 +1,7 @@
 import { useEffect, useRef, useState } from 'react'
 
 const useCurrentWidth = <ElementType extends HTMLElement>() => {
-  const ref = useRef({ clientWidth: 0 } as ElementType)
+  const ref = useRef<ElementType>({ clientWidth: 0 } as any)
   const [width, setWidth] = useState(0)
 
   useEffect(() => {
diff --git a/storybook/addons.js b/storybook/addons.js
@@ -1,2 +1 @@
 import '@storybook/addon-knobs/register'
-import '@storybook/addon-options/register'
diff --git a/storybook/config.js b/storybook/config.js
@@ -1,14 +1,17 @@
 import { withKnobs } from '@storybook/addon-knobs'
-import { withOptions } from '@storybook/addon-options'
-import { themes } from '@storybook/components'
-import { addDecorator, configure } from '@storybook/react'
+import { addDecorator, addParameters, configure } from '@storybook/react'
+import { themes } from '@storybook/theming'
 import { injectGlobal } from 'emotion'
 import React from 'react'
 import { css } from 'react-emotion'
 import { CSSProvider } from '../src/css-context'
 
 const loadStories = () => {
-  const requireContext = require.context('../stories', true, /\.stories\.tsx$/)
+  const requireContext = require.context(
+    '../src/stories',
+    true,
+    /\.stories\.tsx$/,
+  )
 
   requireContext.keys().map(requireContext)
 }
@@ -22,13 +25,15 @@ injectGlobal({
   },
 })
 
-addDecorator(
-  withOptions({
-    name: 'react responsive layout',
-    url: 'https://github.com/mmmurray/react-responsive-layout',
-    theme: themes.dark,
-  }),
-)
+addParameters({
+  options: {
+    theme: {
+      ...themes.dark,
+      brandTitle: 'react-responsive-layout',
+      brandUrl: 'https://github.com/mmmurray/react-responsive-layout',
+    },
+  },
+})
 
 addDecorator(story => <CSSProvider value={{ css }}>{story()}</CSSProvider>)
 
diff --git a/storybook/webpack.config.js b/storybook/webpack.config.js
@@ -1,4 +1,4 @@
-module.exports = (baseConfig, env, config) => {
+module.exports = ({ config }) => {
   config.module.rules.push({
     test: /\.(ts|tsx)$/,
     loader: require.resolve('ts-loader'),
diff --git a/tsconfig.json b/tsconfig.json
diff --git a/yarn.lock b/yarn.lock
