Skip to content

Commit

Permalink
Revert "revert: revert: "chore: upgrade to node 18" (#34496)"
Browse files Browse the repository at this point in the history
  • Loading branch information
dianakhuang authored Apr 23, 2024
1 parent bf19fe2 commit dbabbfe
Show file tree
Hide file tree
Showing 12 changed files with 33,747 additions and 28,878 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/js-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
strategy:
matrix:
os: [ ubuntu-20.04 ]
node-version: [ 18 ]
node-version: [ 16 ]
python-version: [ 3.8 ]

steps:
Expand All @@ -28,13 +28,13 @@ jobs:
node-version: ${{ matrix.node-version }}

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

- name: Install Firefox 123.0
- name: Install Firefox 61.0
run: |
sudo apt-get purge firefox
wget "https://ftp.mozilla.org/pub/firefox/releases/123.0/linux-x86_64/en-US/firefox-123.0.tar.bz2"
tar -xjf firefox-123.0.tar.bz2
wget "https://ftp.mozilla.org/pub/firefox/releases/61.0/linux-x86_64/en-US/firefox-61.0.tar.bz2"
tar -xjf firefox-61.0.tar.bz2
sudo mv firefox /opt/firefox
sudo ln -s /opt/firefox/firefox /usr/bin/firefox
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/lockfileversion-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@ on:

jobs:
version-check:
uses: openedx/.github/.github/workflows/lockfileversion-check-v3.yml@master
uses: openedx/.github/.github/workflows/lockfileversion-check.yml@master
4 changes: 2 additions & 2 deletions .github/workflows/static-assets-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ jobs:
matrix:
os: [ ubuntu-20.04 ]
python-version: [ 3.8 ]
node-version: [ 18 ]
npm-version: [ 10.5.x ]
node-version: [ 16 ]
npm-version: [ 8.5.x ]
mongo-version: ["4.4", "7.0"]

services:
Expand Down
1 change: 0 additions & 1 deletion .nvmrc

This file was deleted.

4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -114,8 +114,8 @@ RUN pip install -r requirements/pip.txt
RUN pip install -r requirements/edx/base.txt

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

# This script is used by an npm post-install hook.
# We copy it into the image now so that it will be available when we run `npm install` in the next step.
Expand Down
15 changes: 15 additions & 0 deletions common/static/common/js/karma.common.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,17 @@ var firefox = require('selenium-webdriver/firefox');

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

// The following crazy bit is to work around the webpack.optimize.CommonsChunkPlugin
// plugin. The problem is that it it factors out the code that defines webpackJsonp
// and puts in in the commons JS, which Karma doesn't know to load first. This is a
// workaround recommended in the karma-webpack bug report that basically just removes
// the plugin for the purposes of Karma testing (the plugin is meant to be an
// optimization only).
// https://github.com/webpack-contrib/karma-webpack/issues/24#issuecomment-257613167
//
// This should be fixed in v3 of karma-webpack
var commonsChunkPluginIndex = webpackConfig[0].plugins.findIndex(function(plugin) { return plugin.chunkNames; });

// Files which are needed by all lms/cms suites.
var commonFiles = {
libraryFiles: [
Expand All @@ -72,6 +83,10 @@ var commonFiles = {
]
};

webpackConfig[0].plugins.splice(commonsChunkPluginIndex, 1);

delete webpackConfig[0].entry;

/**
* Customize the name attribute in xml testcase element
* @param {Object} browser
Expand Down
Loading

0 comments on commit dbabbfe

Please sign in to comment.