ultimate_turbo_modal 2.0.1 → 2.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d5fdea054587cce77438cee439587f3ce28ca49a2b6626d1c1bacd5acf4cf5bb
-  data.tar.gz: 1662f021dae0bdc0a9ff9a2cc2c2a2fd29577bedddf51829249b8b3b61d35c31
+  metadata.gz: 774a6e86a2192eb41f8846c91b0fb73ac2b8a47c2811813e62e64bc25fdb35c6
+  data.tar.gz: 76902c6b109986fc96bfdc9dddb3750d90a46a083e9b1ac16e7ba81ebb062005
 SHA512:
-  metadata.gz: 76a068194d26f01d2940945237b6acb97abaa7621fbdb50ea4665b5f7cf85ddc2c6fd03f1b1486ec6f3f2d7fbb0463b6540ad5fe1865b455e407a33a83499331
-  data.tar.gz: e76696e1d26cb19a62bb71c41ecba7e5d0193e86b7a4c055e0094944108cbbdb75aea4c26c9648a464985e8b8698e7e3595f74525f1ebe4e220e9659b334cec3
+  metadata.gz: e1e0a2edf44c64902f10c945b869ba033898208f139420589e1a5647eba929d4c33767142061b9ec5c653798d3bc80ae9e36d3115765e8d0dad7998bbc283a10
+  data.tar.gz: b0664d14275e26d6866a3772d6972c8a9229fce8f4226f56ece6471b12824e22365f85f361bca3ee16bcef0915f9813e2630df54bcf151f23d2203fa12fa4dad

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.3)
       phlex-rails
       rails
       stimulus-rails

data/VERSION

@@ -1 +1 @@
-2.0.1
+2.0.3

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.json

@@ -1,6 +1,6 @@
 {
   "name": "ultimate_turbo_modal",
-  "version": "2.0.0",
+  "version": "2.0.2",
   "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__': packageVersion
+      }
+    })
   ]
 };

data/javascript/scripts/release-npm.sh

@@ -9,15 +9,15 @@ fi
 
 # Update version
 echo "Updating version in package.json..."
-npm run update-version
+yarn update-version
 
 # Install dependencies
 echo "Installing dependencies..."
-npm install
+yarn install
 
 # Build project
 echo "Building project..."
-npm run build
+yarn build
 
 # Add, commit, and push changes
 VERSION=$(cat ../VERSION)
@@ -30,6 +30,6 @@ git push
 
 # Publish to npm
 echo "Publishing to npm..."
-npm publish
+yarn publish
 
 echo "Release complete!"

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.npmjs.org/@rollup/plugin-replace/-/plugin-replace-6.0.2.tgz"
+  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.npmjs.org/magic-string/-/magic-string-0.30.17.tgz"
+  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.3
 platform: ruby
 authors:
 - Carl Mercier
@@ -86,7 +86,6 @@ files:
 - VERSION
 - javascript/index.js
 - javascript/modal_controller.js
-- javascript/package-lock.json
 - javascript/package.json
 - javascript/rollup.config.js
 - javascript/scripts/release-npm.sh