Node Upgrade (#30420)

* feat: Node16 upgrade
This commit is contained in:
Mohammad Ahtasham ul Hassan
2022-05-18 16:12:34 +05:00
committed by GitHub
parent ffb9c5dfa2
commit f801deaae5
7 changed files with 53965 additions and 10430 deletions

View File

@@ -1,33 +1,10 @@
{ {
"plugins": [ "plugins": [
"transform-object-assign", "@babel/transform-object-assign",
"transform-object-rest-spread" "@babel/plugin-proposal-object-rest-spread",
],
"presets": [
[
"env",
{
"targets": {
"browsers": [
"last 2 versions",
"IE >= 11"
]
},
"modules": false
}
], ],
"babel-preset-react" "presets": [
], "@babel/react",
"env": { "@babel/preset-env"
"test": { ]
"presets": [
[
"env",
{
"modules": "commonjs",
}
]
]
}
},
} }

View File

@@ -15,7 +15,7 @@ jobs:
strategy: strategy:
matrix: matrix:
os: [ ubuntu-20.04 ] os: [ ubuntu-20.04 ]
node-version: [ 12 ] node-version: [ 12, 14, 16 ]
python-version: [ 3.8 ] python-version: [ 3.8 ]
steps: steps:
@@ -28,6 +28,9 @@ jobs:
uses: actions/setup-node@v2 uses: actions/setup-node@v2
with: with:
node-version: ${{ matrix.node-version }} node-version: ${{ matrix.node-version }}
- name: Setup npm
run: npm i -g npm@8.5.x
- name: Install Firefox 61.0 - name: Install Firefox 61.0
run: | run: |

View File

@@ -15,8 +15,8 @@ jobs:
matrix: matrix:
os: [ ubuntu-20.04 ] os: [ ubuntu-20.04 ]
python-version: [ 3.8 ] python-version: [ 3.8 ]
node-version: [ 12 ] node-version: [ 12, 14, 16 ]
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
@@ -39,6 +39,9 @@ jobs:
with: with:
node-version: ${{ matrix.node-version }} node-version: ${{ matrix.node-version }}
- name: Setup npm
run: npm i -g npm@8.5.x
- name: Get pip cache dir - name: Get pip cache dir
id: pip-cache-dir id: pip-cache-dir
run: | run: |

View File

@@ -106,6 +106,7 @@ RUN pip install -r requirements/edx/base-minus-local.txt
# via pip. # via pip.
# The node environment is already 'activated' because its .../bin was put on $PATH. # 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=12.11.1 --prebuilt
RUN npm install -g npm@8.5.x
COPY package.json package.json COPY package.json package.json
COPY package-lock.json package-lock.json COPY package-lock.json package-lock.json
RUN npm set progress=false && npm install RUN npm set progress=false && npm install

View File

@@ -1,17 +1,18 @@
module.exports = { module.exports = {
"globals": { "globals": {
"gettext": (t) => { return t; }, "gettext": (t) => { return t; },
}, },
"modulePaths": [ "modulePaths": [
"common/static/common/js/components", "common/static/common/js/components",
], ],
"setupTestFrameworkScriptFile": "<rootDir>/setupTests.js", "setupFilesAfterEnv": ["<rootDir>/setupTests.js"],
"testMatch": [ "testMatch": [
"/**/*.test.jsx", "/**/*.test.jsx",
"common/static/common/js/components/**/?(*.)+(spec|test).js?(x)", "common/static/common/js/components/**/?(*.)+(spec|test).js?(x)",
], ],
"transform": { "testEnvironment": "jsdom",
"^.+\\.jsx$": "babel-jest", "transform": {
"^.+\\.js$": "babel-jest", "^.+\\.jsx$": "babel-jest",
}, "^.+\\.js$": "babel-jest",
},
}; };

64293
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@@ -3,21 +3,21 @@
"version": "0.1.0", "version": "0.1.0",
"repository": "https://github.com/edx/edx-platform", "repository": "https://github.com/edx/edx-platform",
"dependencies": { "dependencies": {
"@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": "^1.3.3", "@edx/brand-edx.org": "^1.3.3",
"@edx/edx-bootstrap": "1.0.4", "@edx/edx-bootstrap": "1.0.4",
"@edx/edx-proctoring": "^4.8.2", "@edx/edx-proctoring": "^4.8.2",
"@edx/frontend-component-cookie-policy-banner": "1.0.0", "@edx/frontend-component-cookie-policy-banner": "1.0.0",
"@edx/paragon": "2.6.4", "@edx/paragon": "2.6.4",
"@edx/studio-frontend": "^1.17.0", "@edx/studio-frontend": "^1.19.1",
"axios": "^0.21.1", "axios": "^0.21.1",
"babel-core": "6.26.0", "babel-loader": "8.2.4",
"babel-loader": "6.4.1",
"babel-plugin-transform-class-properties": "6.24.1", "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-polyfill": "6.26.0",
"babel-preset-env": "1.6.1",
"babel-preset-react": "6.24.1",
"backbone": "1.4.0", "backbone": "1.4.0",
"backbone-associations": "0.6.2", "backbone-associations": "0.6.2",
"backbone.paginator": "2.0.8", "backbone.paginator": "2.0.8",
@@ -35,6 +35,7 @@
"font-awesome": "4.7.0", "font-awesome": "4.7.0",
"hls.js": "0.14.17", "hls.js": "0.14.17",
"imports-loader": "0.7.1", "imports-loader": "0.7.1",
"jest-environment-jsdom": "^26.0.0",
"jquery": "2.2.4", "jquery": "2.2.4",
"jquery-migrate": "1.4.1", "jquery-migrate": "1.4.1",
"jquery.scrollto": "2.1.2", "jquery.scrollto": "2.1.2",
@@ -42,7 +43,6 @@
"jwt-decode": "^2.2.0", "jwt-decode": "^2.2.0",
"moment": "2.20.1", "moment": "2.20.1",
"moment-timezone": "0.5.14", "moment-timezone": "0.5.14",
"node-sass": "4.12.0",
"picturefill": "3.0.2", "picturefill": "3.0.2",
"popper.js": "1.12.9", "popper.js": "1.12.9",
"prop-types": "15.6.0", "prop-types": "15.6.0",
@@ -57,6 +57,7 @@
"redux-thunk": "2.2.0", "redux-thunk": "2.2.0",
"requirejs": "2.3.5", "requirejs": "2.3.5",
"rtlcss": "2.2.1", "rtlcss": "2.2.1",
"sass": "^1.49.10",
"sass-loader": "6.0.6", "sass-loader": "6.0.6",
"scriptjs": "2.5.8", "scriptjs": "2.5.8",
"string-replace-webpack-plugin": "0.1.3", "string-replace-webpack-plugin": "0.1.3",
@@ -75,7 +76,7 @@
"devDependencies": { "devDependencies": {
"@edx/mockprock": "^1.0.1", "@edx/mockprock": "^1.0.1",
"@edx/stylelint-config-edx": "1.1.0", "@edx/stylelint-config-edx": "1.1.0",
"babel-jest": "23.0.1", "babel-jest": "26.0.0",
"edx-custom-a11y-rules": "1.0.6", "edx-custom-a11y-rules": "1.0.6",
"enzyme": "3.3.0", "enzyme": "3.3.0",
"enzyme-adapter-react-16": "1.1.1", "enzyme-adapter-react-16": "1.1.1",
@@ -84,7 +85,7 @@
"eslint-import-resolver-webpack": "0.8.4", "eslint-import-resolver-webpack": "0.8.4",
"jasmine-core": "2.6.4", "jasmine-core": "2.6.4",
"jasmine-jquery": "git+https://github.com/velesin/jasmine-jquery.git#ebad463d592d3fea00c69f26ea18a930e09c7b58", "jasmine-jquery": "git+https://github.com/velesin/jasmine-jquery.git#ebad463d592d3fea00c69f26ea18a930e09c7b58",
"jest": "23.1.0", "jest": "26.0.0",
"jest-enzyme": "6.0.2", "jest-enzyme": "6.0.2",
"karma": "0.13.22", "karma": "0.13.22",
"karma-chrome-launcher": "0.2.3", "karma-chrome-launcher": "0.2.3",