Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump to React 16 #1

Merged
merged 4 commits into from
Aug 12, 2019
Merged

Bump to React 16 #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6bbba15
Bump to react 16.
ayc92 Jan 14, 2018
d02bf4b
Merge branch 'master' into react_16
nachoaIvarez Jan 22, 2018
acd2568
Update snapshots to reflect styled-components upgrade
ayc92 Jan 23, 2018
c19d03a
Bump @types/react, @types/react-dom in devDependencies.
ayc92 Jan 23, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 12 additions & 8 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"clean": "rimraf dist",
"lint": "eslint src",
"test": "jest",
"check": "yarn run lint -s && yarn run test && dependency-check package.json --entry src",
"check": "yarn run lint && yarn run test && dependency-check package.json --entry src",
"prebuild": "yarn run check -s && yarn run clean -s",
"build": "babel --optional runtime src -d dist --copy-files --ignore src/__tests__",
"prepublish": "yarn run build",
Expand All @@ -33,14 +33,18 @@
"url": "https://github.com/nachoaIvarez/flexbox-react/issues"
},
"homepage": "https://github.com/nachoaIvarez/flexbox-react#readme",
"optionalDependencies": {
"@types/react": "^16.0.34",
"@types/react-dom": "^16.0.3"
},
"peerDependencies": {
"prop-types": "*",
"react": "*",
"react-dom": "*"
},
"devDependencies": {
"@types/react": "^15.0.21",
"@types/react-dom": "^0.14.23",
"@types/react": "^16.0.34",
"@types/react-dom": "^16.0.3",
"babel-cli": "^6.24.1",
"babel-core": "^6.24.1",
"babel-eslint": "^7.2.2",
Expand All @@ -54,13 +58,13 @@
"eslint-plugin-import": "^2.2.0",
"eslint-plugin-jsx-a11y": "^4.0.0",
"eslint-plugin-react": "^6.10.3",
"jest": "^19.0.2",
"jest": "^22",
"prop-types": "^15.5.8",
"react": "^15.5.4",
"react-dom": "^15.5.4",
"react-test-renderer": "^15.5.4",
"react": "^16",
"react-dom": "^16",
"react-test-renderer": "^16",
"rimraf": "^2.6.1",
"typescript": "^2.2.2",
"typescript": "^2.6",
"watch": "^1.0.2"
},
"dependencies": {
Expand Down
43 changes: 26 additions & 17 deletions src/__tests__/__snapshots__/Flexbox.react-test.jsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,9 @@ exports[`Renders <Flexbox /> component with layout helpers (height, width, margi
-webkit-flex-direction:column;
-ms-flex-direction:column;
flex-direction:column;
-webkit-box-flex:1;
-webkit-flex-grow:1;
-ms-flex-grow:1;
-ms-flex-positive:1;
flex-grow:1;
-webkit-flex-wrap:wrap;
-ms-flex-wrap:wrap;
Expand All @@ -41,13 +42,14 @@ exports[`Renders <Flexbox /> component with layout helpers (height, width, margi
-ms-flex:0;
flex:0;
-webkit-flex-basis:0;
-ms-flex-basis:0;
-ms-flex-preferred-size:0;
flex-basis:0;
-webkit-box-flex:0;
-webkit-flex-grow:0;
-ms-flex-grow:0;
-ms-flex-positive:0;
flex-grow:0;
-webkit-flex-shrink:0;
-ms-flex-shrink:0;
-ms-flex-negative:0;
flex-shrink:0;
height:0;
margin:0;
Expand Down Expand Up @@ -113,8 +115,9 @@ exports[`Renders <Flexbox /> component with several flexbox props 1`] = `
-webkit-flex-direction:column;
-ms-flex-direction:column;
flex-direction:column;
-webkit-box-flex:1;
-webkit-flex-grow:1;
-ms-flex-grow:1;
-ms-flex-positive:1;
flex-grow:1;
-webkit-flex-wrap:wrap;
-ms-flex-wrap:wrap;
Expand Down Expand Up @@ -154,8 +157,9 @@ exports[`Renders <Flexbox /> component with special properties set to the number
-webkit-flex-direction:column;
-ms-flex-direction:column;
flex-direction:column;
-webkit-box-flex:1;
-webkit-flex-grow:1;
-ms-flex-grow:1;
-ms-flex-positive:1;
flex-grow:1;
-webkit-flex-wrap:wrap;
-ms-flex-wrap:wrap;
Expand All @@ -174,13 +178,14 @@ exports[`Renders <Flexbox /> component with special properties set to the number
-ms-flex:0;
flex:0;
-webkit-flex-basis:0;
-ms-flex-basis:0;
-ms-flex-preferred-size:0;
flex-basis:0;
-webkit-box-flex:0;
-webkit-flex-grow:0;
-ms-flex-grow:0;
-ms-flex-positive:0;
flex-grow:0;
-webkit-flex-shrink:0;
-ms-flex-shrink:0;
-ms-flex-negative:0;
flex-shrink:0;
height:0;
margin:0;
Expand Down Expand Up @@ -232,8 +237,9 @@ exports[`Renders <Flexbox /> with extra props, outside expected/defined ones (li
-webkit-flex-direction:column;
-ms-flex-direction:column;
flex-direction:column;
-webkit-box-flex:1;
-webkit-flex-grow:1;
-ms-flex-grow:1;
-ms-flex-positive:1;
flex-grow:1;
-webkit-flex-wrap:wrap;
-ms-flex-wrap:wrap;
Expand All @@ -252,13 +258,14 @@ exports[`Renders <Flexbox /> with extra props, outside expected/defined ones (li
-ms-flex:0;
flex:0;
-webkit-flex-basis:0;
-ms-flex-basis:0;
-ms-flex-preferred-size:0;
flex-basis:0;
-webkit-box-flex:0;
-webkit-flex-grow:0;
-ms-flex-grow:0;
-ms-flex-positive:0;
flex-grow:0;
-webkit-flex-shrink:0;
-ms-flex-shrink:0;
-ms-flex-negative:0;
flex-shrink:0;
height:0;
margin:0;
Expand Down Expand Up @@ -326,8 +333,9 @@ exports[`Renders <Flexbox /> with inline styles that can overwrite flexbox-react
-webkit-flex-direction:column;
-ms-flex-direction:column;
flex-direction:column;
-webkit-box-flex:1;
-webkit-flex-grow:1;
-ms-flex-grow:1;
-ms-flex-positive:1;
flex-grow:1;
-webkit-flex-wrap:wrap;
-ms-flex-wrap:wrap;
Expand All @@ -346,13 +354,14 @@ exports[`Renders <Flexbox /> with inline styles that can overwrite flexbox-react
-ms-flex:0;
flex:0;
-webkit-flex-basis:0;
-ms-flex-basis:0;
-ms-flex-preferred-size:0;
flex-basis:0;
-webkit-box-flex:0;
-webkit-flex-grow:0;
-ms-flex-grow:0;
-ms-flex-positive:0;
flex-grow:0;
-webkit-flex-shrink:0;
-ms-flex-shrink:0;
-ms-flex-negative:0;
flex-shrink:0;
height:0;
margin:0;
Expand Down
Loading