rocket_cms 0.29.0 → 0.30.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 40212c8aca0cff8046c18e1330e0b1d2953843f6c980c9b61463394f4be0337a
-  data.tar.gz: 93fff49dbb76906cce0b4c3dc2ae751bf62dfbc8a6115e244640dc8029f26eb7
+  metadata.gz: 99f28386f0c25e7b5b4130753a92cbd67879a73103731cfc7ee7becbb5f51b56
+  data.tar.gz: 4b40826b97201fac4d6e135b7626840b191ce27b196f3c2eae488ad47907ad06
 SHA512:
-  metadata.gz: 9a0a8c20dd3fe38ceae07be0498be6424c4eace59f2e615a9c82775dfc1d51062f31121e46444e34ac7d5a32ba482b3e0785b6e4e92efc7d9981b2c950f475f9
-  data.tar.gz: 52a24599b12ffcbafc11d664c631350a1565e87580426d1b4ec326e62bbf670487e1520a20ac01a911f262595e81bb40d31d4b0519c81e64e18c6412422fef4c
+  metadata.gz: 64a1c82f6fdd78704826efcf596168a8d8307b5d000cf7fc615f6f2a20aa595df4d8768b3d70a8f3a89293dcdc1beb8641ed42f253086b1e7337133c91ba0bd1
+  data.tar.gz: 8b02db625b5ce810e9b14fe92b2048e00c78f759c940bed48916abe8481932d91fcc4aeeb74daeac8579d9564d4c11ccb7a0d20383aabe06b2b5f7109e5e1cf3

data/.ruby-version

@@ -1 +1 @@
-2.2.0
+2.6.5

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rocket_cms (0.29.0)
+    rocket_cms (0.30.0)
       addressable
       coffee-rails
       jquery-rails
@@ -16,50 +16,63 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (5.2.3)
-      actionpack (= 5.2.3)
+    actioncable (6.0.1)
+      actionpack (= 6.0.1)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailer (5.2.3)
-      actionpack (= 5.2.3)
-      actionview (= 5.2.3)
-      activejob (= 5.2.3)
+    actionmailbox (6.0.1)
+      actionpack (= 6.0.1)
+      activejob (= 6.0.1)
+      activerecord (= 6.0.1)
+      activestorage (= 6.0.1)
+      activesupport (= 6.0.1)
+      mail (>= 2.7.1)
+    actionmailer (6.0.1)
+      actionpack (= 6.0.1)
+      actionview (= 6.0.1)
+      activejob (= 6.0.1)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (5.2.3)
-      actionview (= 5.2.3)
-      activesupport (= 5.2.3)
+    actionpack (6.0.1)
+      actionview (= 6.0.1)
+      activesupport (= 6.0.1)
       rack (~> 2.0)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.2.3)
-      activesupport (= 5.2.3)
+      rails-html-sanitizer (~> 1.0, >= 1.2.0)
+    actiontext (6.0.1)
+      actionpack (= 6.0.1)
+      activerecord (= 6.0.1)
+      activestorage (= 6.0.1)
+      activesupport (= 6.0.1)
+      nokogiri (>= 1.8.5)
+    actionview (6.0.1)
+      activesupport (= 6.0.1)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activejob (5.2.3)
-      activesupport (= 5.2.3)
+      rails-html-sanitizer (~> 1.1, >= 1.2.0)
+    activejob (6.0.1)
+      activesupport (= 6.0.1)
       globalid (>= 0.3.6)
-    activemodel (5.2.3)
-      activesupport (= 5.2.3)
-    activerecord (5.2.3)
-      activemodel (= 5.2.3)
-      activesupport (= 5.2.3)
-      arel (>= 9.0)
-    activestorage (5.2.3)
-      actionpack (= 5.2.3)
-      activerecord (= 5.2.3)
+    activemodel (6.0.1)
+      activesupport (= 6.0.1)
+    activerecord (6.0.1)
+      activemodel (= 6.0.1)
+      activesupport (= 6.0.1)
+    activestorage (6.0.1)
+      actionpack (= 6.0.1)
+      activejob (= 6.0.1)
+      activerecord (= 6.0.1)
       marcel (~> 0.3.1)
-    activesupport (5.2.3)
+    activesupport (6.0.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-    addressable (2.6.0)
-      public_suffix (>= 2.0.2, < 4.0)
-    arel (9.0.0)
+      zeitwerk (~> 2.2)
+    addressable (2.7.0)
+      public_suffix (>= 2.0.2, < 5.0)
     builder (3.2.3)
     coffee-rails (5.0.0)
       coffee-script (>= 2.2.0)
@@ -69,13 +82,13 @@ GEM
       execjs
     coffee-script-source (1.12.2)
     concurrent-ruby (1.1.5)
-    crass (1.0.4)
-    erubi (1.8.0)
+    crass (1.0.5)
+    erubi (1.9.0)
     execjs (2.7.0)
     globalid (0.4.2)
       activesupport (>= 4.2.0)
     htmlentities (4.3.4)
-    i18n (1.6.0)
+    i18n (1.7.0)
       concurrent-ruby (~> 1.0)
     jquery-rails (4.3.5)
       rails-dom-testing (>= 1, < 3)
@@ -93,7 +106,7 @@ GEM
       activerecord
       kaminari-core (= 1.1.1)
     kaminari-core (1.1.1)
-    loofah (2.2.3)
+    loofah (2.3.1)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     mail (2.7.1)
@@ -104,45 +117,47 @@ GEM
       mimemagic (~> 0.3.2)
     method_source (0.9.2)
     mimemagic (0.3.3)
-    mini_mime (1.0.1)
+    mini_mime (1.0.2)
     mini_portile2 (2.4.0)
-    minitest (5.11.3)
-    nio4r (2.3.1)
-    nokogiri (1.10.3)
+    minitest (5.13.0)
+    nio4r (2.5.2)
+    nokogiri (1.10.5)
       mini_portile2 (~> 2.4.0)
-    public_suffix (3.1.1)
+    public_suffix (4.0.1)
     rack (2.0.7)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
-    rails (5.2.3)
-      actioncable (= 5.2.3)
-      actionmailer (= 5.2.3)
-      actionpack (= 5.2.3)
-      actionview (= 5.2.3)
-      activejob (= 5.2.3)
-      activemodel (= 5.2.3)
-      activerecord (= 5.2.3)
-      activestorage (= 5.2.3)
-      activesupport (= 5.2.3)
+    rails (6.0.1)
+      actioncable (= 6.0.1)
+      actionmailbox (= 6.0.1)
+      actionmailer (= 6.0.1)
+      actionpack (= 6.0.1)
+      actiontext (= 6.0.1)
+      actionview (= 6.0.1)
+      activejob (= 6.0.1)
+      activemodel (= 6.0.1)
+      activerecord (= 6.0.1)
+      activestorage (= 6.0.1)
+      activesupport (= 6.0.1)
       bundler (>= 1.3.0)
-      railties (= 5.2.3)
+      railties (= 6.0.1)
       sprockets-rails (>= 2.0.0)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.0.4)
-      loofah (~> 2.2, >= 2.2.2)
-    railties (5.2.3)
-      actionpack (= 5.2.3)
-      activesupport (= 5.2.3)
+    rails-html-sanitizer (1.3.0)
+      loofah (~> 2.3)
+    railties (6.0.1)
+      actionpack (= 6.0.1)
+      activesupport (= 6.0.1)
       method_source
       rake (>= 0.8.7)
-      thor (>= 0.19.0, < 2.0)
-    rake (12.3.2)
-    smart_excerpt (0.1.5)
+      thor (>= 0.20.3, < 2.0)
+    rake (13.0.1)
+    smart_excerpt (0.1.6)
       activesupport
       htmlentities
-    sprockets (3.7.2)
+    sprockets (4.0.0)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
     sprockets-rails (3.2.1)
@@ -159,6 +174,7 @@ GEM
     websocket-driver (0.7.1)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.4)
+    zeitwerk (2.2.1)
 
 PLATFORMS
   ruby

data/lib/generators/rocket_cms/templates/.babelrc

@@ -1,8 +1,19 @@
 {
-  "presets": [["env", {
-   "targets": {
-    "browsers": ["last 2 versions", "ie >= 11"]
-    },
-    "useBuiltIns": true
-  }], "stage-0"]
+  "presets": [
+    ["@babel/env", {
+      "targets": {
+        "browsers": ["last 2 versions", "ie >= 11"]
+      },
+      "corejs": 3,
+      "useBuiltIns": "entry"
+    }]
+    //, "@babel/react"
+  ],
+ "plugins": [
+    //["@babel/plugin-transform-react-jsx", { "pragma":"h" }],
+    "@babel/plugin-proposal-function-bind",
+    "@babel/plugin-syntax-dynamic-import",
+    ["@babel/plugin-proposal-class-properties", { "loose": false }],
+    "@babel/plugin-transform-runtime"
+  ]
 }

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

@@ -4,51 +4,37 @@
   "license": "UNLICENSED",
   "private": true,
   "repository": "git@rscz.ru:rocket-science/<%= app_name.downcase %>.git",
-  "scripts": {
-    "start": "./node_modules/.bin/webpack-dev-server --config config/webpack.config.js --hot --inline"
-  },
   "dependencies": {
-    "autoprefixer": "^8.1.0",
-    "axios": "^0.18.0",
-    "babel-cli": "^6.26.0",
-    "babel-core": "^6.26.0",
-    "babel-loader": "^7.1.2",
-    "babel-plugin-syntax-dynamic-import": "^6.18.0",
-    "babel-plugin-transform-runtime": "^6.23.0",
-    "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",
-    "extracted-loader": "1.0.7",
-    "file-loader": "^1.1.6",
+    "@babel/core": "^7.0.0",
+    "@babel/plugin-proposal-class-properties": "^7.0.0",
+    "@babel/plugin-proposal-function-bind": "^7.0.0",
+    "@babel/plugin-transform-runtime": "^7.7.4",
+    "@babel/polyfill": "^7.0.0",
+    "@babel/preset-env": "^7.0.0",
+    "@babel/preset-react": "^7.0.0",
+    "autoprefixer": "^9.3.1",
+    "babel-loader": "^8.0.2",
+    "compression-webpack-plugin": "^3.0.0",
+    "core-js": "3",
+    "css-hot-loader": "^1.3.6",
+    "css-loader": "^3.2.0",
+    "extract-css-chunks-webpack-plugin": "^4.6.0",
+    "file-loader": "^4.3.0",
     "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",
+    "node-sass": "^4.0.0",
+    "normalize.css": "^8.0.1",
     "postcss-functions": "^3.0.0",
-    "postcss-loader": "^2.0.10",
-    "pug": "^2.0.1",
-    "pug-loader": "^2.3.0",
-    "rails-ujs": "^5.2.0",
-    "sass-loader": "^7.0.1",
-    "stats-webpack-plugin": "^0.6.2",
-    "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": "^15.2.1",
-    "vue-template-compiler": "^2.5.15",
-    "webpack": "^4.1.1",
+    "postcss-loader": "^3.0.0",
+    "sass-loader": "^8.0.0",
+    "style-loader": "^1.0.0",
+    "url-loader": "^2.3.0",
+    "webpack": "^4.25.1",
     "webpack-cli": "^3.1.2",
-    "webpack-dev-server": "^3.1.1",
-    "webpack-hot-middleware": "^2.21.0",
-    "webpack-manifest-plugin": "^2.0.0-rc.2"
+    "webpack-dev-server": "^3.1.10",
+    "webpack-manifest-plugin": "^2.0.4"
+  },
+  "scripts": {
+    "build": "webpack --config config/webpack.config.js",
+    "start": "webpack-dev-server --config config/webpack.config.js --hot --inline"
   }
 }

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

@@ -0,0 +1,5 @@
+module.exports = {
+  plugins: [
+    require('autoprefixer')
+  ]
+}

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

@@ -4,91 +4,76 @@ var path = require('path');
 var webpack = require('webpack');
 var ManifestPlugin = require('webpack-manifest-plugin');
 
-var MiniCssExtractPlugin = require("mini-css-extract-plugin");
 var autoprefixer = require('autoprefixer');
 var CompressionPlugin = require("compression-webpack-plugin");
 
 var host = process.env.HOST || 'localhost'
-var devServerPort = <%= port %>;
+var devServerPort = 3808;
 
 var production = process.env.NODE_ENV === 'production';
 
-const extractSass = new MiniCssExtractPlugin({
-  filename: production ? "[name].[chunkhash].css" : "[name].css",
-});
+const ExtractCssChunks = require("extract-css-chunks-webpack-plugin")
 
-var sassExtractor = () => {
-  return [
-    {
-      loader: "extracted-loader",
-    },
-    MiniCssExtractPlugin.loader,
-    {
-      loader: "babel-loader",
-      options: {
-        cacheDirectory: true
-      }
-    },
-    {
-      loader: "css-loader",
-      options: {
-        sourceMap: true
-      }
-    }, {
-      loader: "sass-loader",
-      options: {
-        sourceMap: true
+class CleanUpExtractCssChunks {
+  shouldPickStatChild(child) {
+    return child.name.indexOf('extract-css-chunks-webpack-plugin') !== 0;
+  }
+
+  apply(compiler) {
+    compiler.hooks.done.tap('CleanUpExtractCssChunks', (stats) => {
+      const children = stats.compilation.children;
+      if (Array.isArray(children)) {
+        // eslint-disable-next-line no-param-reassign
+        stats.compilation.children = children
+          .filter(child => this.shouldPickStatChild(child));
       }
-    }
-  ]
+    });
+  }
 }
-
 var config = {
+  //stats: { children: false },
   mode: production ? "production" : "development",
   entry: {
-    // Sources are expected to live in $app_root
-    //vendor: [],
+    // Sources are expected to live in $app_root/webpack
     application: 'application.es6',
   },
 
   module: {
       rules: [
+          { test: /\.es6$/, use: "babel-loader" },
+          { test: /\.jsx$/, use: "babel-loader" },
+          //{ test: /react-select\/src/, use: "babel-loader" },
+          { test: /\.(jpe?g|png|gif)$/i, use: "file-loader" },
           {
-            test: /(\.es6)$/,
-            use: {
-              loader: "babel-loader",
-              options: {
-                cacheDirectory: true
-              }
-            }
-          },
-          {
-            test: /(\.pug)$/,
-            loader: "pug-loader",
-            query: {}
-          },
-          {
-            test: /\.vue/,
-            use: {
-              loader: "vue-loader",
-            }
-          },
-          {
-            test: /\.(jpe?g|png|gif)$/i,
-            use: "file-loader"
-          },
-          {
-            test: /\.svg$/i,
-            exclude: /inline/i,
-            use: "file-loader"
-          },
-          {
-            test: /\.woff($|\?)|\.woff2($|\?)|\.ttf($|\?)|\.otf($|\?)|\.eot($|\?)/,
+            test: /\.woff($|\?)|\.woff2($|\?)|\.ttf($|\?)|\.eot($|\?)|\.svg($|\?)|\.otf($|\?)/,
+            //use: production ? 'file-loader' : 'url-loader'
             use: 'file-loader'
           },
           {
-            test: /\.(s?css|sass)$/i,
-            use: sassExtractor()
+            test: /\.(sass|scss|css)$/,
+            use: [
+              {
+                loader: ExtractCssChunks.loader,
+                options: {
+                  hot: production ? false : true,
+                  // Force reload all
+                  //reloadAll: true,
+                }
+              },
+              {
+                loader: "css-loader",
+                options: {
+                  //minimize: true,
+                  sourceMap: true
+                }
+              },
+              {
+                loader: "postcss-loader",
+              },
+              {
+                loader: "sass-loader"
+              }
+            ]
           },
       ]
   },
@@ -98,7 +83,7 @@ var config = {
     // that all webpacked assets start with webpack/
 
     // must match config.webpack.output_dir
-    path: path.join(__dirname, "..", "public", "webpack"),
+    path: path.join(__dirname, "..", 'public', 'webpack'),
     publicPath: '/webpack/',
 
     filename: production ? '[name]-[chunkhash].js' : '[name].js',
@@ -106,52 +91,56 @@ var config = {
   },
 
   resolve: {
-    modules: [
-      path.resolve(__dirname, "..", "webpack"),
-      path.resolve(__dirname, "..", "node_modules"),
-    ],
-    extensions: [".es6", ".vue", ".sass", ".css", ".js"],
+    modules: [path.resolve(__dirname, "..", "webpack"), path.resolve(__dirname, "..", "node_modules")],
+    extensions: [".es6", ".jsx", ".sass", ".css", ".js"],
     alias: {
       '~': path.resolve(__dirname, "..", "webpack"),
     }
   },
 
   plugins: [
-    extractSass,
+    new ExtractCssChunks(
+        {
+          // Options similar to the same options in webpackOptions.output
+          // both options are optional
+          filename: production ? "[name]-[chunkhash].css" : "[name].css",
+          chunkfilename: production ? "[name]-[id].css" : "[name].css",
+        }
+    ),
+    new CleanUpExtractCssChunks(),
     new ManifestPlugin({
       writeToFileEmit: true,
+      //basePath: "",
       publicPath: production ? "/webpack/" : 'http://' + host + ':' + devServerPort + '/webpack/',
     }),
-    new webpack.ProvidePlugin({
-      $: "jquery",
-      jQuery: "jquery",
-      "window.jQuery": "jquery",
-    })
+    //new webpack.IgnorePlugin(/^\.\/locale$/, /moment$/),
+    new webpack.ContextReplacementPlugin(/moment[/\\]locale$/, /ru|en/),
   ],
   optimization: {
-    runtimeChunk: { name: 'vendor' },
+    minimize: production,
     splitChunks: {
-      chunks: "initial",
       cacheGroups: {
         default: false,
         vendors: {
-          chunks: "initial",
-          test: /[\\/]node_modules[\\/]/,
-          priority: -10,
+          test: /[\\/]node_modules[\\/].*js/,
+          priority: 1,
           name: "vendor",
+          chunks: "initial",
+          enforce: true
         },
       },
     },
-  },
+  }
 };
 
 if (production) {
   config.plugins.push(
+    //new webpack.NoEmitOnErrorsPlugin(),
     new webpack.DefinePlugin({ // <--key to reduce React's size
       'process.env': { NODE_ENV: JSON.stringify('production') }
     }),
     new CompressionPlugin({
-        asset: "[path].gz",
+        //asset: "[path].gz",
         algorithm: "gzip",
         test: /\.js$|\.css$/,
         threshold: 4096,
@@ -161,7 +150,7 @@ if (production) {
   config.output.publicPath = '/webpack/';
 } else {
   config.plugins.push(
-    new webpack.NamedModulesPlugin()
+    new webpack.NamedModulesPlugin(),
   )
 
   config.devServer = {
@@ -169,11 +158,10 @@ if (production) {
     disableHostCheck: true,
     headers: { 'Access-Control-Allow-Origin': '*' },
   };
+
   config.output.publicPath = 'http://' + host + ':' + devServerPort + '/webpack/';
   // Source maps
   config.devtool = 'source-map';
 }
 
-module.exports = config;
-
-
+module.exports = config

data/lib/rocket_cms/version.rb

@@ -1,3 +1,3 @@
 module RocketCMS
-  VERSION = '0.29.0'
+  VERSION = '0.30.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rocket_cms
 version: !ruby/object:Gem::Version
-  version: 0.29.0
+  version: 0.30.0
 platform: ruby
 authors:
 - glebtv
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-05 00:00:00.000000000 Z
+date: 2019-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -282,6 +282,7 @@ files:
 - lib/generators/rocket_cms/templates/migration_pages.rb
 - lib/generators/rocket_cms/templates/migration_seos.rb
 - lib/generators/rocket_cms/templates/package.json
+- lib/generators/rocket_cms/templates/postcss.config.js
 - lib/generators/rocket_cms/templates/production.erb
 - lib/generators/rocket_cms/templates/unicorn.erb
 - lib/generators/rocket_cms/templates/webpack.config.js
@@ -367,7 +368,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.4
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: Please DO NOT use this gem directly, use rocket_cms_mongoid or rocket_cms_activerecord