Merge branch 'dev'

ddnexus · Sep 27, 2023 · 70905da · 70905da
2 parents cd2f336 + 1bac5a7
commit 70905da
Show file tree

Hide file tree

Showing 21 changed files with 837 additions and 796 deletions.
diff --git a/.github/.env b/.github/.env
@@ -1,2 +1,2 @@
 GEM=pagy
-VERSION=6.0.4
+VERSION=6.1.0
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -25,6 +25,11 @@ None
 
 <hr>
 
+## Version 6.1.0
+
+- Add Vietnamese locale (#550)
+- Maintenance (docs, test, gems and node modules updates) fixes and improvements
+
 ## Version 6.0.4
 
 - Updated gems and npm modules

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,33 +1,35 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (7.0.5)
+    activesupport (7.0.8)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
     ansi (1.5.0)
     ast (2.4.2)
+    base64 (0.1.1)
     benchmark-ips (2.12.0)
     builder (3.2.4)
     codecov (0.6.0)
       simplecov (>= 0.15, < 0.22)
     concurrent-ruby (1.2.2)
     docile (1.4.0)
-    ffi (1.15.5)
+    ffi (1.16.2)
     i18n (1.14.1)
       concurrent-ruby (~> 1.0)
     json (2.6.3)
     kalibera (0.1.2)
       memoist (~> 0.16)
       rbzip2 (~> 0.3)
+    language_server-protocol (3.17.0.3)
     listen (3.8.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     memoist (0.16.2)
     memory_profiler (1.0.1)
-    minitest (5.18.1)
-    minitest-reporters (1.6.0)
+    minitest (5.20.0)
+    minitest-reporters (1.6.1)
       ansi
       builder
       minitest (>= 5.0)
@@ -36,17 +38,17 @@ GEM
     mustermann (3.0.0)
       ruby2_keywords (~> 0.0.1)
     nio4r (2.5.9)
-    oj (3.15.0)
+    oj (3.16.1)
     parallel (1.23.0)
     parser (3.2.2.3)
       ast (~> 2.4.1)
       racc
-    puma (6.3.0)
+    puma (6.4.0)
       nio4r (~> 2.0)
     racc (1.7.1)
-    rack (2.2.7)
-    rack-protection (3.0.6)
-      rack
+    rack (2.2.8)
+    rack-protection (3.1.0)
+      rack (~> 2.2, >= 2.2.4)
     rainbow (3.1.1)
     rake (13.0.6)
     rake-manifest (0.2.3)
@@ -58,24 +60,26 @@ GEM
     rematch (1.4.2)
     rerun (0.14.0)
       listen (~> 3.0)
-    rexml (3.2.5)
-    rubocop (1.52.1)
+    rexml (3.2.6)
+    rubocop (1.56.3)
+      base64 (~> 0.1.1)
       json (~> 2.3)
+      language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
       parser (>= 3.2.2.3)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.28.0, < 2.0)
+      rubocop-ast (>= 1.28.1, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
     rubocop-ast (1.29.0)
       parser (>= 3.2.1.0)
-    rubocop-minitest (0.31.0)
+    rubocop-minitest (0.32.2)
       rubocop (>= 1.39, < 2.0)
     rubocop-packaging (0.5.2)
       rubocop (>= 1.33, < 2.0)
-    rubocop-performance (1.18.0)
+    rubocop-performance (1.19.1)
       rubocop (>= 1.7.0, < 2.0)
       rubocop-ast (>= 0.4.0)
     rubocop-rake (0.6.0)
@@ -88,18 +92,18 @@ GEM
       simplecov_json_formatter (~> 0.1)
     simplecov-html (0.12.3)
     simplecov_json_formatter (0.1.4)
-    sinatra (3.0.6)
+    sinatra (3.1.0)
       mustermann (~> 3.0)
       rack (~> 2.2, >= 2.2.4)
-      rack-protection (= 3.0.6)
+      rack-protection (= 3.1.0)
       tilt (~> 2.0)
-    sinatra-contrib (3.0.6)
+    sinatra-contrib (3.1.0)
       multi_json
       mustermann (~> 3.0)
-      rack-protection (= 3.0.6)
-      sinatra (= 3.0.6)
+      rack-protection (= 3.1.0)
+      sinatra (= 3.1.0)
       tilt (~> 2.0)
-    tilt (2.2.0)
+    tilt (2.3.0)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     unicode-display_width (2.4.2)

diff --git a/bump.sh b/bump.sh
@@ -2,9 +2,6 @@
 
 set -e
 
-# Ensure that the ci-cache is up-to-date
-./e2e/ci-cache.sh
-
 # Exit if the working tree is dirty
 test -n "$(git status --porcelain)" && echo "Working tree dirty!" && exit 1
 

diff --git a/e2e/package.json b/e2e/package.json
@@ -8,20 +8,20 @@
     },
     "devDependencies": {
         "@cypress/snapshot": "^2.1.7",
-        "@types/node": "20.3.1",
-        "@typescript-eslint/eslint-plugin": "5.60.0",
-        "@typescript-eslint/parser": "5.60.0",
-        "cypress": "12.14.0",
-        "cypress-html-validate": "6.0.0",
-        "eslint": "8.43.0",
+        "@types/node": "20.7.0",
+        "@typescript-eslint/eslint-plugin": "6.7.3",
+        "@typescript-eslint/parser": "6.7.3",
+        "cypress": "13.2.0",
+        "cypress-html-validate": "6.1.0",
+        "eslint": "8.50.0",
         "eslint-plugin-align-assignments": "^1.1.2",
-        "eslint-plugin-cypress": "2.13.3",
-        "eslint-plugin-import": "2.27.5",
+        "eslint-plugin-cypress": "2.15.1",
+        "eslint-plugin-import": "2.28.1",
         "eslint-plugin-node": "^11.1.0",
         "eslint-plugin-promise": "6.1.1",
-        "html-validate": "8.0.5",
-        "start-server-and-test": "2.0.0",
-        "typescript": "5.1.3"
+        "html-validate": "8.4.1",
+        "start-server-and-test": "2.0.1",
+        "typescript": "5.2.2"
     },
     "scripts": {
         "lint-fix": "eslint --fix cypress --ext .ts",

diff --git a/e2e/snapshots.js b/e2e/snapshots.js
diff --git a/lib/config/pagy.rb b/lib/config/pagy.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Pagy initializer file (6.0.4)
+# Pagy initializer file (6.1.0)
 # Customize only what you really need and notice that the core Pagy works also without any of the following lines.
 # Should you just cherry pick part of this file, please maintain the require-order of the extras