Update Ruby, Node.js, and Nokogiri versions, and add "Bootstrap tag" …

…functionality
simonneutert · Jan 13, 2024 · f16b67e · f16b67e
1 parent 6441b18
commit f16b67e
Show file tree

Hide file tree

Showing 10 changed files with 46 additions and 17 deletions.
diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
@@ -7,7 +7,7 @@ name: Docker buildx
 
 on:
   schedule:
-    - cron: "0 9 * * 0"
+    - cron: "0 19 1 * *"
   push:
     branches: ["main"]
     # Publish semver tags as releases.
@@ -23,7 +23,8 @@ env:
 
 jobs:
   build:
-    runs-on: ubuntu-latest
+    runs-on: macos-latest-xlarge
+    timeout-minutes: 30
     permissions:
       contents: read
       packages: write

diff --git a/.github/workflows/ruby-main-rust-stable.yml b/.github/workflows/ruby-main-rust-stable.yml
@@ -18,10 +18,11 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, macos-latest, macos-latest-xlarge]
-        ruby-version: ["3.2"]
+        ruby-version: ["3.3"]
         rust-version: ["stable"]
 
     runs-on: ${{ matrix.os }}
+    timeout-minutes: 30
 
     steps:
       - uses: actions/checkout@v3

diff --git a/.github/workflows/ruby-main.yml b/.github/workflows/ruby-main.yml
@@ -18,10 +18,11 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, macos-latest, macos-latest-xlarge]
-        ruby-version: ["3.2"]
+        ruby-version: ["3.3"]
         rust-version: ["1.73.0"]
 
     runs-on: ${{ matrix.os }}
+    timeout-minutes: 30
 
     steps:
       - uses: actions/checkout@v3

diff --git a/.github/workflows/ruby.yml b/.github/workflows/ruby.yml
@@ -18,10 +18,11 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, macos-latest]
-        ruby-version: ["3.2"]
+        ruby-version: ["3.3"]
         rust-version: ["1.73.0"]
 
     runs-on: ${{ matrix.os }}
+    timeout-minutes: 30
 
     steps:
       - uses: actions/checkout@v3

diff --git a/.tool-versions b/.tool-versions
@@ -1,3 +1,3 @@
-ruby 3.2.2
+ruby 3.3.0
 rust 1.73.0
-nodejs 18.14.2
+nodejs 20.10.0
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,19 @@
+# Changelog
+
+All notable changes to this project will be documented in this file.
+
+new entry format:
+
+```markdown
+### next (yyyy/mm/dd)
+
+- [PR#](url) Description. - [@user](url)
+```
+
+### next (yyyy/mm/dd)
+
+- [#106](https://github.com/simonneutert/labradorite-notebook/pulls/106) Updates Ruby, Node.js, and Nokogiri versions, and replace unmaintained tag JS framework with "use-bootstrap-tag". - [@simonneutert](https://github.com/simonneutert)
+
 ### 0.4.4 (2023/11/17)
 
 - Updates dependencies and ci config

diff --git a/Dockerfile b/Dockerfile
@@ -1,6 +1,6 @@
 ##### Setup for Alpine #####
 
-FROM ruby:3.2-alpine AS builder
+FROM ruby:3.3-alpine AS builder
 
 ENV LANG C.UTF-8
 ENV WORKDIR="/app/"
@@ -29,7 +29,7 @@ RUN bundle install -j${bundler_jobs}
 
 ##### MAIN CONTAINER #####
 
-FROM ruby:3.2-alpine
+FROM ruby:3.3-alpine
 
 RUN apk add nodejs npm \
     && rm -rf /var/cache/apk/*; \

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -21,12 +21,12 @@ GEM
     minitar (0.9)
     minitest (5.21.1)
     nio4r (2.7.0)
-    nokogiri (1.15.5)
+    nokogiri (1.16.0)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
-    nokogiri (1.15.5-arm64-darwin)
+    nokogiri (1.16.0-arm64-darwin)
       racc (~> 1.4)
-    nokogiri (1.15.5-x86_64-linux)
+    nokogiri (1.16.0-x86_64-linux)
       racc (~> 1.4)
     parallel (1.24.0)
     parser (3.2.2.4)
@@ -136,4 +136,4 @@ DEPENDENCIES
   yard (~> 0.9.34)
 
 BUNDLED WITH
-   2.4.22
+   2.5.4
diff --git a/views/layout.erb b/views/layout.erb
@@ -20,6 +20,7 @@
     <title>Labradorite</title>
     <link href="https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-iYQeCzEYFbKjA/T2uDLTpkwGzCiq6soy8tYaI1GyVh/UjpbCx/TYkiZhlZB6+fzT" crossorigin="anonymous">
     <script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/js/bootstrap.bundle.min.js" integrity="sha384-u1OknCvxWvY5kfmNBILK2hRnQC3Pr17a+RTT6rIHI7NnikvbZlHgTPOOmMi466C8" crossorigin="anonymous"></script>
+    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/[email protected]/dist/use-bootstrap-tag.min.css">
     <script>
       function ready(fn) {
         if (document.readyState !== "loading") {
@@ -31,6 +32,7 @@
     </script>
   </head>
   <body>
+    <script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/use-bootstrap-tag.min.js"></script>
     <div class="container my-4">
       <%= yield %>
     </div>

diff --git a/views/memos/edit.erb b/views/memos/edit.erb
@@ -1,7 +1,5 @@
 <link href="https://releases.transloadit.com/uppy/v3.0.1/uppy.min.css" rel="stylesheet">
-<link rel="stylesheet" href="https://unpkg.com/[email protected]/dist/tagin.min.css">
-<script src="https://unpkg.com/[email protected]/dist/tagin.min.js"></script>
-<div id="memos-edit" class="enable-tagin">
+<div id="memos-edit">
   <div class="row">
     <div class="col">
       <a href="<%= @current_path_memo %>" class="btn btn-primary">Back</a>
@@ -19,7 +17,13 @@
           <input type="text" id="title" name="title" class="form-control" value="<%= @meta_struct.title %>" placeholder="Your Title Here...">
         </div>
         <div class="col-12 col-sm-6 my-4 my-sm-0">
-          <input type="text" name="tags" class="form-control tagin" value="<%= @meta_struct.tags %>">
+          <input type="text" 
+                id="taglist" 
+                name="tags"
+                class="form-control"
+                data-ub-tag-separator=","
+                value="<%= @meta_struct.tags %>"
+          >
         </div>
       </div>
       <div>
@@ -114,3 +118,6 @@
   // Todo: have the path put in a data attribute
   ready(() => initMemosUpdate("memo-form", "/api/v1<%= @current_path_memo %>/update"))
 </script>
+<script>
+  ready(() => UseBootstrapTag(document.getElementById('taglist')))
+</script>