LZMA workaround as per classroom

microbit-foundation · Mar 12, 2024 · 6d08aa6 · 6d08aa6
1 parent 59a2d56
commit 6d08aa6
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/src/fs/lzma.d.ts b/src/fs/lzma.d.ts
@@ -1 +1 @@
-declare module "lzma/src/lzma-d-min";
+declare module "lzma/src/lzma-d";
diff --git a/src/fs/migration.ts b/src/fs/migration.ts
@@ -5,6 +5,15 @@
  */
 import { toByteArray } from "base64-js";
 
+import lzma from "lzma/src/lzma-d";
+
+// LZMA isn't a proper module.
+// When bundled it assigns to window. At dev time it works via the above import.
+const LZMA =
+  typeof window !== "undefined" && (window as any).LZMA
+    ? (window as any).LZMA
+    : lzma.LZMA;
+
 // There are other fields that we don't use.
 export interface Migration {
   meta: {
@@ -34,10 +43,7 @@ export const parseMigrationFromUrl = (
   try {
     if (urlPart) {
       const bytes = toByteArray(urlPart);
-      const json = JSON.parse(
-        // FIXME, reinstate decompression with a working module.
-        /*LZMA.decompress(*/ new TextDecoder().decode(bytes) /*)*/
-      );
+      const json = JSON.parse(LZMA.decompress(bytes));
       if (isMigration(json)) {
         let postMigrationUrl = parts[0];
         // This was previously stripped off by the versioner but for now do it ourselves:
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		declare module "lzma/src/lzma-d-min";
		declare module "lzma/src/lzma-d";