epicshop 6.84.6 → 6.84.8

package/dist/commands/admin/launch-readiness.js

@@ -12,6 +12,27 @@ function stripEpicAiSlugSuffix(value) {
 function normalizeHost(host) {
     return host.toLowerCase().replace(/^www\./, '');
 }
+function parseEpicWorkshopSlugFromEmbedUrl(urlString) {
+    const parseSegments = (segments) => {
+        // Expected: /workshops/<workshopSlug>/...
+        if (segments[0] !== 'workshops')
+            return null;
+        const workshopSlug = segments[1] ?? null;
+        return workshopSlug ? stripEpicAiSlugSuffix(workshopSlug) : null;
+    };
+    try {
+        const url = new URL(urlString);
+        const segments = url.pathname.split('/').filter(Boolean);
+        return parseSegments(segments);
+    }
+    catch {
+        // Fall back to naive parsing (best-effort).
+        const withoutHash = urlString.split('#')[0] ?? urlString;
+        const withoutQuery = withoutHash.split('?')[0] ?? withoutHash;
+        const segments = withoutQuery.split('/').filter(Boolean);
+        return parseSegments(segments);
+    }
+}
 function parseEpicLessonSlugFromEmbedUrl(urlString) {
     const parseSegments = (segments) => {
         if (segments.length === 0)
@@ -38,6 +59,12 @@ function parseEpicLessonSlugFromEmbedUrl(urlString) {
         return parseSegments(segments);
     }
 }
+function formatProductLessonUrl({ productHost, productSlug, lessonSlug, sectionSlug, }) {
+    // The product site will typically redirect to a section-specific path when needed.
+    return sectionSlug
+        ? `https://${productHost}/workshops/${productSlug}/${sectionSlug}/${lessonSlug}`
+        : `https://${productHost}/workshops/${productSlug}/${lessonSlug}`;
+}
 function formatIssue(issue, workshopRoot) {
     const icon = issue.level === 'error' ? chalk.red('❌') : chalk.yellow('⚠️ ');
     const filePart = issue.file
@@ -291,7 +318,7 @@ async function fetchRemoteWorkshopLessonSlugs({ productHost, workshopSlug, }) {
             message: `Product API response did not include an array "resources" field`,
         };
     }
-    const lessonSlugs = [];
+    const lessons = [];
     for (const resource of resources) {
         if (!resource || typeof resource !== 'object')
             continue;
@@ -299,24 +326,28 @@ async function fetchRemoteWorkshopLessonSlugs({ productHost, workshopSlug, }) {
         if (r._type === 'lesson') {
             const slug = r.slug;
             if (typeof slug === 'string')
-                lessonSlugs.push(slug);
+                lessons.push({ slug, sectionSlug: null });
             continue;
         }
         if (r._type === 'section') {
-            const lessons = r.lessons;
-            if (!Array.isArray(lessons))
+            const sectionSlug = typeof r.slug === 'string' && r.slug.trim().length > 0
+                ? r.slug.trim()
+                : null;
+            const sectionLessons = r.lessons;
+            if (!Array.isArray(sectionLessons))
                 continue;
-            for (const lesson of lessons) {
+            for (const lesson of sectionLessons) {
                 if (!lesson || typeof lesson !== 'object')
                     continue;
                 const l = lesson;
                 const slug = l.slug;
-                if (typeof slug === 'string')
-                    lessonSlugs.push(slug);
+                if (typeof slug === 'string') {
+                    lessons.push({ slug, sectionSlug });
+                }
             }
         }
     }
-    return { status: 'success', lessonSlugs };
+    return { status: 'success', lessons };
 }
 async function checkMinContentLength({ fullPath, minChars, }) {
     try {
@@ -789,14 +820,30 @@ export async function launchReadiness(options = {}) {
     // -------------------------------------------------------
     // 4) Remote product lesson list vs local embedded videos
     // -------------------------------------------------------
-    const localLessonSlugs = new Set();
-    for (const embedUrl of embedOccurrences.keys()) {
-        const slug = parseEpicLessonSlugFromEmbedUrl(embedUrl);
-        if (slug)
-            localLessonSlugs.add(slug);
-    }
     if (!skipRemote) {
         if (productHost && productSlug) {
+            // Only consider embeds that belong to this workshop on the configured host.
+            // It's valid for content to include EpicVideo embeds from other workshops/paths.
+            const localProductLessonSlugs = new Set();
+            const normalizedConfigHost = normalizeHost(productHost);
+            for (const embedUrl of embedOccurrences.keys()) {
+                const lessonSlug = parseEpicLessonSlugFromEmbedUrl(embedUrl);
+                if (!lessonSlug)
+                    continue;
+                const workshopSlug = parseEpicWorkshopSlugFromEmbedUrl(embedUrl);
+                if (!workshopSlug || workshopSlug !== productSlug)
+                    continue;
+                try {
+                    const url = new URL(embedUrl);
+                    if (normalizeHost(url.host) !== normalizedConfigHost)
+                        continue;
+                }
+                catch {
+                    // Invalid URLs are reported elsewhere (host/path validation); ignore here.
+                    continue;
+                }
+                localProductLessonSlugs.add(lessonSlug);
+            }
             const remote = await fetchRemoteWorkshopLessonSlugs({
                 productHost,
                 workshopSlug: productSlug,
@@ -809,7 +856,21 @@ export async function launchReadiness(options = {}) {
                 });
             }
             else {
-                const remoteLessonSlugs = Array.from(new Set(remote.lessonSlugs.map(stripEpicAiSlugSuffix)));
+                const remoteLessons = remote.lessons
+                    .map((l) => ({
+                    slug: stripEpicAiSlugSuffix(l.slug),
+                    sectionSlug: l.sectionSlug
+                        ? stripEpicAiSlugSuffix(l.sectionSlug)
+                        : null,
+                }))
+                    .filter((l) => l.slug.trim().length > 0);
+                // Preserve the first sectionSlug seen for a given lesson slug.
+                const remoteLessonBySlug = new Map();
+                for (const l of remoteLessons) {
+                    if (!remoteLessonBySlug.has(l.slug))
+                        remoteLessonBySlug.set(l.slug, l);
+                }
+                const remoteLessonSlugs = [...remoteLessonBySlug.keys()];
                 if (remoteLessonSlugs.length === 0) {
                     issues.push({
                         level: 'error',
@@ -817,25 +878,52 @@ export async function launchReadiness(options = {}) {
                         message: 'Product API returned no lessons. Is the workshop published on the product site?',
                     });
                 }
-                const missing = remoteLessonSlugs.filter((slug) => !localLessonSlugs.has(slug));
+                const missing = remoteLessonSlugs.filter((slug) => !localProductLessonSlugs.has(slug));
                 if (missing.length) {
+                    const formatted = missing
+                        .sort()
+                        .map((slug) => {
+                        const remoteLesson = remoteLessonBySlug.get(slug);
+                        return `- ${slug}: ${formatProductLessonUrl({
+                            productHost,
+                            productSlug,
+                            lessonSlug: slug,
+                            sectionSlug: remoteLesson?.sectionSlug ?? null,
+                        })}`;
+                    })
+                        .join('\n');
                     issues.push({
                         level: 'error',
                         code: 'missing-product-videos-in-workshop',
-                        message: `Missing videos in workshop for product lessons: ${missing
-                            .sort()
-                            .join(', ')}`,
+                        message: `Missing videos in workshop for product lessons:\n${formatted}`,
                     });
                 }
-                const extras = [...localLessonSlugs].filter((slug) => !remoteLessonSlugs.includes(slug));
-                if (extras.length) {
-                    issues.push({
-                        level: 'warning',
-                        code: 'extra-local-videos',
-                        message: `Found EpicVideo embeds for lesson slugs not present in the product lesson list: ${extras
-                            .sort()
-                            .join(', ')}`,
-                    });
+                const remoteLessonSlugSet = new Set(remoteLessonSlugs);
+                for (const [embedUrl, usedBy] of embedOccurrences.entries()) {
+                    const lessonSlug = parseEpicLessonSlugFromEmbedUrl(embedUrl);
+                    if (!lessonSlug)
+                        continue;
+                    const workshopSlug = parseEpicWorkshopSlugFromEmbedUrl(embedUrl);
+                    if (!workshopSlug || workshopSlug !== productSlug)
+                        continue;
+                    try {
+                        const url = new URL(embedUrl);
+                        if (normalizeHost(url.host) !== normalizedConfigHost)
+                            continue;
+                    }
+                    catch {
+                        continue;
+                    }
+                    if (remoteLessonSlugSet.has(lessonSlug))
+                        continue;
+                    for (const file of usedBy) {
+                        issues.push({
+                            level: 'warning',
+                            code: 'extra-local-videos',
+                            message: `EpicVideo embed not present in the product lesson list: ${embedUrl}`,
+                            file,
+                        });
+                    }
                 }
             }
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "epicshop",
-  "version": "6.84.6",
+  "version": "6.84.8",
   "publishConfig": {
     "access": "public"
   },
@@ -105,7 +105,7 @@
     "build:watch": "nx watch --projects=epicshop -- nx run \\$NX_PROJECT_NAME:build"
   },
   "dependencies": {
-    "@epic-web/workshop-utils": "6.84.6",
+    "@epic-web/workshop-utils": "6.84.8",
     "@inquirer/prompts": "^8.2.0",
     "@sentry/node": "^10.38.0",
     "chalk": "^5.6.2",