ultimate_turbo_modal 2.0.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d5fdea054587cce77438cee439587f3ce28ca49a2b6626d1c1bacd5acf4cf5bb
-  data.tar.gz: 1662f021dae0bdc0a9ff9a2cc2c2a2fd29577bedddf51829249b8b3b61d35c31
+  metadata.gz: eb5a2d990486959d808b557642c17ada12d887416c4158d42550e9655dbe6b2f
+  data.tar.gz: dc3ee5b170cd735bc87a0a67a693a9a68c36c8b9cc9bde371a2a7bca0c512744
 SHA512:
-  metadata.gz: 76a068194d26f01d2940945237b6acb97abaa7621fbdb50ea4665b5f7cf85ddc2c6fd03f1b1486ec6f3f2d7fbb0463b6540ad5fe1865b455e407a33a83499331
-  data.tar.gz: e76696e1d26cb19a62bb71c41ecba7e5d0193e86b7a4c055e0094944108cbbdb75aea4c26c9648a464985e8b8698e7e3595f74525f1ebe4e220e9659b334cec3
+  metadata.gz: 5474e9849437b9e97496ba1af522d449c7c3dc26cda3e296c603acc3356f53c1ef24527cb96ecbd42e9713553940d1dd54890297fb9fa2d98f62763b39b1424e
+  data.tar.gz: af196848be428193650a240b3ad78512b175cf294f76821fb279546630ecbcb0d0bb3029e97d538382bc1c7c8c7005a3d03ed3354487321a0890132edf729c7e

data/CHANGELOG.md

@@ -1,4 +1,8 @@
-## [2.0.0] - 2025-04-11
+## [2.0.2] - 2025-04-11
+
+- Warn if the NPM package and Ruby Gem versions don't match.
+
+## [2.0.1] - 2025-04-11
 
 - Properly call `raw` for Phlex 2, and `unsafe_raw` for Phlex 1. Thanks @cavenk!
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ultimate_turbo_modal (2.0.1)
+    ultimate_turbo_modal (2.0.2)
       phlex-rails
       rails
       stimulus-rails

data/VERSION

@@ -1 +1 @@
-2.0.1
+2.0.2

data/javascript/modal_controller.js

@@ -1,6 +1,9 @@
 import { Controller } from '@hotwired/stimulus';
 import { enter, leave } from 'el-transition';
 
+// This placeholder will be replaced by rollup
+const PACKAGE_VERSION = '__PACKAGE_VERSION__';
+
 export default class extends Controller {
   static targets = ["container", "content"]
   static values = {
@@ -10,6 +13,9 @@ export default class extends Controller {
 
   connect() {
     let _this = this;
+
+    this.#checkVersions();
+
     this.showModal();
 
     this.turboFrame = this.element.closest('turbo-frame');
@@ -105,4 +111,19 @@ export default class extends Controller {
   #resetHistoryAdvanced() {
     document.body.removeAttribute("data-turbo-modal-history-advanced");
   }
+
+  #checkVersions() {
+    const gemVersion = this.element.dataset.utmrVersion;
+
+    if (!gemVersion) {
+      // If the attribute isn't set (e.g., in production), skip the check.
+      return;
+    }
+
+    if (gemVersion !== PACKAGE_VERSION) {
+      console.warn(
+        `[UltimateTurboModal] Version Mismatch!\n\nGem Version: ${gemVersion}\nJS Version:  ${PACKAGE_VERSION}\n\nPlease ensure both the 'ultimate_turbo_modal' gem and the 'ultimate-turbo-modal' npm package are updated to the same version.\nElement:`, this.element
+      );
+    }
+  }
 }

data/javascript/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "ultimate_turbo_modal",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "ultimate_turbo_modal",
-      "version": "2.0.0",
+      "version": "2.0.1",
       "license": "MIT",
       "dependencies": {
         "@hotwired/stimulus": "^3.2.2",
@@ -19,6 +19,7 @@
         "rollup": "^2.79.1",
         "rollup-plugin-copy": "^3.5.0",
         "rollup-plugin-css-only": "^4.3.0",
+        "rollup-plugin-replace": "^2.2.0",
         "rollup-plugin-terser": "^7.0.2"
       }
     },
@@ -700,6 +701,16 @@
         "graceful-fs": "^4.1.6"
       }
     },
+    "node_modules/magic-string": {
+      "version": "0.25.9",
+      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.25.9.tgz",
+      "integrity": "sha512-RmF0AsMzgt25qzqqLc1+MbHmhdx0ojF2Fvs4XnOqz2ZOBXzzkEwc/dJQZCYHAn7v1jbVOjAZfK8msRn4BxO4VQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "sourcemap-codec": "^1.4.8"
+      }
+    },
     "node_modules/merge-stream": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
@@ -926,6 +937,18 @@
         "rollup": "<5"
       }
     },
+    "node_modules/rollup-plugin-replace": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/rollup-plugin-replace/-/rollup-plugin-replace-2.2.0.tgz",
+      "integrity": "sha512-/5bxtUPkDHyBJAKketb4NfaeZjL5yLZdeUihSfbF2PQMz+rSTEb8ARKoOl3UBT4m7/X+QOXJo3sLTcq+yMMYTA==",
+      "deprecated": "This module has moved and is now available at @rollup/plugin-replace. Please update your dependencies. This version is no longer maintained.",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "magic-string": "^0.25.2",
+        "rollup-pluginutils": "^2.6.0"
+      }
+    },
     "node_modules/rollup-plugin-terser": {
       "version": "7.0.2",
       "resolved": "https://registry.npmjs.org/rollup-plugin-terser/-/rollup-plugin-terser-7.0.2.tgz",
@@ -942,6 +965,23 @@
         "rollup": "^2.0.0"
       }
     },
+    "node_modules/rollup-pluginutils": {
+      "version": "2.8.2",
+      "resolved": "https://registry.npmjs.org/rollup-pluginutils/-/rollup-pluginutils-2.8.2.tgz",
+      "integrity": "sha512-EEp9NhnUkwY8aif6bxgovPHMoMoNr2FulJziTndpt5H9RdwC47GSGuII9XxpSdzVGM0GWrNPHV6ie1LTNJPaLQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "estree-walker": "^0.6.1"
+      }
+    },
+    "node_modules/rollup-pluginutils/node_modules/estree-walker": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-0.6.1.tgz",
+      "integrity": "sha512-SqmZANLWS0mnatqbSfRP5g8OXZC12Fgg1IwNtLsyHDzJizORW4khDfjPqJZsemPWBB2uqykUah5YpQ6epsqC/w==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/run-parallel": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz",
@@ -1028,6 +1068,14 @@
         "source-map": "^0.6.0"
       }
     },
+    "node_modules/sourcemap-codec": {
+      "version": "1.4.8",
+      "resolved": "https://registry.npmjs.org/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz",
+      "integrity": "sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA==",
+      "deprecated": "Please use @jridgewell/sourcemap-codec instead",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/supports-color": {
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",

data/javascript/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ultimate_turbo_modal",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "description": "The ultimate Turbo / Stimulus / Hotwire modal window for Rails",
   "main": "dist/ultimate_turbo_modal.min.js",
   "module": "dist/ultimate_turbo_modal.min.js",
@@ -39,6 +39,7 @@
   },
   "devDependencies": {
     "@rollup/plugin-node-resolve": "^15.2.3",
+    "@rollup/plugin-replace": "^6.0.2",
     "rollup": "^2.79.1",
     "rollup-plugin-copy": "^3.5.0",
     "rollup-plugin-css-only": "^4.3.0",

data/javascript/rollup.config.js

@@ -1,6 +1,11 @@
 import resolve from '@rollup/plugin-node-resolve';
 import css from 'rollup-plugin-css-only';
 import { terser } from 'rollup-plugin-terser';
+import replace from '@rollup/plugin-replace';
+import { readFileSync } from 'fs';
+
+const pkg = JSON.parse(readFileSync('./package.json', 'utf8'));
+const packageVersion = pkg.version;
 
 export default {
   input: './index.js',
@@ -19,6 +24,12 @@ export default {
   inlineDynamicImports: true,
   plugins: [
     resolve(),
-    css({ output: 'vanilla.css' })
+    css({ output: 'vanilla.css' }),
+    replace({
+      preventAssignment: true,
+      values: {
+        '__PACKAGE_VERSION__': JSON.stringify(packageVersion)
+      }
+    })
   ]
 };

data/javascript/yarn.lock

@@ -61,7 +61,7 @@
     "@jridgewell/gen-mapping" "^0.3.5"
     "@jridgewell/trace-mapping" "^0.3.25"
 
-"@jridgewell/sourcemap-codec@^1.4.10", "@jridgewell/sourcemap-codec@^1.4.14":
+"@jridgewell/sourcemap-codec@^1.4.10", "@jridgewell/sourcemap-codec@^1.4.14", "@jridgewell/sourcemap-codec@^1.5.0":
   version "1.5.0"
   resolved "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.0.tgz"
   integrity sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ==
@@ -111,6 +111,14 @@
     is-module "^1.0.0"
     resolve "^1.22.1"
 
+"@rollup/plugin-replace@^6.0.2":
+  version "6.0.2"
+  resolved "https://registry.yarnpkg.com/@rollup/plugin-replace/-/plugin-replace-6.0.2.tgz#2f565d312d681e4570ff376c55c5c08eb6f1908d"
+  integrity sha512-7QaYCf8bqF04dOy7w/eHmJeNExxTYwvKAmlSAH/EaWWUzbT0h5sbF6bktFoX/0F/0qwng5/dWFMyf3gzaM8DsQ==
+  dependencies:
+    "@rollup/pluginutils" "^5.0.1"
+    magic-string "^0.30.3"
+
 "@rollup/pluginutils@5", "@rollup/pluginutils@^5.0.1":
   version "5.1.4"
   resolved "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-5.1.4.tgz"
@@ -406,6 +414,13 @@ jsonfile@^4.0.0:
   optionalDependencies:
     graceful-fs "^4.1.6"
 
+magic-string@^0.30.3:
+  version "0.30.17"
+  resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.30.17.tgz#450a449673d2460e5bbcfba9a61916a1714c7453"
+  integrity sha512-sNPKHvyjVf7gyjwS4xGTaW/mCnF8wnjtifKBEhxfZ7E/S8tQ0rssrwGNn6q8JH/ohItJfSQp9mBtQYuTlH5QnA==
+  dependencies:
+    "@jridgewell/sourcemap-codec" "^1.5.0"
+
 merge-stream@^2.0.0:
   version "2.0.0"
   resolved "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz"

data/lib/ultimate_turbo_modal/base.rb

@@ -138,32 +138,38 @@ class UltimateTurboModal::Base < Phlex::HTML
   end
 
   def div_dialog(&block)
+    data_attributes = {
+      controller: "modal",
+      modal_target: "container",
+      modal_advance_url_value: advance_url,
+      modal_allowed_click_outside_selector_value: allowed_click_outside_selector,
+      action: "turbo:submit-end->modal#submitEnd keyup@window->modal#closeWithKeyboard click@window->modal#outsideModalClicked click->modal#outsideModalClicked",
+      transition_enter: "ease-out duration-100",
+      transition_enter_start: "opacity-0",
+      transition_enter_end: "opacity-100",
+      transition_leave: "ease-in duration-50",
+      transition_leave_start: "opacity-100",
+      transition_leave_end: "opacity-0",
+      padding: padding?.to_s,
+      title: title?.to_s,
+      header: header?.to_s,
+      close_button: close_button?.to_s,
+      header_divider: header_divider?.to_s,
+      footer_divider: footer_divider?.to_s
+    }
+
+    if defined?(Rails) && (Rails.env.development? || Rails.env.test?)
+      data_attributes[:utmr_version] = UltimateTurboModal::VERSION
+    end
+
     div(id: "modal-container",
       class: self.class::DIV_DIALOG_CLASSES,
       role: "dialog",
       aria: {
-        labeled_by: "modal-title-h",
-        modal: true
+        modal: true,
+        labelledby: "modal-title-h"
       },
-      data: {
-        controller: "modal",
-        modal_target: "container",
-        modal_advance_url_value: advance_url,
-        modal_allowed_click_outside_selector_value: allowed_click_outside_selector,
-        action: "turbo:submit-end->modal#submitEnd keyup@window->modal#closeWithKeyboard click@window->modal#outsideModalClicked click->modal#outsideModalClicked",
-        transition_enter: "ease-out duration-100",
-        transition_enter_start: "opacity-0",
-        transition_enter_end: "opacity-100",
-        transition_leave: "ease-in duration-50",
-        transition_leave_start: "opacity-100",
-        transition_leave_end: "opacity-0",
-        padding: padding?.to_s,
-        title: title?.to_s,
-        header: header?.to_s,
-        close_button: close_button?.to_s,
-        header_divider: header_divider?.to_s,
-        footer_divider: footer_divider?.to_s
-      }, &block)
+      data: data_attributes, &block)
   end
 
   def div_overlay

data/script/build_and_release.sh

@@ -22,6 +22,15 @@ fi
 if [ "$1" != "--skip-gem" ]; then
   echo "Building and releasing gem..."
   bundle exec rake build
+
+  # Check if Gemfile.lock is git dirty
+  if ! git diff --quiet Gemfile.lock; then
+    echo "Gemfile.lock is dirty. Adding, committing, and pushing."
+    git add Gemfile.lock
+    git commit -m "Update Gemfile.lock"
+    bundle exec rake build
+  fi
+
   bundle exec rake release
 else
   echo "Skipping gem build and release..."

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ultimate_turbo_modal
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors:
 - Carl Mercier