feat: node16 upgrade (#30249)
This commit is contained in:
committed by
GitHub
parent
d8f282737c
commit
f10ebf0752
33
.babelrc
33
.babelrc
@@ -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"
|
||||
]
|
||||
}
|
||||
|
||||
@@ -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,
|
||||
|
||||
5
.github/workflows/js-tests.yml
vendored
5
.github/workflows/js-tests.yml
vendored
@@ -15,7 +15,7 @@ jobs:
|
||||
strategy:
|
||||
matrix:
|
||||
os: [ ubuntu-20.04 ]
|
||||
node-version: [ 12 ]
|
||||
node-version: [ 12, 14, 16 ]
|
||||
python-version: [ 3.8 ]
|
||||
|
||||
steps:
|
||||
@@ -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
|
||||
|
||||
5
.github/workflows/quality-checks.yml
vendored
5
.github/workflows/quality-checks.yml
vendored
@@ -15,7 +15,7 @@ jobs:
|
||||
matrix:
|
||||
os: [ ubuntu-20.04 ]
|
||||
python-version: [ 3.8 ]
|
||||
node-version: [ 12 ]
|
||||
node-version: [ 12, 14, 16 ]
|
||||
|
||||
steps:
|
||||
|
||||
@@ -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: |
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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",
|
||||
|
||||
58353
package-lock.json
generated
58353
package-lock.json
generated
File diff suppressed because it is too large
Load Diff
36
package.json
36
package.json
@@ -3,21 +3,21 @@
|
||||
"version": "0.1.0",
|
||||
"repository": "https://github.com/edx/edx-platform",
|
||||
"dependencies": {
|
||||
"@edx/brand-edx.org": "^1.3.3",
|
||||
"@babel/core": "7.17.8",
|
||||
"@babel/plugin-proposal-object-rest-spread": "^7.0.0",
|
||||
"@babel/plugin-transform-object-assign": "^7.0.0",
|
||||
"@babel/preset-env": "^7.16.11",
|
||||
"@babel/preset-react": "7.16.7",
|
||||
"@edx/brand-edx.org": "^2.0.3",
|
||||
"@edx/edx-bootstrap": "1.0.4",
|
||||
"@edx/edx-proctoring": "^4.8.2",
|
||||
"@edx/frontend-component-cookie-policy-banner": "1.0.0",
|
||||
"@edx/edx-proctoring": "^4.10.2",
|
||||
"@edx/frontend-component-cookie-policy-banner": "2.1.14",
|
||||
"@edx/paragon": "2.6.4",
|
||||
"@edx/studio-frontend": "^1.17.0",
|
||||
"@edx/studio-frontend": "^1.18.2",
|
||||
"axios": "^0.21.1",
|
||||
"babel-core": "6.26.0",
|
||||
"babel-loader": "6.4.1",
|
||||
"babel-loader": "8.2.4",
|
||||
"babel-plugin-transform-class-properties": "6.24.1",
|
||||
"babel-plugin-transform-object-assign": "6.22.0",
|
||||
"babel-plugin-transform-object-rest-spread": "6.26.0",
|
||||
"babel-polyfill": "6.26.0",
|
||||
"babel-preset-env": "1.6.1",
|
||||
"babel-preset-react": "6.24.1",
|
||||
"backbone": "1.4.0",
|
||||
"backbone-associations": "0.6.2",
|
||||
"backbone.paginator": "2.0.8",
|
||||
@@ -29,6 +29,7 @@
|
||||
"datatables.net-fixedcolumns": "3.2.6",
|
||||
"edx-proctoring-proctortrack": "git+https://git@github.com/anupdhabarde/edx-proctoring-proctortrack.git#9b55ea63a3f670bcfbdb5870241510746252ee41",
|
||||
"edx-ui-toolkit": "1.5.2",
|
||||
"es-check": "^6.2.1",
|
||||
"exports-loader": "0.6.4",
|
||||
"extract-text-webpack-plugin": "2.1.2",
|
||||
"file-loader": "1.1.6",
|
||||
@@ -42,7 +43,6 @@
|
||||
"jwt-decode": "^2.2.0",
|
||||
"moment": "2.20.1",
|
||||
"moment-timezone": "0.5.14",
|
||||
"node-sass": "4.12.0",
|
||||
"picturefill": "3.0.2",
|
||||
"popper.js": "1.12.9",
|
||||
"prop-types": "15.6.0",
|
||||
@@ -57,6 +57,7 @@
|
||||
"redux-thunk": "2.2.0",
|
||||
"requirejs": "2.3.5",
|
||||
"rtlcss": "2.2.1",
|
||||
"sass": "^1.49.10",
|
||||
"sass-loader": "6.0.6",
|
||||
"scriptjs": "2.5.8",
|
||||
"string-replace-webpack-plugin": "0.1.3",
|
||||
@@ -73,18 +74,17 @@
|
||||
"which-country": "1.0.0"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@edx/mockprock": "^1.0.1",
|
||||
"@edx/stylelint-config-edx": "1.1.0",
|
||||
"babel-jest": "23.0.1",
|
||||
"edx-custom-a11y-rules": "1.0.6",
|
||||
"@edx/eslint-config": "^2.0.0",
|
||||
"@edx/mockprock": "^1.0.2",
|
||||
"@edx/stylelint-config-edx": "2.0.0",
|
||||
"babel-jest": "27.5.1",
|
||||
"edx-custom-a11y-rules": "2.0.1",
|
||||
"enzyme": "3.3.0",
|
||||
"enzyme-adapter-react-16": "1.1.1",
|
||||
"eslint-config-edx": "3.0.1",
|
||||
"eslint-config-edx-es5": "2.0.0",
|
||||
"eslint-import-resolver-webpack": "0.8.4",
|
||||
"jasmine-core": "2.6.4",
|
||||
"jasmine-jquery": "git+https://github.com/velesin/jasmine-jquery.git#ebad463d592d3fea00c69f26ea18a930e09c7b58",
|
||||
"jest": "23.1.0",
|
||||
"jest": "27.5.1",
|
||||
"jest-enzyme": "6.0.2",
|
||||
"karma": "0.13.22",
|
||||
"karma-chrome-launcher": "0.2.3",
|
||||
|
||||
Reference in New Issue
Block a user