fix: support inheritance for editor/focus and fix bug with logo (stackblitz#67)

Author: Nemikolh

packages/astro/src/default/components/Header.astro

@@ -14,8 +14,9 @@ const LOGO_EXTENSIONS = [
 
 let logo;
 
-for (const logoFilename of LOGO_EXTENSIONS) {
-  const exists = fs.existsSync(path.join('public', `logo.${logoFilename}`));
+for (const logoExt of LOGO_EXTENSIONS) {
+  const logoFilename = `logo.${logoExt}`;
+  const exists = fs.existsSync(path.join('public', logoFilename));
 
   if (exists) {
     logo = `/${logoFilename}`;

packages/astro/src/default/utils/content.ts

@@ -116,7 +116,7 @@ export async function getTutorial(): Promise<Tutorial> {
     lesson.data = {
       ...pick(
         [lesson.data, chapterMetadata, partMetadata, tutorialMetaData],
-        ['mainCommand', 'prepareCommands', 'previews', 'autoReload', 'template', 'terminal'],
+        ['mainCommand', 'prepareCommands', 'previews', 'autoReload', 'template', 'terminal', 'editor', 'focus'],
       ),
       ...lesson.data,
     };

packages/types/src/schemas/common.ts

@@ -114,6 +114,7 @@ export const webcontainerSchema = commandsSchema.extend({
   autoReload: z.boolean().optional(),
   template: z.string().optional(),
   terminal: terminalSchema.optional(),
+  focus: z.string().optional(),
   editor: z.union([
     // can either be completely removed by setting it to `false`
     z.boolean().optional(),

packages/types/src/schemas/lesson.ts

@@ -3,7 +3,6 @@ import { baseSchema } from './common.js';
 
 export const lessonSchema = baseSchema.extend({
   type: z.literal('lesson'),
-  focus: z.string().optional(),
   scope: z.string().optional(),
   hideRoot: z.boolean().optional(),
 });