@rsbuild/plugin-assets-retry 0.7.7 → 0.7.9

package/dist/index.cjs

@@ -58,11 +58,12 @@ var AssetsRetryPlugin_exports = {};
 __export(AssetsRetryPlugin_exports, {
   AssetsRetryPlugin: () => AssetsRetryPlugin
 });
-var import_node_path, import_shared, _retryOptions, AssetsRetryPlugin;
+var import_node_path, import_core, import_shared, _retryOptions, AssetsRetryPlugin;
 var init_AssetsRetryPlugin = __esm({
   "src/AssetsRetryPlugin.ts"() {
     "use strict";
     import_node_path = __toESM(require("path"));
+    import_core = require("@rsbuild/core");
     import_shared = require("@rsbuild/shared");
     AssetsRetryPlugin = class {
       constructor(options) {
@@ -105,7 +106,7 @@ var init_AssetsRetryPlugin = __esm({
         if (!this.scriptPath) {
           this.scriptPath = import_node_path.default.posix.join(
             this.distDir,
-            `assets-retry.${"0.7.7"}.js`
+            `assets-retry.${"0.7.9"}.js`
           );
         }
         return this.scriptPath;
@@ -136,7 +137,14 @@ var init_AssetsRetryPlugin = __esm({
           this.HtmlPlugin.getHooks(compilation).alterAssetTagGroups.tapPromise(
             this.name,
             async (data) => {
-              const scriptTag = (0, import_shared.generateScriptTag)();
+              const scriptTag = {
+                tagName: "script",
+                attributes: {
+                  type: "text/javascript"
+                },
+                voidTag: false,
+                meta: {}
+              };
               if (this.inlineScript) {
                 data.headTags.unshift({
                   ...scriptTag,
@@ -144,7 +152,10 @@ var init_AssetsRetryPlugin = __esm({
                 });
               } else {
                 const publicPath = (0, import_shared.getPublicPathFromCompiler)(compiler);
-                const url = (0, import_shared.withPublicPath)(await this.getScriptPath(), publicPath);
+                const url = (0, import_core.ensureAssetPrefix)(
+                  await this.getScriptPath(),
+                  publicPath
+                );
                 data.headTags.unshift({
                   ...scriptTag,
                   attributes: {
@@ -188,12 +199,23 @@ ${appendSource}`, "utf-8");
     throw err;
   }
 }
-var import_node_path2, import_core, import_shared2, import_serialize_javascript, AsyncChunkRetryPlugin;
+function pick(obj, keys) {
+  return keys.reduce(
+    (ret, key) => {
+      if (obj[key] !== void 0) {
+        ret[key] = obj[key];
+      }
+      return ret;
+    },
+    {}
+  );
+}
+var import_node_path2, import_core2, import_shared2, import_serialize_javascript, AsyncChunkRetryPlugin;
 var init_AsyncChunkRetryPlugin = __esm({
   "src/AsyncChunkRetryPlugin.ts"() {
     "use strict";
     import_node_path2 = __toESM(require("path"));
-    import_core = require("@rsbuild/core");
+    import_core2 = require("@rsbuild/core");
     import_shared2 = require("@rsbuild/shared");
     import_serialize_javascript = __toESM(require("serialize-javascript"));
     AsyncChunkRetryPlugin = class {
@@ -202,7 +224,7 @@ var init_AsyncChunkRetryPlugin = __esm({
         __publicField(this, "options");
         __publicField(this, "runtimeOptions");
         this.options = options;
-        this.runtimeOptions = (0, import_shared2.pick)(options, [
+        this.runtimeOptions = pick(options, [
           "domain",
           "max",
           "onRetry",
@@ -213,7 +235,7 @@ var init_AsyncChunkRetryPlugin = __esm({
         ]);
       }
       getRawRuntimeRetryCode() {
-        const { RuntimeGlobals } = import_core.rspack;
+        const { RuntimeGlobals } = import_core2.rspack;
         const filename = "asyncChunkRetry";
         const runtimeFilePath = import_node_path2.default.join(
           __dirname,
@@ -271,7 +293,7 @@ var pluginAssetsRetry = (options = {}) => ({
         }
         const { AssetsRetryPlugin: AssetsRetryPlugin2 } = await Promise.resolve().then(() => (init_AssetsRetryPlugin(), AssetsRetryPlugin_exports));
         const { AsyncChunkRetryPlugin: AsyncChunkRetryPlugin2 } = await Promise.resolve().then(() => (init_AsyncChunkRetryPlugin(), AsyncChunkRetryPlugin_exports));
-        const distDir = (0, import_shared3.getDistPath)(config, "js");
+        const distDir = config.output.distPath.js;
         if (options.crossOrigin === void 0) {
           options.crossOrigin = config.html.crossorigin;
         }

package/dist/index.js

@@ -34,12 +34,12 @@ var __privateSet = (obj, member, value, setter) => {
   return value;
 };
 
-// ../../node_modules/.pnpm/@modern-js+module-tools@2.52.0_eslint@9.4.0_typescript@5.4.5/node_modules/@modern-js/module-tools/shims/esm.js
+// ../../node_modules/.pnpm/@modern-js+module-tools@2.52.0_eslint@9.5.0_typescript@5.4.5/node_modules/@modern-js/module-tools/shims/esm.js
 import { fileURLToPath } from "url";
 import path from "path";
 var getFilename, getDirname, __dirname;
 var init_esm = __esm({
-  "../../node_modules/.pnpm/@modern-js+module-tools@2.52.0_eslint@9.4.0_typescript@5.4.5/node_modules/@modern-js/module-tools/shims/esm.js"() {
+  "../../node_modules/.pnpm/@modern-js+module-tools@2.52.0_eslint@9.5.0_typescript@5.4.5/node_modules/@modern-js/module-tools/shims/esm.js"() {
     "use strict";
     getFilename = () => fileURLToPath(import.meta.url);
     getDirname = () => path.dirname(getFilename());
@@ -53,12 +53,8 @@ __export(AssetsRetryPlugin_exports, {
   AssetsRetryPlugin: () => AssetsRetryPlugin
 });
 import path2 from "path";
-import {
-  fse,
-  generateScriptTag,
-  getPublicPathFromCompiler,
-  withPublicPath
-} from "@rsbuild/shared";
+import { ensureAssetPrefix } from "@rsbuild/core";
+import { fse, getPublicPathFromCompiler } from "@rsbuild/shared";
 var _retryOptions, AssetsRetryPlugin;
 var init_AssetsRetryPlugin = __esm({
   "src/AssetsRetryPlugin.ts"() {
@@ -105,7 +101,7 @@ var init_AssetsRetryPlugin = __esm({
         if (!this.scriptPath) {
           this.scriptPath = path2.posix.join(
             this.distDir,
-            `assets-retry.${"0.7.7"}.js`
+            `assets-retry.${"0.7.9"}.js`
           );
         }
         return this.scriptPath;
@@ -136,7 +132,14 @@ var init_AssetsRetryPlugin = __esm({
           this.HtmlPlugin.getHooks(compilation).alterAssetTagGroups.tapPromise(
             this.name,
             async (data) => {
-              const scriptTag = generateScriptTag();
+              const scriptTag = {
+                tagName: "script",
+                attributes: {
+                  type: "text/javascript"
+                },
+                voidTag: false,
+                meta: {}
+              };
               if (this.inlineScript) {
                 data.headTags.unshift({
                   ...scriptTag,
@@ -144,7 +147,10 @@ var init_AssetsRetryPlugin = __esm({
                 });
               } else {
                 const publicPath = getPublicPathFromCompiler(compiler);
-                const url = withPublicPath(await this.getScriptPath(), publicPath);
+                const url = ensureAssetPrefix(
+                  await this.getScriptPath(),
+                  publicPath
+                );
                 data.headTags.unshift({
                   ...scriptTag,
                   attributes: {
@@ -170,7 +176,7 @@ __export(AsyncChunkRetryPlugin_exports, {
 });
 import path3 from "path";
 import { rspack } from "@rsbuild/core";
-import { fse as fse2, pick } from "@rsbuild/shared";
+import { fse as fse2 } from "@rsbuild/shared";
 import serialize from "serialize-javascript";
 function appendWebpackScript(module, appendSource) {
   try {
@@ -192,6 +198,17 @@ ${appendSource}`, "utf-8");
     throw err;
   }
 }
+function pick(obj, keys) {
+  return keys.reduce(
+    (ret, key) => {
+      if (obj[key] !== void 0) {
+        ret[key] = obj[key];
+      }
+      return ret;
+    },
+    {}
+  );
+}
 var AsyncChunkRetryPlugin;
 var init_AsyncChunkRetryPlugin = __esm({
   "src/AsyncChunkRetryPlugin.ts"() {
@@ -254,7 +271,7 @@ var init_AsyncChunkRetryPlugin = __esm({
 
 // src/index.ts
 init_esm();
-import { getDistPath, isHtmlDisabled } from "@rsbuild/shared";
+import { isHtmlDisabled } from "@rsbuild/shared";
 var PLUGIN_ASSETS_RETRY_NAME = "rsbuild:assets-retry";
 var pluginAssetsRetry = (options = {}) => ({
   name: PLUGIN_ASSETS_RETRY_NAME,
@@ -267,7 +284,7 @@ var pluginAssetsRetry = (options = {}) => ({
         }
         const { AssetsRetryPlugin: AssetsRetryPlugin2 } = await Promise.resolve().then(() => (init_AssetsRetryPlugin(), AssetsRetryPlugin_exports));
         const { AsyncChunkRetryPlugin: AsyncChunkRetryPlugin2 } = await Promise.resolve().then(() => (init_AsyncChunkRetryPlugin(), AsyncChunkRetryPlugin_exports));
-        const distDir = getDistPath(config, "js");
+        const distDir = config.output.distPath.js;
         if (options.crossOrigin === void 0) {
           options.crossOrigin = config.html.crossorigin;
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rsbuild/plugin-assets-retry",
-  "version": "0.7.7",
+  "version": "0.7.9",
   "description": "Assets retry plugin for Rsbuild",
   "homepage": "https://rsbuild.dev",
   "repository": {
@@ -24,7 +24,7 @@
   ],
   "dependencies": {
     "serialize-javascript": "^6.0.2",
-    "@rsbuild/shared": "0.7.7"
+    "@rsbuild/shared": "0.7.9"
   },
   "devDependencies": {
     "@babel/core": "^7.24.7",
@@ -34,10 +34,10 @@
     "html-webpack-plugin": "npm:html-rspack-plugin@5.7.2",
     "terser": "5.31.1",
     "typescript": "^5.4.2",
-    "@rsbuild/core": "0.7.7"
+    "@rsbuild/core": "0.7.9"
   },
   "peerDependencies": {
-    "@rsbuild/core": "^0.7.7"
+    "@rsbuild/core": "^0.7.9"
   },
   "publishConfig": {
     "access": "public",