rocket_cms 0.35.0 → 0.36.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (10) hide show
  1. checksums.yaml +4 -4
  2. data/.ruby-version +1 -1
  3. data/Gemfile.lock +74 -74
  4. data/lib/generators/rocket_cms/templates/Capfile +1 -0
  5. data/lib/generators/rocket_cms/templates/deploy.erb +3 -0
  6. data/lib/generators/rocket_cms/templates/package.json +29 -30
  7. data/lib/generators/rocket_cms/templates/webpack.config.js +13 -7
  8. data/lib/rocket_cms/version.rb +1 -1
  9. data/template.rb +4 -3
  10. metadata +3 -3
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 8a90552d8b2be28d032feff8ff02ee3b6f3d77caa692ae015cf9395b711a4876
4
- data.tar.gz: 901754951a02fcce2aa66905101a51f6a34d97a77844bf6f07f9a7a959f23de8
3
+ metadata.gz: cfd76532d1cd7a3cd24ff905c6db5e59d2834bf460938343050eb46f95ef3ebb
4
+ data.tar.gz: 49b14a0ef0c07e3b93e3ba90eff8e39ff445001344e3a73c4e53efc02604afa1
5
5
  SHA512:
6
- metadata.gz: 5dab7f7ab31b57f0b371f8d8e6c60df3186b6f4738d68c0e55d2b64325cca99b763172d66d5183006a9e714353fb8c6e3e68f35ff283138a052b0e0cb2439cb7
7
- data.tar.gz: 2546fff6283204b2af1d29effe641c9f787159ede53f1638dabb427378693bb0a2cfabb49a7b541a60bc38e9ba06900018a66cb5bfe9a0327ae8fd6da3f3feb8
6
+ metadata.gz: e5260560ffc942d07a28fb25e6d9c79c62a0790440a6e5bd005fb758d3db8eab1b2b0a9970b0d679abf47463c49d7e2dcdf14babb79da26002f40b62d3bc9997
7
+ data.tar.gz: d186240220796370e98378a65b5867734cadfb1dae11d952a86165805a7d430151e9d86f4c13e38ff7333c89098d79a9116bd80cf9d70f1ff25d66ee388df310
data/.ruby-version CHANGED
@@ -1 +1 @@
1
- 2.6.5
1
+ 2.6.6
data/Gemfile.lock CHANGED
@@ -1,7 +1,7 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- rocket_cms (0.35.0)
4
+ rocket_cms (0.36.0)
5
5
  addressable
6
6
  coffee-rails
7
7
  jquery-rails
@@ -16,66 +16,66 @@ PATH
16
16
  GEM
17
17
  remote: https://rubygems.org/
18
18
  specs:
19
- actioncable (6.1.0)
20
- actionpack (= 6.1.0)
21
- activesupport (= 6.1.0)
19
+ actioncable (6.1.4)
20
+ actionpack (= 6.1.4)
21
+ activesupport (= 6.1.4)
22
22
  nio4r (~> 2.0)
23
23
  websocket-driver (>= 0.6.1)
24
- actionmailbox (6.1.0)
25
- actionpack (= 6.1.0)
26
- activejob (= 6.1.0)
27
- activerecord (= 6.1.0)
28
- activestorage (= 6.1.0)
29
- activesupport (= 6.1.0)
24
+ actionmailbox (6.1.4)
25
+ actionpack (= 6.1.4)
26
+ activejob (= 6.1.4)
27
+ activerecord (= 6.1.4)
28
+ activestorage (= 6.1.4)
29
+ activesupport (= 6.1.4)
30
30
  mail (>= 2.7.1)
31
- actionmailer (6.1.0)
32
- actionpack (= 6.1.0)
33
- actionview (= 6.1.0)
34
- activejob (= 6.1.0)
35
- activesupport (= 6.1.0)
31
+ actionmailer (6.1.4)
32
+ actionpack (= 6.1.4)
33
+ actionview (= 6.1.4)
34
+ activejob (= 6.1.4)
35
+ activesupport (= 6.1.4)
36
36
  mail (~> 2.5, >= 2.5.4)
37
37
  rails-dom-testing (~> 2.0)
38
- actionpack (6.1.0)
39
- actionview (= 6.1.0)
40
- activesupport (= 6.1.0)
38
+ actionpack (6.1.4)
39
+ actionview (= 6.1.4)
40
+ activesupport (= 6.1.4)
41
41
  rack (~> 2.0, >= 2.0.9)
42
42
  rack-test (>= 0.6.3)
43
43
  rails-dom-testing (~> 2.0)
44
44
  rails-html-sanitizer (~> 1.0, >= 1.2.0)
45
- actiontext (6.1.0)
46
- actionpack (= 6.1.0)
47
- activerecord (= 6.1.0)
48
- activestorage (= 6.1.0)
49
- activesupport (= 6.1.0)
45
+ actiontext (6.1.4)
46
+ actionpack (= 6.1.4)
47
+ activerecord (= 6.1.4)
48
+ activestorage (= 6.1.4)
49
+ activesupport (= 6.1.4)
50
50
  nokogiri (>= 1.8.5)
51
- actionview (6.1.0)
52
- activesupport (= 6.1.0)
51
+ actionview (6.1.4)
52
+ activesupport (= 6.1.4)
53
53
  builder (~> 3.1)
54
54
  erubi (~> 1.4)
55
55
  rails-dom-testing (~> 2.0)
56
56
  rails-html-sanitizer (~> 1.1, >= 1.2.0)
57
- activejob (6.1.0)
58
- activesupport (= 6.1.0)
57
+ activejob (6.1.4)
58
+ activesupport (= 6.1.4)
59
59
  globalid (>= 0.3.6)
60
- activemodel (6.1.0)
61
- activesupport (= 6.1.0)
62
- activerecord (6.1.0)
63
- activemodel (= 6.1.0)
64
- activesupport (= 6.1.0)
65
- activestorage (6.1.0)
66
- actionpack (= 6.1.0)
67
- activejob (= 6.1.0)
68
- activerecord (= 6.1.0)
69
- activesupport (= 6.1.0)
70
- marcel (~> 0.3.1)
71
- mimemagic (~> 0.3.2)
72
- activesupport (6.1.0)
60
+ activemodel (6.1.4)
61
+ activesupport (= 6.1.4)
62
+ activerecord (6.1.4)
63
+ activemodel (= 6.1.4)
64
+ activesupport (= 6.1.4)
65
+ activestorage (6.1.4)
66
+ actionpack (= 6.1.4)
67
+ activejob (= 6.1.4)
68
+ activerecord (= 6.1.4)
69
+ activesupport (= 6.1.4)
70
+ marcel (~> 1.0.0)
71
+ mini_mime (>= 1.1.0)
72
+ activesupport (6.1.4)
73
73
  concurrent-ruby (~> 1.0, >= 1.0.2)
74
74
  i18n (>= 1.6, < 2)
75
75
  minitest (>= 5.1)
76
76
  tzinfo (~> 2.0)
77
77
  zeitwerk (~> 2.3)
78
- addressable (2.7.0)
78
+ addressable (2.8.0)
79
79
  public_suffix (>= 2.0.2, < 5.0)
80
80
  builder (3.2.4)
81
81
  coffee-rails (5.0.0)
@@ -85,14 +85,14 @@ GEM
85
85
  coffee-script-source
86
86
  execjs
87
87
  coffee-script-source (1.12.2)
88
- concurrent-ruby (1.1.7)
88
+ concurrent-ruby (1.1.9)
89
89
  crass (1.0.6)
90
90
  erubi (1.10.0)
91
- execjs (2.7.0)
91
+ execjs (2.8.1)
92
92
  globalid (0.4.2)
93
93
  activesupport (>= 4.2.0)
94
94
  htmlentities (4.3.4)
95
- i18n (1.8.5)
95
+ i18n (1.8.10)
96
96
  concurrent-ruby (~> 1.0)
97
97
  jquery-rails (4.4.0)
98
98
  rails-dom-testing (>= 1, < 3)
@@ -110,54 +110,54 @@ GEM
110
110
  activerecord
111
111
  kaminari-core (= 1.2.1)
112
112
  kaminari-core (1.2.1)
113
- loofah (2.8.0)
113
+ loofah (2.10.0)
114
114
  crass (~> 1.0.2)
115
115
  nokogiri (>= 1.5.9)
116
116
  mail (2.7.1)
117
117
  mini_mime (>= 0.1.1)
118
118
  manual_slug (0.4.0)
119
119
  activesupport
120
- marcel (0.3.3)
121
- mimemagic (~> 0.3.2)
120
+ marcel (1.0.1)
122
121
  method_source (1.0.0)
123
- mimemagic (0.3.5)
124
- mini_mime (1.0.2)
125
- mini_portile2 (2.4.0)
126
- minitest (5.14.2)
127
- nio4r (2.5.4)
128
- nokogiri (1.10.10)
129
- mini_portile2 (~> 2.4.0)
122
+ mini_mime (1.1.0)
123
+ mini_portile2 (2.5.3)
124
+ minitest (5.14.4)
125
+ nio4r (2.5.7)
126
+ nokogiri (1.11.7)
127
+ mini_portile2 (~> 2.5.0)
128
+ racc (~> 1.4)
130
129
  public_suffix (4.0.6)
130
+ racc (1.5.2)
131
131
  rack (2.2.3)
132
132
  rack-test (1.1.0)
133
133
  rack (>= 1.0, < 3)
134
- rails (6.1.0)
135
- actioncable (= 6.1.0)
136
- actionmailbox (= 6.1.0)
137
- actionmailer (= 6.1.0)
138
- actionpack (= 6.1.0)
139
- actiontext (= 6.1.0)
140
- actionview (= 6.1.0)
141
- activejob (= 6.1.0)
142
- activemodel (= 6.1.0)
143
- activerecord (= 6.1.0)
144
- activestorage (= 6.1.0)
145
- activesupport (= 6.1.0)
134
+ rails (6.1.4)
135
+ actioncable (= 6.1.4)
136
+ actionmailbox (= 6.1.4)
137
+ actionmailer (= 6.1.4)
138
+ actionpack (= 6.1.4)
139
+ actiontext (= 6.1.4)
140
+ actionview (= 6.1.4)
141
+ activejob (= 6.1.4)
142
+ activemodel (= 6.1.4)
143
+ activerecord (= 6.1.4)
144
+ activestorage (= 6.1.4)
145
+ activesupport (= 6.1.4)
146
146
  bundler (>= 1.15.0)
147
- railties (= 6.1.0)
147
+ railties (= 6.1.4)
148
148
  sprockets-rails (>= 2.0.0)
149
149
  rails-dom-testing (2.0.3)
150
150
  activesupport (>= 4.2.0)
151
151
  nokogiri (>= 1.6)
152
152
  rails-html-sanitizer (1.3.0)
153
153
  loofah (~> 2.3)
154
- railties (6.1.0)
155
- actionpack (= 6.1.0)
156
- activesupport (= 6.1.0)
154
+ railties (6.1.4)
155
+ actionpack (= 6.1.4)
156
+ activesupport (= 6.1.4)
157
157
  method_source
158
- rake (>= 0.8.7)
158
+ rake (>= 0.13)
159
159
  thor (~> 1.0)
160
- rake (13.0.3)
160
+ rake (13.0.6)
161
161
  smart_excerpt (0.1.6)
162
162
  activesupport
163
163
  htmlentities
@@ -169,12 +169,12 @@ GEM
169
169
  activesupport (>= 4.0)
170
170
  sprockets (>= 3.0.0)
171
171
  stringex (2.8.5)
172
- thor (1.0.1)
172
+ thor (1.1.0)
173
173
  tzinfo (2.0.4)
174
174
  concurrent-ruby (~> 1.0)
175
175
  validates_email_format_of (1.6.3)
176
176
  i18n
177
- websocket-driver (0.7.3)
177
+ websocket-driver (0.7.5)
178
178
  websocket-extensions (>= 0.1.0)
179
179
  websocket-extensions (0.1.5)
180
180
  zeitwerk (2.4.2)
data/lib/generators/rocket_cms/templates/Capfile CHANGED
@@ -18,6 +18,7 @@ require 'capistrano/puma'
18
18
  install_plugin Capistrano::Puma
19
19
  install_plugin Capistrano::Puma::Workers
20
20
  install_plugin Capistrano::Puma::Jungle
21
+ install_plugin Capistrano::Puma::Systemd
21
22
 
22
23
  require "capistrano/scm/git"
23
24
  install_plugin Capistrano::SCM::Git
data/lib/generators/rocket_cms/templates/deploy.erb CHANGED
@@ -13,6 +13,9 @@ set :use_sudo, false
13
13
  set :puma_state, -> { File.join(shared_path, 'tmp', 'puma', 'state') }
14
14
  set :puma_pid, -> { File.join(shared_path, 'tmp', 'puma', 'pid') }
15
15
  set :puma_conf, -> { File.join(current_path, 'config', 'puma.rb') }
16
+ set :puma_preload_app, false
17
+ set :puma_service_unit_name, "puma"
18
+ set :puma_systemctl_user, :user
16
19
 
17
20
  Rake::Task["puma:check"].clear
18
21
  Rake::Task["puma:config"].clear
data/lib/generators/rocket_cms/templates/package.json CHANGED
@@ -5,39 +5,38 @@
5
5
  "private": true,
6
6
  "repository": "git@rscz.ru:rocket-science/<%= app_name.downcase %>.git",
7
7
  "dependencies": {
8
- "@rails/actioncable": "^6.0.0",
9
- "@rails/ujs": "^6.0.0",
10
- "turbolinks": "^5.2.0",
11
- "@babel/core": "^7.0.0",
12
- "@babel/plugin-proposal-class-properties": "^7.0.0",
13
- "@babel/plugin-proposal-function-bind": "^7.0.0",
14
- "@babel/plugin-transform-runtime": "^7.7.4",
15
- "@babel/polyfill": "^7.0.0",
16
- "@babel/preset-env": "^7.0.0",
17
- "@babel/preset-react": "^7.0.0",
18
- "autoprefixer": "^9.3.1",
19
- "babel-loader": "^8.0.2",
20
- "compression-webpack-plugin": "^3.0.0",
21
- "core-js": "3",
22
- "css-hot-loader": "^1.3.6",
23
- "css-loader": "^3.2.0",
24
- "extract-css-chunks-webpack-plugin": "^4.6.0",
25
- "file-loader": "^4.3.0",
26
- "html-loader": "^0.5.5",
27
- "node-sass": "^4.0.0",
8
+ "@babel/core": "^7.14.6",
9
+ "@babel/plugin-proposal-class-properties": "^7.14.5",
10
+ "@babel/plugin-proposal-function-bind": "^7.14.5",
11
+ "@babel/plugin-transform-runtime": "^7.14.5",
12
+ "@babel/preset-env": "^7.14.7",
13
+ "@babel/preset-react": "^7.14.5",
14
+ "@rails/actioncable": "^6.1.4",
15
+ "@rails/ujs": "^6.1.4",
16
+ "autoprefixer": "^10.3.1",
17
+ "babel-loader": "^8.2.2",
18
+ "compression-webpack-plugin": "^8.0.1",
19
+ "core-js": "^3.15.2",
20
+ "css-hot-loader": "^1.4.4",
21
+ "css-loader": "^5.2.7",
22
+ "extract-css-chunks-webpack-plugin": "^4.9.0",
23
+ "file-loader": "^6.2.0",
24
+ "html-loader": "^2.1.2",
25
+ "node-sass": "^6.0.1",
28
26
  "normalize.css": "^8.0.1",
29
- "postcss-functions": "^3.0.0",
30
- "postcss-loader": "^3.0.0",
31
- "sass-loader": "^8.0.0",
32
- "style-loader": "^1.0.0",
33
- "url-loader": "^2.3.0",
34
- "webpack": "^4.25.1",
35
- "webpack-cli": "^3.1.2",
36
- "webpack-dev-server": "^3.1.10",
37
- "webpack-manifest-plugin": "^2.0.4"
27
+ "postcss-functions": "^4.0.2",
28
+ "postcss-loader": "^6.1.1",
29
+ "sass-loader": "^12.1.0",
30
+ "style-loader": "^3.1.0",
31
+ "turbolinks": "^5.2.0",
32
+ "url-loader": "^4.1.1",
33
+ "webpack": "^5.44.0",
34
+ "webpack-cli": "^4.7.2",
35
+ "webpack-dev-server": "^3.11.2",
36
+ "webpack-manifest-plugin": "^3.1.1"
38
37
  },
39
38
  "scripts": {
40
39
  "build": "webpack --config config/webpack.config.js",
41
- "start": "webpack-dev-server --config config/webpack.config.js --hot --inline"
40
+ "start": "webpack serve --config config/webpack.config.js --progress --hot --inline"
42
41
  }
43
42
  }
data/lib/generators/rocket_cms/templates/webpack.config.js CHANGED
@@ -2,7 +2,7 @@
2
2
 
3
3
  var path = require('path');
4
4
  var webpack = require('webpack');
5
- var ManifestPlugin = require('webpack-manifest-plugin');
5
+ var { WebpackManifestPlugin } = require('webpack-manifest-plugin');
6
6
 
7
7
  var autoprefixer = require('autoprefixer');
8
8
  var CompressionPlugin = require("compression-webpack-plugin");
@@ -55,6 +55,7 @@ var config = {
55
55
  {
56
56
  loader: ExtractCssChunks.loader,
57
57
  options: {
58
+ modules: false,
58
59
  hmr: production ? false : true,
59
60
  // Force reload all
60
61
  //reloadAll: true,
@@ -71,7 +72,15 @@ var config = {
71
72
  loader: "postcss-loader",
72
73
  },
73
74
  {
74
- loader: "sass-loader"
75
+ loader: "sass-loader",
76
+ options: {
77
+ sassOptions: {
78
+ includePaths: [
79
+ path.resolve(__dirname, "..", "webpack"),
80
+ //path.resolve(__dirname, "..", "node_modules"),
81
+ ]
82
+ }
83
+ },
75
84
  }
76
85
  ]
77
86
  },
@@ -108,7 +117,7 @@ var config = {
108
117
  }
109
118
  ),
110
119
  new CleanUpExtractCssChunks(),
111
- new ManifestPlugin({
120
+ new WebpackManifestPlugin({
112
121
  writeToFileEmit: true,
113
122
  //basePath: "",
114
123
  publicPath: production ? "/webpack/" : 'http://' + host + ':' + devServerPort + '/webpack/',
@@ -118,6 +127,7 @@ var config = {
118
127
  ],
119
128
  optimization: {
120
129
  minimize: production,
130
+ moduleIds: production ? 'deterministic' : 'named',
121
131
  splitChunks: {
122
132
  cacheGroups: {
123
133
  default: false,
@@ -149,10 +159,6 @@ if (production) {
149
159
  );
150
160
  config.output.publicPath = '/webpack/';
151
161
  } else {
152
- config.plugins.push(
153
- new webpack.NamedModulesPlugin(),
154
- )
155
-
156
162
  config.devServer = {
157
163
  port: devServerPort,
158
164
  disableHostCheck: true,
data/lib/rocket_cms/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module RocketCMS
2
- VERSION = '0.35.0'
2
+ VERSION = '0.36.0'
3
3
  end
data/template.rb CHANGED
@@ -54,7 +54,7 @@ gem 'cancancan'
54
54
  #{if mongoid then "gem 'cancancan'" end}
55
55
 
56
56
  gem 'cloner'
57
- gem 'puma'
57
+ gem 'puma', github: 'AnatolyShirykalov/puma', branch: '5.3.2'
58
58
 
59
59
  gem 'sentry-raven'
60
60
 
@@ -96,7 +96,7 @@ group :development, :test do
96
96
  gem 'capybara'
97
97
  # https://github.com/mattheworiordan/capybara-screenshot/issues/243
98
98
  gem 'capybara-screenshot'
99
- gem 'selenium-webdriver'
99
+ gem 'selenium-webdriver', '4.0.0.beta4'
100
100
  gem 'webdrivers'
101
101
  gem 'database_cleaner'
102
102
  #{if mongoid then " gem 'database_cleaner-mongoid'" else "" end}
@@ -553,7 +553,7 @@ if rails_env == 'development'
553
553
  else
554
554
  # https://github.com/seuros/capistrano-puma/blob/642d141ee502546bd5a43a76cd9f6766dc0fcc7a/lib/capistrano/templates/puma.rb.erb#L25
555
555
  prune_bundler
556
- preload_app!
556
+ preload_app! false
557
557
  # Change to match your CPU core count
558
558
  workers 1
559
559
  #{'shared_dir = "#{base_dir}/shared"'}
@@ -568,6 +568,7 @@ else
568
568
  #{'pidfile "#{shared_dir}/tmp/puma/pid"'}
569
569
  #{'state_path "#{shared_dir}/tmp/puma/state"'}
570
570
  activate_control_app
571
+ reopen_logs
571
572
  on_restart do
572
573
  puts 'Refreshing Gemfile'
573
574
  #{'ENV["BUNDLE_GEMFILE"] = "#{current_dir}/Gemfile" unless rails_env == \'development\''}
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: rocket_cms
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.35.0
4
+ version: 0.36.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - glebtv
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2020-12-23 00:00:00.000000000 Z
11
+ date: 2021-07-14 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: bundler
@@ -364,7 +364,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
364
364
  - !ruby/object:Gem::Version
365
365
  version: '0'
366
366
  requirements: []
367
- rubygems_version: 3.1.4
367
+ rubygems_version: 3.0.3
368
368
  signing_key:
369
369
  specification_version: 4
370
370
  summary: Please DO NOT use this gem directly, use rocket_cms_mongoid or rocket_cms_activerecord