Skip to content
Prev Previous commit
Next Next commit
Merge branch 'master' into lukyth/upgrade-eslint-plugin
  • Loading branch information
lukyth committed Jan 11, 2020
commit 1510e82bdb4aabc79cfd87535a82ea779f81a585
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ npx create-react-app my-app
cd my-app
npm start
```

If you've previously installed `create-react-app` globally via `npm install -g create-react-app`, we recommend you uninstall the package using `npm uninstall -g create-react-app` to ensure that npx always uses the latest version.

_([npx](https://medium.com/@maybekatz/introducing-npx-an-npm-package-runner-55f7d4bd282b) comes with npm 5.2+ and higher, see [instructions for older npm versions](https://gist.github.com/gaearon/4064d3c23a77c74a3614c498a8bb1c5f))_
Expand Down
1 change: 0 additions & 1 deletion docusaurus/docs/integrating-with-an-api-backend.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ It allows creating hypermedia and GraphQL APIs in minutes.
It is shipped with an official Progressive Web App generator as well as a dynamic administration interface, both built for Create React App.
Check out [this tutorial](https://api-platform.com/docs/distribution).


## C# (ASP.NET Core)

ASP.NET Core has a React project template that uses Create React App. Check out [their documentation](https://docs.microsoft.com/en-us/aspnet/core/client-side/spa/react).
2 changes: 1 addition & 1 deletion packages/cra-template/template/src/serviceWorker.js
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ function registerValidSW(swUrl, config) {
function checkValidServiceWorker(swUrl, config) {
// Check if the service worker can be found. If it can't reload the page.
fetch(swUrl, {
headers: { 'Service-Worker': 'script' }
headers: { 'Service-Worker': 'script' },
})
.then(response => {
// Ensure service worker exists, and that we really are getting a JS file.
Expand Down
6 changes: 3 additions & 3 deletions packages/react-error-overlay/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,9 @@
"chokidar": "^3.3.0",
"cross-env": "6.0.3",
"eslint": "^6.1.0",
"eslint-config-react-app": "^5.0.2",
"eslint-plugin-flowtype": "4.3.0",
"eslint-plugin-import": "2.18.2",
"eslint-config-react-app": "^5.1.0",
"eslint-plugin-flowtype": "4.5.2",
"eslint-plugin-import": "2.19.1",
"eslint-plugin-jsx-a11y": "6.2.3",
"eslint-plugin-react": "7.17.0",
"flow-bin": "^0.113.0",
Expand Down
4 changes: 2 additions & 2 deletions packages/react-scripts/config/webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -270,8 +270,8 @@ module.exports = function(webpackEnv) {
: false,
},
cssProcessorPluginOptions: {
preset: ['default', { minifyFontValues: { removeQuotes: false } }]
}
preset: ['default', { minifyFontValues: { removeQuotes: false } }],
},
}),
],
// Automatically split vendor and commons
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,12 @@ import React, { Component } from 'react';
import PropTypes from 'prop-types';

function load() {
return [[1, '1'], [2, '2'], [3, '3'], [4, '4']];
return [
[1, '1'],
[2, '2'],
[3, '3'],
[4, '4'],
];
}

export default class extends Component {
Expand Down
18 changes: 9 additions & 9 deletions packages/react-scripts/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,17 +42,17 @@
"css-loader": "3.3.2",
"dotenv": "8.2.0",
"dotenv-expand": "5.1.0",
"eslint": "^6.1.0",
"eslint-config-react-app": "^5.0.2",
"eslint-loader": "3.0.2",
"eslint-plugin-flowtype": "4.3.0",
"eslint-plugin-import": "2.18.2",
"eslint": "^6.6.0",
"eslint-config-react-app": "^5.1.0",
"eslint-loader": "3.0.3",
"eslint-plugin-flowtype": "4.5.2",
"eslint-plugin-import": "2.19.1",
"eslint-plugin-jsx-a11y": "6.2.3",
"eslint-plugin-react": "7.14.3",
"eslint-plugin-react": "7.17.0",
"eslint-plugin-react-hooks": "2.1.2",
"file-loader": "3.0.1",
"fs-extra": "7.0.1",
"html-webpack-plugin": "4.0.0-beta.5",
"file-loader": "4.3.0",
"fs-extra": "^8.1.0",
"html-webpack-plugin": "4.0.0-beta.11",
"identity-obj-proxy": "3.0.0",
"jest": "24.9.0",
"jest-environment-jsdom-fourteen": "1.0.1",
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.