From 2da05d74db2b65417893746de55496d2fc86f572 Mon Sep 17 00:00:00 2001 From: Paul Sernatinger Date: Mon, 14 Nov 2022 08:30:30 -0600 Subject: [PATCH 0001/1259] Specs all passing --- .ruby-version | 2 +- Gemfile | 47 +++--- Gemfile.lock | 145 +++++++++--------- docs/maintainers.md | 1 + lib/app.rb | 17 +- lib/docs/core/request.rb | 2 +- lib/docs/core/requester.rb | 16 +- lib/docs/core/scraper.rb | 2 +- lib/tasks/updates.thor | 2 +- test/lib/docs/core/doc_test.rb | 10 +- test/lib/docs/core/entry_index_test.rb | 4 +- test/lib/docs/core/filter_test.rb | 6 +- test/lib/docs/core/instrumentable_test.rb | 4 +- test/lib/docs/core/manifest_test.rb | 4 +- test/lib/docs/core/models/entry_test.rb | 4 +- test/lib/docs/core/models/type_test.rb | 4 +- test/lib/docs/core/parser_test.rb | 4 +- test/lib/docs/core/request_test.rb | 8 +- test/lib/docs/core/requester_test.rb | 8 +- test/lib/docs/core/response_test.rb | 4 +- test/lib/docs/core/scraper_test.rb | 6 +- .../docs/core/scrapers/file_scraper_test.rb | 4 +- .../docs/core/scrapers/url_scraper_test.rb | 14 +- test/lib/docs/core/url_test.rb | 4 +- .../docs/filters/core/apply_base_url_test.rb | 4 +- test/lib/docs/filters/core/clean_html_test.rb | 4 +- test/lib/docs/filters/core/clean_text_test.rb | 4 +- test/lib/docs/filters/core/container_test.rb | 4 +- test/lib/docs/filters/core/entries_test.rb | 4 +- test/lib/docs/filters/core/inner_html_test.rb | 4 +- .../docs/filters/core/internal_urls_test.rb | 4 +- .../docs/filters/core/normalize_paths_test.rb | 4 +- .../docs/filters/core/normalize_urls_test.rb | 4 +- .../docs/filters/core/parse_cf_email_test.rb | 4 +- test/lib/docs/filters/core/title_test.rb | 4 +- test/lib/docs/storage/abstract_store_test.rb | 6 +- test/lib/docs/storage/file_store_test.rb | 4 +- 37 files changed, 198 insertions(+), 178 deletions(-) diff --git a/.ruby-version b/.ruby-version index 49cdd668e1..ef538c2810 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -2.7.6 +3.1.2 diff --git a/Gemfile b/Gemfile index ee87a78408..bd5c4fb470 100644 --- a/Gemfile +++ b/Gemfile @@ -1,37 +1,38 @@ source 'https://rubygems.org' -ruby '~> 2.7.3' +ruby '3.1.2' -gem 'rake' -gem 'thor' -gem 'pry', '~> 0.14.0' -gem 'activesupport', '~> 5.2', require: false -gem 'yajl-ruby', require: false +gem 'activesupport', require: false gem 'html-pipeline' -gem 'typhoeus' gem 'nokogiri' +gem 'pry-byebug' +gem 'rake' gem 'terminal-table' +gem 'thor' +gem 'typhoeus' +gem 'yajl-ruby', require: false group :app do + gem 'browser' + gem 'chunky_png' + gem 'coffee-script' + gem 'erubi' + gem 'image_optim_pack', platforms: :ruby + gem 'image_optim' + gem 'rack-ssl-enforcer' gem 'rack' - gem 'sinatra' + gem 'rss' + gem 'sass' gem 'sinatra-contrib' - gem 'rack-ssl-enforcer' - gem 'thin' - gem 'sprockets' + gem 'sinatra' gem 'sprockets-helpers' - gem 'erubi' - gem 'browser' - gem 'sass' - gem 'coffee-script' - gem 'chunky_png' gem 'sprockets-sass' - gem 'image_optim' - gem 'image_optim_pack', platforms: :ruby + gem 'sprockets' + gem 'thin' end group :production do - gem 'uglifier' gem 'newrelic_rpm' + gem 'uglifier' end group :development do @@ -39,17 +40,17 @@ group :development do end group :docs do - gem 'redcarpet' + gem 'net-sftp', require: false gem 'progress_bar', require: false - gem 'unix_utils', require: false + gem 'redcarpet' gem 'tty-pager', require: false - gem 'net-sftp', '>= 2.1.3.rc2', require: false + gem 'unix_utils', require: false end group :test do gem 'minitest' - gem 'rr', require: false gem 'rack-test', require: false + gem 'rr', require: false end if ENV['SELENIUM'] == '1' diff --git a/Gemfile.lock b/Gemfile.lock index 63d8dc4a6b..25f03ef290 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,136 +1,138 @@ GEM remote: https://rubygems.org/ specs: - activesupport (5.2.6) + activesupport (7.0.4) concurrent-ruby (~> 1.0, >= 1.0.2) - i18n (>= 0.7, < 2) - minitest (~> 5.1) - tzinfo (~> 1.1) - backports (3.15.0) + i18n (>= 1.6, < 2) + minitest (>= 5.1) + tzinfo (~> 2.0) better_errors (2.9.1) coderay (>= 1.0.0) erubi (>= 1.0.0) rack (>= 0.9.0) - browser (2.6.1) - chunky_png (1.3.11) + browser (5.3.1) + byebug (11.1.3) + chunky_png (1.4.0) coderay (1.1.3) coffee-script (2.4.1) coffee-script-source execjs coffee-script-source (1.12.2) - concurrent-ruby (1.1.9) - daemons (1.4.0) - erubi (1.10.0) - ethon (0.12.0) - ffi (>= 1.3.0) + concurrent-ruby (1.1.10) + daemons (1.4.1) + erubi (1.11.0) + ethon (0.16.0) + ffi (>= 1.15.0) eventmachine (1.2.7) - execjs (2.7.0) - exifr (1.3.6) + execjs (2.8.1) + exifr (1.3.10) ffi (1.15.5) fspath (3.1.2) highline (2.0.3) - html-pipeline (2.12.0) + html-pipeline (2.14.3) activesupport (>= 2) nokogiri (>= 1.4) - i18n (1.8.10) + i18n (1.12.0) concurrent-ruby (~> 1.0) - image_optim (0.26.5) + image_optim (0.31.1) exifr (~> 1.2, >= 1.2.2) fspath (~> 3.0) - image_size (>= 1.5, < 3) + image_size (>= 1.5, < 4) in_threads (~> 1.3) progress (~> 3.0, >= 3.0.1) - image_optim_pack (0.6.0) + image_optim_pack (0.9.1.20221104) fspath (>= 2.1, < 4) image_optim (~> 0.19) - image_size (2.0.2) - in_threads (1.5.3) + image_size (3.2.0) + in_threads (1.6.0) method_source (1.0.0) mini_portile2 (2.8.0) - minitest (5.14.4) - multi_json (1.13.1) - mustermann (1.1.1) + minitest (5.16.3) + multi_json (1.15.0) + mustermann (3.0.0) ruby2_keywords (~> 0.0.1) - net-sftp (3.0.0.beta1) - net-ssh (>= 5.0.0, < 6.0.0) - net-ssh (5.2.0) - newrelic_rpm (6.7.0.359) + net-sftp (4.0.0) + net-ssh (>= 5.0.0, < 8.0.0) + net-ssh (7.0.1) + newrelic_rpm (8.12.0) nokogiri (1.13.9) mini_portile2 (~> 2.8.0) racc (~> 1.4) options (2.3.2) - progress (3.5.2) - progress_bar (1.3.0) + progress (3.6.0) + progress_bar (1.3.3) highline (>= 1.6, < 3) options (~> 2.3.0) pry (0.14.1) coderay (~> 1.1) method_source (~> 1.0) + pry-byebug (3.10.1) + byebug (~> 11.0) + pry (>= 0.13, < 0.15) racc (1.6.0) - rack (2.2.3.1) - rack-protection (2.0.7) + rack (2.2.4) + rack-protection (3.0.3) rack rack-ssl-enforcer (0.2.9) - rack-test (1.1.0) - rack (>= 1.0, < 3) - rake (13.0.0) - rb-fsevent (0.10.3) - rb-inotify (0.10.0) + rack-test (2.0.2) + rack (>= 1.3) + rake (13.0.6) + rb-fsevent (0.11.2) + rb-inotify (0.10.1) ffi (~> 1.0) redcarpet (3.5.1) - rr (1.2.1) + rexml (3.2.5) + rr (3.1.0) + rss (0.2.9) + rexml ruby2_keywords (0.0.5) sass (3.7.4) sass-listen (~> 4.0.0) sass-listen (4.0.0) rb-fsevent (~> 0.9, >= 0.9.4) rb-inotify (~> 0.9, >= 0.9.7) - sinatra (2.0.7) - mustermann (~> 1.0) - rack (~> 2.0) - rack-protection (= 2.0.7) + sinatra (3.0.3) + mustermann (~> 3.0) + rack (~> 2.2, >= 2.2.4) + rack-protection (= 3.0.3) tilt (~> 2.0) - sinatra-contrib (2.0.7) - backports (>= 2.8.2) + sinatra-contrib (3.0.3) multi_json - mustermann (~> 1.0) - rack-protection (= 2.0.7) - sinatra (= 2.0.7) + mustermann (~> 3.0) + rack-protection (= 3.0.3) + sinatra (= 3.0.3) tilt (~> 2.0) sprockets (3.7.2) concurrent-ruby (~> 1.0) rack (> 1, < 3) - sprockets-helpers (1.2.1) + sprockets-helpers (1.4.0) sprockets (>= 2.2) sprockets-sass (2.0.0.beta2) sprockets (>= 2.0, < 4.0) - strings (0.1.6) - strings-ansi (~> 0.1) - unicode-display_width (~> 1.5) + strings (0.2.1) + strings-ansi (~> 0.2) + unicode-display_width (>= 1.5, < 3.0) unicode_utils (~> 1.4) - strings-ansi (0.1.0) - terminal-table (1.8.0) - unicode-display_width (~> 1.1, >= 1.1.1) + strings-ansi (0.2.0) + terminal-table (3.0.2) + unicode-display_width (>= 1.1.1, < 3) thin (1.8.1) daemons (~> 1.0, >= 1.0.9) eventmachine (~> 1.0, >= 1.0.4) rack (>= 1, < 3) - thor (0.20.3) - thread_safe (0.3.6) - tilt (2.0.10) - tty-pager (0.12.1) - strings (~> 0.1.4) - tty-screen (~> 0.6) - tty-which (~> 0.4) - tty-screen (0.7.0) - tty-which (0.4.1) - typhoeus (1.3.1) + thor (1.2.1) + tilt (2.0.11) + tty-pager (0.14.0) + strings (~> 0.2.0) + tty-screen (~> 0.8) + tty-screen (0.8.1) + typhoeus (1.4.0) ethon (>= 0.9.0) - tzinfo (1.2.10) - thread_safe (~> 0.1) + tzinfo (2.0.5) + concurrent-ruby (~> 1.0) uglifier (4.2.0) execjs (>= 0.3.0, < 3) - unicode-display_width (1.6.0) + unicode-display_width (2.3.0) unicode_utils (1.4.0) unix_utils (0.0.15) yajl-ruby (1.4.3) @@ -139,7 +141,7 @@ PLATFORMS ruby DEPENDENCIES - activesupport (~> 5.2) + activesupport better_errors browser chunky_png @@ -149,17 +151,18 @@ DEPENDENCIES image_optim image_optim_pack minitest - net-sftp (>= 2.1.3.rc2) + net-sftp newrelic_rpm nokogiri progress_bar - pry (~> 0.14.0) + pry-byebug rack rack-ssl-enforcer rack-test rake redcarpet rr + rss sass sinatra sinatra-contrib @@ -176,7 +179,7 @@ DEPENDENCIES yajl-ruby RUBY VERSION - ruby 2.7.3p183 + ruby 3.1.2p20 BUNDLED WITH 2.1.4 diff --git a/docs/maintainers.md b/docs/maintainers.md index e8483a41c7..24436b73fb 100644 --- a/docs/maintainers.md +++ b/docs/maintainers.md @@ -125,6 +125,7 @@ The following people (used to) maintain DevDocs: - [Jed Fox](https://github.com/j-f1) - [Mrugesh Mohapatra](https://github.com/raisedadead) - [Oliver Eyton-Williams](https://github.com/ojeytonwilliams) +- [Paul Sernatinger](https://github.com/oscillot) - [Simon Legner](https://github.com/simon04) - [Thibaut Courouble](https://github.com/thibaut) diff --git a/lib/app.rb b/lib/app.rb index 43ce2a4ebe..6d197b4ae2 100644 --- a/lib/app.rb +++ b/lib/app.rb @@ -238,7 +238,22 @@ def redirect_via_js(path) end def supports_js_redirection? - browser.modern? && !memoized_cookies.empty? + modern_browser?(browser) && !memoized_cookies.empty? + end + + # https://github.com/fnando/browser#detecting-modern-browsers + # https://github.com/fnando/browser/blob/v2.6.1/lib/browser/browser.rb + # This restores the old browser gem `#modern?` functionality as it was in 2.6.1 + # It's possible this isn't even really needed any longer, these versions are quite old now + def modern_browser?(browser) + [ + browser.webkit?, + browser.firefox? && browser.version.to_i >= 17, + browser.ie? && browser.version.to_i >= 9 && !browser.compatibility_view?, + browser.edge? && !browser.compatibility_view?, + browser.opera? && browser.version.to_i >= 12, + browser.firefox? && browser.device.tablet? && browser.platform.android? && b.version.to_i >= 14 + ].any? end end diff --git a/lib/docs/core/request.rb b/lib/docs/core/request.rb index b1e26e68d6..2a7f96c6d5 100644 --- a/lib/docs/core/request.rb +++ b/lib/docs/core/request.rb @@ -13,7 +13,7 @@ def self.run(*args, &block) request.run end - def initialize(url, options = {}) + def initialize(url, **options) super url.to_s, DEFAULT_OPTIONS.merge(options) end diff --git a/lib/docs/core/requester.rb b/lib/docs/core/requester.rb index 6c7f5b6a80..ed8bafcb5d 100644 --- a/lib/docs/core/requester.rb +++ b/lib/docs/core/requester.rb @@ -4,10 +4,10 @@ class Requester < Typhoeus::Hydra attr_reader :request_options - def self.run(urls, options = {}, &block) + def self.run(urls, **options, &block) urls = urls.dup - requester = new(options) - requester.on_response(&block) if block + requester = new(**options) + requester.on_response(&block) if block_given? requester.on_response do # cheap hack to ensure root page is processed first if urls requester.request(urls) @@ -19,16 +19,16 @@ def self.run(urls, options = {}, &block) requester end - def initialize(options = {}) + def initialize(**options) @request_options = options.extract!(:request_options)[:request_options].try(:dup) || {} options[:max_concurrency] ||= 20 options[:pipelining] = 0 super end - def request(urls, options = {}, &block) + def request(urls, **options, &block) requests = [urls].flatten.map do |url| - build_and_queue_request(url, options, &block) + build_and_queue_request(url, **options, &block) end requests.length == 1 ? requests.first : requests end @@ -46,8 +46,8 @@ def on_response(&block) private - def build_and_queue_request(url, options, &block) - request = Request.new(url, request_options.merge(options)) + def build_and_queue_request(url, **options, &block) + request = Request.new(url, **request_options.merge(options)) request.on_complete(&block) if block queue(request) request diff --git a/lib/docs/core/scraper.rb b/lib/docs/core/scraper.rb index 083b0015eb..007580ed50 100644 --- a/lib/docs/core/scraper.rb +++ b/lib/docs/core/scraper.rb @@ -51,7 +51,7 @@ def initialize end def initialize_stubs - self.class.stubs.each do |path, block| + self.class.stubs.each do |path, &block| Typhoeus.stub(url_for(path)).and_return do Typhoeus::Response.new \ effective_url: url_for(path), diff --git a/lib/tasks/updates.thor b/lib/tasks/updates.thor index 62dcf20c11..5dd1539749 100644 --- a/lib/tasks/updates.thor +++ b/lib/tasks/updates.thor @@ -259,7 +259,7 @@ Maintainers can close this issue when all documentations are up-to-date. The iss # HTTP utilities # - def github_get(endpoint, params = {}) + def github_get(endpoint, **params) github_request(endpoint, {method: :get, params: params}) end diff --git a/test/lib/docs/core/doc_test.rb b/test/lib/docs/core/doc_test.rb index 3da1fcfc41..b0d2341f84 100644 --- a/test/lib/docs/core/doc_test.rb +++ b/test/lib/docs/core/doc_test.rb @@ -1,5 +1,5 @@ -require 'test_helper' -require 'docs' +require_relative '../../../test_helper' +require_relative '../../../../lib/docs' class DocsDocTest < MiniTest::Spec let :doc do @@ -197,7 +197,7 @@ class DocsDocTest < MiniTest::Spec it "opens the .path directory before storing the file" do stub(doc).path { 'path' } stub(store).write { assert false } - mock(store).open('path') do |_, block| + mock(store).open('path') do |_, &block| stub(store).write block.call end @@ -258,7 +258,7 @@ class DocsDocTest < MiniTest::Spec before do any_instance_of(doc) do |instance| - stub(instance).build_pages { |block| pages.each(&block) } + stub(instance).build_pages { |&block| pages.each(&block) } end end @@ -313,7 +313,7 @@ class DocsDocTest < MiniTest::Spec it "replaces the .path directory before storing the files" do stub(doc).path { 'path' } stub(store).write { assert false } - mock(store).replace('path') do |_, block| + mock(store).replace('path') do |_, &block| stub(store).write block.call end diff --git a/test/lib/docs/core/entry_index_test.rb b/test/lib/docs/core/entry_index_test.rb index 0f8b0b187d..187f5f4ad2 100644 --- a/test/lib/docs/core/entry_index_test.rb +++ b/test/lib/docs/core/entry_index_test.rb @@ -1,5 +1,5 @@ -require 'test_helper' -require 'docs' +require_relative '../../../test_helper' +require_relative '../../../../lib/docs' class DocsEntryIndexTest < MiniTest::Spec let :entry do diff --git a/test/lib/docs/core/filter_test.rb b/test/lib/docs/core/filter_test.rb index 77265c222a..38c5019a3f 100644 --- a/test/lib/docs/core/filter_test.rb +++ b/test/lib/docs/core/filter_test.rb @@ -1,5 +1,5 @@ -require 'test_helper' -require 'docs' +require_relative '../../../test_helper' +require_relative '../../../../lib/docs' class DocsFilterTest < MiniTest::Spec include FilterTestHelper @@ -19,7 +19,7 @@ class DocsFilterTest < MiniTest::Spec describe "#subpath_to" do it "returns the subpath from the #base_url to the url, ignoring case" do - stub(filter.base_url).subpath_to('url', hash_including(ignore_case: true)) { 'subpath' } + stub(filter.base_url).subpath_to('url', ignore_case: true) { 'subpath' } assert_equal 'subpath', filter.subpath_to('url') end end diff --git a/test/lib/docs/core/instrumentable_test.rb b/test/lib/docs/core/instrumentable_test.rb index 0c8fc95638..c3fe2b8b6b 100644 --- a/test/lib/docs/core/instrumentable_test.rb +++ b/test/lib/docs/core/instrumentable_test.rb @@ -1,5 +1,5 @@ -require 'test_helper' -require 'docs' +require_relative '../../../test_helper' +require_relative '../../../../lib/docs' class DocsInstrumentableTest < MiniTest::Spec let :extended_class do diff --git a/test/lib/docs/core/manifest_test.rb b/test/lib/docs/core/manifest_test.rb index 16484a7016..583b2ceeac 100644 --- a/test/lib/docs/core/manifest_test.rb +++ b/test/lib/docs/core/manifest_test.rb @@ -1,5 +1,5 @@ -require 'test_helper' -require 'docs' +require_relative '../../../test_helper' +require_relative '../../../../lib/docs' class ManifestTest < MiniTest::Spec let :doc do diff --git a/test/lib/docs/core/models/entry_test.rb b/test/lib/docs/core/models/entry_test.rb index 307cdaac43..7487340ff2 100644 --- a/test/lib/docs/core/models/entry_test.rb +++ b/test/lib/docs/core/models/entry_test.rb @@ -1,5 +1,5 @@ -require 'test_helper' -require 'docs' +require_relative '../../../../test_helper' +require_relative '../../../../../lib/docs' class DocsEntryTest < MiniTest::Spec Entry = Docs::Entry diff --git a/test/lib/docs/core/models/type_test.rb b/test/lib/docs/core/models/type_test.rb index 8d95ea36cc..a01d8e6140 100644 --- a/test/lib/docs/core/models/type_test.rb +++ b/test/lib/docs/core/models/type_test.rb @@ -1,5 +1,5 @@ -require 'test_helper' -require 'docs' +require_relative '../../../../test_helper' +require_relative '../../../../../lib/docs' class DocsTypeTest < MiniTest::Spec Type = Docs::Type diff --git a/test/lib/docs/core/parser_test.rb b/test/lib/docs/core/parser_test.rb index 21f62c39d6..440516a8e9 100644 --- a/test/lib/docs/core/parser_test.rb +++ b/test/lib/docs/core/parser_test.rb @@ -1,5 +1,5 @@ -require 'test_helper' -require 'docs' +require_relative '../../../test_helper' +require_relative '../../../../lib/docs' class DocsParserTest < MiniTest::Spec def parser(content) diff --git a/test/lib/docs/core/request_test.rb b/test/lib/docs/core/request_test.rb index a5a9e48c04..d05dd1ffe9 100644 --- a/test/lib/docs/core/request_test.rb +++ b/test/lib/docs/core/request_test.rb @@ -1,13 +1,13 @@ -require 'test_helper' -require 'docs' +require_relative '../../../test_helper' +require_relative '../../../../lib/docs' class DocsRequestTest < MiniTest::Spec let :url do 'http://example.com' end - def request(url = self.url, options = {}) - Docs::Request.new(url, options).tap do |request| + def request(url = self.url, **options) + Docs::Request.new(url, **options).tap do |request| request.extend FakeInstrumentation end end diff --git a/test/lib/docs/core/requester_test.rb b/test/lib/docs/core/requester_test.rb index 63eace1aa4..acf8d0a9a2 100644 --- a/test/lib/docs/core/requester_test.rb +++ b/test/lib/docs/core/requester_test.rb @@ -1,5 +1,5 @@ -require 'test_helper' -require 'docs' +require_relative '../../../test_helper' +require_relative '../../../../lib/docs' class DocsRequesterTest < MiniTest::Spec def stub_request(url) @@ -7,7 +7,7 @@ def stub_request(url) end let :requester do - Docs::Requester.new(options) + Docs::Requester.new(**options) end let :url do @@ -81,7 +81,7 @@ def stub_request(url) end it "returns an array of requests" do - result = requester.request(urls, { params: 'test' }, &block) + result = requester.request(urls, params: 'test', &block) assert_instance_of Array, result assert_equal urls.length, result.length assert result.all? { |obj| obj.instance_of? Docs::Request } diff --git a/test/lib/docs/core/response_test.rb b/test/lib/docs/core/response_test.rb index 4142752d02..9e92c034fc 100644 --- a/test/lib/docs/core/response_test.rb +++ b/test/lib/docs/core/response_test.rb @@ -1,5 +1,5 @@ -require 'test_helper' -require 'docs' +require_relative '../../../test_helper' +require_relative '../../../../lib/docs' class DocsResponseTest < MiniTest::Spec let :response do diff --git a/test/lib/docs/core/scraper_test.rb b/test/lib/docs/core/scraper_test.rb index 25e0af3b0e..3d49320743 100644 --- a/test/lib/docs/core/scraper_test.rb +++ b/test/lib/docs/core/scraper_test.rb @@ -1,5 +1,5 @@ -require 'test_helper' -require 'docs' +require_relative '../../../test_helper' +require_relative '../../../../lib/docs' class DocsScraperTest < MiniTest::Spec class Scraper < Docs::Scraper @@ -223,7 +223,7 @@ class Scraper < Docs::Scraper context "when the response is processable" do before do - stub(scraper).request_all do |urls, block| + stub(scraper).request_all do |urls, &block| urls.each { |url| @next_urls ||= block.call(response) } end stub(scraper).handle_response(response) { processed_response } diff --git a/test/lib/docs/core/scrapers/file_scraper_test.rb b/test/lib/docs/core/scrapers/file_scraper_test.rb index 88b5e8d5ec..46dad3c780 100644 --- a/test/lib/docs/core/scrapers/file_scraper_test.rb +++ b/test/lib/docs/core/scrapers/file_scraper_test.rb @@ -1,5 +1,5 @@ -require 'test_helper' -require 'docs' +require_relative '../../../../test_helper' +require_relative '../../../../../lib/docs' class FileScraperTest < MiniTest::Spec ROOT_PATH = File.expand_path('../../../../../../', __FILE__) diff --git a/test/lib/docs/core/scrapers/url_scraper_test.rb b/test/lib/docs/core/scrapers/url_scraper_test.rb index 5ff72231ea..9a687256ab 100644 --- a/test/lib/docs/core/scrapers/url_scraper_test.rb +++ b/test/lib/docs/core/scrapers/url_scraper_test.rb @@ -1,5 +1,5 @@ -require 'test_helper' -require 'docs' +require_relative '../../../../test_helper' +require_relative '../../../../../lib/docs' class DocsUrlScraperTest < MiniTest::Spec class Scraper < Docs::UrlScraper @@ -54,29 +54,29 @@ class Scraper < Docs::UrlScraper end it "runs a Requester with the given urls" do - mock(Docs::Requester).run 'urls', anything + mock(Docs::Requester).run('urls', request_options: {params: {}, headers: {"User-Agent" => "DevDocs"}}) result end it "runs a Requester with .headers as :request_options" do stub(Scraper).headers { { testheader: true } } - mock(Docs::Requester).run anything, satisfy { |options| options[:request_options][:headers][:testheader] } + mock(Docs::Requester).run('urls', request_options: {params: {}, headers: {testheader: true}}) result end it "runs a Requester with default .headers as :request_options" do - mock(Docs::Requester).run anything, satisfy { |options| options[:request_options][:headers]["User-Agent"] } + mock(Docs::Requester).run('urls', request_options: {params: {}, headers: {"User-Agent" => "DevDocs"}}) result end it "runs a Requester with .params as :request_options" do stub(Scraper).params { { test: true } } - mock(Docs::Requester).run anything, satisfy { |options| options[:request_options][:params][:test] } + mock(Docs::Requester).run('urls', request_options: {params: {test: true}, headers: {"User-Agent" => "DevDocs"}}) result end it "runs a Requester with the given block" do - stub(Docs::Requester).run { |*args| @block = args.last } + stub(Docs::Requester).run { |*_args, **_kwargs, &block| @block = block } result assert_equal block, @block end diff --git a/test/lib/docs/core/url_test.rb b/test/lib/docs/core/url_test.rb index 08839b54cc..7d4bda43de 100644 --- a/test/lib/docs/core/url_test.rb +++ b/test/lib/docs/core/url_test.rb @@ -1,5 +1,5 @@ -require 'test_helper' -require 'docs' +require_relative '../../../test_helper' +require_relative '../../../../lib/docs' class DocsUrlTest < MiniTest::Spec URL = Docs::URL diff --git a/test/lib/docs/filters/core/apply_base_url_test.rb b/test/lib/docs/filters/core/apply_base_url_test.rb index e627d95936..ba2764e7a8 100644 --- a/test/lib/docs/filters/core/apply_base_url_test.rb +++ b/test/lib/docs/filters/core/apply_base_url_test.rb @@ -1,5 +1,5 @@ -require 'test_helper' -require 'docs' +require_relative '../../../../test_helper' +require_relative '../../../../../lib/docs' class ApplyBaseUrlFilterTest < MiniTest::Spec include FilterTestHelper diff --git a/test/lib/docs/filters/core/clean_html_test.rb b/test/lib/docs/filters/core/clean_html_test.rb index a3e163e0ca..2d3c9f8add 100644 --- a/test/lib/docs/filters/core/clean_html_test.rb +++ b/test/lib/docs/filters/core/clean_html_test.rb @@ -1,5 +1,5 @@ -require 'test_helper' -require 'docs' +require_relative '../../../../test_helper' +require_relative '../../../../../lib/docs' class CleanHtmlFilterTest < MiniTest::Spec include FilterTestHelper diff --git a/test/lib/docs/filters/core/clean_text_test.rb b/test/lib/docs/filters/core/clean_text_test.rb index ec08b6e6c7..7babf15e48 100644 --- a/test/lib/docs/filters/core/clean_text_test.rb +++ b/test/lib/docs/filters/core/clean_text_test.rb @@ -1,5 +1,5 @@ -require 'test_helper' -require 'docs' +require_relative '../../../../test_helper' +require_relative '../../../../../lib/docs' class CleanTextFilterTest < MiniTest::Spec include FilterTestHelper diff --git a/test/lib/docs/filters/core/container_test.rb b/test/lib/docs/filters/core/container_test.rb index cdf08c0d2d..7d4993e8b4 100644 --- a/test/lib/docs/filters/core/container_test.rb +++ b/test/lib/docs/filters/core/container_test.rb @@ -1,5 +1,5 @@ -require 'test_helper' -require 'docs' +require_relative '../../../../test_helper' +require_relative '../../../../../lib/docs' class ContainerFilterTest < MiniTest::Spec include FilterTestHelper diff --git a/test/lib/docs/filters/core/entries_test.rb b/test/lib/docs/filters/core/entries_test.rb index 0fa843a08d..e33f778d01 100644 --- a/test/lib/docs/filters/core/entries_test.rb +++ b/test/lib/docs/filters/core/entries_test.rb @@ -1,5 +1,5 @@ -require 'test_helper' -require 'docs' +require_relative '../../../../test_helper' +require_relative '../../../../../lib/docs' class EntriesFilterTest < MiniTest::Spec include FilterTestHelper diff --git a/test/lib/docs/filters/core/inner_html_test.rb b/test/lib/docs/filters/core/inner_html_test.rb index 194cc555f1..bbd4095848 100644 --- a/test/lib/docs/filters/core/inner_html_test.rb +++ b/test/lib/docs/filters/core/inner_html_test.rb @@ -1,5 +1,5 @@ -require 'test_helper' -require 'docs' +require_relative '../../../../test_helper' +require_relative '../../../../../lib/docs' class InnerHtmlFilterTest < MiniTest::Spec include FilterTestHelper diff --git a/test/lib/docs/filters/core/internal_urls_test.rb b/test/lib/docs/filters/core/internal_urls_test.rb index 5d9df46985..c9194e09e0 100644 --- a/test/lib/docs/filters/core/internal_urls_test.rb +++ b/test/lib/docs/filters/core/internal_urls_test.rb @@ -1,5 +1,5 @@ -require 'test_helper' -require 'docs' +require_relative '../../../../test_helper' +require_relative '../../../../../lib/docs' class InternalUrlsFilterTest < MiniTest::Spec include FilterTestHelper diff --git a/test/lib/docs/filters/core/normalize_paths_test.rb b/test/lib/docs/filters/core/normalize_paths_test.rb index b3fc120df8..6d407f2b0b 100644 --- a/test/lib/docs/filters/core/normalize_paths_test.rb +++ b/test/lib/docs/filters/core/normalize_paths_test.rb @@ -1,5 +1,5 @@ -require 'test_helper' -require 'docs' +require_relative '../../../../test_helper' +require_relative '../../../../../lib/docs' class NormalizePathsFilterTest < MiniTest::Spec include FilterTestHelper diff --git a/test/lib/docs/filters/core/normalize_urls_test.rb b/test/lib/docs/filters/core/normalize_urls_test.rb index 7e2a56e524..804b05b159 100644 --- a/test/lib/docs/filters/core/normalize_urls_test.rb +++ b/test/lib/docs/filters/core/normalize_urls_test.rb @@ -1,5 +1,5 @@ -require 'test_helper' -require 'docs' +require_relative '../../../../test_helper' +require_relative '../../../../../lib/docs' class NormalizeUrlsFilterTest < MiniTest::Spec include FilterTestHelper diff --git a/test/lib/docs/filters/core/parse_cf_email_test.rb b/test/lib/docs/filters/core/parse_cf_email_test.rb index ed0a922974..d6124fedac 100644 --- a/test/lib/docs/filters/core/parse_cf_email_test.rb +++ b/test/lib/docs/filters/core/parse_cf_email_test.rb @@ -1,5 +1,5 @@ -require 'test_helper' -require 'docs' +require_relative '../../../../test_helper' +require_relative '../../../../../lib/docs' class ParseCfEmailFilterTest < MiniTest::Spec include FilterTestHelper diff --git a/test/lib/docs/filters/core/title_test.rb b/test/lib/docs/filters/core/title_test.rb index 69c83fe3dd..9a28bd3bee 100644 --- a/test/lib/docs/filters/core/title_test.rb +++ b/test/lib/docs/filters/core/title_test.rb @@ -1,5 +1,5 @@ -require 'test_helper' -require 'docs' +require_relative '../../../../test_helper' +require_relative '../../../../../lib/docs' class TitleFilterTest < MiniTest::Spec include FilterTestHelper diff --git a/test/lib/docs/storage/abstract_store_test.rb b/test/lib/docs/storage/abstract_store_test.rb index f552cd4a81..d63e95f226 100644 --- a/test/lib/docs/storage/abstract_store_test.rb +++ b/test/lib/docs/storage/abstract_store_test.rb @@ -1,5 +1,5 @@ -require 'test_helper' -require 'docs' +require_relative '../../../test_helper' +require_relative '../../../../lib/docs' class DocsAbstractStoreTest < MiniTest::Spec InvalidPathError = Docs::AbstractStore::InvalidPathError @@ -368,7 +368,7 @@ class DocsAbstractStoreTest < MiniTest::Spec end def stub_paths(*paths) - stub(store).each { |block| paths.each(&block) } + stub(store).each { |&block| paths.each(&block) } end it "calls the block" do diff --git a/test/lib/docs/storage/file_store_test.rb b/test/lib/docs/storage/file_store_test.rb index 586d8a41b5..aa3ce3f8ec 100644 --- a/test/lib/docs/storage/file_store_test.rb +++ b/test/lib/docs/storage/file_store_test.rb @@ -1,5 +1,5 @@ -require 'test_helper' -require 'docs' +require_relative '../../../test_helper' +require_relative '../../../../lib/docs' class DocsFileStoreTest < MiniTest::Spec let :store do From ed50204d8bd167bfb2f15f8f43b8e4fa9712b008 Mon Sep 17 00:00:00 2001 From: Paul Sernatinger Date: Mon, 14 Nov 2022 08:47:09 -0600 Subject: [PATCH 0002/1259] Update docker base images, copyright year, add self to maintainers --- COPYRIGHT | 2 +- Dockerfile | 3 +-- Dockerfile-alpine | 2 +- docs/maintainers.md | 1 + 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/COPYRIGHT b/COPYRIGHT index 8b56007921..36daa5b03e 100644 --- a/COPYRIGHT +++ b/COPYRIGHT @@ -1,4 +1,4 @@ -Copyright 2013-2021 Thibaut Courouble and other contributors +Copyright 2013-2022 Thibaut Courouble and other contributors This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/Dockerfile b/Dockerfile index 060193dfd5..4079b747bc 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,4 @@ -FROM ruby:2.7.6 - +FROM ruby:3.1.2 ENV LANG=C.UTF-8 ENV ENABLE_SERVICE_WORKER=true diff --git a/Dockerfile-alpine b/Dockerfile-alpine index dcd296a257..6575e2d77a 100644 --- a/Dockerfile-alpine +++ b/Dockerfile-alpine @@ -1,4 +1,4 @@ -FROM ruby:2.7.6-alpine +FROM ruby:3.1.2-alpine ENV LANG=C.UTF-8 ENV ENABLE_SERVICE_WORKER=true diff --git a/docs/maintainers.md b/docs/maintainers.md index 24436b73fb..cd85fc0871 100644 --- a/docs/maintainers.md +++ b/docs/maintainers.md @@ -32,6 +32,7 @@ In order to deploy DevDocs, you must: - be given access to DevDocs's [Sentry instance](https://sentry.io/devdocs/devdocs-js/) (for JS error tracking) and familiarize yourself with its UI. - be provided with DevDocs's S3 credentials, and install (`brew install awscli` on macOS) and [configure](https://docs.aws.amazon.com/cli/latest/reference/configure/) the AWS CLI on your computer. The configuration must add a named profile called "devdocs": + ``` aws configure --profile devdocs ``` From 3d325b846112ea73532e862786e920946fc87fbe Mon Sep 17 00:00:00 2001 From: Paul Sernatinger Date: Mon, 14 Nov 2022 20:57:28 -0600 Subject: [PATCH 0003/1259] Update .tool-version file for asdf users --- .tool-versions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.tool-versions b/.tool-versions index 1ade73219b..0b2d858781 100644 --- a/.tool-versions +++ b/.tool-versions @@ -1 +1 @@ -ruby 2.7.4 +ruby 3.1.2 From f803d30160f8037557fdbadc8f61b182c4e4ad2d Mon Sep 17 00:00:00 2001 From: Paul Sernatinger Date: Fri, 18 Nov 2022 22:28:43 -0600 Subject: [PATCH 0004/1259] Update Gemfile.lock Co-authored-by: Simon Legner --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 25f03ef290..535836f3c5 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -182,4 +182,4 @@ RUBY VERSION ruby 3.1.2p20 BUNDLED WITH - 2.1.4 + 2.3.11 From c68101a7371d32d4d0bef8929cc997d8e5d4ec00 Mon Sep 17 00:00:00 2001 From: Paul Sernatinger Date: Fri, 18 Nov 2022 22:29:49 -0600 Subject: [PATCH 0005/1259] Address some review comments --- docs/maintainers.md | 1 - lib/docs/filters/core/images.rb | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/maintainers.md b/docs/maintainers.md index cd85fc0871..fdacd2347e 100644 --- a/docs/maintainers.md +++ b/docs/maintainers.md @@ -126,7 +126,6 @@ The following people (used to) maintain DevDocs: - [Jed Fox](https://github.com/j-f1) - [Mrugesh Mohapatra](https://github.com/raisedadead) - [Oliver Eyton-Williams](https://github.com/ojeytonwilliams) -- [Paul Sernatinger](https://github.com/oscillot) - [Simon Legner](https://github.com/simon04) - [Thibaut Courouble](https://github.com/thibaut) diff --git a/lib/docs/filters/core/images.rb b/lib/docs/filters/core/images.rb index 407583dc37..f63016e332 100644 --- a/lib/docs/filters/core/images.rb +++ b/lib/docs/filters/core/images.rb @@ -1,5 +1,6 @@ # frozen_string_literal: true +require 'base64' require 'image_optim' module Docs From 928ffc98ef235086d8715eecd9cd99f3184519f8 Mon Sep 17 00:00:00 2001 From: ClasherKasten Date: Sat, 11 Feb 2023 20:24:35 +0100 Subject: [PATCH 0006/1259] Update Angular documentations --- lib/docs/scrapers/angular.rb | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/lib/docs/scrapers/angular.rb b/lib/docs/scrapers/angular.rb index ac27740cc0..beb11cd5fe 100644 --- a/lib/docs/scrapers/angular.rb +++ b/lib/docs/scrapers/angular.rb @@ -15,7 +15,7 @@ class Angular < UrlScraper options[:max_image_size] = 256_000 options[:attribution] = <<-HTML - © 2010–2022 Google, Inc.
+ © 2010–2023 Google, Inc.
Licensed under the Creative Commons Attribution License 4.0. HTML @@ -83,25 +83,25 @@ def url_for(path) end version do - self.release = '15.0.0' + self.release = '15.1.4' self.base_url = 'https://angular.io/' include Docs::Angular::Since12 end version '14' do - self.release = '14.2.11' - self.base_url = 'https://angular.io/' + self.release = '14.2.12' + self.base_url = 'https://v14.angular.io/' include Docs::Angular::Since12 end version '13' do - self.release = '13.3.8' + self.release = '13.3.12' self.base_url = 'https://v13.angular.io/' include Docs::Angular::Since12 end version '12' do - self.release = '12.2.13' + self.release = '12.2.17' self.base_url = 'https://v12.angular.io/' include Docs::Angular::Since12 end @@ -113,13 +113,13 @@ def url_for(path) end version '10' do - self.release = '10.2.3' + self.release = '10.2.5' self.base_url = 'https://v10.angular.io/' include Docs::Angular::Common end version '9' do - self.release = '9.1.12' + self.release = '9.1.13' self.base_url = 'https://v9.angular.io/' include Docs::Angular::Common end @@ -131,7 +131,7 @@ def url_for(path) end version '7' do - self.release = '7.2.15' + self.release = '7.2.16' self.base_url = 'https://v7.angular.io/' include Docs::Angular::Common end @@ -149,7 +149,7 @@ def url_for(path) end version '4' do - self.release = '4.4.6' + self.release = '4.4.7' self.base_url = 'https://v4.angular.io/' include Docs::Angular::Common end From b9ba7d4d31e38f863b1e874e78bc49bc4ad191c9 Mon Sep 17 00:00:00 2001 From: ClasherKasten Date: Wed, 15 Feb 2023 15:32:23 +0100 Subject: [PATCH 0007/1259] Update CMake documentation (3.26) --- lib/docs/scrapers/cmake.rb | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/lib/docs/scrapers/cmake.rb b/lib/docs/scrapers/cmake.rb index 797a61b84f..cf14b56235 100644 --- a/lib/docs/scrapers/cmake.rb +++ b/lib/docs/scrapers/cmake.rb @@ -4,7 +4,7 @@ class Cmake < UrlScraper self.type = 'sphinx_simple' self.links = { home: 'https://cmake.org/', - code: 'https://cmake.org/gitweb?p=cmake.git;a=summary' + code: 'https://gitlab.kitware.com/cmake/cmake/' } html_filters.push 'cmake/clean_html', 'sphinx/clean_html', 'cmake/entries', 'title' @@ -16,10 +16,15 @@ class Cmake < UrlScraper options[:skip_patterns] = [/\Agenerator/, /\Acpack_gen/, /\Ainclude/, /\Arelease/, /tutorial\/(\w*%20)+/] options[:attribution] = <<-HTML - © 2000–2022 Kitware, Inc. and Contributors
+ © 2000–2023 Kitware, Inc. and Contributors
Licensed under the BSD 3-clause License. HTML + version '3.26' do + self.release = '3.26' + self.base_url = "https://cmake.org/cmake/help/v#{self.version}/" + end + version '3.25' do self.release = '3.25' self.base_url = "https://cmake.org/cmake/help/v#{self.version}/" From 577e46bbb6efa28fed2f42d24da98894278ebd8c Mon Sep 17 00:00:00 2001 From: Simon Legner Date: Fri, 17 Feb 2023 22:55:00 +0100 Subject: [PATCH 0008/1259] Ruby 3.2.1 --- .ruby-version | 2 +- .tool-versions | 2 +- Dockerfile | 2 +- Dockerfile-alpine | 2 +- Gemfile | 2 +- Gemfile.lock | 6 +++--- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.ruby-version b/.ruby-version index ef538c2810..e4604e3afd 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -3.1.2 +3.2.1 diff --git a/.tool-versions b/.tool-versions index 0b2d858781..40b87ee468 100644 --- a/.tool-versions +++ b/.tool-versions @@ -1 +1 @@ -ruby 3.1.2 +ruby 3.2.1 diff --git a/Dockerfile b/Dockerfile index 4079b747bc..aca0744ac2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM ruby:3.1.2 +FROM ruby:3.2.1 ENV LANG=C.UTF-8 ENV ENABLE_SERVICE_WORKER=true diff --git a/Dockerfile-alpine b/Dockerfile-alpine index 6575e2d77a..aa815c60e0 100644 --- a/Dockerfile-alpine +++ b/Dockerfile-alpine @@ -1,4 +1,4 @@ -FROM ruby:3.1.2-alpine +FROM ruby:3.2.1-alpine ENV LANG=C.UTF-8 ENV ENABLE_SERVICE_WORKER=true diff --git a/Gemfile b/Gemfile index bd5c4fb470..56a5e9d17c 100644 --- a/Gemfile +++ b/Gemfile @@ -1,5 +1,5 @@ source 'https://rubygems.org' -ruby '3.1.2' +ruby '3.2.1' gem 'activesupport', require: false gem 'html-pipeline' diff --git a/Gemfile.lock b/Gemfile.lock index 6d4474c81b..ca6f689b12 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -55,7 +55,7 @@ GEM net-ssh (>= 5.0.0, < 8.0.0) net-ssh (7.0.1) newrelic_rpm (8.12.0) - nokogiri (1.13.10) + nokogiri (1.14.2) mini_portile2 (~> 2.8.0) racc (~> 1.4) options (2.3.2) @@ -179,7 +179,7 @@ DEPENDENCIES yajl-ruby RUBY VERSION - ruby 3.1.2p20 + ruby 3.2.1p31 BUNDLED WITH - 2.3.11 + 2.4.6 From 8c1750d7eb18ae74bd0de5ed63bf04e46eee11dd Mon Sep 17 00:00:00 2001 From: Simon Legner Date: Fri, 17 Feb 2023 23:00:44 +0100 Subject: [PATCH 0009/1259] image_optim 0.31.3 --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index ca6f689b12..60aa3da9cf 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -34,7 +34,7 @@ GEM nokogiri (>= 1.4) i18n (1.12.0) concurrent-ruby (~> 1.0) - image_optim (0.31.1) + image_optim (0.31.3) exifr (~> 1.2, >= 1.2.2) fspath (~> 3.0) image_size (>= 1.5, < 4) From 25893614b3db9f6adc053cceb1768d718e7060bf Mon Sep 17 00:00:00 2001 From: Oliver Eyton-Williams Date: Tue, 21 Feb 2023 11:38:28 +0100 Subject: [PATCH 0010/1259] fix: use URI.open to fetch docs --- lib/tasks/docs.thor | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/tasks/docs.thor b/lib/tasks/docs.thor index 5670c7d90e..a586aa63ce 100644 --- a/lib/tasks/docs.thor +++ b/lib/tasks/docs.thor @@ -241,7 +241,7 @@ class DocsCLI < Thor ['index.json', 'meta.json'].each do |filename| json = "https://documents.devdocs.io/#{doc.path}/#{filename}?#{time}" begin - open(json) do |file| + URI.open(json) do |file| mutex.synchronize do path = File.join(dir, filename) File.write(path, file.read) From d25de2092a4d6bec141f93205e4a89d372978a6d Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 21 Feb 2023 13:03:31 +0000 Subject: [PATCH 0011/1259] chore(deps): update dependency activesupport to v7.0.4.1 [security] --- Gemfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 60aa3da9cf..e862e06a79 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,7 +1,7 @@ GEM remote: https://rubygems.org/ specs: - activesupport (7.0.4) + activesupport (7.0.4.2) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) @@ -128,7 +128,7 @@ GEM tty-screen (0.8.1) typhoeus (1.4.0) ethon (>= 0.9.0) - tzinfo (2.0.5) + tzinfo (2.0.6) concurrent-ruby (~> 1.0) uglifier (4.2.0) execjs (>= 0.3.0, < 3) From e09fdd9e562738d0f9e7693b7acf12ae641f6208 Mon Sep 17 00:00:00 2001 From: Oliver Eyton-Williams Date: Tue, 21 Feb 2023 14:10:27 +0100 Subject: [PATCH 0012/1259] chore: validate heroku stack upgrade From 7fd7b0e1513590210fcb945c850ad899b83f74f4 Mon Sep 17 00:00:00 2001 From: Simon Legner Date: Tue, 21 Feb 2023 18:58:22 +0100 Subject: [PATCH 0013/1259] Update Babel documentation (7.21.1) See #1926 --- lib/docs/filters/babel/clean_html.rb | 15 ++++++++++----- lib/docs/scrapers/babel.rb | 4 ++-- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/lib/docs/filters/babel/clean_html.rb b/lib/docs/filters/babel/clean_html.rb index 33cfa56adf..d573b65cf4 100644 --- a/lib/docs/filters/babel/clean_html.rb +++ b/lib/docs/filters/babel/clean_html.rb @@ -3,6 +3,8 @@ class Babel class CleanHtmlFilter < Filter def call + @doc = at_css('.theme-doc-markdown') + css('.fixedHeaderContainer').remove css('.toc').remove @@ -15,14 +17,17 @@ def call css('.docs-prevnext').remove - css('pre > code.hljs').each do |node| - node.parent['data-language'] = node['class'][/language-(\w+)/, 1] - end - css('pre').each do |node| - node.content = node.content + node.content = node.css('.token-line').map(&:content).join("\n") + node['data-language'] = node['class'][/language-(\w+)/, 1] end + css('.codeBlockTitle_x_ju').remove + + css('*').remove_attr('class') + + css('*').remove_attr('style') + doc end diff --git a/lib/docs/scrapers/babel.rb b/lib/docs/scrapers/babel.rb index 2482f9bc03..d095495c3e 100644 --- a/lib/docs/scrapers/babel.rb +++ b/lib/docs/scrapers/babel.rb @@ -1,7 +1,7 @@ module Docs class Babel < UrlScraper self.type = 'simple' - self.base_url = 'https://babeljs.io/docs/en/' + self.base_url = 'https://babeljs.io/docs/' self.links = { home: 'https://babeljs.io/', code: 'https://github.com/babel/babel' @@ -30,7 +30,7 @@ class Babel < UrlScraper HTML version '7' do - self.release = '7.16.4' + self.release = '7.21.1' end version '6' do From 26ea24216ee0ff04c67a46d67db3c996029c4c1d Mon Sep 17 00:00:00 2001 From: Simon Legner Date: Tue, 21 Feb 2023 19:02:41 +0100 Subject: [PATCH 0014/1259] Fix **options --- lib/docs/core/request.rb | 2 +- lib/docs/core/requester.rb | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/lib/docs/core/request.rb b/lib/docs/core/request.rb index 2a7f96c6d5..b1e26e68d6 100644 --- a/lib/docs/core/request.rb +++ b/lib/docs/core/request.rb @@ -13,7 +13,7 @@ def self.run(*args, &block) request.run end - def initialize(url, **options) + def initialize(url, options = {}) super url.to_s, DEFAULT_OPTIONS.merge(options) end diff --git a/lib/docs/core/requester.rb b/lib/docs/core/requester.rb index ed8bafcb5d..28b7db2d57 100644 --- a/lib/docs/core/requester.rb +++ b/lib/docs/core/requester.rb @@ -4,9 +4,9 @@ class Requester < Typhoeus::Hydra attr_reader :request_options - def self.run(urls, **options, &block) + def self.run(urls, options = {}, &block) urls = urls.dup - requester = new(**options) + requester = new(options) requester.on_response(&block) if block_given? requester.on_response do # cheap hack to ensure root page is processed first if urls @@ -19,16 +19,16 @@ def self.run(urls, **options, &block) requester end - def initialize(**options) + def initialize(options = {}) @request_options = options.extract!(:request_options)[:request_options].try(:dup) || {} options[:max_concurrency] ||= 20 options[:pipelining] = 0 super end - def request(urls, **options, &block) + def request(urls, options = {}, &block) requests = [urls].flatten.map do |url| - build_and_queue_request(url, **options, &block) + build_and_queue_request(url, options, &block) end requests.length == 1 ? requests.first : requests end @@ -46,7 +46,7 @@ def on_response(&block) private - def build_and_queue_request(url, **options, &block) + def build_and_queue_request(url, options = {}, &block) request = Request.new(url, **request_options.merge(options)) request.on_complete(&block) if block queue(request) From b85f071466a54f7d48dfde3188fb17c0b94df80c Mon Sep 17 00:00:00 2001 From: Simon Legner Date: Tue, 21 Feb 2023 19:09:51 +0100 Subject: [PATCH 0015/1259] Update Angular documentation (15.1.5) --- lib/docs/scrapers/angular.rb | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/lib/docs/scrapers/angular.rb b/lib/docs/scrapers/angular.rb index beb11cd5fe..05981cc981 100644 --- a/lib/docs/scrapers/angular.rb +++ b/lib/docs/scrapers/angular.rb @@ -83,7 +83,7 @@ def url_for(path) end version do - self.release = '15.1.4' + self.release = '15.1.5' self.base_url = 'https://angular.io/' include Docs::Angular::Since12 end @@ -95,13 +95,13 @@ def url_for(path) end version '13' do - self.release = '13.3.12' + self.release = '13.3.8' self.base_url = 'https://v13.angular.io/' include Docs::Angular::Since12 end version '12' do - self.release = '12.2.17' + self.release = '12.2.13' self.base_url = 'https://v12.angular.io/' include Docs::Angular::Since12 end @@ -113,13 +113,13 @@ def url_for(path) end version '10' do - self.release = '10.2.5' + self.release = '10.2.3' self.base_url = 'https://v10.angular.io/' include Docs::Angular::Common end version '9' do - self.release = '9.1.13' + self.release = '9.1.12' self.base_url = 'https://v9.angular.io/' include Docs::Angular::Common end @@ -131,7 +131,7 @@ def url_for(path) end version '7' do - self.release = '7.2.16' + self.release = '7.2.15' self.base_url = 'https://v7.angular.io/' include Docs::Angular::Common end @@ -149,7 +149,7 @@ def url_for(path) end version '4' do - self.release = '4.4.7' + self.release = '4.4.6' self.base_url = 'https://v4.angular.io/' include Docs::Angular::Common end From 007ec837491b1d755418e863eea52a1fc48bbbba Mon Sep 17 00:00:00 2001 From: Simon Legner Date: Tue, 21 Feb 2023 19:14:04 +0100 Subject: [PATCH 0016/1259] Update Axios documentation (1.3.0) --- lib/docs/scrapers/axios.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/docs/scrapers/axios.rb b/lib/docs/scrapers/axios.rb index 65e2628116..e3dbfa7df3 100755 --- a/lib/docs/scrapers/axios.rb +++ b/lib/docs/scrapers/axios.rb @@ -5,7 +5,7 @@ class Axios < UrlScraper home: 'hthttps://axios-http.com/', code: 'https://github.com/axios/axios' } - self.release = '1.2.1' + self.release = '1.3.0' self.base_url = "https://axios-http.com/docs/" self.initial_paths = %w(index intro) From 06d36f2bdda0f8e33055cd3ca1ffdd4f3a22fc15 Mon Sep 17 00:00:00 2001 From: Simon Legner Date: Tue, 21 Feb 2023 19:19:14 +0100 Subject: [PATCH 0017/1259] DevDocs requires Ruby 3.2.1 --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 5ccd14919c..b5e117738e 100644 --- a/README.md +++ b/README.md @@ -22,7 +22,7 @@ Unless you wish to contribute to the project, we recommend using the hosted vers DevDocs is made of two pieces: a Ruby scraper that generates the documentation and metadata, and a JavaScript app powered by a small Sinatra app. -DevDocs requires Ruby 2.7.4, libcurl, and a JavaScript runtime supported by [ExecJS](https://github.com/rails/execjs#readme) (included in OS X and Windows; [Node.js](https://nodejs.org/en/) on Linux). Once you have these installed, run the following commands: +DevDocs requires Ruby 3.2.1, libcurl, and a JavaScript runtime supported by [ExecJS](https://github.com/rails/execjs#readme) (included in OS X and Windows; [Node.js](https://nodejs.org/en/) on Linux). Once you have these installed, run the following commands: ```sh git clone https://github.com/freeCodeCamp/devdocs.git && cd devdocs From b1981dd8352befa3468cb946a13ce3d012a92ff7 Mon Sep 17 00:00:00 2001 From: Simon Legner Date: Tue, 21 Feb 2023 19:19:26 +0100 Subject: [PATCH 0018/1259] Update Nokogiri documentation (1.14.2) --- lib/docs/scrapers/nokogiri2.rb | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/lib/docs/scrapers/nokogiri2.rb b/lib/docs/scrapers/nokogiri2.rb index cef6e565c6..0b2e415732 100644 --- a/lib/docs/scrapers/nokogiri2.rb +++ b/lib/docs/scrapers/nokogiri2.rb @@ -7,7 +7,7 @@ class Nokogiri2 < Rdoc self.name = 'Nokogiri' self.slug = 'nokogiri' - self.release = '1.13.0' + self.release = '1.14.2' self.base_url = "https://nokogiri.org/rdoc/" html_filters.replace 'rdoc/entries', 'nokogiri2/entries' @@ -16,8 +16,9 @@ class Nokogiri2 < Rdoc options[:only_patterns] = [/\ANokogiri/, /\AXSD/] options[:attribution] = <<-HTML - © 2008–2021 Aaron Patterson, Mike Dalessio, Charles Nutter, Sergio Arbeo,
- Patrick Mahoney, Yoko Harada, Akinori MUSHA, John Shahid, Lars Kanis
+ © 2008–2023 by Mike Dalessio, Aaron Patterson, Yoko Harada, Akinori MUSHA, John Shahid,
+ Karol Bucek, Sam Ruby, Craig Barnes, Stephen Checkoway, Lars Kanis, Sergio Arbeo,
+ Timothy Elliott, Nobuyoshi Nakada, Charles Nutter, Patrick Mahoney Licensed under the MIT License. HTML From 18a84c72e9225b5241d2b490fd961cd85545e500 Mon Sep 17 00:00:00 2001 From: ChandlerVer5 Date: Wed, 22 Feb 2023 17:55:20 +0800 Subject: [PATCH 0019/1259] =?UTF-8?q?fix:=20=F0=9F=90=9B=20babel=20documen?= =?UTF-8?q?t=20duplicate=20and=20do=20not=20display?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/docs/filters/babel/entries.rb | 8 ++++---- lib/docs/scrapers/babel.rb | 4 ++++ 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/lib/docs/filters/babel/entries.rb b/lib/docs/filters/babel/entries.rb index f113bf8a5f..c423fa8d13 100644 --- a/lib/docs/filters/babel/entries.rb +++ b/lib/docs/filters/babel/entries.rb @@ -3,13 +3,13 @@ class Babel class EntriesFilter < Docs::EntriesFilter ENTRIES = { - 'Usage' => ['Options', 'Config Files', '@babel/cli', '@babel/polyfill', + 'Usage' => ['Options', 'Plugins', 'Config Files', 'Compiler assumptions', '@babel/cli', '@babel/polyfill', '@babel/plugin-transform-runtime', '@babel/register'], - 'Presets' => ['@babel/preset-env', '@babel/preset-flow', '@babel/preset-react', '@babel/preset-typescript'], + 'Presets' => ['@babel/preset'], 'Tooling' => ['@babel/parser', '@babel/core', '@babel/generator', '@babel/code-frame', - '@babel/helpers', '@babel/runtime', '@babel/template', '@babel/traverse', '@babel/types'] + '@babel/helper', '@babel/runtime', '@babel/template', '@babel/traverse', '@babel/types', '@babel/standalone'] } def get_name @@ -18,7 +18,7 @@ def get_name def get_type ENTRIES.each do |key, value| - return key if value.include?(name) + return key if value.any? { |val| name.start_with?(val) } return 'Other Plugins' if subpath.include?('babel-plugin') end end diff --git a/lib/docs/scrapers/babel.rb b/lib/docs/scrapers/babel.rb index d095495c3e..79eaa217d3 100644 --- a/lib/docs/scrapers/babel.rb +++ b/lib/docs/scrapers/babel.rb @@ -24,6 +24,10 @@ class Babel < UrlScraper /roadmap/ ] + options[:skip_link] = ->(link) { + link['href'].include?('https://babeljs.io/docs/en/') + } + options[:attribution] = <<-HTML © 2014-present Sebastian McKenzie
Licensed under the MIT License. From 5b232b50b972cb7fc3f84ca85b21ba707decf26e Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 4 Mar 2023 06:22:57 +0000 Subject: [PATCH 0020/1259] chore(deps): update ruby/setup-ruby action to v1.141.0 --- .github/workflows/build.yml | 2 +- .github/workflows/schedule-doc-report.yml | 2 +- .github/workflows/test.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 214a914de0..0467bf3557 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -13,7 +13,7 @@ jobs: steps: - uses: actions/checkout@dc323e67f16fb5f7663d20ff7941f27f5809e9b6 # v2.6.0 - name: Set up Ruby - uses: ruby/setup-ruby@d3c9825d67b0d8720afdfdde5af56c79fdb38d16 # v1.138.0 + uses: ruby/setup-ruby@5a73aa9f67560c0d447ab95e2c73fb8d0f790c01 # v1.141.0 with: bundler-cache: true # runs 'bundle install' and caches installed gems automatically - name: Run tests diff --git a/.github/workflows/schedule-doc-report.yml b/.github/workflows/schedule-doc-report.yml index 4518f915cc..b2f9b8513a 100644 --- a/.github/workflows/schedule-doc-report.yml +++ b/.github/workflows/schedule-doc-report.yml @@ -10,7 +10,7 @@ jobs: steps: - uses: actions/checkout@dc323e67f16fb5f7663d20ff7941f27f5809e9b6 # v2.6.0 - name: Set up Ruby - uses: ruby/setup-ruby@d3c9825d67b0d8720afdfdde5af56c79fdb38d16 # v1.138.0 + uses: ruby/setup-ruby@5a73aa9f67560c0d447ab95e2c73fb8d0f790c01 # v1.141.0 with: bundler-cache: true # runs 'bundle install' and caches installed gems automatically - name: Generate report diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 672e62e3ed..31ead3dc37 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -11,7 +11,7 @@ jobs: steps: - uses: actions/checkout@dc323e67f16fb5f7663d20ff7941f27f5809e9b6 # v2.6.0 - name: Set up Ruby - uses: ruby/setup-ruby@d3c9825d67b0d8720afdfdde5af56c79fdb38d16 # v1.138.0 + uses: ruby/setup-ruby@5a73aa9f67560c0d447ab95e2c73fb8d0f790c01 # v1.141.0 with: bundler-cache: true # runs 'bundle install' and caches installed gems automatically - name: Run tests From cde606e149e10213844dff254accff2d02466c0c Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 4 Mar 2023 11:44:37 +0000 Subject: [PATCH 0021/1259] chore(deps): update dependency sinatra to v3.0.4 [security] --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index e862e06a79..93ad920e82 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -70,7 +70,7 @@ GEM byebug (~> 11.0) pry (>= 0.13, < 0.15) racc (1.6.1) - rack (2.2.6.2) + rack (2.2.6.3) rack-protection (3.0.3) rack rack-ssl-enforcer (0.2.9) From 7e7c19ae96583b555b58e345d0353e8065e251e8 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 5 Mar 2023 15:16:26 +0000 Subject: [PATCH 0022/1259] chore(deps): update ruby/setup-ruby action to v1.143.0 --- .github/workflows/build.yml | 2 +- .github/workflows/schedule-doc-report.yml | 2 +- .github/workflows/test.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0467bf3557..2a17ace9c4 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -13,7 +13,7 @@ jobs: steps: - uses: actions/checkout@dc323e67f16fb5f7663d20ff7941f27f5809e9b6 # v2.6.0 - name: Set up Ruby - uses: ruby/setup-ruby@5a73aa9f67560c0d447ab95e2c73fb8d0f790c01 # v1.141.0 + uses: ruby/setup-ruby@31a7f6d628878b80bc63375a93ae079ec50a1601 # v1.143.0 with: bundler-cache: true # runs 'bundle install' and caches installed gems automatically - name: Run tests diff --git a/.github/workflows/schedule-doc-report.yml b/.github/workflows/schedule-doc-report.yml index b2f9b8513a..c5b9d5f43d 100644 --- a/.github/workflows/schedule-doc-report.yml +++ b/.github/workflows/schedule-doc-report.yml @@ -10,7 +10,7 @@ jobs: steps: - uses: actions/checkout@dc323e67f16fb5f7663d20ff7941f27f5809e9b6 # v2.6.0 - name: Set up Ruby - uses: ruby/setup-ruby@5a73aa9f67560c0d447ab95e2c73fb8d0f790c01 # v1.141.0 + uses: ruby/setup-ruby@31a7f6d628878b80bc63375a93ae079ec50a1601 # v1.143.0 with: bundler-cache: true # runs 'bundle install' and caches installed gems automatically - name: Generate report diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 31ead3dc37..dc4b2683a8 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -11,7 +11,7 @@ jobs: steps: - uses: actions/checkout@dc323e67f16fb5f7663d20ff7941f27f5809e9b6 # v2.6.0 - name: Set up Ruby - uses: ruby/setup-ruby@5a73aa9f67560c0d447ab95e2c73fb8d0f790c01 # v1.141.0 + uses: ruby/setup-ruby@31a7f6d628878b80bc63375a93ae079ec50a1601 # v1.143.0 with: bundler-cache: true # runs 'bundle install' and caches installed gems automatically - name: Run tests From 21f3a9b2625302567ac60e5a3518a5e666d58056 Mon Sep 17 00:00:00 2001 From: Yition Cheung Date: Tue, 7 Mar 2023 02:56:37 +0000 Subject: [PATCH 0023/1259] fix: missing `Redis/Sorted Set` docs --- lib/docs/filters/redis/entries.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/docs/filters/redis/entries.rb b/lib/docs/filters/redis/entries.rb index f1073d693b..057d357215 100644 --- a/lib/docs/filters/redis/entries.rb +++ b/lib/docs/filters/redis/entries.rb @@ -489,7 +489,7 @@ def get_type "scripting" => "Core: Scripting and Functions", "server" => "Core: Server managment", "set" => "Core: Set", - "sorted-set:" => "Core: Sorted Set", + "sorted-set" => "Core: Sorted Set", "stream" => "Core: Stream", "string" => "Core: String", "transactions" => "Core: Transactions", From 2207cbdfffb5e72996e6b9ea8b1b89457e8917b2 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 11 Mar 2023 03:23:39 +0000 Subject: [PATCH 0024/1259] chore(deps): update ruby/setup-ruby action to v1.144.0 --- .github/workflows/build.yml | 2 +- .github/workflows/schedule-doc-report.yml | 2 +- .github/workflows/test.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 2a17ace9c4..1dfe6e5f0e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -13,7 +13,7 @@ jobs: steps: - uses: actions/checkout@dc323e67f16fb5f7663d20ff7941f27f5809e9b6 # v2.6.0 - name: Set up Ruby - uses: ruby/setup-ruby@31a7f6d628878b80bc63375a93ae079ec50a1601 # v1.143.0 + uses: ruby/setup-ruby@9669f3ee51dc3f4eda8447ab696b3ab19a90d14b # v1.144.0 with: bundler-cache: true # runs 'bundle install' and caches installed gems automatically - name: Run tests diff --git a/.github/workflows/schedule-doc-report.yml b/.github/workflows/schedule-doc-report.yml index c5b9d5f43d..7a4916706e 100644 --- a/.github/workflows/schedule-doc-report.yml +++ b/.github/workflows/schedule-doc-report.yml @@ -10,7 +10,7 @@ jobs: steps: - uses: actions/checkout@dc323e67f16fb5f7663d20ff7941f27f5809e9b6 # v2.6.0 - name: Set up Ruby - uses: ruby/setup-ruby@31a7f6d628878b80bc63375a93ae079ec50a1601 # v1.143.0 + uses: ruby/setup-ruby@9669f3ee51dc3f4eda8447ab696b3ab19a90d14b # v1.144.0 with: bundler-cache: true # runs 'bundle install' and caches installed gems automatically - name: Generate report diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index dc4b2683a8..17922d93e6 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -11,7 +11,7 @@ jobs: steps: - uses: actions/checkout@dc323e67f16fb5f7663d20ff7941f27f5809e9b6 # v2.6.0 - name: Set up Ruby - uses: ruby/setup-ruby@31a7f6d628878b80bc63375a93ae079ec50a1601 # v1.143.0 + uses: ruby/setup-ruby@9669f3ee51dc3f4eda8447ab696b3ab19a90d14b # v1.144.0 with: bundler-cache: true # runs 'bundle install' and caches installed gems automatically - name: Run tests From 89cbaeeb7b814d7d855c3f49ad6bf614a9f16c1b Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 16 Mar 2023 02:50:52 +0000 Subject: [PATCH 0025/1259] chore(deps): update dependency activesupport to v7.0.4.3 [security] --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 93ad920e82..1ef9fe1cd5 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,7 +1,7 @@ GEM remote: https://rubygems.org/ specs: - activesupport (7.0.4.2) + activesupport (7.0.4.3) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) From d350de1dfb6b9611e1c50fd07cb72a58d3bd4dc0 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 16 Mar 2023 04:48:40 +0000 Subject: [PATCH 0026/1259] chore(deps): update dependency rack to v2.2.6.4 [security] --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 1ef9fe1cd5..4d92e4e069 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -70,7 +70,7 @@ GEM byebug (~> 11.0) pry (>= 0.13, < 0.15) racc (1.6.1) - rack (2.2.6.3) + rack (2.2.6.4) rack-protection (3.0.3) rack rack-ssl-enforcer (0.2.9) From 794b37898abc4c6044973fb83fbc209e6ad9ca37 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 18 Mar 2023 04:02:21 +0000 Subject: [PATCH 0027/1259] chore(deps): update dependency sinatra-contrib to v3.0.5 --- Gemfile.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 4d92e4e069..d3ca8fe3c4 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -71,7 +71,7 @@ GEM pry (>= 0.13, < 0.15) racc (1.6.1) rack (2.2.6.4) - rack-protection (3.0.3) + rack-protection (3.0.5) rack rack-ssl-enforcer (0.2.9) rack-test (2.0.2) @@ -91,16 +91,16 @@ GEM sass-listen (4.0.0) rb-fsevent (~> 0.9, >= 0.9.4) rb-inotify (~> 0.9, >= 0.9.7) - sinatra (3.0.3) + sinatra (3.0.5) mustermann (~> 3.0) rack (~> 2.2, >= 2.2.4) - rack-protection (= 3.0.3) + rack-protection (= 3.0.5) tilt (~> 2.0) - sinatra-contrib (3.0.3) + sinatra-contrib (3.0.5) multi_json mustermann (~> 3.0) - rack-protection (= 3.0.3) - sinatra (= 3.0.3) + rack-protection (= 3.0.5) + sinatra (= 3.0.5) tilt (~> 2.0) sprockets (3.7.2) concurrent-ruby (~> 1.0) From 020e4abbdd4e1e29e6d617af1dc033a7e998c8ac Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 18 Mar 2023 07:45:42 +0000 Subject: [PATCH 0028/1259] chore(deps): update ruby/setup-ruby action to v1.144.1 --- .github/workflows/build.yml | 2 +- .github/workflows/schedule-doc-report.yml | 2 +- .github/workflows/test.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1dfe6e5f0e..cc3b6aaca1 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -13,7 +13,7 @@ jobs: steps: - uses: actions/checkout@dc323e67f16fb5f7663d20ff7941f27f5809e9b6 # v2.6.0 - name: Set up Ruby - uses: ruby/setup-ruby@9669f3ee51dc3f4eda8447ab696b3ab19a90d14b # v1.144.0 + uses: ruby/setup-ruby@e6689b4deb1cb2062ea45315001f687c0b52111b # v1.144.1 with: bundler-cache: true # runs 'bundle install' and caches installed gems automatically - name: Run tests diff --git a/.github/workflows/schedule-doc-report.yml b/.github/workflows/schedule-doc-report.yml index 7a4916706e..f156c4c280 100644 --- a/.github/workflows/schedule-doc-report.yml +++ b/.github/workflows/schedule-doc-report.yml @@ -10,7 +10,7 @@ jobs: steps: - uses: actions/checkout@dc323e67f16fb5f7663d20ff7941f27f5809e9b6 # v2.6.0 - name: Set up Ruby - uses: ruby/setup-ruby@9669f3ee51dc3f4eda8447ab696b3ab19a90d14b # v1.144.0 + uses: ruby/setup-ruby@e6689b4deb1cb2062ea45315001f687c0b52111b # v1.144.1 with: bundler-cache: true # runs 'bundle install' and caches installed gems automatically - name: Generate report diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 17922d93e6..42aa19d5fd 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -11,7 +11,7 @@ jobs: steps: - uses: actions/checkout@dc323e67f16fb5f7663d20ff7941f27f5809e9b6 # v2.6.0 - name: Set up Ruby - uses: ruby/setup-ruby@9669f3ee51dc3f4eda8447ab696b3ab19a90d14b # v1.144.0 + uses: ruby/setup-ruby@e6689b4deb1cb2062ea45315001f687c0b52111b # v1.144.1 with: bundler-cache: true # runs 'bundle install' and caches installed gems automatically - name: Run tests From 631e27ff87c6303be574524ec25e0cb971b784d6 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 18 Mar 2023 08:28:18 +0000 Subject: [PATCH 0029/1259] chore(deps): update dependency erubi to v1.12.0 --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index d3ca8fe3c4..bf6e599b96 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -20,7 +20,7 @@ GEM coffee-script-source (1.12.2) concurrent-ruby (1.1.10) daemons (1.4.1) - erubi (1.11.0) + erubi (1.12.0) ethon (0.16.0) ffi (>= 1.15.0) eventmachine (1.2.7) From 8a38bce2b2d7059dc92f49e0929cdabd58901a04 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 18 Mar 2023 10:46:07 +0000 Subject: [PATCH 0030/1259] chore(deps): update dependency minitest to v5.18.0 --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index bf6e599b96..33bed04cd9 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -47,7 +47,7 @@ GEM in_threads (1.6.0) method_source (1.0.0) mini_portile2 (2.8.0) - minitest (5.16.3) + minitest (5.18.0) multi_json (1.15.0) mustermann (3.0.0) ruby2_keywords (~> 0.0.1) From 3ff9a52011a85cafa48dee1ada1f4cb4de538cc2 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 18 Mar 2023 12:17:21 +0000 Subject: [PATCH 0031/1259] chore(deps): update dependency newrelic_rpm to v8.16.0 --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 33bed04cd9..dee2e1b6e8 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -54,7 +54,7 @@ GEM net-sftp (4.0.0) net-ssh (>= 5.0.0, < 8.0.0) net-ssh (7.0.1) - newrelic_rpm (8.12.0) + newrelic_rpm (8.16.0) nokogiri (1.14.2) mini_portile2 (~> 2.8.0) racc (~> 1.4) From 8715f59a56ed48221cdb32c4a989e362acafbf60 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 18 Mar 2023 14:58:06 +0000 Subject: [PATCH 0032/1259] chore(deps): update dependency rack-test to v2.1.0 --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index dee2e1b6e8..ba1c331db7 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -74,7 +74,7 @@ GEM rack-protection (3.0.5) rack rack-ssl-enforcer (0.2.9) - rack-test (2.0.2) + rack-test (2.1.0) rack (>= 1.3) rake (13.0.6) rb-fsevent (0.11.2) From 7c68de3f77b50d2bf67380d444fe201b3e4c8356 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 18 Mar 2023 16:54:35 +0000 Subject: [PATCH 0033/1259] chore(deps): update dependency redcarpet to v3.6.0 --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index ba1c331db7..b5146c4317 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -80,7 +80,7 @@ GEM rb-fsevent (0.11.2) rb-inotify (0.10.1) ffi (~> 1.0) - redcarpet (3.5.1) + redcarpet (3.6.0) rexml (3.2.5) rr (3.1.0) rss (0.2.9) From 81d83fef2c6a7c609284b20ac48a5f3eaddca76d Mon Sep 17 00:00:00 2001 From: Simon Legner Date: Mon, 20 Mar 2023 22:41:10 +0100 Subject: [PATCH 0034/1259] Update TypeScript documentation (5.0.2) --- lib/docs/scrapers/typescript.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/docs/scrapers/typescript.rb b/lib/docs/scrapers/typescript.rb index 81fa5a70c0..f4cac24b35 100644 --- a/lib/docs/scrapers/typescript.rb +++ b/lib/docs/scrapers/typescript.rb @@ -4,7 +4,7 @@ class Typescript < UrlScraper self.name = 'TypeScript' self.type = 'typescript' - self.release = '4.9.3' + self.release = '5.0.2' self.base_urls = [ 'https://www.typescriptlang.org/docs/handbook/', 'https://www.typescriptlang.org/' @@ -35,7 +35,7 @@ def initial_urls ] options[:attribution] = <<-HTML - © 2012-2022 Microsoft
+ © 2012-2023 Microsoft
Licensed under the Apache License, Version 2.0. HTML From 9e5943ff8aae4ad6c57739de6d9b74f8b3ebdd7c Mon Sep 17 00:00:00 2001 From: Simon Legner Date: Mon, 20 Mar 2023 22:44:42 +0100 Subject: [PATCH 0035/1259] Update FastAPI documentation (0.95.0) --- lib/docs/scrapers/fastapi.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/docs/scrapers/fastapi.rb b/lib/docs/scrapers/fastapi.rb index 760603b955..7711e0eda8 100644 --- a/lib/docs/scrapers/fastapi.rb +++ b/lib/docs/scrapers/fastapi.rb @@ -2,7 +2,7 @@ module Docs class Fastapi < UrlScraper self.name = 'FastAPI' self.type = 'fastapi' - self.release = '0.88.0' + self.release = '0.95.0' self.base_url = 'https://fastapi.tiangolo.com/' self.root_path = '/' self.links = { From b9042abe7298baee224b41d17ffd97ad8e5609b9 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 25 Mar 2023 01:01:01 +0000 Subject: [PATCH 0036/1259] chore(deps): update github actions --- .github/workflows/build.yml | 4 ++-- .github/workflows/schedule-doc-report.yml | 4 ++-- .github/workflows/test.yml | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index cc3b6aaca1..f6f48ef51a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -11,9 +11,9 @@ jobs: runs-on: ubuntu-20.04 if: github.repository == 'freeCodeCamp/devdocs' steps: - - uses: actions/checkout@dc323e67f16fb5f7663d20ff7941f27f5809e9b6 # v2.6.0 + - uses: actions/checkout@ee0669bd1cc54295c223e0bb666b733df41de1c5 # v2.7.0 - name: Set up Ruby - uses: ruby/setup-ruby@e6689b4deb1cb2062ea45315001f687c0b52111b # v1.144.1 + uses: ruby/setup-ruby@ec02537da5712d66d4d50a0f33b7eb52773b5ed1 # v1.144.2 with: bundler-cache: true # runs 'bundle install' and caches installed gems automatically - name: Run tests diff --git a/.github/workflows/schedule-doc-report.yml b/.github/workflows/schedule-doc-report.yml index f156c4c280..ca408ca651 100644 --- a/.github/workflows/schedule-doc-report.yml +++ b/.github/workflows/schedule-doc-report.yml @@ -8,9 +8,9 @@ jobs: runs-on: ubuntu-20.04 if: github.repository == 'freeCodeCamp/devdocs' steps: - - uses: actions/checkout@dc323e67f16fb5f7663d20ff7941f27f5809e9b6 # v2.6.0 + - uses: actions/checkout@ee0669bd1cc54295c223e0bb666b733df41de1c5 # v2.7.0 - name: Set up Ruby - uses: ruby/setup-ruby@e6689b4deb1cb2062ea45315001f687c0b52111b # v1.144.1 + uses: ruby/setup-ruby@ec02537da5712d66d4d50a0f33b7eb52773b5ed1 # v1.144.2 with: bundler-cache: true # runs 'bundle install' and caches installed gems automatically - name: Generate report diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 42aa19d5fd..a2c8f8885a 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -9,9 +9,9 @@ jobs: test: runs-on: ubuntu-20.04 steps: - - uses: actions/checkout@dc323e67f16fb5f7663d20ff7941f27f5809e9b6 # v2.6.0 + - uses: actions/checkout@ee0669bd1cc54295c223e0bb666b733df41de1c5 # v2.7.0 - name: Set up Ruby - uses: ruby/setup-ruby@e6689b4deb1cb2062ea45315001f687c0b52111b # v1.144.1 + uses: ruby/setup-ruby@ec02537da5712d66d4d50a0f33b7eb52773b5ed1 # v1.144.2 with: bundler-cache: true # runs 'bundle install' and caches installed gems automatically - name: Run tests From 375cef781b9572bf22ec9d0ad34fa2ac82380e20 Mon Sep 17 00:00:00 2001 From: Simon Legner Date: Fri, 31 Mar 2023 18:34:01 +0200 Subject: [PATCH 0037/1259] Update TypeScript documentation (5.0.2) From af4907a748453bef295ad8ea6840e40c60b7742d Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 1 Apr 2023 00:37:48 +0000 Subject: [PATCH 0038/1259] chore(deps): update dependency thin to v1.8.2 --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index b5146c4317..b13460ed0d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -116,7 +116,7 @@ GEM strings-ansi (0.2.0) terminal-table (3.0.2) unicode-display_width (>= 1.1.1, < 3) - thin (1.8.1) + thin (1.8.2) daemons (~> 1.0, >= 1.0.9) eventmachine (~> 1.0, >= 1.0.4) rack (>= 1, < 3) From 1106309822381aa0c50ced4a08c264e78c46d5c2 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 1 Apr 2023 06:16:26 +0000 Subject: [PATCH 0039/1259] chore(deps): update ruby/setup-ruby action to v1.145.0 --- .github/workflows/build.yml | 2 +- .github/workflows/schedule-doc-report.yml | 2 +- .github/workflows/test.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f6f48ef51a..bd18102432 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -13,7 +13,7 @@ jobs: steps: - uses: actions/checkout@ee0669bd1cc54295c223e0bb666b733df41de1c5 # v2.7.0 - name: Set up Ruby - uses: ruby/setup-ruby@ec02537da5712d66d4d50a0f33b7eb52773b5ed1 # v1.144.2 + uses: ruby/setup-ruby@904f3fef85a9c80a3750cbe7d5159268fd5caa9f # v1.145.0 with: bundler-cache: true # runs 'bundle install' and caches installed gems automatically - name: Run tests diff --git a/.github/workflows/schedule-doc-report.yml b/.github/workflows/schedule-doc-report.yml index ca408ca651..5b00e9527b 100644 --- a/.github/workflows/schedule-doc-report.yml +++ b/.github/workflows/schedule-doc-report.yml @@ -10,7 +10,7 @@ jobs: steps: - uses: actions/checkout@ee0669bd1cc54295c223e0bb666b733df41de1c5 # v2.7.0 - name: Set up Ruby - uses: ruby/setup-ruby@ec02537da5712d66d4d50a0f33b7eb52773b5ed1 # v1.144.2 + uses: ruby/setup-ruby@904f3fef85a9c80a3750cbe7d5159268fd5caa9f # v1.145.0 with: bundler-cache: true # runs 'bundle install' and caches installed gems automatically - name: Generate report diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index a2c8f8885a..53fb33d041 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -11,7 +11,7 @@ jobs: steps: - uses: actions/checkout@ee0669bd1cc54295c223e0bb666b733df41de1c5 # v2.7.0 - name: Set up Ruby - uses: ruby/setup-ruby@ec02537da5712d66d4d50a0f33b7eb52773b5ed1 # v1.144.2 + uses: ruby/setup-ruby@904f3fef85a9c80a3750cbe7d5159268fd5caa9f # v1.145.0 with: bundler-cache: true # runs 'bundle install' and caches installed gems automatically - name: Run tests From bb9816b38db6b10bc32316a3919e202f7a03df0a Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 1 Apr 2023 11:43:29 +0000 Subject: [PATCH 0040/1259] chore(deps): update dependency ruby to v3.2.2 --- .ruby-version | 2 +- .tool-versions | 2 +- Dockerfile | 2 +- Dockerfile-alpine | 2 +- Gemfile | 2 +- Gemfile.lock | 10 +++++----- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.ruby-version b/.ruby-version index e4604e3afd..be94e6f53d 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -3.2.1 +3.2.2 diff --git a/.tool-versions b/.tool-versions index 40b87ee468..f2a971aa75 100644 --- a/.tool-versions +++ b/.tool-versions @@ -1 +1 @@ -ruby 3.2.1 +ruby 3.2.2 diff --git a/Dockerfile b/Dockerfile index aca0744ac2..f5d9b2494c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM ruby:3.2.1 +FROM ruby:3.2.2 ENV LANG=C.UTF-8 ENV ENABLE_SERVICE_WORKER=true diff --git a/Dockerfile-alpine b/Dockerfile-alpine index aa815c60e0..39ca37c51e 100644 --- a/Dockerfile-alpine +++ b/Dockerfile-alpine @@ -1,4 +1,4 @@ -FROM ruby:3.2.1-alpine +FROM ruby:3.2.2-alpine ENV LANG=C.UTF-8 ENV ENABLE_SERVICE_WORKER=true diff --git a/Gemfile b/Gemfile index 56a5e9d17c..f276b26383 100644 --- a/Gemfile +++ b/Gemfile @@ -1,5 +1,5 @@ source 'https://rubygems.org' -ruby '3.2.1' +ruby '3.2.2' gem 'activesupport', require: false gem 'html-pipeline' diff --git a/Gemfile.lock b/Gemfile.lock index b13460ed0d..201de54aa3 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -40,13 +40,13 @@ GEM image_size (>= 1.5, < 4) in_threads (~> 1.3) progress (~> 3.0, >= 3.0.1) - image_optim_pack (0.9.1.20221104) + image_optim_pack (0.9.1.20230325) fspath (>= 2.1, < 4) image_optim (~> 0.19) image_size (3.2.0) in_threads (1.6.0) method_source (1.0.0) - mini_portile2 (2.8.0) + mini_portile2 (2.8.1) minitest (5.18.0) multi_json (1.15.0) mustermann (3.0.0) @@ -63,13 +63,13 @@ GEM progress_bar (1.3.3) highline (>= 1.6, < 3) options (~> 2.3.0) - pry (0.14.1) + pry (0.14.2) coderay (~> 1.1) method_source (~> 1.0) pry-byebug (3.10.1) byebug (~> 11.0) pry (>= 0.13, < 0.15) - racc (1.6.1) + racc (1.6.2) rack (2.2.6.4) rack-protection (3.0.5) rack @@ -179,7 +179,7 @@ DEPENDENCIES yajl-ruby RUBY VERSION - ruby 3.2.1p31 + ruby 3.2.2p53 BUNDLED WITH 2.4.6 From 6ed6edb3ee3529e766e7b4fa73142219d82d685c Mon Sep 17 00:00:00 2001 From: Beemen Sameh <41084077+beemensameh@users.noreply.github.com> Date: Fri, 7 Apr 2023 20:00:35 +0200 Subject: [PATCH 0041/1259] add django 4.2 --- lib/docs/scrapers/django.rb | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lib/docs/scrapers/django.rb b/lib/docs/scrapers/django.rb index 0e8b35f5fd..fc179dbc84 100644 --- a/lib/docs/scrapers/django.rb +++ b/lib/docs/scrapers/django.rb @@ -34,6 +34,11 @@ class Django < FileScraper Licensed under the BSD License. HTML + version '4.2' do + self.release = '4.2' + self.base_url = "https://docs.djangoproject.com/en/#{self.version}/" + end + version '4.1' do self.release = '4.1' self.base_url = "https://docs.djangoproject.com/en/#{self.version}/" From 24f0b9aec4705a5d4c50fc9b83a26599bc0140b2 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 8 Apr 2023 04:05:40 +0000 Subject: [PATCH 0042/1259] chore(deps): update ruby/setup-ruby action to v1.146.0 --- .github/workflows/build.yml | 2 +- .github/workflows/schedule-doc-report.yml | 2 +- .github/workflows/test.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index bd18102432..1b1ef4ee6f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -13,7 +13,7 @@ jobs: steps: - uses: actions/checkout@ee0669bd1cc54295c223e0bb666b733df41de1c5 # v2.7.0 - name: Set up Ruby - uses: ruby/setup-ruby@904f3fef85a9c80a3750cbe7d5159268fd5caa9f # v1.145.0 + uses: ruby/setup-ruby@55283cc23133118229fd3f97f9336ee23a179fcf # v1.146.0 with: bundler-cache: true # runs 'bundle install' and caches installed gems automatically - name: Run tests diff --git a/.github/workflows/schedule-doc-report.yml b/.github/workflows/schedule-doc-report.yml index 5b00e9527b..cecbbb0ba7 100644 --- a/.github/workflows/schedule-doc-report.yml +++ b/.github/workflows/schedule-doc-report.yml @@ -10,7 +10,7 @@ jobs: steps: - uses: actions/checkout@ee0669bd1cc54295c223e0bb666b733df41de1c5 # v2.7.0 - name: Set up Ruby - uses: ruby/setup-ruby@904f3fef85a9c80a3750cbe7d5159268fd5caa9f # v1.145.0 + uses: ruby/setup-ruby@55283cc23133118229fd3f97f9336ee23a179fcf # v1.146.0 with: bundler-cache: true # runs 'bundle install' and caches installed gems automatically - name: Generate report diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 53fb33d041..3c0feacca8 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -11,7 +11,7 @@ jobs: steps: - uses: actions/checkout@ee0669bd1cc54295c223e0bb666b733df41de1c5 # v2.7.0 - name: Set up Ruby - uses: ruby/setup-ruby@904f3fef85a9c80a3750cbe7d5159268fd5caa9f # v1.145.0 + uses: ruby/setup-ruby@55283cc23133118229fd3f97f9336ee23a179fcf # v1.146.0 with: bundler-cache: true # runs 'bundle install' and caches installed gems automatically - name: Run tests From bb01d1544c7538db19178944281916636daaf5bd Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 12 Apr 2023 06:20:43 +0000 Subject: [PATCH 0043/1259] chore(deps): update dependency nokogiri to v1.14.3 [security] --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 201de54aa3..be0265a8a7 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -55,7 +55,7 @@ GEM net-ssh (>= 5.0.0, < 8.0.0) net-ssh (7.0.1) newrelic_rpm (8.16.0) - nokogiri (1.14.2) + nokogiri (1.14.3) mini_portile2 (~> 2.8.0) racc (~> 1.4) options (2.3.2) From 0d41bfe631dfad3bc071d9a224a4ad89af833765 Mon Sep 17 00:00:00 2001 From: Simon Legner Date: Wed, 12 Apr 2023 22:24:35 +0200 Subject: [PATCH 0044/1259] Update Git documentation (2.40.0) --- lib/docs/scrapers/git.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/docs/scrapers/git.rb b/lib/docs/scrapers/git.rb index a5de307a64..97fa6d5bf1 100644 --- a/lib/docs/scrapers/git.rb +++ b/lib/docs/scrapers/git.rb @@ -1,7 +1,7 @@ module Docs class Git < UrlScraper self.type = 'git' - self.release = '2.39.0' + self.release = '2.40.0' self.base_url = 'https://git-scm.com/docs' self.initial_paths = %w(/git.html) self.links = { From a18a74bcd8490f15bcac23826bc5a5e1211cb453 Mon Sep 17 00:00:00 2001 From: Simon Legner Date: Wed, 12 Apr 2023 22:28:04 +0200 Subject: [PATCH 0045/1259] Update Vitest documentation (0.30.1) --- lib/docs/scrapers/vitest.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/docs/scrapers/vitest.rb b/lib/docs/scrapers/vitest.rb index 3c2b23e396..d3909e1819 100644 --- a/lib/docs/scrapers/vitest.rb +++ b/lib/docs/scrapers/vitest.rb @@ -16,7 +16,7 @@ class Vitest < UrlScraper Licensed under the MIT License. HTML - self.release = '0.27.1' + self.release = '0.30.1' self.base_url = 'https://vitest.dev/' self.initial_paths = %w(guide/) html_filters.push 'vitest/entries', 'vite/clean_html' From e8dcd14cdfefe891feb06b997c7a58dd4b78d35f Mon Sep 17 00:00:00 2001 From: Simon Legner Date: Wed, 12 Apr 2023 22:30:10 +0200 Subject: [PATCH 0046/1259] Update Octave documentation (8.1.0) --- lib/docs/scrapers/octave.rb | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/lib/docs/scrapers/octave.rb b/lib/docs/scrapers/octave.rb index c44a1f6ce6..fa9103fcbe 100644 --- a/lib/docs/scrapers/octave.rb +++ b/lib/docs/scrapers/octave.rb @@ -23,12 +23,17 @@ class Octave < UrlScraper options[:root_title] = 'GNU Octave' options[:attribution] = <<-HTML - © 1996–2022 The Octave Project Developers
+ © 1996–2023 The Octave Project Developers
Permission is granted to make and distribute verbatim copies of this manual provided the copyright notice and this permission notice are preserved on all copies.
Permission is granted to copy and distribute modified versions of this manual under the conditions for verbatim copying, provided that the entire resulting derived work is distributed under the terms of a permission notice identical to this one.
Permission is granted to copy and distribute translations of this manual into another language, under the above conditions for modified versions. HTML + version '8' do + self.release = '8.1.0' + self.base_url = "https://docs.octave.org/v#{self.release}/" + end + version '7' do self.release = '7.2.0' self.base_url = "https://docs.octave.org/v#{self.release}/" From a4b15b6027337d01c26d3a4bba76fb3aecc02d2d Mon Sep 17 00:00:00 2001 From: Simon Legner Date: Wed, 12 Apr 2023 22:48:07 +0200 Subject: [PATCH 0047/1259] Update Redis documentation (7.0.10) --- lib/docs/scrapers/redis.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/docs/scrapers/redis.rb b/lib/docs/scrapers/redis.rb index 46b299af7c..d4c62b42d4 100644 --- a/lib/docs/scrapers/redis.rb +++ b/lib/docs/scrapers/redis.rb @@ -1,7 +1,7 @@ module Docs class Redis < UrlScraper self.type = 'redis' - self.release = '7.0.8' + self.release = '7.0.10' self.base_url = 'https://redis.io/commands' self.links = { home: 'https://redis.io/', @@ -16,7 +16,7 @@ class Redis < UrlScraper options[:follow_links] = ->(filter) { filter.root_page? } options[:attribution] = <<-HTML - © 2009–2022 Salvatore Sanfilippo
+ © 2006–2022 Salvatore Sanfilippo
Licensed under the Creative Commons Attribution-ShareAlike License 4.0. HTML From a7fcbf466051b5b45375fb6a233000f13cb82ca2 Mon Sep 17 00:00:00 2001 From: Simon Legner Date: Wed, 12 Apr 2023 22:55:31 +0200 Subject: [PATCH 0048/1259] Update Babel documentation (7.21.4) --- lib/docs/scrapers/babel.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/docs/scrapers/babel.rb b/lib/docs/scrapers/babel.rb index 79eaa217d3..a5eb603f31 100644 --- a/lib/docs/scrapers/babel.rb +++ b/lib/docs/scrapers/babel.rb @@ -34,7 +34,7 @@ class Babel < UrlScraper HTML version '7' do - self.release = '7.21.1' + self.release = '7.21.4' end version '6' do From 7041e0ba1b9e9cbb0ea62ddb12c635bae81a4b7d Mon Sep 17 00:00:00 2001 From: Florian Scholz Date: Thu, 13 Apr 2023 16:14:01 +0200 Subject: [PATCH 0049/1259] Add links.{code,home} for MDN scrapers --- lib/docs/scrapers/http.rb | 9 +++++++++ lib/docs/scrapers/mdn/css.rb | 4 ++++ lib/docs/scrapers/mdn/dom.rb | 4 ++++ lib/docs/scrapers/mdn/html.rb | 4 ++++ lib/docs/scrapers/mdn/javascript.rb | 4 ++++ lib/docs/scrapers/mdn/mdn.rb | 4 ++++ lib/docs/scrapers/mdn/svg.rb | 4 ++++ lib/docs/scrapers/mdn/web_extensions.rb | 4 ++-- 8 files changed, 35 insertions(+), 2 deletions(-) diff --git a/lib/docs/scrapers/http.rb b/lib/docs/scrapers/http.rb index b8f382189d..a2f4a7f9b0 100644 --- a/lib/docs/scrapers/http.rb +++ b/lib/docs/scrapers/http.rb @@ -8,6 +8,15 @@ class Http < Mdn 'https://developer.mozilla.org/en-US/docs/Web/HTTP', 'https://datatracker.ietf.org/doc/html/', ] + self.links = { + home: 'https://developer.mozilla.org/en-US/docs/Web/HTTP', + code: 'https://github.com/mdn/content/tree/main/files/en-us/web/http' + } + + options[:attribution] = <<-HTML + © 2005–2023 MDN contributors.
+ Licensed under the Creative Commons Attribution-ShareAlike License v2.5 or later. + HTML html_filters.push 'http/clean_html', 'http/entries', 'title' diff --git a/lib/docs/scrapers/mdn/css.rb b/lib/docs/scrapers/mdn/css.rb index 724a6fec28..38ac2de681 100644 --- a/lib/docs/scrapers/mdn/css.rb +++ b/lib/docs/scrapers/mdn/css.rb @@ -4,6 +4,10 @@ class Css < Mdn self.name = 'CSS' self.base_url = 'https://developer.mozilla.org/en-US/docs/Web/CSS' self.root_path = '/Reference' + self.links = { + home: 'https://developer.mozilla.org/en-US/docs/Web/CSS', + code: 'https://github.com/mdn/content/tree/main/files/en-us/web/css' + } html_filters.push 'css/clean_html', 'css/entries' diff --git a/lib/docs/scrapers/mdn/dom.rb b/lib/docs/scrapers/mdn/dom.rb index 7af13d559d..b9466c1e11 100644 --- a/lib/docs/scrapers/mdn/dom.rb +++ b/lib/docs/scrapers/mdn/dom.rb @@ -5,6 +5,10 @@ class Dom < Mdn self.name = 'Web APIs' self.slug = 'dom' self.base_url = 'https://developer.mozilla.org/en-US/docs/Web/API' + self.links = { + home: 'https://developer.mozilla.org/en-US/docs/Web/API', + code: 'https://github.com/mdn/content/tree/main/files/en-us/web/api' + } html_filters.push 'dom/clean_html', 'dom/entries' diff --git a/lib/docs/scrapers/mdn/html.rb b/lib/docs/scrapers/mdn/html.rb index be7e7bae71..4857b70224 100644 --- a/lib/docs/scrapers/mdn/html.rb +++ b/lib/docs/scrapers/mdn/html.rb @@ -5,6 +5,10 @@ class Html < Mdn # release = '2023-01-06' self.name = 'HTML' self.base_url = 'https://developer.mozilla.org/en-US/docs/Web/HTML' + self.links = { + home: 'https://developer.mozilla.org/en-US/docs/Web/HTML', + code: 'https://github.com/mdn/content/tree/main/files/en-us/web/html' + } html_filters.push 'html/clean_html', 'html/entries' diff --git a/lib/docs/scrapers/mdn/javascript.rb b/lib/docs/scrapers/mdn/javascript.rb index 8c1a64bc0a..b935ff9e9a 100644 --- a/lib/docs/scrapers/mdn/javascript.rb +++ b/lib/docs/scrapers/mdn/javascript.rb @@ -6,6 +6,10 @@ class Javascript < Mdn # release = '2023-01-06' self.name = 'JavaScript' self.base_url = 'https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference' + self.links = { + home: 'https://developer.mozilla.org/en-US/docs/Web/JavaScript', + code: 'https://github.com/mdn/content/tree/main/files/en-us/web/javascript' + } html_filters.push 'javascript/clean_html', 'javascript/entries' diff --git a/lib/docs/scrapers/mdn/mdn.rb b/lib/docs/scrapers/mdn/mdn.rb index 54856e475d..00c43c3f20 100644 --- a/lib/docs/scrapers/mdn/mdn.rb +++ b/lib/docs/scrapers/mdn/mdn.rb @@ -2,6 +2,10 @@ module Docs class Mdn < UrlScraper self.abstract = true self.type = 'mdn' + self.links = { + home: 'https://developer.mozilla.org', + code: 'https://github.com/mdn/content' + } html_filters.push 'mdn/clean_html', 'mdn/compat_tables' diff --git a/lib/docs/scrapers/mdn/svg.rb b/lib/docs/scrapers/mdn/svg.rb index 689fae99e7..3fc6711371 100644 --- a/lib/docs/scrapers/mdn/svg.rb +++ b/lib/docs/scrapers/mdn/svg.rb @@ -6,6 +6,10 @@ class Svg < Mdn # release = '2022-09-06' self.name = 'SVG' self.base_url = 'https://developer.mozilla.org/en-US/docs/Web/SVG' + self.links = { + home: 'https://developer.mozilla.org/en-US/docs/Web/SVG', + code: 'https://github.com/mdn/content/tree/main/files/en-us/web/svg' + } html_filters.push 'svg/clean_html', 'svg/entries' diff --git a/lib/docs/scrapers/mdn/web_extensions.rb b/lib/docs/scrapers/mdn/web_extensions.rb index 664ca98552..ccbbe47bd6 100644 --- a/lib/docs/scrapers/mdn/web_extensions.rb +++ b/lib/docs/scrapers/mdn/web_extensions.rb @@ -4,9 +4,9 @@ class WebExtensions < Mdn self.name = 'Web Extensions' self.slug = 'web_extensions' self.links = { - home: 'https://developer.mozilla.org/en-US/docs/Mozilla/Add-ons/WebExtensions' + home: 'https://developer.mozilla.org/en-US/docs/Mozilla/Add-ons/WebExtensions', + code: 'https://github.com/mdn/content/tree/main/files/en-us/mozilla/add-ons/webextensions' } - self.base_url = 'https://developer.mozilla.org/en-US/docs/Mozilla/Add-ons/WebExtensions' html_filters.push 'web_extensions/entries', 'web_extensions/clean_html' From 46f2a8484be66c9e142f520f57979f1cac87cb5b Mon Sep 17 00:00:00 2001 From: Florian Scholz Date: Thu, 13 Apr 2023 17:40:18 +0200 Subject: [PATCH 0050/1259] Remove skip paths of non-existent MDN pages --- lib/docs/scrapers/mdn/html.rb | 6 ------ lib/docs/scrapers/mdn/javascript.rb | 7 ------- lib/docs/scrapers/mdn/svg.rb | 2 -- 3 files changed, 15 deletions(-) diff --git a/lib/docs/scrapers/mdn/html.rb b/lib/docs/scrapers/mdn/html.rb index be7e7bae71..3144231da9 100644 --- a/lib/docs/scrapers/mdn/html.rb +++ b/lib/docs/scrapers/mdn/html.rb @@ -10,12 +10,6 @@ class Html < Mdn options[:root_title] = 'HTML' - options[:skip] = %w( - /index - /Element/shadow - /Element/webkit-meter-optimum-value - ) - options[:replace_paths] = { '/Element/h1' => '/Element/Heading_Elements', '/Element/h2' => '/Element/Heading_Elements', diff --git a/lib/docs/scrapers/mdn/javascript.rb b/lib/docs/scrapers/mdn/javascript.rb index 8c1a64bc0a..60e7a1ed9a 100644 --- a/lib/docs/scrapers/mdn/javascript.rb +++ b/lib/docs/scrapers/mdn/javascript.rb @@ -11,13 +11,6 @@ class Javascript < Mdn options[:root_title] = 'JavaScript' - # Don't want - options[:skip] = %w( - /Methods_Index - /Properties_Index - /Operators/Legacy_generator_function - /Statements/Legacy_generator_function) - # Duplicates options[:skip].concat %w( /Global_Objects diff --git a/lib/docs/scrapers/mdn/svg.rb b/lib/docs/scrapers/mdn/svg.rb index 689fae99e7..934b640300 100644 --- a/lib/docs/scrapers/mdn/svg.rb +++ b/lib/docs/scrapers/mdn/svg.rb @@ -21,8 +21,6 @@ class Svg < Mdn end end - options[:skip] = %w(/Compatibility_sources /FAQ) - options[:fix_urls] = ->(url) do url.sub! 'https://developer.mozilla.org/en-US/Web/SVG', Svg.base_url url.sub! 'https://developer.mozilla.org/en-US/docs/SVG', Svg.base_url From 426be3138e359fc664974cc00bfea0a5cd839262 Mon Sep 17 00:00:00 2001 From: Florian Scholz Date: Thu, 13 Apr 2023 17:46:05 +0200 Subject: [PATCH 0051/1259] Fix --- lib/docs/scrapers/mdn/javascript.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/docs/scrapers/mdn/javascript.rb b/lib/docs/scrapers/mdn/javascript.rb index 60e7a1ed9a..1049d6d8a1 100644 --- a/lib/docs/scrapers/mdn/javascript.rb +++ b/lib/docs/scrapers/mdn/javascript.rb @@ -12,7 +12,7 @@ class Javascript < Mdn options[:root_title] = 'JavaScript' # Duplicates - options[:skip].concat %w( + options[:skip] = %w( /Global_Objects /Operators /Statements) From 8f0edbaaec5c1e38cfc97b96937c4567b72cc819 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 15 Apr 2023 00:34:42 +0000 Subject: [PATCH 0052/1259] chore(deps): update dependency sinatra-contrib to v3.0.6 --- Gemfile.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index be0265a8a7..0ffb5fa057 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -71,7 +71,7 @@ GEM pry (>= 0.13, < 0.15) racc (1.6.2) rack (2.2.6.4) - rack-protection (3.0.5) + rack-protection (3.0.6) rack rack-ssl-enforcer (0.2.9) rack-test (2.1.0) @@ -91,16 +91,16 @@ GEM sass-listen (4.0.0) rb-fsevent (~> 0.9, >= 0.9.4) rb-inotify (~> 0.9, >= 0.9.7) - sinatra (3.0.5) + sinatra (3.0.6) mustermann (~> 3.0) rack (~> 2.2, >= 2.2.4) - rack-protection (= 3.0.5) + rack-protection (= 3.0.6) tilt (~> 2.0) - sinatra-contrib (3.0.5) + sinatra-contrib (3.0.6) multi_json mustermann (~> 3.0) - rack-protection (= 3.0.5) - sinatra (= 3.0.5) + rack-protection (= 3.0.6) + sinatra (= 3.0.6) tilt (~> 2.0) sprockets (3.7.2) concurrent-ruby (~> 1.0) From ad56aa406b0df49861d58e2dcdcb0c25e6499752 Mon Sep 17 00:00:00 2001 From: Simon Legner Date: Mon, 24 Apr 2023 12:05:37 +0200 Subject: [PATCH 0053/1259] MDN scrapers: fix browser compatibility table --- lib/docs/filters/mdn/compat_tables.rb | 47 +++++++++------------------ lib/docs/scrapers/mdn/mdn.rb | 3 +- 2 files changed, 18 insertions(+), 32 deletions(-) diff --git a/lib/docs/filters/mdn/compat_tables.rb b/lib/docs/filters/mdn/compat_tables.rb index b9891db100..d51c8f2c81 100644 --- a/lib/docs/filters/mdn/compat_tables.rb +++ b/lib/docs/filters/mdn/compat_tables.rb @@ -71,27 +71,14 @@ def generate_compatibility_table() end def request_bcd_uris - url = current_url.to_s + '/index.json' - response = Request.run url - index_json = JSON.load response.body - - uris = [] - - index_json['doc']['body'].each do |element| - uris.push(element['value']['dataURL']) if element['type'] == 'browser_compatibility' and element['value']['dataURL'] - end - - uris.map! do |uri| - tmp_uri = URI.parse(base_url.to_s) - tmp_uri.path = uri - uri = tmp_uri.to_s - end - - return uris + hydration = JSON.load at_css('#hydration').text + files = hydration['doc']['browserCompat'] || [] + files.map { |file| "https://bcd.developer.mozilla.org/bcd/api/v0/current/#{file}.json" } end def generate_compatibility_table_wrapper(url) response = Request.run url + return "" unless response.success? @json_data = JSON.load(response.body)['data'] html_table = generate_basic_html_table() @@ -202,32 +189,30 @@ def add_data_to_entry(json, entry) if version_removed[0] format_string = "" + elsif version_added[0] == 'No' + format_string = "" + elsif version_added[0] == '?' + format_string = "" else - if version_added[0] == 'No' - format_string = "" - elsif version_added[0] == '?' - format_string = "" - else - format_string = "" - end + format_string = "" end for value in (0..version_added.length-1) do if version_removed[value] - format_string += "
#{version_added[value]}-#{version_removed[value]}
" + version_string = "#{version_added[value]}–#{version_removed[value]}" else - if version_added[value] == 'No' - format_string += "
#{version_added[value]}
" - else - format_string += "
#{version_added[value]}
" - end + version_string = version_added[value] end if notes[value] - format_string += "
#{notes[value]}
" + format_string += "
#{version_string}#{notes[value]}
" + else + format_string += "
#{version_string}
" end end + format_string += "" + else format_string = "
?
" end diff --git a/lib/docs/scrapers/mdn/mdn.rb b/lib/docs/scrapers/mdn/mdn.rb index 00c43c3f20..7ca01b050a 100644 --- a/lib/docs/scrapers/mdn/mdn.rb +++ b/lib/docs/scrapers/mdn/mdn.rb @@ -7,7 +7,8 @@ class Mdn < UrlScraper code: 'https://github.com/mdn/content' } - html_filters.push 'mdn/clean_html', 'mdn/compat_tables' + html_filters.insert_before 'container', 'mdn/compat_tables' # needs access to - - """ - source.replace / +\ +` + ); + return source.replace(/ \ -` +`, ); return source.replace(/