jets 1.4.2 → 1.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2da53de9bc1b25884e71b48341b06a1730e948d64dd498a8447b0007c351e6ff
-  data.tar.gz: 1946239ac14061a49427551c34e194050edeff8fa5a3ccc67679b6d5f9790ce5
+  metadata.gz: 8c7b4bf4a3af04ba9de3ddafc8e8483303c50eca8cddc28cb70830eb941bde6a
+  data.tar.gz: 38a3ee6c6fabd939ae3f4ab76639363c3cce222ff85f080cffb7f4652bc3a9e7
 SHA512:
-  metadata.gz: d1c4b44501539f490fc51a223847863adc24882e990b8ed600b07ae520326ea80b2adf169f4b65e452545cc1fbf59da3c7d6f010c6891902d8e383fb6e7c7630
-  data.tar.gz: 97912bfac0e5fb6a1176439f9d36745f8278104fec34874f0d53468c3f0d8452bd9c8bfe90e9002abe451d42b33c381d98a9d7517e970ff20bcc17067d0c4d81
+  metadata.gz: 30b7009d55779a5aa79d4d72b760dc1cfaba6b363112ae30c4e4504df145f6e3acd075a93ddccc9608a5d0f0549c5dbe5ac925e21cbdeb07f907c79135649d1a
+  data.tar.gz: 3981e12eb19f182d874915b17510c31fe03b5107bbc35d8ee1c097e15d5e534e9ddbf95ecd16c3ae8720f645faa6e649fec3d913535d0d48edf13f12355b95e7

data/CHANGELOG.md

@@ -3,6 +3,9 @@
 All notable changes to this project will be documented in this file.
 This project *loosely tries* to adhere to [Semantic Versioning](http://semver.org/), even before v1.0.
 
+## [1.4.3]
+- fix webpacker:compile on jets build and allow jets deploy to work standalone
+
 ## [1.4.2]
 - fix webpacker:compile on jets build
 

data/Gemfile.lock

@@ -11,7 +11,7 @@ GIT
 PATH
   remote: .
   specs:
-    jets (1.4.2)
+    jets (1.4.3)
       actionpack (>= 5.2.1)
       actionview (>= 5.2.1)
       activerecord (>= 5.2.1)

data/lib/jets/builders/code_builder.rb

@@ -1,5 +1,4 @@
 require "action_view"
-require "bundler"
 require "colorize"
 require "fileutils"
 require "net/http"
@@ -178,10 +177,7 @@ class Jets::Builders
       end
 
       headline "Compling assets in current project directory"
-      # Thanks: https://stackoverflow.com/questions/4195735/get-list-of-gems-being-used-by-a-bundler-project
-      require "bundler/setup"
-      webpacker_loaded = Gem.loaded_specs.keys.include?("webpacker")
-      return unless webpacker_loaded
+      return unless webpacker_included?
 
       sh("yarn install")
       webpack_command = File.exist?("#{Jets.root}bin/webpack") ?
@@ -190,6 +186,18 @@ class Jets::Builders
       sh "JETS_ENV=#{Jets.env} #{webpack_command}"
     end
 
+    def webpacker_included?
+      # Old code, leaving around for now:
+      # Thanks: https://stackoverflow.com/questions/4195735/get-list-of-gems-being-used-by-a-bundler-project
+      # webpacker_loaded = Gem.loaded_specs.keys.include?("webpacker")
+      # return unless webpacker_loaded
+
+      # Checking this way because when using jets standalone for Afterburner mode we don't want to run into
+      # bundler gem collisions.  TODO: figure out the a better way to handle the collisions.
+      lines = IO.readlines("#{Jets.root}Gemfile")
+      lines.detect { |l| l =~ /webpacker/ }
+    end
+
     # This happens in the current app directory not the tmp code for simplicity
     # This is because the node likely been set up correctly there.
     def compile_rails_assets

data/lib/jets/version.rb

@@ -1,3 +1,3 @@
 module Jets
-  VERSION = "1.4.2"
+  VERSION = "1.4.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jets
 version: !ruby/object:Gem::Version
-  version: 1.4.2
+  version: 1.4.3
 platform: ruby
 authors:
 - Tung Nguyen