Skip to content

Commit

Permalink
Remove yarn and workspace for website
Browse files Browse the repository at this point in the history
  • Loading branch information
timdorr committed Oct 25, 2021
1 parent 0691cca commit e94b191
Show file tree
Hide file tree
Showing 17 changed files with 47,584 additions and 17,751 deletions.
14 changes: 4 additions & 10 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,22 +16,16 @@ jobs:
uses: actions/setup-node@v1
with:
node-version: 14.x
cache: npm

- name: Checkout code
uses: actions/checkout@v2

- name: Cache dependencies
uses: actions/cache@v2
with:
path: .yarn/cache
key: yarn-${{ hashFiles('yarn.lock') }}
restore-keys: yarn-

- name: Install dependencies
run: yarn install
run: npm ci

- name: Run test suite
run: yarn test
run: npm test

- name: Collect coverage
run: yarn coverage
run: npm run coverage
25 changes: 0 additions & 25 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,28 +3,3 @@ dist
lib
coverage
es

.cache
.yarnrc
.yarn/*
!.yarn/patches
!.yarn/releases
!.yarn/plugins
!.yarn/sdks
!.yarn/versions
.pnp.*
*.tgz
react-redux-*/

.yalc
yalc.lock
yalc.sig

lib/core/metadata.js
lib/core/MetadataBlog.js

website/translated_docs
website/build/
website/yarn.lock
website/node_modules
website/i18n/*
9 changes: 0 additions & 9 deletions .yarn/plugins/@yarnpkg/plugin-compat.cjs

This file was deleted.

29 changes: 0 additions & 29 deletions .yarn/plugins/@yarnpkg/plugin-workspace-tools.cjs

This file was deleted.

55 changes: 0 additions & 55 deletions .yarn/releases/yarn-berry.cjs

This file was deleted.

9 changes: 0 additions & 9 deletions .yarnrc.yml

This file was deleted.

18 changes: 9 additions & 9 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,51 +20,51 @@ Fork, then clone the repo:
git clone https://github.com/your-username/react-redux.git
```

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:
This repository uses npm 7. Install dependencies with:

```
yarn install
npm install
```

### Building

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

```
yarn build
npm run build
```

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

```
yarn build:lib
npm run build:lib
```

To create just a UMD build:

```
yarn build:umd
yarn build:umd:min
npm run build:umd
npm run build:umd:min
```

### Testing and Linting

To run the tests:

```
yarn test
npm test
```

To continuously watch and run tests, run the following:

```
yarn test --watch
npm test --watch
```

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

```
yarn lint
npm run lint
```

### New Features
Expand Down
22 changes: 7 additions & 15 deletions netlify.toml
Original file line number Diff line number Diff line change
@@ -1,22 +1,14 @@
[build]
base = "website"
publish = "website/build"
command = "yarn build && cp _redirects ./build"
ignore = "git diff --quiet HEAD^ HEAD -- ../docs/ ."
base = "website"
publish = "website/build"
command = "npm install && npm run build && cp _redirects ./build"
ignore = "git diff --quiet HEAD^ HEAD -- ../docs/ ."

[build.environment]
NODE_VERSION = "14"
NODE_OPTIONS = "--max_old_space_size=4096"
NETLIFY_USE_YARN = "true"
YARN_VERSION = "1.22.10"


[[plugins]]
package = "netlify-plugin-cache"
[plugins.inputs]
paths = [
"node_modules/.cache",
"website/node_modules/.cache",
".yarn/.cache"
]

package = "netlify-plugin-cache"
[plugins.inputs]
paths = ["node_modules/.cache", "website/node_modules/.cache"]
Loading

0 comments on commit e94b191

Please sign in to comment.