Upgrade react-scripts, switch from adm-zip to fflate.

adm-zip did not play nice with compiling to the browser after upgrading react-scripts
This commit is contained in:
Przemek Więch
2025-01-10 23:55:16 +01:00
parent c54c70b874
commit c208452553
6 changed files with 21585 additions and 26811 deletions

View File

@@ -3,7 +3,8 @@ import {convertGedcom, getSoftware, TopolaData} from '../util/gedcom_util';
import {DataSource, DataSourceEnum, SourceSelection} from './data_source';
import {IndiInfo, JsonGedcomData} from 'topola';
import {TopolaError} from '../util/error';
import AdmZip from 'adm-zip';
import {strFromU8, unzip, Unzipped} from 'fflate';
import {Buffer} from 'buffer';
/**
* Returns a valid IndiInfo object, either with the given indi and generation
@@ -40,24 +41,29 @@ function prepareData(
async function loadGedzip(
blob: Blob,
): Promise<{gedcom: string; images: Map<string, string>}> {
const zip = new AdmZip(Buffer.from(await blob.arrayBuffer()));
const entries = zip.getEntries();
const buffer = Buffer.from(await blob.arrayBuffer());
const unzipped: Unzipped = await new Promise((resolve, reject) => {
unzip(buffer, (err, result) => {
if (err) {
reject(err);
} else {
resolve(result);
}
});
});
let gedcom = undefined;
const images = new Map<string, string>();
for (const entry of entries) {
if (entry.entryName.endsWith('.ged')) {
for (let fileName of Object.keys(unzipped)) {
if (fileName.endsWith('.ged')) {
if (gedcom) {
console.warn('Multiple GEDCOM files found in zip archive.');
} else {
gedcom = entry.getData().toString();
gedcom = strFromU8(unzipped[fileName]);
}
} else {
// Save image for later.
images.set(
entry.entryName,
URL.createObjectURL(new Blob([entry.getData()])),
);
images.set(fileName, URL.createObjectURL(new Blob([unzipped[fileName]])));
}
}
if (!gedcom) {