From 17284752447384a1cc271dd1f2b1e0ebd06f32ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ari=20Perkki=C3=B6?= Date: Wed, 24 Jul 2024 18:27:13 +0300 Subject: [PATCH] fix: solve shows lesson-only files empty --- .../tests/__snapshots__/create-tutorial.test.ts.snap | 8 ++++++++ packages/runtime/src/store/index.ts | 6 ++++-- .../1-introduction/2-foo/_solution/src/index.html | 12 ++++++++++++ 3 files changed, 24 insertions(+), 2 deletions(-) create mode 100644 packages/template/src/content/tutorial/1-basics/1-introduction/2-foo/_solution/src/index.html diff --git a/packages/cli/tests/__snapshots__/create-tutorial.test.ts.snap b/packages/cli/tests/__snapshots__/create-tutorial.test.ts.snap index afc56b2ff..31799e804 100644 --- 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 index 143bd6a61..e2349a787 100644 --- 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 new file mode 100644 index 000000000..bcbe92f86 --- /dev/null +++ b/packages/template/src/content/tutorial/1-basics/1-introduction/2-foo/_solution/src/index.html @@ -0,0 +1,12 @@ + + + + + + Document + + +

Solution

+

Other files should be visible as well

+ +