alchemy_cms 7.0.0.pre.a → 7.0.0.pre.c

data/lib/alchemy/tinymce.rb

@@ -4,7 +4,7 @@ module Alchemy
   module Tinymce
     mattr_accessor :languages, :plugins
 
-    @@plugins = %w(alchemy_link anchor autoresize charmap code directionality fullscreen hr link lists paste tabfocus table)
+    @@plugins = %w[alchemy_link anchor autoresize charmap code directionality fullscreen hr link lists paste tabfocus table]
     @@init = {
       skin: "alchemy",
       width: "auto",
@@ -15,14 +15,14 @@ module Alchemy
       statusbar: true,
       toolbar: [
         "bold italic underline | strikethrough subscript superscript | numlist bullist indent outdent | removeformat | fullscreen",
-        "pastetext charmap hr | undo redo | alchemy_link unlink anchor | code",
+        "pastetext charmap hr | undo redo | alchemy_link unlink anchor | code"
       ],
       fix_list_elements: true,
       convert_urls: false,
       entity_encoding: "raw",
       paste_as_text: true,
       element_format: "html",
-      branding: false,
+      branding: false
     }
 
     class << self
@@ -33,29 +33,6 @@ module Alchemy
       def init
         @@init
       end
-
-      def custom_configs_present?(page)
-        custom_config_ingredients(page).any?
-      end
-
-      def custom_config_ingredients(page)
-        ingredient_definitions_from_elements(page.descendent_element_definitions)
-      end
-
-      private
-
-      def ingredient_definitions_from_elements(definitions)
-        definitions.collect do |el|
-          next if el["ingredients"].blank?
-
-          ingredients = el["ingredients"].select do |c|
-            c["settings"] && c["settings"]["tinymce"].is_a?(Hash)
-          end
-          next if ingredients.blank?
-
-          ingredients.map { |c| c.merge("element" => el["name"]) }
-        end.flatten.compact
-      end
     end
   end
 end

data/lib/alchemy/upgrader/seven_point_zero.rb

@@ -8,30 +8,20 @@ module Alchemy
     include Thor::Actions
 
     class << self
-      def update_admin_entrypoint
-        if File.exist? "app/javascript/packs/alchemy/admin.js"
-          FileUtils.mv "app/javascript/packs/alchemy/admin.js", "app/javascript/alchemy_admin.js"
-        else
-          log "Skipping. No alchemy/admin entrypoint found. Maybe already migrated from Webpacker?", :info
-        end
-        if Dir.exist?("app/javascript/packs/alchemy") && Dir.empty?("app/javascript/packs/alchemy")
-          FileUtils.rm_r "app/javascript/packs/alchemy"
-        end
-        if File.exist? "config/importmap.rb"
-          # We want the bundled package if using importmaps
-          task.gsub_file "app/javascript/alchemy_admin.js", 'import "@alchemy_cms/admin"', 'import "@alchemy_cms/dist/admin"'
-        end
-        if task.ask("Do you want to remove webpacker now? (y/N)", default: "N") == "y"
+      def remove_admin_entrypoint
+        FileUtils.rm_rf "app/javascript/packs/alchemy/admin.js"
+        FileUtils.rm_rf "app/javascript/packs/alchemy_admin.js"
+        FileUtils.rm_rf "app/javascript/packs/alchemy"
+        FileUtils.rm_rf "app/javascript/packs/alchemy"
+        task.run "yarn remove @alchemy_cms/admin"
+        if task.ask("Do you want to remove webpacker as well? (y/N)", default: "N") == "y"
+          task.run "bundle remove webpacker"
           task.run "yarn remove @rails/webpacker webpack webpack-cli webpack-dev-server"
-          FileUtils.rm_r "app/javascript/packs"
-          FileUtils.rm_r "config/webpack"
-          FileUtils.rm "config/webpacker.yml"
-          FileUtils.rm "bin/webpack"
-          FileUtils.rm "bin/webpack-dev-server"
-        end
-        if task.ask("Do you want to add jsbundling-rails now? (Y/n)", default: "Y") == "Y"
-          task.run "bundle add jsbundling-rails"
-          task.run "bin/rails javascript:install:esbuild"
+          FileUtils.rm_rf "app/javascript/packs"
+          FileUtils.rm_rf "config/webpack"
+          FileUtils.rm_f "config/webpacker.yml"
+          FileUtils.rm_f "bin/webpack"
+          FileUtils.rm_f "bin/webpack-dev-server"
         end
       end
 

data/lib/alchemy/upgrader.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require "alchemy/shell"
 
 module Alchemy
@@ -24,17 +25,6 @@ module Alchemy
           todo "Check the default configuration file (./config/alchemy/config.yml.defaults) for new configuration options and insert them into your config file.", "Configuration has changed"
         end
       end
-
-      def update_npm_package
-        desc "Update npm package."
-        if File.exist? Rails.root.join("config/importmap.rb")
-          `bin/importmap pin @alchemy_cms/admin@~#{Alchemy.version}`
-        elsif File.exist? Rails.root.join("package.json")
-          `yarn add @alchemy_cms/admin@~#{Alchemy.version}`
-        else
-          log("Could not update alchemy admin package! Make sure you have a JS bundler installed", :warning)
-        end
-      end
     end
   end
 end

data/lib/alchemy/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Alchemy
-  VERSION = "7.0.0-a"
+  VERSION = "7.0.0-c"
 
   def self.version
     VERSION

data/lib/alchemy.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require "alchemy/admin/preview_url"
+require "importmap-rails"
 
 module Alchemy
   YAML_PERMITTED_CLASSES = %w[Symbol Date Regexp]
@@ -78,4 +79,8 @@ module Alchemy
   #     Alchemy.enable_searchable = true
   #
   mattr_accessor :enable_searchable, default: false
+
+  # JS Importmap instance
+  singleton_class.attr_accessor :importmap
+  self.importmap = Importmap::Map.new
 end

data/lib/alchemy_cms.rb

@@ -12,6 +12,7 @@ require "cancan"
 require "dragonfly"
 require "gutentag"
 require "handlebars_assets"
+require "importmap-rails"
 require "jquery-rails"
 require "jquery-ui-rails"
 require "kaminari"
@@ -21,8 +22,9 @@ require "request_store"
 require "responders"
 require "sassc-rails"
 require "simple_form"
-require "turbolinks"
+require "turbo-rails"
 require "userstamp"
+require "view_component"
 
 # Require globally used Alchemy mixins
 require_relative "alchemy/ability_helper"

data/lib/generators/alchemy/base.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require "rails"
 
 module Alchemy
@@ -11,7 +12,7 @@ module Alchemy
       def conditional_template(source, destination)
         files = Dir.glob(destination.gsub(/\.([a-z]+)$/, "*"))
         if files.any?
-          ext = File.extname(files.first)[1..-1]
+          ext = File.extname(files.first)[1..]
 
           # If view already exists using a different template engine, change
           # source and destination file names to use that engine.
@@ -36,7 +37,7 @@ module Alchemy
         YAML.safe_load(
           ERB.new(File.read(Rails.root.join("config", "alchemy", name))).result,
           permitted_classes: YAML_PERMITTED_CLASSES,
-          aliases: true,
+          aliases: true
         )
       rescue Errno::ENOENT
         puts "\nERROR: Could not read config/alchemy/#{name} file. Please run: `rails generate alchemy:install`"

data/lib/generators/alchemy/elements/elements_generator.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative "../base"
 
 module Alchemy
@@ -26,7 +27,7 @@ module Alchemy
       end
 
       def element_name(element)
-        if element["name"] =~ Alchemy::Element::NAME_REGEXP
+        if Alchemy::Element::NAME_REGEXP.match?(element["name"])
           element["name"].underscore
         else
           raise "Element name '#{element["name"]}' has wrong format. Only lowercase and non whitespace characters allowed."

data/lib/generators/alchemy/ingredient/ingredient_generator.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require "rails"
 
 module Alchemy

data/lib/generators/alchemy/install/files/application.html.erb

@@ -5,8 +5,8 @@
     <%= csrf_meta_tags %>
     <%= csp_meta_tag %>
 
-    <%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track': 'reload' %>
-    <%= javascript_link_tag 'application', 'data-turbolinks-track': 'reload' %>
+    <%= stylesheet_link_tag 'application', media: 'all', 'data-turbo-track': 'reload' %>
+    <%= javascript_include_tag 'application', 'data-turbo-track': 'reload' %>
   </head>
 
   <body>

data/lib/generators/alchemy/install/install_generator.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require "rails/generators"
 require "alchemy/install/tasks"
 require "alchemy/version"
@@ -57,7 +58,7 @@ module Alchemy
       end
 
       def copy_yml_files
-        %w(elements page_layouts menus).each do |file|
+        %w[elements page_layouts menus].each do |file|
           template "#{__dir__}/templates/#{file}.yml.tt", app_config_path.join("alchemy", "#{file}.yml")
         end
       end
@@ -98,30 +99,6 @@ module Alchemy
         rake "gutentag:install:migrations"
       end
 
-      def add_npm_package
-        if File.exist? app_root.join("package.json")
-          run "yarn add @alchemy_cms/admin@~#{Alchemy.version}"
-        elsif File.exist? app_root.join("config/importmap.rb")
-          run "bin/importmap pin @alchemy_cms/admin@~#{Alchemy.version}"
-        else
-          log("Could not add alchemy admin package! Make sure you have a JS bundler installed", :warning)
-        end
-      end
-
-      def copy_alchemy_entry_point
-        if Dir.exist? app_root.join("app/javascript")
-          if File.exist? app_root.join("config/importmap.rb")
-            # We want the bundled package if using importmaps
-            create_file app_root.join("app/javascript/alchemy_admin.js"), 'import "@alchemy_cms/dist/admin"'
-          else
-            # We want the normal package if using a bundler locally
-            create_file app_root.join("app/javascript/alchemy_admin.js"), 'import "@alchemy_cms/admin"'
-          end
-        else
-          log("Could not add alchemy admin entry point! Make sure you have a JS bundler installed", :warning)
-        end
-      end
-
       def set_primary_language
         header
         install_tasks.set_primary_language(

data/lib/generators/alchemy/module/module_generator.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require "rails"
 
 module Alchemy

data/lib/generators/alchemy/page_layouts/page_layouts_generator.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative "../base"
 
 module Alchemy

data/lib/generators/alchemy/site_layouts/site_layouts_generator.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative "../base"
 
 module Alchemy

data/lib/generators/alchemy/views/views_generator.rb

@@ -1,10 +1,11 @@
 # frozen_string_literal: true
+
 require "rails"
 
 module Alchemy
   module Generators
     class ViewsGenerator < ::Rails::Generators::Base
-      ALCHEMY_VIEWS = %w(breadcrumb language_links messages_mailer)
+      ALCHEMY_VIEWS = %w[breadcrumb language_links messages_mailer]
 
       desc "Generates Alchemy views for #{ALCHEMY_VIEWS.to_sentence}."
 

data/lib/tasks/alchemy/thumbnails.rake

@@ -5,7 +5,7 @@ namespace :alchemy do
     desc "Generates all thumbnails for Alchemy Pictures and Picture Ingredients."
     task thumbnails: [
       "alchemy:generate:picture_thumbnails",
-      "alchemy:generate:ingredient_picture_thumbnails",
+      "alchemy:generate:ingredient_picture_thumbnails"
     ]
 
     desc "Generates thumbnails for Alchemy Pictures."
@@ -24,10 +24,10 @@ namespace :alchemy do
 
     desc "Generates thumbnails for Alchemy Picture Ingredients (set ELEMENTS=element1,element2 to only generate thumbnails for a subset of elements)."
     task ingredient_picture_thumbnails: :environment do
-      ingredient_pictures = Alchemy::Ingredients::Picture.
-        joins(:element).
-        preload({ related_object: :thumbs }).
-        merge(Alchemy::Element.published)
+      ingredient_pictures = Alchemy::Ingredients::Picture
+        .joins(:element)
+        .preload({related_object: :thumbs})
+        .merge(Alchemy::Element.published)
 
       if ENV["ELEMENTS"].present?
         ingredient_pictures = ingredient_pictures.merge(

data/lib/tasks/alchemy/tidy.rake

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require "alchemy/tasks/tidy"
 
 namespace :alchemy do

data/lib/tasks/alchemy/upgrade.rake

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require "alchemy/upgrader"
 require "alchemy/version"
 
@@ -6,7 +7,7 @@ namespace :alchemy do
   desc "Upgrades your app to AlchemyCMS v#{Alchemy::VERSION}."
   task upgrade: [
     "alchemy:upgrade:prepare",
-    "alchemy:upgrade:7.0:run",
+    "alchemy:upgrade:7.0:run"
   ] do
     Alchemy::Upgrader.display_todos
   end
@@ -15,14 +16,13 @@ namespace :alchemy do
     desc "Alchemy Upgrader: Prepares the database and updates Alchemys configuration file."
     task prepare: [
       "alchemy:upgrade:database",
-      "alchemy:upgrade:config",
-      "alchemy:upgrade:package",
+      "alchemy:upgrade:config"
     ]
 
     desc "Alchemy Upgrader: Prepares the database."
     task database: [
       "alchemy:install:migrations",
-      "db:migrate",
+      "db:migrate"
     ]
 
     desc "Alchemy Upgrader: Copy configuration file."
@@ -30,28 +30,23 @@ namespace :alchemy do
       Alchemy::Upgrader.copy_new_config_file
     end
 
-    desc "Alchemy Upgrader: Install new Node package."
-    task package: [:environment] do
-      Alchemy::Upgrader.update_npm_package
-    end
-
     desc "Upgrade Alchemy to v7.0"
     task "7.0" => [
       "alchemy:upgrade:prepare",
-      "alchemy:upgrade:7.0:run",
+      "alchemy:upgrade:7.0:run"
     ] do
       Alchemy::Upgrader.display_todos
     end
 
     namespace "7.0" do
       task "run" => [
-        "alchemy:upgrade:7.0:update_admin_entrypoint",
+        "alchemy:upgrade:7.0:remove_admin_entrypoint"
       ]
 
-      desc "Update alchemy admin entrypoint"
-      task update_admin_entrypoint: [:environment] do
-        puts "adding npm_package..."
-        Alchemy::Upgrader::SevenPointZero.update_admin_entrypoint
+      desc "Remove alchemy admin entrypoint"
+      task remove_admin_entrypoint: [:environment] do
+        puts "removing npm_package..."
+        Alchemy::Upgrader::SevenPointZero.remove_admin_entrypoint
       end
     end
   end

data/package.json

@@ -1,41 +1,21 @@
 {
-  "name": "@alchemy_cms/admin",
-  "version": "7.0.0-a",
-  "description": "AlchemyCMS",
-  "browser": "package/dist/admin.js",
-  "files": [
-    "package/**/*"
-  ],
-  "directories": {
-    "lib": "package"
-  },
+  "name": "alchemy_admin",
   "scripts": {
     "test": "jest",
-    "build": "esbuild package/admin.js --bundle --sourcemap --minify --outdir=package/dist --public-path=assets"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/AlchemyCMS/alchemy_cms.git"
+    "lint": "prettier --check 'app/javascript/**/*.js'"
   },
   "keywords": [],
   "author": "Thomas von Deyen",
   "license": "BSD-3-Clause",
-  "bugs": {
-    "url": "https://github.com/AlchemyCMS/alchemy_cms/issues"
-  },
-  "homepage": "https://github.com/AlchemyCMS/alchemy_cms#readme",
-  "dependencies": {
-    "flatpickr": "^4.6.9",
-    "lodash-es": "^4.17.21",
-    "sortablejs": "^1.10.2"
-  },
   "devDependencies": {
     "@babel/core": "^7.9.6",
     "@babel/preset-env": "^7.9.6",
     "babel-jest": "^29.0.1",
-    "esbuild": "^0.17.5",
+    "flatpickr": "^4.6.9",
     "jest": "^25.2.7",
+    "lodash-es": "^4.17.21",
     "prettier": "^2.0.2",
+    "sortablejs": "^1.10.2",
     "xhr-mock": "^2.5.1"
   },
   "jest": {
@@ -43,7 +23,7 @@
       "Alchemy": {}
     },
     "roots": [
-      "package"
+      "spec/javascript/alchemy_admin"
     ]
   }
 }