Skip to content

Commit

Permalink
Merge pull request #56 from MrBenJ/chore/update-emotion-flow
Browse files Browse the repository at this point in the history
Update @emotion/core to fix flowtype context.js issues
  • Loading branch information
MrBenJ committed Jan 7, 2019
2 parents aa135a8 + 899dec0 commit 3a23018
Show file tree
Hide file tree
Showing 9 changed files with 59 additions and 30 deletions.
7 changes: 1 addition & 6 deletions .flowconfig
@@ -1,10 +1,5 @@
# Note: @emotion/core is throwing a bad 'context.js' typecheck error.
# I'm ignoring @emotion/core for now and supressing flow checking
# on any files that are importing it for now.
# There's a pull request that supposedly fixes this issue here:
# https://github.com/emotion-js/emotion/pull/1126
[ignore]
.*/node_modules/@emotion/core

[include]

[libs]
Expand Down
62 changes: 50 additions & 12 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
Expand Up @@ -6,8 +6,8 @@
"main": "index.js",
"dependencies": {
"@babel/core": "^7.2.2",
"@emotion/core": "^10.0.5",
"@emotion/styled": "^10.0.5",
"@emotion/core": "^10.0.6",
"@emotion/styled": "^10.0.6",
"classnames": "^2.2.6",
"font-awesome": "^4.7.0",
"gatsby": "^2.0.85",
Expand Down
2 changes: 1 addition & 1 deletion src/components/ChapterLayout/ChapterLayout.js
@@ -1,4 +1,4 @@
// supress@flow
// @flow
import React, { type Node } from 'react';
import { graphql } from 'gatsby';

Expand Down
2 changes: 1 addition & 1 deletion src/components/ChapterLayout/ChapterLayout.style.js
@@ -1,4 +1,4 @@
// supress@flow
// @flow
import { css } from '@emotion/core';
import { COLORS as c } from '../../constants';
import { HEADER_HEIGHT } from '../Header';
Expand Down
4 changes: 1 addition & 3 deletions src/components/Header/Header.style.js
@@ -1,9 +1,7 @@
// supress@flow
// @flow
import { css } from '@emotion/core';
import { COLORS as c, BREAKPOINTS as BP } from '../../constants';



export const HEADER_HEIGHT = '5rem';

export default css`
Expand Down
3 changes: 1 addition & 2 deletions src/components/Layout/Layout.style.js
@@ -1,4 +1,4 @@
// supress@flow
// @flow
import { css } from '@emotion/core';

import { COLORS as c } from '../../constants';
Expand All @@ -10,5 +10,4 @@ export default css`
.container-with-header {
padding-top: ${HEADER_HEIGHT};
}
`;
3 changes: 1 addition & 2 deletions src/components/Menu/Menu.style.js
@@ -1,4 +1,4 @@
// supress@flow
// @flow
import { css } from '@emotion/core';

import { COLORS as c, BREAKPOINTS as BP } from '../../constants';
Expand All @@ -8,7 +8,6 @@ const ICON_SPACING = 1;
const MOBILE_MENU_WIDTH = '100%';
const DESKTOP_MENU_WIDTH = '30vw';


export default css`
.menu-icon {
position: fixed;
Expand Down
2 changes: 1 addition & 1 deletion src/pages/index.js
@@ -1,4 +1,4 @@
// supress@flow
// @flow
import React, { type Node } from 'react';
import { css } from '@emotion/core';

Expand Down

0 comments on commit 3a23018

Please sign in to comment.