Skip to content

Commit

Permalink
Merge pull request #24 from sharetribe/update-from-upstream
Browse files Browse the repository at this point in the history
v6.0.0 Update from upstream (CRA v4.0.2 > v5.0.1)
  • Loading branch information
Gnito authored Jul 7, 2022
2 parents 2d61a9d + e8e16ee commit e25d807
Show file tree
Hide file tree
Showing 144 changed files with 56,166 additions and 23,373 deletions.
3 changes: 2 additions & 1 deletion .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@
"browser": true,
"commonjs": true,
"node": true,
"es6": true
"es6": true,
"jest": true
},
"parserOptions": {
"ecmaVersion": 2018
Expand Down
4 changes: 2 additions & 2 deletions .github/CODEOWNERS
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
packages/ @ianschmitz @iansu @mrmckeb @petetnt
docusaurus/ @ianschmitz @iansu @mrmckeb
packages/ @iansu @mrmckeb
docusaurus/ @iansu @mrmckeb
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ labels: 'issue: bug report, needs triage'
* yarn.lock
Then you need to decide which package manager you prefer to use.
We support both npm (https://npmjs.com) and yarn (http://yarnpkg.com/).
We support both npm (https://npmjs.com) and yarn (https://yarnpkg.com/).
However, **they can't be used together in one project** so you need to pick one.
If you decided to use npm, run this in your project directory:
Expand Down
12 changes: 9 additions & 3 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,14 @@ jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v1
- uses: actions/checkout@v2
- uses: actions/setup-node@v2
with:
node-version: '14'
cache: 'npm'
- name: Install npm@8
run: npm i -g npm@8
- name: Install
run: yarn --no-progress --non-interactive --no-lockfile
run: npm ci --prefer-offline
- name: Build
run: yarn build
run: npm run build
32 changes: 32 additions & 0 deletions .github/workflows/integration.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
name: Integration Tests

on:
push:
branches:
- main
pull_request:
branches:
- main

jobs:
job:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: ['ubuntu-latest', 'macos-latest', 'windows-latest']
node: ['14', '16']
steps:
- uses: actions/checkout@v2
- name: Setup node
uses: actions/setup-node@v2
with:
node-version: ${{ matrix.node }}
cache: 'npm'
- name: Install npm@8
run: npm i -g npm@8
- name: Install yarn
run: npm i -g yarn
- name: Install packages
run: npm ci --prefer-offline
- name: Run integration tests
run: npm run test:integration
12 changes: 9 additions & 3 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,14 @@ jobs:
lint:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v1
- uses: actions/checkout@v2
- uses: actions/setup-node@v2
with:
node-version: '14'
cache: 'npm'
- name: Install npm@8
run: npm i -g npm@8
- name: Install
run: yarn --no-progress --non-interactive --no-lockfile
run: npm ci --prefer-offline
- name: Alex
run: yarn alex
run: npm run alex
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,3 @@ yarn-debug.log*
yarn-error.log*
/.changelog
.npm/
yarn.lock
38 changes: 19 additions & 19 deletions CHANGELOG-0.x.md

Large diffs are not rendered by default.

10 changes: 4 additions & 6 deletions CHANGELOG-1.x.md
Original file line number Diff line number Diff line change
Expand Up @@ -1365,7 +1365,7 @@ or
yarn add --dev --exact [email protected]
```

If you previously had issues with an `Invalid Host Header` error, [follow these new instructions](https://github.com/facebook/create-react-app/blob/master/packages/react-scripts/template/README.md#invalid-host-header-errors-after-configuring-proxy) to fix it.
If you previously had issues with an `Invalid Host Header` error, [follow these new instructions](https://github.com/facebook/create-react-app/blob/main/packages/react-scripts/template/README.md#invalid-host-header-errors-after-configuring-proxy) to fix it.

## 1.0.1 (May 19, 2017)

Expand Down Expand Up @@ -1547,7 +1547,7 @@ You can automatically convert your project to fix them by running the [correspon

#### How do I make my tests work with Jest 20?

Please refer to the [Jest 19](https://facebook.github.io/jest/blog/2017/02/21/jest-19-immersive-watch-mode-test-platform-improvements.html#breaking-changes) and [Jest 20](http://facebook.github.io/jest/blog/2017/05/06/jest-20-delightful-testing-multi-project-runner.html#breaking-changes) breaking changes for migration instructions.
Please refer to the [Jest 19](https://facebook.github.io/jest/blog/2017/02/21/jest-19-immersive-watch-mode-test-platform-improvements.html#breaking-changes) and [Jest 20](https://facebook.github.io/jest/blog/2017/05/06/jest-20-delightful-testing-multi-project-runner.html#breaking-changes) breaking changes for migration instructions.

If you use snapshots, you will likely need to update them once because of the change in format.

Expand All @@ -1572,7 +1572,7 @@ If you still have the problem please file an issue.

Unhandled Promise rejections will now crash tests. You can fix them by explicitly catching the errors you don’t care about.

#### How to turn my app into a [Progressive Web App](https://github.com/facebook/create-react-app/blob/master/packages/react-scripts/template/README.md#making-a-progressive-web-app)?
#### How to turn my app into a [Progressive Web App](https://github.com/facebook/create-react-app/blob/main/packages/react-scripts/template/README.md#making-a-progressive-web-app)?

After the regular update procedure above, add these line to `<head>` in `public/index.html`:

Expand All @@ -1588,9 +1588,7 @@ After the regular update procedure above, add these line to `<head>` in `public/
Add `<noscript>` to `<body>` in `public/index.html`:

```html
<noscript>
You need to enable JavaScript to run this app.
</noscript>
<noscript> You need to enable JavaScript to run this app. </noscript>
```

Then create a file called `public/manifest.json` that looks like this:
Expand Down
10 changes: 5 additions & 5 deletions CHANGELOG-2.x.md
Original file line number Diff line number Diff line change
Expand Up @@ -823,7 +823,7 @@ import 'react-app-polyfill/ie9'; // For IE 9-11 support
import 'react-app-polyfill/ie11'; // For IE 11 support
```

You can read more about [these polyfills here](https://github.com/facebook/create-react-app/tree/master/packages/react-app-polyfill).
You can read more about [these polyfills here](https://github.com/facebook/create-react-app/tree/main/packages/react-app-polyfill).

### Dynamic `import()` of a CommonJS module now has a `.default` property

Expand All @@ -845,7 +845,7 @@ We previously allowed code splitting with a webpack-specific directive, `require
**Single Module**

```js
require.ensure(['module-a'], function() {
require.ensure(['module-a'], function () {
var a = require('module-a');
// ...
});
Expand All @@ -859,7 +859,7 @@ import('module-a').then(a => {
**Multiple Module**

```js
require.ensure(['module-a', 'module-b'], function() {
require.ensure(['module-a', 'module-b'], function () {
var a = require('module-a');
var b = require('module-b');
// ...
Expand Down Expand Up @@ -913,7 +913,7 @@ Next, create `src/setupProxy.js` and place the following contents in it:
```js
const proxy = require('http-proxy-middleware');

module.exports = function(app) {
module.exports = function (app) {
// ...
};
```
Expand All @@ -936,7 +936,7 @@ Place entries into `src/setupProxy.js` like so:
```js
const proxy = require('http-proxy-middleware');

module.exports = function(app) {
module.exports = function (app) {
app.use(proxy('/api', { target: 'http://localhost:5000/' }));
app.use(proxy('/*.svg', { target: 'http://localhost:5000/' }));
};
Expand Down
2 changes: 1 addition & 1 deletion CHANGELOG-3.x.md
Original file line number Diff line number Diff line change
Expand Up @@ -330,7 +330,7 @@ v3.3.0 is a minor release that adds new features, including custom templates and

You can now create a new app using custom templates.

We've published our existing templates as [`cra-template`](https://github.com/facebook/create-react-app/tree/master/packages/cra-template) and [`cra-template-typescript`](https://github.com/facebook/create-react-app/tree/master/packages/cra-template-typescript), but we expect to see many great templates from the community over the coming weeks.
We've published our existing templates as [`cra-template`](https://github.com/facebook/create-react-app/tree/main/packages/cra-template) and [`cra-template-typescript`](https://github.com/facebook/create-react-app/tree/main/packages/cra-template-typescript), but we expect to see many great templates from the community over the coming weeks.

The below command shows how you can create a new app with `cra-template-typescript`.

Expand Down
Loading

0 comments on commit e25d807

Please sign in to comment.