rocket_cms 0.26.1 → 0.27.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fef536b412c9d86e1b9ef8c575778cb66dba519e47bfef1655ccacfa099dae11
-  data.tar.gz: 41f593eeae535201a36fec053aecb1eef923d7d06a48ea819a304cd621bcea3a
+  metadata.gz: c21ff3d80a0eb1cdb7c51cd56545307bbbede8c031e76ea2256736f25dd3524f
+  data.tar.gz: 7047f6924714b82ad36d0eb6784f0a51f54bd14d25bfd50d489b690ac8242d86
 SHA512:
-  metadata.gz: f885c7d1bb7cf8142403106a6c58d45502bafe4a110b8f7842dab13b694ad09ce82b00fe57691d3f7961e5576788c7774c7376b93670cca7fc5833ce7217785d
-  data.tar.gz: e3d0308ece6ddacd777f62aab289ae26dd5e6faf4b3ae4b11650147d928b412ca153a06bed3c84260cc290b3cdfafdba5f4743eae8339125482f8a493a11a1c3
+  metadata.gz: c845eded2d6b517d6f9f44aea0ad3750aed9daf8ed09693e5b379889680b8163ab399cda4e15cecb3160ac54fb8db6101380fdc47aaf0aa65b745ff3914d939d
+  data.tar.gz: 66ebd9b8f48652e72466a88391c7f1ec87f85334c3bf6c50e91fe3699613953f64362f7cc01fc81a7e32bf34e9e8ac7999c350063154be8ab6ee2d2922542eb4

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rocket_cms (0.26.1)
+    rocket_cms (0.27.0)
       addressable
       coffee-rails
       jquery-rails
@@ -75,9 +75,9 @@ GEM
     globalid (0.4.1)
       activesupport (>= 4.2.0)
     htmlentities (4.3.4)
-    i18n (1.0.0)
+    i18n (1.0.1)
       concurrent-ruby (~> 1.0)
-    jquery-rails (4.3.1)
+    jquery-rails (4.3.3)
       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
@@ -107,11 +107,11 @@ GEM
     mini_mime (1.0.0)
     mini_portile2 (2.3.0)
     minitest (5.11.3)
-    nio4r (2.3.0)
+    nio4r (2.3.1)
     nokogiri (1.8.2)
       mini_portile2 (~> 2.3.0)
     public_suffix (3.0.2)
-    rack (2.0.4)
+    rack (2.0.5)
     rack-test (1.0.0)
       rack (>= 1.0, < 3)
     rails (5.2.0)

data/lib/generators/rocket_cms/ability_generator.rb

@@ -5,7 +5,7 @@ module RocketCms
   class AbilityGenerator < Rails::Generators::Base
     source_root File.expand_path('../templates', __FILE__)
     include Generators::Utils::InstanceMethods
-    
+
     desc 'RocketCMS CanCan Ability config generator'
     def ability
       template 'ability.erb', 'app/models/ability.rb'

data/lib/generators/rocket_cms/templates/deploy.erb

@@ -10,6 +10,17 @@ set :deploy_to, "<%= deploy_to %>"
 #set :rvm_ruby_version, "2.5.0@#{fetch :application}"
 set :use_sudo, false
 
+Rake::Task["puma:check"].clear
+Rake::Task["puma:config"].clear
+namespace :puma do
+  task :check do
+    puts 'override'
+  end
+  task :config do
+  end
+end
+
+
 set :keep_releases, 20
 
 <% if RocketCMS.mongoid? %>

data/lib/generators/rocket_cms/templates/package.json

@@ -18,30 +18,32 @@
     "babel-preset-env": "^1.6.1",
     "babel-preset-stage-0": "^6.24.1",
     "babel-runtime": "^6.26.0",
+    "bootstrap": "^4.1.1",
     "compression-webpack-plugin": "^1.1.3",
     "css-loader": "^0.28.9",
-    "extract-text-webpack-plugin": "^4.0.0-beta.0",
     "extracted-loader": "1.0.7",
     "file-loader": "^1.1.6",
     "html-loader": "^0.5.5",
     "jquery": "^3.3.1",
     "js-cookie": "^2.2.0",
     "lodash-es": "^4.17.5",
+    "mini-css-extract-plugin": "^0.4.0",
     "node-sass": "^4.7.2",
     "normalize.css": "^8.0.0",
+    "popper.js": "^1.14.3",
     "postcss-functions": "^3.0.0",
     "postcss-loader": "^2.0.10",
     "pug": "^2.0.1",
-    "pug-loader": "github:glebtv/pug-loader",
-    "rails-ujs": "^5.1.4",
-    "sass-loader": "^6.0.6",
+    "pug-loader": "^2.3.0",
+    "rails-ujs": "^5.2.0",
+    "sass-loader": "^7.0.1",
     "stats-webpack-plugin": "^0.6.2",
-    "style-loader": "^0.20.3",
+    "style-loader": "^0.21.0",
     "svg-inline-loader": "^0.8.0",
     "turbolinks": "^5.1.1",
     "url-loader": "^1.0.1",
     "vue": "^2.5.15",
-    "vue-loader": "^14.2.1",
+    "vue-loader": "^15.2.1",
     "vue-template-compiler": "^2.5.15",
     "webpack": "^4.1.1",
     "webpack-cli": "^2.0.11",

data/lib/generators/rocket_cms/templates/webpack.config.js

@@ -4,7 +4,7 @@ var path = require('path');
 var webpack = require('webpack');
 var ManifestPlugin = require('webpack-manifest-plugin');
 
-var ExtractTextPlugin = require("extract-text-webpack-plugin");
+var MiniCssExtractPlugin = require("mini-css-extract-plugin");
 var autoprefixer = require('autoprefixer');
 var CompressionPlugin = require("compression-webpack-plugin");
 
@@ -13,32 +13,34 @@ var devServerPort = <%= port %>;
 
 var production = process.env.NODE_ENV === 'production';
 
-const extractSass = new ExtractTextPlugin({
-  filename: production ? "[name]-[chunkhash].css" : "[name].css",
+const extractSass = new MiniCssExtractPlugin({
+  filename: production ? "[name].[chunkhash].css" : "[name].css",
 });
 
 var sassExtractor = () => {
-  return ['extracted-loader'].concat(extractSass.extract({
-    use: [{
+  return [
+    {
+      loader: "extracted-loader",
+    },
+    MiniCssExtractPlugin.loader,
+    {
       loader: "babel-loader",
       options: {
         cacheDirectory: true
       }
-    }, {
+    },
+    {
       loader: "css-loader",
       options: {
-        minimize: !production,
-        sourceMap: !production,
+        sourceMap: true
       }
     }, {
       loader: "sass-loader",
       options: {
-        sourceMap: !production,
-        includePaths: [path.resolve(__dirname, "..", "webpack")]
+        sourceMap: true
       }
-    }],
-    fallback: "style-loader"
-  }));
+    }
+  ]
 }
 
 var config = {

data/lib/generators/rocket_cms/templates/webpack/layout/index.sass

@@ -1,4 +1,4 @@
-@import "~common"
+@import "~/common"
 
 @import "./main"
 @import "./typography"

data/lib/generators/rocket_cms/templates/webpack/layout/main.sass

@@ -2,7 +2,7 @@
   box-sizing: border-box
 
 html, body
-  height: 100%
+  min-height: 100%
 
 html
   font-size: 14px

data/lib/rocket_cms/version.rb

@@ -1,3 +1,3 @@
 module RocketCMS
-  VERSION = '0.26.1'
+  VERSION = '0.27.0'
 end

data/template.rb

@@ -24,7 +24,7 @@ git_source(:github) do |repo_name|
   "https://github.com/#{repo_name}.git"
 end
 '}
-gem 'rails', '5.2.0.rc2'
+gem 'rails', '5.2.0'
 #{if mongoid then "gem 'mongoid', '~> 6.1.0'" else "gem 'pg', '>= 0.18', '< 2.0'" end}
 gem 'turbolinks' #required for redirects even if using via webpack
 
@@ -35,7 +35,7 @@ gem 'sass'
 gem 'rocket_cms', path: '/data/rocket_cms'" if is_dev}
 #{"#{if mongoid then "gem 'rocket_cms_mongoid'" else "gem 'rocket_cms_activerecord'" end}" unless is_dev}
 
-gem 'rails_admin', github: 'rs-pro/rails_admin'
+gem 'rails_admin', github: 'sferik/rails_admin'
 #{"gem 'friendly_id', github: 'norman/friendly_id'" unless mongoid}
 
 gem 'slim'
@@ -476,6 +476,12 @@ end
 remove_file 'config/credentials.yml.enc'
 remove_file 'config/master.key'
 
+create_file 'Procfile' do <<-TEXT
+web: bundle exec puma
+webpack: npm start
+TEXT
+end
+
 FileUtils.cp(Pathname.new(destination_root).join('config', 'secrets.yml').to_s, Pathname.new(destination_root).join('config', 'secrets.yml.example').to_s)
 
 unless mongoid

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rocket_cms
 version: !ruby/object:Gem::Version
-  version: 0.26.1
+  version: 0.27.0
 platform: ruby
 authors:
 - glebtv
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-13 00:00:00.000000000 Z
+date: 2018-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -368,7 +368,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: Please DO NOT use this gem directly, use rocket_cms_mongoid or rocket_cms_activerecord