From 6d6a634973a8365fea11e55a715dc5f5f688ea11 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tr=C3=A8sAbhi?= <43380238+tresabhi@users.noreply.github.com>
Date: Thu, 5 Jun 2025 13:01:50 -0500
Subject: [PATCH] fix: a bunch of stupid things

---
 .gitignore                                       |  2 +-
 packages/scripts/src/core/blitz/readDVPLFile.ts  | 13 ++++++++++++-
 .../src/core/github/commitMultipleFiles.ts       | 16 +++++++---------
 submodules/blitzkit-internal                     |  1 +
 4 files changed, 21 insertions(+), 11 deletions(-)
 create mode 160000 submodules/blitzkit-internal

diff --git a/.gitignore b/.gitignore
index abd77cc70..3804cd921 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,7 @@
 node_modules
 _node_modules
 package-lock.json
-.env
+*.env
 /test-results/
 /playwright-report/
 /playwright/.cache/
diff --git a/packages/scripts/src/core/blitz/readDVPLFile.ts b/packages/scripts/src/core/blitz/readDVPLFile.ts
index 49c6f4f82..422ef7258 100644
--- a/packages/scripts/src/core/blitz/readDVPLFile.ts
+++ b/packages/scripts/src/core/blitz/readDVPLFile.ts
@@ -1,9 +1,20 @@
 import { readFile } from 'fs/promises';
+import { DATA_COMPRESSED } from '../../buildAssets/constants';
 import { readDVPL } from './readDVPL';
 
 export async function readDVPLFile(file: string) {
-  const path = `${file}${file.endsWith('.dvpl') ? '' : '.dvpl'}`;
+  let path: string;
+
+  if (DATA_COMPRESSED) {
+    path = file.endsWith('.dvpl') ? file : `${file}.dvpl`;
+  } else {
+    path = file.replace('.dvpl', '');
+  }
+
   const content = await readFile(path);
+
+  if (!DATA_COMPRESSED) return content;
+
   const dvpl = readDVPL(content);
 
   return dvpl;
diff --git a/packages/scripts/src/core/github/commitMultipleFiles.ts b/packages/scripts/src/core/github/commitMultipleFiles.ts
index 300841201..6180407ab 100644
--- a/packages/scripts/src/core/github/commitMultipleFiles.ts
+++ b/packages/scripts/src/core/github/commitMultipleFiles.ts
@@ -1,3 +1,4 @@
+import { asset } from '@blitzkit/core';
 import ProgressBar from 'progress';
 import { GithubChangeBlob, createBlob } from './createBlob';
 import { octokit } from './octokit';
@@ -19,10 +20,7 @@ export async function commitMultipleFiles(
 
   await Promise.all(
     changesRaw.map(async (change) => {
-      const blobPath = `${repoRaw}/${branch}/${change.path}`;
-      const response = await fetch(
-        `https://raw.githubusercontent.com/${blobPath}`,
-      );
+      const response = await fetch(asset(change.path));
       let isNew: boolean;
       let isDifferent: boolean;
       let diff: number;
@@ -45,7 +43,7 @@ export async function commitMultipleFiles(
         isNew = false;
         const buffer = Buffer.from(await response.arrayBuffer());
 
-        if (buffer.equals(change.content)) {
+        if (buffer.equals(new Uint8Array(change.content))) {
           diff = 0;
           isDifferent = false;
         } else {
@@ -54,7 +52,7 @@ export async function commitMultipleFiles(
         }
       } else {
         throw new Error(
-          `Unexpected status code ${response.status} for ${blobPath}`,
+          `Unexpected status code ${response.status} for ${change.path}`,
         );
       }
 
@@ -73,17 +71,17 @@ export async function commitMultipleFiles(
 
       if (isNew) {
         console.log(
-          `🟢 (+${change.content.length.toLocaleString()}B) ${blobPath}`,
+          `🟢 (+${change.content.length.toLocaleString()}B) ${change.path}`,
         );
         changes.push(change);
       } else if (isDifferent) {
         console.log(
-          `🟡 (${diff > 0 ? '+' : ''}${diff.toLocaleString()}B) ${blobPath}`,
+          `🟡 (${diff > 0 ? '+' : ''}${diff.toLocaleString()}B) ${change.path}`,
         );
         changes.push(change);
       } else {
         console.log(
-          `🔵 (${change.content.length.toLocaleString()}B) ${blobPath}`,
+          `🔵 (${change.content.length.toLocaleString()}B) ${change.path}`,
         );
       }
     }),
diff --git a/submodules/blitzkit-internal b/submodules/blitzkit-internal
new file mode 160000
index 000000000..14adb2e45
--- /dev/null
+++ b/submodules/blitzkit-internal
@@ -0,0 +1 @@
+Subproject commit 14adb2e4566376bf0acba4524fd09456a49e6152