Skip to content

Commit

Permalink
uprade nodejs to v14
Browse files Browse the repository at this point in the history
This upgrades nodejs to v14.18.2. This This isn't fully updated (current
version is 17.x.x) but this will get us to the point where we can
upgrade yarn to v3 and run some other upgrades that will then, I think,
let us upgrade to a more recent nodejs version and so on. We're climbing
the ladder here :)

part of #5129
pr #5130
  • Loading branch information
alicewriteswrongs committed Jan 4, 2022
1 parent aee034e commit 9f45e86
Show file tree
Hide file tree
Showing 5 changed files with 400 additions and 235 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ jobs:
- name: Set up NodeJS
uses: actions/setup-node@v2-beta
with:
node-version: "10.15.1"
node-version: "14.18.2"

- name: Set up environment
run: sudo apt-get install libelf1
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile-node
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM node:10.15.1
FROM node:14.18.2
LABEL maintainer "ODL DevOps <[email protected]>"

RUN apt-get update && apt-get install libelf1
Expand Down
13 changes: 7 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"awesome-phonenumber": "^2.35.0",
"axios-mock-adapter": "^1.8.1",
"babel-core": "^6.24.1",
"babel-eslint": "^8.1.1",
"babel-eslint": "^10.1.0",
"babel-loader": "^7.0.0",
"babel-plugin-jsx": "^1.2.0",
"babel-plugin-syntax-dynamic-import": "^6.18.0",
Expand Down Expand Up @@ -47,15 +47,16 @@
"diacritics": "^1.3.0",
"draft-js": "^0.10.1",
"draft-js-export-html": "^1.4.1",
"eslint": "6.6.0",
"eslint": "7",
"eslint-config-defaults": "9.0.0",
"eslint-config-google": "^0.9.1",
"eslint-config-mitodl": "0.0.7",
"eslint-config-mitodl": "0.1.0",
"eslint-plugin-babel": "^4.1.1",
"eslint-plugin-flow-vars": "^0.5.0",
"eslint-plugin-flowtype": "^2.35.1",
"eslint-plugin-mocha": "4.11.0",
"eslint-plugin-react": "7.1.0",
"eslint-plugin-react-hooks": "4",
"express": "^4.15.3",
"fetch-mock": "^5.11.0",
"file-loader": "^0.11.1",
Expand All @@ -79,7 +80,7 @@
"nyc": "^15.0.0",
"object.entries": "^1.0.4",
"postcss-loader": "^2.0.5",
"prettier-eslint-cli": "^5.0.0",
"prettier-eslint-cli": "^5.0.1",
"prop-types": "^15.5.10",
"ramda": "^0.24.0",
"react": "~16.8",
Expand Down Expand Up @@ -133,8 +134,8 @@
"webpack-hot-middleware": "^2.17.1"
},
"engines": {
"node": "10.15.1",
"yarn": "1.13.0"
"node": "14.18.2",
"yarn": "1.22.15"
},
"scripts": {
"postinstall": "./webpack_if_prod.sh",
Expand Down
2 changes: 2 additions & 0 deletions static/js/global_init.js
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,9 @@ const FakeTransition = ({ children }) => children()
const FakeCSSTransition = props =>
props.in ? <FakeTransition>{props.children}</FakeTransition> : null
// adapted from https://testing-library.com/docs/example-react-transition-group
// eslint-disable-next-line no-import-assign
ReactTransitionGroup.Transition = FakeTransition
// eslint-disable-next-line no-import-assign
ReactTransitionGroup.CSSTransition = FakeCSSTransition

// eslint-disable-next-line mocha/no-top-level-hooks
Expand Down
Loading

0 comments on commit 9f45e86

Please sign in to comment.