good_job 3.12.5 → 3.12.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2ab20515ae75193d46a2340d2b14b7e34217fb5eddf6e468cdd1d9d2aacb8a0d
-  data.tar.gz: 318bfc51ed42c853dbebcba084780d2c359b62fee526bf76482e7ccba2122ab7
+  metadata.gz: 24b3e7de3de7bb0365a230607a0f1f566d431adcd508ce7ee23406164c6528bc
+  data.tar.gz: cd84291baf21cbaabbc543510851481ee835278bd1e844380be99fff749e0702
 SHA512:
-  metadata.gz: 9d78a07949afbda9ab3f45f5605cbc6411d26402c89b1e273f32584c2bbe7bccf5c48d58e201fc9b529d5b2d0dfd4874aebd82d79a4e2af72360bb0e0b61cfa1
-  data.tar.gz: 4b3b505b89ce9696a9f94198ba853b06e0a37adb100006ddce43e8d334b1ef05afb6ee2b37c9d33ffc05f0fc3fc60ef2a2a8a346311f3e6e2298e2228eeb062a
+  metadata.gz: d79680539f1dfabf4076e313207a54b3f38370f31ca855fdc3cf5bfc20799dd2e6b2495274055a45027459f31439dd11677f270ef823ec6c64b8f44359691312
+  data.tar.gz: 1606e6811d188bd18d56d368fe712871193283c93f3f52c5300052884e4ca1fbb3e8ab502499add0b9364780eca13154ca9cb6c2bfdc8674ca3dd6b157f28209

data/CHANGELOG.md

@@ -1,5 +1,30 @@
 # Changelog
 
+## [v3.12.7](https://github.com/bensheldon/good_job/tree/v3.12.7) (2023-03-01)
+
+[Full Changelog](https://github.com/bensheldon/good_job/compare/v3.12.6...v3.12.7)
+
+**Fixed bugs:**
+
+- Rename "assets" to "frontends" to avoid Asset Pipeline collisions [\#874](https://github.com/bensheldon/good_job/pull/874) ([bensheldon](https://github.com/bensheldon))
+
+**Closed issues:**
+
+- GoodJob's JavaScript takes precedence over application's JavaScript in GoodJob 3.12.6, Rails 7 [\#873](https://github.com/bensheldon/good_job/issues/873)
+
+## [v3.12.6](https://github.com/bensheldon/good_job/tree/v3.12.6) (2023-03-01)
+
+[Full Changelog](https://github.com/bensheldon/good_job/compare/v3.12.5...v3.12.6)
+
+**Merged pull requests:**
+
+- Update and cleanup js and css assets; add Stimulus [\#870](https://github.com/bensheldon/good_job/pull/870) ([bensheldon](https://github.com/bensheldon))
+- Bump actions/add-to-project from 0.4.0 to 0.4.1 [\#869](https://github.com/bensheldon/good_job/pull/869) ([dependabot[bot]](https://github.com/apps/dependabot))
+- Bump actions/checkout from 2 to 3 [\#868](https://github.com/bensheldon/good_job/pull/868) ([dependabot[bot]](https://github.com/apps/dependabot))
+- Bump rubocop-rails from 2.17.4 to 2.18.0 [\#867](https://github.com/bensheldon/good_job/pull/867) ([dependabot[bot]](https://github.com/apps/dependabot))
+- Bump pg from 1.4.5 to 1.4.6 [\#866](https://github.com/bensheldon/good_job/pull/866) ([dependabot[bot]](https://github.com/apps/dependabot))
+- Extract GoodJob::Capsule [\#861](https://github.com/bensheldon/good_job/pull/861) ([bensheldon](https://github.com/bensheldon))
+
 ## [v3.12.5](https://github.com/bensheldon/good_job/tree/v3.12.5) (2023-02-24)
 
 [Full Changelog](https://github.com/bensheldon/good_job/compare/v3.12.4...v3.12.5)

data/app/controllers/good_job/frontends_controller.rb

@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+module GoodJob
+  class FrontendsController < ActionController::Base # rubocop:disable Rails/ApplicationController
+    skip_after_action :verify_same_origin_request
+
+    STATIC_ASSETS = {
+      css: {
+        bootstrap: GoodJob::Engine.root.join("app", "frontend", "good_job", "vendor", "bootstrap", "bootstrap.min.css"),
+        style: GoodJob::Engine.root.join("app", "frontend", "good_job", "style.css"),
+      },
+      js: {
+        bootstrap: GoodJob::Engine.root.join("app", "frontend", "good_job", "vendor", "bootstrap", "bootstrap.bundle.min.js"),
+        chartjs: GoodJob::Engine.root.join("app", "frontend", "good_job", "vendor", "chartjs", "chart.min.js"),
+        es_module_shims: GoodJob::Engine.root.join("app", "frontend", "good_job", "vendor", "es_module_shims.js"),
+        rails_ujs: GoodJob::Engine.root.join("app", "frontend", "good_job", "vendor", "rails_ujs.js"),
+      },
+    }.freeze
+
+    MODULE_OVERRIDES = {
+      application: GoodJob::Engine.root.join("app", "frontend", "good_job", "application.js"),
+      stimulus: GoodJob::Engine.root.join("app", "frontend", "good_job", "vendor", "stimulus.js"),
+    }.freeze
+
+    def self.js_modules
+      @_js_modules ||= GoodJob::Engine.root.join("app", "frontend", "good_job", "modules").children.select(&:file?).each_with_object({}) do |file, modules|
+        key = File.basename(file.basename.to_s, ".js").to_sym
+        modules[key] = file
+      end.merge(MODULE_OVERRIDES)
+    end
+
+    before_action do
+      expires_in 1.year, public: true
+    end
+
+    def static
+      render file: STATIC_ASSETS.dig(params[:format].to_sym, params[:name].to_sym) || raise(ActionController::RoutingError, 'Not Found')
+    end
+
+    def module
+      raise(ActionController::RoutingError, 'Not Found') if params[:format] != "js"
+
+      render file: self.class.js_modules[params[:name].to_sym] || raise(ActionController::RoutingError, 'Not Found')
+    end
+  end
+end

data/app/{assets/good_job/modules → frontend/good_job}/application.js

@@ -7,6 +7,9 @@ import showToasts from "toasts";
 import setupPopovers from "popovers";
 import LivePoll from "live_poll";
 
+import { Application } from "stimulus";
+window.Stimulus = Application.start();
+
 documentReady(function() {
   renderCharts();
   showToasts();
@@ -16,3 +19,4 @@ documentReady(function() {
   const livePoll = new LivePoll
   livePoll.start();
 });
+