epicshop 6.71.4 → 6.72.1

package/dist/commands/start.js

@@ -124,16 +124,36 @@ export async function start(options = {}) {
             try {
                 const { checkForUpdatesCached } = await import('@epic-web/workshop-utils/git.server');
                 const { getMutedNotifications } = await import('@epic-web/workshop-utils/db.server');
-                const updates = await checkForUpdatesCached();
-                if (updates.updatesAvailable && updates.remoteCommit) {
-                    // Check if update notification is muted
-                    const mutedNotifications = await getMutedNotifications();
-                    const updateNotificationId = `update-repo-${updates.remoteCommit}`;
-                    if (!mutedNotifications.includes(updateNotificationId)) {
-                        const updateLink = chalk.blue.bgWhite(` ${updates.diffLink} `);
-                        console.log('\n', `🎉  There are ${chalk.yellow('updates available')} for this workshop repository.  🎉\n\nTo get the updates, ${chalk.green.bold.bgWhite(`press the "u" key`)}\n\nTo view a diff, check:\n  ${updateLink}\n\nTo dismiss this notification, ${chalk.red.bold.bgWhite(`press the "d" key`)}\n`);
-                    }
+                const updates = (await checkForUpdatesCached());
+                const updateNotificationId = updates.updateNotificationId ?? null;
+                const repoUpdatesAvailable = updates.repoUpdatesAvailable ?? updates.updatesAvailable;
+                const dependenciesNeedInstall = updates.dependenciesNeedInstall ?? false;
+                if (!updates.updatesAvailable || !updateNotificationId) {
+                    return;
+                }
+                // Check if update notification is muted
+                const mutedNotifications = await getMutedNotifications();
+                if (mutedNotifications.includes(updateNotificationId)) {
+                    return;
+                }
+                const updateLink = repoUpdatesAvailable && updates.diffLink
+                    ? chalk.blue.bgWhite(` ${updates.diffLink} `)
+                    : null;
+                const headline = repoUpdatesAvailable
+                    ? `🎉  There are ${chalk.yellow('updates available')} for this workshop repository.  🎉`
+                    : `📦  ${chalk.yellow('Dependencies are out of date')} for this workshop repository.  📦`;
+                const lines = [headline];
+                if (dependenciesNeedInstall) {
+                    lines.push(`Your installed packages don't match ${chalk.cyan('package.json')}.`);
+                }
+                lines.push(repoUpdatesAvailable
+                    ? `To get the updates${dependenciesNeedInstall ? ' and reinstall dependencies' : ''}, ${chalk.green.bold.bgWhite(`press the "u" key`)}`
+                    : `To reinstall dependencies, ${chalk.green.bold.bgWhite(`press the "u" key`)}`);
+                if (updateLink) {
+                    lines.push(`To view a diff, check:\n  ${updateLink}`);
                 }
+                lines.push(`To dismiss this notification, ${chalk.red.bold.bgWhite(`press the "d" key`)}`);
+                console.log('\n', `${lines.join('\n\n')}\n`);
             }
             catch {
                 // Silently ignore update check errors
@@ -381,10 +401,9 @@ export async function start(options = {}) {
                     try {
                         const { checkForUpdatesCached } = await import('@epic-web/workshop-utils/git.server');
                         const { muteNotification } = await import('@epic-web/workshop-utils/db.server');
-                        const updates = await checkForUpdatesCached();
-                        if (updates.updatesAvailable && updates.remoteCommit) {
-                            const updateNotificationId = `update-repo-${updates.remoteCommit}`;
-                            await muteNotification(updateNotificationId);
+                        const updates = (await checkForUpdatesCached());
+                        if (updates.updatesAvailable && updates.updateNotificationId) {
+                            await muteNotification(updates.updateNotificationId);
                             console.log(chalk.green('\n✅ Update notification dismissed permanently.\n'));
                         }
                         else {

package/dist/commands/workshops.js

@@ -9,6 +9,7 @@ import { userHasAccessToWorkshop } from '@epic-web/workshop-utils/epic-api.serve
 import chalk from 'chalk';
 import { matchSorter, rankings } from 'match-sorter';
 import ora from 'ora';
+import { z } from 'zod';
 import { assertCanPrompt, isCiEnvironment } from "../utils/cli-runtime.js";
 import { runCommand, runCommandInteractive } from "../utils/command-runner.js";
 import { setup } from "./setup.js";
@@ -70,6 +71,20 @@ export async function findWorkshopRoot() {
 export async function isInWorkshopDirectory() {
     return (await findWorkshopRoot()) !== null;
 }
+const GitHubRepoSchema = z.object({
+    name: z.string(),
+    description: z.string().nullable(),
+    html_url: z.string(),
+    stargazers_count: z.number(),
+    topics: z.array(z.string()).default([]),
+    archived: z.boolean(),
+});
+const GitHubSearchResponseSchema = z.object({
+    total_count: z.number(),
+    incomplete_results: z.boolean(),
+    items: z.array(GitHubRepoSchema),
+});
+const PackageJsonSchema = z.record(z.unknown());
 const PRODUCT_ICONS = {
     'www.epicweb.dev': '🌌',
     'www.epicai.pro': '⚡',
@@ -103,6 +118,7 @@ async function fetchAvailableWorkshops() {
         cache: githubCache,
         ttl: 1000 * 60 * 15, // 15 minutes
         swr: 1000 * 60 * 60 * 6, // 6 hours stale-while-revalidate
+        checkValue: GitHubRepoSchema.array(),
         async getFreshValue() {
             // Note: `archived:false` is supported by GitHub search.
             const baseUrl = `https://api.github.com/search/repositories?q=topic:workshop+org:${GITHUB_ORG}+archived:false&sort=stars&order=desc`;
@@ -125,11 +141,12 @@ async function fetchAvailableWorkshops() {
                     }
                     throw new Error(`Failed to fetch workshops from GitHub: ${response.status}`);
                 }
-                const data = (await response.json());
-                const items = Array.isArray(data.items) ? data.items : [];
-                if (typeof data.total_count === 'number') {
-                    totalCount = data.total_count;
+                const parseResult = GitHubSearchResponseSchema.safeParse(await response.json());
+                if (!parseResult.success) {
+                    throw new Error(`Failed to parse GitHub API response: ${parseResult.error.message}`);
                 }
+                const { items, total_count } = parseResult.data;
+                totalCount = total_count;
                 allItems.push(...items);
                 // Stop when there are no more results for the next page.
                 if (items.length < perPage)
@@ -151,6 +168,7 @@ async function fetchWorkshopPackageJson(repoName) {
         cache: githubCache,
         ttl: 1000 * 60 * 60 * 6, // 6 hours
         swr: 1000 * 60 * 60 * 24 * 30, // 30 days stale-while-revalidate
+        checkValue: PackageJsonSchema.nullable(),
         async getFreshValue() {
             const url = `https://raw.githubusercontent.com/${GITHUB_ORG}/${repoName}/main/package.json`;
             const response = await fetch(url, {
@@ -163,7 +181,8 @@ async function fetchWorkshopPackageJson(repoName) {
                 return null;
             }
             try {
-                return (await response.json());
+                const parsed = PackageJsonSchema.safeParse(await response.json());
+                return parsed.success ? parsed.data : null;
             }
             catch {
                 return null;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "epicshop",
-  "version": "6.71.4",
+  "version": "6.72.1",
   "publishConfig": {
     "access": "public"
   },
@@ -99,9 +99,9 @@
     "build:watch": "nx watch --projects=epicshop -- nx run \\$NX_PROJECT_NAME:build"
   },
   "dependencies": {
-    "@epic-web/workshop-utils": "6.71.4",
+    "@epic-web/workshop-utils": "6.72.1",
     "@inquirer/prompts": "^8.2.0",
-    "@sentry/node": "^10.35.0",
+    "@sentry/node": "^10.36.0",
     "chalk": "^5.6.2",
     "close-with-grace": "^2.4.0",
     "execa": "^9.6.1",
@@ -109,7 +109,7 @@
     "match-sorter": "^8.2.0",
     "open": "^11.0.0",
     "openid-client": "^6.8.1",
-    "ora": "^9.0.0",
+    "ora": "^9.1.0",
     "yargs": "^18.0.0"
   },
   "devDependencies": {