From 79ce6f237735a585151932469a59826f6bfa2ed7 Mon Sep 17 00:00:00 2001 From: Anton Georgiev Date: Thu, 5 Sep 2024 13:34:53 -0400 Subject: [PATCH] chore: adjust package-lock.json and Gemfile* - reverting Gemfile* to what was working in v3.0.x-release - committing a seemingly missing portion for bbb-learning-dashboard --- bbb-learning-dashboard/package-lock.json | 8 +++--- record-and-playback/core/Gemfile | 2 +- record-and-playback/core/Gemfile.lock | 31 ++++++++---------------- 3 files changed, 15 insertions(+), 26 deletions(-) diff --git a/bbb-learning-dashboard/package-lock.json b/bbb-learning-dashboard/package-lock.json index 9ee5d6fc2c..cec5f43a95 100644 --- a/bbb-learning-dashboard/package-lock.json +++ b/bbb-learning-dashboard/package-lock.json @@ -18934,9 +18934,9 @@ } }, "node_modules/typescript": { - "version": "5.5.4", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.5.4.tgz", - "integrity": "sha512-Mtq29sKDAEYP7aljRgtPOpTvOfbwRWlS6dPRzwjdE+C0R4brX/GUyhHSecbHMFLNBLcJIPt9nl9yG5TZ1weH+Q==", + "version": "4.9.5", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.5.tgz", + "integrity": "sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==", "license": "Apache-2.0", "peer": true, "bin": { @@ -18944,7 +18944,7 @@ "tsserver": "bin/tsserver" }, "engines": { - "node": ">=14.17" + "node": ">=4.2.0" } }, "node_modules/unbox-primitive": { diff --git a/record-and-playback/core/Gemfile b/record-and-playback/core/Gemfile index 30b824093c..5bf1f8f3c5 100644 --- a/record-and-playback/core/Gemfile +++ b/record-and-playback/core/Gemfile @@ -26,7 +26,7 @@ gem 'journald-logger', '~> 3.0' gem 'jwt', '~> 2.2' gem 'locale', '~> 2.1' gem 'loofah', '~> 2.19.1' -gem 'nokogiri', '~> 1.16.5' +gem 'nokogiri', '~> 1.13.10', '>= 1.13.10' gem 'open4', '~> 1.3' gem 'rb-inotify', '~> 0.10' gem 'redis', '~> 4.1' diff --git a/record-and-playback/core/Gemfile.lock b/record-and-playback/core/Gemfile.lock index fad0c2d378..73174d239c 100644 --- a/record-and-playback/core/Gemfile.lock +++ b/record-and-playback/core/Gemfile.lock @@ -2,30 +2,21 @@ GEM remote: https://rubygems.org/ specs: absolute_time (1.0.0) - activesupport (7.1.3.2) - base64 - bigdecimal + activesupport (7.0.5) concurrent-ruby (~> 1.0, >= 1.0.2) - connection_pool (>= 2.2.5) - drb i18n (>= 1.6, < 2) minitest (>= 5.1) - mutex_m tzinfo (~> 2.0) ast (2.4.2) - base64 (0.2.0) bbbevents (2.0.0) activesupport (>= 5.0.0.1, < 8) rexml - bigdecimal (3.1.7) builder (3.2.4) - concurrent-ruby (1.2.3) - connection_pool (2.4.1) + concurrent-ruby (1.2.2) crass (1.0.6) - drb (2.2.1) fastimage (2.2.6) ffi (1.15.5) - i18n (1.14.4) + i18n (1.14.1) concurrent-ruby (~> 1.0) java_properties (0.0.4) journald-logger (3.1.0) @@ -37,15 +28,14 @@ GEM loofah (2.19.1) crass (~> 1.0.2) nokogiri (>= 1.5.9) - mini_portile2 (2.8.6) + mini_portile2 (2.8.0) minitest (5.14.4) mono_logger (1.1.2) multi_json (1.15.0) mustermann (3.0.0) ruby2_keywords (~> 0.0.1) - mutex_m (0.2.0) - nokogiri (1.16.5) - mini_portile2 (~> 2.8.2) + nokogiri (1.13.10) + mini_portile2 (~> 2.8.0) racc (~> 1.4) open4 (1.3.4) optimist (3.0.1) @@ -87,11 +77,10 @@ GEM ruby-progressbar (1.13.0) ruby2_keywords (0.0.5) rubyzip (2.3.2) - sinatra (4.0.0) + sinatra (3.1.0) mustermann (~> 3.0) - rack (>= 3.0.0, < 4) - rack-protection (= 4.0.0) - rack-session (>= 2.0.0, < 3) + rack (~> 2.2, >= 2.2.4) + rack-protection (= 3.1.0) tilt (~> 2.0) strscan (3.1.0) tilt (2.2.0) @@ -113,7 +102,7 @@ DEPENDENCIES locale (~> 2.1) loofah (~> 2.19.1) minitest (~> 5.14.1) - nokogiri (~> 1.16.5) + nokogiri (~> 1.13.10, >= 1.13.10) open4 (~> 1.3) optimist rake (>= 12.3, < 14)