fix: solve shows lesson-only files empty

AriPerkkio · AriPerkkio · commit 172847524473 · 2024-07-25T10:15:15.000+03:00
diff --git a/packages/cli/tests/__snapshots__/create-tutorial.test.ts.snap b/packages/cli/tests/__snapshots__/create-tutorial.test.ts.snap
@@ -46,6 +46,9 @@ exports[`create a project 1`] = `
   "src/content/tutorial/1-basics/1-introduction/2-foo/_files/src/index.html",
   "src/content/tutorial/1-basics/1-introduction/2-foo/_files/src/unicorn.js",
   "src/content/tutorial/1-basics/1-introduction/2-foo/_files/src/windows_xp.png",
+  "src/content/tutorial/1-basics/1-introduction/2-foo/_solution",
+  "src/content/tutorial/1-basics/1-introduction/2-foo/_solution/src",
+  "src/content/tutorial/1-basics/1-introduction/2-foo/_solution/src/index.html",
   "src/content/tutorial/1-basics/1-introduction/2-foo/content.mdx",
   "src/content/tutorial/1-basics/1-introduction/3-bar",
   "src/content/tutorial/1-basics/1-introduction/3-bar/_files",
@@ -97,6 +100,7 @@ exports[`create and build a project 1`] = `
   "1-basics-1-introduction-1-welcome-files.json",
   "1-basics-1-introduction-1-welcome-solution.json",
   "1-basics-1-introduction-2-foo-files.json",
+  "1-basics-1-introduction-2-foo-solution.json",
   "1-basics-1-introduction-3-bar-files.json",
   "1-basics/2-foo",
   "1-basics/2-foo/1-welcome",
@@ -185,6 +189,9 @@ exports[`create and eject a project 1`] = `
   "src/content/tutorial/1-basics/1-introduction/2-foo/_files/src/index.html",
   "src/content/tutorial/1-basics/1-introduction/2-foo/_files/src/unicorn.js",
   "src/content/tutorial/1-basics/1-introduction/2-foo/_files/src/windows_xp.png",
+  "src/content/tutorial/1-basics/1-introduction/2-foo/_solution",
+  "src/content/tutorial/1-basics/1-introduction/2-foo/_solution/src",
+  "src/content/tutorial/1-basics/1-introduction/2-foo/_solution/src/index.html",
   "src/content/tutorial/1-basics/1-introduction/2-foo/content.mdx",
   "src/content/tutorial/1-basics/1-introduction/3-bar",
   "src/content/tutorial/1-basics/1-introduction/3-bar/_files",
@@ -276,6 +283,7 @@ exports[`create, eject and build a project 1`] = `
   "1-basics-1-introduction-1-welcome-files.json",
   "1-basics-1-introduction-1-welcome-solution.json",
   "1-basics-1-introduction-2-foo-files.json",
+  "1-basics-1-introduction-2-foo-solution.json",
   "1-basics-1-introduction-3-bar-files.json",
   "1-basics/2-foo",
   "1-basics/2-foo/1-welcome",
diff --git a/packages/runtime/src/store/index.ts b/packages/runtime/src/store/index.ts
@@ -290,8 +290,10 @@ export class TutorialStore {
       return;
     }
 
-    this._editorStore.setDocuments(this._lessonSolution);
-    this._runner.updateFiles(this._lessonSolution);
+    const files = { ...this._lessonFiles, ...this._lessonSolution };
+
+    this._editorStore.setDocuments(files);
+    this._runner.updateFiles(files);
   }
 
   setSelectedFile(filePath: string | undefined) {
diff --git a/packages/template/src/content/tutorial/1-basics/1-introduction/2-foo/_solution/src/index.html b/packages/template/src/content/tutorial/1-basics/1-introduction/2-foo/_solution/src/index.html
@@ -0,0 +1,12 @@
+<!doctype html>
+<html lang="en">
+  <head>
+    <meta charset="UTF-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title>Document</title>
+  </head>
+  <body>
+    <h1>Solution</h1>
+    <p>Other files should be visible as well</p>
+  </body>
+</html>

Original file line number	Diff line number	Diff line change
`@@ -290,8 +290,10 @@ export class TutorialStore {`
`290`	`290`	`return;`
`291`	`291`	`}`
`292`	`292`
`293`		`- this._editorStore.setDocuments(this._lessonSolution);`
`294`		`- this._runner.updateFiles(this._lessonSolution);`
	`293`	`+ const files = { ...this._lessonFiles, ...this._lessonSolution };`
	`294`	`+`
	`295`	`+ this._editorStore.setDocuments(files);`
	`296`	`+ this._runner.updateFiles(files);`
`295`	`297`	`}`
`296`	`298`
`297`	`299`	`setSelectedFile(filePath: string \| undefined) {`