Steve-Dee-Designs
/
woocommerce
mirror of https://github.com/woocommerce/woocommerce.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Prevent Mini Cart loading the same script twice (https://github.com/woocommerce/woocommerce-blocks/pull/7794)

This commit is contained in:
Albert Juhé Lluveras 2022-12-01 11:54:28 +01:00 committed by GitHub
parent 796e952b92
commit 9f3d61e1ea
2 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
plugins/woocommerce-blocks/assets/js/base/utils/lazy-load-script.ts
View File

@ -26,8 +26,16 @@ interface AppendScriptAttributesParam {
* This function checks whether an element matching that selector exists. * This function checks whether an element matching that selector exists.
* Useful to know if a script has already been appended to the page. * Useful to know if a script has already been appended to the page.
*/ */
const isScriptTagInDOM = ( scriptId: string ): boolean => { const isScriptTagInDOM = ( scriptId: string, src = '' ): boolean => {
const scriptElements = document.querySelectorAll( `script#${ scriptId }` ); const srcParts = src.split( '?' );
if ( srcParts?.length > 1 ) {
src = srcParts[ 0 ];
}
const selector = src
? `script#${ scriptId }, script[src*="${ src }"]`
: `script#${ scriptId }`;
const scriptElements = document.querySelectorAll( selector );
return scriptElements.length > 0; return scriptElements.length > 0;
}; };
@ -37,7 +45,10 @@ const isScriptTagInDOM = ( scriptId: string ): boolean => {
*/ */
const appendScript = ( attributes: AppendScriptAttributesParam ): void => { const appendScript = ( attributes: AppendScriptAttributesParam ): void => {
// Abort if id is not valid or a script with the same id exists. // Abort if id is not valid or a script with the same id exists.
if ( ! isString( attributes.id ) || isScriptTagInDOM( attributes.id ) ) { if (
! isString( attributes.id ) ||
isScriptTagInDOM( attributes.id, attributes?.src )
) {
return; return;
} }
const scriptElement = document.createElement( 'script' ); const scriptElement = document.createElement( 'script' );
@ -92,7 +103,7 @@ const lazyLoadScript = ( {
translations, translations,
}: LazyLoadScriptParams ): Promise< void > => { }: LazyLoadScriptParams ): Promise< void > => {
return new Promise( ( resolve, reject ) => { return new Promise( ( resolve, reject ) => {
if ( isScriptTagInDOM( `${ handle }-js` ) ) { if ( isScriptTagInDOM( `${ handle }-js`, src ) ) {
resolve(); resolve();
} }

9
plugins/woocommerce-blocks/assets/js/base/utils/preload-script.ts
View File

@ -13,9 +13,12 @@ const preloadScript = ( {
src, src,
version, version,
}: PreloadScriptParams ): void => { }: PreloadScriptParams ): void => {
const handleScriptElements = document.querySelectorAll( const srcParts = src.split( '?' );
`#${ handle }-js, #${ handle }-js-prefetch` if ( srcParts?.length > 1 ) {
); src = srcParts[ 0 ];
}
const selector = `#${ handle }-js, #${ handle }-js-prefetch, script[src*="${ src }"]`;
const handleScriptElements = document.querySelectorAll( selector );
if ( handleScriptElements.length === 0 ) { if ( handleScriptElements.length === 0 ) {
const prefetchLink = document.createElement( 'link' ); const prefetchLink = document.createElement( 'link' );