Open Source Platform for DTC, B2B Commerce, Marketplaces & Omnichannel. REST APIs, TypeScript SDKs, and production-ready Next.js storefront. Self-host it. Own your data. No vendor lock-in. Zero platform fees.
Ruby b2b-commercee-commerceecommerceecommerce-apiecommerce-frameworkecommerce-platformheadlessheadless-commerceheadless-ecommercemarketplacemulti-tenantmulti-vendormulti-vendor-ecommerceopen-sourcespree-commerce
Draft admin importmaps
Damian Kaczmarczyka2f026373cd1
diff --git a/admin/app/assets/config/spree_admin_manifest.js b/admin/app/assets/config/spree_admin_manifest.jsindex db15951402..ec456eb0d9 100644--- a/admin/app/assets/config/spree_admin_manifest.js+++ b/admin/app/assets/config/spree_admin_manifest.js@@ -1,3 +1,4 @@-//= link_directory ../../javascript/spree/admin .js//= link_directory ../../javascript/spree/admin/controllers .js//= link_directory ../../javascript/spree/admin/helpers .js+//= link spree/admin/helpers/trix/video_embed.js+//= link application.jsdiff --git a/admin/app/javascript/spree/admin/application.js b/admin/app/javascript/spree/admin/application.jsindex a3ece77c09..27a8421c23 100644--- a/admin/app/javascript/spree/admin/application.js+++ b/admin/app/javascript/spree/admin/application.js@@ -1,5 +1,159 @@-// Configure your import map in config/importmap.rb. Read more: https://github.com/rails/importmap-rails+// Rails stuff+import "@rails/actioncable"+import "@rails/actiontext"import "@hotwired/turbo-rails"-import "@rails/request.js"-import "controllers"-import "helpers"\ No newline at end of file+import * as ActiveStorage from "@rails/activestorage"+ActiveStorage.start()++import "chartkick"+import "Chart.bundle"++import LocalTime from "local-time"+import "mapkick/bundle"++// Helpers+import 'spree/admin/helpers/tinymce'+import 'spree/admin/helpers/navs'+import 'spree/admin/helpers/canvas'+import 'spree/admin/helpers/trix/video_embed'+import 'spree/admin/helpers/bootstrap'+++// Stimulus controllers+import { Application } from "@hotwired/stimulus"++const application = Application.start()++// Configure Stimulus development experience+application.debug = false+window.Stimulus = application++import AutoSubmit from '@stimulus-components/auto-submit'+import TextareaAutogrow from 'stimulus-textarea-autogrow'+import Notification from 'stimulus-notification'+import PasswordVisibility from 'stimulus-password-visibility'+import RailsNestedForm from '@stimulus-components/rails-nested-form'+import Reveal from 'stimulus-reveal-controller'+import Sortable from 'stimulus-sortable'+import { Tabs } from 'tailwindcss-stimulus-components'++import AccountBillingAddressController from 'spree/admin/controllers/account_billing_address_controller'+import AccountTaxRegistrationsController from 'spree/admin/controllers/account_tax_registrations_controller'+import ActiveStorageUpload from 'spree/admin/controllers/active_storage_upload_controller'+import AddDomainController from 'spree/admin/controllers/add_domain_controller'+// import AddressAutocompleteController from 'spree/addre/controllersss_autocomplete_controller'+// import AddressFormController from 'spree/addre/controllersss_form_controller'+import AssetUploaderController from 'spree/admin/controllers/asset_uploader_controller'+import AutocompleteSelectController from 'spree/admin/controllers/autocomplete_select_controller'+import BetterSliderController from 'spree/admin/controllers/better_slider_controller'+import BlockFormController from 'spree/admin/controllers/block_form_controller'+import BootstrapTabs from 'spree/admin/controllers/bootstrap_tabs_controller'+import BulkOperationController from 'spree/admin/controllers/bulk_operation_controller'+import CalculatorFieldsController from 'spree/admin/controllers/calculator_fields_controller'+import CalendarRangeController from 'spree/admin/controllers/calendar_range_controller'+import Clipboard from 'spree/admin/controllers/clipboard_controller'+import ColorPaletteController from 'spree/admin/controllers/color_palette_controller'+import ColorPickerController from 'spree/admin/controllers/color_picker_controller'+// import EnableButtonController from 'spree/enabl/controllerse_button_controller'+import FlatfileUploaderController from 'spree/admin/controllers/flatfile_uploader_controller'+import FiltersController from 'spree/admin/controllers/filters_controller'+import FontPickerController from 'spree/admin/controllers/font_picker_controller'+import MediaFormController from 'spree/admin/controllers/media_form_controller'+import MultiInputController from 'spree/admin/controllers/multi_input_controller'+import OrderBillingAddressController from 'spree/admin/controllers/order_billing_address_controller'+import PageBuilderController from 'spree/admin/controllers/page_builder_controller'+import PasswordToggle from 'spree/admin/controllers/password_toggle_controller'+import ProductFormController from 'spree/admin/controllers/product_form_controller'+import RangeInputController from 'spree/admin/controllers/range_input_controller'+import ReplaceController from 'spree/admin/controllers/replace_controller'+import RowLinkController from 'spree/admin/controllers/row_link_controller'+import RuleFormController from 'spree/admin/controllers/rule_form_controller'+import SearchPickerController from 'spree/admin/controllers/search_picker_controller'+import SectionFormController from 'spree/admin/controllers/section_form_controller'+import SelectController from 'spree/admin/controllers/select_controller'+import SeoFormController from 'spree/admin/controllers/seo_form_controller'+import SlugFormController from 'spree/admin/controllers/slug_form_controller'+import SortableTree from 'spree/admin/controllers/sortable_tree_controller'+import SpreeController from 'spree/admin/controllers/spree_controller'+import StockTransferController from 'spree/admin/controllers/stock_transfer_controller'+import StoreFormController from 'spree/admin/controllers/store_form_controller'+import UnitSystemController from 'spree/admin/controllers/unit_system_controller'+import VariantsFormController from 'spree/admin/controllers/variants_form_controller'+import WebhooksSubscriberEventsController from 'spree/admin/controllers/webhook_subscriber_events_controller'++application.register('account-billing-address', AccountBillingAddressController)+application.register('account-tax-registrations', AccountTaxRegistrationsController)+application.register('active-storage-upload', ActiveStorageUpload)+application.register('add-domain', AddDomainController)+// application.register('address-autocomplete', AddressAutocompleteController)+// application.register('address-form', AddressFormController)+application.register('asset-uploader', AssetUploaderController)+application.register('auto-submit', AutoSubmit)+application.register('autocomplete-select', AutocompleteSelectController)+application.register('better-slider', BetterSliderController)+application.register('block-form', BlockFormController)+application.register('bootstrap-tabs', BootstrapTabs) // We should merge with tabs controller/remove this+application.register('bulk-operation', BulkOperationController)+application.register('calculator-fields', CalculatorFieldsController)+application.register('calendar-range', CalendarRangeController)+application.register('clipboard', Clipboard)+application.register('color-palette', ColorPaletteController)+application.register('color-picker', ColorPickerController)+// application.register('enable-button', EnableButtonController)+application.register('flatfile-uploader', FlatfileUploaderController)+application.register('filters', FiltersController)+application.register('font-picker', FontPickerController)+application.register('media-form', MediaFormController)+application.register('multi-input', MultiInputController)+application.register('nested-form', RailsNestedForm)+application.register('notification', Notification)+application.register('order-billing-address', OrderBillingAddressController)+application.register('page-builder', PageBuilderController)+application.register('password-toggle', PasswordToggle)+application.register('password-visibility', PasswordVisibility)+application.register('product-form', ProductFormController)+application.register('range-input', RangeInputController)+application.register('replace', ReplaceController)+application.register('reveal', Reveal)+application.register('row-link', RowLinkController)+application.register('rule-form', RuleFormController)+application.register('search-picker', SearchPickerController)+application.register('section-form', SectionFormController)+application.register('select', SelectController)+application.register('seo-form', SeoFormController)+application.register('slug-form', SlugFormController)+application.register('sortable', Sortable)+application.register('sortable-tree', SortableTree)+application.register('spree', SpreeController)+application.register('stock-transfer', StockTransferController)+application.register('store-form', StoreFormController)+application.register('tabs', Tabs)+application.register('textarea-autogrow', TextareaAutogrow)+application.register('unit-system', UnitSystemController)+application.register('variants-form', VariantsFormController)+application.register('webhooks-subscriber-events', WebhooksSubscriberEventsController)++++LocalTime.start()++Trix.config.blockAttributes.heading1.tagName = 'h2'++document.addEventListener('turbo:before-visit', _event => {+ const content = document.getElementById('content')+ if (content) content.classList.add('blurred')+})++document.addEventListener('turbo:load', _event => {+ const content = document.getElementById('content')+ if (content) content.classList.remove('blurred')+})++document.addEventListener('turbo:submit-start', () => {+ Turbo.navigator.delegate.adapter.progressBar.setValue(0)+ Turbo.navigator.delegate.adapter.progressBar.show()+})+document.addEventListener('turbo:submit-end', () => {+ Turbo.navigator.delegate.adapter.progressBar.setValue(1)+ Turbo.navigator.delegate.adapter.progressBar.hide()+})diff --git a/admin/app/javascript/spree/admin/helpers/bootstrap.js b/admin/app/javascript/spree/admin/helpers/bootstrap.jsnew file mode 100644index 0000000000..b6aa2bc29b--- /dev/null+++ b/admin/app/javascript/spree/admin/helpers/bootstrap.js@@ -0,0 +1,29 @@+import 'jquery'+import 'bootstrap'+import { lockScroll, unlockScroll } from 'spree/admin/helpers/scroll_lock'+++const initTooltips = () => {+ $('.with-tip').each(function() {+ $(this).tooltip()+ })++ $('.with-tip').on('show.bs.tooltip', function(event) {+ if (('ontouchstart' in window)) {+ event.preventDefault()+ }+ })+}++const removeTooltips = () => {+ $('.with-tip').each(function() {+ $(this).tooltip('dispose')+ })+}++$('.modal').on('show.bs.modal', lockScroll)+$('.modal').on('hide.bs.modal', unlockScroll)++document.addEventListener("turbo:click", removeTooltips)+document.addEventListener("turbo:load", initTooltips)+document.addEventListener('turbo:frame-render', initTooltips)diff --git a/admin/app/javascript/spree/admin/helpers/canvas.js b/admin/app/javascript/spree/admin/helpers/canvas.jsnew file mode 100644index 0000000000..a77055bf71--- /dev/null+++ b/admin/app/javascript/spree/admin/helpers/canvas.js@@ -0,0 +1,29 @@+// ugly JS copied from a tutorial :)+const initOffcanvas = () => {+ document.querySelectorAll('.pull-bs-canvas-right, .pull-bs-canvas-left').forEach((element) => {+ element.addEventListener('click', () => {+ document.body.insertAdjacentHTML('afterbegin', '<div class="bs-canvas-overlay bg-dark position-fixed w-100 h-100"></div>');+ if(element.classList.contains('pull-bs-canvas-right'))+ document.querySelector('.bs-canvas-right').classList.add('mr-0');+ else+ document.querySelector('.bs-canvas-left').classList.add('ml-0');+ })+ })++ document.querySelectorAll('.bs-canvas-close, .bs-canvas-overlay').forEach((element) => {+ element.addEventListener('click', () => {+ let elm = element.classList.contains('bs-canvas-close') ? element.closest('.bs-canvas') : document.querySelector('.bs-canvas');+ elm.classList.remove('mr-0', 'ml-0');+ document.querySelector('.bs-canvas-overlay').remove();+ })+ })+}++const hideOffcanvas = () => {+ document.querySelector('.bs-canvas')?.classList?.remove('mr-0', 'ml-0');+ document.querySelector('.bs-canvas-overlay')?.remove();+}++document.addEventListener("turbo:load", initOffcanvas)+document.addEventListener("turbo:click", hideOffcanvas)+diff --git a/admin/app/javascript/spree/admin/helpers/navs.js b/admin/app/javascript/spree/admin/helpers/navs.jsnew file mode 100644index 0000000000..d75204f531--- /dev/null+++ b/admin/app/javascript/spree/admin/helpers/navs.js@@ -0,0 +1,10 @@+const initNavs = () => {+ document.querySelectorAll('#settings-nav .nav-link').forEach((element) => {+ element.addEventListener('click', () => {+ element.parentElement.parentElement.querySelectorAll('.nav-link.active').forEach((element) => {+ element.classList.remove('active')+ })+ })+ })+}+document.addEventListener("turbo:load", initNavs)diff --git a/admin/app/javascript/spree/admin/helpers/scroll_lock.js b/admin/app/javascript/spree/admin/helpers/scroll_lock.jsnew file mode 100644index 0000000000..3408d448ea--- /dev/null+++ b/admin/app/javascript/spree/admin/helpers/scroll_lock.js@@ -0,0 +1,25 @@+export function lockScroll() {+ const body = document.body+ const scrollPosition = window.scrollY || body.scrollTop+ document.documentElement.style.setProperty('--scroll-y', scrollPosition)++ body.style.top = `-${scrollPosition}px`+ const scrollbarWidth = window.innerWidth - document.documentElement.clientWidth+ document.body.style.paddingRight = `${scrollbarWidth}px`+ body.style.left = '0px'+ body.style.right = '0px'+ body.style.overflow = 'hidden'+ body.style.position = 'fixed'+}++export function unlockScroll() {+ const body = document.body+ body.style.position = ''+ body.style.paddingRight = ''+ body.style.left = ''+ body.style.right = ''+ body.style.overflow = ''++ document.documentElement.scrollTop = document.documentElement.style.getPropertyValue('--scroll-y') || window.scrollY+ body.style.top = ''+}diff --git a/admin/app/javascript/spree/admin/helpers/tinymce.js b/admin/app/javascript/spree/admin/helpers/tinymce.jsnew file mode 100644index 0000000000..7d8e127395--- /dev/null+++ b/admin/app/javascript/spree/admin/helpers/tinymce.js@@ -0,0 +1,73 @@+document.addEventListener('turbo:before-render', initializeTinmce)+document.addEventListener('turbo:load', initializeTinmce)+document.addEventListener('turbo:frame-render', initializeTinmce)++function initializeTinmce() {+ tinymce.remove()++ tinymce.init({+ content_style: 'body { font-family: Inter, sans-serif; font-size: 14px; }',+ selector: '.spree-rte',+ height: 300,+ extended_valid_elements: 'span',+ indent: false,+ plugins: ['image', 'table', 'code', 'link', 'lists'],+ menubar: false,+ inline_boundaries: false,+ toolbar: 'undo redo | blocks | bold italic link forecolor backcolor | bullist numlist outdent indent | alignleft aligncenter alignright alignjustify | table | code',+ // Default styles without heading 1+ style_formats: [+ {+ title: 'Headings',+ items: [+ { title: 'Heading 2', format: 'h2' },+ { title: 'Heading 3', format: 'h3' },+ { title: 'Heading 4', format: 'h4' },+ { title: 'Heading 5', format: 'h5' },+ { title: 'Heading 6', format: 'h6' }+ ]+ },+ {+ title: 'Inline',+ items: [+ { title: 'Bold', format: 'bold' },+ { title: 'Italic', format: 'italic' },+ { title: 'Underline', format: 'underline' },+ { title: 'Strikethrough', format: 'strikethrough' },+ { title: 'Superscript', format: 'superscript' },+ { title: 'Subscript', format: 'subscript' },+ { title: 'Code', format: 'code' }+ ]+ },+ {+ title: 'Blocks',+ items: [+ { title: 'Paragraph', format: 'p' },+ { title: 'Blockquote', format: 'blockquote' },+ { title: 'Div', format: 'div' },+ { title: 'Pre', format: 'pre' }+ ]+ },+ {+ title: 'Align',+ items: [+ { title: 'Left', format: 'alignleft' },+ { title: 'Center', format: 'aligncenter' },+ { title: 'Right', format: 'alignright' },+ { title: 'Justify', format: 'alignjustify' }+ ]+ }+ ],+ setup: function (ed) {+ if (document.getElementById(ed.id).hasAttribute('readonly')) ed.mode.set('readonly')+ }+ })++ tinymce.init({+ content_style: 'table { width: 100%; }; body { font-family: Inter, sans-serif; font-size: 14px; }',+ selector: '.spree-rte-table',+ plugins: ['table paste code'],+ menubar: false,+ toolbar: 'table | code | undo redo'+ })+}diff --git a/admin/app/javascript/spree/admin/helpers/trix/video_embed.js b/admin/app/javascript/spree/admin/helpers/trix/video_embed.jsnew file mode 100644index 0000000000..85c565c040--- /dev/null+++ b/admin/app/javascript/spree/admin/helpers/trix/video_embed.js@@ -0,0 +1,175 @@+import { post, destroy } from '@rails/request.js'++const lang = Trix.config.lang+lang['embed'] = 'Embed'+lang['embedVideo'] = 'Embed a video'++Trix.config.toolbar.getDefaultHTML = function() {+ return `<div class="trix-button-row">+ <span class="trix-button-group trix-button-group--text-tools" data-trix-button-group="text-tools">+ <button type="button" class="trix-button trix-button--icon trix-button--icon-bold" data-trix-attribute="bold" data-trix-key="b" title="${lang.bold}" tabindex="-1">${lang.bold}</button>+ <button type="button" class="trix-button trix-button--icon trix-button--icon-italic" data-trix-attribute="italic" data-trix-key="i" title="${lang.italic}" tabindex="-1">${lang.italic}</button>+ <button type="button" class="trix-button trix-button--icon trix-button--icon-strike" data-trix-attribute="strike" title="${lang.strike}" tabindex="-1">${lang.strike}</button>+ <button type="button" class="trix-button trix-button--icon trix-button--icon-link" data-trix-attribute="href" data-trix-action="link" data-trix-key="k" title="${lang.link}" tabindex="-1">${lang.link}</button>+ </span>++ <span class="trix-button-group trix-button-group--block-tools" data-trix-button-group="block-tools">+ <button type="button" class="trix-button trix-button--icon trix-button--icon-heading-1" data-trix-attribute="heading1" title="${lang.heading1}" tabindex="-1">${lang.heading1}</button>+ <button type="button" class="trix-button trix-button--icon trix-button--icon-quote" data-trix-attribute="quote" title="${lang.quote}" tabindex="-1">${lang.quote}</button>+ <button type="button" class="trix-button trix-button--icon trix-button--icon-code" data-trix-attribute="code" title="${lang.code}" tabindex="-1">${lang.code}</button>+ <button type="button" class="trix-button trix-button--icon trix-button--icon-bullet-list" data-trix-attribute="bullet" title="${lang.bullets}" tabindex="-1">${lang.bullets}</button>+ <button type="button" class="trix-button trix-button--icon trix-button--icon-number-list" data-trix-attribute="number" title="${lang.numbers}" tabindex="-1">${lang.numbers}</button>+ <button type="button" class="trix-button trix-button--icon trix-button--icon-decrease-nesting-level" data-trix-action="decreaseNestingLevel" title="${lang.outdent}" tabindex="-1">${lang.outdent}</button>+ <button type="button" class="trix-button trix-button--icon trix-button--icon-increase-nesting-level" data-trix-action="increaseNestingLevel" title="${lang.indent}" tabindex="-1">${lang.indent}</button>+ </span>++ <span class="trix-button-group trix-button-group--file-tools" data-trix-button-group="file-tools">+ <button type="button" class="trix-button trix-button--icon trix-button--icon-attach" data-trix-action="attachFiles" title="${lang.attachFiles}" tabindex="-1">${lang.attachFiles}</button>+ <button type="button" class="trix-button trix-button--icon trix-button--icon-embed" data-trix-action="x-video-embed" title="${lang.embedVideo}" tabindex="-1">${lang.embedVideo}</button>+ </span>++ <span class="trix-button-group-spacer"></span>++ <span class="trix-button-group trix-button-group--history-tools" data-trix-button-group="history-tools">+ <button type="button" class="trix-button trix-button--icon trix-button--icon-undo" data-trix-action="undo" data-trix-key="z" title="${lang.undo}" tabindex="-1">${lang.undo}</button>+ <button type="button" class="trix-button trix-button--icon trix-button--icon-redo" data-trix-action="redo" data-trix-key="shift+z" title="${lang.redo}" tabindex="-1">${lang.redo}</button>+ </span>+ </div>++ <div class="trix-dialogs" data-trix-dialogs>+ <div class="trix-dialog trix-dialog--link" data-trix-dialog="href" data-trix-dialog-attribute="href">+ <div class="trix-dialog__link-fields">+ <input type="url" name="href" class="trix-input trix-input--dialog" placeholder="${lang.urlPlaceholder}" aria-label="${lang.url}" required data-trix-input>+ <div class="trix-button-group">+ <input type="button" class="trix-button trix-button--dialog" value="${lang.link}" data-trix-method="setAttribute">+ <input type="button" class="trix-button trix-button--dialog" value="${lang.unlink}" data-trix-method="removeAttribute">+ </div>+ </div>+ </div>++ <div class="trix-dialog trix-dialog--x-video-embed" data-trix-dialog="href" data-trix-dialog-attribute="href">+ <div class="trix-dialog__link-fields">+ <input type="url" name="href" class="trix-input trix-input--dialog" placeholder="${lang.urlPlaceholder}" aria-label="${lang.url}" required data-trix-input>+ <div class="trix-button-group">+ <input type="button" class="trix-button trix-button--dialog" value="${lang.embed}">+ </div>+ </div>++ <div class="trix-dialog--error-container mt-2 d-none">+ <small class="trix-dialog--error-message text-danger"></small>+ </div>+ </div>+ </div>`+}++// Show a dialog for embedding a video after clicking the video embed button+document.addEventListener("trix-action-invoke", function(event) {+ const { invokingElement, actionName } = event++ if (actionName == "x-video-embed") {+ const dialog = invokingElement.closest("trix-toolbar").querySelector(".trix-dialog--x-video-embed")+ const input = dialog.querySelector('.trix-input--dialog')++ if (!invokingElement.classList.contains("trix-active")) {+ activateTrixElement(invokingElement)+ activateTrixElement(dialog)++ input.disabled = false+ input.required = true++ input.focus()+ } else {+ input.disabled = true+ input.required = false++ deactivateTrixElement(dialog)+ deactivateTrixElement(invokingElement)+ }+ }+})++// Clean up the video embed attachment after removing it from the rich text content+document.addEventListener("trix-attachment-remove", async function(event) {+ const { attachment } = event+ const { sgid } = attachment.attachment.attributes.values++ destroy(`/admin/action_text/video_embeds/${sgid}`, { responseKind: 'json' })+})++document.addEventListener("trix-initialize", function(event) {+ const editor = event.target++ // Deactivate video embed button after clicking on the editor window+ editor.addEventListener("click", function(_event) {+ const toolbar = editor.previousElementSibling++ if (toolbar.tagName == "TRIX-TOOLBAR") {+ const videoEmbedButton = toolbar.querySelector('[data-trix-action="x-video-embed"]')++ if (videoEmbedButton && videoEmbedButton.classList.contains("trix-active")) {+ deactivateTrixElement(videoEmbedButton)+ }+ }+ })++ // Attach a video embed+ const toolbar = editor.previousElementSibling++ if (toolbar.tagName == "TRIX-TOOLBAR") {+ const dialog = toolbar.querySelector(".trix-dialog--x-video-embed")+ const embedButton = dialog.querySelector(".trix-button--dialog")++ embedButton.addEventListener("click", async function(event) {+ const input = event.target.closest('.trix-dialog--x-video-embed').querySelector('.trix-input--dialog')++ input.disabled = true+ embedButton.disabled = true++ const errorContainer = dialog.querySelector(".trix-dialog--error-container")+ const errorMessage = errorContainer.querySelector(".trix-dialog--error-message")++ if (!errorContainer.classList.contains('d-none')) {+ errorContainer.classList.add('d-none')+ }++ errorMessage.innerHTML = ''++ const response = await post('/admin/action_text/video_embeds', { body: JSON.stringify({ url: input.value }), responseKind: 'json' })++ if (response.ok) {+ const { sgid, content } = await response.json++ const attachment = new Trix.Attachment({ content, sgid })+ editor.editor.insertAttachment(attachment)++ const videoEmbedButton = toolbar.querySelector('[data-trix-action="x-video-embed"]')+ deactivateTrixElement(videoEmbedButton)++ input.value = ''+ input.required = false+ embedButton.disabled = false+ } else {+ const { error } = await response.json++ if (errorContainer.classList.contains('d-none')) {+ errorContainer.classList.remove('d-none')+ }++ errorMessage.innerHTML = error++ input.disabled = false+ embedButton.disabled = false+ }+ })+ }+})++function activateTrixElement(element) {+ element.classList.add("trix-active")+ element.setAttribute("data-trix-active", "")+}++function deactivateTrixElement(element) {+ element.classList.remove("trix-active")+ element.removeAttribute("data-trix-active")+}diff --git a/admin/app/views/layouts/spree/admin.html.erb b/admin/app/views/layouts/spree/admin.html.erbindex ff8654267d..9be1d4ae4e 100644--- a/admin/app/views/layouts/spree/admin.html.erb+++ b/admin/app/views/layouts/spree/admin.html.erb@@ -1,7 +1,10 @@<!DOCTYPE html><html lang="<%= I18n.locale %>"><head>- <%= javascript_importmap_tags 'application-spree-backend' %>+ <!-- Trix does not work with importmaps in Rails 7 -->+ <!-- https://github.com/basecamp/trix/issues/1182 -->+ <%= javascript_include_tag 'trix' %>+ <%= javascript_importmap_tags 'application-spree-admin' %></head><body class="admin min-vh-100 <%= controller_name %> <%= action_name %>" data-controller="spree"><div class="container-fluid">diff --git a/admin/config/importmap.rb b/admin/config/importmap.rbnew file mode 100644index 0000000000..a5b10a2d8d--- /dev/null+++ b/admin/config/importmap.rb@@ -0,0 +1,32 @@+pin "application-spree-admin", to: "spree/admin/application.js"++pin "@hotwired/turbo-rails", to: "turbo.min.js", preload: ["application-spree-admin"]+pin "@rails/actioncable", to: "actioncable.esm.js", preload: ["application-spree-admin"]+pin "@hotwired/stimulus", to: "stimulus.min.js", preload: ["application-spree-admin"]+pin "@rails/activestorage", to: "activestorage.esm.js", preload: ["application-spree-admin"]+pin "@rails/actiontext", to: "https://ga.jspm.io/npm:@rails/[email protected]/app/assets/javascripts/actiontext.js", preload: ["application-spree-admin"]+#https://github.com/rails/requestjs-rails/issues/5#issuecomment-1017936902+pin "@rails/request.js", to: "https://ga.jspm.io/npm:@rails/[email protected]/src/index.js", preload: ["application-spree-admin"]+pin "sortablejs", to: "https://ga.jspm.io/npm:[email protected]/modular/sortable.esm.js", preload: ["application-spree-admin"]+pin "chartkick", to: "chartkick.js", preload: ["application-spree-admin"]+pin "Chart.bundle", to: "Chart.bundle.js", preload: ["application-spree-admin"]+pin "local-time", to: "https://ga.jspm.io/npm:[email protected]/app/assets/javascripts/local-time.es2017-esm.js", preload: ["application-spree-admin"]+pin "mapkick/bundle", to: "mapkick.bundle.js", preload: ["application-spree-admin"]+pin 'jquery', to: 'jquery3.min.js', preload: ["application-spree-admin"]+# Bootstrap 4 does not want to work with importmaps, after long debugging I found this comment which helped https://github.com/twbs/bootstrap-rubygem/issues/257#issuecomment-1707196465. Bootstrap has to be imported from jsdelivr.+pin "bootstrap", to: 'https://cdn.jsdelivr.net/npm/[email protected]/dist/js/bootstrap.bundle.min.js', preload: ["application-spree-admin"]+pin "@stimulus-components/auto-submit", to: "https://ga.jspm.io/npm:@stimulus-components/[email protected]/dist/stimulus-auto-submit.mjs", preload: ["application-spree-admin"]+pin "@stimulus-components/rails-nested-form", to: "https://ga.jspm.io/npm:@stimulus-components/[email protected]/dist/stimulus-rails-nested-form.mjs", preload: ["application-spree-admin"]+pin "stimulus-notification", to: "https://ga.jspm.io/npm:[email protected]/dist/stimulus-notification.mjs", preload: ["application-spree-admin"]+pin "stimulus-password-visibility", to: "https://ga.jspm.io/npm:[email protected]/dist/stimulus-password-visibility.mjs", preload: ["application-spree-admin"]+pin "stimulus-reveal-controller", to: "https://ga.jspm.io/npm:[email protected]/dist/stimulus-reveal-controller.mjs", preload: ["application-spree-admin"]+pin "stimulus-sortable", to: "https://ga.jspm.io/npm:[email protected]/dist/stimulus-sortable.mjs", preload: ["application-spree-admin"]+pin "stimulus-textarea-autogrow", to: "https://ga.jspm.io/npm:[email protected]/dist/stimulus-textarea-autogrow.mjs", preload: ["application-spree-admin"]+pin "tailwindcss-stimulus-components", to: "https://ga.jspm.io/npm:[email protected]/dist/tailwindcss-stimulus-components.module.js", preload: ["application-spree-admin"]+pin "hotkeys-js", to: "https://ga.jspm.io/npm:[email protected]/dist/hotkeys.esm.js", preload: ["application-spree-admin"]+pin "sortablejs", to: "https://ga.jspm.io/npm:[email protected]/modular/sortable.esm.js", preload: ["application-spree-admin"]+pin "stimulus-use", to: "https://ga.jspm.io/npm:[email protected]/dist/index.js", preload: ["application-spree-admin"]+++pin_all_from Spree::Admin::Engine.root.join("app/javascript/spree/admin/controllers"), under: "spree/admin/controllers", to: "spree/admin/controllers", preload: ["application-spree-admin"]+pin_all_from Spree::Admin::Engine.root.join("app/javascript/spree/admin/helpers"), under: "spree/admin/helpers", to: "spree/admin/helpers", preload: ["application-spree-admin"]diff --git a/admin/config/imprtmap.rb b/admin/config/imprtmap.rbdeleted file mode 100644index 1d69c6687f..0000000000--- a/admin/config/imprtmap.rb+++ /dev/null@@ -1,9 +0,0 @@-pin "application-spree-admin", to: "spree/admin/application.js", preload: true-pin "@hotwired/turbo-rails", to: "turbo.min.js", preload: true-pin "@hotwired/stimulus", to: "stimulus.min.js", preload: true-pin "@hotwired/stimulus-loading", to: "stimulus-loading.js", preload: true-pin "@rails/request.js", to: "requestjs.js", preload: true-pin "sortablejs", to: "https://ga.jspm.io/npm:[email protected]/modular/sortable.esm.js"--pin_all_from Spree::Admin::Engine.root.join("app/javascript/spree/admin/controllers"), under: "controllers", to: "spree/admin/controllers"-pin_all_from Spree::Admin::Engine.root.join("app/javascript/spree/admin/helpers"), under: "helpers", to: "spree/admin/helpers"diff --git a/admin/lib/spree/admin/engine.rb b/admin/lib/spree/admin/engine.rbindex 08bfb94e03..dcf10494ed 100644--- a/admin/lib/spree/admin/engine.rb+++ b/admin/lib/spree/admin/engine.rb@@ -16,7 +16,7 @@ module Spreeinitializer 'spree.admin.assets' do |app|app.config.assets.paths << root.join('app/javascript')- app.config.assets.precompile += %w[ spree_admin_manifest ]+ app.config.assets.precompile += %w[ spree_admin_manifest bootstrap.bundle.min.js jquery3.min.js ]endinitializer 'spree.admin.importmap', before: 'importmap' do |app|