trestle 0.9.9 → 0.10.0.pre2

data/lib/trestle/toolbar/menu.rb

@@ -18,26 +18,27 @@ module Trestle
       end
 
       def render_toggle(options={})
-        content_tag(:button, type: "button", class: Array(options[:class]) + ["dropdown-toggle"], data: { toggle: "dropdown" }) do
-          safe_join([
-            content_tag(:span, "", class: "caret"),
-            content_tag(:span, I18n.t("trestle.ui.toggle_dropdown", default: "Toggle dropdown"), class: "sr-only")
-          ])
+        content_tag(:button, type: "button", class: Array(options[:class]) + ["dropdown-toggle dropdown-toggle-split"], data: { bs_toggle: "dropdown" }, aria: { expanded: false }) do
+          content_tag(:span, I18n.t("trestle.ui.toggle_dropdown", default: "Toggle dropdown"), class: "visually-hidden")
         end
       end
 
       def render_items
-        content_tag(:ul, safe_join(items, "\n"), class: "dropdown-menu dropdown-menu-right", role: "menu")
+        content_tag(:ul, safe_join(items, "\n"), class: "dropdown-menu dropdown-menu-end", role: "menu")
       end
 
       class Builder
-        delegate :admin_link_to, :content_tag, to: :@template
+        delegate :admin_link_to, :content_tag, :tag, to: :@template
 
         def initialize(menu, template)
           @menu, @template = menu, template
         end
 
         def link(content, instance_or_url=nil, options={}, &block)
+          if instance_or_url.is_a?(Hash)
+            instance_or_url, options = nil, instance_or_url
+          end
+
           options[:class] = Array(options[:class])
           options[:class] << "dropdown-item"
 
@@ -45,16 +46,15 @@ module Trestle
         end
 
         def header(text)
-          item(class: "dropdown-header") { text }
+          item { content_tag(:h6, text, class: "dropdown-header") }
         end
 
         def divider
-          item(class: "divider")
+          item { tag(:hr, class: "dropdown-divider") }
         end
 
         def item(options={}, &block)
-          opts = { role: "presentation" }.merge(options)
-          item = block_given? ? content_tag(:li, opts, &block) : content_tag(:li, "", opts)
+          item = block_given? ? content_tag(:li, options, &block) : content_tag(:li, "", options)
 
           @menu.items << item
 

data/lib/trestle/version.rb

@@ -1,3 +1,3 @@
 module Trestle
-  VERSION = "0.9.9"
+  VERSION = "0.10.0.pre2"
 end

data/lib/trestle.rb

@@ -6,6 +6,7 @@ require "kaminari"
 module Trestle
   require_relative "trestle/evaluation_context"
   require_relative "trestle/builder"
+  require_relative "trestle/color"
   require_relative "trestle/hook"
   require_relative "trestle/toolbar"
   require_relative "trestle/adapters"
@@ -64,30 +65,8 @@ module Trestle
     Navigation.build(blocks, context)
   end
 
-  # Returns the I18n fallbacks for the given locale.
-  #
-  # This is used from within a Sprockets asset (JavaScript)
-  # to determine which locale files to include.
-  #
-  # Examples
-  #
-  #   Trestle.i18n_fallbacks("pt-BR") => ["pt-BR", "pt"]
-  #   Trestle.i18n_fallbacks("ca") => ["ca", "es-ES", "es"] %>
-  #
-  # Returns an array of locale Strings.
-  def self.i18n_fallbacks(locale=I18n.locale)
-    if I18n.respond_to?(:fallbacks)
-      I18n.fallbacks[locale].map(&:to_s)
-    elsif locale.to_s.include?("-")
-      fallback = locale.to_s.split("-").first
-      [locale, fallback]
-    else
-      [locale]
-    end
-  end
-
   def self.deprecator
-    @deprecator ||= ActiveSupport::Deprecation.new
+    @deprecator ||= ActiveSupport::Deprecation.new('1.0', 'Trestle')
   end
 end
 

data/package.json

@@ -1,11 +1,11 @@
 {
   "name": "trestle",
-  "version": "0.9.7",
+  "version": "0.10.0-pre2",
   "description": "A modern, responsive admin framework for Ruby on Rails",
   "homepage": "https://trestle.io",
   "repository": "https://github.com/TrestleAdmin/trestle.git",
   "author": "Sam Pohlenz <sam@sampohlenz.com>",
-  "license": "LGPL-3.0",
+  "license": "LGPL-3.0-only",
   "private": true,
   "scripts": {
     "dev": "webpack --mode development",
@@ -13,33 +13,37 @@
     "watch": "webpack --mode development --watch"
   },
   "devDependencies": {
-    "@babel/core": "^7.14.6",
-    "@babel/preset-env": "^7.14.7",
-    "autoprefixer": "^10.2.6",
-    "babel-loader": "^8.0.6",
-    "copy-webpack-plugin": "^9.0.1",
-    "css-loader": "^5.2.6",
-    "css-minimizer-webpack-plugin": "^3.0.2",
-    "expose-loader": "^3.0.0",
-    "mini-css-extract-plugin": "^2.0.0",
-    "postcss": "^8.3.5",
-    "postcss-loader": "^6.1.1",
-    "sass": "^1.76.0",
-    "sass-loader": "^12.1.0",
-    "webpack": "^5.42.0",
-    "webpack-cli": "^4.7.2"
+    "@babel/core": "^7.20.12",
+    "@babel/helper-explode-assignable-expression": "^7.18.6",
+    "@babel/preset-env": "^7.20.2",
+    "autoprefixer": "^10.4.13",
+    "babel-loader": "^9.1.2",
+    "copy-webpack-plugin": "^11.0.0",
+    "css-loader": "^6.7.3",
+    "css-minimizer-webpack-plugin": "^5.0.0",
+    "expose-loader": "^4.0.0",
+    "mini-css-extract-plugin": "^2.7.2",
+    "postcss": "^8.4.21",
+    "postcss-loader": "^7.0.2",
+    "sass": "^1.57.1",
+    "sass-loader": "^13.2.0",
+    "webpack": "^5.75.0",
+    "webpack-bundle-analyzer": "^4.7.0",
+    "webpack-cli": "^5.0.1"
   },
   "dependencies": {
-    "@fortawesome/fontawesome-free": "^5.15.3",
-    "@rails/ujs": "^6.1.3-1",
-    "bootstrap": "^4.5.0",
-    "bootstrap-confirmation2": "^4.2.1",
-    "bs-custom-file-input": "^1.3.2",
-    "flatpickr": "^4.6.2",
+    "@fortawesome/fontawesome-free": "^6.2.1",
+    "@hotwired/stimulus": "^3.2.2",
+    "@hotwired/stimulus-webpack-helpers": "^1.0.1",
+    "@hotwired/turbo": "^8.0.2",
+    "@popperjs/core": "^2.11.8",
+    "bootstrap": "~5.3.1",
+    "flatpickr": "^4.6.13",
+    "get-video-id": "^4.1.7",
+    "i18n-js": "^4.4.3",
     "jquery": "^3.6.0",
-    "magnific-popup": "^1.1.0",
-    "popper.js": "^1.15.0",
-    "select2": "^4.0.10",
-    "select2-theme-bootstrap4": "^1.0.0"
+    "photoswipe": "^5.4.4",
+    "select2": "^4.0.13",
+    "select2-bootstrap-5-theme": "~1.3.0"
   }
 }

data/trestle.gemspec

@@ -12,26 +12,21 @@ Gem::Specification.new do |spec|
   spec.summary       = "A modern, responsive admin framework for Ruby on Rails"
   spec.description   = "Trestle is a modern, responsive admin framework for Ruby on Rails."
   spec.homepage      = "https://www.trestle.io"
-  spec.license       = "LGPL-3.0"
+  spec.license       = "LGPL-3.0-only"
 
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(bin|coverage|gemfiles|node_modules|spec|sandbox)/}) }
 
   spec.require_paths = ["lib"]
 
-  spec.required_ruby_version = ">= 2.2.2"
+  spec.required_ruby_version = ">= 2.6.0"
 
-  spec.add_dependency "railties",        ">= 5.2.0"
-  spec.add_dependency "activemodel",     ">= 5.2.0"
-  spec.add_dependency "sprockets-rails", ">= 2.0.0"
-  spec.add_dependency "kaminari",        ">= 1.1.0"
+  spec.add_dependency "railties",    ">= 6.0.0"
+  spec.add_dependency "activemodel", ">= 6.0.0"
+  spec.add_dependency "turbo-rails", ">= 2.0.0"
+  spec.add_dependency "kaminari",    ">= 1.1.0"
 
   spec.add_development_dependency "rspec-rails",         ">= 5.1.2"
   spec.add_development_dependency "rspec-html-matchers", "~> 0.10.0"
   spec.add_development_dependency "database_cleaner",    "~> 2.0.2"
   spec.add_development_dependency "ammeter",             "~> 1.1.5"
-
-  spec.add_development_dependency "bundler"
-  spec.add_development_dependency "rake"
-  spec.add_development_dependency "sqlite3"
-  spec.add_development_dependency "turbolinks"
 end

data/webpack.config.js

@@ -4,6 +4,7 @@ const CopyWebpackPlugin = require('copy-webpack-plugin');
 const CssMinimizerPlugin = require('css-minimizer-webpack-plugin');
 const MiniCssExtractPlugin = require('mini-css-extract-plugin');
 const TerserPlugin = require('terser-webpack-plugin');
+// const BundleAnalyzerPlugin = require('webpack-bundle-analyzer').BundleAnalyzerPlugin;
 
 module.exports = {
   mode: 'production',
@@ -11,8 +12,10 @@ module.exports = {
   output: {
     library: 'Trestle',
     libraryExport: 'Trestle',
-    filename: 'bundle.js',
-    path: path.resolve(__dirname, 'app/assets/bundle/trestle')
+    filename: 'admin.js',
+    path: path.resolve(__dirname, 'app/assets/bundle/trestle'),
+    chunkFilename: '[name]-[contenthash].digested.js',
+    assetModuleFilename: '[name][ext]'
   },
   optimization: {
     minimizer: [
@@ -32,7 +35,7 @@ module.exports = {
         ]
       },
       {
-        test: /\.(ttf|eot|svg|woff2?)(\?[\s\S]+)?$/,
+        test: /\.(ttf|woff2?)(\?[\s\S]+)?$/,
         type: 'asset/resource'
       },
       {
@@ -78,13 +81,9 @@ module.exports = {
   plugins: [
     new CopyWebpackPlugin({
       patterns: [
-        {
-          from: 'node_modules/@fortawesome/fontawesome-free/webfonts/*',
-          to: '[name][ext]'
-        },
         {
           from: 'node_modules/flatpickr/dist/l10n/*.js',
-          to: 'flatpickr/[name][ext]',
+          to: 'locale/flatpickr/[name][ext]',
           globOptions: {
             ignore: ['**/index.js']
           }
@@ -92,8 +91,9 @@ module.exports = {
       ]
     }),
     new MiniCssExtractPlugin({
-      filename: 'bundle.css'
-    })
+      filename: 'admin.css'
+    }),
+    // new BundleAnalyzerPlugin()
   ],
   resolve: {
     mainFields: ['main']