diff --git a/.eslintrc.json b/.eslintrc.json
deleted file mode 100644
index ac44d5236..000000000
--- a/.eslintrc.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "root": true,
-    "env": {
-        "browser": true,
-        "es2021": true
-    },
-    "extends": [
-        "eslint:recommended",
-        "plugin:@typescript-eslint/recommended"
-    ],
-    "plugins": [
-        "@typescript-eslint",
-        "align-assignments"
-    ],
-    "parser": "@typescript-eslint/parser",
-    "parserOptions": {
-        "ecmaVersion": "latest"
-    },
-    "rules": {
-        "semi": ["warn", "always", {"omitLastInOneLineBlock": true}],
-        "align-assignments/align-assignments": ["warn", { "requiresOnly": false } ]
-    }
-}
diff --git a/.github/ISSUE_TEMPLATE/Code.yml b/.github/ISSUE_TEMPLATE/Code.yml
index 8c5a1b19c..7e3eed9e9 100644
--- a/.github/ISSUE_TEMPLATE/Code.yml
+++ b/.github/ISSUE_TEMPLATE/Code.yml
@@ -19,7 +19,7 @@ body:
     attributes:
       label: 👀 Before submitting...
       options:
-        - label: I upgraded to pagy version 8.4.3
+        - label: I upgraded to pagy version 8.4.4
           required: true
         - label: I searched through the [Documentation](https://ddnexus.github.io/pagy/)
           required: true
diff --git a/.github/latest_release_body.md b/.github/latest_release_body.md
index 06e758615..03f6b610c 100644
--- a/.github/latest_release_body.md
+++ b/.github/latest_release_body.md
@@ -8,10 +8,10 @@
   the [details](https://github.com/ddnexus/pagy/discussions/672#discussioncomment-9212328))
 - See the [CHANGELOG](https://ddnexus.github.io/pagy/changelog) for possible breaking changes
 
-### Changes in 8.4.3
+### Changes in 8.4.4
 
 <!-- changes start -->
-- Deprecate/rename javascript files keeping copies of old files to avoid production breaking changes; updates playground apps
+- Update eslint: new configuration, stricter rules and javascript code
 <!-- changes end -->
 
 [CHANGELOG](https://ddnexus.github.io/pagy/changelog)
diff --git a/.idea/runConfigurations/Build_src.xml b/.idea/runConfigurations/Build_Pagy.xml
similarity index 82%
rename from .idea/runConfigurations/Build_src.xml
rename to .idea/runConfigurations/Build_Pagy.xml
index 07e0848aa..40409504b 100644
--- a/.idea/runConfigurations/Build_src.xml
+++ b/.idea/runConfigurations/Build_Pagy.xml
@@ -1,8 +1,8 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Build src" type="ShConfigurationType">
+  <configuration default="false" name="Build Pagy" type="ShConfigurationType">
     <option name="SCRIPT_TEXT" value="" />
     <option name="INDEPENDENT_SCRIPT_PATH" value="true" />
-    <option name="SCRIPT_PATH" value="$PROJECT_DIR$/src/build.sh" />
+    <option name="SCRIPT_PATH" value="$PROJECT_DIR$/src/build" />
     <option name="SCRIPT_OPTIONS" value="" />
     <option name="INDEPENDENT_SCRIPT_WORKING_DIRECTORY" value="true" />
     <option name="SCRIPT_WORKING_DIRECTORY" value="$PROJECT_DIR$/src" />
diff --git a/.idea/runConfigurations/Bump_Version.xml b/.idea/runConfigurations/Bump_Version.xml
index dffb5f4f9..d57dc4db9 100644
--- a/.idea/runConfigurations/Bump_Version.xml
+++ b/.idea/runConfigurations/Bump_Version.xml
@@ -2,7 +2,7 @@
   <configuration default="false" name="Bump Version" type="ShConfigurationType">
     <option name="SCRIPT_TEXT" value="" />
     <option name="INDEPENDENT_SCRIPT_PATH" value="true" />
-    <option name="SCRIPT_PATH" value="$PROJECT_DIR$/scripts/bump-version.sh" />
+    <option name="SCRIPT_PATH" value="$PROJECT_DIR$/scripts/bump" />
     <option name="SCRIPT_OPTIONS" value="" />
     <option name="INDEPENDENT_SCRIPT_WORKING_DIRECTORY" value="true" />
     <option name="SCRIPT_WORKING_DIRECTORY" value="$PROJECT_DIR$" />
diff --git a/.idea/runConfigurations/Cypress_Open.xml b/.idea/runConfigurations/Cypress_Open.xml
index c34d69548..49d0b3f9d 100644
--- a/.idea/runConfigurations/Cypress_Open.xml
+++ b/.idea/runConfigurations/Cypress_Open.xml
@@ -1,11 +1,11 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Cypress Open" type="ShConfigurationType" editBeforeRun="true">
-    <option name="SCRIPT_TEXT" value="./cy-open demo" />
+    <option name="SCRIPT_TEXT" value="e2e/cy-open demo" />
     <option name="INDEPENDENT_SCRIPT_PATH" value="true" />
     <option name="SCRIPT_PATH" value="" />
     <option name="SCRIPT_OPTIONS" value="" />
     <option name="INDEPENDENT_SCRIPT_WORKING_DIRECTORY" value="true" />
-    <option name="SCRIPT_WORKING_DIRECTORY" value="$PROJECT_DIR$/e2e" />
+    <option name="SCRIPT_WORKING_DIRECTORY" value="$PROJECT_DIR$" />
     <option name="INDEPENDENT_INTERPRETER_PATH" value="true" />
     <option name="INTERPRETER_PATH" value="/usr/bin/zsh" />
     <option name="INTERPRETER_OPTIONS" value="" />
diff --git a/.idea/runConfigurations/Cyress_Test.xml b/.idea/runConfigurations/Cyress_Test.xml
index 59a458cfa..1078008ef 100644
--- a/.idea/runConfigurations/Cyress_Test.xml
+++ b/.idea/runConfigurations/Cyress_Test.xml
@@ -1,11 +1,11 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Cyress Test" type="ShConfigurationType">
-    <option name="SCRIPT_TEXT" value="./cy-test" />
+    <option name="SCRIPT_TEXT" value="e2e/cy-test" />
     <option name="INDEPENDENT_SCRIPT_PATH" value="true" />
     <option name="SCRIPT_PATH" value="" />
     <option name="SCRIPT_OPTIONS" value="" />
     <option name="INDEPENDENT_SCRIPT_WORKING_DIRECTORY" value="true" />
-    <option name="SCRIPT_WORKING_DIRECTORY" value="$PROJECT_DIR$/e2e" />
+    <option name="SCRIPT_WORKING_DIRECTORY" value="$PROJECT_DIR$" />
     <option name="INDEPENDENT_INTERPRETER_PATH" value="true" />
     <option name="INTERPRETER_PATH" value="/usr/bin/zsh" />
     <option name="INTERPRETER_OPTIONS" value="" />
diff --git a/.idea/runConfigurations/Update_modules.xml b/.idea/runConfigurations/Update_Packages.xml
similarity index 76%
rename from .idea/runConfigurations/Update_modules.xml
rename to .idea/runConfigurations/Update_Packages.xml
index 2051d558f..0362cd0dc 100644
--- a/.idea/runConfigurations/Update_modules.xml
+++ b/.idea/runConfigurations/Update_Packages.xml
@@ -1,6 +1,6 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Update modules" type="ShConfigurationType">
-    <option name="SCRIPT_TEXT" value="cd $PROJECT_DIR$/src &amp;&amp; npm-check -u &amp;&amp; cd $PROJECT_DIR$/e2e &amp;&amp; npm-check -u" />
+  <configuration default="false" name="Update Packages" type="ShConfigurationType">
+    <option name="SCRIPT_TEXT" value="npm-check -u &amp;&amp; npm-check ./e2e -u" />
     <option name="INDEPENDENT_SCRIPT_PATH" value="true" />
     <option name="SCRIPT_PATH" value="" />
     <option name="SCRIPT_OPTIONS" value="" />
diff --git a/CHANGELOG.md b/CHANGELOG.md
index d9b50f685..0142a367e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -29,6 +29,10 @@ If you upgrade from version `< 8.0.0` see the following:
   - `pagy-module.d.ts`: use `pagy.d.ts`
 <hr>
 
+## Version 8.4.4
+
+- Update eslint: new configuration, stricter rules and javascript code
+
 ## Version 8.4.3
 
 - Deprecate/rename javascript files keeping copies of old files to avoid production breaking changes; updates playground apps
diff --git a/Gemfile.lock b/Gemfile.lock
index c81f8f8a0..96eafcf85 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,40 +1,40 @@
 PATH
   remote: gem
   specs:
-    pagy (8.4.3)
+    pagy (8.4.4)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (7.1.3.3)
-      actionpack (= 7.1.3.3)
-      activesupport (= 7.1.3.3)
+    actioncable (7.1.3.4)
+      actionpack (= 7.1.3.4)
+      activesupport (= 7.1.3.4)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
       zeitwerk (~> 2.6)
-    actionmailbox (7.1.3.3)
-      actionpack (= 7.1.3.3)
-      activejob (= 7.1.3.3)
-      activerecord (= 7.1.3.3)
-      activestorage (= 7.1.3.3)
-      activesupport (= 7.1.3.3)
+    actionmailbox (7.1.3.4)
+      actionpack (= 7.1.3.4)
+      activejob (= 7.1.3.4)
+      activerecord (= 7.1.3.4)
+      activestorage (= 7.1.3.4)
+      activesupport (= 7.1.3.4)
       mail (>= 2.7.1)
       net-imap
       net-pop
       net-smtp
-    actionmailer (7.1.3.3)
-      actionpack (= 7.1.3.3)
-      actionview (= 7.1.3.3)
-      activejob (= 7.1.3.3)
-      activesupport (= 7.1.3.3)
+    actionmailer (7.1.3.4)
+      actionpack (= 7.1.3.4)
+      actionview (= 7.1.3.4)
+      activejob (= 7.1.3.4)
+      activesupport (= 7.1.3.4)
       mail (~> 2.5, >= 2.5.4)
       net-imap
       net-pop
       net-smtp
       rails-dom-testing (~> 2.2)
-    actionpack (7.1.3.3)
-      actionview (= 7.1.3.3)
-      activesupport (= 7.1.3.3)
+    actionpack (7.1.3.4)
+      actionview (= 7.1.3.4)
+      activesupport (= 7.1.3.4)
       nokogiri (>= 1.8.5)
       racc
       rack (>= 2.2.4)
@@ -42,35 +42,35 @@ GEM
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.2)
       rails-html-sanitizer (~> 1.6)
-    actiontext (7.1.3.3)
-      actionpack (= 7.1.3.3)
-      activerecord (= 7.1.3.3)
-      activestorage (= 7.1.3.3)
-      activesupport (= 7.1.3.3)
+    actiontext (7.1.3.4)
+      actionpack (= 7.1.3.4)
+      activerecord (= 7.1.3.4)
+      activestorage (= 7.1.3.4)
+      activesupport (= 7.1.3.4)
       globalid (>= 0.6.0)
       nokogiri (>= 1.8.5)
-    actionview (7.1.3.3)
-      activesupport (= 7.1.3.3)
+    actionview (7.1.3.4)
+      activesupport (= 7.1.3.4)
       builder (~> 3.1)
       erubi (~> 1.11)
       rails-dom-testing (~> 2.2)
       rails-html-sanitizer (~> 1.6)
-    activejob (7.1.3.3)
-      activesupport (= 7.1.3.3)
+    activejob (7.1.3.4)
+      activesupport (= 7.1.3.4)
       globalid (>= 0.3.6)
-    activemodel (7.1.3.3)
-      activesupport (= 7.1.3.3)
-    activerecord (7.1.3.3)
-      activemodel (= 7.1.3.3)
-      activesupport (= 7.1.3.3)
+    activemodel (7.1.3.4)
+      activesupport (= 7.1.3.4)
+    activerecord (7.1.3.4)
+      activemodel (= 7.1.3.4)
+      activesupport (= 7.1.3.4)
       timeout (>= 0.4.0)
-    activestorage (7.1.3.3)
-      actionpack (= 7.1.3.3)
-      activejob (= 7.1.3.3)
-      activerecord (= 7.1.3.3)
-      activesupport (= 7.1.3.3)
+    activestorage (7.1.3.4)
+      actionpack (= 7.1.3.4)
+      activejob (= 7.1.3.4)
+      activerecord (= 7.1.3.4)
+      activesupport (= 7.1.3.4)
       marcel (~> 1.0)
-    activesupport (7.1.3.3)
+    activesupport (7.1.3.4)
       base64
       bigdecimal
       concurrent-ruby (~> 1.0, >= 1.0.2)
@@ -95,7 +95,8 @@ GEM
     domain_name (0.6.20240107)
     drb (2.2.1)
     erubi (1.12.0)
-    ffi (1.16.3)
+    ffi (1.17.0-x86_64-darwin)
+    ffi (1.17.0-x86_64-linux-gnu)
     ffi-compiler (1.3.2)
       ffi (>= 1.15.5)
       rake
@@ -144,7 +145,7 @@ GEM
     mustermann (3.0.0)
       ruby2_keywords (~> 0.0.1)
     mutex_m (0.2.0)
-    net-imap (0.4.11)
+    net-imap (0.4.12)
       date
       net-protocol
     net-pop (0.1.2)
@@ -181,20 +182,20 @@ GEM
     rackup (2.1.0)
       rack (>= 3)
       webrick (~> 1.8)
-    rails (7.1.3.3)
-      actioncable (= 7.1.3.3)
-      actionmailbox (= 7.1.3.3)
-      actionmailer (= 7.1.3.3)
-      actionpack (= 7.1.3.3)
-      actiontext (= 7.1.3.3)
-      actionview (= 7.1.3.3)
-      activejob (= 7.1.3.3)
-      activemodel (= 7.1.3.3)
-      activerecord (= 7.1.3.3)
-      activestorage (= 7.1.3.3)
-      activesupport (= 7.1.3.3)
+    rails (7.1.3.4)
+      actioncable (= 7.1.3.4)
+      actionmailbox (= 7.1.3.4)
+      actionmailer (= 7.1.3.4)
+      actionpack (= 7.1.3.4)
+      actiontext (= 7.1.3.4)
+      actionview (= 7.1.3.4)
+      activejob (= 7.1.3.4)
+      activemodel (= 7.1.3.4)
+      activerecord (= 7.1.3.4)
+      activestorage (= 7.1.3.4)
+      activesupport (= 7.1.3.4)
       bundler (>= 1.15.0)
-      railties (= 7.1.3.3)
+      railties (= 7.1.3.4)
     rails-dom-testing (2.2.0)
       activesupport (>= 5.0.0)
       minitest
@@ -202,9 +203,9 @@ GEM
     rails-html-sanitizer (1.6.0)
       loofah (~> 2.21)
       nokogiri (~> 1.14)
-    railties (7.1.3.3)
-      actionpack (= 7.1.3.3)
-      activesupport (= 7.1.3.3)
+    railties (7.1.3.4)
+      actionpack (= 7.1.3.4)
+      activesupport (= 7.1.3.4)
       irb
       rackup (>= 1.0.0)
       rake (>= 12.2)
diff --git a/bun.lockb b/bun.lockb
index 8daff5a90..a05601c8d 100755
Binary files a/bun.lockb and b/bun.lockb differ
diff --git a/e2e/.eslintrc.json b/e2e/.eslintrc.json
deleted file mode 100644
index 7ea034b9d..000000000
--- a/e2e/.eslintrc.json
+++ /dev/null
@@ -1,12 +0,0 @@
-// extend the root config file
-{
-    "env": {
-        "amd": true,
-        "node": true
-    },
-    "extends": ["plugin:cypress/recommended"],
-    "plugins": ["cypress"],
-    "parserOptions": {
-        "sourceType": "module"
-    }
-}
diff --git a/e2e/README.md b/e2e/README.md
index 3c056ec04..d6d733da6 100644
--- a/e2e/README.md
+++ b/e2e/README.md
@@ -3,9 +3,13 @@
 Pagy provides quite a few helpers that render the pagination elements for different js-frameworks on the client side. They are
 tested with the [Pagy Playground](https://ddnexus.github.io/pagy/playground/) apps and [Cypress](https://www.cypress.io).
 
-If you you need to run the E2E tests, here are two different ways to run them.
+Notice: the `e2e` dir containing the cypress tests is also a minimalistic workspace. That is a solution needed to workaround [this cypress issue](https://github.com/cypress-io/cypress/issues/22273) and keep everything cypress-related in a single dir inside the project (instead of files and dirs mixed with the main project). 
+    
+## Testing
 
-## 1. Github Actions
+You have two different ways to run the tests:
+
+### 1. Github Actions
 
 Just create a PR and all the ruby and e2e tests will run on GitHub. Usually this option is fine for simple PRs that pass the ruby
 tests.
@@ -13,14 +17,14 @@ tests.
 **Notice**: This option is not enabled by default in Github for new contributors, however after you create a PR it will get
 enabled ASAP.
 
-## 2. Run E2E Tests On Your System
+### 2. Run E2E Tests On Your System
 
-The test environment uses [bun](https://bun.sh) ([cypress still needs node ATM](https://github.com/cypress-io/cypress/issues/28962) )
+The test environment uses [bun](https://bun.sh) ([but cypress still needs node ATM](https://github.com/cypress-io/cypress/issues/28962) )
 - Install [bun](https://bun.sh/docs/installation)
-- Optional for updating: install `npm-check`: `bun install -g npm-check`.
+- Optional for updating package: install `npm-check`: `bun install -g npm-check`
 - Install modules: `bun install`
 
-### Run the test for all the apps
+#### Run the test for all the apps
 
 You can run all the cypress tests in parallel with:
 
@@ -33,7 +37,7 @@ Notice:
 - The output of the parallel processes get mixed in the same log stream, however the test summaries are prefixed with the app name.
 - The script will return a non-zero status if any of the test fail, and will print a brief feedback.
 
-### Run the test for a single app
+#### Run the test for a single app
 
 You can limit the cypress test to a specific APP:
 
@@ -41,7 +45,7 @@ You can limit the cypress test to a specific APP:
 <local-pagy-dir>/e2e $ ./cy-test repro
 ```
 
-### Run the test interactively
+#### Run the test interactively
 
 You can also run the cypress test interactively (only one APP/file at the time) opening cypress UI:
 
diff --git a/e2e/cy-open b/e2e/cy-open
index b79781b72..a26b21430 100755
--- a/e2e/cy-open
+++ b/e2e/cy-open
@@ -5,6 +5,7 @@ set -e
 app=$1
 port=${2:-8080}
 
-cd -- "$(dirname "$0")"
+root="$(git rev-parse --show-toplevel)"
+. "$root/scripts/root-pwd.sh"
 
 start-test "bundle exec pagy $app -p $port" http://0.0.0.0:$port "cypress open"
diff --git a/e2e/cy-test b/e2e/cy-test
index 1566b705a..e5df4a30f 100755
--- a/e2e/cy-test
+++ b/e2e/cy-test
@@ -5,7 +5,8 @@ set -e
 app=$1
 port=${2:-8080}
 
-cd -- "$(dirname "$0")"
+root="$(git rev-parse --show-toplevel)"
+. "$root/scripts/cd-and-back.sh"
 
 test () {
 	NODE_NO_WARNINGS=1 \
diff --git a/e2e/cypress.config.ts b/e2e/cypress.config.ts
index 154d6d70c..d0ca81570 100644
--- a/e2e/cypress.config.ts
+++ b/e2e/cypress.config.ts
@@ -8,7 +8,7 @@ export default defineConfig(
         e2e: {
             // supportFolder: "support",
             baseUrl: "http://0.0.0.0:8080",
-            setupNodeEvents(on, config) {
+            setupNodeEvents(on) {
                 htmlvalidate.install(on, {
                     rules: {
                         // a few frameworks use improper elements to render various roles
diff --git a/e2e/cypress/support/e2e.ts b/e2e/cypress/support/e2e.ts
index 63e06ec30..91c290524 100644
--- a/e2e/cypress/support/e2e.ts
+++ b/e2e/cypress/support/e2e.ts
@@ -16,7 +16,7 @@
 import "cypress-html-validate/dist/commands";
 import * as cypressSnapshots from "@cypress/snapshot";
 // @ts-expect-error: register does not exist
-cypressSnapshots.register();
+cypressSnapshots.register(); // eslint-disable-line  @typescript-eslint/no-unsafe-call
 afterEach(() => cy.htmlvalidate());
 // Silence issue https://github.com/quasarframework/quasar/issues/2233#issuecomment-1006506083
 // Cypress issue (open) https://github.com/cypress-io/cypress/issues/20341
diff --git a/e2e/cypress/support/snapshots.d.ts b/e2e/cypress/support/snapshots.d.ts
index c47887d0f..256293337 100644
--- a/e2e/cypress/support/snapshots.d.ts
+++ b/e2e/cypress/support/snapshots.d.ts
@@ -1,7 +1,6 @@
 // add a minimal declaration file
 declare module "@cypress/snapshot" {
     global {
-        // eslint-disable-next-line @typescript-eslint/no-namespace
         namespace Cypress {
             interface Chainable {
                 // Missing declaration from snapshots
@@ -10,4 +9,3 @@ declare module "@cypress/snapshot" {
         }
     }
 }
-
diff --git a/e2e/package.json b/e2e/package.json
index ada33dd98..2ef279d54 100644
--- a/e2e/package.json
+++ b/e2e/package.json
@@ -2,18 +2,5 @@
   "name": "pagy.e2e",
   "description": "Pagy E2E Testing",
   "private": true,
-  "type": "module",
-  "devDependencies": {
-    "@cypress/snapshot": "^2.1.7",
-    "@types/node": "20.14.0",
-    "cypress": "13.10.0",
-    "cypress-html-validate": "6.1.0",
-    "eslint-plugin-cypress": "3.3.0",
-    "eslint-plugin-promise": "6.2.0",
-    "html-validate": "8.20.0",
-    "start-server-and-test": "2.0.3"
-  },
-  "scripts": {
-    "lint-fix": "eslint --fix cypress --ext .ts"
-  }
+  "type": "module"
 }
diff --git a/e2e/snapshots.js b/e2e/snapshots.js
index b8ee5875f..da8a06920 100644
--- a/e2e/snapshots.js
+++ b/e2e/snapshots.js
@@ -313,7 +313,7 @@ module.exports = {
       "6": "<span id=\"pagy-info\"\n  class=\"pagy info\">Displaying items 981-1000 of 1000 in total</span>"
     }
   },
-  "__version": "13.10.0",
+  "__version": "13.11.0",
   "[repro] Test helpers": {
     "[repro] Test #nav": {
       "1": "<p id=\"records\">@records: 1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20</p>",
diff --git a/e2e/tsconfig.json b/e2e/tsconfig.json
index 000f421c0..7531f6b86 100644
--- a/e2e/tsconfig.json
+++ b/e2e/tsconfig.json
@@ -1,9 +1,11 @@
 {
-    "include": ["./cypress/**/*.ts"],
+    "include": ["cypress/**/*.ts", "./cypress.config.ts"],
     "compilerOptions": {
+        "baseUrl": "./",
         "strict": true,
         "target": "ESNext",
         "module": "NodeNext",
+        "moduleResolution": "NodeNext",
         "lib": ["esnext", "dom", "dom.iterable"],
         "types": ["cypress", "node"],
         "noEmit": true,
@@ -11,7 +13,6 @@
         "checkJs": false,
         "esModuleInterop": true,
         "allowSyntheticDefaultImports": true,
-        "moduleResolution": "NodeNext",
         "resolveJsonModule": true,
         "allowImportingTsExtensions": true
     },
diff --git a/eslint.config.js b/eslint.config.js
new file mode 100644
index 000000000..f7b379a15
--- /dev/null
+++ b/eslint.config.js
@@ -0,0 +1,46 @@
+import eslint from '@eslint/js';
+import tseslint from 'typescript-eslint';
+import alignAssignments from 'eslint-plugin-align-assignments';
+import pluginCypress from 'eslint-plugin-cypress/flat'
+
+export default tseslint.config(
+  {
+    // We lint only typescript sources and tests. Everything else is generated.
+    files: ['src/pagy.ts', 'e2e/cypress/*.ts', 'e2e/cypress.config.ts'],
+    extends: [
+      eslint.configs.recommended,
+      ...tseslint.configs.recommended,
+      ...tseslint.configs.recommendedTypeChecked,
+      ...tseslint.configs.strict,  // opinionated but ok for now
+      ],
+    plugins: {
+      alignAssignments: alignAssignments,
+      '@typescript-eslint': tseslint.plugin,
+    },
+    languageOptions: {
+      parser: tseslint.parser,
+        parserOptions: {
+        project: true,
+      },
+    },
+    rules: {
+      'alignAssignments/align-assignments': 'warn',
+      'semi': ["warn", "always", {"omitLastInOneLineBlock": true}],
+      '@typescript-eslint/array-type': 'error',
+      '@typescript-eslint/consistent-type-imports': 'error',
+      '@typescript-eslint/no-unsafe-argument': 'error',
+      '@typescript-eslint/no-unsafe-assignment': 'error',
+      '@typescript-eslint/no-unsafe-call': 'error',
+      '@typescript-eslint/no-unsafe-member-access': 'error',
+      '@typescript-eslint/no-unsafe-return': 'error',
+    }
+  },
+  {
+    files: ['e2e/cypress/*.ts', 'e2e/cypress.config.ts'],
+    ...pluginCypress.configs.recommended,
+    rules: {
+      'cypress/no-unnecessary-waiting': 'warn',
+      'cypress/unsafe-to-chain-command': 'error',
+    }
+  }
+);
diff --git a/gem/apps/calendar.ru b/gem/apps/calendar.ru
index ce46a618d..9808cc1a7 100644
--- a/gem/apps/calendar.ru
+++ b/gem/apps/calendar.ru
@@ -18,7 +18,7 @@
 # DOC
 #    https://ddnexus.github.io/pagy/playground/#4-calendar-app
 
-VERSION = '8.4.3'
+VERSION = '8.4.4'
 
 require 'bundler/inline'
 require 'bundler'
diff --git a/gem/apps/demo.ru b/gem/apps/demo.ru
index 145a0e09d..e489ea2b2 100644
--- a/gem/apps/demo.ru
+++ b/gem/apps/demo.ru
@@ -18,7 +18,7 @@
 # DOC
 #    https://ddnexus.github.io/pagy/playground/#3-demo-app
 
-VERSION = '8.4.3'
+VERSION = '8.4.4'
 
 require 'bundler/inline'
 require 'bundler'
diff --git a/gem/apps/rails.ru b/gem/apps/rails.ru
index 6093b5d22..d4c581117 100644
--- a/gem/apps/rails.ru
+++ b/gem/apps/rails.ru
@@ -15,7 +15,7 @@
 # DOC
 #    https://ddnexus.github.io/pagy/playground/#2-rails-app
 
-VERSION = '8.4.3'
+VERSION = '8.4.4'
 
 # Gemfile
 require 'bundler/inline'
diff --git a/gem/apps/repro.ru b/gem/apps/repro.ru
index 18ae03579..16a1b8324 100644
--- a/gem/apps/repro.ru
+++ b/gem/apps/repro.ru
@@ -15,7 +15,7 @@
 # DOC
 #    https://ddnexus.github.io/pagy/playground/#1-repro-app
 
-VERSION = '8.4.3'
+VERSION = '8.4.4'
 
 require 'bundler/inline'
 require 'bundler'
diff --git a/gem/bin/pagy b/gem/bin/pagy
index 53a036974..7209351c4 100755
--- a/gem/bin/pagy
+++ b/gem/bin/pagy
@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
-VERSION = '8.4.3'
+VERSION = '8.4.4'
 APPS    = %w[repro rails demo calendar].freeze
 LINUX   = RbConfig::CONFIG['host_os'].include?('linux')
 
diff --git a/gem/config/pagy.rb b/gem/config/pagy.rb
index 50e193f56..3fca905fb 100644
--- a/gem/config/pagy.rb
+++ b/gem/config/pagy.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Pagy initializer file (8.4.3)
+# Pagy initializer file (8.4.4)
 # 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
 
diff --git a/gem/javascripts/pagy-module.js b/gem/javascripts/pagy-module.js
index b88aaf136..96a59fdda 100644
--- a/gem/javascripts/pagy-module.js
+++ b/gem/javascripts/pagy-module.js
@@ -13,8 +13,7 @@ const Pagy = (() => {
       let html = tokens.before;
       const series = sequels[width.toString()];
       const labels = labelSequels?.[width.toString()] ?? series.map((l) => l.toString());
-      for (const i in series) {
-        const item = series[i];
+      series.forEach((item, i) => {
         const label = labels[i];
         let filled;
         if (typeof item === "number") {
@@ -25,7 +24,7 @@ const Pagy = (() => {
           filled = fillIn(tokens.current, item, label);
         }
         html += typeof trimParam === "string" && item == 1 ? trim(filled, trimParam) : filled;
-      }
+      });
       html += tokens.after;
       el.innerHTML = "";
       el.insertAdjacentHTML("afterbegin", html);
@@ -64,7 +63,7 @@ const Pagy = (() => {
       link.href = url;
       link.click();
     };
-    ["change", "focus"].forEach((e) => input.addEventListener(e, input.select));
+    ["change", "focus"].forEach((e) => input.addEventListener(e, () => input.select()));
     input.addEventListener("focusout", action);
     input.addEventListener("keypress", (e) => {
       if (e.key === "Enter") {
@@ -74,7 +73,7 @@ const Pagy = (() => {
   };
   const trim = (a, param) => a.replace(new RegExp(`[?&]${param}=1\\b(?!&)|\\b${param}=1&`), "");
   return {
-    version: "8.4.3",
+    version: "8.4.4",
     init(arg) {
       const target = arg instanceof Element ? arg : document;
       const elements = target.querySelectorAll("[data-pagy]");
diff --git a/gem/javascripts/pagy.js b/gem/javascripts/pagy.js
index c50549f62..035bf72b3 100644
--- a/gem/javascripts/pagy.js
+++ b/gem/javascripts/pagy.js
@@ -1,4 +1,4 @@
-window.Pagy=(()=>{const j=new ResizeObserver((z)=>z.forEach((B)=>B.target.querySelectorAll(".pagy-rjs").forEach((D)=>D.pagyRender()))),A=(z,[B,D,x,F])=>{const E=z.parentElement??z,H=Object.keys(D).map((G)=>parseInt(G)).sort((G,L)=>L-G);let K=-1;const R=(G,L,M)=>G.replace(/__pagy_page__/g,L).replace(/__pagy_label__/g,M);if((z.pagyRender=function(){const G=H.find((Q)=>Q<E.clientWidth)||0;if(G===K)return;let L=B.before;const M=D[G.toString()],X=x?.[G.toString()]??M.map((Q)=>Q.toString());for(let Q in M){const T=M[Q],$=X[Q];let U;if(typeof T==="number")U=R(B.a,T.toString(),$);else if(T==="gap")U=B.gap;else U=R(B.current,T,$);L+=typeof F==="string"&&T==1?Z(U,F):U}L+=B.after,z.innerHTML="",z.insertAdjacentHTML("afterbegin",L),K=G})(),z.classList.contains("pagy-rjs"))j.observe(E)},C=(z,[B,D])=>Y(z,(x)=>[x,B.replace(/__pagy_page__/,x)],D),J=(z,[B,D,x])=>{Y(z,(F)=>{const E=Math.max(Math.ceil(B/parseInt(F)),1).toString(),H=D.replace(/__pagy_page__/,E).replace(/__pagy_items__/,F);return[E,H]},x)},Y=(z,B,D)=>{const x=z.querySelector("input"),F=z.querySelector("a"),E=x.value,H=function(){if(x.value===E)return;const[K,R,G]=[x.min,x.value,x.max].map((X)=>parseInt(X)||0);if(R<K||R>G){x.value=E,x.select();return}let[L,M]=B(x.value);if(typeof D==="string"&&L==="1")M=Z(M,D);F.href=M,F.click()};["change","focus"].forEach((K)=>x.addEventListener(K,x.select)),x.addEventListener("focusout",H),x.addEventListener("keypress",(K)=>{if(K.key==="Enter")H()})},Z=(z,B)=>z.replace(new RegExp(`[?&]${B}=1\\b(?!&)|\\b${B}=1&`),"");return{version:"8.4.3",init(z){const D=(z instanceof Element?z:document).querySelectorAll("[data-pagy]");for(let x of D)try{const F=Uint8Array.from(atob(x.getAttribute("data-pagy")),(K)=>K.charCodeAt(0)),[E,...H]=JSON.parse((new TextDecoder()).decode(F));if(E==="nav")A(x,H);else if(E==="combo")C(x,H);else if(E==="selector")J(x,H);else console.warn("Skipped Pagy.init() for: %o\nUnknown keyword '%s'",x,E)}catch(F){console.warn("Skipped Pagy.init() for: %o\n%s",x,F)}}}})();
+window.Pagy=(()=>{const j=new ResizeObserver((B)=>B.forEach((D)=>D.target.querySelectorAll(".pagy-rjs").forEach((E)=>E.pagyRender()))),x=(B,[D,E,z,G])=>{const F=B.parentElement??B,K=Object.keys(E).map((H)=>parseInt(H)).sort((H,M)=>M-H);let L=-1;const T=(H,M,R)=>H.replace(/__pagy_page__/g,M).replace(/__pagy_label__/g,R);if((B.pagyRender=function(){const H=K.find((Q)=>Q<F.clientWidth)||0;if(H===L)return;let M=D.before;const R=E[H.toString()],X=z?.[H.toString()]??R.map((Q)=>Q.toString());R.forEach((Q,J)=>{const $=X[J];let U;if(typeof Q==="number")U=T(D.a,Q.toString(),$);else if(Q==="gap")U=D.gap;else U=T(D.current,Q,$);M+=typeof G==="string"&&Q==1?Z(U,G):U}),M+=D.after,B.innerHTML="",B.insertAdjacentHTML("afterbegin",M),L=H})(),B.classList.contains("pagy-rjs"))j.observe(F)},A=(B,[D,E])=>Y(B,(z)=>[z,D.replace(/__pagy_page__/,z)],E),C=(B,[D,E,z])=>{Y(B,(G)=>{const F=Math.max(Math.ceil(D/parseInt(G)),1).toString(),K=E.replace(/__pagy_page__/,F).replace(/__pagy_items__/,G);return[F,K]},z)},Y=(B,D,E)=>{const z=B.querySelector("input"),G=B.querySelector("a"),F=z.value,K=function(){if(z.value===F)return;const[L,T,H]=[z.min,z.value,z.max].map((X)=>parseInt(X)||0);if(T<L||T>H){z.value=F,z.select();return}let[M,R]=D(z.value);if(typeof E==="string"&&M==="1")R=Z(R,E);G.href=R,G.click()};["change","focus"].forEach((L)=>z.addEventListener(L,()=>z.select())),z.addEventListener("focusout",K),z.addEventListener("keypress",(L)=>{if(L.key==="Enter")K()})},Z=(B,D)=>B.replace(new RegExp(`[?&]${D}=1\\b(?!&)|\\b${D}=1&`),"");return{version:"8.4.4",init(B){const E=(B instanceof Element?B:document).querySelectorAll("[data-pagy]");for(let z of E)try{const G=Uint8Array.from(atob(z.getAttribute("data-pagy")),(L)=>L.charCodeAt(0)),[F,...K]=JSON.parse((new TextDecoder()).decode(G));if(F==="nav")x(z,K);else if(F==="combo")A(z,K);else if(F==="selector")C(z,K);else console.warn("Skipped Pagy.init() for: %o\nUnknown keyword '%s'",z,F)}catch(G){console.warn("Skipped Pagy.init() for: %o\n%s",z,G)}}}})();
 
-//# debugId=C131CFD0ECFFDA8364756e2164756e21
+//# debugId=42F7B0D379AB673764756e2164756e21
 //# sourceMappingURL=pagy.min.js.map
diff --git a/gem/javascripts/pagy.min.js b/gem/javascripts/pagy.min.js
index c50549f62..035bf72b3 100644
--- a/gem/javascripts/pagy.min.js
+++ b/gem/javascripts/pagy.min.js
@@ -1,4 +1,4 @@
-window.Pagy=(()=>{const j=new ResizeObserver((z)=>z.forEach((B)=>B.target.querySelectorAll(".pagy-rjs").forEach((D)=>D.pagyRender()))),A=(z,[B,D,x,F])=>{const E=z.parentElement??z,H=Object.keys(D).map((G)=>parseInt(G)).sort((G,L)=>L-G);let K=-1;const R=(G,L,M)=>G.replace(/__pagy_page__/g,L).replace(/__pagy_label__/g,M);if((z.pagyRender=function(){const G=H.find((Q)=>Q<E.clientWidth)||0;if(G===K)return;let L=B.before;const M=D[G.toString()],X=x?.[G.toString()]??M.map((Q)=>Q.toString());for(let Q in M){const T=M[Q],$=X[Q];let U;if(typeof T==="number")U=R(B.a,T.toString(),$);else if(T==="gap")U=B.gap;else U=R(B.current,T,$);L+=typeof F==="string"&&T==1?Z(U,F):U}L+=B.after,z.innerHTML="",z.insertAdjacentHTML("afterbegin",L),K=G})(),z.classList.contains("pagy-rjs"))j.observe(E)},C=(z,[B,D])=>Y(z,(x)=>[x,B.replace(/__pagy_page__/,x)],D),J=(z,[B,D,x])=>{Y(z,(F)=>{const E=Math.max(Math.ceil(B/parseInt(F)),1).toString(),H=D.replace(/__pagy_page__/,E).replace(/__pagy_items__/,F);return[E,H]},x)},Y=(z,B,D)=>{const x=z.querySelector("input"),F=z.querySelector("a"),E=x.value,H=function(){if(x.value===E)return;const[K,R,G]=[x.min,x.value,x.max].map((X)=>parseInt(X)||0);if(R<K||R>G){x.value=E,x.select();return}let[L,M]=B(x.value);if(typeof D==="string"&&L==="1")M=Z(M,D);F.href=M,F.click()};["change","focus"].forEach((K)=>x.addEventListener(K,x.select)),x.addEventListener("focusout",H),x.addEventListener("keypress",(K)=>{if(K.key==="Enter")H()})},Z=(z,B)=>z.replace(new RegExp(`[?&]${B}=1\\b(?!&)|\\b${B}=1&`),"");return{version:"8.4.3",init(z){const D=(z instanceof Element?z:document).querySelectorAll("[data-pagy]");for(let x of D)try{const F=Uint8Array.from(atob(x.getAttribute("data-pagy")),(K)=>K.charCodeAt(0)),[E,...H]=JSON.parse((new TextDecoder()).decode(F));if(E==="nav")A(x,H);else if(E==="combo")C(x,H);else if(E==="selector")J(x,H);else console.warn("Skipped Pagy.init() for: %o\nUnknown keyword '%s'",x,E)}catch(F){console.warn("Skipped Pagy.init() for: %o\n%s",x,F)}}}})();
+window.Pagy=(()=>{const j=new ResizeObserver((B)=>B.forEach((D)=>D.target.querySelectorAll(".pagy-rjs").forEach((E)=>E.pagyRender()))),x=(B,[D,E,z,G])=>{const F=B.parentElement??B,K=Object.keys(E).map((H)=>parseInt(H)).sort((H,M)=>M-H);let L=-1;const T=(H,M,R)=>H.replace(/__pagy_page__/g,M).replace(/__pagy_label__/g,R);if((B.pagyRender=function(){const H=K.find((Q)=>Q<F.clientWidth)||0;if(H===L)return;let M=D.before;const R=E[H.toString()],X=z?.[H.toString()]??R.map((Q)=>Q.toString());R.forEach((Q,J)=>{const $=X[J];let U;if(typeof Q==="number")U=T(D.a,Q.toString(),$);else if(Q==="gap")U=D.gap;else U=T(D.current,Q,$);M+=typeof G==="string"&&Q==1?Z(U,G):U}),M+=D.after,B.innerHTML="",B.insertAdjacentHTML("afterbegin",M),L=H})(),B.classList.contains("pagy-rjs"))j.observe(F)},A=(B,[D,E])=>Y(B,(z)=>[z,D.replace(/__pagy_page__/,z)],E),C=(B,[D,E,z])=>{Y(B,(G)=>{const F=Math.max(Math.ceil(D/parseInt(G)),1).toString(),K=E.replace(/__pagy_page__/,F).replace(/__pagy_items__/,G);return[F,K]},z)},Y=(B,D,E)=>{const z=B.querySelector("input"),G=B.querySelector("a"),F=z.value,K=function(){if(z.value===F)return;const[L,T,H]=[z.min,z.value,z.max].map((X)=>parseInt(X)||0);if(T<L||T>H){z.value=F,z.select();return}let[M,R]=D(z.value);if(typeof E==="string"&&M==="1")R=Z(R,E);G.href=R,G.click()};["change","focus"].forEach((L)=>z.addEventListener(L,()=>z.select())),z.addEventListener("focusout",K),z.addEventListener("keypress",(L)=>{if(L.key==="Enter")K()})},Z=(B,D)=>B.replace(new RegExp(`[?&]${D}=1\\b(?!&)|\\b${D}=1&`),"");return{version:"8.4.4",init(B){const E=(B instanceof Element?B:document).querySelectorAll("[data-pagy]");for(let z of E)try{const G=Uint8Array.from(atob(z.getAttribute("data-pagy")),(L)=>L.charCodeAt(0)),[F,...K]=JSON.parse((new TextDecoder()).decode(G));if(F==="nav")x(z,K);else if(F==="combo")A(z,K);else if(F==="selector")C(z,K);else console.warn("Skipped Pagy.init() for: %o\nUnknown keyword '%s'",z,F)}catch(G){console.warn("Skipped Pagy.init() for: %o\n%s",z,G)}}}})();
 
-//# debugId=C131CFD0ECFFDA8364756e2164756e21
+//# debugId=42F7B0D379AB673764756e2164756e21
 //# sourceMappingURL=pagy.min.js.map
diff --git a/gem/javascripts/pagy.min.js.map b/gem/javascripts/pagy.min.js.map
index 2334fa92b..20657c83c 100644
--- a/gem/javascripts/pagy.min.js.map
+++ b/gem/javascripts/pagy.min.js.map
@@ -2,9 +2,9 @@
   "version": 3,
   "sources": ["../../src/pagy.ts"],
   "sourcesContent": [
-    "type NavArgs = readonly [Tokens, Sequels, null | LabelSequels, string?]\ntype ComboArgs = readonly [string, string?]\ntype SelectorArgs = readonly [number, string, string?]\n\ninterface Tokens {\n  readonly before:string\n  readonly a:string\n  readonly current:string\n  readonly gap:string\n  readonly after:string\n}\n\ninterface Sequels {readonly [width:string]:(string | number)[]}\n\ninterface LabelSequels {readonly [width:string]:string[]}\n\ninterface NavElement extends Element {pagyRender():void}\n\nconst Pagy = (() => {\n  // The observer instance for responsive navs\n  const rjsObserver = new ResizeObserver(\n      entries => entries.forEach(e => e.target.querySelectorAll<NavElement>(\".pagy-rjs\")\n                                       .forEach(el => el.pagyRender())));\n  // Init the *_nav_js helpers\n  const initNav = (el:NavElement, [tokens, sequels, labelSequels, trimParam]:NavArgs) => {\n    const container = el.parentElement ?? el;\n    const widths    = Object.keys(sequels).map(w => parseInt(w)).sort((a, b) => b - a);\n    let lastWidth   = -1;\n    const fillIn    = (a:string, page:string, label:string):string =>\n        a.replace(/__pagy_page__/g, page).replace(/__pagy_label__/g, label);\n    (el.pagyRender = function () {\n      const width = widths.find(w => w < container.clientWidth) || 0;\n      if (width === lastWidth) { return } // no change: abort\n      let html     = tokens.before;  // already trimmed in html\n      const series = sequels[width.toString()];\n      const labels = labelSequels?.[width.toString()] ?? series.map(l => l.toString());\n      for (const i in series) {\n        const item  = series[i];\n        const label = labels[i];\n        let filled;\n        if (typeof item === \"number\") {\n          filled = fillIn(tokens.a, item.toString(), label);\n        } else if (item === \"gap\") {\n          filled = tokens.gap;\n        } else { // active page\n          filled = fillIn(tokens.current, item, label);\n        }\n        html += (typeof trimParam === \"string\" && item == 1) ? trim(filled, trimParam) : filled;\n      }\n      html += tokens.after;   // eslint-disable-line align-assignments/align-assignments\n      el.innerHTML = \"\";\n      el.insertAdjacentHTML(\"afterbegin\", html);\n      lastWidth = width;\n    })();\n    if (el.classList.contains(\"pagy-rjs\")) { rjsObserver.observe(container) }\n  };\n\n  // Init the *_combo_nav_js helpers\n  const initCombo = (el:Element, [url_token, trimParam]:ComboArgs) =>\n      initInput(el, inputValue => [inputValue, url_token.replace(/__pagy_page__/, inputValue)], trimParam);\n\n  // Init the items_selector_js helper\n  const initSelector = (el:Element, [from, url_token, trimParam]:SelectorArgs) => {\n    initInput(el, inputValue => {\n      const page = Math.max(Math.ceil(from / parseInt(inputValue)), 1).toString();\n      const url  = url_token.replace(/__pagy_page__/, page).replace(/__pagy_items__/, inputValue);\n      return [page, url];\n    }, trimParam);\n  };\n\n  // Init the input element\n  const initInput = (el:Element, getVars:(v:string) => [string, string], trimParam?:string) => {\n    const input   = el.querySelector(\"input\") as HTMLInputElement;\n    const link    = el.querySelector(\"a\") as HTMLAnchorElement;\n    const initial = input.value;\n    const action  = function () {\n      if (input.value === initial) { return }  // not changed\n      const [min, val, max] = [input.min, input.value, input.max].map(n => parseInt(n) || 0);\n      if (val < min || val > max) {  // reset invalid/out-of-range\n        input.value = initial;\n        input.select();\n        return;\n      }\n      let [page, url] = getVars(input.value);   // eslint-disable-line prefer-const\n      if (typeof trimParam === \"string\" && page === \"1\") { url = trim(url, trimParam) }\n      link.href = url;\n      link.click();\n    };\n    [\"change\", \"focus\"].forEach(e => input.addEventListener(e, input.select));        // auto-select\n    input.addEventListener(\"focusout\", action);                                       // trigger action\n    input.addEventListener(\"keypress\", e => { if (e.key === \"Enter\") { action() } }); // trigger action\n  };\n\n  // Trim the ${page-param}=1 params in links\n  const trim = (a:string, param:string) =>\n      a.replace(new RegExp(`[?&]${param}=1\\\\b(?!&)|\\\\b${param}=1&`), \"\");\n\n  // Public interface\n  return {\n    version: \"8.4.3\",\n\n    // Scan for elements with a \"data-pagy\" attribute and call their init functions with the decoded args\n    init(arg?:Element | never) {\n      const target   = arg instanceof Element ? arg : document;\n      const elements = target.querySelectorAll(\"[data-pagy]\");\n      for (const el of elements) {\n        try {\n          const uint8array         = Uint8Array.from(atob(el.getAttribute(\"data-pagy\") as string), c => c.charCodeAt(0));\n          const [keyword, ...args] = JSON.parse((new TextDecoder()).decode(uint8array)); // base64-utf8 -> JSON -> Array\n          if (keyword === \"nav\") {\n            initNav(el as NavElement, args as NavArgs);\n          } else if (keyword === \"combo\") {\n            initCombo(el, args as ComboArgs);\n          } else if (keyword === \"selector\") {\n            initSelector(el, args as SelectorArgs);\n          } else {\n            console.warn(\"Skipped Pagy.init() for: %o\\nUnknown keyword '%s'\", el, keyword);\n          }\n        } catch (err) { console.warn(\"Skipped Pagy.init() for: %o\\n%s\", el, err) }\n      }\n    }\n  };\n})();\n\nexport default Pagy;\n"
+    "type NavArgs      = readonly [Tokens, Sequels, null | LabelSequels, string?]\ntype ComboArgs    = readonly [string, string?]\ntype SelectorArgs = readonly [number, string, string?]\ntype JsonArgs     = ['nav', NavArgs] | ['combo', ComboArgs] | ['selector', SelectorArgs]\n\ninterface Tokens {\n  readonly before:string\n  readonly a:string\n  readonly current:string\n  readonly gap:string\n  readonly after:string\n}\ninterface Sequels {readonly [width:string]:(string | number)[]}\ninterface LabelSequels {readonly [width:string]:string[]}\ninterface NavElement extends Element {pagyRender():void}\n\nconst Pagy = (() => {\n  // The observer instance for responsive navs\n  const rjsObserver = new ResizeObserver(\n      entries => entries.forEach(e => e.target.querySelectorAll<NavElement>(\".pagy-rjs\")\n                                       .forEach(el => el.pagyRender())));\n  // Init the *_nav_js helpers\n  const initNav = (el:NavElement, [tokens, sequels, labelSequels, trimParam]:NavArgs) => {\n    const container = el.parentElement ?? el;\n    const widths    = Object.keys(sequels).map(w => parseInt(w)).sort((a, b) => b - a);\n    let lastWidth   = -1;\n    const fillIn    = (a:string, page:string, label:string):string =>\n        a.replace(/__pagy_page__/g, page).replace(/__pagy_label__/g, label);\n    (el.pagyRender = function () {\n      const width = widths.find(w => w < container.clientWidth) || 0;\n      if (width === lastWidth) { return } // no change: abort\n      let html     = tokens.before;  // already trimmed in html\n      const series = sequels[width.toString()];\n      const labels = labelSequels?.[width.toString()] ?? series.map(l => l.toString());\n      series.forEach((item, i) => {\n        const label = labels[i];\n        let filled;\n        if (typeof item === \"number\") {\n          filled = fillIn(tokens.a, item.toString(), label);\n        } else if (item === \"gap\") {\n          filled = tokens.gap;\n        } else { // active page\n          filled = fillIn(tokens.current, item, label);\n        }\n        html += (typeof trimParam === \"string\" && item == 1) ? trim(filled, trimParam) : filled;\n      });\n      html        += tokens.after;\n      el.innerHTML = \"\";\n      el.insertAdjacentHTML(\"afterbegin\", html);\n      lastWidth = width;\n    })();\n    if (el.classList.contains(\"pagy-rjs\")) { rjsObserver.observe(container) }\n  };\n\n  // Init the *_combo_nav_js helpers\n  const initCombo = (el:Element, [url_token, trimParam]:ComboArgs) =>\n      initInput(el, inputValue => [inputValue, url_token.replace(/__pagy_page__/, inputValue)], trimParam);\n\n  // Init the items_selector_js helper\n  const initSelector = (el:Element, [from, url_token, trimParam]:SelectorArgs) => {\n    initInput(el, inputValue => {\n      const page = Math.max(Math.ceil(from / parseInt(inputValue)), 1).toString();\n      const url  = url_token.replace(/__pagy_page__/, page).replace(/__pagy_items__/, inputValue);\n      return [page, url];\n    }, trimParam);\n  };\n\n  // Init the input element\n  const initInput = (el:Element, getVars:(v:string) => [string, string], trimParam?:string) => {\n    const input   = el.querySelector(\"input\") as HTMLInputElement;\n    const link    = el.querySelector(\"a\") as HTMLAnchorElement;\n    const initial = input.value;\n    const action  = function () {\n      if (input.value === initial) { return }  // not changed\n      const [min, val, max] = [input.min, input.value, input.max].map(n => parseInt(n) || 0);\n      if (val < min || val > max) {  // reset invalid/out-of-range\n        input.value = initial;\n        input.select();\n        return;\n      }\n      let [page, url] = getVars(input.value);   // eslint-disable-line prefer-const\n      if (typeof trimParam === \"string\" && page === \"1\") { url = trim(url, trimParam) }\n      link.href = url;\n      link.click();\n    };\n    [\"change\", \"focus\"].forEach(e => input.addEventListener(e, () => input.select()));  // auto-select\n    input.addEventListener(\"focusout\", action);                                         // trigger action\n    input.addEventListener(\"keypress\", e => { if (e.key === \"Enter\") { action() } });   // trigger action\n  };\n\n  // Trim the ${page-param}=1 params in links\n  const trim = (a:string, param:string) =>\n      a.replace(new RegExp(`[?&]${param}=1\\\\b(?!&)|\\\\b${param}=1&`), \"\");\n\n  // Public interface\n  return {\n    version: \"8.4.4\",\n\n    // Scan for elements with a \"data-pagy\" attribute and call their init functions with the decoded args\n    init(arg?:Element) {\n      const target   = arg instanceof Element ? arg : document;\n      const elements = target.querySelectorAll(\"[data-pagy]\");\n      for (const el of elements) {\n        try {\n          const uint8array         = Uint8Array.from(atob(el.getAttribute(\"data-pagy\") as string), c => c.charCodeAt(0));\n          const [keyword, ...args] = JSON.parse((new TextDecoder()).decode(uint8array)) as JsonArgs; // base64-utf8 -> JSON -> Array\n          if (keyword === \"nav\") {\n            initNav(el as NavElement, args as unknown as NavArgs);\n          } else if (keyword === \"combo\") {\n            initCombo(el, args as unknown as ComboArgs);\n          } else if (keyword === \"selector\") {\n            initSelector(el, args as unknown as SelectorArgs);\n          } else {\n            console.warn(\"Skipped Pagy.init() for: %o\\nUnknown keyword '%s'\", el, keyword);\n          }\n        } catch (err) { console.warn(\"Skipped Pagy.init() for: %o\\n%s\", el, err) }\n      }\n    }\n  };\n})();\n\nexport default Pagy;\n"
   ],
-  "mappings": "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",
-  "debugId": "C131CFD0ECFFDA8364756e2164756e21",
+  "mappings": "AAgBA,IAAM,GAAQ,IAAM,CAElB,MAAM,EAAc,IAAI,eACpB,KAAW,EAAQ,QAAQ,KAAK,EAAE,OAAO,iBAA6B,WAAW,EAC/C,QAAQ,KAAM,EAAG,WAAW,CAAC,CAAC,CAAC,EAE/D,EAAU,CAAC,GAAgB,EAAQ,EAAS,EAAc,KAAuB,CACrF,MAAM,EAAY,EAAG,eAAiB,EAChC,EAAY,OAAO,KAAK,CAAO,EAAE,IAAI,KAAK,SAAS,CAAC,CAAC,EAAE,KAAK,CAAC,EAAG,IAAM,EAAI,CAAC,EACjF,IAAI,GAAc,EAClB,MAAM,EAAY,CAAC,EAAU,EAAa,IACtC,EAAE,QAAQ,iBAAkB,CAAI,EAAE,QAAQ,kBAAmB,CAAK,EAwBtE,IAvBC,EAAG,mBAAsB,EAAG,CAC3B,MAAM,EAAQ,EAAO,KAAK,KAAK,EAAI,EAAU,WAAW,GAAK,EAC7D,GAAI,IAAU,EAAa,OAC3B,IAAI,EAAW,EAAO,OACtB,MAAM,EAAS,EAAQ,EAAM,SAAS,GAChC,EAAS,IAAe,EAAM,SAAS,IAAM,EAAO,IAAI,KAAK,EAAE,SAAS,CAAC,EAC/E,EAAO,QAAQ,CAAC,EAAM,IAAM,CAC1B,MAAM,EAAQ,EAAO,GACrB,IAAI,EACJ,UAAW,IAAS,SAClB,EAAS,EAAO,EAAO,EAAG,EAAK,SAAS,EAAG,CAAK,UACvC,IAAS,MAClB,EAAS,EAAO,QAEhB,GAAS,EAAO,EAAO,QAAS,EAAM,CAAK,EAE7C,UAAgB,IAAc,UAAY,GAAQ,EAAK,EAAK,EAAQ,CAAS,EAAI,EAClF,EACD,GAAe,EAAO,MACtB,EAAG,UAAY,GACf,EAAG,mBAAmB,aAAc,CAAI,EACxC,EAAY,IACX,EACC,EAAG,UAAU,SAAS,UAAU,EAAK,EAAY,QAAQ,CAAS,GAIlE,EAAY,CAAC,GAAa,EAAW,KACvC,EAAU,EAAI,KAAc,CAAC,EAAY,EAAU,QAAQ,gBAAiB,CAAU,CAAC,EAAG,CAAS,EAGjG,EAAe,CAAC,GAAa,EAAM,EAAW,KAA4B,CAC9E,EAAU,EAAI,KAAc,CAC1B,MAAM,EAAO,KAAK,IAAI,KAAK,KAAK,EAAO,SAAS,CAAU,CAAC,EAAG,CAAC,EAAE,SAAS,EACpE,EAAO,EAAU,QAAQ,gBAAiB,CAAI,EAAE,QAAQ,iBAAkB,CAAU,EAC1F,MAAO,CAAC,EAAM,CAAG,GAChB,CAAS,GAIR,EAAY,CAAC,EAAY,EAAwC,IAAsB,CAC3F,MAAM,EAAU,EAAG,cAAc,OAAO,EAClC,EAAU,EAAG,cAAc,GAAG,EAC9B,EAAU,EAAM,MAChB,UAAmB,EAAG,CAC1B,GAAI,EAAM,QAAU,EAAW,OAC/B,MAAO,EAAK,EAAK,GAAO,CAAC,EAAM,IAAK,EAAM,MAAO,EAAM,GAAG,EAAE,IAAI,KAAK,SAAS,CAAC,GAAK,CAAC,EACrF,GAAI,EAAM,GAAO,EAAM,EAAK,CAC1B,EAAM,MAAQ,EACd,EAAM,OAAO,EACb,OAEF,IAAK,EAAM,GAAO,EAAQ,EAAM,KAAK,EACrC,UAAW,IAAc,UAAY,IAAS,IAAO,EAAM,EAAK,EAAK,CAAS,EAC9E,EAAK,KAAO,EACZ,EAAK,MAAM,GAEb,CAAC,SAAU,OAAO,EAAE,QAAQ,KAAK,EAAM,iBAAiB,EAAG,IAAM,EAAM,OAAO,CAAC,CAAC,EAChF,EAAM,iBAAiB,WAAY,CAAM,EACzC,EAAM,iBAAiB,WAAY,KAAK,CAAE,GAAI,EAAE,MAAQ,QAAW,EAAO,EAAK,GAI3E,EAAO,CAAC,EAAU,IACpB,EAAE,QAAQ,IAAI,OAAO,OAAO,kBAAsB,MAAU,EAAG,EAAE,EAGrE,MAAO,CACL,QAAS,QAGT,IAAI,CAAC,EAAc,CAEjB,MAAM,GADW,aAAe,QAAU,EAAM,UACxB,iBAAiB,aAAa,EACtD,QAAW,KAAM,EACf,GAAI,CACF,MAAM,EAAqB,WAAW,KAAK,KAAK,EAAG,aAAa,WAAW,CAAW,EAAG,KAAK,EAAE,WAAW,CAAC,CAAC,GACtG,KAAY,GAAQ,KAAK,OAAO,IAAI,YAAY,GAAG,OAAO,CAAU,CAAC,EAC5E,GAAI,IAAY,MACd,EAAQ,EAAkB,CAA0B,UAC3C,IAAY,QACrB,EAAU,EAAI,CAA4B,UACjC,IAAY,WACrB,EAAa,EAAI,CAA+B,MAEhD,SAAQ,KAAK,oDAAqD,EAAI,CAAO,QAExE,EAAP,CAAc,QAAQ,KAAK,kCAAmC,EAAI,CAAG,GAG7E,IACC",
+  "debugId": "42F7B0D379AB673764756e2164756e21",
   "names": []
 }
\ No newline at end of file
diff --git a/gem/javascripts/pagy.mjs b/gem/javascripts/pagy.mjs
index b88aaf136..96a59fdda 100644
--- a/gem/javascripts/pagy.mjs
+++ b/gem/javascripts/pagy.mjs
@@ -13,8 +13,7 @@ const Pagy = (() => {
       let html = tokens.before;
       const series = sequels[width.toString()];
       const labels = labelSequels?.[width.toString()] ?? series.map((l) => l.toString());
-      for (const i in series) {
-        const item = series[i];
+      series.forEach((item, i) => {
         const label = labels[i];
         let filled;
         if (typeof item === "number") {
@@ -25,7 +24,7 @@ const Pagy = (() => {
           filled = fillIn(tokens.current, item, label);
         }
         html += typeof trimParam === "string" && item == 1 ? trim(filled, trimParam) : filled;
-      }
+      });
       html += tokens.after;
       el.innerHTML = "";
       el.insertAdjacentHTML("afterbegin", html);
@@ -64,7 +63,7 @@ const Pagy = (() => {
       link.href = url;
       link.click();
     };
-    ["change", "focus"].forEach((e) => input.addEventListener(e, input.select));
+    ["change", "focus"].forEach((e) => input.addEventListener(e, () => input.select()));
     input.addEventListener("focusout", action);
     input.addEventListener("keypress", (e) => {
       if (e.key === "Enter") {
@@ -74,7 +73,7 @@ const Pagy = (() => {
   };
   const trim = (a, param) => a.replace(new RegExp(`[?&]${param}=1\\b(?!&)|\\b${param}=1&`), "");
   return {
-    version: "8.4.3",
+    version: "8.4.4",
     init(arg) {
       const target = arg instanceof Element ? arg : document;
       const elements = target.querySelectorAll("[data-pagy]");
diff --git a/gem/lib/pagy.rb b/gem/lib/pagy.rb
index 9316af6e1..bac27b4dc 100644
--- a/gem/lib/pagy.rb
+++ b/gem/lib/pagy.rb
@@ -5,7 +5,7 @@
 
 # Core class
 class Pagy
-  VERSION = '8.4.3'
+  VERSION = '8.4.4'
 
   # Gem root pathname to get the path of Pagy files stylesheets, javascripts, apps, locales, etc.
   def self.root
diff --git a/gem/pagy.gemspec b/gem/pagy.gemspec
index a2b300d92..1e106916d 100644
--- a/gem/pagy.gemspec
+++ b/gem/pagy.gemspec
@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name        = 'pagy'
-  s.version     = '8.4.3'
+  s.version     = '8.4.4'
   s.authors     = ['Domizio Demichelis']
   s.email       = ['dd.nexus@gmail.com']
   s.summary     = 'The best pagination ruby gem'
diff --git a/package.json b/package.json
index 49b0dd953..3b0eecaa4 100644
--- a/package.json
+++ b/package.json
@@ -1,21 +1,24 @@
 {
-    "name": "pagy",
-    "description": "Workspaces environment",
-    "private": true,
-    "devDependencies": {
-        "@typescript-eslint/eslint-plugin": "7.7.0",
-        "@typescript-eslint/parser": "7.7.0",
-        "eslint": "8.57.0",
-        "eslint-plugin-align-assignments": "^1.1.2",
-        "eslint-plugin-import": "2.29.1",
-        "eslint-plugin-node": "^11.1.0",
-        "eslint-plugin-promise": "6.1.1",
-        "retypeapp-linux-x64": "3.5.0",
-        "typescript": "5.4.5"
-    },
-    "workspaces": [
-        "e2e",
-        "src"
-    ],
-    "packageManager": "yarn@1.22.22+sha512.a6b2f7906b721bba3d67d4aff083df04dad64c399707841b7acf00f6b133b7ac24255f2652fa22ae3534329dc6180534e98d17432037ff6fd140556e2bb3137e"
+  "name": "pagy",
+  "description": "Javascript support files",
+  "private": true,
+  "type": "module",
+  "devDependencies": {
+    "@cypress/snapshot": "^2.1.7",
+    "@types/node": "20.14.2",
+    "cypress": "13.11.0",
+    "cypress-html-validate": "6.1.0",
+    "eslint-plugin-cypress": "3.3.0",
+    "eslint-plugin-promise": "6.2.0",
+    "html-validate": "8.20.0",
+    "start-server-and-test": "2.0.4",
+    "@eslint/js": "^9.4.0",
+    "@types/eslint__js": "^8.42.3",
+    "eslint": "^9.4.0",
+    "eslint-plugin-align-assignments": "^1.1.2",
+    "retypeapp-linux-x64": "3.5.0",
+    "typescript": "5.4.5",
+    "typescript-eslint": "^7.12.0"
+  },
+  "workspaces": ["e2e"]
 }
diff --git a/retype.yml b/retype.yml
index b75586496..7f4e35830 100644
--- a/retype.yml
+++ b/retype.yml
@@ -8,7 +8,7 @@ url: https://ddnexus.github.io/pagy
 
 branding:
   title: Pagy
-  label: 8.4.3
+  label: 8.4.4
   colors:
     label:
       text: "#FFFFFF"
diff --git a/scripts/bump-version.sh b/scripts/bump
similarity index 95%
rename from scripts/bump-version.sh
rename to scripts/bump
index 7a249b6e5..3f77614e4 100755
--- a/scripts/bump-version.sh
+++ b/scripts/bump
@@ -2,14 +2,11 @@
 
 set -e
 
+root="$(git rev-parse --show-toplevel)"
+
 # Abort if the working tree is dirty
 [[ -z "$(git status --porcelain)" ]] || (>&2 echo "Working tree dirty!" && exit 1)
 
-# Set the root path
-dir="$(dirname -- "$0")"
-root="$(cd -P -- "$(dirname -- "$dir")" && printf '%s\n' "$(pwd -P)")"
-cd $root
-
 # Prompt for the new version
 old_vers=$(ruby -Igem/lib -rpagy -e 'puts Pagy::VERSION')
 echo "Current Pagy::VERSION: $old_vers"
@@ -46,7 +43,7 @@ bump "$root/src/pagy.ts"
 
 # Build javascript files
 cd "$root/src"
-./build.sh
+./build
 cd "$root"
 
 # Bumps docs example
diff --git a/scripts/cd-and-back.sh b/scripts/cd-and-back.sh
new file mode 100644
index 000000000..e8564c387
--- /dev/null
+++ b/scripts/cd-and-back.sh
@@ -0,0 +1,16 @@
+#!/usr/bin/env bash
+
+# Source to cd to the script name and go back on exit
+
+set -e
+
+initial_pwd=$PWD
+
+back() {
+    cd "$initial_pwd"
+}
+trap back EXIT
+
+# Set the sdir path
+script_path="$(cd -P -- "$(dirname -- "$0")" && printf '%s\n' "$(pwd -P)")"
+cd $script_path
diff --git a/src/build b/src/build
new file mode 100755
index 000000000..57fb0c6eb
--- /dev/null
+++ b/src/build
@@ -0,0 +1,21 @@
+#!/usr/bin/env bash
+
+set -e
+
+root="$(git rev-parse --show-toplevel)"
+. "$root/scripts/cd-and-back.sh"
+
+jdir="$root/gem/javascripts"
+
+echo 'Generating javascript files'
+bun build ./pagy.ts --target=node --no-bundle --outfile=$jdir/pagy.mjs
+
+bun build ./pagy.min.js --target=browser --minify --sourcemap=external --outdir=$jdir
+sed -i "0,/var ./{s/var ./window.Pagy/}" $jdir/pagy.min.js
+# fix the bun issue https://github.com/oven-sh/bun/issues/3325
+echo "//# sourceMappingURL=pagy.min.js.map" >> $jdir/pagy.min.js
+
+# Copy the deprecated files that can break a production app
+cd $jdir
+cp pagy.min.js pagy.js
+cp pagy.mjs pagy-module.js
diff --git a/src/build.sh b/src/build.sh
deleted file mode 100755
index b2fa898a7..000000000
--- a/src/build.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/usr/bin/env bash
-
-set -e
-
-js_path=../gem/javascripts
-
-echo 'Generating javascript files'
-bun build ./pagy.ts --target=node --no-bundle --outfile=$js_path/pagy.mjs
-
-bun build ./pagy.min.js --target=browser --minify --sourcemap=external --outdir=$js_path
-sed -i "0,/var ./{s/var ./window.Pagy/}" $js_path/pagy.min.js
-# fix for bun issue https://github.com/oven-sh/bun/issues/3325
-echo "//# sourceMappingURL=pagy.min.js.map" >> $js_path/pagy.min.js
-
-# Copy the deprecated files that can break a production app
-cd $js_path
-cp pagy.min.js pagy.js
-cp pagy.mjs pagy-module.js
diff --git a/src/package.json b/src/package.json
deleted file mode 100644
index 43a1381be..000000000
--- a/src/package.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "name": "src",
-  "description": "TypeScript source for pagy.js",
-  "private": true,
-  "scripts": {
-    "lint-fix": "eslint . --fix --ext .ts"
-  }
-}
diff --git a/src/pagy.min.js b/src/pagy.min.js
index 06e48e3e5..cb193688c 100644
--- a/src/pagy.min.js
+++ b/src/pagy.min.js
@@ -1,2 +1 @@
-// eslint-disable-next-line @typescript-eslint/no-unused-vars
 import Pagy from "./pagy";
diff --git a/src/pagy.ts b/src/pagy.ts
index 3321e91a5..77cb33b82 100644
--- a/src/pagy.ts
+++ b/src/pagy.ts
@@ -1,6 +1,7 @@
-type NavArgs = readonly [Tokens, Sequels, null | LabelSequels, string?]
-type ComboArgs = readonly [string, string?]
+type NavArgs      = readonly [Tokens, Sequels, null | LabelSequels, string?]
+type ComboArgs    = readonly [string, string?]
 type SelectorArgs = readonly [number, string, string?]
+type JsonArgs     = ['nav', NavArgs] | ['combo', ComboArgs] | ['selector', SelectorArgs]
 
 interface Tokens {
   readonly before:string
@@ -9,11 +10,8 @@ interface Tokens {
   readonly gap:string
   readonly after:string
 }
-
 interface Sequels {readonly [width:string]:(string | number)[]}
-
 interface LabelSequels {readonly [width:string]:string[]}
-
 interface NavElement extends Element {pagyRender():void}
 
 const Pagy = (() => {
@@ -34,8 +32,7 @@ const Pagy = (() => {
       let html     = tokens.before;  // already trimmed in html
       const series = sequels[width.toString()];
       const labels = labelSequels?.[width.toString()] ?? series.map(l => l.toString());
-      for (const i in series) {
-        const item  = series[i];
+      series.forEach((item, i) => {
         const label = labels[i];
         let filled;
         if (typeof item === "number") {
@@ -46,8 +43,8 @@ const Pagy = (() => {
           filled = fillIn(tokens.current, item, label);
         }
         html += (typeof trimParam === "string" && item == 1) ? trim(filled, trimParam) : filled;
-      }
-      html += tokens.after;   // eslint-disable-line align-assignments/align-assignments
+      });
+      html        += tokens.after;
       el.innerHTML = "";
       el.insertAdjacentHTML("afterbegin", html);
       lastWidth = width;
@@ -86,9 +83,9 @@ const Pagy = (() => {
       link.href = url;
       link.click();
     };
-    ["change", "focus"].forEach(e => input.addEventListener(e, input.select));        // auto-select
-    input.addEventListener("focusout", action);                                       // trigger action
-    input.addEventListener("keypress", e => { if (e.key === "Enter") { action() } }); // trigger action
+    ["change", "focus"].forEach(e => input.addEventListener(e, () => input.select()));  // auto-select
+    input.addEventListener("focusout", action);                                         // trigger action
+    input.addEventListener("keypress", e => { if (e.key === "Enter") { action() } });   // trigger action
   };
 
   // Trim the ${page-param}=1 params in links
@@ -97,22 +94,22 @@ const Pagy = (() => {
 
   // Public interface
   return {
-    version: "8.4.3",
+    version: "8.4.4",
 
     // Scan for elements with a "data-pagy" attribute and call their init functions with the decoded args
-    init(arg?:Element | never) {
+    init(arg?:Element) {
       const target   = arg instanceof Element ? arg : document;
       const elements = target.querySelectorAll("[data-pagy]");
       for (const el of elements) {
         try {
           const uint8array         = Uint8Array.from(atob(el.getAttribute("data-pagy") as string), c => c.charCodeAt(0));
-          const [keyword, ...args] = JSON.parse((new TextDecoder()).decode(uint8array)); // base64-utf8 -> JSON -> Array
+          const [keyword, ...args] = JSON.parse((new TextDecoder()).decode(uint8array)) as JsonArgs; // base64-utf8 -> JSON -> Array
           if (keyword === "nav") {
-            initNav(el as NavElement, args as NavArgs);
+            initNav(el as NavElement, args as unknown as NavArgs);
           } else if (keyword === "combo") {
-            initCombo(el, args as ComboArgs);
+            initCombo(el, args as unknown as ComboArgs);
           } else if (keyword === "selector") {
-            initSelector(el, args as SelectorArgs);
+            initSelector(el, args as unknown as SelectorArgs);
           } else {
             console.warn("Skipped Pagy.init() for: %o\nUnknown keyword '%s'", el, keyword);
           }