trestle 0.9.5 → 0.9.7

data/lib/trestle.rb

@@ -11,6 +11,7 @@ module Trestle
   require_relative "trestle/adapters"
   require_relative "trestle/attribute"
   require_relative "trestle/breadcrumb"
+  require_relative "trestle/lazy"
   require_relative "trestle/configurable"
   require_relative "trestle/configuration"
   require_relative "trestle/display"
@@ -23,27 +24,29 @@ module Trestle
   require_relative "trestle/tab"
   require_relative "trestle/table"
   require_relative "trestle/admin"
+  require_relative "trestle/registry"
   require_relative "trestle/resource"
 
-  mattr_accessor :admins
-  self.admins = {}
+  # The registry records all active Trestle admins and facilitates lookups.
+  mattr_accessor :registry
+  self.registry = Registry.new
 
-  def self.admin(name, options={}, &block)
-    register(Admin::Builder.create(name, options, &block))
+  class << self
+    # Expose registry methods on Trestle module
+    delegate :register, :lookup, :lookup_model, :admins, to: :registry
   end
 
-  def self.resource(name, options={}, &block)
-    register(Resource::Builder.create(name, options, &block))
+  # Builds and registers a new plain admin
+  def self.admin(name, **options, &block)
+    register(Admin::Builder.create(name, options, &block))
   end
 
-  def self.register(admin)
-    self.admins[admin.admin_name] = admin
+  # Builds and registers a new admin resource
+  def self.resource(name, register_model: true, **options, &block)
+    register(Resource::Builder.create(name, options, &block), register_model: register_model)
   end
 
-  def self.lookup(admin)
-    return admin if admin.is_a?(Class) && admin < Trestle::Admin
-    self.admins[admin.to_s]
-  end
+  # Configuration methods
 
   def self.config
     @configuration ||= Configuration.new
@@ -53,14 +56,27 @@ module Trestle
     config.configure(&block)
   end
 
+  # Builds the global navigation by combining the menu options from the
+  # Trestle configuration along with menu blocks from admin resources.
   def self.navigation(context)
-    blocks = config.menus + admins.values.map(&:menu).compact
+    blocks = config.menus + registry.map(&:menu).compact
     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]
+      I18n.fallbacks[locale].map(&:to_s)
     elsif locale.to_s.include?("-")
       fallback = locale.to_s.split("-").first
       [locale, fallback]

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "trestle",
-  "version": "0.9.0",
+  "version": "0.9.7",
   "description": "A modern, responsive admin framework for Ruby on Rails",
   "homepage": "https://trestle.io",
   "repository": "https://github.com/TrestleAdmin/trestle.git",
@@ -13,36 +13,33 @@
     "watch": "webpack --mode development --watch"
   },
   "devDependencies": {
-    "@babel/core": "^7.6.0",
-    "@babel/preset-env": "^7.6.0",
-    "autoprefixer": "^9.6.1",
+    "@babel/core": "^7.14.6",
+    "@babel/preset-env": "^7.14.7",
+    "autoprefixer": "^10.2.6",
     "babel-loader": "^8.0.6",
-    "copy-webpack-plugin": "^5.0.4",
-    "css-loader": "^3.2.0",
-    "expose-loader": "^0.7.5",
-    "file-loader": "^6.0.0",
-    "mini-css-extract-plugin": "^0.9.0",
-    "node-sass": "^4.14.1",
-    "optimize-css-assets-webpack-plugin": "^5.0.3",
-    "postcss-loader": "^3.0.0",
-    "sass-loader": "^8.0.0",
-    "uglify-js": "^3.9.3",
-    "uglifyjs-webpack-plugin": "^2.2.0",
-    "url-loader": "^4.1.0",
-    "webpack": "^4.40.2",
-    "webpack-cli": "^3.3.9"
+    "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",
+    "node-sass": "^7.0.1",
+    "postcss": "^8.3.5",
+    "postcss-loader": "^6.1.1",
+    "sass-loader": "^12.1.0",
+    "webpack": "^5.42.0",
+    "webpack-cli": "^4.7.2"
   },
   "dependencies": {
-    "@fortawesome/fontawesome-free": "^5.11.1",
-    "@rails/ujs": "^6.0.3",
+    "@fortawesome/fontawesome-free": "^5.15.3",
+    "@rails/ujs": "^6.1.3-1",
     "bootstrap": "^4.5.0",
-    "bootstrap-confirmation2": "^4.1.0",
+    "bootstrap-confirmation2": "^4.2.1",
     "bs-custom-file-input": "^1.3.2",
     "flatpickr": "^4.6.2",
-    "jquery": "^3.5.1",
+    "jquery": "^3.6.0",
     "magnific-popup": "^1.1.0",
     "popper.js": "^1.15.0",
     "select2": "^4.0.10",
-    "select2-theme-bootstrap4": "^0.2.0-beta.4"
+    "select2-theme-bootstrap4": "^1.0.0"
   }
 }

data/webpack.config.js

@@ -1,12 +1,12 @@
 const path = require('path');
 
-const Uglify = require('uglify-js');
-const UglifyJsPlugin = require('uglifyjs-webpack-plugin');
-const MiniCssExtractPlugin = require('mini-css-extract-plugin');
-const OptimizeCSSAssetsPlugin = require('optimize-css-assets-webpack-plugin');
 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');
 
 module.exports = {
+  mode: 'production',
   entry: path.resolve(__dirname, 'frontend/index.js'),
   output: {
     library: 'Trestle',
@@ -15,27 +15,11 @@ module.exports = {
     path: path.resolve(__dirname, 'app/assets/bundle/trestle')
   },
   optimization: {
-    splitChunks: {
-      cacheGroups: {
-        styles: {
-          name: 'styles',
-          test: /\.css$/,
-          chunks: 'all',
-          enforce: true
-        }
-      }
-    },
     minimizer: [
-      new UglifyJsPlugin({
-        cache: true,
-        parallel: true,
-        sourceMap: true
+      new TerserPlugin({
+        extractComments: false
       }),
-      new OptimizeCSSAssetsPlugin({
-        cssProcessorPluginOptions: {
-          preset: ['default', { normalizePositions: false }]
-        }
-      })
+      new CssMinimizerPlugin()
     ]
   },
   module: {
@@ -49,26 +33,27 @@ module.exports = {
       },
       {
         test: /\.(ttf|eot|svg|woff2?)(\?[\s\S]+)?$/,
-        use: {
-          loader: 'file-loader',
-          options: {
-            name: '[name].[ext]'
-          }
-        }
+        type: 'asset/resource'
       },
       {
         test: /\.(png|jpg|gif)$/i,
-        exclude: /node_modules/,
-        use: {
-          loader: 'url-loader'
-        }
+        type: 'asset/inline'
       },
       {
         test: /\.s?[ac]ss$/,
         use: [
           { loader: MiniCssExtractPlugin.loader },
           { loader: 'css-loader' },
-          { loader: 'postcss-loader', options: { plugins: [ require('autoprefixer') ] } },
+          {
+            loader: 'postcss-loader',
+            options: {
+              postcssOptions: {
+                plugins: [
+                  ['autoprefixer', {}]
+                ]
+              }
+            }
+          },
           { loader: 'sass-loader' }
         ]
       },
@@ -76,26 +61,29 @@ module.exports = {
         test: require.resolve('jquery'),
         use: [{
           loader: 'expose-loader',
-          options: 'jQuery'
-        }, {
-          loader: 'expose-loader',
-          options: '$'
+          options: {
+            exposes: ['$', 'jQuery']
+          }
         }]
       }
     ]
   },
   plugins: [
-    new CopyWebpackPlugin([
-      { from: 'node_modules/@fortawesome/fontawesome-free/webfonts/*', to: '[name].[ext]' },
-      {
-        from: 'node_modules/flatpickr/dist/l10n/*.js',
-        to: 'flatpickr/[name].[ext]',
-        ignore: ['index.js'],
-        transform: function(fileContent, path) {
-          return Uglify.minify(fileContent.toString()).code.toString();
+    new CopyWebpackPlugin({
+      patterns: [
+        {
+          from: 'node_modules/@fortawesome/fontawesome-free/webfonts/*',
+          to: '[name][ext]'
+        },
+        {
+          from: 'node_modules/flatpickr/dist/l10n/*.js',
+          to: 'flatpickr/[name][ext]',
+          globOptions: {
+            ignore: ['**/index.js']
+          }
         }
-      }
-    ]),
+      ]
+    }),
     new MiniCssExtractPlugin({
       filename: 'bundle.css'
     })