epicshop 6.85.3 → 6.85.5

package/dist/commands/auth.js

@@ -181,53 +181,48 @@ export async function login(options = {}) {
                 reject(new Error('Device authorization timed out'));
             }, deviceResponse.expires_in * 1000);
         });
-        try {
-            const tokenSet = await Promise.race([
-                client.pollDeviceAuthorizationGrant(config, deviceResponse),
-                timeoutPromise,
-            ]);
-            if (!tokenSet) {
-                const message = 'No token received from authorization';
-                if (!silent) {
-                    console.error(chalk.red(`❌ ${message}`));
-                }
-                return { success: false, message };
-            }
-            const UserInfoSchema = z.object({
-                id: z.string(),
-                email: z.string(),
-                name: z.string().nullable().optional(),
-            });
-            const protectedResourceResponse = await client.fetchProtectedResource(config, tokenSet.access_token, new URL(`${issuer}/userinfo`), 'GET');
-            const userinfoRaw = await protectedResourceResponse.json();
-            const userinfoResult = UserInfoSchema.safeParse(userinfoRaw);
-            if (!userinfoResult.success) {
-                const message = `Failed to parse user info: ${userinfoResult.error.message}`;
-                if (!silent) {
-                    console.error(chalk.red(`❌ ${message}`));
-                }
-                return { success: false, message };
+        const tokenSet = await Promise.race([
+            client.pollDeviceAuthorizationGrant(config, deviceResponse),
+            timeoutPromise,
+        ]);
+        if (!tokenSet) {
+            const message = 'No token received from authorization';
+            if (!silent) {
+                console.error(chalk.red(`❌ ${message}`));
             }
-            const userinfo = userinfoResult.data;
-            await saveAuthData(domain.host, {
-                id: userinfo.id,
-                tokenSet: {
-                    access_token: tokenSet.access_token,
-                    token_type: tokenSet.token_type ?? 'Bearer',
-                    scope: tokenSet.scope ?? '',
-                },
-                email: userinfo.email,
-                name: userinfo.name,
-            });
+            return { success: false, message };
+        }
+        const UserInfoSchema = z.object({
+            id: z.string(),
+            email: z.string(),
+            name: z.string().nullable().optional(),
+        });
+        const protectedResourceResponse = await client.fetchProtectedResource(config, tokenSet.access_token, new URL(`${issuer}/userinfo`), 'GET');
+        const userinfoRaw = await protectedResourceResponse.json();
+        const userinfoResult = UserInfoSchema.safeParse(userinfoRaw);
+        if (!userinfoResult.success) {
+            const message = `Failed to parse user info: ${userinfoResult.error.message}`;
             if (!silent) {
-                const name = userinfo.name ? ` (${userinfo.name})` : '';
-                console.log(chalk.green(`\n✅ Successfully logged in to ${domain.displayName} as ${chalk.cyan(userinfo.email)}${name}`));
+                console.error(chalk.red(`❌ ${message}`));
             }
-            return { success: true, message: `Logged in to ${domain.displayName}` };
+            return { success: false, message };
         }
-        catch (error) {
-            throw error;
+        const userinfo = userinfoResult.data;
+        await saveAuthData(domain.host, {
+            id: userinfo.id,
+            tokenSet: {
+                access_token: tokenSet.access_token,
+                token_type: tokenSet.token_type ?? 'Bearer',
+                scope: tokenSet.scope ?? '',
+            },
+            email: userinfo.email,
+            name: userinfo.name,
+        });
+        if (!silent) {
+            const name = userinfo.name ? ` (${userinfo.name})` : '';
+            console.log(chalk.green(`\n✅ Successfully logged in to ${domain.displayName} as ${chalk.cyan(userinfo.email)}${name}`));
         }
+        return { success: true, message: `Logged in to ${domain.displayName}` };
     }
     catch (error) {
         const message = error instanceof Error ? error.message : String(error);

package/dist/commands/start.js

@@ -1,4 +1,4 @@
-// eslint-disable-next-line import/order -- must appear first
+// oxlint-disable-next-line import/order -- must appear first
 import { getEnv } from '@epic-web/workshop-utils/init-env';
 import { spawn, execSync } from 'node:child_process';
 import crypto from 'node:crypto';

package/dist/commands/warm.js

@@ -9,7 +9,7 @@ export async function warm({ silent = false, } = {}) {
     }
     try {
         const { getApps, isProblemApp, isSolutionApp } = await import('@epic-web/workshop-utils/apps.server');
-        const { getDiffFiles, getDiffCode } = await import('@epic-web/workshop-utils/diff.server');
+        const { getDiffFiles, getDiffPatch } = await import('@epic-web/workshop-utils/diff.server');
         const { warmCache: warmEpicAPICache } = await import('@epic-web/workshop-utils/epic-api.server');
         void warmEpicAPICache().catch(() => { }); // ignore failure
         // Warm up the apps cache
@@ -34,7 +34,7 @@ export async function warm({ silent = false, } = {}) {
             if (solutionApp) {
                 const pairName = `${problemApp.exerciseNumber.toString().padStart(2, '0')}.${problemApp.stepNumber.toString().padStart(2, '0')}.problem vs ${solutionApp.exerciseNumber.toString().padStart(2, '0')}.${solutionApp.stepNumber.toString().padStart(2, '0')}.solution`;
                 try {
-                    await getDiffCode(problemApp, solutionApp);
+                    await getDiffPatch(problemApp, solutionApp);
                     await getDiffFiles(problemApp, solutionApp);
                     diffCount++;
                     if (!silent) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "epicshop",
-  "version": "6.85.3",
+  "version": "6.85.5",
   "publishConfig": {
     "access": "public"
   },
@@ -99,13 +99,13 @@
     "test": "vitest run",
     "test:watch": "vitest",
     "typecheck": "tsc --noEmit",
-    "lint": "eslint --cache --cache-location ./node_modules/.cache/eslint .",
+    "lint": "oxlint .",
     "build": "zshy",
     "postbuild": "node fix-bin.js",
     "build:watch": "nx watch --projects=epicshop -- nx run \\$NX_PROJECT_NAME:build"
   },
   "dependencies": {
-    "@epic-web/workshop-utils": "6.85.3",
+    "@epic-web/workshop-utils": "6.85.5",
     "@inquirer/prompts": "^8.2.0",
     "@sentry/node": "^10.38.0",
     "chalk": "^5.6.2",
@@ -119,7 +119,7 @@
     "yargs": "^18.0.0"
   },
   "devDependencies": {
-    "@epic-web/config": "^1.24.0",
+    "@epic-web/config": "^1.24.1",
     "@types/node": "^25.2.3",
     "@types/yargs": "^17.0.35",
     "vitest": "^4.0.18",