maglevcms 1.1.4 → 1.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a26b7ce563ab6178216e954e923de1495b0873799c0035c5d297b201395025b3
-  data.tar.gz: 5a6c1ee7711d6e1c9817ede3015e4bfbd4db2ac7ed4e295167e6281ed55d6a78
+  metadata.gz: 1592154952ea460b1a251f422ff5c2a195671024b1dc7cff35244eb0f22121bc
+  data.tar.gz: '09969af10aa25986f2df6c5ce062f57889489befcc9bbd3d6c122a4fc7d70aba'
 SHA512:
-  metadata.gz: 30b8ed56ab4ff85ab76afc908155979c5b6dffe80b7208931f16116e9264e5786db978bae12e6a94fe46c4c8b18ff368b591ed000564cefc69fe37b8620094bd
-  data.tar.gz: ea757185ab81c7f2fc532f20a49c1a0803ed4607ba405d72ff5e3397a15ef72708feaf79f20734c2188d10bee7dc6012889f31a5f4eaa5a2ebaaf6456d99cc6e
+  metadata.gz: f3937431f0c1da7bfed8238baf1f1179145b128537ebe82184a99ed659aeaf01b523c836c926cb87800e61cfd21ae119b35eecdde85ace9cb3d10f6d8ddf43d7
+  data.tar.gz: a44cf3da138c61c43cdabd1be26c0253242cc3bfeb817bb59d65952ef716c55527138fcba2b76525d19523f8ff4fa8a6cebe095e9fe50154386415aa6b22fd03

data/config/vite.json

@@ -1,16 +1,17 @@
 {
   "all": {
     "sourceCodeDir": "app/frontend",
-    "watchAdditionalPaths": []
+    "watchAdditionalPaths": [],
+    "publicOutputDir": "maglev-assets"
   },
   "development": {
     "autoBuild": true,
-    "publicOutputDir": "maglev-assets",
+    "publicOutputDir": "maglev-assets-dev",
     "port": 3136
   },
   "test": {
     "autoBuild": true,
-    "publicOutputDir": "maglev-assets",
+    "publicOutputDir": "maglev-assets-test",
     "port": 3137
   }
 }

data/lib/maglev/engine.rb

@@ -41,15 +41,25 @@ module Maglev
     delegate :vite_ruby, to: :class
 
     def self.vite_ruby
-      @vite_ruby ||= ::ViteRuby.new(root: root)
+      @vite_ruby ||= ::ViteRuby.new(root: root, mode: Rails.env)
     end
 
     # Serves the engine's vite-ruby when requested
     initializer 'maglev.vite_rails.static' do |app|
-      app.middleware.insert_before 0,
-                                   Rack::Static,
-                                   urls: ["/#{vite_ruby.config.public_output_dir}"],
-                                   root: root.join(vite_ruby.config.public_dir)
+      if Rails.application.config.public_file_server.enabled
+        # this is the right setup when the main application is already
+        # using Vite for the theme assets.
+        app.middleware.insert_after ActionDispatch::Static,
+                                    Rack::Static,
+                                    urls: ["/#{vite_ruby.config.public_output_dir}"],
+                                    root: root.join(vite_ruby.config.public_dir)
+      else
+        # mostly when running the application in production behind NGINX or APACHE
+        app.middleware.insert_before 0,
+                                     Rack::Static,
+                                     urls: ["/#{vite_ruby.config.public_output_dir}"],
+                                     root: root.join(vite_ruby.config.public_dir)
+      end
     end
 
     initializer 'maglev.vite_rails_engine.proxy' do |app|

data/lib/maglev/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Maglev
-  VERSION = '1.1.4'
+  VERSION = '1.1.5'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: maglevcms
 version: !ruby/object:Gem::Version
-  version: 1.1.4
+  version: 1.1.5
 platform: ruby
 authors:
 - Didier Lafforgue
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-11-16 00:00:00.000000000 Z
+date: 2022-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jbuilder