epicshop 6.86.0 → 6.87.0

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

@@ -1,10 +1,12 @@
 import fs from 'node:fs/promises';
 import path from 'node:path';
+import { debuglog } from 'node:util';
 import { compileMdx } from '@epic-web/workshop-utils/compile-mdx.server';
 import { getErrorMessage } from '@epic-web/workshop-utils/utils';
 import chalk from 'chalk';
 import { pathExists } from "../../utils/filesystem.js";
 import { collectStepDirectories, formatProductLessonUrl, fetchRemoteWorkshopLessons, isDirectory, resolveMdxFile, } from "./workshop-content-utils.js";
+const debug = debuglog('epic:launch-readiness');
 function stripEpicAiSlugSuffix(value) {
     // EpicAI embeds sometimes include a `~...` suffix in the slug segment.
     return value.replace(/~[^ ]*$/, '');
@@ -62,6 +64,27 @@ function parseEpicLessonSlugFromEmbedUrl(urlString) {
         return parseSegments(segments);
     }
 }
+function parseEmbedUrlVariant(urlString) {
+    const parseSegments = (segments) => {
+        const last = segments.at(-1) ?? '';
+        return {
+            hasProblemSuffix: last === 'problem',
+            hasSolutionSuffix: last === 'solution',
+        };
+    };
+    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 formatIssue(issue, workshopRoot) {
     const icon = issue.level === 'error' ? chalk.red('❌') : chalk.yellow('⚠️ ');
     const filePart = issue.file
@@ -569,6 +592,7 @@ export async function launchReadiness(options = {}) {
         try {
             const compiled = await compileMdx(file.fullPath);
             const embeds = compiled.epicVideoEmbeds ?? [];
+            debug('file=%s kind=%s embeds=%d', file.relativePath, file.kind, embeds.length);
             if (embeds.length === 0) {
                 issues.push({
                     level: 'error',
@@ -579,6 +603,24 @@ export async function launchReadiness(options = {}) {
                 continue;
             }
             for (const embed of embeds) {
+                const variant = parseEmbedUrlVariant(embed);
+                debug('embed file=%s kind=%s url=%s problemSuffix=%s solutionSuffix=%s', file.relativePath, file.kind, embed, variant.hasProblemSuffix, variant.hasSolutionSuffix);
+                if (file.kind === 'step-solution' && !variant.hasSolutionSuffix) {
+                    issues.push({
+                        level: 'error',
+                        code: 'step-solution-video-missing-solution-suffix',
+                        message: `Step solution files must use a /solution video URL suffix: ${embed}`,
+                        file: file.fullPath,
+                    });
+                }
+                if (file.kind === 'step-problem' && variant.hasSolutionSuffix) {
+                    issues.push({
+                        level: 'error',
+                        code: 'step-problem-video-uses-solution-suffix',
+                        message: `Step problem files must not use a /solution video URL suffix: ${embed}`,
+                        file: file.fullPath,
+                    });
+                }
                 const set = embedOccurrences.get(embed) ?? new Set();
                 set.add(file.fullPath);
                 embedOccurrences.set(embed, set);
@@ -711,6 +753,7 @@ export async function launchReadiness(options = {}) {
                 }
                 localProductLessonSlugs.add(lessonSlug);
             }
+            debug('remote-check workshop=%s localProductLessonSlugs=%d', productSlug, localProductLessonSlugs.size);
             const remote = await fetchRemoteWorkshopLessons({
                 productHost,
                 workshopSlug: productSlug,
@@ -739,6 +782,7 @@ export async function launchReadiness(options = {}) {
                         remoteLessonBySlug.set(l.slug, l);
                 }
                 const remoteLessonSlugs = [...remoteLessonBySlug.keys()];
+                debug('remote-check workshop=%s remoteLessonSlugs=%d moduleType=%s', productSlug, remoteLessonSlugs.length, remoteModuleType);
                 if (remoteLessonSlugs.length === 0) {
                     issues.push({
                         level: 'error',
@@ -748,6 +792,7 @@ export async function launchReadiness(options = {}) {
                 }
                 const missing = remoteLessonSlugs.filter((slug) => !localProductLessonSlugs.has(slug));
                 if (missing.length) {
+                    debug('remote-check missing-lesson-slugs=%o', missing.slice().sort());
                     const formatted = missing
                         .sort()
                         .map((slug) => {

package/dist/commands/admin/set-videos.js

@@ -234,6 +234,12 @@ function upsertTitleEpicVideo({ content, url, }) {
 function formatNumberedList(items, { startAt = 1 } = {}) {
     return items.map((item, index) => `${startAt + index}. ${item}`).join('\n');
 }
+function getTargetLessonUrl({ baseUrl, fileKind, }) {
+    if (fileKind === 'step-solution') {
+        return `${baseUrl.replace(/\/+$/, '')}/solution`;
+    }
+    return baseUrl;
+}
 function buildFileLessonSlotPlans(files) {
     const plans = [];
     const stepSlotByKey = new Map();
@@ -385,13 +391,17 @@ export async function setVideos(options = {}) {
         const lesson = remoteLessons[plan.lessonSlotIndex];
         if (!lesson)
             continue;
-        const targetUrl = formatProductLessonUrl({
+        const baseLessonUrl = formatProductLessonUrl({
             productHost,
             productSlug,
             moduleType: remoteModuleType,
             lessonSlug: lesson.slug,
             sectionSlug: lesson.sectionSlug,
         });
+        const targetUrl = getTargetLessonUrl({
+            baseUrl: baseLessonUrl,
+            fileKind: plan.file.kind,
+        });
         let currentContent = '';
         try {
             currentContent = await fs.readFile(plan.file.fullPath, 'utf8');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "epicshop",
-  "version": "6.86.0",
+  "version": "6.87.0",
   "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.86.0",
+    "@epic-web/workshop-utils": "6.87.0",
     "@inquirer/prompts": "^8.2.0",
     "@sentry/node": "^10.38.0",
     "chalk": "^5.6.2",