Upgraded react, react-dom and isomorphic-style-loader.

[mglace]

Upgraded react, react-dom and isomorphic-style-loader packages. Upgraded react context references to new context API.

[piglovesyou]

@mglace Terribly sorry for the late response. Would you please fix the conflict?

[piglovesyou]

And the conflicts of package.json and yarn.lock too please if you don't mind. Or rather we can get the latest for them (react, react-dom, isomorphic-style-loader).

[mglace]

And the conflicts of package.json and yarn.lock too please if you don't mind. Or rather we can get the latest for them (react, react-dom, isomorphic-style-loader).

I'm not exactly sure how to resolve the conflicts in the yarn.lock file. Any advice on how to accomplish that?

[piglovesyou]

Usually just tracking package.json works. Why don't you run merge and take --theirs on yarn.lock and then run yarn again? Also I would suggest the latest version of these packages will be nice. (for instance isomorphic-style-loader is now 5.1.0)

[piglovesyou]

Please check out the build failure

[mglace]

I don't know jest very well but at first glance, it doesn't seem to be working with the new React context API. I'll keep digging but if anyone else has any experience with this please let me know.

[mglace]

As I suspected, it looks like enzyme does not yet support statically setting contextType in React 16 (enzymejs/enzyme#1553). I will look into alternative ways to test this functionality.

[mmarkelov]

@mglace you should update babel-jest and jest to pass your tests, after it you could remove babel-core also

[mglace]

@mmarkelov thanks for the suggestion but no luck i'm afraid. I upgraded babel-jest and jest to the latest versions and I continue to receive the same error.

 FAIL  src/components/Layout/Layout.test.js
  Layout
    × renders children correctly (25ms)
  ● Layout › renders children correctly

    TypeError: Cannot read property 'apply' of undefined

      19 |   test('renders children correctly', () => {
      20 |     const wrapper = renderer
    > 21 |       .create(
         |        ^
      22 |         <App insertCss={() => {}} context={{ fetch: () => {}, pathname: '' }}>
      23 |           <Layout>
      24 |             <div className="child" />

I'll keep working on it.

[mmarkelov]

@mglace create PR to your branch - it is ok for me

[mmarkelov]

@mglace sorry man, I just forgot about lint( Could pls fix it? Or I can make PR

[piavgh]

Hi @mglace

Thank you for this update. Is there a plan on when this PR will be merged into master?

[mmarkelov]

@mglace another problem. I just forgot that some packages are not incompatible with Node 6. .travis.yml should be changed. We just need to drop 6 - I can fix it =)

[piglovesyou]

Before dropping Node6, please

• Try finding way to keep supporting it
• Explain why it is necessary/inevitable
• Update all docs/related settings in the project