epicshop 6.85.0 → 6.85.2

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

@@ -4,14 +4,21 @@ 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, stripEpicAiSlugSuffix, } from "./workshop-content-utils.js";
+import { collectStepDirectories, formatProductLessonUrl, fetchRemoteWorkshopLessons, isDirectory, resolveMdxFile, } from "./workshop-content-utils.js";
+function stripEpicAiSlugSuffix(value) {
+    // EpicAI embeds sometimes include a `~...` suffix in the slug segment.
+    return value.replace(/~[^ ]*$/, '');
+}
+function isProductLessonPathSegment(segment) {
+    return segment === 'workshops' || segment === 'tutorials';
+}
 function normalizeHost(host) {
     return host.toLowerCase().replace(/^www\./, '');
 }
-function parseEpicWorkshopSlugFromEmbedUrl(urlString) {
+function parseEpicProductSlugFromEmbedUrl(urlString) {
     const parseSegments = (segments) => {
-        // Expected: /workshops/<workshopSlug>/...
-        if (segments[0] !== 'workshops')
+        // Expected: /workshops/<slug>/... or /tutorials/<slug>/...
+        if (!isProductLessonPathSegment(segments[0]))
             return null;
         const workshopSlug = segments[1] ?? null;
         return workshopSlug ? stripEpicAiSlugSuffix(workshopSlug) : null;
@@ -653,13 +660,13 @@ export async function launchReadiness(options = {}) {
                 }
             }
             const segments = url.pathname.split('/').filter(Boolean);
-            // Expected: /workshops/<workshopSlug>/...
-            if (segments[0] !== 'workshops') {
+            // Expected: /workshops/<workshopSlug>/... or /tutorials/<tutorialSlug>/...
+            if (!isProductLessonPathSegment(segments[0])) {
                 for (const file of usedBy) {
                     issues.push({
                         level: 'warning',
                         code: 'epic-video-url-unexpected-path',
-                        message: 'EpicVideo url path does not start with /workshops/... (this may break progress tracking)',
+                        message: 'EpicVideo url path does not start with /workshops/... or /tutorials/... (this may break progress tracking)',
                         file,
                     });
                 }
@@ -690,7 +697,7 @@ export async function launchReadiness(options = {}) {
                 const lessonSlug = parseEpicLessonSlugFromEmbedUrl(embedUrl);
                 if (!lessonSlug)
                     continue;
-                const workshopSlug = parseEpicWorkshopSlugFromEmbedUrl(embedUrl);
+                const workshopSlug = parseEpicProductSlugFromEmbedUrl(embedUrl);
                 if (!workshopSlug || workshopSlug !== productSlug)
                     continue;
                 try {
@@ -716,6 +723,7 @@ export async function launchReadiness(options = {}) {
                 });
             }
             else {
+                const remoteModuleType = remote.moduleType;
                 const remoteLessons = remote.lessons
                     .map((l) => ({
                     slug: stripEpicAiSlugSuffix(l.slug),
@@ -747,6 +755,7 @@ export async function launchReadiness(options = {}) {
                         return `- ${slug}: ${formatProductLessonUrl({
                             productHost,
                             productSlug,
+                            moduleType: remoteModuleType,
                             lessonSlug: slug,
                             sectionSlug: remoteLesson?.sectionSlug ?? null,
                         })}`;
@@ -763,7 +772,7 @@ export async function launchReadiness(options = {}) {
                     const lessonSlug = parseEpicLessonSlugFromEmbedUrl(embedUrl);
                     if (!lessonSlug)
                         continue;
-                    const workshopSlug = parseEpicWorkshopSlugFromEmbedUrl(embedUrl);
+                    const workshopSlug = parseEpicProductSlugFromEmbedUrl(embedUrl);
                     if (!workshopSlug || workshopSlug !== productSlug)
                         continue;
                     try {

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

@@ -333,6 +333,7 @@ export async function setVideos(options = {}) {
         });
     }
     const remoteLessons = remoteResult.lessons;
+    const remoteModuleType = remoteResult.moduleType;
     if (remoteLessons.length === 0) {
         return fail('Product API returned no lessons. Is the workshop published on the product site?', {
             warnings,
@@ -349,6 +350,7 @@ export async function setVideos(options = {}) {
             const lessonUrl = formatProductLessonUrl({
                 productHost,
                 productSlug,
+                moduleType: remoteModuleType,
                 lessonSlug: lesson.slug,
                 sectionSlug: lesson.sectionSlug,
             });
@@ -364,6 +366,7 @@ export async function setVideos(options = {}) {
             const lessonUrl = formatProductLessonUrl({
                 productHost,
                 productSlug,
+                moduleType: remoteModuleType,
                 lessonSlug: lesson.slug,
                 sectionSlug: lesson.sectionSlug,
             });
@@ -385,6 +388,7 @@ export async function setVideos(options = {}) {
         const targetUrl = formatProductLessonUrl({
             productHost,
             productSlug,
+            moduleType: remoteModuleType,
             lessonSlug: lesson.slug,
             sectionSlug: lesson.sectionSlug,
         });
@@ -429,6 +433,7 @@ export async function setVideos(options = {}) {
         const extras = remoteLessons.slice(requiredLessonSlots).map((lesson) => formatProductLessonUrl({
             productHost,
             productSlug,
+            moduleType: remoteModuleType,
             lessonSlug: lesson.slug,
             sectionSlug: lesson.sectionSlug,
         }));

package/dist/commands/admin/workshop-content-utils.d.ts

@@ -3,11 +3,13 @@ export type RemoteLesson = {
     slug: string;
     sectionSlug: string | null;
 };
+export type ProductModuleType = 'workshop' | 'tutorial';
 type NormalizeSlug = (value: string) => string;
 export declare function stripEpicAiSlugSuffix(value: string): string;
-export declare function formatProductLessonUrl({ productHost, productSlug, lessonSlug, sectionSlug, }: {
+export declare function formatProductLessonUrl({ productHost, productSlug, moduleType, lessonSlug, sectionSlug, }: {
     productHost: string;
     productSlug: string;
+    moduleType?: ProductModuleType;
     lessonSlug: string;
     sectionSlug: string | null;
 }): string;
@@ -26,6 +28,7 @@ export declare function fetchRemoteWorkshopLessons({ productHost, workshopSlug,
 }): Promise<{
     status: 'success';
     lessons: Array<RemoteLesson>;
+    moduleType: ProductModuleType;
 } | {
     status: 'error';
     message: string;

package/dist/commands/admin/workshop-content-utils.js

@@ -7,11 +7,12 @@ export function stripEpicAiSlugSuffix(value) {
     // EpicAI embeds sometimes include a `~...` suffix in the slug segment.
     return value.replace(/~[^ ]*$/, '');
 }
-export function formatProductLessonUrl({ productHost, productSlug, lessonSlug, sectionSlug, }) {
+export function formatProductLessonUrl({ productHost, productSlug, moduleType = 'workshop', lessonSlug, sectionSlug, }) {
+    const productPath = moduleType === 'tutorial' ? 'tutorials' : 'workshops';
     // 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}`;
+        ? `https://${productHost}/${productPath}/${productSlug}/${sectionSlug}/${lessonSlug}`
+        : `https://${productHost}/${productPath}/${productSlug}/${lessonSlug}`;
 }
 export async function isDirectory(targetPath) {
     try {
@@ -112,6 +113,12 @@ export async function fetchRemoteWorkshopLessons({ productHost, workshopSlug, no
     const resources = data && typeof data === 'object' && 'resources' in data
         ? data.resources
         : null;
+    const moduleType = data &&
+        typeof data === 'object' &&
+        'moduleType' in data &&
+        data.moduleType === 'tutorial'
+        ? 'tutorial'
+        : 'workshop';
     if (!Array.isArray(resources)) {
         return {
             status: 'error',
@@ -164,5 +171,5 @@ export async function fetchRemoteWorkshopLessons({ productHost, workshopSlug, no
             }
         }
     }
-    return { status: 'success', lessons };
+    return { status: 'success', lessons, moduleType };
 }

package/dist/commands/cleanup.js

@@ -630,7 +630,12 @@ export async function cleanup({ silent = false, force = false, targets, workshop
                     // explicit `--workshops` were provided, we treat the current workshop
                     // as the only workshop candidate. This avoids suggesting other
                     // workshops in prompts and keeps size estimates accurate.
-                    allWorkshops = [workshopFromCwd];
+                    updateSpinner(analysisSpinner, 'Resolving current workshop...');
+                    const repoWorkshops = await listWorkshopsInDirectory(reposDir);
+                    const matchingRepoWorkshop = repoWorkshops.find((workshop) => workshop.repoName === workshopFromCwd.repoName);
+                    // Prefer the repos-directory path when available so workshop IDs are
+                    // stable even when cwd uses an equivalent symlinked path.
+                    allWorkshops = [matchingRepoWorkshop ?? workshopFromCwd];
                 }
                 else {
                     updateSpinner(analysisSpinner, 'Finding installed workshops...');
@@ -655,6 +660,11 @@ export async function cleanup({ silent = false, force = false, targets, workshop
                     contextWorkshop =
                         workshopIdentities.find((workshop) => workshop.id === cwdId) ?? null;
                 }
+                if (!contextWorkshop &&
+                    shouldScopeToCwdWorkshop &&
+                    workshopIdentities.length === 1) {
+                    contextWorkshop = workshopIdentities[0] ?? null;
+                }
             }
             if (selectedTargets.length === 0) {
                 if (allWorkshops.length > 0) {

package/package.json

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