Skip to content

Commit

Permalink
Merge pull request #317 from sbates-idrc/C2LC-575
Browse files Browse the repository at this point in the history
C2LC-575: Update react-scripts to version 5
  • Loading branch information
sbates-idrc authored Jan 24, 2022
2 parents 6b5e7e1 + fbd2b4e commit 5c0cfa5
Show file tree
Hide file tree
Showing 7 changed files with 4,263 additions and 9,621 deletions.
14 changes: 0 additions & 14 deletions .flowcoverage-all

This file was deleted.

15 changes: 0 additions & 15 deletions .flowcoverage-main-threshold

This file was deleted.

13 changes: 0 additions & 13 deletions .flowcoverage-tests-threshold

This file was deleted.

14 changes: 1 addition & 13 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-18.04]
node-version: [12.x, 14.x]
node-version: [14.x, 16.x]
runs-on: ${{ matrix.os }}
env:
CI: true
Expand Down Expand Up @@ -37,14 +37,6 @@ jobs:
run: npm run build
- name: Flow
run: npx flow check
- name: Flow Type Coverage (HTML report)
run: npx flow-coverage-report --config .flowcoverage-all
- name: Archive Flow Type Coverage Report
continue-on-error: true
uses: actions/upload-artifact@v2
with:
name: Flow Type Coverage Report
path: flow-coverage/
- name: Test
run: npm test -- --verbose --coverage
- name: Archive Test Code Coverage Report
Expand All @@ -53,9 +45,5 @@ jobs:
with:
name: Test Code Coverage Report
path: coverage/
- name: Flow Type Coverage (main coverage threshold)
run: npx flow-coverage-report --config .flowcoverage-main-threshold
- name: Flow Type Coverage (test coverage threshold)
run: npx flow-coverage-report --config .flowcoverage-tests-threshold
- name: Lint Documentation
run: npm run markdownlint
2 changes: 1 addition & 1 deletion netlify.toml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[build]
environment = { NODE_VERSION = "12" }
environment = { NODE_VERSION = "14" }
command = "npm run netlify-build"
publish = "build/"
13,820 changes: 4,258 additions & 9,562 deletions package-lock.json

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,18 +7,17 @@
"classnames": "2.3.1",
"enzyme": "3.11.0",
"enzyme-adapter-react-16": "1.15.6",
"node-sass": "4.14.1",
"node-sass": "7.0.1",
"react": "16.14.0",
"react-bootstrap": "1.6.4",
"react-dom": "16.14.0",
"react-intl": "5.22.0",
"react-scripts": "4.0.3",
"react-scripts": "5.0.0",
"tone": "14.7.77",
"typeface-roboto": "1.1.13"
},
"devDependencies": {
"flow-bin": "0.142.0",
"flow-coverage-report": "0.8.0",
"markdownlint-cli2": "0.3.2"
},
"scripts": {
Expand Down Expand Up @@ -57,6 +56,7 @@
"args": "after-used"
}
],
"no-use-before-define": "off",
"no-var": "error",
"prefer-const": "error"
}
Expand Down

0 comments on commit 5c0cfa5

Please sign in to comment.