stimulus_reflex 3.5.0.pre10 → 3.5.0.rc2

data/lib/stimulus_reflex/reflex_data.rb

@@ -52,7 +52,7 @@ class StimulusReflex::ReflexData
   end
 
   def params
-    form_params.merge(url_params)
+    form_params.deep_merge(url_params)
   end
 
   def form_params
@@ -85,8 +85,12 @@ class StimulusReflex::ReflexData
     data["reflexController"]
   end
 
+  def npm_version
+    data["version"].to_s
+  end
+
   def version
-    data["version"].to_s.gsub("-pre", ".pre")
+    data["version"].to_s.gsub("-pre", ".pre").gsub("-rc", ".rc")
   end
 
   private

data/lib/stimulus_reflex/reflex_factory.rb

@@ -20,7 +20,8 @@ class StimulusReflex::ReflexFactory
           reflex_controller: reflex_data.reflex_controller,
           permanent_attribute_name: reflex_data.permanent_attribute_name,
           suppress_logging: reflex_data.suppress_logging,
-          version: reflex_data.version
+          version: reflex_data.version,
+          npm_version: reflex_data.npm_version
         })
     end
 

data/lib/stimulus_reflex/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module StimulusReflex
-  VERSION = "3.5.0.pre10"
+  VERSION = "3.5.0.rc2"
 end

data/lib/stimulus_reflex/version_checker.rb

@@ -0,0 +1,54 @@
+# frozen_string_literal: true
+
+module StimulusReflex
+  class VersionMismatchError < StandardError
+  end
+
+  module VersionChecker
+    def check_version!
+      return if StimulusReflex.config.on_failed_sanity_checks == :ignore
+      return if version == StimulusReflex::VERSION
+
+      level = (StimulusReflex.config.on_failed_sanity_checks == :exit) ? "error" : "warn"
+      reason = (level == "error") ? "failed to execute your reflex action due to" : "noticed"
+
+      mismatch = "StimulusReflex #{reason} a version mismatch between your gem and JavaScript version. Package versions must match exactly.\n\nstimulus_reflex gem: #{StimulusReflex::VERSION}\nstimulus_reflex npm: #{npm_version}"
+
+      StimulusReflex.config.logger.error("\n\e[31m#{mismatch}\e[0m")
+
+      log = {
+        message: mismatch,
+        level: level,
+        reflexId: id
+      }
+
+      event = {
+        name: "stimulus-reflex:version-mismatch",
+        reflexId: id,
+        detail: {
+          message: mismatch,
+          gem: StimulusReflex::VERSION,
+          npm: npm_version,
+          level: level
+        }
+      }
+
+      toast = {
+        text: mismatch.to_s,
+        destination: "https://docs.stimulusreflex.com/hello-world/setup#upgrading-package-versions-and-sanity",
+        reflexId: id,
+        level: level
+      }
+
+      CableReady::Channels.instance[@channel.stream_name].tap { |channel|
+        channel.console_log(log)
+        channel.dispatch_event(event)
+        channel.stimulus_reflex_version_mismatch(toast) if Rails.env.development?
+      }.broadcast
+
+      return if level == "warn"
+
+      raise VersionMismatchError.new(mismatch)
+    end
+  end
+end

data/lib/tasks/stimulus_reflex/stimulus_reflex.rake

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-include Rails.application.routes.url_helpers
-
 SR_STEPS = {
   "action_cable" => "Action Cable",
   "webpacker" => "Install StimulusReflex using Webpacker",

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "stimulus_reflex",
-  "version": "3.5.0-pre10",
+  "version": "3.5.0-rc2",
   "description": "Build reactive applications with the Rails tooling you already know and love.",
   "keywords": [
     "ruby",
@@ -46,17 +46,18 @@
     "build:watch": "yarn rollup -wc",
     "watch": "yarn build:watch",
     "test": "web-test-runner javascript/test/**/*.test.js",
+    "test:watch": "yarn test --watch",
     "docs:dev": "vitepress dev docs",
-    "docs:build": "vitepress build docs",
+    "docs:build": "vitepress build docs && cp docs/_redirects docs/.vitepress/dist",
     "docs:preview": "vitepress preview docs"
   },
   "peerDependencies": {
     "@hotwired/stimulus": ">= 3.0"
   },
   "dependencies": {
-    "@hotwired/stimulus": ">= 3.0, < 4",
-    "@rails/actioncable": ">= 6.0, < 8",
-    "cable_ready": "5.0.0-pre10"
+    "@hotwired/stimulus": "^3",
+    "@rails/actioncable": "^6 || ^7",
+    "cable_ready": "5.0.0-rc2"
   },
   "devDependencies": {
     "@open-wc/testing": "^3.1.7",
@@ -65,9 +66,10 @@
     "@rollup/plugin-terser": "^0.4.0",
     "@web/dev-server-esbuild": "^0.3.3",
     "@web/dev-server-rollup": "^0.3.21",
-    "@web/test-runner": "^0.15.0",
+    "@web/test-runner": "^0.15.1",
     "prettier-standard": "^16.4.1",
-    "rollup": "^3.17.1",
-    "vitepress": "^1.0.0-alpha.47"
+    "rollup": "^3.19.1",
+    "toastify-js": "^1.12.0",
+    "vitepress": "^1.0.0-alpha.56"
   }
 }

data/rollup.config.mjs

@@ -13,13 +13,6 @@ const pretty = () => {
   })
 }
 
-const minify = () => {
-  return terser({
-    mangle: true,
-    compress: true
-  })
-}
-
 const esConfig = {
   format: 'es',
   inlineDynamicImports: true
@@ -47,23 +40,11 @@ const output = distFolders
       file: `${distFolder}/${baseName}.umd.js`,
       plugins: [pretty()]
     },
-    {
-      ...umdConfig,
-      file: `${distFolder}/${baseName}.umd.min.js`,
-      sourcemap: true,
-      plugins: [pretty()]
-    },
     {
       ...esConfig,
       file: `${distFolder}/${baseName}.js`,
       format: 'es',
       plugins: [pretty()]
-    },
-    {
-      ...esConfig,
-      file: `${distFolder}/${baseName}.min.js`,
-      sourcemap: true,
-      plugins: [minify()]
     }
   ])
   .flat()

data/stimulus_reflex.gemspec

@@ -46,9 +46,9 @@ Gem::Specification.new do |gem|
   gem.add_dependency "activesupport", *rails_version
   gem.add_dependency "railties", *rails_version
 
-  gem.add_dependency "cable_ready", ">= 5.0.0.pre10"
+  gem.add_dependency "cable_ready", ">= 5.0.0.rc2"
   gem.add_dependency "nokogiri", "~> 1.0"
-  gem.add_dependency "rack", "~> 2.0"
+  gem.add_dependency "rack", ">= 2", "< 4"
   gem.add_dependency "redis", ">= 4.0", "< 6.0"
 
   gem.add_development_dependency "bundler", "~> 2.0"