Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 5 additions & 28 deletions .babelrc
Original file line number Diff line number Diff line change
@@ -1,33 +1,10 @@
{
"plugins": [
"transform-object-assign",
"transform-object-rest-spread"
"@babel/transform-object-assign",
"@babel/plugin-proposal-object-rest-spread",
],
"presets": [
[
"env",
{
"targets": {
"browsers": [
"last 2 versions",
"IE >= 11"
]
},
"modules": false
}
],
"babel-preset-react"
],
"env": {
"test": {
"presets": [
[
"env",
{
"modules": "commonjs",
}
]
]
}
},
"@babel/react",
"@babel/preset-env"
]
}
2 changes: 1 addition & 1 deletion .eslintrc.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"extends": "eslint-config-edx-es5",
"extends": "@edx/eslint-config",
"globals": { // Try to avoid adding any new globals.
// Old compatibility things and hacks
"edx": true,
Expand Down
5 changes: 4 additions & 1 deletion .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 ]
node-version: [ 12, 14, 16 ]
python-version: [ 3.8 ]

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

- name: Setup npm
run: npm i -g npm@8.5.x

- name: Install Firefox 61.0
run: |
sudo apt-get purge firefox
Expand Down
5 changes: 4 additions & 1 deletion .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 ]
node-version: [ 12, 14, 16 ]

steps:

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

- name: Setup npm
run: npm i -g npm@8.5.x

- 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=12.11.1 --prebuilt
RUN nodeenv /edx/app/edxapp/nodeenv --node=16.14.0 --npm=8.5.x --prebuilt
COPY package.json package.json
COPY package-lock.json package-lock.json
RUN npm set progress=false && npm install
Expand Down
3 changes: 2 additions & 1 deletion jest.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,12 @@ module.exports = {
"modulePaths": [
"common/static/common/js/components",
],
"setupTestFrameworkScriptFile": "<rootDir>/setupTests.js",
"setupFilesAfterEnv": ["<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