Skip to content

Commit ff48125

Browse files
author
Feanil Patel
authored
Merge pull request #34503 from brian-smith-tcril/revert-revert-node-18
revert: revert: "chore: upgrade to node 18" (#34496)
2 parents 9738f61 + 27d33d4 commit ff48125

12 files changed

+28695
-33564
lines changed

.github/workflows/js-tests.yml

+5-5
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
strategy:
1414
matrix:
1515
os: [ ubuntu-20.04 ]
16-
node-version: [ 16 ]
16+
node-version: [ 18 ]
1717
python-version: [ 3.8 ]
1818

1919
steps:
@@ -28,13 +28,13 @@ jobs:
2828
node-version: ${{ matrix.node-version }}
2929

3030
- name: Setup npm
31-
run: npm i -g npm@8.5.x
31+
run: npm i -g npm@10.5.x
3232

33-
- name: Install Firefox 61.0
33+
- name: Install Firefox 123.0
3434
run: |
3535
sudo apt-get purge firefox
36-
wget "https://ftp.mozilla.org/pub/firefox/releases/61.0/linux-x86_64/en-US/firefox-61.0.tar.bz2"
37-
tar -xjf firefox-61.0.tar.bz2
36+
wget "https://ftp.mozilla.org/pub/firefox/releases/123.0/linux-x86_64/en-US/firefox-123.0.tar.bz2"
37+
tar -xjf firefox-123.0.tar.bz2
3838
sudo mv firefox /opt/firefox
3939
sudo ln -s /opt/firefox/firefox /usr/bin/firefox
4040

.github/workflows/lockfileversion-check.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@ on:
1010

1111
jobs:
1212
version-check:
13-
uses: openedx/.github/.github/workflows/lockfileversion-check.yml@master
13+
uses: openedx/.github/.github/workflows/lockfileversion-check-v3.yml@master

.github/workflows/static-assets-check.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ jobs:
1414
matrix:
1515
os: [ ubuntu-20.04 ]
1616
python-version: [ 3.8 ]
17-
node-version: [ 16 ]
18-
npm-version: [ 8.5.x ]
17+
node-version: [ 18 ]
18+
npm-version: [ 10.5.x ]
1919
mongo-version: ["4.4", "7.0"]
2020

2121
services:

.nvmrc

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
18

Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -114,8 +114,8 @@ RUN pip install -r requirements/pip.txt
114114
RUN pip install -r requirements/edx/base.txt
115115

116116
# Install node and npm
117-
RUN nodeenv /edx/app/edxapp/nodeenv --node=16.14.0 --prebuilt
118-
RUN npm install -g npm@8.5.x
117+
RUN nodeenv /edx/app/edxapp/nodeenv --node=18.19.0 --prebuilt
118+
RUN npm install -g npm@10.5.x
119119

120120
# This script is used by an npm post-install hook.
121121
# We copy it into the image now so that it will be available when we run `npm install` in the next step.

common/static/common/js/karma.common.conf.js

-15
Original file line numberDiff line numberDiff line change
@@ -49,17 +49,6 @@ var firefox = require('selenium-webdriver/firefox');
4949

5050
var webpackConfig = require(path.join(appRoot, 'webpack.dev.config.js'));
5151

52-
// The following crazy bit is to work around the webpack.optimize.CommonsChunkPlugin
53-
// plugin. The problem is that it it factors out the code that defines webpackJsonp
54-
// and puts in in the commons JS, which Karma doesn't know to load first. This is a
55-
// workaround recommended in the karma-webpack bug report that basically just removes
56-
// the plugin for the purposes of Karma testing (the plugin is meant to be an
57-
// optimization only).
58-
// https://github.com/webpack-contrib/karma-webpack/issues/24#issuecomment-257613167
59-
//
60-
// This should be fixed in v3 of karma-webpack
61-
var commonsChunkPluginIndex = webpackConfig[0].plugins.findIndex(function(plugin) { return plugin.chunkNames; });
62-
6352
// Files which are needed by all lms/cms suites.
6453
var commonFiles = {
6554
libraryFiles: [
@@ -83,10 +72,6 @@ var commonFiles = {
8372
]
8473
};
8574

86-
webpackConfig[0].plugins.splice(commonsChunkPluginIndex, 1);
87-
88-
delete webpackConfig[0].entry;
89-
9075
/**
9176
* Customize the name attribute in xml testcase element
9277
* @param {Object} browser

0 commit comments

Comments
 (0)