Skip to content

Upgrade styled-jsx to v2.2.1#3358

Merged
timneutkens merged 6 commits into
vercel:canaryfrom
giuseppeg:patch-3
Dec 4, 2017
Merged

Upgrade styled-jsx to v2.2.1#3358
timneutkens merged 6 commits into
vercel:canaryfrom
giuseppeg:patch-3

Conversation

@giuseppeg
Copy link
Copy Markdown
Contributor

Includes some bug fixes. Do you guys update the lockfiles before releasing or per PR?

yashha and others added 4 commits November 16, 2017 11:54
* Adapt with-mobx example for with-mobx-state-tree

* Remove unnecessary lastUpdate parameter to show off snapshot

* update readme

* make other.js more closely mimic index.js
Includes some bug fixes.
Copy link
Copy Markdown
Contributor

@timneutkens timneutkens left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💯

@timneutkens timneutkens changed the base branch from master to canary December 3, 2017 23:03
# Conflicts:
#	package.json
#	server/document.js
@timneutkens
Copy link
Copy Markdown
Contributor

Merged master with canary. After tests are successful I'll merge

@giuseppeg
Copy link
Copy Markdown
Contributor Author

@timneutkens did you read my comment about yarn.lock and package-lock.json?
We need to update them too.

@timneutkens
Copy link
Copy Markdown
Contributor

@giuseppeg I'll do it before releasing 👍

@timneutkens timneutkens merged commit 5daafa4 into vercel:canary Dec 4, 2017
timneutkens pushed a commit to timneutkens/next.js that referenced this pull request Dec 4, 2017
* Pulled encoding to top of head (vercel#3214)

* Remove next.d.ts to use @types/next (vercel#3297)

* Add with-mobx-state-tree example (vercel#3179)

* Adapt with-mobx example for with-mobx-state-tree

* Remove unnecessary lastUpdate parameter to show off snapshot

* update readme

* make other.js more closely mimic index.js

* Upgrade styled-jsx to v2.2.1

Includes some bug fixes.

* Fix linting
timneutkens added a commit that referenced this pull request Dec 5, 2017
* Add .jsx extension

* examples: add create-next-app (#3377)

* examples: add create-next-app

* fix with-typescript readme

* Upgrading with-flow example to the latest flow-bin ver. 0.59.0 (#3337)

For upgrading I used flow-upgrade module by https://yarnpkg.com/en/package/flow-upgrade

* doc'd fs-routing option & added note on `passHref` (#3384)

2 changes:

`passHref` - just added a cautionary note on the importance of `passHref`. We had a few days of no-href links on our site b/c we used a custom component instead of a raw `<a>` tag,  and Google bot wasn't crawling our links (confirmed in Google cache). Hurt our SEO a bit, so I thought it was worth noting.


`useFileSystemPublicRoutes` - this is mentioned in #914 , but it doesn't appear any doc was actually added. We use `next-routes`, and we were serving all the files in `/pages/` in addition to their route patterns (ie duplicate content), which can be a pain w/ SEO and duplicate content.

* fix typo in readme.md (#3385)

* Upgrade styled-jsx to v2.2.1 (#3358)

* Pulled encoding to top of head (#3214)

* Remove next.d.ts to use @types/next (#3297)

* Add with-mobx-state-tree example (#3179)

* Adapt with-mobx example for with-mobx-state-tree

* Remove unnecessary lastUpdate parameter to show off snapshot

* update readme

* make other.js more closely mimic index.js

* Upgrade styled-jsx to v2.2.1

Includes some bug fixes.

* Fix linting

* Make sure import that doesn’t end in .jsx works

* Move tests

* Show error when .js and .jsx both exist

* Remove .jsx when importing from ‘path.jsx’

* Fixes

* Get .jsx resolver back

* Revert "Get .jsx resolver back"

This reverts commit 6f76712.

* Revert "Revert "Get .jsx resolver back""

This reverts commit 69e592e.

* Add remove .jsx to preset

* Remove jsx resolver

* Revert "Remove jsx resolver"

This reverts commit 5e3ef1a.

* Revert "Revert "Remove jsx resolver""

This reverts commit 8248e50.

* Revert "Revert "Revert "Remove jsx resolver"""

This reverts commit 2a6d418.

* Make 1 component not use .jsx
@lock lock Bot locked as resolved and limited conversation to collaborators May 16, 2018
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants