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.

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

Dependency major version upgrades #8950

Merged
merged 14 commits into from
May 13, 2020
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
Prev Previous commit
Next Next commit
Merge remote-tracking branch 'upstream/master' into upgrade-majors
  • Loading branch information
ianschmitz committed May 4, 2020
commit cc9f70ac1352c2cab3ee8ae48c3acf508c74d01d
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ export default class BaseUrl extends Component {
render() {
return (
<div id="feature-base-url">
{this.state.users.map(user => (
{this.state.users.map((user) => (
<div key={user.id}>{user.name}</div>
))}
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ export default class ArrayDestructuring extends Component {
render() {
return (
<div id="feature-array-destructuring">
{this.state.users.map(user => {
{this.state.users.map((user) => {
const [id, name] = user;
return <div key={id}>{name}</div>;
})}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ export default class ArraySpread extends Component {
render() {
return (
<div id="feature-array-spread">
{this.state.users.map(user => (
{this.state.users.map((user) => (
<div key={user.id}>{user.name}</div>
))}
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ export default class AsyncAwait extends Component {
render() {
return (
<div id="feature-async-await">
{this.state.users.map(user => (
{this.state.users.map((user) => (
<div key={user.id}>{user.name}</div>
))}
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ export default class ClassProperties extends Component {
render() {
return (
<div id="feature-class-properties">
{this.users.map(user => (
{this.users.map((user) => (
<div key={user.id}>{user.name}</div>
))}
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ export default class ComputedProperties extends Component {
render() {
return (
<div id="feature-computed-properties">
{this.state.users.map(user => (
{this.state.users.map((user) => (
<div key={user.id}>{user.user_name}</div>
))}
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ const styled = ([style]) =>
style
.trim()
.split(/\s*;\s*/)
.map(rule => rule.split(/\s*:\s*/))
.map((rule) => rule.split(/\s*:\s*/))
.reduce((rules, rule) => ({ ...rules, [rule[0]]: rule[1] }), {});

function load() {
Expand Down Expand Up @@ -51,7 +51,7 @@ export default class CustomInterpolation extends Component {

return (
<div id="feature-custom-interpolation">
{this.state.users.map(user => (
{this.state.users.map((user) => (
<div key={user.id} style={veryInlineStyle}>
{user.name}
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ export default class DefaultParameters extends Component {
render() {
return (
<div id="feature-default-parameters">
{this.state.users.map(user => (
{this.state.users.map((user) => (
<div key={user.id}>{user.name}</div>
))}
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ export default class DestructuringAndAwait extends Component {
render() {
return (
<div id="feature-destructuring-and-await">
{this.state.users.map(user => (
{this.state.users.map((user) => (
<div key={user.id}>{user.name}</div>
))}
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ export default class Generators extends Component {
render() {
return (
<div id="feature-generators">
{this.state.users.map(user => (
{this.state.users.map((user) => (
<div key={user.id}>{user.name}</div>
))}
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ export default class NullishCoalescing extends Component {
render() {
return (
<div id="feature-nullish-coalescing">
{this.state.users.map(user => (
{this.state.users.map((user) => (
<div key={user.id}>{user.name ?? 'John Doe'}</div>
))}
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ export default class ObjectDestructuring extends Component {
render() {
return (
<div id="feature-object-destructuring">
{this.state.users.map(user => {
{this.state.users.map((user) => {
const { id, ...rest } = user;
// eslint-disable-next-line no-unused-vars
const [{ name, ...innerRest }] = [{ ...rest }];
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ export default class ObjectSpread extends Component {
render() {
return (
<div id="feature-object-spread">
{this.state.users.map(user => (
{this.state.users.map((user) => (
<div key={user.id}>
{user.name}: {user.age}
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ export default class OptionalChaining extends Component {
render() {
return (
<div id="feature-optional-chaining">
{this.state.users.map(user => (
{this.state.users.map((user) => (
<div key={user.id}>{user?.name}</div>
))}
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ export default class Promises extends Component {
}

componentDidMount() {
load().then(users => {
load().then((users) => {
this.setState({ users });
});
}
Expand All @@ -40,7 +40,7 @@ export default class Promises extends Component {
render() {
return (
<div id="feature-promises">
{this.state.users.map(user => (
{this.state.users.map((user) => (
<div key={user.id}>{user.name}</div>
))}
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ export default class RestAndDefault extends Component {
render() {
return (
<div id="feature-rest-and-default">
{this.state.users.map(user => (
{this.state.users.map((user) => (
<div key={user.id}>{user.name}</div>
))}
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ export default class RestParameters extends Component {
render() {
return (
<div id="feature-rest-parameters">
{this.state.users.map(user => (
{this.state.users.map((user) => (
<div key={user.id}>{user.name}</div>
))}
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ export default class TemplateInterpolation extends Component {
render() {
return (
<div id="feature-template-interpolation">
{this.state.users.map(user => (
{this.state.users.map((user) => (
<div key={user.id}>{user.name}</div>
))}
</div>
Expand Down
2 changes: 1 addition & 1 deletion packages/react-scripts/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@
"resolve-url-loader": "3.1.1",
"sass-loader": "8.0.2",
"semver": "7.3.2",
"style-loader": "0.23.1",
"style-loader": "1.2.1",
"terser-webpack-plugin": "3.0.0",
"ts-pnp": "1.2.0",
"url-loader": "4.1.0",
Expand Down
2 changes: 1 addition & 1 deletion test/fixtures/node_path/src/App.js
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ export default class App extends Component {
render() {
return (
<div>
{this.state.users.map(user => (
{this.state.users.map((user) => (
<div key={user.id}>{user.name}</div>
))}
</div>
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.