headmin 0.2.8 → 0.3.4

data/lib/generators/headmin/devise_generator.rb

@@ -2,15 +2,15 @@ module Headmin
   class DeviseGenerator < Rails::Generators::Base
     include Rails::Generators::Migration
 
-    source_root File.expand_path('../../templates', __FILE__)
+    source_root File.expand_path("../../templates", __FILE__)
 
     def copy_controllers
-      directory 'controllers/auth', 'app/controllers/auth'
+      directory "controllers/auth", "app/controllers/auth"
     end
 
     def copy_views
-      directory 'views/auth', 'app/views/auth'
-      copy_file 'views/layouts/auth.html.erb', 'app/views/layouts/auth.html.erb'
+      directory "views/auth", "app/views/auth"
+      copy_file "views/layouts/auth.html.erb", "app/views/layouts/auth.html.erb"
     end
   end
 end

data/lib/generators/headmin/fields_generator.rb

@@ -2,22 +2,22 @@ module Headmin
   class FieldsGenerator < Rails::Generators::Base
     include Rails::Generators::Migration
 
-    source_root File.expand_path('../../templates', __FILE__)
+    source_root File.expand_path("../../templates", __FILE__)
 
     def copy_models
-      template 'models/field.rb', 'app/models/field.rb'
+      template "models/field.rb", "app/models/field.rb"
     end
 
     def copy_migrations
-      migration_template 'migrations/create_fields.rb', 'db/migrate/create_fields.rb'
-      migration_template 'migrations/create_field_hierarchies.rb', 'db/migrate/create_field_hierarchies.rb'
+      migration_template "migrations/create_fields.rb", "db/migrate/create_fields.rb"
+      migration_template "migrations/create_field_hierarchies.rb", "db/migrate/create_field_hierarchies.rb"
     end
 
-    private
-
-    def self.next_migration_number(dirname)
-      next_migration_number = current_migration_number(dirname) + 1
-      ActiveRecord::Migration.next_migration_number(next_migration_number)
+    class << self
+      def next_migration_number(dirname)
+        next_migration_number = current_migration_number(dirname) + 1
+        ActiveRecord::Migration.next_migration_number(next_migration_number)
+      end
     end
   end
 end

data/lib/generators/templates/controllers/auth/confirmations_controller.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class Auth::ConfirmationsController < Devise::ConfirmationsController
-  layout 'auth'
+  layout "auth"
   # GET /resource/confirmation/new
   # def new
   #   super

data/lib/generators/templates/controllers/auth/omniauth_callbacks_controller.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class Auth::OmniauthCallbacksController < Devise::OmniauthCallbacksController
-  layout 'auth'
+  layout "auth"
   # You should configure your model like this:
   # devise :omniauthable, omniauth_providers: [:twitter]
 

data/lib/generators/templates/controllers/auth/passwords_controller.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class Auth::PasswordsController < Devise::PasswordsController
-  layout 'auth'
+  layout "auth"
   # GET /resource/password/new
   # def new
   #   super

data/lib/generators/templates/controllers/auth/registrations_controller.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class Auth::RegistrationsController < Devise::RegistrationsController
-  layout 'auth'
+  layout "auth"
   # before_action :configure_sign_up_params, only: [:create]
   # before_action :configure_account_update_params, only: [:update]
 

data/lib/generators/templates/controllers/auth/sessions_controller.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class Auth::SessionsController < Devise::SessionsController
-  layout 'auth'
+  layout "auth"
   # before_action :configure_sign_in_params, only: [:create]
 
   # GET /resource/sign_in

data/lib/generators/templates/controllers/auth/unlocks_controller.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class Auth::UnlocksController < Devise::UnlocksController
-  layout 'auth'
+  layout "auth"
   # GET /resource/unlock/new
   # def new
   #   super

data/lib/generators/templates/models/block.rb

@@ -1,3 +1,3 @@
 class Block < ApplicationRecord
   include Headmin::Block
-end
+end

data/lib/headmin/engine.rb

@@ -1,12 +1,27 @@
 module Headmin
   class Engine < Rails::Engine
-    engine_name 'headmin'
+    engine_name "headmin"
 
-    require 'closure_tree'
+    require "closure_tree"
+    require "redcarpet"
+    require "rouge"
 
     # Add translations to main app
     config.before_configuration do
       config.i18n.load_path += Dir["#{config.root}/config/locales/**/*.yml"]
     end
+
+    # Add assets to precompilation list
+    initializer "headmin.assets" do |app|
+      next unless app.config.respond_to?(:assets)
+      app.config.assets.precompile += %w[headmin.js headmin.css headmin.scss]
+    end
+
+    # Add importmap to main app
+    initializer "headmin.importmap", before: "importmap" do |app|
+      next unless app.config.respond_to?(:importmap)
+      app.config.importmap.paths << Engine.root.join("config/importmap.rb")
+      app.config.importmap.cache_sweepers << Engine.root.join("app/assets/javascripts")
+    end
   end
-end
+end

data/lib/headmin/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Headmin
-  VERSION = "0.2.8"
+  VERSION = "0.3.4"
 end

data/lib/headmin.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 
 require_relative "headmin/version"
-require_relative "headmin/engine"
+require_relative "headmin/engine"

data/package.json

@@ -1,10 +1,11 @@
 {
   "name": "headmin",
-  "version": "0.2.6",
+  "version": "0.3.3",
   "description": "Admin component library",
-  "main": "src/js/headmin.js",
-  "sass": "src/scss/headmin.scss",
-  "style": "src/css/headmin.css",
+  "module": "app/assets/javascripts/headmin.js",
+  "main": "app/assets/javascripts/headmin.js",
+  "sass": "app/assets/stylesheets/headmin.scss",
+  "style": "app/assets/stylesheets/headmin.css",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/insiting/headmin.git"
@@ -22,42 +23,23 @@
   "dependencies": {
     "@hotwired/stimulus": "^3.0",
     "@hotwired/stimulus-webpack-helpers": "^1.0",
-    "@popperjs/core": "^2.9.3",
-    "@rails/ujs": "^6.0.0",
-    "bootstrap": "^5.1.1",
-    "ckeditor5-build-classic-simple-upload-adapter-image-resize": "^1.0.4",
+    "@popperjs/core": "^2.11.2",
+    "bootstrap": "^5.1.3",
     "flatpickr": "^4.6.9",
-    "sortablejs": "^1.13.0",
-    "tom-select": "^2.0.0-rc.4"
+    "sortablejs": "^1.14.0",
+    "tom-select": "^2.0.0"
   },
   "devDependencies": {
-    "@babel/core": "^7.12.10",
-    "@babel/preset-env": "^7.12.11",
-    "autoprefixer": "^10.2.3",
-    "babel-loader": "^8.2.2",
-    "node-sass": "^6.0.1",
-    "node-sass-tilde-importer": "^1.0.2",
-    "onchange": "^7.1.0",
-    "path": "^0.12.7",
-    "postcss": "^8.2.4",
-    "postcss-cli": "^8.3.1",
-    "watch": "^1.0.2",
-    "webpack": "4.44.2",
-    "webpack-cli": "^4.4.0"
+    "esbuild": "^0.14.11",
+    "esbuild-sass-plugin": "^2.0.3"
   },
-  "browserslist": [
-    "last 2 versions",
-    "ie >= 11"
-  ],
   "scripts": {
-    "autoprefixer": "postcss -u autoprefixer -b 'last 2 versions' -r dist/css/headmin.css",
-    "compile:sass": "node-sass --importer=node_modules/node-sass-tilde-importer src/scss/headmin.scss dist/css/headmin.css",
-    "build:css": "yarn compile:sass && yarn autoprefixer",
-    "build:js": "webpack",
+    "build:css": "node esbuild-css.js",
+    "build:js": "node esbuild-js.js",
     "build": "yarn build:css & yarn build:js",
-    "watch:css": "onchange src/scss/**/*.scss -- yarn build:css",
-    "watch:js": "onchange src/js/**/*.js -- yarn build:js",
+    "watch:css": "node esbuild-css.js -w",
+    "watch:js": "node esbuild-js.js -w",
     "watch": "yarn watch:css & yarn watch:js",
-    "dev": "yarn build & yarn watch"
+    "dev": "yarn watch"
   }
 }

data/src/js/headmin.js

@@ -1 +1 @@
-export {Headmin} from "./headmin/headmin"
+export {Headmin} from "../../app/assets/javascripts/headmin/index"

data/src/scss/headmin.scss

@@ -1,61 +1 @@
-// Vendor
-@import url("https://cdn.jsdelivr.net/npm/bootstrap-icons@1.5.0/font/bootstrap-icons.css");
-
-// Bootstrap
-@import "~bootstrap/scss/functions.scss";
-@import "~bootstrap/scss/variables.scss";
-@import "~bootstrap/scss/mixins.scss";
-@import "~bootstrap/scss/utilities.scss";
-@import "vendor/bootstrap/variables";  // Bootstrap overrides
-@import "~bootstrap/scss/root.scss";
-@import "~bootstrap/scss/reboot.scss";
-@import "~bootstrap/scss/type.scss";
-@import "~bootstrap/scss/images.scss";
-@import "~bootstrap/scss/containers.scss";
-@import "~bootstrap/scss/grid.scss";
-@import "~bootstrap/scss/tables.scss";
-@import "~bootstrap/scss/forms.scss";
-@import "~bootstrap/scss/buttons.scss";
-@import "~bootstrap/scss/transitions.scss";
-@import "~bootstrap/scss/dropdown.scss";
-@import "~bootstrap/scss/button-group.scss";
-@import "~bootstrap/scss/nav.scss";
-@import "~bootstrap/scss/navbar.scss";
-@import "~bootstrap/scss/card.scss";
-@import "~bootstrap/scss/accordion.scss";
-@import "~bootstrap/scss/breadcrumb.scss";
-@import "~bootstrap/scss/pagination.scss";
-@import "~bootstrap/scss/badge.scss";
-@import "~bootstrap/scss/alert.scss";
-@import "~bootstrap/scss/progress.scss";
-@import "~bootstrap/scss/list-group.scss";
-@import "~bootstrap/scss/close.scss";
-@import "~bootstrap/scss/toasts.scss";
-@import "~bootstrap/scss/modal.scss";
-@import "~bootstrap/scss/tooltip.scss";
-@import "~bootstrap/scss/popover.scss";
-@import "~bootstrap/scss/carousel.scss";
-@import "~bootstrap/scss/spinners.scss";
-@import "~bootstrap/scss/helpers.scss";
-@import "~bootstrap/scss/utilities/api.scss";
-
-// Tom select
-@import "~tom-select/dist/scss/tom-select.bootstrap5";
-
-// Flatpickr
-@import "~flatpickr/dist/flatpickr";
-
-// Redactor
-@import "vendor/redactorx/redactorx";
-@import "vendor/redactorx/override";
-
-// Headmin
-@import "headmin/filters";
-@import "headmin/form";
-@import "headmin/general";
-@import "headmin/layout";
-@import "headmin/login";
-@import "headmin/table";
-@import "headmin/utilities";
-@import "headmin/filter";
-@import "headmin/popup";
+@import "../../app/assets/stylesheets/headmin";