From 01a5687241b0dd5c52422b2ca34715ed72103472 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ari=20Perkki=C3=B6?= <ari.perkkio@gmail.com>
Date: Tue, 13 Aug 2024 09:59:30 +0300
Subject: [PATCH 1/8] fix(astro): don't import Astro's private modules

---
 .../astro/src/default/layouts/Layout.astro    |   2 +-
 .../src/default/layouts/swap-functions.js     | 183 ++++++++++++++++++
 2 files changed, 184 insertions(+), 1 deletion(-)
 create mode 100644 packages/astro/src/default/layouts/swap-functions.js

diff --git a/packages/astro/src/default/layouts/Layout.astro b/packages/astro/src/default/layouts/Layout.astro
index b77544c81..35b41b538 100644
--- a/packages/astro/src/default/layouts/Layout.astro
+++ b/packages/astro/src/default/layouts/Layout.astro
@@ -38,7 +38,7 @@ const baseURL = import.meta.env.BASE_URL;
       }
     </script>
     <script>
-      import * as builtInSwap from 'node_modules/astro/dist/transitions/swap-functions';
+      import * as builtInSwap from './swap-functions.js';
 
       declare global {
         function setTutorialKitTheme(): void;
diff --git a/packages/astro/src/default/layouts/swap-functions.js b/packages/astro/src/default/layouts/swap-functions.js
new file mode 100644
index 000000000..c5a0d8e22
--- /dev/null
+++ b/packages/astro/src/default/layouts/swap-functions.js
@@ -0,0 +1,183 @@
+// copy of built https://github.com/withastro/astro/blob/64f81e92d1ddd325f7f80508eb88590814c070a8/packages/astro/src/transitions/swap-functions.ts
+
+/* eslint-disable */
+
+/*
+MIT License
+
+Copyright (c) 2021 Fred K. Schott
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+"""
+This license applies to parts of the `packages/create-astro` and `packages/astro` subdirectories originating from the https://github.com/sveltejs/kit repository:
+
+Copyright (c) 2020 [these people](https://github.com/sveltejs/kit/graphs/contributors)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+"""
+
+"""
+This license applies to parts of the `packages/create-astro` and `packages/astro` subdirectories originating from the https://github.com/vitejs/vite repository:
+
+MIT License
+
+Copyright (c) 2019-present, Yuxi (Evan) You and Vite contributors
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+"""
+*/
+
+const PERSIST_ATTR = 'data-astro-transition-persist';
+
+function deselectScripts(doc) {
+  for (const s1 of document.scripts) {
+    for (const s2 of doc.scripts) {
+      if (
+        // Check if the script should be rerun regardless of it being the same
+        !s2.hasAttribute('data-astro-rerun') && // Inline
+        ((!s1.src && s1.textContent === s2.textContent) || // External
+          (s1.src && s1.type === s2.type && s1.src === s2.src))
+      ) {
+        s2.dataset.astroExec = '';
+        break;
+      }
+    }
+  }
+}
+
+function swapRootAttributes(doc) {
+  const html = document.documentElement;
+  const astroAttributes = [...html.attributes].filter(
+    ({ name }) => (html.removeAttribute(name), name.startsWith('data-astro-')),
+  );
+  [...doc.documentElement.attributes, ...astroAttributes].forEach(({ name, value }) => html.setAttribute(name, value));
+}
+
+function swapHeadElements(doc) {
+  for (const el of Array.from(document.head.children)) {
+    const newEl = persistedHeadElement(el, doc);
+
+    if (newEl) {
+      newEl.remove();
+    } else {
+      el.remove();
+    }
+  }
+  document.head.append(...doc.head.children);
+}
+
+function swapBodyElement(newElement, oldElement) {
+  oldElement.replaceWith(newElement);
+
+  for (const el of oldElement.querySelectorAll(`[${PERSIST_ATTR}]`)) {
+    const id = el.getAttribute(PERSIST_ATTR);
+    const newEl = newElement.querySelector(`[${PERSIST_ATTR}="${id}"]`);
+
+    if (newEl) {
+      newEl.replaceWith(el);
+
+      if (newEl.localName === 'astro-island' && shouldCopyProps(el)) {
+        el.setAttribute('ssr', '');
+        el.setAttribute('props', newEl.getAttribute('props'));
+      }
+    }
+  }
+}
+
+const saveFocus = () => {
+  const activeElement = document.activeElement;
+
+  if (activeElement?.closest(`[${PERSIST_ATTR}]`)) {
+    if (activeElement instanceof HTMLInputElement || activeElement instanceof HTMLTextAreaElement) {
+      const start = activeElement.selectionStart;
+      const end = activeElement.selectionEnd;
+
+      return () => restoreFocus({ activeElement, start, end });
+    }
+
+    return () => restoreFocus({ activeElement });
+  } else {
+    return () => restoreFocus({ activeElement: null });
+  }
+};
+const restoreFocus = ({ activeElement, start, end }) => {
+  if (activeElement) {
+    activeElement.focus();
+
+    if (activeElement instanceof HTMLInputElement || activeElement instanceof HTMLTextAreaElement) {
+      if (typeof start === 'number') {
+        activeElement.selectionStart = start;
+      }
+
+      if (typeof end === 'number') {
+        activeElement.selectionEnd = end;
+      }
+    }
+  }
+};
+const persistedHeadElement = (el, newDoc) => {
+  const id = el.getAttribute(PERSIST_ATTR);
+  const newEl = id && newDoc.head.querySelector(`[${PERSIST_ATTR}="${id}"]`);
+
+  if (newEl) {
+    return newEl;
+  }
+
+  if (el.matches('link[rel=stylesheet]')) {
+    const href = el.getAttribute('href');
+    return newDoc.head.querySelector(`link[rel=stylesheet][href="${href}"]`);
+  }
+
+  return null;
+};
+const shouldCopyProps = (el) => {
+  const persistProps = el.dataset.astroTransitionPersistProps;
+  return persistProps == null || persistProps === 'false';
+};
+const swap = (doc) => {
+  deselectScripts(doc);
+  swapRootAttributes(doc);
+  swapHeadElements(doc);
+
+  const restoreFocusFunction = saveFocus();
+  swapBodyElement(doc.body, document.body);
+  restoreFocusFunction();
+};
+export { deselectScripts, restoreFocus, saveFocus, swap, swapBodyElement, swapHeadElements, swapRootAttributes };

From e2f8aa6eb07f10becb67c73602262ba835bf3eb2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ari=20Perkki=C3=B6?= <ari.perkkio@gmail.com>
Date: Tue, 13 Aug 2024 10:41:36 +0300
Subject: [PATCH 2/8] test: udpate snapshots

---
 packages/cli/tests/__snapshots__/create-tutorial.test.ts.snap | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/cli/tests/__snapshots__/create-tutorial.test.ts.snap b/packages/cli/tests/__snapshots__/create-tutorial.test.ts.snap
index 381191655..f917cd886 100644
--- a/packages/cli/tests/__snapshots__/create-tutorial.test.ts.snap
+++ b/packages/cli/tests/__snapshots__/create-tutorial.test.ts.snap
@@ -268,6 +268,7 @@ exports[`create and eject a project 1`] = `
   "src/env.d.ts",
   "src/layouts",
   "src/layouts/Layout.astro",
+  "src/layouts/swap-functions.js",
   "src/pages",
   "src/pages/[...slug].astro",
   "src/pages/index.astro",

From 3d3032db721511ac826a7764a0848535fd452545 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ari=20Perkki=C3=B6?= <ari.perkkio@gmail.com>
Date: Wed, 14 Aug 2024 09:23:28 +0300
Subject: [PATCH 3/8] fix(astro): resolve Astro's private APIs properly

---
 .../astro/src/default/layouts/Layout.astro    |   3 +-
 .../src/default/layouts/swap-functions.js     | 183 ------------------
 packages/astro/src/index.ts                   |   2 +
 .../src/vite-plugins/astro-swap-functions.ts  |  36 ++++
 .../create-tutorial.test.ts.snap              |   1 -
 5 files changed, 40 insertions(+), 185 deletions(-)
 delete mode 100644 packages/astro/src/default/layouts/swap-functions.js
 create mode 100644 packages/astro/src/vite-plugins/astro-swap-functions.ts

diff --git a/packages/astro/src/default/layouts/Layout.astro b/packages/astro/src/default/layouts/Layout.astro
index 35b41b538..8af57f9f5 100644
--- a/packages/astro/src/default/layouts/Layout.astro
+++ b/packages/astro/src/default/layouts/Layout.astro
@@ -38,7 +38,8 @@ const baseURL = import.meta.env.BASE_URL;
       }
     </script>
     <script>
-      import * as builtInSwap from './swap-functions.js';
+      // @ts-ignore -- untyped
+      import * as builtInSwap from 'tutorialkit:astro-swap-functions';
 
       declare global {
         function setTutorialKitTheme(): void;
diff --git a/packages/astro/src/default/layouts/swap-functions.js b/packages/astro/src/default/layouts/swap-functions.js
deleted file mode 100644
index c5a0d8e22..000000000
--- a/packages/astro/src/default/layouts/swap-functions.js
+++ /dev/null
@@ -1,183 +0,0 @@
-// copy of built https://github.com/withastro/astro/blob/64f81e92d1ddd325f7f80508eb88590814c070a8/packages/astro/src/transitions/swap-functions.ts
-
-/* eslint-disable */
-
-/*
-MIT License
-
-Copyright (c) 2021 Fred K. Schott
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
-"""
-This license applies to parts of the `packages/create-astro` and `packages/astro` subdirectories originating from the https://github.com/sveltejs/kit repository:
-
-Copyright (c) 2020 [these people](https://github.com/sveltejs/kit/graphs/contributors)
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-"""
-
-"""
-This license applies to parts of the `packages/create-astro` and `packages/astro` subdirectories originating from the https://github.com/vitejs/vite repository:
-
-MIT License
-
-Copyright (c) 2019-present, Yuxi (Evan) You and Vite contributors
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-"""
-*/
-
-const PERSIST_ATTR = 'data-astro-transition-persist';
-
-function deselectScripts(doc) {
-  for (const s1 of document.scripts) {
-    for (const s2 of doc.scripts) {
-      if (
-        // Check if the script should be rerun regardless of it being the same
-        !s2.hasAttribute('data-astro-rerun') && // Inline
-        ((!s1.src && s1.textContent === s2.textContent) || // External
-          (s1.src && s1.type === s2.type && s1.src === s2.src))
-      ) {
-        s2.dataset.astroExec = '';
-        break;
-      }
-    }
-  }
-}
-
-function swapRootAttributes(doc) {
-  const html = document.documentElement;
-  const astroAttributes = [...html.attributes].filter(
-    ({ name }) => (html.removeAttribute(name), name.startsWith('data-astro-')),
-  );
-  [...doc.documentElement.attributes, ...astroAttributes].forEach(({ name, value }) => html.setAttribute(name, value));
-}
-
-function swapHeadElements(doc) {
-  for (const el of Array.from(document.head.children)) {
-    const newEl = persistedHeadElement(el, doc);
-
-    if (newEl) {
-      newEl.remove();
-    } else {
-      el.remove();
-    }
-  }
-  document.head.append(...doc.head.children);
-}
-
-function swapBodyElement(newElement, oldElement) {
-  oldElement.replaceWith(newElement);
-
-  for (const el of oldElement.querySelectorAll(`[${PERSIST_ATTR}]`)) {
-    const id = el.getAttribute(PERSIST_ATTR);
-    const newEl = newElement.querySelector(`[${PERSIST_ATTR}="${id}"]`);
-
-    if (newEl) {
-      newEl.replaceWith(el);
-
-      if (newEl.localName === 'astro-island' && shouldCopyProps(el)) {
-        el.setAttribute('ssr', '');
-        el.setAttribute('props', newEl.getAttribute('props'));
-      }
-    }
-  }
-}
-
-const saveFocus = () => {
-  const activeElement = document.activeElement;
-
-  if (activeElement?.closest(`[${PERSIST_ATTR}]`)) {
-    if (activeElement instanceof HTMLInputElement || activeElement instanceof HTMLTextAreaElement) {
-      const start = activeElement.selectionStart;
-      const end = activeElement.selectionEnd;
-
-      return () => restoreFocus({ activeElement, start, end });
-    }
-
-    return () => restoreFocus({ activeElement });
-  } else {
-    return () => restoreFocus({ activeElement: null });
-  }
-};
-const restoreFocus = ({ activeElement, start, end }) => {
-  if (activeElement) {
-    activeElement.focus();
-
-    if (activeElement instanceof HTMLInputElement || activeElement instanceof HTMLTextAreaElement) {
-      if (typeof start === 'number') {
-        activeElement.selectionStart = start;
-      }
-
-      if (typeof end === 'number') {
-        activeElement.selectionEnd = end;
-      }
-    }
-  }
-};
-const persistedHeadElement = (el, newDoc) => {
-  const id = el.getAttribute(PERSIST_ATTR);
-  const newEl = id && newDoc.head.querySelector(`[${PERSIST_ATTR}="${id}"]`);
-
-  if (newEl) {
-    return newEl;
-  }
-
-  if (el.matches('link[rel=stylesheet]')) {
-    const href = el.getAttribute('href');
-    return newDoc.head.querySelector(`link[rel=stylesheet][href="${href}"]`);
-  }
-
-  return null;
-};
-const shouldCopyProps = (el) => {
-  const persistProps = el.dataset.astroTransitionPersistProps;
-  return persistProps == null || persistProps === 'false';
-};
-const swap = (doc) => {
-  deselectScripts(doc);
-  swapRootAttributes(doc);
-  swapHeadElements(doc);
-
-  const restoreFocusFunction = saveFocus();
-  swapBodyElement(doc.body, document.body);
-  restoreFocusFunction();
-};
-export { deselectScripts, restoreFocus, saveFocus, swap, swapBodyElement, swapHeadElements, swapRootAttributes };
diff --git a/packages/astro/src/index.ts b/packages/astro/src/index.ts
index 02bd01f0d..349d75447 100644
--- a/packages/astro/src/index.ts
+++ b/packages/astro/src/index.ts
@@ -4,6 +4,7 @@ import { fileURLToPath } from 'node:url';
 import { extraIntegrations } from './integrations.js';
 import { updateMarkdownConfig } from './remark/index.js';
 import { tutorialkitCore } from './vite-plugins/core.js';
+import { astroSwapFunctions } from './vite-plugins/astro-swap-functions.js';
 import { userlandCSS, watchUserlandCSS } from './vite-plugins/css.js';
 import { tutorialkitStore } from './vite-plugins/store.js';
 import { overrideComponents, type OverrideComponentsOptions } from './vite-plugins/override-components.js';
@@ -108,6 +109,7 @@ export default function createPlugin({
               tutorialkitStore,
               tutorialkitCore,
               overrideComponents({ components, defaultRoutes: !!defaultRoutes }),
+              astroSwapFunctions(),
               process.env.TUTORIALKIT_DEV ? (await import('vite-plugin-inspect')).default() : null,
             ],
           },
diff --git a/packages/astro/src/vite-plugins/astro-swap-functions.ts b/packages/astro/src/vite-plugins/astro-swap-functions.ts
new file mode 100644
index 000000000..d23d0ad83
--- /dev/null
+++ b/packages/astro/src/vite-plugins/astro-swap-functions.ts
@@ -0,0 +1,36 @@
+/**
+ * A plugin for importing Astro's private 'transitions/swap-functions.js' module.
+ * This is temporary solution and can break at any time when end-user's update their `astro` version.
+ */
+import { readFile } from 'node:fs/promises';
+import { createRequire } from 'node:module';
+import { resolve } from 'node:path';
+import type { VitePlugin } from '../types.js';
+
+const require = createRequire(import.meta.url);
+const astroDist = resolve(require.resolve('astro/package.json'), '..');
+const swapFunctionEntry = resolve(astroDist, 'dist/transitions/swap-functions.js');
+
+const virtualModuleId = 'tutorialkit:astro-swap-functions';
+const resolvedId = `\0${virtualModuleId}`;
+
+export function astroSwapFunctions(): VitePlugin {
+  return {
+    name: 'tutorialkit-astro-swap-functions-plugin',
+    resolveId(id) {
+      if (id === virtualModuleId) {
+        return resolvedId;
+      }
+
+      return undefined;
+    },
+
+    async load(id) {
+      if (id === resolvedId) {
+        return await readFile(swapFunctionEntry, 'utf8');
+      }
+
+      return undefined;
+    },
+  };
+}
diff --git a/packages/cli/tests/__snapshots__/create-tutorial.test.ts.snap b/packages/cli/tests/__snapshots__/create-tutorial.test.ts.snap
index f917cd886..381191655 100644
--- a/packages/cli/tests/__snapshots__/create-tutorial.test.ts.snap
+++ b/packages/cli/tests/__snapshots__/create-tutorial.test.ts.snap
@@ -268,7 +268,6 @@ exports[`create and eject a project 1`] = `
   "src/env.d.ts",
   "src/layouts",
   "src/layouts/Layout.astro",
-  "src/layouts/swap-functions.js",
   "src/pages",
   "src/pages/[...slug].astro",
   "src/pages/index.astro",

From e757484cd63a27fc99a6cd7f90367fd8fc672b48 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ari=20Perkki=C3=B6?= <ari.perkkio@gmail.com>
Date: Wed, 14 Aug 2024 12:34:29 +0300
Subject: [PATCH 4/8] fix: code review

Co-authored-by: Dominic Elm <d3lm@users.noreply.github.com>
---
 packages/astro/src/default/layouts/Layout.astro | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/astro/src/default/layouts/Layout.astro b/packages/astro/src/default/layouts/Layout.astro
index 8af57f9f5..ae460fc48 100644
--- a/packages/astro/src/default/layouts/Layout.astro
+++ b/packages/astro/src/default/layouts/Layout.astro
@@ -38,7 +38,7 @@ const baseURL = import.meta.env.BASE_URL;
       }
     </script>
     <script>
-      // @ts-ignore -- untyped
+      // @ts-ignore because it's untyped
       import * as builtInSwap from 'tutorialkit:astro-swap-functions';
 
       declare global {

From bfa5a54c79f80e9193283905e101ae7b3ae44647 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ari=20Perkki=C3=B6?= <ari.perkkio@gmail.com>
Date: Wed, 14 Aug 2024 14:35:51 +0300
Subject: [PATCH 5/8] fix: code review

---
 packages/astro/src/vite-plugins/astro-swap-functions.ts | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/astro/src/vite-plugins/astro-swap-functions.ts b/packages/astro/src/vite-plugins/astro-swap-functions.ts
index d23d0ad83..4e053217e 100644
--- a/packages/astro/src/vite-plugins/astro-swap-functions.ts
+++ b/packages/astro/src/vite-plugins/astro-swap-functions.ts
@@ -2,7 +2,6 @@
  * A plugin for importing Astro's private 'transitions/swap-functions.js' module.
  * This is temporary solution and can break at any time when end-user's update their `astro` version.
  */
-import { readFile } from 'node:fs/promises';
 import { createRequire } from 'node:module';
 import { resolve } from 'node:path';
 import type { VitePlugin } from '../types.js';
@@ -27,7 +26,7 @@ export function astroSwapFunctions(): VitePlugin {
 
     async load(id) {
       if (id === resolvedId) {
-        return await readFile(swapFunctionEntry, 'utf8');
+        return `export * from '${swapFunctionEntry}';`;
       }
 
       return undefined;

From e987eef6d9670a3ef5031420153e12710e4737fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ari=20Perkki=C3=B6?= <ari.perkkio@gmail.com>
Date: Wed, 14 Aug 2024 14:51:00 +0300
Subject: [PATCH 6/8] fix: windows paths

---
 packages/astro/src/vite-plugins/astro-swap-functions.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/astro/src/vite-plugins/astro-swap-functions.ts b/packages/astro/src/vite-plugins/astro-swap-functions.ts
index 4e053217e..114bae5d3 100644
--- a/packages/astro/src/vite-plugins/astro-swap-functions.ts
+++ b/packages/astro/src/vite-plugins/astro-swap-functions.ts
@@ -3,12 +3,12 @@
  * This is temporary solution and can break at any time when end-user's update their `astro` version.
  */
 import { createRequire } from 'node:module';
-import { resolve } from 'node:path';
+import { resolve, join } from 'node:path';
 import type { VitePlugin } from '../types.js';
 
 const require = createRequire(import.meta.url);
-const astroDist = resolve(require.resolve('astro/package.json'), '..');
-const swapFunctionEntry = resolve(astroDist, 'dist/transitions/swap-functions.js');
+const astroDist = resolve(require.resolve(join('astro', 'package.json')), '..');
+const swapFunctionEntry = join(astroDist, 'dist', 'transitions', 'swap-functions.js');
 
 const virtualModuleId = 'tutorialkit:astro-swap-functions';
 const resolvedId = `\0${virtualModuleId}`;

From c907e47e89212fce67ea0889762cc0ac3d0c380c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ari=20Perkki=C3=B6?= <ari.perkkio@gmail.com>
Date: Wed, 14 Aug 2024 15:13:52 +0300
Subject: [PATCH 7/8] fix: windows paths

---
 packages/astro/src/vite-plugins/astro-swap-functions.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/astro/src/vite-plugins/astro-swap-functions.ts b/packages/astro/src/vite-plugins/astro-swap-functions.ts
index 114bae5d3..d67ec3c95 100644
--- a/packages/astro/src/vite-plugins/astro-swap-functions.ts
+++ b/packages/astro/src/vite-plugins/astro-swap-functions.ts
@@ -3,12 +3,12 @@
  * This is temporary solution and can break at any time when end-user's update their `astro` version.
  */
 import { createRequire } from 'node:module';
-import { resolve, join } from 'node:path';
+import { resolve, sep } from 'node:path';
 import type { VitePlugin } from '../types.js';
 
 const require = createRequire(import.meta.url);
-const astroDist = resolve(require.resolve(join('astro', 'package.json')), '..');
-const swapFunctionEntry = join(astroDist, 'dist', 'transitions', 'swap-functions.js');
+const astroDist = resolve(require.resolve('astro/package.json'), '..');
+const swapFunctionEntry = resolve(astroDist, 'dist/transitions/swap-functions.js').replaceAll(sep, '/');
 
 const virtualModuleId = 'tutorialkit:astro-swap-functions';
 const resolvedId = `\0${virtualModuleId}`;

From e0fe0fff0be723ce84b398179d923196135b17e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ari=20Perkki=C3=B6?= <ari.perkkio@gmail.com>
Date: Wed, 14 Aug 2024 16:14:33 +0300
Subject: [PATCH 8/8] fix: code review

---
 packages/astro/src/default/env-default.d.ts     | 2 ++
 packages/astro/src/default/layouts/Layout.astro | 1 -
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/astro/src/default/env-default.d.ts b/packages/astro/src/default/env-default.d.ts
index f61727d18..8507091db 100644
--- a/packages/astro/src/default/env-default.d.ts
+++ b/packages/astro/src/default/env-default.d.ts
@@ -13,5 +13,7 @@ declare module 'tutorialkit:override-components' {
   export { topBar as TopBar };
 }
 
+declare module 'tutorialkit:astro-swap-functions';
+
 declare const __ENTERPRISE__: boolean;
 declare const __WC_CONFIG__: WebContainerConfig | undefined;
diff --git a/packages/astro/src/default/layouts/Layout.astro b/packages/astro/src/default/layouts/Layout.astro
index ae460fc48..4b8ceb3a0 100644
--- a/packages/astro/src/default/layouts/Layout.astro
+++ b/packages/astro/src/default/layouts/Layout.astro
@@ -38,7 +38,6 @@ const baseURL = import.meta.env.BASE_URL;
       }
     </script>
     <script>
-      // @ts-ignore because it's untyped
       import * as builtInSwap from 'tutorialkit:astro-swap-functions';
 
       declare global {