Update Ruby and javascript dependencies

Put base url in Jekyll config to ensure rss feed has correct path Popper needs to be explicitly imported Replace data-toggle by data-bs-toggle
apache · Jan 9, 2024 · 305e341 · 305e341
1 parent 101ae26
commit 305e341
Show file tree

Hide file tree

Showing 8 changed files with 348 additions and 343 deletions.
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -41,34 +41,33 @@ jobs:
           cache: "npm"
       - name: Configure for production
         run: |
-          echo "JEKYLL_BASE_URL=" >> ${GITHUB_ENV}
           echo "ORIGIN=${{ github.repository }}" >> ${GITHUB_ENV}
           echo "TARGET_BRANCH=asf-site" >> ${GITHUB_ENV}
-          echo >> _extra_config.yml
+          echo "base_url: " >> _extra_config.yml
         if: |
           github.event_name == 'push' &&
             github.repository == 'apache/arrow-site'
       - name: Configure for GitHub Pages on push to main branch
         run: |
           owner=$(jq --raw-output .repository.owner.login ${GITHUB_EVENT_PATH})
           repository=$(jq --raw-output .repository.name ${GITHUB_EVENT_PATH})
-          echo "JEKYLL_BASE_URL=/${repository}" >> ${GITHUB_ENV}
           echo "ORIGIN=${owner}/${repository}" >> ${GITHUB_ENV}
           echo "TARGET_BRANCH=gh-pages" >> ${GITHUB_ENV}
           # "url:" is for the opengraph tags, and it can't be relative
-          echo "url: https://${owner}.github.io/${repository}" >> _extra_config.yml
+          echo "url: https://${owner}.github.io" >> _extra_config.yml
+          echo "base_url: /${repository}" >> _extra_config.yml
         if: |
           github.event_name == 'push' &&
             github.repository != 'apache/arrow-site'
       - name: Configure for GitHub Pages on pull request
         run: |
           owner=$(jq --raw-output .pull_request.head.user.login ${GITHUB_EVENT_PATH})
           repository=$(jq --raw-output .pull_request.head.repo.name ${GITHUB_EVENT_PATH})
-          echo "JEKYLL_BASE_URL=/${repository}" >> ${GITHUB_ENV}
           echo "ORIGIN=${owner}/${repository}" >> ${GITHUB_ENV}
           echo "TARGET_BRANCH=gh-pages" >> ${GITHUB_ENV}
           # "url:" is for the opengraph tags, and it can't be relative
-          echo "url: https://${owner}.github.io/${repository}" >> _extra_config.yml
+          echo "url: https://${owner}.github.io" >> _extra_config.yml
+          echo "baseurl: /${repository}" >> _extra_config.yml
         if: |
           github.event_name == 'pull_request'
       - name: Build

diff --git a/.ruby-version b/.ruby-version
@@ -1 +1 @@
-3.0.2
+3.3.0
diff --git a/Gemfile b/Gemfile
@@ -24,7 +24,7 @@ gem "tzinfo-data", platforms: [:mingw, :mswin, :x64_mingw, :jruby]
 gem "webrick"
 
 group :jekyll_plugins do
-  gem "jekyll-feed", "~> 0.6"
+  gem "jekyll-feed", "~> 0.17.0"
   gem "jekyll-jupyter-notebook"
   gem "jekyll-seo-tag"
 end
diff --git a/Rakefile b/Rakefile
@@ -51,8 +51,6 @@ task :default => :serve
 desc "Generate site"
 task :generate => webpacked_js do
   command_line = ["jekyll", "build"]
-  base_url = ENV["JEKYLL_BASE_URL"]
-  command_line << "--baseurl=#{base_url}" if base_url
   extra_config = ENV["JEKYLL_EXTRA_CONFIG"]
   command_line << "--config=_config.yml,#{extra_config}" if extra_config
   destination = ENV["JEKYLL_DESTINATION"]

diff --git a/_includes/header.html b/_includes/header.html
@@ -14,7 +14,7 @@
         <li class="nav-item"><a class="nav-link" href="{{ site.baseurl }}/blog" role="button" aria-haspopup="true" aria-expanded="false">Blog</a></li>
         <li class="nav-item dropdown">
           <a class="nav-link dropdown-toggle" href="#"
-             id="navbarDropdownGetArrow" role="button" data-toggle="dropdown"
+             id="navbarDropdownGetArrow" role="button" data-bs-toggle="dropdown"
              aria-haspopup="true" aria-expanded="false">
              Get Arrow
           </a>
@@ -26,7 +26,7 @@
         </li>
         <li class="nav-item dropdown">
           <a class="nav-link dropdown-toggle" href="#"
-             id="navbarDropdownDocumentation" role="button" data-toggle="dropdown"
+             id="navbarDropdownDocumentation" role="button" data-bs-toggle="dropdown"
              aria-haspopup="true" aria-expanded="false">
              Documentation
           </a>
@@ -50,7 +50,7 @@
         </li>
         <li class="nav-item dropdown">
           <a class="nav-link dropdown-toggle" href="#"
-             id="navbarDropdownSubprojects" role="button" data-toggle="dropdown"
+             id="navbarDropdownSubprojects" role="button" data-bs-toggle="dropdown"
              aria-haspopup="true" aria-expanded="false">
              Subprojects
           </a>
@@ -64,7 +64,7 @@
         </li>
         <li class="nav-item dropdown">
           <a class="nav-link dropdown-toggle" href="#"
-             id="navbarDropdownCommunity" role="button" data-toggle="dropdown"
+             id="navbarDropdownCommunity" role="button" data-bs-toggle="dropdown"
              aria-haspopup="true" aria-expanded="false">
              Community
           </a>
@@ -82,7 +82,7 @@
         </li>
         <li class="nav-item dropdown">
           <a class="nav-link dropdown-toggle" href="#"
-             id="navbarDropdownASF" role="button" data-toggle="dropdown"
+             id="navbarDropdownASF" role="button" data-bs-toggle="dropdown"
              aria-haspopup="true" aria-expanded="false">
              ASF Links
           </a>

diff --git a/_webpack/main.js b/_webpack/main.js
@@ -15,4 +15,4 @@
 // specific language governing permissions and limitations
 // under the License.
 
-import "bootstrap";
+import { Dropdown } from 'bootstrap';