alchemy_cms 7.0.0.pre.b → 7.0.0.pre.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1294701d36b22b1003c708713292d905295b3a91b9caabae888c7e75555dd84c
-  data.tar.gz: 9119c835cd11c74c996466747ddf5c1ad4ba1da42bfe82a52847507a88371513
+  metadata.gz: cf26638792221ec3a204abb8ca19d221b16f6548d6d4a4d0cb01434962c90814
+  data.tar.gz: b7ad6adcb58b64e1355fd47d70d7622de73f2fc4016db83b06ffb2631c4fc837
 SHA512:
-  metadata.gz: f16b17350ebda052f7115a01ecf91274ccbb82bd0c3040701eae28d0cb793f87a62b54302e5caac4861536c0f0edb9f33bf242d6c6fa3d97388c17622aa40d52
-  data.tar.gz: 2466351d5448f8b2b304e8c7d3338443cbbae3b2df6ba5bdcf25545e3b496fd6de49ad29e6900cc5f70a22ac6585ba10e08414fe21bb734e20096ef0206c6515
+  metadata.gz: ca9665f36097d622e848dc13a5eda0cdc9061e0ac07a319fca261ecfd8572a6c47d9d0ece22672012935e4a83c66768bdd86509ffe05e61e647806a98ed133a4
+  data.tar.gz: 85740399b154064e2070e87779abc09c2c44e08bb0b0bb119b12962bc038bd6375ca4d962951b32b3369ac535bf4f83aa714d5605ddbfbaf3e8faf46cb42e8fd

data/.github/workflows/lint.yml

@@ -3,7 +3,7 @@ name: Lint
 on: [pull_request]
 
 jobs:
-  Lint:
+  Standard:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
@@ -15,3 +15,23 @@ jobs:
           bundler-cache: true
       - name: Lint Ruby files
         run: bundle exec standardrb
+  Prettier:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+      - name: Setup Node
+        uses: actions/setup-node@v3
+        with:
+          node-version: "18"
+      - name: Restore node_modules cache
+        uses: actions/cache@v3
+        with:
+          path: node_modules
+          key: ${{ runner.os }}-node-modules-${{ hashFiles('package.json') }}
+          restore-keys: |
+            ${{ runner.os }}-node-modules
+      - name: Install dependencies
+        run: yarn install
+      - name: Lint code
+        run: yarn lint

data/.github/workflows/{ci.yml → test.yml}

@@ -1,4 +1,4 @@
-name: CI
+name: Test
 
 on: [push, pull_request]
 

data/.gitignore

@@ -9,15 +9,10 @@ pkg
 tmp
 log
 .sass-cache
-spec/dummy/app/assets/builds/*.js*
-spec/dummy/app/javascript/
 spec/dummy/config/alchemy/config.yml
 spec/dummy/db/*.sqlite3*
-spec/dummy/package.json
 spec/dummy/postcss.config.js
 spec/dummy/public/assets/
-spec/dummy/public/packs/
-spec/dummy/public/packs-test/
 spec/dummy/uploads/
 .rvmrc
 /coverage/

data/CHANGELOG.md

@@ -2,6 +2,13 @@
 
 ## 7.0.0 (unreleased)
 
+- Allow to create element with warning in definition [#2507](https://github.com/AlchemyCMS/alchemy_cms/pull/2507) ([tvdeyen](https://github.com/tvdeyen))
+- Remove unused javascript [#2506](https://github.com/AlchemyCMS/alchemy_cms/pull/2506) ([sascha-karnatz](https://github.com/sascha-karnatz))
+- Allow authors to link to all pages again [#2504](https://github.com/AlchemyCMS/alchemy_cms/pull/2504) ([tvdeyen](https://github.com/tvdeyen))
+- Lint JS code with Prettier [#2503](https://github.com/AlchemyCMS/alchemy_cms/pull/2503) ([tvdeyen](https://github.com/tvdeyen))
+- Use absolute imports in modules [#2502](https://github.com/AlchemyCMS/alchemy_cms/pull/2502) ([tvdeyen](https://github.com/tvdeyen))
+- Replace turbolinks with turbo [#2499](https://github.com/AlchemyCMS/alchemy_cms/pull/2499) ([sascha-karnatz](https://github.com/sascha-karnatz))
+- Use Importmaps for admin JS [#2498](https://github.com/AlchemyCMS/alchemy_cms/pull/2498) ([tvdeyen](https://github.com/tvdeyen))
 - Fix TinyMCE loading behavior after page change [#2494](https://github.com/AlchemyCMS/alchemy_cms/pull/2494) ([sascha-karnatz](https://github.com/sascha-karnatz))
 - [js] Update esbuild → 0.18.4 (unknown) [#2492](https://github.com/AlchemyCMS/alchemy_cms/pull/2492) ([depfu](https://github.com/apps/depfu))
 - Add ransackable attributes to tags [#2487](https://github.com/AlchemyCMS/alchemy_cms/pull/2487) ([tvdeyen](https://github.com/tvdeyen))

data/Gemfile

@@ -20,7 +20,6 @@ group :development, :test do
   # in our case the culprit is `handlebars-assets`. The changes between 2.7.0 and 2.8.0 are
   # minimal, but breaking.
   gem "execjs", "= 2.8.1"
-  gem "jsbundling-rails", "~> 1.1"
   gem "rubocop", require: false
   gem "standard", "~> 1.25", require: false
 

data/README.md

@@ -340,7 +340,7 @@ $ bin/start
 
 ### Bump version
 
-Bump the version number in both `lib/alchemy/version.rb` and `./package.json`. Make sure both are exactly the same and follow [SemVer format](https://semver.org/#semantic-versioning-specification-semver).
+Bump the version number in `lib/alchemy/version.rb`.
 
 ### Update the changelog
 
@@ -357,11 +357,11 @@ $ git commit -am "Bump version to vX.Y.Z"
 
 ### Release a new version
 
-This task will publish both the ruby gem and the npm package.
+This task will publish the ruby gem.
 It also tags the latest commit.
 
 ```bash
-$ bundle exec rake alchemy:release
+$ bundle exec rake release
 ```
 
 ## ❓Getting Help

data/Rakefile

@@ -41,17 +41,12 @@ namespace :alchemy do
     task :prepare do
       system(
         <<~BASH
-          yarn install && \
-          yarn link && \
           cd spec/dummy && \
           export RAILS_ENV=test && \
           bin/rake db:create && \
           bin/rake db:environment:set && \
           bin/rake db:migrate:reset && \
-          bin/rails javascript:install:esbuild && \
           bin/rails g alchemy:install --skip --skip-demo-files --auto-accept --skip-db-create && \
-          yarn link @alchemy_cms/admin && \
-          bin/rails javascript:build && \
           cd -
         BASH
       ) || fail
@@ -81,18 +76,4 @@ namespace :alchemy do
       File.delete(backup)
     end
   end
-
-  desc "Release a new Ruby gem and npm package in one command"
-  task :release do
-    require "json"
-    require_relative "lib/alchemy/version"
-    package = File.read("package.json")
-    unless JSON.parse(package)["version"] == Alchemy.version
-      abort "Ruby gem and npm package versions are out of sync! Please fix."
-    end
-    # Release the Ruby gem with bundler
-    Rake::Task["release"].invoke
-    # Publish npm package via CLI
-    system "npm publish"
-  end
 end

data/alchemy_cms.gemspec

@@ -41,6 +41,7 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency "dragonfly_svg", ["~> 0.0.4"]
   gem.add_runtime_dependency "gutentag", ["~> 2.2", ">= 2.2.1"]
   gem.add_runtime_dependency "handlebars_assets", ["~> 0.23"]
+  gem.add_runtime_dependency "importmap-rails", ["~> 1.2", ">= 1.2.1"]
   gem.add_runtime_dependency "jquery-rails", ["~> 4.0", ">= 4.0.4"]
   gem.add_runtime_dependency "jquery-ui-rails", ["~> 6.0"]
   gem.add_runtime_dependency "kaminari", ["~> 1.1"]
@@ -51,7 +52,7 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency "sassc-rails", ["~> 2.1"]
   gem.add_runtime_dependency "simple_form", [">= 4.0", "< 6"]
   gem.add_runtime_dependency "sprockets", [">= 3.0", "< 5"]
-  gem.add_runtime_dependency "turbolinks", [">= 2.5"]
+  gem.add_runtime_dependency "turbo-rails", [">= 1.4"]
   gem.add_runtime_dependency "view_component", ["~> 3.0"]
 
   gem.add_development_dependency "capybara", ["~> 3.0"]

data/app/assets/config/alchemy_manifest.js

@@ -13,3 +13,4 @@
 //= link_tree ../images/alchemy/
 //= link_tree ../../../vendor/assets/fonts/
 //= link_tree ../../../vendor/assets/images/
+//= link_tree ../../javascript .js

data/app/assets/javascripts/alchemy/admin.js

@@ -2,7 +2,6 @@
 // ------------------------------
 //= require jquery2
 //= require jquery_ujs
-//= require turbolinks
 //= require jquery-ui/effects/effect-fade
 //= require jquery-ui/widgets/draggable
 //= require jquery-ui/widgets/sortable
@@ -17,7 +16,6 @@
 //= require alchemy/templates
 //= require alchemy/alchemy.base
 //= require alchemy/alchemy.autocomplete
-//= require alchemy/alchemy.browser
 //= require alchemy/alchemy.buttons
 //= require alchemy/alchemy.dialog
 //= require alchemy/alchemy.char_counter

data/app/assets/javascripts/alchemy/alchemy.base.js.coffee

@@ -50,25 +50,4 @@ $.extend Alchemy,
       dropdownAutoWidth: true
     return
 
-  getUrlParam: (name) ->
-    results = new RegExp("[\\?&]" + name + "=([^&#]*)").exec(window.location.href)
-    results[1] or 0  if results
-    return
-
-  isiPhone: navigator.userAgent.match(/iPhone/i) isnt null
-  isiPad: navigator.userAgent.match(/iPad/i) isnt null
-  isiPod: navigator.userAgent.match(/iPod/i) isnt null
-  isiOS: navigator.userAgent.match(/iPad|iPhone|iPod/i) isnt null
-  isFirefox: navigator.userAgent.match(/Firefox/i) isnt null
-  isChrome: navigator.userAgent.match(/Chrome/i) isnt null
-  isSafari: navigator.userAgent.match(/Safari/i) isnt null
-  isIE: navigator.userAgent.match(/MSIE/i) isnt null
-
-Alchemy.getBrowserVersion = (browser) ->
-  (if Alchemy["is" + browser] then parseInt(navigator.userAgent.match(new RegExp(browser + ".[0-9]+", "i"))[0].replace(new RegExp(browser + "."), ""), 10) else null)
-  return
 
-Alchemy.ChromeVersion = Alchemy.getBrowserVersion("Chrome")
-Alchemy.FirefoxVersion = Alchemy.getBrowserVersion("Firefox")
-Alchemy.SafariVersion = Alchemy.getBrowserVersion("Safari")
-Alchemy.IEVersion = Alchemy.getBrowserVersion("MSIE")

data/app/assets/javascripts/alchemy/alchemy.dirty.js.coffee

@@ -40,7 +40,7 @@ $.extend Alchemy,
         $form.submit()
     else if $(element).is("a")
       callback = ->
-        Turbolinks.visit(element.pathname)
+        Turbo.visit(element.pathname)
     if Alchemy.isPageDirty()
       Alchemy.openConfirmDialog Alchemy.t('page_dirty_notice'),
         title: Alchemy.t('warning')

data/app/assets/javascripts/alchemy/alchemy.initializer.js.coffee

@@ -1,6 +1,6 @@
 # Initialize all onload scripts at once.
 #
-# Called at jQuery ready event and Turbolinks page change event.
+# Called at jQuery ready event and Turbo page change event.
 #
 Alchemy.Initializer = ->
 
@@ -26,13 +26,13 @@ Alchemy.Initializer = ->
   $('select#change_locale').on 'change', (e) ->
     url = window.location.pathname
     delimiter = if url.match(/\?/) then '&' else '?'
-    Turbolinks.visit "#{url}#{delimiter}admin_locale=#{$(this).val()}"
+    Turbo.visit "#{url}#{delimiter}admin_locale=#{$(this).val()}"
 
   # Site select handler
   $('select#change_site').on 'change', (e) ->
     url = window.location.pathname
     delimiter = if url.match(/\?/) then '&' else '?'
-    Turbolinks.visit "#{url}#{delimiter}site_id=#{$(this).val()}"
+    Turbo.visit "#{url}#{delimiter}site_id=#{$(this).val()}"
 
   # Submit forms of selects with `data-autosubmit="true"`
   $('select[data-auto-submit="true"]').on 'change', (e) ->
@@ -46,18 +46,11 @@ Alchemy.Initializer = ->
     tagName = (event.target || event.srcElement).tagName
     key.isPressed('esc') || !(tagName == 'INPUT' || tagName == 'SELECT' || tagName == 'TEXTAREA')
 
-# Enabling the Turbolinks Progress Bar for v2.5
-Turbolinks.enableProgressBar() if Turbolinks.enableProgressBar
-
-# Turbolinks DOM Ready.
-# Handle both v2.5(page:change), and v.5.0 (turbolinks:load)
-$(document).on 'page:change turbolinks:load', ->
+$(document).on 'turbo:load', ->
   Alchemy.Initializer()
   return
 
-# Turbolinks before parsing a new page
-# Handle both v2.5(page:receive), and v.5.0 (turbolinks:request-end)
-$(document).on 'page:receive turbolinks:request-end', ->
+$(document).on 'turbo:before-fetch-request', ->
   # Ensure that all tinymce editors get removed before parsing a new page
   Alchemy.Tinymce.removeFrom $('.has_tinymce')
   return

data/app/assets/javascripts/alchemy/alchemy.link_dialog.js.coffee

@@ -59,17 +59,12 @@ class window.Alchemy.LinkDialog extends Alchemy.Dialog
   initPageSelect: ->
     pageTemplate = HandlebarsTemplates.page
     element_anchor_placeholder = @$element_anchor.attr('placeholder')
-    if @link_object.dataset.languageId
-      api_url = "#{Alchemy.routes.api_pages_path}?language_id=#{@link_object.dataset.languageId}"
-    else
-      api_url = Alchemy.routes.api_pages_path
-
     @$internal_link.select2
       placeholder: Alchemy.t('Search page')
       allowClear: true
       minimumInputLength: 3
       ajax:
-        url: api_url
+        url: Alchemy.routes.api_pages_path
         datatype: 'json'
         quietMillis: 300
         data: (term, page) ->

data/app/assets/stylesheets/alchemy/base.scss

@@ -3,8 +3,8 @@ html {
   height: 100%;
   font-size: $base-font-size;
 
-  &.turbolinks-progress-bar::before,
-  .turbolinks-progress-bar {
+  &.turbo-progress-bar::before,
+  .turbo-progress-bar {
     background-color: $blue !important;
     z-index: 400001;
   }

data/app/controllers/alchemy/api/pages_controller.rb

@@ -8,9 +8,7 @@ module Alchemy
     # Returns all pages as json object
     #
     def index
-      language = Alchemy::Language.find_by(id: params[:language_id]) || Alchemy::Language.current
       @pages = Alchemy::Page.accessible_by(current_ability, :index)
-      @pages = @pages.where(language: language)
       @pages = @pages.includes(*page_includes)
       @pages = @pages.ransack(params[:q]).result
 

data/app/controllers/alchemy/base_controller.rb

@@ -9,13 +9,6 @@ module Alchemy
     include Alchemy::ControllerActions
     include Alchemy::Modules
 
-    # Include Turbolinks explicitly in case Alchemy is embedded into a
-    # larger application that doesn't work with Turbolinks. The app
-    # can then set config.turbolinks.auto_include = false so that
-    # Turbolinks is not included in the app controllers.
-    include Turbolinks::Controller
-    ::ActionDispatch::Assertions.include ::Turbolinks::Assertions
-
     protect_from_forgery
 
     before_action :mailer_set_url_options

data/{package/src → app/javascript/alchemy_admin}/node_tree.js

@@ -1,6 +1,6 @@
 import Sortable from "sortablejs"
-import { patch } from "./utils/ajax"
-import { on } from "./utils/events"
+import { patch } from "alchemy_admin/utils/ajax"
+import { on } from "alchemy_admin/utils/events"
 
 function displayNodeFolders() {
   document.querySelectorAll("li.menu-item").forEach((el) => {

data/{package/src → app/javascript/alchemy_admin}/page_publication_fields.js

@@ -9,7 +9,7 @@ export default function () {
     )
     const public_field = dialog.querySelector("#page_public")
 
-    if(!public_field) return
+    if (!public_field) return
 
     public_field.addEventListener("click", function (evt) {
       const checkbox = evt.target

data/{package/src → app/javascript/alchemy_admin}/page_sorter.js

@@ -1,5 +1,5 @@
 import Sortable from "sortablejs"
-import { patch } from "./utils/ajax"
+import { patch } from "alchemy_admin/utils/ajax"
 
 function onFinishDragging(evt) {
   const pageId = evt.item.dataset.pageId

data/{package/src → app/javascript/alchemy_admin}/picture_editors.js

@@ -1,7 +1,7 @@
 import debounce from "lodash-es/debounce"
 import max from "lodash-es/max"
-import { get } from "./utils/ajax"
-import ImageLoader from "./image_loader"
+import { get } from "alchemy_admin/utils/ajax"
+import ImageLoader from "alchemy_admin/image_loader"
 
 const UPDATE_DELAY = 125
 const IMAGE_PLACEHOLDER = '<i class="icon far fa-image fa-fw"></i>'

data/{package/src → app/javascript/alchemy_admin}/sitemap.js

@@ -1,8 +1,8 @@
 // The admin sitemap Alchemy class
-import PageSorter from "./page_sorter"
-import { on } from "./utils/events"
-import { get, patch } from "./utils/ajax"
-import { createSortables, displayPageFolders } from "./page_sorter"
+import PageSorter from "alchemy_admin/page_sorter"
+import { on } from "alchemy_admin/utils/events"
+import { get, patch } from "alchemy_admin/utils/ajax"
+import { createSortables, displayPageFolders } from "alchemy_admin/page_sorter"
 
 export default class Sitemap {
   // Storing some objects.

data/app/javascript/alchemy_admin.js

@@ -0,0 +1,34 @@
+import "@hotwired/turbo-rails"
+
+import translate from "alchemy_admin/i18n"
+import translationData from "alchemy_admin/translations"
+import fileEditors from "alchemy_admin/file_editors"
+import IngredientAnchorLink from "alchemy_admin/ingredient_anchor_link"
+import pictureEditors from "alchemy_admin/picture_editors"
+import ImageLoader from "alchemy_admin/image_loader"
+import ImageCropper from "alchemy_admin/image_cropper"
+import Datepicker from "alchemy_admin/datepicker"
+import Sitemap from "alchemy_admin/sitemap"
+import Tinymce from "alchemy_admin/tinymce"
+import PagePublicationFields from "alchemy_admin/page_publication_fields"
+
+// 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),
+  fileEditors,
+  pictureEditors,
+  ImageLoader: ImageLoader.init,
+  ImageCropper,
+  IngredientAnchorLink,
+  Datepicker,
+  Sitemap,
+  Tinymce,
+  PagePublicationFields
+})

data/app/models/alchemy/element.rb

@@ -35,13 +35,14 @@ module Alchemy
     FORBIDDEN_DEFINITION_ATTRIBUTES = [
       "amount",
       "autogenerate",
-      "nestable_elements",
+      "compact",
+      "deprecated",
       "hint",
       "ingredients",
-      "taggable",
-      "compact",
       "message",
-      "deprecated"
+      "nestable_elements",
+      "taggable",
+      "warning"
     ].freeze
 
     # All Elements that share the same page version and parent element and are fixed or not are considered a list.

data/app/views/alchemy/_menubar.html.erb

@@ -1,5 +1,5 @@
 <% if !@preview_mode && @page && can?(:edit_content, @page) %>
-  <div id="alchemy_menubar" style="display: none" data-turbolinks="false">
+  <div id="alchemy_menubar" style="display: none" data-turbo="false">
     <ul>
       <li><%= link_to Alchemy.t(:to_alchemy), alchemy.admin_dashboard_url %></li>
       <li><%= link_to Alchemy.t(:edit_page), alchemy.edit_admin_page_url(@page) %></li>

data/app/views/alchemy/admin/attachments/_replace_button.html.erb

@@ -17,7 +17,7 @@
       selector: '#replace_<%= dom_id(object) %>',
       file_types: '<%= file_types.join("|") %>',
       complete: function() {
-        Turbolinks.visit('<%= redirect_url.html_safe %>');
+        Turbo.visit('<%= redirect_url.html_safe %>');
       }
     };
     Alchemy.Uploader(options);

data/app/views/alchemy/admin/attachments/destroy.js.erb

@@ -1 +1 @@
-Turbolinks.visit('<%= @url %>');
+Turbo.visit('<%= @url %>');

data/app/views/alchemy/admin/nodes/index.html.erb

@@ -42,6 +42,8 @@
   <% end %>
 </div>
 
-<script>
-  Alchemy.NodeTree()
+<script type="module">
+  import NodeTree from "alchemy_admin/node_tree"
+
+  NodeTree()
 </script>

data/app/views/alchemy/admin/pages/_page_layout_filter.html.erb

@@ -23,7 +23,7 @@
     $("#page_layout").on("change", function(e) {
       var url = "<%= alchemy.admin_pages_path(search_filter_params.except(:page_layout, :page).merge(view: "list")) %>";
       delimiter = url.match(/\?/) ? "&" : "?";
-      Turbolinks.visit(url + delimiter + "page_layout=" + encodeURIComponent($(this).val()));
+      Turbo.visit(url + delimiter + "page_layout=" + encodeURIComponent($(this).val()));
     });
   });
 </script>

data/app/views/alchemy/admin/pages/edit.html.erb

@@ -81,7 +81,7 @@
               host: @page.site.host == "*" ? request.host : @page.site.host,
             ),
             title: Alchemy.t("Visit page"),
-            data: { turbolinks: false },
+            data: { turbo: false },
             target: "_blank",
             class: 'icon_button' do %>
           <%= render_icon('external-link-alt') %>
@@ -140,12 +140,11 @@
 <% content_for :javascripts do %>
 
 <% content_for :javascript_includes do %>
-  <meta name="turbolinks-cache-control" content="no-cache">
+  <meta name="turbo-cache-control" content="no-cache">
 <% end %>
 
 <script type="text/javascript" charset="utf-8">
-
-  $(function() {
+  $(document).one('turbo:load', function() {
     $('#unlock_page_form, #publish_page_form').on('submit', function(event) {
       var not_dirty = Alchemy.checkPageDirtyness(this);
       if (!not_dirty) Alchemy.pleaseWaitOverlay(false);

data/app/views/alchemy/admin/pages/index.html.erb

@@ -1,5 +1,5 @@
 <% content_for :javascript_includes do %>
-  <meta name="turbolinks-cache-control" content="no-cache">
+  <meta name="turbo-cache-control" content="no-cache">
 <% end %>
 
 <% content_for :toolbar do %>

data/app/views/alchemy/admin/pages/update.js.erb

@@ -31,11 +31,11 @@
     Alchemy.growl("<%= j @notice %>");
     Alchemy.closeCurrentDialog();
   } else {
-    document.addEventListener('turbolinks:load', function () {
+    document.addEventListener('turbo:load', function () {
       Alchemy.growl("<%= j @notice %>");
     }, { once: true })
     Alchemy.closeCurrentDialog(function() {
-      Turbolinks.visit(location.toString(), { action: "replace" });
+      Turbo.visit(location.toString(), { action: "replace" });
     });
   }
 

data/app/views/alchemy/admin/resources/_filter_bar.html.erb

@@ -19,7 +19,7 @@
       if ($this.data('remote') === true) {
         $.get(path, params.toString(), null, 'script');
       } else {
-        Turbolinks.visit(path + '?' + params.toString());
+        Turbo.visit(path + '?' + params.toString());
       }
       return false;
     });

data/app/views/alchemy/admin/styleguide/index.html.erb

@@ -3,7 +3,7 @@
 <% end %>
 
 <% content_for :javascript_includes do %>
-  <meta name="turbolinks-cache-control" content="no-cache">
+  <meta name="turbo-cache-control" content="no-cache">
 <% end %>
 
 <% content_for(:toolbar) do %>

data/app/views/alchemy/admin/uploader/_button.html.erb

@@ -27,7 +27,7 @@
       <% if local_assigns[:in_dialog] %>
         $.get(url, null, null, 'script');
       <% else %>
-        Turbolinks.visit(url);
+        Turbo.visit(url);
       <% end %>
       }
     };

data/app/views/alchemy/base/permission_denied.js.erb

@@ -1,3 +1,3 @@
 Alchemy.closeCurrentDialog(function() {
-  Turbolinks.visit('<%= Alchemy.login_path %>');
+  Turbo.visit('<%= Alchemy.login_path %>');
 });

data/app/views/alchemy/base/redirect.js.erb

@@ -1,7 +1,7 @@
 (function() {
   var dialog = Alchemy.currentDialog();
   var callback = function() {
-    Turbolinks.visit('<%= url_for(@redirect_url) %>');
+    Turbo.visit('<%= url_for(@redirect_url) %>');
   };
   if (dialog) {
     Alchemy.closeCurrentDialog(callback);

data/app/views/alchemy/ingredients/shared/_link_tools.html.erb

@@ -5,7 +5,6 @@
     onclick: 'new Alchemy.LinkDialog(this).open(); return false;',
     class: "icon_button#{ingredient_editor.linked? ? ' linked' : ''} link-ingredient",
     "data-parent-selector": "[data-ingredient-id='#{ingredient_editor.id}']",
-    "data-language-id": ingredient_editor.page&.language_id,
     title: Alchemy.t(:place_link),
     id: "edit_link_#{ingredient_editor.id}"
   ) %>

data/app/views/alchemy/ingredients/shared/_picture_tools.html.erb

@@ -34,7 +34,6 @@
   class: picture_editor.linked? ? "linked" : nil,
   title: Alchemy.t(:link_image),
   "data-parent-selector": "[data-ingredient-id='#{picture_editor.id}']",
-  "data-language-id": picture_editor.page&.language_id,
   id: "edit_link_#{picture_editor.id}"
 } do %>
   <span class="disabled" tabindex="-1"><%= render_icon(:link) %></span>

data/app/views/layouts/alchemy/admin.html.erb

@@ -7,8 +7,8 @@
     <link rel="shortcut icon" href="<%= asset_path('alchemy/favicon.ico') %>">
     <%= csrf_meta_tag %>
     <meta name="robots" content="noindex">
-    <%= stylesheet_link_tag('alchemy/admin/all', media: 'screen', 'data-turbolinks-track' => true) %>
-    <%= stylesheet_link_tag('alchemy/print', media: 'print', 'data-turbolinks-track' => true) %>
+    <%= stylesheet_link_tag('alchemy/admin/all', media: 'screen', 'data-turbo-track' => true) %>
+    <%= stylesheet_link_tag('alchemy/print', media: 'print', 'data-turbo-track' => true) %>
     <%= yield :stylesheets %>
     <script>
       // Global Alchemy JavaScript object.
@@ -33,12 +33,8 @@
       };
     </script>
     <%= render 'alchemy/admin/partials/routes' %>
-    <%= javascript_include_tag('alchemy/admin/all', 'data-turbolinks-track' => true) %>
-    <% if respond_to?(:javascript_pack_tag) %>
-      <%= javascript_pack_tag('alchemy/admin', 'data-turbolinks-track' => true) %>
-    <% else %>
-      <%= javascript_include_tag('alchemy_admin', 'data-turbolinks-track' => true) %>
-    <% end %>
+    <%= javascript_include_tag('alchemy/admin/all', 'data-turbo-track' => true) %>
+    <%= javascript_importmap_tags("alchemy_admin", importmap: Alchemy.importmap) %>
     <%= yield :javascript_includes %>
   </head>
   <%= content_tag :body, id: 'alchemy', class: alchemy_body_class do %>

data/bin/importmap

@@ -0,0 +1,4 @@
+#!/usr/bin/env ruby
+
+require_relative "../spec/dummy/config/application"
+require "importmap/commands"