cm-admin 3.0.16 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f3debddacbd593b7ae649770a5237ea0af2f7c3481cfdb75f93adf833345c702
-  data.tar.gz: f2d63c47f670a66b78241fa45398edfac023c36acc89d079065734319e72bccd
+  metadata.gz: 758deeaf34976fadccc5e68a438f0ba2cc3fe7f519431ffe750c740c162b92c7
+  data.tar.gz: 770661bd71b01b11ec2f50c4a88adf8a182d6d082e0b8415ef099df8559e8279
 SHA512:
-  metadata.gz: 7d04f7523d8e25ef11d45025a4e8adbb3f583c4d1c5b8e353cd30a7f0d055a79280cfe081a1120721f83377476ba074334d9ec01e822595b372e1c78f2c64217
-  data.tar.gz: 76b3873cc8a0bea1c6ec2bd435538c9e06304310000a77d7380e2fc9bbb46232734a6d1881ccb566ca7aa135679606dea7b374777b292092f1747a2736cc8adc
+  metadata.gz: e87eb00d34c7c2e601078d815d6137ef4eddb22d543294d33301a102b3f9ff2931f46e353a832db435441df81cb32d198d06824bd8cef82984440fc0ef5186d5
+  data.tar.gz: 594fcf9d069ef492dfb469e22cb4b609ea3b6d4c6acbf1404080c3d9e8b18ed2fa416ef2122a7035c9a53dc8dc915ae6724a768e1aa74fec16bd5735c9879cef

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cm-admin (3.0.16)
+    cm-admin (4.0.0)
       caxlsx_rails
       cocoon (~> 1.2.15)
       csv-importer (~> 0.8.2)
@@ -9,9 +9,8 @@ PATH
       local_time (~> 3.0.2)
       pagy (~> 4.11.0)
       pundit (~> 2.2.0)
-      rails (>= 6.0)
-      slim (~> 4.1.0)
-      webpacker (~> 5.4.3)
+      rails (>= 7.0)
+      slim (>= 4.1.0)
 
 GEM
   remote: https://rubygems.org/
@@ -178,8 +177,6 @@ GEM
       activesupport (>= 3.0.0)
     racc (1.8.1)
     rack (3.1.8)
-    rack-proxy (0.7.7)
-      rack
     rack-session (2.0.0)
       rack (>= 3.0.0)
     rack-test (2.1.0)
@@ -258,7 +255,6 @@ GEM
       rubocop-ast (>= 1.31.1, < 2.0)
     ruby-progressbar (1.13.0)
     rubyzip (2.3.2)
-    semantic_range (3.0.0)
     slim (4.1.0)
       temple (>= 0.7.6, < 0.9)
       tilt (>= 2.0.6, < 2.1)
@@ -275,11 +271,6 @@ GEM
       axiom-types (~> 0.1)
       coercible (~> 1.0)
       descendants_tracker (~> 0.0, >= 0.0.3)
-    webpacker (5.4.4)
-      activesupport (>= 5.2)
-      rack-proxy (>= 0.6.1)
-      railties (>= 5.2)
-      semantic_range (>= 2.3.0)
     webrick (1.8.2)
     websocket-driver (0.7.6)
       websocket-extensions (>= 0.1.0)

data/app/helpers/cm_admin/application_helper.rb

@@ -1,10 +1,5 @@
 module CmAdmin
   module ApplicationHelper
-
-    def current_webpacker_instance
-      CmAdmin.webpacker
-    end
-
     # Allow if policy is not defined.
     def has_valid_policy(ar_object, action_name)
       if ar_object.instance_of?(OpenStruct) && ar_object&.parent_record.present? && ar_object&.associated_model.present?

data/app/views/layouts/cm_admin.html.slim

@@ -20,17 +20,11 @@ html
     meta[name="viewport" content="width=device-width,initial-scale=1"]
     = csrf_meta_tags
     = csp_meta_tag
-    = stylesheet_link_tag 'cm_admin/cm_admin', media: 'all', 'data-turbolinks-track': 'reload'
-    - if CmAdmin::VersionManager.use_webpacker?
-      = stylesheet_pack_tag 'cm_admin/application', 'data-turbolinks-track': 'reload'
-      = javascript_pack_tag 'cm_admin/application', 'data-turbolinks-track': 'reload'
-      script src="https://cdn.jsdelivr.net/npm/select2@4.1.0-rc.0/dist/js/select2.min.js" 
-    - elsif CmAdmin::VersionManager.use_importmap?
-      = javascript_importmap_tags
-      = javascript_import_module_tag "cm_admin/application"
-    = javascript_include_tag 'cm_admin/custom', 'data-turbolinks-track': 'reload'
+    = stylesheet_link_tag 'cm_admin/cm_admin', media: 'all', 'data-turbo-track': 'reload'
+    = javascript_importmap_tags
+    = javascript_import_module_tag "cm_admin/application"
     script src="https://kit.fontawesome.com/9c93dde7a7.js" data-mutate-approach="sync"
-    = stylesheet_link_tag 'cm_admin/custom', media: 'all', 'data-turbolinks-track': 'reload'
+    = stylesheet_link_tag 'cm_admin/custom', media: 'all', 'data-turbo-track': 'reload'
     link href="https://cdn.jsdelivr.net/npm/select2@4.1.0-rc.0/dist/css/select2.min.css" rel="stylesheet" /
     
     script src="https://raw.githack.com/SortableJS/Sortable/master/Sortable.js"

data/app/views/layouts/static.html.slim

@@ -6,10 +6,7 @@ html
     meta[name="viewport" content="width=device-width,initial-scale=1"]
     = csrf_meta_tags
     = csp_meta_tag
-    = stylesheet_link_tag 'cm_admin/cm_admin', media: 'all', 'data-turbolinks-track': 'reload'
-    - if CmAdmin::VersionManager.rails6?
-      = stylesheet_pack_tag 'cm_admin/application', 'data-turbolinks-track': 'reload'
-      = javascript_pack_tag 'cm_admin/application', 'data-turbolinks-track': 'reload'
+    = stylesheet_link_tag 'cm_admin/cm_admin', media: 'all', 'data-turbo-track': 'reload'
   body
     - flash.each do |type, msg|
       .alert class="alert-#{type}"

data/cm_admin.gemspec

@@ -34,8 +34,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'local_time', '~> 3.0.2'
   spec.add_runtime_dependency 'pagy', '~> 4.11.0'
   spec.add_runtime_dependency 'pundit', '~> 2.2.0'
-  spec.add_runtime_dependency('rails', '>= 6.0')
-  spec.add_runtime_dependency 'slim', '~> 4.1.0'
-  spec.add_runtime_dependency 'webpacker', '~> 5.4.3'
+  spec.add_runtime_dependency 'rails', '>= 7.0'
+  spec.add_runtime_dependency 'slim', '>= 4.1.0'
   spec.add_dependency 'importmap-rails'
 end

data/lib/cm_admin/engine.rb

@@ -6,56 +6,31 @@ module CmAdmin
   class Engine < Rails::Engine
     isolate_namespace CmAdmin
 
-    config.app_middleware.use(
-      Rack::Static,
-      # note! this varies from the webpacker/engine documentation
-      urls: ["/cm-admin-packs"], root: CmAdmin::Engine.root.join("public")
-    )
-
     initializer 'RailsAdmin precompile hook', group: :all do |app|
-      app.config.assets.precompile += %w(
+      app.config.assets.precompile += %w[
         cm_admin/cm_admin.css
         cm_admin/custom.js
         cm_admin/custom.css
-      )
+      ]
     end
 
     def mount_path
       CmAdmin::Engine.routes.find_script_name({})
     end
 
-    if VersionManager.rails6?
-      initializer "webpacker.proxy" do |app|
-        insert_middleware = begin
-          CmAdmin.webpacker.config.dev_server.present?
-        rescue
-          nil
-        end
-        next unless insert_middleware
+    initializer 'cm_admin.importmap', before: 'importmap' do |app|
+      # NOTE: this will add pins from this engine to the main app
+      # https://github.com/rails/importmap-rails#composing-import-maps
+      app.config.importmap.paths << root.join('config/importmap.rb')
 
-        app.middleware.insert_before(
-          0, Webpacker::DevServerProxy, # "Webpacker::DevServerProxy" if Rails version < 5
-          ssl_verify_none: true,
-          webpacker: CmAdmin.webpacker
-        )
-      end
-    elsif VersionManager.rails7?
-      initializer "cm_admin.importmap", before: "importmap" do |app|
-        # NOTE: this will add pins from this engine to the main app
-        # https://github.com/rails/importmap-rails#composing-import-maps
-        app.config.importmap.paths << root.join("config/importmap.rb")
-  
-        # NOTE: something about cache; I did not look into it.
-        # https://github.com/rails/importmap-rails#sweeping-the-cache-in-development-and-test
-        app.config.importmap.cache_sweepers << root.join("app/assets/javascripts")
-      end
-  
-      # NOTE: add engine manifest to precompile assets in production
-      initializer "cm_admin.assets" do |app|
-        app.config.assets.precompile += %w[cm_admin_manifest]
-      end
+      # NOTE: something about cache; I did not look into it.
+      # https://github.com/rails/importmap-rails#sweeping-the-cache-in-development-and-test
+      app.config.importmap.cache_sweepers << root.join('app/assets/javascripts')
     end
 
-    
+    # NOTE: add engine manifest to precompile assets in production
+    initializer 'cm_admin.assets' do |app|
+      app.config.assets.precompile += %w[cm_admin_manifest]
+    end
   end
 end

data/lib/cm_admin/version.rb

@@ -1,3 +1,3 @@
 module CmAdmin
-  VERSION = '3.0.16'
+  VERSION = '4.0.0'
 end

data/lib/cm_admin/version_manager.rb

@@ -1,20 +1,16 @@
 module CmAdmin
   class VersionManager
     class << self
-      def rails6?
-        Rails::VERSION::MAJOR == 6
-      end
-
       def rails7?
         Rails::VERSION::MAJOR == 7
       end
 
-      def use_importmap?
-        rails7? && File.exist?('config/importmap.rb')
+      def rails8?
+        Rails::VERSION::MAJOR == 8
       end
 
-      def use_webpacker?
-        rails6? && defined?(Webpacker) == 'constant'
+      def use_importmap?
+        (rails7? || rails8?) && File.exist?('config/importmap.rb')
       end
     end
   end

data/lib/cm_admin.rb

@@ -16,13 +16,6 @@ module CmAdmin
   @@cm_admin_models ||= []
 
   class << self
-    def webpacker
-      @webpacker ||= ::Webpacker::Instance.new(
-        root_path: CmAdmin::Engine.root,
-        config_path: CmAdmin::Engine.root.join('config', 'webpacker.yml')
-      )
-    end
-
     def configure
       # instance_eval(&block)
       @config ||= Configuration.new

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cm-admin
 version: !ruby/object:Gem::Version
-  version: 3.0.16
+  version: 4.0.0
 platform: ruby
 authors:
 - Michael
@@ -106,42 +106,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '7.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '7.0'
 - !ruby/object:Gem::Dependency
   name: slim
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.1.0
-- !ruby/object:Gem::Dependency
-  name: webpacker
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 5.4.3
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 5.4.3
 - !ruby/object:Gem::Dependency
   name: importmap-rails
   requirement: !ruby/object:Gem::Requirement
@@ -358,9 +344,6 @@ files:
 - app/controllers/cm_admin/static_controller.rb
 - app/helpers/cm_admin/application_helper.rb
 - app/helpers/cm_admin/custom_helper.rb
-- app/javascript/packs/cm_admin/application.js
-- app/javascript/packs/cm_admin/scaffolds.js
-- app/javascript/stylesheets/cm_admin/application.scss
 - app/jobs/file_import_processor_job.rb
 - app/models/cm_permission.rb
 - app/models/cm_role.rb
@@ -413,25 +396,16 @@ files:
 - bin/console
 - bin/importmap
 - bin/setup
-- bin/webpack
-- bin/webpack-dev-server
 - cm_admin.gemspec
-- config/.DS_Store
 - config/importmap.rb
 - config/initializers/active_record_extension.rb
 - config/routes.rb
-- config/webpack/development.js
-- config/webpack/environment.js
-- config/webpack/production.js
-- config/webpack/test.js
-- config/webpacker.yml
 - docs/AddingAlert.md
 - docs/CustomFilterMethod.md
 - docs/ListingSelectTwoAjax.md
 - docs/ListingSelectTwoItems.md
 - docs/RoleManagement.md
 - docs/ShowHideContent.md
-- lib/.DS_Store
 - lib/cm-admin.rb
 - lib/cm_admin.rb
 - lib/cm_admin/configuration.rb
@@ -498,7 +472,6 @@ files:
 - lib/generators/cm_admin/templates/graphql/objects/base/paging_type.rb
 - lib/generators/cm_admin/templates/graphql/queries/base_query.rb
 - lib/generators/cm_admin/templates/policy.rb
-- lib/tasks/webpack_install.rake
 - package-lock.json
 - package.json
 - postcss.config.js

data/app/javascript/packs/cm_admin/application.js

@@ -1,27 +0,0 @@
-require("@rails/ujs").start();
-require("turbolinks").start();
-require("@rails/activestorage").start();
-require("stylesheets/cm_admin/application");
-require("jquery");
-require("moment");
-require("bootstrap");
-require("flatpickr");
-require("jgrowl");
-require("trix");
-require("./scaffolds.js");
-require("/app/assets/javascripts/cm_admin/shared_scaffolds.js");
-require("/app/assets/javascripts/cm_admin/form_validation.js");
-require("/app/assets/javascripts/cm_admin/quick_search.js");
-require("/app/assets/javascripts/cm_admin/filters.js");
-require("/app/assets/javascripts/cm_admin/exports.js");
-require("/app/assets/javascripts/cm_admin/bulk_actions.js");
-
-import jQuery from "jquery";
-import LocalTime from "local-time";
-window.$ = jQuery;
-window.jQuery = jQuery;
-
-LocalTime.start();
-require("@nathanvda/cocoon");
-import "@fortawesome/fontawesome-free/css/all";
-import "daterangepicker";

data/app/javascript/packs/cm_admin/scaffolds.js

@@ -1,5 +0,0 @@
-import { initializeComponents } from "../../../assets/javascripts/cm_admin/shared_scaffolds";
-
-$(document).on('turbolinks:load', function () {
-  initializeComponents();
-});

data/app/javascript/stylesheets/cm_admin/application.scss

@@ -1,3 +0,0 @@
-@import "bootstrap/scss/bootstrap";
-@import "flatpickr/dist/flatpickr";
-@import "../../../../node_modules/daterangepicker/daterangepicker.css";

data/bin/webpack

@@ -1,18 +0,0 @@
-#!/usr/bin/env ruby
-
-ENV['RAILS_ENV'] ||= ENV['RACK_ENV'] || 'development'
-ENV['NODE_ENV']  ||= 'development'
-
-require 'pathname'
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile',
-  Pathname.new(__FILE__).realpath)
-
-require 'bundler/setup'
-
-require 'webpacker'
-require 'webpacker/webpack_runner'
-
-APP_ROOT = File.expand_path('..', __dir__)
-Dir.chdir(APP_ROOT) do
-  Webpacker::WebpackRunner.run(ARGV)
-end

data/bin/webpack-dev-server

@@ -1,18 +0,0 @@
-#!/usr/bin/env ruby
-
-ENV['RAILS_ENV'] ||= ENV['RACK_ENV'] || 'development'
-ENV['NODE_ENV']  ||= 'development'
-
-require 'pathname'
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile',
-  Pathname.new(__FILE__).realpath)
-
-require 'bundler/setup'
-
-require 'webpacker'
-require 'webpacker/dev_server_runner'
-
-APP_ROOT = File.expand_path('..', __dir__)
-Dir.chdir(APP_ROOT) do
-  Webpacker::DevServerRunner.run(ARGV)
-end

data/config/webpack/development.js

@@ -1,5 +0,0 @@
-process.env.NODE_ENV = process.env.NODE_ENV || 'development'
-
-const environment = require('./environment')
-
-module.exports = environment.toWebpackConfig()

data/config/webpack/environment.js

@@ -1,13 +0,0 @@
-const { environment } = require('@rails/webpacker')
-
-const webpack = require('webpack')
-environment.plugins.prepend('Provide',
-  new webpack.ProvidePlugin({
-    $: 'jquery',
-    jQuery: 'jquery',
-    moment: 'moment',
-    Popper: ['popper.js', 'default']
-  })
-)
-
-module.exports = environment

data/config/webpack/production.js

@@ -1,5 +0,0 @@
-process.env.NODE_ENV = process.env.NODE_ENV || 'production'
-
-const environment = require('./environment')
-
-module.exports = environment.toWebpackConfig()

data/config/webpack/test.js

@@ -1,5 +0,0 @@
-process.env.NODE_ENV = process.env.NODE_ENV || 'development'
-
-const environment = require('./environment')
-
-module.exports = environment.toWebpackConfig()

data/config/webpacker.yml

@@ -1,92 +0,0 @@
-# Note: You must restart bin/webpack-dev-server for changes to take effect
-
-default: &default
-  source_path: app/javascript
-  source_entry_path: packs
-  public_root_path: public
-  public_output_path: cm-admin-packs
-  cache_path: tmp/cache/webpacker
-  webpack_compile_output: true
-
-  # Additional paths webpack should lookup modules
-  # ['app/assets', 'engine/foo/app/assets']
-  additional_paths: ['app/assets']
-
-  # Reload manifest.json on all requests so we reload latest compiled packs
-  cache_manifest: false
-
-  # Extract and emit a css file
-  extract_css: false
-
-  static_assets_extensions:
-    - .jpg
-    - .jpeg
-    - .png
-    - .gif
-    - .tiff
-    - .ico
-    - .svg
-    - .eot
-    - .otf
-    - .ttf
-    - .woff
-    - .woff2
-
-  extensions:
-    - .mjs
-    - .js
-    - .sass
-    - .scss
-    - .css
-    - .module.sass
-    - .module.scss
-    - .module.css
-    - .png
-    - .svg
-    - .gif
-    - .jpeg
-    - .jpg
-
-development:
-  <<: *default
-  compile: true
-
-  # Reference: https://webpack.js.org/configuration/dev-server/
-  dev_server:
-    https: false
-    host: localhost
-    port: 3035
-    public: localhost:3035
-    hmr: false
-    # Inline should be set to true if using HMR
-    inline: true
-    overlay: true
-    compress: true
-    disable_host_check: true
-    use_local_ip: false
-    quiet: false
-    pretty: false
-    headers:
-      'Access-Control-Allow-Origin': '*'
-    watch_options:
-      ignored: '**/node_modules/**'
-
-
-test:
-  <<: *default
-  compile: true
-
-  # Compile test packs to a separate directory
-  public_output_path: packs-test
-
-production:
-  <<: *default
-
-  # Production depends on precompilation of packs prior to booting for performance.
-  compile: false
-
-  # Extract and emit a css file
-  extract_css: true
-
-  # Cache manifest.json for performance
-  cache_manifest: true

data/lib/tasks/webpack_install.rake

@@ -1,65 +0,0 @@
-# desc "Explaining what the task does"
-# task :cm_admin do
-#   # Task goes here
-# end
-
-def ensure_log_goes_to_stdout
-  old_logger = Webpacker.logger
-  Webpacker.logger = ActiveSupport::Logger.new(STDOUT)
-  yield
-ensure
-  Webpacker.logger = old_logger
-end
-
-namespace :cm_admin do
-    namespace :webpacker do
-        desc "Install deps with yarn"
-        task :yarn_install do
-            Dir.chdir(File.join(__dir__, "../..")) do
-                system "yarn install --no-progress --production"
-            end
-        end
-
-        desc "Compile JavaScript packs using webpack for production with digests"
-        task compile: [:yarn_install, :environment] do
-            Webpacker.with_node_env("production") do
-                ensure_log_goes_to_stdout do
-                    if CmAdmin.webpacker.commands.compile
-                        # Successful compilation!
-                    else
-                        # Failed compilation
-                        exit!
-                    end
-                end
-            end
-        end
-    end
-end
-
-def yarn_install_available?
-    rails_major = Rails::VERSION::MAJOR
-    rails_minor = Rails::VERSION::MINOR
-
-    rails_major > 5 || (rails_major == 5 && rails_minor >= 1)
-end
-
-def enhance_assets_precompile
-    # yarn:install was added in Rails 5.1
-    deps = yarn_install_available? ? [] : ["cm_admin:webpacker:yarn_install"]
-    Rake::Task["assets:precompile"].enhance(deps) do
-        Rake::Task["cm_admin:webpacker:compile"].invoke
-    end
-end
-
-if CmAdmin::VersionManager.rails6?
-  # Compile packs after we've compiled all other assets during precompilation
-  skip_webpacker_precompile = %w(no false n f).include?(ENV["WEBPACKER_PRECOMPILE"])
-
-  unless skip_webpacker_precompile
-      if Rake::Task.task_defined?("assets:precompile")
-          enhance_assets_precompile
-      else
-          Rake::Task.define_task("assets:precompile" =>"cm_admin:webpacker:compile")
-      end
-  end
-end