useblocks 1.1.46 → 1.1.53

package/vite/index.cjs

@@ -92,6 +92,51 @@ async function copyFolder(src, dest, filter) {
 	}));
 }
 //#endregion
+//#region src/shared/publicPathResolve.ts
+/**
+* Build-time mirror of build-tools/plugins/shared/publicPathResolve.ts (SSOT).
+* bundler-plugins tsc emits declarations with rootDir = src/, so shared helpers must live here.
+*/
+/** JS-выражение: document.baseURI с fallback на location.href */
+var PUBLIC_PATH_RESOLUTION_BASE_EXPRESSION = `(
+  typeof document !== 'undefined' && document.baseURI
+    ? document.baseURI
+    : (typeof window !== 'undefined' && window.location ? window.location.href : '')
+)`;
+/**
+* Тело IIFE для нормализации publicPath в сгенерированном bootstrap-коде.
+* `rawPathExpression` — JS-выражение, дающее сырой путь.
+*/
+function generateNormalizePublicPathBody(rawPathExpression) {
+	return `
+  var rawPath = ${rawPathExpression};
+  if (!rawPath) {
+    rawPath = './';
+  }
+  try {
+    var normalizedPath = String(rawPath);
+    if (/^[a-zA-Z][a-zA-Z\\d+\\-.]*:/.test(normalizedPath) || normalizedPath.indexOf('//') === 0) {
+      return normalizedPath.charAt(normalizedPath.length - 1) === '/'
+        ? normalizedPath
+        : normalizedPath + '/';
+    }
+    var baseUrl = ${PUBLIC_PATH_RESOLUTION_BASE_EXPRESSION};
+    var resolved = baseUrl ? new URL(normalizedPath, baseUrl).href : normalizedPath;
+    return resolved.charAt(resolved.length - 1) === '/'
+      ? resolved
+      : resolved + '/';
+  } catch (e) {
+    var fallback = String(rawPath);
+    return fallback.charAt(fallback.length - 1) === '/'
+      ? fallback
+      : fallback + '/';
+  }`.trim();
+}
+function generateNormalizePublicPathIIFE(rawPathExpression) {
+	return `(function() {${generateNormalizePublicPathBody(rawPathExpression)}
+  })()`;
+}
+//#endregion
 //#region src/shared/hostBootstrap.ts
 /**
 * Joins an integrator-provided `publicPath` prefix with the product `outputFolder`
@@ -123,27 +168,7 @@ function joinHostPublicPath(publicPath, outputFolder, defaultOutputFolder) {
 * `publicPath` is still unset — plugin-dev must rely on host prepend, not detection.
 */
 function createNormalizedPublicPathAssignment(environmentVariable, rawPath) {
-	const literal = JSON.stringify(String(rawPath || ""));
-	return [
-		`if (!window.${environmentVariable}.publicPath) window.${environmentVariable}.publicPath = (function() {`,
-		`  var rawPath = ${literal};`,
-		"  if (!rawPath) {",
-		"    rawPath = './';",
-		"  }",
-		"  try {",
-		"    var normalizedPath = String(rawPath);",
-		"    if (/^[a-zA-Z][a-zA-Z\\d+\\-.]*:/.test(normalizedPath) || normalizedPath.indexOf('//') === 0) {",
-		"      return normalizedPath;",
-		"    }",
-		"    var baseUrl = typeof document !== 'undefined' && document.baseURI",
-		"      ? document.baseURI",
-		"      : (typeof window !== 'undefined' && window.location ? window.location.href : '');",
-		"    return baseUrl ? new URL(normalizedPath, baseUrl).href : normalizedPath;",
-		"  } catch (_error) {",
-		"    return String(rawPath);",
-		"  }",
-		"})();"
-	].join(" ");
+	return `if (!window.${environmentVariable}.publicPath) window.${environmentVariable}.publicPath = ${generateNormalizePublicPathIIFE(JSON.stringify(String(rawPath || "")))};`;
 }
 function createInitFragment$1(environmentVariable, publicPath, startupPrefetchMode) {
 	return [

package/vite/index.d.ts

@@ -1,5 +1,4 @@
 import { Plugin } from "vite";
-
 //#region node_modules/.cache/bundler-plugins-dts/shared/hostPackageEntryMatch.d.ts
 type EntryModuleTest = RegExp | ((moduleId: string) => boolean);
 //#endregion

package/vite/index.js

@@ -63,6 +63,51 @@ async function copyFolder(src, dest, filter) {
 	}));
 }
 //#endregion
+//#region src/shared/publicPathResolve.ts
+/**
+* Build-time mirror of build-tools/plugins/shared/publicPathResolve.ts (SSOT).
+* bundler-plugins tsc emits declarations with rootDir = src/, so shared helpers must live here.
+*/
+/** JS-выражение: document.baseURI с fallback на location.href */
+var PUBLIC_PATH_RESOLUTION_BASE_EXPRESSION = `(
+  typeof document !== 'undefined' && document.baseURI
+    ? document.baseURI
+    : (typeof window !== 'undefined' && window.location ? window.location.href : '')
+)`;
+/**
+* Тело IIFE для нормализации publicPath в сгенерированном bootstrap-коде.
+* `rawPathExpression` — JS-выражение, дающее сырой путь.
+*/
+function generateNormalizePublicPathBody(rawPathExpression) {
+	return `
+  var rawPath = ${rawPathExpression};
+  if (!rawPath) {
+    rawPath = './';
+  }
+  try {
+    var normalizedPath = String(rawPath);
+    if (/^[a-zA-Z][a-zA-Z\\d+\\-.]*:/.test(normalizedPath) || normalizedPath.indexOf('//') === 0) {
+      return normalizedPath.charAt(normalizedPath.length - 1) === '/'
+        ? normalizedPath
+        : normalizedPath + '/';
+    }
+    var baseUrl = ${PUBLIC_PATH_RESOLUTION_BASE_EXPRESSION};
+    var resolved = baseUrl ? new URL(normalizedPath, baseUrl).href : normalizedPath;
+    return resolved.charAt(resolved.length - 1) === '/'
+      ? resolved
+      : resolved + '/';
+  } catch (e) {
+    var fallback = String(rawPath);
+    return fallback.charAt(fallback.length - 1) === '/'
+      ? fallback
+      : fallback + '/';
+  }`.trim();
+}
+function generateNormalizePublicPathIIFE(rawPathExpression) {
+	return `(function() {${generateNormalizePublicPathBody(rawPathExpression)}
+  })()`;
+}
+//#endregion
 //#region src/shared/hostBootstrap.ts
 /**
 * Joins an integrator-provided `publicPath` prefix with the product `outputFolder`
@@ -94,27 +139,7 @@ function joinHostPublicPath(publicPath, outputFolder, defaultOutputFolder) {
 * `publicPath` is still unset — plugin-dev must rely on host prepend, not detection.
 */
 function createNormalizedPublicPathAssignment(environmentVariable, rawPath) {
-	const literal = JSON.stringify(String(rawPath || ""));
-	return [
-		`if (!window.${environmentVariable}.publicPath) window.${environmentVariable}.publicPath = (function() {`,
-		`  var rawPath = ${literal};`,
-		"  if (!rawPath) {",
-		"    rawPath = './';",
-		"  }",
-		"  try {",
-		"    var normalizedPath = String(rawPath);",
-		"    if (/^[a-zA-Z][a-zA-Z\\d+\\-.]*:/.test(normalizedPath) || normalizedPath.indexOf('//') === 0) {",
-		"      return normalizedPath;",
-		"    }",
-		"    var baseUrl = typeof document !== 'undefined' && document.baseURI",
-		"      ? document.baseURI",
-		"      : (typeof window !== 'undefined' && window.location ? window.location.href : '');",
-		"    return baseUrl ? new URL(normalizedPath, baseUrl).href : normalizedPath;",
-		"  } catch (_error) {",
-		"    return String(rawPath);",
-		"  }",
-		"})();"
-	].join(" ");
+	return `if (!window.${environmentVariable}.publicPath) window.${environmentVariable}.publicPath = ${generateNormalizePublicPathIIFE(JSON.stringify(String(rawPath || "")))};`;
 }
 function createInitFragment$1(environmentVariable, publicPath, startupPrefetchMode) {
 	return [

package/vite/pluginDev/index.d.ts

@@ -1,5 +1,4 @@
 import { Plugin } from "vite";
-
 //#region node_modules/.cache/bundler-plugins-dts/shared/pluginDevOptions.d.ts
 type PluginDevExternalsMode = 'esm' | 'globals' | 'async-globals' | false;
 type PluginDevOptions = {

package/webpack/index.cjs

@@ -30,6 +30,51 @@ function toPascalCase(str) {
 	return `${str}`.toLowerCase().replace(/[-_]+/g, " ").replace(/[^\w\s]/g, "").replace(/\s+(.)(\w*)/g, (_m, a, b) => `${a.toUpperCase()}${b}`).replace(/\w/, (s) => s.toUpperCase());
 }
 //#endregion
+//#region src/shared/publicPathResolve.ts
+/**
+* Build-time mirror of build-tools/plugins/shared/publicPathResolve.ts (SSOT).
+* bundler-plugins tsc emits declarations with rootDir = src/, so shared helpers must live here.
+*/
+/** JS-выражение: document.baseURI с fallback на location.href */
+var PUBLIC_PATH_RESOLUTION_BASE_EXPRESSION = `(
+  typeof document !== 'undefined' && document.baseURI
+    ? document.baseURI
+    : (typeof window !== 'undefined' && window.location ? window.location.href : '')
+)`;
+/**
+* Тело IIFE для нормализации publicPath в сгенерированном bootstrap-коде.
+* `rawPathExpression` — JS-выражение, дающее сырой путь.
+*/
+function generateNormalizePublicPathBody(rawPathExpression) {
+	return `
+  var rawPath = ${rawPathExpression};
+  if (!rawPath) {
+    rawPath = './';
+  }
+  try {
+    var normalizedPath = String(rawPath);
+    if (/^[a-zA-Z][a-zA-Z\\d+\\-.]*:/.test(normalizedPath) || normalizedPath.indexOf('//') === 0) {
+      return normalizedPath.charAt(normalizedPath.length - 1) === '/'
+        ? normalizedPath
+        : normalizedPath + '/';
+    }
+    var baseUrl = ${PUBLIC_PATH_RESOLUTION_BASE_EXPRESSION};
+    var resolved = baseUrl ? new URL(normalizedPath, baseUrl).href : normalizedPath;
+    return resolved.charAt(resolved.length - 1) === '/'
+      ? resolved
+      : resolved + '/';
+  } catch (e) {
+    var fallback = String(rawPath);
+    return fallback.charAt(fallback.length - 1) === '/'
+      ? fallback
+      : fallback + '/';
+  }`.trim();
+}
+function generateNormalizePublicPathIIFE(rawPathExpression) {
+	return `(function() {${generateNormalizePublicPathBody(rawPathExpression)}
+  })()`;
+}
+//#endregion
 //#region src/shared/hostBootstrap.ts
 /**
 * Joins an integrator-provided `publicPath` prefix with the product `outputFolder`
@@ -61,27 +106,7 @@ function joinHostPublicPath(publicPath, outputFolder, defaultOutputFolder) {
 * `publicPath` is still unset — plugin-dev must rely on host prepend, not detection.
 */
 function createNormalizedPublicPathAssignment(environmentVariable, rawPath) {
-	const literal = JSON.stringify(String(rawPath || ""));
-	return [
-		`if (!window.${environmentVariable}.publicPath) window.${environmentVariable}.publicPath = (function() {`,
-		`  var rawPath = ${literal};`,
-		"  if (!rawPath) {",
-		"    rawPath = './';",
-		"  }",
-		"  try {",
-		"    var normalizedPath = String(rawPath);",
-		"    if (/^[a-zA-Z][a-zA-Z\\d+\\-.]*:/.test(normalizedPath) || normalizedPath.indexOf('//') === 0) {",
-		"      return normalizedPath;",
-		"    }",
-		"    var baseUrl = typeof document !== 'undefined' && document.baseURI",
-		"      ? document.baseURI",
-		"      : (typeof window !== 'undefined' && window.location ? window.location.href : '');",
-		"    return baseUrl ? new URL(normalizedPath, baseUrl).href : normalizedPath;",
-		"  } catch (_error) {",
-		"    return String(rawPath);",
-		"  }",
-		"})();"
-	].join(" ");
+	return `if (!window.${environmentVariable}.publicPath) window.${environmentVariable}.publicPath = ${generateNormalizePublicPathIIFE(JSON.stringify(String(rawPath || "")))};`;
 }
 function createInitFragment(environmentVariable, publicPath, startupPrefetchMode) {
 	return [

package/webpack/index.d.ts

@@ -1,5 +1,4 @@
 import { Compilation, Compiler } from "webpack";
-
 //#region node_modules/.cache/bundler-plugins-dts/shared/hostPackageEntryMatch.d.ts
 type EntryModuleTest = RegExp | ((moduleId: string) => boolean);
 //#endregion

package/webpack/index.js

@@ -6,6 +6,51 @@ function toPascalCase(str) {
 	return `${str}`.toLowerCase().replace(/[-_]+/g, " ").replace(/[^\w\s]/g, "").replace(/\s+(.)(\w*)/g, (_m, a, b) => `${a.toUpperCase()}${b}`).replace(/\w/, (s) => s.toUpperCase());
 }
 //#endregion
+//#region src/shared/publicPathResolve.ts
+/**
+* Build-time mirror of build-tools/plugins/shared/publicPathResolve.ts (SSOT).
+* bundler-plugins tsc emits declarations with rootDir = src/, so shared helpers must live here.
+*/
+/** JS-выражение: document.baseURI с fallback на location.href */
+var PUBLIC_PATH_RESOLUTION_BASE_EXPRESSION = `(
+  typeof document !== 'undefined' && document.baseURI
+    ? document.baseURI
+    : (typeof window !== 'undefined' && window.location ? window.location.href : '')
+)`;
+/**
+* Тело IIFE для нормализации publicPath в сгенерированном bootstrap-коде.
+* `rawPathExpression` — JS-выражение, дающее сырой путь.
+*/
+function generateNormalizePublicPathBody(rawPathExpression) {
+	return `
+  var rawPath = ${rawPathExpression};
+  if (!rawPath) {
+    rawPath = './';
+  }
+  try {
+    var normalizedPath = String(rawPath);
+    if (/^[a-zA-Z][a-zA-Z\\d+\\-.]*:/.test(normalizedPath) || normalizedPath.indexOf('//') === 0) {
+      return normalizedPath.charAt(normalizedPath.length - 1) === '/'
+        ? normalizedPath
+        : normalizedPath + '/';
+    }
+    var baseUrl = ${PUBLIC_PATH_RESOLUTION_BASE_EXPRESSION};
+    var resolved = baseUrl ? new URL(normalizedPath, baseUrl).href : normalizedPath;
+    return resolved.charAt(resolved.length - 1) === '/'
+      ? resolved
+      : resolved + '/';
+  } catch (e) {
+    var fallback = String(rawPath);
+    return fallback.charAt(fallback.length - 1) === '/'
+      ? fallback
+      : fallback + '/';
+  }`.trim();
+}
+function generateNormalizePublicPathIIFE(rawPathExpression) {
+	return `(function() {${generateNormalizePublicPathBody(rawPathExpression)}
+  })()`;
+}
+//#endregion
 //#region src/shared/hostBootstrap.ts
 /**
 * Joins an integrator-provided `publicPath` prefix with the product `outputFolder`
@@ -37,27 +82,7 @@ function joinHostPublicPath(publicPath, outputFolder, defaultOutputFolder) {
 * `publicPath` is still unset — plugin-dev must rely on host prepend, not detection.
 */
 function createNormalizedPublicPathAssignment(environmentVariable, rawPath) {
-	const literal = JSON.stringify(String(rawPath || ""));
-	return [
-		`if (!window.${environmentVariable}.publicPath) window.${environmentVariable}.publicPath = (function() {`,
-		`  var rawPath = ${literal};`,
-		"  if (!rawPath) {",
-		"    rawPath = './';",
-		"  }",
-		"  try {",
-		"    var normalizedPath = String(rawPath);",
-		"    if (/^[a-zA-Z][a-zA-Z\\d+\\-.]*:/.test(normalizedPath) || normalizedPath.indexOf('//') === 0) {",
-		"      return normalizedPath;",
-		"    }",
-		"    var baseUrl = typeof document !== 'undefined' && document.baseURI",
-		"      ? document.baseURI",
-		"      : (typeof window !== 'undefined' && window.location ? window.location.href : '');",
-		"    return baseUrl ? new URL(normalizedPath, baseUrl).href : normalizedPath;",
-		"  } catch (_error) {",
-		"    return String(rawPath);",
-		"  }",
-		"})();"
-	].join(" ");
+	return `if (!window.${environmentVariable}.publicPath) window.${environmentVariable}.publicPath = ${generateNormalizePublicPathIIFE(JSON.stringify(String(rawPath || "")))};`;
 }
 function createInitFragment(environmentVariable, publicPath, startupPrefetchMode) {
 	return [

package/webpack/pluginDev/index.d.ts

@@ -1,5 +1,4 @@
 import { Compiler } from "webpack";
-
 //#region node_modules/.cache/bundler-plugins-dts/shared/pluginDevOptions.d.ts
 type PluginDevExternalsMode = 'esm' | 'globals' | 'async-globals' | false;
 type PluginDevOptions = {