@rsbuild/plugin-assets-retry 1.4.1 → 1.4.2

package/dist/index.cjs

@@ -295,7 +295,7 @@ var __webpack_exports__ = {};
                 const { inlineScript = true } = userOptions;
                 const getScriptPath = (environment)=>{
                     const distDir = environment.config.output.distPath.js;
-                    return external_node_path_default().posix.join(distDir, "assets-retry.1-4-1.js");
+                    return external_node_path_default().posix.join(distDir, "assets-retry.1-4-2.js");
                 };
                 const getDefaultValueFromRsbuildConfig = (config)=>{
                     var _config_output_minify;

package/dist/index.js

@@ -270,7 +270,7 @@ const pluginAssetsRetry = (userOptions = {})=>({
             const { inlineScript = true } = userOptions;
             const getScriptPath = (environment)=>{
                 const distDir = environment.config.output.distPath.js;
-                return node_path.posix.join(distDir, "assets-retry.1-4-1.js");
+                return node_path.posix.join(distDir, "assets-retry.1-4-2.js");
             };
             const getDefaultValueFromRsbuildConfig = (config)=>{
                 var _config_output_minify;

package/dist/runtime/initialChunkRetry.js

@@ -94,11 +94,6 @@
     }
     function createElement(origin, attributes) {
         var crossOrigin = true === attributes.crossOrigin ? 'anonymous' : attributes.crossOrigin;
-        var crossOriginAttr = crossOrigin ? 'crossorigin="'.concat(crossOrigin, '"') : '';
-        var retryTimesAttr = attributes.times ? 'data-rb-retry-times="'.concat(attributes.times, '"') : '';
-        var originalQueryAttr = attributes.originalQuery ? 'data-rb-original-query="'.concat(attributes.originalQuery, '"') : '';
-        var ruleIndexAttr = attributes.ruleIndex >= 0 ? 'data-rb-rule-i="'.concat(attributes.ruleIndex, '"') : '';
-        var isAsyncAttr = attributes.isAsync ? 'data-rb-async' : '';
         if (initialChunkRetry_instanceof(origin, HTMLScriptElement)) {
             var script = document.createElement("script");
             script.src = attributes.url;
@@ -107,10 +102,7 @@
             if (attributes.isAsync) script.dataset.rbAsync = '';
             if (void 0 !== attributes.originalQuery) script.dataset.rbOriginalQuery = attributes.originalQuery;
             if (attributes.ruleIndex >= 0) script.dataset.rbRuleI = String(attributes.ruleIndex);
-            return {
-                element: script,
-                str: '<script src="'.concat(attributes.url, '" ').concat(crossOriginAttr, " ").concat(retryTimesAttr, " ").concat(isAsyncAttr, " ").concat(ruleIndexAttr, " ").concat(originalQueryAttr, ">") + "<\/script>"
-            };
+            return script;
         }
         if (initialChunkRetry_instanceof(origin, HTMLLinkElement)) {
             var link = document.createElement('link');
@@ -120,16 +112,13 @@
             if (crossOrigin) link.crossOrigin = crossOrigin;
             if (attributes.times) link.dataset.rbRetryTimes = String(attributes.times);
             if (void 0 !== attributes.originalQuery) link.dataset.rbOriginalQuery = attributes.originalQuery;
-            return {
-                element: link,
-                str: '<link rel="'.concat(link.rel, '" href="').concat(attributes.url, '" ').concat(crossOriginAttr, " ").concat(retryTimesAttr, " ").concat(link.as ? 'as="'.concat(link.as, '"') : '', " ").concat(ruleIndexAttr, " ").concat(originalQueryAttr, "></link>")
-            };
+            return link;
         }
     }
-    function reloadElementResource(origin, fresh, attributes) {
-        if (initialChunkRetry_instanceof(origin, HTMLScriptElement)) if (attributes.isAsync) document.body.appendChild(fresh.element);
+    function reloadElementResource(origin, freshElement, attributes) {
+        if (initialChunkRetry_instanceof(origin, HTMLScriptElement)) if (attributes.isAsync) document.body.appendChild(freshElement);
         else console.warn(ERROR_PREFIX, "load sync script failed, for security only async/defer script can be retried", origin);
-        if (initialChunkRetry_instanceof(origin, HTMLLinkElement)) document.getElementsByTagName('head')[0].appendChild(fresh.element);
+        if (initialChunkRetry_instanceof(origin, HTMLLinkElement)) document.getElementsByTagName('head')[0].appendChild(freshElement);
         if (initialChunkRetry_instanceof(origin, HTMLImageElement)) {
             origin.src = attributes.url;
             origin.dataset.rbRetryTimes = String(attributes.times);

package/dist/runtime/initialChunkRetry.min.js

@@ -1 +1 @@
-!function(){"use strict";function e(e,r){for(var n=r.domain,t=0;t<n.length;t++){var a=n[t];if(-1!==e.indexOf(a))return a}return window.origin}var r=/[?#].*$/;function n(e,r){return null!=r&&"undefined"!=typeof Symbol&&r[Symbol.hasInstance]?!!r[Symbol.hasInstance](e):e instanceof r}var t={link:HTMLLinkElement,script:HTMLScriptElement,img:HTMLImageElement};function a(r,a){var i=a.target,o=i.tagName.toLocaleLowerCase(),c=n(i,HTMLScriptElement)||n(i,HTMLImageElement)?i.src:n(i,HTMLLinkElement)?i.href:null;if(!c)return!1;var s=Number(i.dataset.rbRuleI||"-1"),l=r[s]||function(r,n,t){for(var a=0;a<t.length;a++){var i,o=t[a],c=o.test,s=!0;if((null!=(i=RegExp)&&"undefined"!=typeof Symbol&&i[Symbol.hasInstance]?!!i[Symbol.hasInstance](c):c instanceof i)?s=c.test(r):"string"==typeof c?s=new RegExp(c).test(r):"function"==typeof c&&(s=c(r)),o.domain&&o.domain.length>0){var l=e(r,o);o.domain.includes(l)||(s=!1)}if(o.type&&o.type.length>0&&!o.type.includes(n)&&(s=!1),s)return o}return null}(c,o,r);if(!l)return!1;s=r.indexOf(l);var u=l.type;return!!o&&-1!==u.indexOf(o)&&!!t[o]&&!!n(i,t[o])&&{target:i,tagName:o,url:c,rule:l,ruleIndex:s}}function i(e,r,t){n(e,HTMLScriptElement)&&(t.isAsync?document.body.appendChild(r.element):console.warn("[@rsbuild/plugin-assets-retry] ","load sync script failed, for security only async/defer script can be retried",e)),n(e,HTMLLinkElement)&&document.getElementsByTagName("head")[0].appendChild(r.element),n(e,HTMLImageElement)&&(e.src=t.url,e.dataset.rbRetryTimes=t.times+"",e.dataset.rbOriginalQuery=t.originalQuery+"")}"undefined"==typeof window||window.__RB_ASYNC_CHUNKS__||(window.__RB_ASYNC_CHUNKS__={});try{var o=__RETRY_OPTIONS__;"undefined"!=typeof window&&void 0!==window.document&&(document.addEventListener("error",function(t){if(t&&n(t.target,Element))try{!function(t,o){var c,s=a(t,o);if(!1!==s){var l=s.target,u=s.tagName,d=s.url,m=s.rule,y=s.ruleIndex;if(!("undefined"!=typeof window&&Object.keys(window.__RB_ASYNC_CHUNKS__||{}).some(function(e){return -1!==d.indexOf(e)}))){var f,g,p,b,v,_=e(d,m),h=Number(l.dataset.rbRetryTimes)||0;if(h===m.max){"function"==typeof m.onFail&&m.onFail({times:h,domain:_,url:d,tagName:u,isAsyncChunk:!1});return}var E=(g=m.domain,p=e(_,m),-1===(b=g.indexOf(p))?p:g[(b+1)%g.length]),T=null!=(c=l.dataset.rbOriginalQuery)?c:(v=d.split("?")[1])?"?".concat(v.split("#")[0]):"",w=!!l.dataset.rbAsync||l.async||l.defer,L={url:d.replace(_,E).replace(r,"")+(f=h+1,!0===m.addQuery?""!==T?"".concat(T,"&retry=").concat(f):"?retry=".concat(f):"function"==typeof m.addQuery?m.addQuery({times:f,originalQuery:T}):""),times:h+1,originalQuery:T,ruleIndex:y,crossOrigin:m.crossOrigin,isAsync:w},S=function(e,r){var t=!0===r.crossOrigin?"anonymous":r.crossOrigin,a=t?'crossorigin="'.concat(t,'"'):"",i=r.times?'data-rb-retry-times="'.concat(r.times,'"'):"",o=r.originalQuery?'data-rb-original-query="'.concat(r.originalQuery,'"'):"",c=r.ruleIndex>=0?'data-rb-rule-i="'.concat(r.ruleIndex,'"'):"",s=r.isAsync?"data-rb-async":"";if(n(e,HTMLScriptElement)){var l=document.createElement("script");return l.src=r.url,t&&(l.crossOrigin=t),r.times&&(l.dataset.rbRetryTimes=r.times+""),r.isAsync&&(l.dataset.rbAsync=""),void 0!==r.originalQuery&&(l.dataset.rbOriginalQuery=r.originalQuery),r.ruleIndex>=0&&(l.dataset.rbRuleI=r.ruleIndex+""),{element:l,str:'<script src="'.concat(r.url,'" ').concat(a," ").concat(i," ").concat(s," ").concat(c," ").concat(o,">")+"<\/script>"}}if(n(e,HTMLLinkElement)){var u=document.createElement("link");return u.rel=e.rel||"stylesheet",e.as&&(u.as=e.as),u.href=r.url,t&&(u.crossOrigin=t),r.times&&(u.dataset.rbRetryTimes=r.times+""),void 0!==r.originalQuery&&(u.dataset.rbOriginalQuery=r.originalQuery),{element:u,str:'<link rel="'.concat(u.rel,'" href="').concat(r.url,'" ').concat(a," ").concat(i," ").concat(u.as?'as="'.concat(u.as,'"'):""," ").concat(c," ").concat(o,"></link>")}}}(l,L),N={times:h,domain:_,url:d,tagName:u,isAsyncChunk:!1};"function"==typeof m.onRetry&&m.onRetry(N);var O="function"==typeof m.delay?m.delay(N):m.delay;O>0?setTimeout(function(){i(l,S,L)},O):i(l,S,L)}}}(o,t)}catch(e){console.error("retry error captured",e)}},!0),document.addEventListener("load",function(r){if(r&&n(r.target,Element))try{!function(r,n){var t=a(r,n);if(!1!==t){var i=t.target,o=t.tagName,c=t.url,s=t.rule,l=e(c,s),u=Number(i.dataset.rbRetryTimes)||0;0!==u&&"function"==typeof s.onSuccess&&s.onSuccess({times:u,domain:l,url:c,tagName:o,isAsyncChunk:!1})}}(o,r)}catch(e){console.error("load error captured",e)}},!0))}catch(e){console.error("monitor error captured",e)}}();
+!function(){"use strict";function e(e,r){for(var n=r.domain,t=0;t<n.length;t++){var i=n[t];if(-1!==e.indexOf(i))return i}return window.origin}var r=/[?#].*$/;function n(e,r){return null!=r&&"undefined"!=typeof Symbol&&r[Symbol.hasInstance]?!!r[Symbol.hasInstance](e):e instanceof r}var t={link:HTMLLinkElement,script:HTMLScriptElement,img:HTMLImageElement};function i(r,i){var a=i.target,o=a.tagName.toLocaleLowerCase(),s=n(a,HTMLScriptElement)||n(a,HTMLImageElement)?a.src:n(a,HTMLLinkElement)?a.href:null;if(!s)return!1;var u=Number(a.dataset.rbRuleI||"-1"),l=r[u]||function(r,n,t){for(var i=0;i<t.length;i++){var a,o=t[i],s=o.test,u=!0;if((null!=(a=RegExp)&&"undefined"!=typeof Symbol&&a[Symbol.hasInstance]?!!a[Symbol.hasInstance](s):s instanceof a)?u=s.test(r):"string"==typeof s?u=new RegExp(s).test(r):"function"==typeof s&&(u=s(r)),o.domain&&o.domain.length>0){var l=e(r,o);o.domain.includes(l)||(u=!1)}if(o.type&&o.type.length>0&&!o.type.includes(n)&&(u=!1),u)return o}return null}(s,o,r);if(!l)return!1;u=r.indexOf(l);var c=l.type;return!!o&&-1!==c.indexOf(o)&&!!t[o]&&!!n(a,t[o])&&{target:a,tagName:o,url:s,rule:l,ruleIndex:u}}function a(e,r,t){n(e,HTMLScriptElement)&&(t.isAsync?document.body.appendChild(r):console.warn("[@rsbuild/plugin-assets-retry] ","load sync script failed, for security only async/defer script can be retried",e)),n(e,HTMLLinkElement)&&document.getElementsByTagName("head")[0].appendChild(r),n(e,HTMLImageElement)&&(e.src=t.url,e.dataset.rbRetryTimes=t.times+"",e.dataset.rbOriginalQuery=t.originalQuery+"")}"undefined"==typeof window||window.__RB_ASYNC_CHUNKS__||(window.__RB_ASYNC_CHUNKS__={});try{var o=__RETRY_OPTIONS__;"undefined"!=typeof window&&void 0!==window.document&&(document.addEventListener("error",function(t){if(t&&n(t.target,Element))try{!function(t,o){var s,u=i(t,o);if(!1!==u){var l=u.target,c=u.tagName,d=u.url,m=u.rule,y=u.ruleIndex;if(!("undefined"!=typeof window&&Object.keys(window.__RB_ASYNC_CHUNKS__||{}).some(function(e){return -1!==d.indexOf(e)}))){var f,g,p,b,v,_=e(d,m),h=Number(l.dataset.rbRetryTimes)||0;if(h===m.max){"function"==typeof m.onFail&&m.onFail({times:h,domain:_,url:d,tagName:c,isAsyncChunk:!1});return}var E=(g=m.domain,p=e(_,m),-1===(b=g.indexOf(p))?p:g[(b+1)%g.length]),T=null!=(s=l.dataset.rbOriginalQuery)?s:(v=d.split("?")[1])?"?".concat(v.split("#")[0]):"",w=!!l.dataset.rbAsync||l.async||l.defer,L={url:d.replace(_,E).replace(r,"")+(f=h+1,!0===m.addQuery?""!==T?"".concat(T,"&retry=").concat(f):"?retry=".concat(f):"function"==typeof m.addQuery?m.addQuery({times:f,originalQuery:T}):""),times:h+1,originalQuery:T,ruleIndex:y,crossOrigin:m.crossOrigin,isAsync:w},S=function(e,r){var t=!0===r.crossOrigin?"anonymous":r.crossOrigin;if(n(e,HTMLScriptElement)){var i=document.createElement("script");return i.src=r.url,t&&(i.crossOrigin=t),r.times&&(i.dataset.rbRetryTimes=r.times+""),r.isAsync&&(i.dataset.rbAsync=""),void 0!==r.originalQuery&&(i.dataset.rbOriginalQuery=r.originalQuery),r.ruleIndex>=0&&(i.dataset.rbRuleI=r.ruleIndex+""),i}if(n(e,HTMLLinkElement)){var a=document.createElement("link");return a.rel=e.rel||"stylesheet",e.as&&(a.as=e.as),a.href=r.url,t&&(a.crossOrigin=t),r.times&&(a.dataset.rbRetryTimes=r.times+""),void 0!==r.originalQuery&&(a.dataset.rbOriginalQuery=r.originalQuery),a}}(l,L),N={times:h,domain:_,url:d,tagName:c,isAsyncChunk:!1};"function"==typeof m.onRetry&&m.onRetry(N);var O="function"==typeof m.delay?m.delay(N):m.delay;O>0?setTimeout(function(){a(l,S,L)},O):a(l,S,L)}}}(o,t)}catch(e){console.error("retry error captured",e)}},!0),document.addEventListener("load",function(r){if(r&&n(r.target,Element))try{!function(r,n){var t=i(r,n);if(!1!==t){var a=t.target,o=t.tagName,s=t.url,u=t.rule,l=e(s,u),c=Number(a.dataset.rbRetryTimes)||0;0!==c&&"function"==typeof u.onSuccess&&u.onSuccess({times:c,domain:l,url:s,tagName:o,isAsyncChunk:!1})}}(o,r)}catch(e){console.error("load error captured",e)}},!0))}catch(e){console.error("monitor error captured",e)}}();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rsbuild/plugin-assets-retry",
-  "version": "1.4.1",
+  "version": "1.4.2",
   "repository": "https://github.com/rspack-contrib/rsbuild-plugin-assets-retry",
   "license": "MIT",
   "type": "module",
@@ -31,7 +31,7 @@
     "@microsoft/api-extractor": "^7.52.10",
     "@biomejs/biome": "^1.9.4",
     "@playwright/test": "^1.54.1",
-    "@rsbuild/core": "^1.4.12",
+    "@rsbuild/core": "^1.5.0-beta.1",
     "@rsbuild/plugin-react": "^1.3.4",
     "@rslib/core": "^0.11.0",
     "@swc/core": "^1.13.3",