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
Support Rails 7.2 (#12412)
Łukasz Adamczyk8c54f1f52db6
diff --git a/admin/config/importmap.rb b/admin/config/importmap.rbindex 37131446d8..ba5f968967 100644--- a/admin/config/importmap.rb+++ b/admin/config/importmap.rb@@ -2,7 +2,7 @@ pin 'application-spree-admin', to: 'spree/admin/application.js', preload: falsepin '@rails/actioncable', to: 'actioncable.esm.js', preload: ['application-spree-admin']pin '@rails/activestorage', to: 'activestorage.esm.js', preload: ['application-spree-admin']-pin '@rails/actiontext', to: '@[email protected]', preload: ['application-spree-admin']+pin '@rails/actiontext', to: '@[email protected]', preload: ['application-spree-admin']pin 'trix', to: '[email protected]', preload: ['application-spree-admin']pin '@rails/request.js', to: '@rails--request.js.js', preload: ['application-spree-admin'] # @0.0.8diff --git a/admin/vendor/javascript/@[email protected] b/admin/vendor/javascript/@[email protected]similarity index 99%rename from admin/vendor/javascript/@[email protected]rename to admin/vendor/javascript/@[email protected]index 390d34add2..57a737988f 100644--- a/admin/vendor/javascript/@[email protected]+++ b/admin/vendor/javascript/@[email protected]@@ -1,4 +1,4 @@-// @rails/[email protected] downloaded from https://ga.jspm.io/npm:@rails/[email protected]/app/assets/javascripts/actiontext.esm.js+// @rails/[email protected] downloaded from https://ga.jspm.io/npm:@rails/[email protected]/app/assets/javascripts/actiontext.esm.jsvar t=typeof globalThis!=="undefined"?globalThis:typeof self!=="undefined"?self:global;var e={exports:{}};(function(e,r){(function(t){e.exports=t()})((function(e){var r=["0","1","2","3","4","5","6","7","8","9","a","b","c","d","e","f"];function md5cycle(t,e){var r=t[0],i=t[1],s=t[2],n=t[3];r+=(i&s|~i&n)+e[0]-680876936|0;r=(r<<7|r>>>25)+i|0;n+=(r&i|~r&s)+e[1]-389564586|0;n=(n<<12|n>>>20)+r|0;s+=(n&r|~n&i)+e[2]+606105819|0;s=(s<<17|s>>>15)+n|0;i+=(s&n|~s&r)+e[3]-1044525330|0;i=(i<<22|i>>>10)+s|0;r+=(i&s|~i&n)+e[4]-176418897|0;r=(r<<7|r>>>25)+i|0;n+=(r&i|~r&s)+e[5]+1200080426|0;n=(n<<12|n>>>20)+r|0;s+=(n&r|~n&i)+e[6]-1473231341|0;s=(s<<17|s>>>15)+n|0;i+=(s&n|~s&r)+e[7]-45705983|0;i=(i<<22|i>>>10)+s|0;r+=(i&s|~i&n)+e[8]+1770035416|0;r=(r<<7|r>>>25)+i|0;n+=(r&i|~r&s)+e[9]-1958414417|0;n=(n<<12|n>>>20)+r|0;s+=(n&r|~n&i)+e[10]-42063|0;s=(s<<17|s>>>15)+n|0;i+=(s&n|~s&r)+e[11]-1990404162|0;i=(i<<22|i>>>10)+s|0;r+=(i&s|~i&n)+e[12]+1804603682|0;r=(r<<7|r>>>25)+i|0;n+=(r&i|~r&s)+e[13]-40341101|0;n=(n<<12|n>>>20)+r|0;s+=(n&r|~n&i)+e[14]-1502002290|0;s=(s<<17|s>>>15)+n|0;i+=(s&n|~s&r)+e[15]+1236535329|0;i=(i<<22|i>>>10)+s|0;r+=(i&n|s&~n)+e[1]-165796510|0;r=(r<<5|r>>>27)+i|0;n+=(r&s|i&~s)+e[6]-1069501632|0;n=(n<<9|n>>>23)+r|0;s+=(n&i|r&~i)+e[11]+643717713|0;s=(s<<14|s>>>18)+n|0;i+=(s&r|n&~r)+e[0]-373897302|0;i=(i<<20|i>>>12)+s|0;r+=(i&n|s&~n)+e[5]-701558691|0;r=(r<<5|r>>>27)+i|0;n+=(r&s|i&~s)+e[10]+38016083|0;n=(n<<9|n>>>23)+r|0;s+=(n&i|r&~i)+e[15]-660478335|0;s=(s<<14|s>>>18)+n|0;i+=(s&r|n&~r)+e[4]-405537848|0;i=(i<<20|i>>>12)+s|0;r+=(i&n|s&~n)+e[9]+568446438|0;r=(r<<5|r>>>27)+i|0;n+=(r&s|i&~s)+e[14]-1019803690|0;n=(n<<9|n>>>23)+r|0;s+=(n&i|r&~i)+e[3]-187363961|0;s=(s<<14|s>>>18)+n|0;i+=(s&r|n&~r)+e[8]+1163531501|0;i=(i<<20|i>>>12)+s|0;r+=(i&n|s&~n)+e[13]-1444681467|0;r=(r<<5|r>>>27)+i|0;n+=(r&s|i&~s)+e[2]-51403784|0;n=(n<<9|n>>>23)+r|0;s+=(n&i|r&~i)+e[7]+1735328473|0;s=(s<<14|s>>>18)+n|0;i+=(s&r|n&~r)+e[12]-1926607734|0;i=(i<<20|i>>>12)+s|0;r+=(i^s^n)+e[5]-378558|0;r=(r<<4|r>>>28)+i|0;n+=(r^i^s)+e[8]-2022574463|0;n=(n<<11|n>>>21)+r|0;s+=(n^r^i)+e[11]+1839030562|0;s=(s<<16|s>>>16)+n|0;i+=(s^n^r)+e[14]-35309556|0;i=(i<<23|i>>>9)+s|0;r+=(i^s^n)+e[1]-1530992060|0;r=(r<<4|r>>>28)+i|0;n+=(r^i^s)+e[4]+1272893353|0;n=(n<<11|n>>>21)+r|0;s+=(n^r^i)+e[7]-155497632|0;s=(s<<16|s>>>16)+n|0;i+=(s^n^r)+e[10]-1094730640|0;i=(i<<23|i>>>9)+s|0;r+=(i^s^n)+e[13]+681279174|0;r=(r<<4|r>>>28)+i|0;n+=(r^i^s)+e[0]-358537222|0;n=(n<<11|n>>>21)+r|0;s+=(n^r^i)+e[3]-722521979|0;s=(s<<16|s>>>16)+n|0;i+=(s^n^r)+e[6]+76029189|0;i=(i<<23|i>>>9)+s|0;r+=(i^s^n)+e[9]-640364487|0;r=(r<<4|r>>>28)+i|0;n+=(r^i^s)+e[12]-421815835|0;n=(n<<11|n>>>21)+r|0;s+=(n^r^i)+e[15]+530742520|0;s=(s<<16|s>>>16)+n|0;i+=(s^n^r)+e[2]-995338651|0;i=(i<<23|i>>>9)+s|0;r+=(s^(i|~n))+e[0]-198630844|0;r=(r<<6|r>>>26)+i|0;n+=(i^(r|~s))+e[7]+1126891415|0;n=(n<<10|n>>>22)+r|0;s+=(r^(n|~i))+e[14]-1416354905|0;s=(s<<15|s>>>17)+n|0;i+=(n^(s|~r))+e[5]-57434055|0;i=(i<<21|i>>>11)+s|0;r+=(s^(i|~n))+e[12]+1700485571|0;r=(r<<6|r>>>26)+i|0;n+=(i^(r|~s))+e[3]-1894986606|0;n=(n<<10|n>>>22)+r|0;s+=(r^(n|~i))+e[10]-1051523|0;s=(s<<15|s>>>17)+n|0;i+=(n^(s|~r))+e[1]-2054922799|0;i=(i<<21|i>>>11)+s|0;r+=(s^(i|~n))+e[8]+1873313359|0;r=(r<<6|r>>>26)+i|0;n+=(i^(r|~s))+e[15]-30611744|0;n=(n<<10|n>>>22)+r|0;s+=(r^(n|~i))+e[6]-1560198380|0;s=(s<<15|s>>>17)+n|0;i+=(n^(s|~r))+e[13]+1309151649|0;i=(i<<21|i>>>11)+s|0;r+=(s^(i|~n))+e[4]-145523070|0;r=(r<<6|r>>>26)+i|0;n+=(i^(r|~s))+e[11]-1120210379|0;n=(n<<10|n>>>22)+r|0;s+=(r^(n|~i))+e[2]+718787259|0;s=(s<<15|s>>>17)+n|0;i+=(n^(s|~r))+e[9]-343485551|0;i=(i<<21|i>>>11)+s|0;t[0]=r+t[0]|0;t[1]=i+t[1]|0;t[2]=s+t[2]|0;t[3]=n+t[3]|0}function md5blk(t){var e,r=[];for(e=0;e<64;e+=4)r[e>>2]=t.charCodeAt(e)+(t.charCodeAt(e+1)<<8)+(t.charCodeAt(e+2)<<16)+(t.charCodeAt(e+3)<<24);return r}function md5blk_array(t){var e,r=[];for(e=0;e<64;e+=4)r[e>>2]=t[e]+(t[e+1]<<8)+(t[e+2]<<16)+(t[e+3]<<24);return r}function md51(t){var e,r,i,s,n,a,o=t.length,h=[1732584193,-271733879,-1732584194,271733878];for(e=64;e<=o;e+=64)md5cycle(h,md5blk(t.substring(e-64,e)));t=t.substring(e-64);r=t.length;i=[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0];for(e=0;e<r;e+=1)i[e>>2]|=t.charCodeAt(e)<<(e%4<<3);i[e>>2]|=128<<(e%4<<3);if(e>55){md5cycle(h,i);for(e=0;e<16;e+=1)i[e]=0}s=o*8;s=s.toString(16).match(/(.*?)(.{0,8})$/);n=parseInt(s[2],16);a=parseInt(s[1],16)||0;i[14]=n;i[15]=a;md5cycle(h,i);return h}function md51_array(t){var e,r,i,s,n,a,o=t.length,h=[1732584193,-271733879,-1732584194,271733878];for(e=64;e<=o;e+=64)md5cycle(h,md5blk_array(t.subarray(e-64,e)));t=e-64<o?t.subarray(e-64):new Uint8Array(0);r=t.length;i=[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0];for(e=0;e<r;e+=1)i[e>>2]|=t[e]<<(e%4<<3);i[e>>2]|=128<<(e%4<<3);if(e>55){md5cycle(h,i);for(e=0;e<16;e+=1)i[e]=0}s=o*8;s=s.toString(16).match(/(.*?)(.{0,8})$/);n=parseInt(s[2],16);a=parseInt(s[1],16)||0;i[14]=n;i[15]=a;md5cycle(h,i);return h}function rhex(t){var e,i="";for(e=0;e<4;e+=1)i+=r[t>>e*8+4&15]+r[t>>e*8&15];return i}function hex(t){var e;for(e=0;e<t.length;e+=1)t[e]=rhex(t[e]);return t.join("")}hex(md51("hello"))!=="5d41402abc4b2a76b9719d911017c592";typeof ArrayBuffer==="undefined"||ArrayBuffer.prototype.slice||function(){function clamp(t,e){t=t|0||0;return t<0?Math.max(t+e,0):Math.min(t,e)}ArrayBuffer.prototype.slice=function(r,i){var s,n,a,o,h=(this||t).byteLength,l=clamp(r,h),c=h;i!==e&&(c=clamp(i,h));if(l>c)return new ArrayBuffer(0);s=c-l;n=new ArrayBuffer(s);a=new Uint8Array(n);o=new Uint8Array(this||t,l,s);a.set(o);return n}}();function toUtf8(t){/[\u0080-\uFFFF]/.test(t)&&(t=unescape(encodeURIComponent(t)));return t}function utf8Str2ArrayBuffer(t,e){var r,i=t.length,s=new ArrayBuffer(i),n=new Uint8Array(s);for(r=0;r<i;r+=1)n[r]=t.charCodeAt(r);return e?n:s}function arrayBuffer2Utf8Str(t){return String.fromCharCode.apply(null,new Uint8Array(t))}function concatenateArrayBuffers(t,e,r){var i=new Uint8Array(t.byteLength+e.byteLength);i.set(new Uint8Array(t));i.set(new Uint8Array(e),t.byteLength);return r?i:i.buffer}function hexToBinaryString(t){var e,r=[],i=t.length;for(e=0;e<i-1;e+=2)r.push(parseInt(t.substr(e,2),16));return String.fromCharCode.apply(String,r)}function SparkMD5(){this.reset()}SparkMD5.prototype.append=function(e){this.appendBinary(toUtf8(e));return this||t};SparkMD5.prototype.appendBinary=function(e){(this||t)._buff+=e;(this||t)._length+=e.length;var r,i=(this||t)._buff.length;for(r=64;r<=i;r+=64)md5cycle((this||t)._hash,md5blk((this||t)._buff.substring(r-64,r)));(this||t)._buff=(this||t)._buff.substring(r-64);return this||t};SparkMD5.prototype.end=function(e){var r,i,s=(this||t)._buff,n=s.length,a=[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0];for(r=0;r<n;r+=1)a[r>>2]|=s.charCodeAt(r)<<(r%4<<3);this._finish(a,n);i=hex((this||t)._hash);e&&(i=hexToBinaryString(i));this.reset();return i};SparkMD5.prototype.reset=function(){(this||t)._buff="";(this||t)._length=0;(this||t)._hash=[1732584193,-271733879,-1732584194,271733878];return this||t};SparkMD5.prototype.getState=function(){return{buff:(this||t)._buff,length:(this||t)._length,hash:(this||t)._hash.slice()}};SparkMD5.prototype.setState=function(e){(this||t)._buff=e.buff;(this||t)._length=e.length;(this||t)._hash=e.hash;return this||t};SparkMD5.prototype.destroy=function(){delete(this||t)._hash;delete(this||t)._buff;delete(this||t)._length};SparkMD5.prototype._finish=function(e,r){var i,s,n,a=r;e[a>>2]|=128<<(a%4<<3);if(a>55){md5cycle((this||t)._hash,e);for(a=0;a<16;a+=1)e[a]=0}i=(this||t)._length*8;i=i.toString(16).match(/(.*?)(.{0,8})$/);s=parseInt(i[2],16);n=parseInt(i[1],16)||0;e[14]=s;e[15]=n;md5cycle((this||t)._hash,e)};SparkMD5.hash=function(t,e){return SparkMD5.hashBinary(toUtf8(t),e)};SparkMD5.hashBinary=function(t,e){var r=md51(t),i=hex(r);return e?hexToBinaryString(i):i};SparkMD5.ArrayBuffer=function(){this.reset()};SparkMD5.ArrayBuffer.prototype.append=function(e){var r,i=concatenateArrayBuffers((this||t)._buff.buffer,e,true),s=i.length;(this||t)._length+=e.byteLength;for(r=64;r<=s;r+=64)md5cycle((this||t)._hash,md5blk_array(i.subarray(r-64,r)));(this||t)._buff=r-64<s?new Uint8Array(i.buffer.slice(r-64)):new Uint8Array(0);return this||t};SparkMD5.ArrayBuffer.prototype.end=function(e){var r,i,s=(this||t)._buff,n=s.length,a=[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0];for(r=0;r<n;r+=1)a[r>>2]|=s[r]<<(r%4<<3);this._finish(a,n);i=hex((this||t)._hash);e&&(i=hexToBinaryString(i));this.reset();return i};SparkMD5.ArrayBuffer.prototype.reset=function(){(this||t)._buff=new Uint8Array(0);(this||t)._length=0;(this||t)._hash=[1732584193,-271733879,-1732584194,271733878];return this||t};SparkMD5.ArrayBuffer.prototype.getState=function(){var e=SparkMD5.prototype.getState.call(this||t);e.buff=arrayBuffer2Utf8Str(e.buff);return e};SparkMD5.ArrayBuffer.prototype.setState=function(e){e.buff=utf8Str2ArrayBuffer(e.buff,true);return SparkMD5.prototype.setState.call(this||t,e)};SparkMD5.ArrayBuffer.prototype.destroy=SparkMD5.prototype.destroy;SparkMD5.ArrayBuffer.prototype._finish=SparkMD5.prototype._finish;SparkMD5.ArrayBuffer.hash=function(t,e){var r=md51_array(new Uint8Array(t)),i=hex(r);return e?hexToBinaryString(i):i};return SparkMD5}))})(e);var r=e.exports;const i=File.prototype.slice||File.prototype.mozSlice||File.prototype.webkitSlice;class FileChecksum{static create(t,e){const r=new FileChecksum(t);r.create(e)}constructor(t){this.file=t;this.chunkSize=2097152;this.chunkCount=Math.ceil(this.file.size/this.chunkSize);this.chunkIndex=0}create(t){this.callback=t;this.md5Buffer=new r.ArrayBuffer;this.fileReader=new FileReader;this.fileReader.addEventListener("load",(t=>this.fileReaderDidLoad(t)));this.fileReader.addEventListener("error",(t=>this.fileReaderDidError(t)));this.readNextChunk()}fileReaderDidLoad(t){this.md5Buffer.append(t.target.result);if(!this.readNextChunk()){const t=this.md5Buffer.end(true);const e=btoa(t);this.callback(null,e)}}fileReaderDidError(t){this.callback(`Error reading ${this.file.name}`)}readNextChunk(){if(this.chunkIndex<this.chunkCount||this.chunkIndex==0&&this.chunkCount==0){const t=this.chunkIndex*this.chunkSize;const e=Math.min(t+this.chunkSize,this.file.size);const r=i.call(this.file,t,e);this.fileReader.readAsArrayBuffer(r);this.chunkIndex++;return true}return false}}function getMetaValue(t){const e=findElement(document.head,`meta[name="${t}"]`);if(e)return e.getAttribute("content")}function findElements(t,e){if(typeof t=="string"){e=t;t=document}const r=t.querySelectorAll(e);return toArray(r)}function findElement(t,e){if(typeof t=="string"){e=t;t=document}return t.querySelector(e)}function dispatchEvent(t,e,r={}){const{disabled:i}=t;const{bubbles:s,cancelable:n,detail:a}=r;const o=document.createEvent("Event");o.initEvent(e,s||true,n||true);o.detail=a||{};try{t.disabled=false;t.dispatchEvent(o)}finally{t.disabled=i}return o}function toArray(t){return Array.isArray(t)?t:Array.from?Array.from(t):[].slice.call(t)}class BlobRecord{constructor(t,e,r,i={}){this.file=t;this.attributes={filename:t.name,content_type:t.type||"application/octet-stream",byte_size:t.size,checksum:e};this.xhr=new XMLHttpRequest;this.xhr.open("POST",r,true);this.xhr.responseType="json";this.xhr.setRequestHeader("Content-Type","application/json");this.xhr.setRequestHeader("Accept","application/json");this.xhr.setRequestHeader("X-Requested-With","XMLHttpRequest");Object.keys(i).forEach((t=>{this.xhr.setRequestHeader(t,i[t])}));const s=getMetaValue("csrf-token");s!=void 0&&this.xhr.setRequestHeader("X-CSRF-Token",s);this.xhr.addEventListener("load",(t=>this.requestDidLoad(t)));this.xhr.addEventListener("error",(t=>this.requestDidError(t)))}get status(){return this.xhr.status}get response(){const{responseType:t,response:e}=this.xhr;return t=="json"?e:JSON.parse(e)}create(t){this.callback=t;this.xhr.send(JSON.stringify({blob:this.attributes}))}requestDidLoad(t){if(this.status>=200&&this.status<300){const{response:t}=this;const{direct_upload:e}=t;delete t.direct_upload;this.attributes=t;this.directUploadData=e;this.callback(null,this.toJSON())}else this.requestDidError(t)}requestDidError(t){this.callback(`Error creating Blob for "${this.file.name}". Status: ${this.status}`)}toJSON(){const t={};for(const e in this.attributes)t[e]=this.attributes[e];return t}}class BlobUpload{constructor(t){this.blob=t;this.file=t.file;const{url:e,headers:r}=t.directUploadData;this.xhr=new XMLHttpRequest;this.xhr.open("PUT",e,true);this.xhr.responseType="text";for(const t in r)this.xhr.setRequestHeader(t,r[t]);this.xhr.addEventListener("load",(t=>this.requestDidLoad(t)));this.xhr.addEventListener("error",(t=>this.requestDidError(t)))}create(t){this.callback=t;this.xhr.send(this.file.slice())}requestDidLoad(t){const{status:e,response:r}=this.xhr;e>=200&&e<300?this.callback(null,r):this.requestDidError(t)}requestDidError(t){this.callback(`Error storing "${this.file.name}". Status: ${this.xhr.status}`)}}let s=0;class DirectUpload{constructor(t,e,r,i={}){this.id=++s;this.file=t;this.url=e;this.delegate=r;this.customHeaders=i}create(t){FileChecksum.create(this.file,((e,r)=>{if(e){t(e);return}const i=new BlobRecord(this.file,r,this.url,this.customHeaders);notify(this.delegate,"directUploadWillCreateBlobWithXHR",i.xhr);i.create((e=>{if(e)t(e);else{const e=new BlobUpload(i);notify(this.delegate,"directUploadWillStoreFileWithXHR",e.xhr);e.create((e=>{e?t(e):t(null,i.toJSON())}))}}))}))}}function notify(t,e,...r){if(t&&typeof t[e]=="function")return t[e](...r)}class DirectUploadController{constructor(t,e){this.input=t;this.file=e;this.directUpload=new DirectUpload(this.file,this.url,this);this.dispatch("initialize")}start(t){const e=document.createElement("input");e.type="hidden";e.name=this.input.name;this.input.insertAdjacentElement("beforebegin",e);this.dispatch("start");this.directUpload.create(((r,i)=>{if(r){e.parentNode.removeChild(e);this.dispatchError(r)}else e.value=i.signed_id;this.dispatch("end");t(r)}))}uploadRequestDidProgress(t){const e=t.loaded/t.total*100;e&&this.dispatch("progress",{progress:e})}get url(){return this.input.getAttribute("data-direct-upload-url")}dispatch(t,e={}){e.file=this.file;e.id=this.directUpload.id;return dispatchEvent(this.input,`direct-upload:${t}`,{detail:e})}dispatchError(t){const e=this.dispatch("error",{error:t});e.defaultPrevented||alert(t)}directUploadWillCreateBlobWithXHR(t){this.dispatch("before-blob-request",{xhr:t})}directUploadWillStoreFileWithXHR(t){this.dispatch("before-storage-request",{xhr:t});t.upload.addEventListener("progress",(t=>this.uploadRequestDidProgress(t)))}}const n="input[type=file][data-direct-upload-url]:not([disabled])";class DirectUploadsController{constructor(t){this.form=t;this.inputs=findElements(t,n).filter((t=>t.files.length))}start(t){const e=this.createDirectUploadControllers();const startNextController=()=>{const r=e.shift();if(r)r.start((e=>{if(e){t(e);this.dispatch("end")}else startNextController()}));else{t();this.dispatch("end")}};this.dispatch("start");startNextController()}createDirectUploadControllers(){const t=[];this.inputs.forEach((e=>{toArray(e.files).forEach((r=>{const i=new DirectUploadController(e,r);t.push(i)}))}));return t}dispatch(t,e={}){return dispatchEvent(this.form,`direct-uploads:${t}`,{detail:e})}}const a="data-direct-uploads-processing";const o=new WeakMap;let h=false;function start(){if(!h){h=true;document.addEventListener("click",didClick,true);document.addEventListener("submit",didSubmitForm,true);document.addEventListener("ajax:before",didSubmitRemoteElement)}}function didClick(t){const e=t.target.closest("button, input");e&&e.type==="submit"&&e.form&&o.set(e.form,e)}function didSubmitForm(t){handleFormSubmissionEvent(t)}function didSubmitRemoteElement(t){t.target.tagName=="FORM"&&handleFormSubmissionEvent(t)}function handleFormSubmissionEvent(t){const e=t.target;if(e.hasAttribute(a)){t.preventDefault();return}const r=new DirectUploadsController(e);const{inputs:i}=r;if(i.length){t.preventDefault();e.setAttribute(a,"");i.forEach(disable);r.start((t=>{e.removeAttribute(a);t?i.forEach(enable):submitForm(e)}))}}function submitForm(t){let e=o.get(t)||findElement(t,"input[type=submit], button[type=submit]");if(e){const{disabled:t}=e;e.disabled=false;e.focus();e.click();e.disabled=t}else{e=document.createElement("input");e.type="submit";e.style.display="none";t.appendChild(e);e.click();t.removeChild(e)}o.delete(t)}function disable(t){t.disabled=true}function enable(t){t.disabled=false}function autostart(){window.ActiveStorage&&start()}setTimeout(autostart,1);class AttachmentUpload{constructor(t,e){this.attachment=t;this.element=e;this.directUpload=new DirectUpload(t.file,this.directUploadUrl,this)}start(){this.directUpload.create(this.directUploadDidComplete.bind(this))}directUploadWillStoreFileWithXHR(t){t.upload.addEventListener("progress",(t=>{const e=t.loaded/t.total*100;this.attachment.setUploadProgress(e)}))}directUploadDidComplete(t,e){if(t)throw new Error(`Direct upload failed: ${t}`);this.attachment.setAttributes({sgid:e.attachable_sgid,url:this.createBlobUrl(e.signed_id,e.filename)})}createBlobUrl(t,e){return this.blobUrlTemplate.replace(":signed_id",t).replace(":filename",encodeURIComponent(e))}get directUploadUrl(){return this.element.dataset.directUploadUrl}get blobUrlTemplate(){return this.element.dataset.blobUrlTemplate}}addEventListener("trix-attachment-add",(t=>{const{attachment:e,target:r}=t;if(e.file){const t=new AttachmentUpload(e,r);t.start()}}));var l={};export{l as default};diff --git a/core/app/models/concerns/spree/metadata.rb b/core/app/models/concerns/spree/metadata.rbindex 6f43e0283a..15b9698ad4 100644--- a/core/app/models/concerns/spree/metadata.rb+++ b/core/app/models/concerns/spree/metadata.rb@@ -5,13 +5,9 @@ module Spreeincluded doattribute :public_metadata, default: {}attribute :private_metadata, default: {}- if Rails::VERSION::STRING >= '7.1.0'- serialize :public_metadata, coder: HashSerializer- serialize :private_metadata, coder: HashSerializer- else- serialize :public_metadata, HashSerializer- serialize :private_metadata, HashSerializer- end++ serialize :public_metadata, coder: HashSerializer+ serialize :private_metadata, coder: HashSerializerend# https://nandovieira.com/using-postgresql-and-jsonb-with-ruby-on-railsdiff --git a/core/app/models/spree/address.rb b/core/app/models/spree/address.rbindex cc4651cf12..a15968468c 100644--- a/core/app/models/spree/address.rb+++ b/core/app/models/spree/address.rb@@ -78,8 +78,6 @@ module Spreedelegate :name, :iso3, :iso, :iso_name, to: :country, prefix: truedelegate :abbr, to: :state, prefix: true, allow_nil: true- alias_attribute :first_name, :firstname- alias_attribute :last_name, :lastnamealias_attribute :postal_code, :zipcodeself.whitelisted_ransackable_attributes = ADDRESS_FIELDS@@ -99,6 +97,22 @@ module Spreeuser.present? && id == user.ship_address_idend+ def first_name+ firstname+ end++ def first_name=(value)+ self.firstname = value+ end++ def last_name+ lastname+ end++ def last_name=(value)+ self.lastname = value+ end+def full_name"#{firstname} #{lastname}".stripenddiff --git a/core/app/models/spree/coupon_code.rb b/core/app/models/spree/coupon_code.rbindex 606db7ccae..25e70ceb69 100644--- a/core/app/models/spree/coupon_code.rb+++ b/core/app/models/spree/coupon_code.rb@@ -2,7 +2,7 @@ module Spreeclass CouponCode < Spree.base_classinclude Spree::Security::CouponCodes if defined?(Spree::Security::CouponCodes)- enum state: %i(unused used)+ enum :state, %i(unused used)acts_as_paranoiddiff --git a/core/app/models/spree/export.rb b/core/app/models/spree/export.rbindex b76f9fe7c6..7340286f15 100644--- a/core/app/models/spree/export.rb+++ b/core/app/models/spree/export.rb@@ -26,11 +26,7 @@ module Spree## Enums#- if Rails.version >= '7.0'- enum :format, SUPPORTED_FILE_FORMATS.each_with_index.to_h- else- enum format: SUPPORTED_FILE_FORMATS.each_with_index.to_h- end+ enum :format, SUPPORTED_FILE_FORMATS.each_with_index.to_h## Ransack configurationdiff --git a/core/app/models/spree/promotion.rb b/core/app/models/spree/promotion.rbindex bdc090b0fc..29d0f96e2c 100644--- a/core/app/models/spree/promotion.rb+++ b/core/app/models/spree/promotion.rb@@ -22,11 +22,7 @@ module Spree## Enums#- if Rails.version >= '7.0'- enum :kind, { coupon_code: 0, automatic: 1 }- else- enum kind: { coupon_code: 0, automatic: 1 }- end+ enum :kind, { coupon_code: 0, automatic: 1 }## Associationsdiff --git a/core/app/models/spree/property.rb b/core/app/models/spree/property.rbindex 47efa317f0..766cf39cf7 100644--- a/core/app/models/spree/property.rb+++ b/core/app/models/spree/property.rb@@ -37,11 +37,7 @@ module Spreescope :filterable, -> { where(filterable: true) }KIND_OPTIONS = { short_text: 0, long_text: 1, number: 2, rich_text: 3 }.freeze- if Rails.version >= '7.0'- enum :kind, KIND_OPTIONS- else- enum kind: KIND_OPTIONS- end+ enum :kind, KIND_OPTIONSafter_touch :touch_all_productsafter_update :touch_all_products, if: -> { saved_changes.key?(:presentation) }diff --git a/core/config/initializers/active_storage.rb b/core/config/initializers/active_storage.rbindex a66165c0ba..892e53f8aa 100644--- a/core/config/initializers/active_storage.rb+++ b/core/config/initializers/active_storage.rb@@ -1,4 +1 @@Rails.application.config.active_storage.content_types_to_serve_as_binary.delete('image/svg+xml')--# https://guides.rubyonrails.org/configuring.html#config-active-storage-web-image-content-types-Rails.application.config.active_storage.web_image_content_types << 'image/webp'diff --git a/core/spree_core.gemspec b/core/spree_core.gemspecindex 6011647e41..78ee54734b 100644--- a/core/spree_core.gemspec+++ b/core/spree_core.gemspec@@ -26,7 +26,7 @@ Gem::Specification.new do |s|s.files = Dir["{app,config,db,lib}/**/*", "LICENSE.md", "Rakefile"].reject { |f| f.match(/^spec/) && !f.match(/^spec\/fixtures/) }s.require_path = 'lib'- s.add_dependency 'rails', '>= 7.1', '< 8.0'+ s.add_dependency 'rails', '>= 7.2', '< 8.0's.add_dependency 'activemerchant', '~> 1.67's.add_dependency 'acts_as_list', '>= 0.8'