alchemy_cms 7.0.0.pre.b → 7.0.0.pre.c

data/lib/alchemy/engine.rb

@@ -20,6 +20,20 @@ module Alchemy
       NonStupidDigestAssets.whitelist += [/^tinymce\//]
     end
 
+    initializer "alchemy.importmap" do |app|
+      Alchemy.importmap.draw(Engine.root.join("config", "importmap.rb"))
+
+      package_path = Engine.root.join("app/javascript")
+      app.config.assets.paths << package_path
+
+      if app.config.importmap.sweep_cache
+        Alchemy.importmap.cache_sweeper(watches: package_path)
+        ActiveSupport.on_load(:action_controller_base) do
+          before_action { Alchemy.importmap.cache_sweeper.execute_if_updated }
+        end
+      end
+    end
+
     # Gutentag downcases all tags before save
     # and Gutentag validations are not case sensitive.
     # But we support having tags with uppercase characters.

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

@@ -25,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-b"
+  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,7 +22,7 @@ require "request_store"
 require "responders"
 require "sassc-rails"
 require "simple_form"
-require "turbolinks"
+require "turbo-rails"
 require "userstamp"
 require "view_component"
 

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_include_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

@@ -99,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/tasks/alchemy/upgrade.rake

@@ -16,8 +16,7 @@ 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."
@@ -31,11 +30,6 @@ 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",
@@ -46,13 +40,13 @@ namespace :alchemy do
 
     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-b",
-  "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.18.4",
+    "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"
     ]
   }
 }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: alchemy_cms
 version: !ruby/object:Gem::Version
-  version: 7.0.0.pre.b
+  version: 7.0.0.pre.c
 platform: ruby
 authors:
 - Thomas von Deyen
@@ -13,7 +13,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-06-22 00:00:00.000000000 Z
+date: 2023-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionmailer
@@ -325,6 +325,26 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.23'
+- !ruby/object:Gem::Dependency
+  name: importmap-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.2.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.2.1
 - !ruby/object:Gem::Dependency
   name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
@@ -496,19 +516,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '5'
 - !ruby/object:Gem::Dependency
-  name: turbolinks
+  name: turbo-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2.5'
+        version: '1.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2.5'
+        version: '1.4'
 - !ruby/object:Gem::Dependency
   name: view_component
   requirement: !ruby/object:Gem::Requirement
@@ -705,9 +725,9 @@ files:
 - ".github/ISSUE_TEMPLATE/Feature_request.md"
 - ".github/PULL_REQUEST_TEMPLATE.md"
 - ".github/workflows/brakeman-analysis.yml"
-- ".github/workflows/ci.yml"
 - ".github/workflows/lint.yml"
 - ".github/workflows/stale.yml"
+- ".github/workflows/test.yml"
 - ".gitignore"
 - ".hound.yml"
 - ".localeapp/config.rb"
@@ -895,6 +915,22 @@ files:
 - app/helpers/alchemy/elements_helper.rb
 - app/helpers/alchemy/pages_helper.rb
 - app/helpers/alchemy/url_helper.rb
+- app/javascript/alchemy_admin.js
+- app/javascript/alchemy_admin/datepicker.js
+- app/javascript/alchemy_admin/file_editors.js
+- app/javascript/alchemy_admin/i18n.js
+- app/javascript/alchemy_admin/image_cropper.js
+- app/javascript/alchemy_admin/image_loader.js
+- app/javascript/alchemy_admin/ingredient_anchor_link.js
+- app/javascript/alchemy_admin/node_tree.js
+- app/javascript/alchemy_admin/page_publication_fields.js
+- app/javascript/alchemy_admin/page_sorter.js
+- app/javascript/alchemy_admin/picture_editors.js
+- app/javascript/alchemy_admin/sitemap.js
+- app/javascript/alchemy_admin/tinymce.js
+- app/javascript/alchemy_admin/translations.js
+- app/javascript/alchemy_admin/utils/ajax.js
+- app/javascript/alchemy_admin/utils/events.js
 - app/jobs/alchemy/base_job.rb
 - app/jobs/alchemy/publish_page_job.rb
 - app/mailers/alchemy/base_mailer.rb
@@ -1191,6 +1227,7 @@ files:
 - app/views/layouts/alchemy/admin.html.erb
 - app/views/layouts/alchemy/sitemap.xml.erb
 - babel.config.js
+- bin/importmap
 - bin/rails
 - bin/rspec
 - bin/setup
@@ -1198,6 +1235,7 @@ files:
 - config/alchemy/config.yml
 - config/alchemy/modules.yml
 - config/brakeman.ignore
+- config/importmap.rb
 - config/initializers/assets.rb
 - config/initializers/dragonfly.rb
 - config/initializers/mime_types.rb
@@ -1328,27 +1366,6 @@ files:
 - lib/tasks/alchemy/tidy.rake
 - lib/tasks/alchemy/upgrade.rake
 - package.json
-- package/admin.js
-- package/dist/admin.js
-- package/dist/admin.js.map
-- package/src/__tests__/i18n.spec.js
-- package/src/datepicker.js
-- package/src/file_editors.js
-- package/src/i18n.js
-- package/src/image_cropper.js
-- package/src/image_loader.js
-- package/src/ingredient_anchor_link.js
-- package/src/node_tree.js
-- package/src/page_publication_fields.js
-- package/src/page_sorter.js
-- package/src/picture_editors.js
-- package/src/sitemap.js
-- package/src/tinymce.js
-- package/src/translations.js
-- package/src/utils/__tests__/ajax.spec.js
-- package/src/utils/__tests__/events.spec.js
-- package/src/utils/ajax.js
-- package/src/utils/events.js
 - vendor/assets/fonts/fa-regular-400.eot
 - vendor/assets/fonts/fa-regular-400.svg
 - vendor/assets/fonts/fa-regular-400.ttf

data/package/admin.js

@@ -1,34 +0,0 @@
-import translate from "./src/i18n"
-import translationData from "./src/translations"
-import NodeTree from "./src/node_tree"
-import fileEditors from "./src/file_editors"
-import IngredientAnchorLink from "./src/ingredient_anchor_link"
-import pictureEditors from "./src/picture_editors"
-import ImageLoader from "./src/image_loader"
-import ImageCropper from "./src/image_cropper"
-import Datepicker from "./src/datepicker"
-import Sitemap from "./src/sitemap"
-import Tinymce from "./src/tinymce"
-import PagePublicationFields from "./src/page_publication_fields.js"
-
-// Global Alchemy object
-if (typeof window.Alchemy === "undefined") {
-  window.Alchemy = {}
-}
-
-// Enhance the global Alchemy object with imported features
-Object.assign(Alchemy, {
-  // Global utility method for translating a given string
-  t: translate,
-  translations: Object.assign(Alchemy.translations || {}, translationData),
-  NodeTree,
-  fileEditors,
-  pictureEditors,
-  ImageLoader: ImageLoader.init,
-  ImageCropper,
-  IngredientAnchorLink,
-  Datepicker,
-  Sitemap,
-  Tinymce,
-  PagePublicationFields
-})