Skip to content

Commit

Permalink
Revert "feat: node16 upgrade (#30249)" (#30268)
Browse files Browse the repository at this point in the history
This reverts commit f10ebf0.
  • Loading branch information
aht007 authored Apr 18, 2022
1 parent f10ebf0 commit e84187b
Show file tree
Hide file tree
Showing 8 changed files with 11,464 additions and 49,895 deletions.
33 changes: 28 additions & 5 deletions .babelrc
Original file line number Diff line number Diff line change
@@ -1,10 +1,33 @@
{
"plugins": [
"@babel/transform-object-assign",
"@babel/plugin-proposal-object-rest-spread",
"transform-object-assign",
"transform-object-rest-spread"
],
"presets": [
"@babel/react",
"@babel/preset-env"
]
[
"env",
{
"targets": {
"browsers": [
"last 2 versions",
"IE >= 11"
]
},
"modules": false
}
],
"babel-preset-react"
],
"env": {
"test": {
"presets": [
[
"env",
{
"modules": "commonjs",
}
]
]
}
},
}
2 changes: 1 addition & 1 deletion .eslintrc.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"extends": "@edx/eslint-config",
"extends": "eslint-config-edx-es5",
"globals": { // Try to avoid adding any new globals.
// Old compatibility things and hacks
"edx": true,
Expand Down
5 changes: 1 addition & 4 deletions .github/workflows/js-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
strategy:
matrix:
os: [ ubuntu-20.04 ]
node-version: [ 12, 14, 16 ]
node-version: [ 12 ]
python-version: [ 3.8 ]

steps:
Expand All @@ -29,9 +29,6 @@ jobs:
with:
node-version: ${{ matrix.node-version }}

- name: Setup npm
run: npm i -g [email protected]

- name: Install Firefox 61.0
run: |
sudo apt-get purge firefox
Expand Down
5 changes: 1 addition & 4 deletions .github/workflows/quality-checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
matrix:
os: [ ubuntu-20.04 ]
python-version: [ 3.8 ]
node-version: [ 12, 14, 16 ]
node-version: [ 12 ]

steps:

Expand All @@ -39,9 +39,6 @@ jobs:
with:
node-version: ${{ matrix.node-version }}

- name: Setup npm
run: npm i -g [email protected]

- name: Get pip cache dir
id: pip-cache-dir
run: |
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ RUN pip install -r requirements/edx/base-minus-local.txt
# Must be done after Python requirements, since nodeenv is installed
# via pip.
# The node environment is already 'activated' because its .../bin was put on $PATH.
RUN nodeenv /edx/app/edxapp/nodeenv --node=16.14.0 --npm=8.5.x --prebuilt
RUN nodeenv /edx/app/edxapp/nodeenv --node=12.11.1 --prebuilt
COPY package.json package.json
COPY package-lock.json package-lock.json
RUN npm set progress=false && npm install
Expand Down
3 changes: 1 addition & 2 deletions jest.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,11 @@ module.exports = {
"modulePaths": [
"common/static/common/js/components",
],
"setupFilesAfterEnv": ["<rootDir>/setupTests.js"],
"setupTestFrameworkScriptFile": "<rootDir>/setupTests.js",
"testMatch": [
"/**/*.test.jsx",
"common/static/common/js/components/**/?(*.)+(spec|test).js?(x)",
],
"testEnvironment": "jsdom",
"transform": {
"^.+\\.jsx$": "babel-jest",
"^.+\\.js$": "babel-jest",
Expand Down
Loading

0 comments on commit e84187b

Please sign in to comment.