@jant/core 0.3.45 → 0.3.46

package/bin/commands/import-site.js

@@ -437,6 +437,18 @@ function isAbsoluteUrl(value) {
   return typeof value === "string" && /^https?:\/\//i.test(value);
 }
 
+/**
+ * True when `url` points to a different location than the import target —
+ * i.e. has a scheme (`https://`, `data:`) or is protocol-relative (`//cdn…`).
+ * False for relative paths (`/media/x`, `./x`, `x`), which always belong to
+ * the source site and must be rehosted. Used to filter the body-fallback
+ * upload when `--skip-remote-media` is set.
+ */
+function isAbsoluteImportUrl(value) {
+  if (typeof value !== "string") return false;
+  return /^([a-z][a-z0-9+.\-]*:|\/\/)/i.test(value);
+}
+
 /**
  * Resolve a `media:` entry's `src` or `poster` reference to a local disk
  * path when the export bundled the bytes under `static/`. Absolute URLs
@@ -641,19 +653,7 @@ async function buildImportedAttachments(
   target,
   siteConfig,
   sourceRootDir,
-  options = {},
 ) {
-  if (
-    sourceRootDir &&
-    typeof sourceRootDir === "object" &&
-    !Array.isArray(sourceRootDir) &&
-    options &&
-    Object.keys(options).length === 0
-  ) {
-    options = sourceRootDir;
-    sourceRootDir = null;
-  }
-
   const attachments = [];
   let uploaded = 0;
 
@@ -668,10 +668,6 @@ async function buildImportedAttachments(
       continue;
     }
 
-    if (options.skipUploads) {
-      continue;
-    }
-
     const normalized = await normalizeMediaSpec(
       spec,
       siteConfig,
@@ -1976,6 +1972,7 @@ function buildPostPayloadFromBundle(bundle, options) {
 }
 
 export const __test__ = {
+  isAbsoluteImportUrl,
   resolveImportUrl,
   readMediaSpecAsset,
   normalizeMediaSpec,
@@ -2009,7 +2006,7 @@ export async function run(argv) {
       token: { type: "string" },
       path: { type: "string", default: "." },
       "dry-run": { type: "boolean", default: false },
-      "skip-media": { type: "boolean", default: false },
+      "skip-remote-media": { type: "boolean", default: false },
       help: { type: "boolean", short: "h" },
     },
   });
@@ -2034,7 +2031,7 @@ export async function run(argv) {
     );
     console.log("  --dry-run     Parse and validate without making API calls");
     console.log(
-      "  --skip-media  Skip remote media download/upload (embedded text attachments still import)",
+      "  --skip-remote-media  Skip uploading absolute-URL images found in body (relative paths and declared media still import)",
     );
     console.log("");
     console.log(
@@ -2066,7 +2063,7 @@ export async function run(argv) {
 
   const apiUrl = values.url?.replace(/\/$/, "");
   const dryRun = values["dry-run"];
-  const skipMedia = values["skip-media"];
+  const skipRemoteMedia = values["skip-remote-media"];
   const target = dryRun
     ? null
     : values.url
@@ -2149,7 +2146,7 @@ export async function run(argv) {
             `[dry-run] Would replace navigation with ${importedNav.items.length} items`,
           );
         }
-        if (avatarImport && !skipMedia) {
+        if (avatarImport) {
           if (avatarImport.mode === "remove") {
             console.log("[dry-run] Would remove existing site avatar");
           } else {
@@ -2204,7 +2201,7 @@ export async function run(argv) {
           }
         }
 
-        if (avatarImport && !skipMedia) {
+        if (avatarImport) {
           try {
             await target.syncSiteAvatar(
               avatarImport.mode === "set" ? avatarImport : null,
@@ -2349,7 +2346,7 @@ export async function run(argv) {
       }
 
       const rootResourceIds = [];
-      if (!skipMedia && !dryRun && rootResourceSpecs.length > 0) {
+      if (!dryRun && rootResourceSpecs.length > 0) {
         const result = await uploadBundleResources(rootResourceSpecs, target);
         mediaUploaded += result.uploaded;
         if (result.urlMap.size > 0) {
@@ -2360,8 +2357,13 @@ export async function run(argv) {
 
       // Fallback: rewrite any leftover in-body image URLs (covers hand-
       // authored Hugo content where the exporter didn't declare resources).
-      if (!skipMedia && !dryRun) {
-        const imageMedia = findImageUrls(rootBody).map((src) => ({ src }));
+      // `--skip-remote-media` filters out absolute URLs here so we only
+      // rehost relative paths (the source site's own files).
+      if (!dryRun) {
+        const fallbackUrls = findImageUrls(rootBody).filter(
+          (url) => !skipRemoteMedia || !isAbsoluteImportUrl(url),
+        );
+        const imageMedia = fallbackUrls.map((src) => ({ src }));
         const uploadResult = await uploadMediaList(
           imageMedia,
           target,
@@ -2380,7 +2382,6 @@ export async function run(argv) {
           target,
           siteConfig,
           sourceRootDir,
-          { skipUploads: skipMedia },
         );
         importedAttachments = attachmentResult.attachments;
         mediaUploaded += attachmentResult.uploaded;
@@ -2396,7 +2397,7 @@ export async function run(argv) {
       // These reference a `.md` artifact that holds the full body; the
       // normalizer fetches the bytes (local disk first, then remote URL)
       // and decodes them.
-      if (!skipMedia && !dryRun) {
+      if (!dryRun) {
         for (const textEntry of rootTextAttachmentEntries) {
           const textAttachment = await normalizeTextAttachmentSpec(
             textEntry,
@@ -2496,7 +2497,7 @@ export async function run(argv) {
         }
 
         const replyResourceIds = [];
-        if (!skipMedia && replyResourceSpecs.length > 0) {
+        if (replyResourceSpecs.length > 0) {
           const result = await uploadBundleResources(
             replyResourceSpecs,
             target,
@@ -2508,8 +2509,11 @@ export async function run(argv) {
           replyResourceIds.push(...result.mediaIds);
         }
 
-        if (!skipMedia) {
-          const imageMedia = findImageUrls(replyBody).map((src) => ({ src }));
+        {
+          const fallbackUrls = findImageUrls(replyBody).filter(
+            (url) => !skipRemoteMedia || !isAbsoluteImportUrl(url),
+          );
+          const imageMedia = fallbackUrls.map((src) => ({ src }));
           const uploadResult = await uploadMediaList(
             imageMedia,
             target,
@@ -2527,7 +2531,6 @@ export async function run(argv) {
           target,
           siteConfig,
           sourceRootDir,
-          { skipUploads: skipMedia },
         );
         replyAttachments = attachmentResult.attachments;
         mediaUploaded += attachmentResult.uploaded;
@@ -2535,15 +2538,13 @@ export async function run(argv) {
           replyAttachments.push({ type: "media", mediaId });
         }
 
-        if (!skipMedia) {
-          for (const textEntry of replyTextAttachmentEntries) {
-            const textAttachment = await normalizeTextAttachmentSpec(
-              textEntry,
-              siteConfig,
-              sourceRootDir,
-            );
-            if (textAttachment) replyAttachments.push(textAttachment);
-          }
+        for (const textEntry of replyTextAttachmentEntries) {
+          const textAttachment = await normalizeTextAttachmentSpec(
+            textEntry,
+            siteConfig,
+            sourceRootDir,
+          );
+          if (textAttachment) replyAttachments.push(textAttachment);
         }
 
         const replyMemberships = resolveCollectionMemberships(

package/dist/{app-Hvqe7Ks_.js → app-CM7sb3xO.js}

@@ -1,5 +1,5 @@
 import "./url-umUptr5z.js";
-import { t as createApp } from "./app-C-L7wL6o.js";
+import { t as createApp } from "./app-DB-P66E5.js";
 import "./github-sync-CQ1x271f.js";
 import "./env-CgaH9Mut.js";
 export { createApp };

package/dist/{app-C-L7wL6o.js → app-DB-P66E5.js}

@@ -3352,9 +3352,9 @@ function normalizeThemeColorForMeta(color) {
 * internal paths (e.g. `/_assets/client-HASH.js`) embedded by the Worker build
 * from the Vite client manifest. Used only in production (IS_VITE_DEV=false).
 */ var IS_VITE_DEV = typeof __JANT_DEV__ !== "undefined" && __JANT_DEV__ === true;
-var CORE_VERSION = "0.3.45-63de2a28e1b65691";
+var CORE_VERSION = "0.3.46-4c46f967df638082";
 var CLIENT_JS_FILE = "/_assets/client-dSfWfMe9.js";
-var CLIENT_AUTH_JS_FILE = "/_assets/client-auth-Dcon89Av.js";
+var CLIENT_AUTH_JS_FILE = "/_assets/client-auth-BLCUje4M.js";
 var CLIENT_CSS_FILE = "/_assets/client-DDs6NzB3.css";
 var CLIENT_CJK_CSS_FILE = "/_assets/client-cjk-B7Z0snDu.css";
 var CLIENT_CJK_TC_CSS_FILE = "/_assets/client-cjk-tc-BesJYrb2.css";
@@ -3673,7 +3673,7 @@ var IconSprite = () => {
 	const cjkSerifFont = appConfig?.cjkSerifFont ?? "off";
 	const cjkStylesheetPath = cjkSerifFont === "zh-Hans" ? IS_VITE_DEV ? assetPath("/src/style-cjk.css") : toPublicAssetPath(CLIENT_CJK_CSS_FILE, assetBasePath) : cjkSerifFont === "zh-Hant" ? IS_VITE_DEV ? assetPath("/src/style-cjk-tc.css") : toPublicAssetPath(CLIENT_CJK_TC_CSS_FILE, assetBasePath) : cjkSerifFont === "ja" ? IS_VITE_DEV ? assetPath("/src/style-cjk-jp.css") : toPublicAssetPath(CLIENT_CJK_JP_CSS_FILE, assetBasePath) : cjkSerifFont === "ko" ? IS_VITE_DEV ? assetPath("/src/style-cjk-kr.css") : toPublicAssetPath(CLIENT_CJK_KR_CSS_FILE, assetBasePath) : null;
 	const clientScriptPath = IS_VITE_DEV ? resolvedClientBundle === "full" ? assetPath("/src/client-auth.ts") : assetPath("/src/client.ts") : toPublicAssetPath(resolvedClientBundle === "full" ? CLIENT_AUTH_JS_FILE : CLIENT_JS_FILE, assetBasePath);
-	const faviconAssetVersion = resolvedFaviconVersion || "0.3.45-63de2a28e1b65691";
+	const faviconAssetVersion = resolvedFaviconVersion || "0.3.46-4c46f967df638082";
 	const resolvedFaviconHref = faviconHref ?? (faviconAssetVersion ? toPublicPath(`/favicon.ico?v=${faviconAssetVersion}`, sitePathPrefix) : toPublicPath("/favicon.ico", sitePathPrefix));
 	const resolvedAppleTouchHref = appleTouchHref ?? (faviconAssetVersion ? toPublicPath(`/apple-touch-icon.png?v=${faviconAssetVersion}`, sitePathPrefix) : toPublicPath("/apple-touch-icon.png", sitePathPrefix));
 	const socialImageHref = resolvedSocialImagePath && (isFullUrl(resolvedSocialImagePath) || resolvedSocialImagePath.startsWith("//") ? resolvedSocialImagePath : toAbsoluteSiteUrl(resolvedSocialImagePath, appConfig?.siteUrl || "", sitePathPrefix));
@@ -10172,7 +10172,7 @@ var PaginatedPageHeader = ({ title, currentPage = 1, totalPages, description, ic
 						class: "py-8 text-muted-foreground",
 						children: [i18n._({ id: "Q/uoSA" }), !isAuthenticated && /* @__PURE__ */ jsxDEV$1(Fragment$1, { children: [" ", /* @__PURE__ */ jsxDEV$1("a", {
 							href: signinUrl,
-							class: "underline-offset-2 hover:underline",
+							class: "underline underline-offset-2",
 							children: i18n._({ id: "nfU386" })
 						})] })]
 					})

package/dist/client/.vite/manifest.json

@@ -146,7 +146,7 @@
     "name": "url"
   },
   "src/client-auth.ts": {
-    "file": "_assets/client-auth-Dcon89Av.js",
+    "file": "_assets/client-auth-BLCUje4M.js",
     "name": "client-auth",
     "src": "src/client-auth.ts",
     "isEntry": true,