Skip to content

Commit fd5529d

Browse files
timdorrmarkerikson
authored andcommitted
Remove yarn and workspace for website
1 parent 0691cca commit fd5529d

File tree

17 files changed

+47584
-17751
lines changed

17 files changed

+47584
-17751
lines changed

.github/workflows/test.yml

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -16,22 +16,16 @@ jobs:
1616
uses: actions/setup-node@v1
1717
with:
1818
node-version: 14.x
19+
cache: npm
1920

2021
- name: Checkout code
2122
uses: actions/checkout@v2
2223

23-
- name: Cache dependencies
24-
uses: actions/cache@v2
25-
with:
26-
path: .yarn/cache
27-
key: yarn-${{ hashFiles('yarn.lock') }}
28-
restore-keys: yarn-
29-
3024
- name: Install dependencies
31-
run: yarn install
25+
run: npm ci
3226

3327
- name: Run test suite
34-
run: yarn test
28+
run: npm test
3529

3630
- name: Collect coverage
37-
run: yarn coverage
31+
run: npm run coverage

.gitignore

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -3,28 +3,3 @@ dist
33
lib
44
coverage
55
es
6-
7-
.cache
8-
.yarnrc
9-
.yarn/*
10-
!.yarn/patches
11-
!.yarn/releases
12-
!.yarn/plugins
13-
!.yarn/sdks
14-
!.yarn/versions
15-
.pnp.*
16-
*.tgz
17-
react-redux-*/
18-
19-
.yalc
20-
yalc.lock
21-
yalc.sig
22-
23-
lib/core/metadata.js
24-
lib/core/MetadataBlog.js
25-
26-
website/translated_docs
27-
website/build/
28-
website/yarn.lock
29-
website/node_modules
30-
website/i18n/*

.yarn/plugins/@yarnpkg/plugin-compat.cjs

Lines changed: 0 additions & 9 deletions
This file was deleted.

.yarn/plugins/@yarnpkg/plugin-workspace-tools.cjs

Lines changed: 0 additions & 29 deletions
This file was deleted.

.yarn/releases/yarn-berry.cjs

Lines changed: 0 additions & 55 deletions
This file was deleted.

.yarnrc.yml

Lines changed: 0 additions & 9 deletions
This file was deleted.

CONTRIBUTING.md

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,51 +20,51 @@ Fork, then clone the repo:
2020
git clone https://github.com/your-username/react-redux.git
2121
```
2222

23-
This repository uses Yarn v2 to manage packages. You'll need to have Yarn v1.22 installed globally on your system first, as Yarn v2 depends on that being available first. Install dependencies with:
23+
This repository uses npm 7. Install dependencies with:
2424

2525
```
26-
yarn install
26+
npm install
2727
```
2828

2929
### Building
3030

3131
Running the `build` task will create both a CommonJS module-per-module build and a UMD build.
3232

3333
```
34-
yarn build
34+
npm run build
3535
```
3636

3737
To create just a CommonJS module-per-module build:
3838

3939
```
40-
yarn build:lib
40+
npm run build:lib
4141
```
4242

4343
To create just a UMD build:
4444

4545
```
46-
yarn build:umd
47-
yarn build:umd:min
46+
npm run build:umd
47+
npm run build:umd:min
4848
```
4949

5050
### Testing and Linting
5151

5252
To run the tests:
5353

5454
```
55-
yarn test
55+
npm test
5656
```
5757

5858
To continuously watch and run tests, run the following:
5959

6060
```
61-
yarn test --watch
61+
npm test --watch
6262
```
6363

6464
To perform linting with `eslint`, run the following:
6565

6666
```
67-
yarn lint
67+
npm run lint
6868
```
6969

7070
### New Features

netlify.toml

Lines changed: 7 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,14 @@
11
[build]
2-
base = "website"
3-
publish = "website/build"
4-
command = "yarn build && cp _redirects ./build"
5-
ignore = "git diff --quiet HEAD^ HEAD -- ../docs/ ."
2+
base = "website"
3+
publish = "website/build"
4+
command = "npm install && npm run build && cp _redirects ./build"
5+
ignore = "git diff --quiet HEAD^ HEAD -- ../docs/ ."
66

77
[build.environment]
88
NODE_VERSION = "14"
99
NODE_OPTIONS = "--max_old_space_size=4096"
10-
NETLIFY_USE_YARN = "true"
11-
YARN_VERSION = "1.22.10"
12-
1310

1411
[[plugins]]
15-
package = "netlify-plugin-cache"
16-
[plugins.inputs]
17-
paths = [
18-
"node_modules/.cache",
19-
"website/node_modules/.cache",
20-
".yarn/.cache"
21-
]
22-
12+
package = "netlify-plugin-cache"
13+
[plugins.inputs]
14+
paths = ["node_modules/.cache", "website/node_modules/.cache"]

0 commit comments

Comments
 (0)