r5 0.4.0.2 → 0.4.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7c312393f6a5800dd98254bad60bc94cfe034cda
-  data.tar.gz: f8f8cb7203c97a47819b506629c8479c8df0b6cb
+  metadata.gz: ae3414e9df9b6b59cdaa4d7878e32d08e2e58204
+  data.tar.gz: 4ec373b9a429d70a3e43a27e12792721378206ee
 SHA512:
-  metadata.gz: 1d8d58594bc4bc6f5fa680bd3a405cf46a0013164bea63704b46c10a4349b80de6b9c8b191996ab572d9f11b839c53661d6ae8ab986a02031393290997beff85
-  data.tar.gz: 58c72ce771417e97baabfca476d2609a9aca72bdb085eb9c99acb4fffe39e8d0ded9b1af911acdb0ac98c5644cd66329c135ee4c43f944fa521e2bc41c15ccc1
+  metadata.gz: 00321c3a4c01006c5c441763c6392ee24eed975b00ad497cbf82c25beb9bc03972b249ceef4c024d7f484c22cb3e106e420613398fc2da537fdc625614b11804
+  data.tar.gz: 977072d4966d971202f3d5dd05566662d73e940a7441feef01538d099146670094b3fae51049f10e0567713c93e0d24f9a4000f54d56153059ac9499989de5fa

data/lib/r5/recipes/materialize.rb

@@ -17,6 +17,27 @@ before: "\n//= require_tree ." do <<-TXT
 TXT
 end
 
+
+create_file "#{@project_path}/config/webpack/custom.js" do <<-JS
+  const webpack = require('webpack')
+  
+  module.exports = {
+    resolve: {
+      alias: {
+        jquery: 'jquery/src/jquery',
+      }
+    },
+  }
+  
+  // config/webpack/development.js
+  const merge = require('webpack-merge')
+  const environment = require('./environment')
+  const customConfig = require('./custom')
+  
+  module.exports = merge(environment.toWebpackConfig(), customConfig)
+JS
+end
+
 insert_into_file "#{@project_path}/app/javascript/packs/application.js",
                  after: "console.log('Hello World from Webpacker')" do <<-JS
                  
@@ -25,32 +46,26 @@ window.jQuery = jQuery
 
 let ready;
 ready = function() {
-  $(".datepicker").datetimepicker({locale: 'cs', format: 'D. M. YYYY'});
+  // $(".datepicker").datetimepicker({locale: 'cs', format: 'D. M. YYYY'});
 };
 // Fire javascript after turbolinks event
 $(document).on('turbolinks:load', ready);
 JS
 end
 
-insert_into_file "#{@project_path}/config/webpack/shared.js",
-                 after: "new ManifestPlugin({ fileName: paths.manifest, publicPath, writeToFileEmit: true })
-  ]," do <<-JS
-
-  resolve: {
-    alias: {
-      jquery: "jquery/src/jquery"
-    }
-  },
-JS
-end
-
-insert_into_file "#{@project_path}/config/webpack/shared.js",
-                 after: "new ExtractTextPlugin(env.NODE_ENV === 'production' ? '[name]-[hash].css' : '[name].css')," do <<-JS
+insert_into_file "#{@project_path}/config/webpack/environment.js",
+                 after: "const { environment } = require('@rails/webpacker')" do <<-JS
 
-  new webpack.ProvidePlugin({
-    $: 'jquery',
-    jQuery: 'jquery',
-    jquery: 'jquery'
-  }),
+  const webpack = require('webpack')
+  
+  // Add an additional plugin of your choosing : ProvidePlugin
+  environment.plugins.set(
+    'Provide',
+    new webpack.ProvidePlugin({
+      $: 'jquery',
+      jQuery: 'jquery',
+      jquery: 'jquery',
+    })
+  )
 JS
 end

data/lib/r5/starter.rb

@@ -13,16 +13,21 @@ class Starter < Thor
       create_config_file
     end
 
-    if `rails -v` =~ /command not found/ or !(`rails -v` =~ /Rails 5.1.*/)
+    if (system "rails -v").nil? or (%x[rails -v] =~ /Rails 5.1.*/).nil?
       say "You didn't install Rails or have version lower than 5.1 Please install proper version.", :red
       abort
     end
 
-    if `yarn --version` =~ /command not found/
+    if (system "yarn --version").nil?
       say "You need to install yarn on your system to manage javascript assets", :red
       abort
     end
 
+    if (system "webpack").nil?
+      say "You need to install webpack", :red
+      abort
+    end
+
     unless Config.check_settings.empty?
       say Config.check_settings, :green
       say 'Check structure of your config file - it seems you are missing required options mentioned above', :red
@@ -54,7 +59,7 @@ class Starter < Thor
   def new project_name
     @project_name = project_name
     run "rails new #{@project_name} -T --skip-bundle --webpack"
-    run 'rake webpacker:install'
+    #run 'rake webpacker:install'
 
     @project_path = "#{@dir}/#{@project_name}"
     @project_label = @project_name.capitalize.gsub('_', ' ')

data/lib/r5/version.rb

@@ -1,3 +1,3 @@
 module R5
-  VERSION = "0.4.0.2"
+  VERSION = "0.4.0.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: r5
 version: !ruby/object:Gem::Version
-  version: 0.4.0.2
+  version: 0.4.0.4
 platform: ruby
 authors:
 - mousse
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-16 00:00:00.000000000 Z
+date: 2017-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler