diff --git a/bridgetown-website/Gemfile b/bridgetown-website/Gemfile index 1a97aee70..35e242ec1 100644 --- a/bridgetown-website/Gemfile +++ b/bridgetown-website/Gemfile @@ -12,7 +12,7 @@ gem "bridgetown-paginate", path: "../bridgetown-paginate" gem "puma", "< 7" gem "bridgetown-feed", "~> 3" -gem "bridgetown-quick-search", "~> 2.0" +gem "bridgetown-quick-search", "~> 3.0" gem "bridgetown-seo-tag", "~> 6.0" gem "bridgetown-svg-inliner", "~> 2.0" diff --git a/bridgetown-website/Gemfile.lock b/bridgetown-website/Gemfile.lock index a0739a530..60917ce2a 100644 --- a/bridgetown-website/Gemfile.lock +++ b/bridgetown-website/Gemfile.lock @@ -59,7 +59,7 @@ PATH GEM remote: https://rubygems.org/ specs: - activesupport (7.1.3.2) + activesupport (7.1.3.4) base64 bigdecimal concurrent-ruby (~> 1.0, >= 1.0.2) @@ -69,34 +69,36 @@ GEM minitest (>= 5.1) mutex_m tzinfo (~> 2.0) - addressable (2.8.6) - public_suffix (>= 2.0.2, < 6.0) + addressable (2.8.7) + public_suffix (>= 2.0.2, < 7.0) amazing_print (1.6.0) ast (2.4.2) base64 (0.2.0) bigdecimal (3.1.8) bridgetown-feed (3.1.2) bridgetown (>= 1.2.0.beta2, < 2.0) - bridgetown-quick-search (2.0.0) - bridgetown (>= 1.2.0.beta2, < 2.0) + bridgetown-quick-search (3.0.3) + bridgetown (>= 1.2.0.beta2, < 3.0) bridgetown-seo-tag (6.0.0) bridgetown (>= 1.2.0.beta5, < 2.0) bridgetown-svg-inliner (2.0.0) bridgetown (>= 1.2.0, < 2.0) nokogiri - concurrent-ruby (1.2.3) + concurrent-ruby (1.3.3) connection_pool (2.4.1) csv (3.3.0) drb (2.2.1) - dry-inflector (1.0.0) - erubi (1.12.0) - faraday (2.9.0) + dry-inflector (1.1.0) + erubi (1.13.0) + faraday (2.10.0) faraday-net_http (>= 2.0, < 3.2) + logger faraday-follow_redirects (0.3.0) faraday (>= 1, < 3) - faraday-net_http (3.1.0) + faraday-net_http (3.1.1) net-http - ffi (1.16.3) + ffi (1.17.0-arm64-darwin) + ffi (1.17.0-x86_64-linux-gnu) gems (1.2.0) hash_with_dot_access (2.1.1) i18n (1.14.5) @@ -110,41 +112,43 @@ GEM listen (3.9.0) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) - minitest (5.22.3) + logger (1.6.0) + minitest (5.24.1) mutex_m (0.2.0) net-http (0.4.1) uri nio4r (2.7.3) - nokogiri (1.16.4-arm64-darwin) + nokogiri (1.16.7-arm64-darwin) racc (~> 1.4) - nokogiri (1.16.4-x86_64-linux) + nokogiri (1.16.7-x86_64-linux) racc (~> 1.4) nokolexbor (0.5.4-arm64-darwin) nokolexbor (0.5.4-x86_64-linux) - parser (3.3.1.0) + parser (3.3.4.0) ast (~> 2.4.1) racc - public_suffix (5.0.5) + public_suffix (6.0.1) puma (6.4.2) nio4r (~> 2.0) - racc (1.7.3) - rack (3.0.11) + racc (1.8.1) + rack (3.1.7) rackup (2.1.0) rack (>= 3) webrick (~> 1.8) rake (13.2.1) rb-fsevent (0.11.2) - rb-inotify (0.10.1) + rb-inotify (0.11.1) ffi (~> 1.0) regexp_parser (2.1.1) - rexml (3.2.6) - roda (3.80.0) + rexml (3.3.2) + strscan + roda (3.82.0) rack - rouge (4.2.1) + rouge (4.3.0) ruby2js (5.1.2) parser regexp_parser (~> 2.1.1) - serbea (2.1.0) + serbea (2.2.0) erubi (>= 1.10) tilt (~> 2.0) signalize (1.3.0) @@ -152,13 +156,14 @@ GEM streamlined (0.5.2) serbea (>= 2.1) zeitwerk (~> 2.5) + strscan (3.1.0) thor (1.3.1) - tilt (2.3.0) + tilt (2.4.0) tzinfo (2.0.6) concurrent-ruby (~> 1.0) uri (0.13.0) webrick (1.8.1) - zeitwerk (2.6.13) + zeitwerk (2.6.17) PLATFORMS arm64-darwin-22 @@ -171,7 +176,7 @@ DEPENDENCIES bridgetown-feed (~> 3) bridgetown-foundation! bridgetown-paginate! - bridgetown-quick-search (~> 2.0) + bridgetown-quick-search (~> 3.0) bridgetown-seo-tag (~> 6.0) bridgetown-svg-inliner (~> 2.0) gems (~> 1.2) diff --git a/bridgetown-website/frontend/javascript/index.js.rb b/bridgetown-website/frontend/javascript/index.js.rb index 270674428..0da765002 100644 --- a/bridgetown-website/frontend/javascript/index.js.rb +++ b/bridgetown-website/frontend/javascript/index.js.rb @@ -29,7 +29,7 @@ import "./turbo_transitions.js.rb" async def import_additional_dependencies() - await import("bridgetown-quick-search/dist") + await import("bridgetown-quick-search") document.query_selector("bridgetown-search-form > input").add_event_listener :keydown do |event| if event.key_code == 13 diff --git a/bridgetown-website/package-lock.json b/bridgetown-website/package-lock.json index ffae55714..866de9536 100644 --- a/bridgetown-website/package-lock.json +++ b/bridgetown-website/package-lock.json @@ -11,7 +11,7 @@ "@hotwired/turbo": "^7.1.0", "@ruby2js/esbuild-plugin": "^1.0.0", "@shoelace-style/shoelace": "^2.0.0-beta.82", - "bridgetown-quick-search": "1.1.3", + "bridgetown-quick-search": "^3.0.3", "hotkeys-js": "^3.8.7", "smoothscroll-polyfill": "^0.4.4" }, @@ -114,16 +114,6 @@ "node": ">=4" } }, - "node_modules/@babel/runtime": { - "version": "7.18.9", - "license": "MIT", - "dependencies": { - "regenerator-runtime": "^0.13.4" - }, - "engines": { - "node": ">=6.9.0" - } - }, "node_modules/@csstools/postcss-cascade-layers": { "version": "1.0.5", "dev": true, @@ -467,6 +457,11 @@ "version": "1.0.8", "license": "BSD-3-Clause" }, + "node_modules/@lit-labs/ssr-dom-shim": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/@lit-labs/ssr-dom-shim/-/ssr-dom-shim-1.2.0.tgz", + "integrity": "sha512-yWJKmpGE6lUURKAaIltoPIE/wrbY3TEkqQt+X0m+7fQNnAv0keydnYvbiJFP1PnMhizmIWRWOG5KLhYyc/xl+g==" + }, "node_modules/@lit/reactive-element": { "version": "1.4.1", "license": "BSD-3-Clause" @@ -730,14 +725,50 @@ } }, "node_modules/bridgetown-quick-search": { - "version": "1.1.3", - "license": "MIT", + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/bridgetown-quick-search/-/bridgetown-quick-search-3.0.3.tgz", + "integrity": "sha512-UPdg4SfOap/qXi7K6eErtYNnQTYgk8UX2Rkx0m6PQIoNkHa9WhJSKdjlGLqAKq3R3fefFzQB7ypJlHLNn7qceA==", "dependencies": { - "@babel/runtime": "^7.10.1", - "lit": "^2.0.0", + "lit": "^3.1.0", "lunr": "^2.3.8" } }, + "node_modules/bridgetown-quick-search/node_modules/@lit/reactive-element": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/@lit/reactive-element/-/reactive-element-2.0.4.tgz", + "integrity": "sha512-GFn91inaUa2oHLak8awSIigYz0cU0Payr1rcFsrkf5OJ5eSPxElyZfKh0f2p9FsTiZWXQdWGJeXZICEfXXYSXQ==", + "dependencies": { + "@lit-labs/ssr-dom-shim": "^1.2.0" + } + }, + "node_modules/bridgetown-quick-search/node_modules/lit": { + "version": "3.1.4", + "resolved": "https://registry.npmjs.org/lit/-/lit-3.1.4.tgz", + "integrity": "sha512-q6qKnKXHy2g1kjBaNfcoLlgbI3+aSOZ9Q4tiGa9bGYXq5RBXxkVTqTIVmP2VWMp29L4GyvCFm8ZQ2o56eUAMyA==", + "dependencies": { + "@lit/reactive-element": "^2.0.4", + "lit-element": "^4.0.4", + "lit-html": "^3.1.2" + } + }, + "node_modules/bridgetown-quick-search/node_modules/lit-element": { + "version": "4.0.6", + "resolved": "https://registry.npmjs.org/lit-element/-/lit-element-4.0.6.tgz", + "integrity": "sha512-U4sdJ3CSQip7sLGZ/uJskO5hGiqtlpxndsLr6mt3IQIjheg93UKYeGQjWMRql1s/cXNOaRrCzC2FQwjIwSUqkg==", + "dependencies": { + "@lit-labs/ssr-dom-shim": "^1.2.0", + "@lit/reactive-element": "^2.0.4", + "lit-html": "^3.1.2" + } + }, + "node_modules/bridgetown-quick-search/node_modules/lit-html": { + "version": "3.1.4", + "resolved": "https://registry.npmjs.org/lit-html/-/lit-html-3.1.4.tgz", + "integrity": "sha512-yKKO2uVv7zYFHlWMfZmqc+4hkmSbFp8jgjdZY9vvR9jr4J8fH6FUMXhr+ljfELgmjpvlF7Z1SJ5n5/Jeqtc9YA==", + "dependencies": { + "@types/trusted-types": "^2.0.2" + } + }, "node_modules/browserslist": { "version": "4.21.3", "dev": true, @@ -2823,10 +2854,6 @@ "node": ">=6" } }, - "node_modules/regenerator-runtime": { - "version": "0.13.9", - "license": "MIT" - }, "node_modules/resolve": { "version": "1.22.1", "dev": true, diff --git a/bridgetown-website/package.json b/bridgetown-website/package.json index 0d7fe0c48..5c413170f 100644 --- a/bridgetown-website/package.json +++ b/bridgetown-website/package.json @@ -21,7 +21,7 @@ "@hotwired/turbo": "^7.1.0", "@ruby2js/esbuild-plugin": "^1.0.0", "@shoelace-style/shoelace": "^2.0.0-beta.82", - "bridgetown-quick-search": "2.0.0", + "bridgetown-quick-search": "^3.0.3", "hotkeys-js": "^3.8.7", "smoothscroll-polyfill": "^0.4.4" },