Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion packages/api/core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@
"filenamify": "^4.1.0",
"find-up": "^5.0.0",
"fs-extra": "^10.0.0",
"got": "^14.0.0",
"jiti": "^2.4.2",
"listr2": "^7.0.2",
"log-symbols": "^4.0.0",
Expand Down
3 changes: 1 addition & 2 deletions packages/maker/zip/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,7 @@
"@electron-forge/maker-base": "workspace:*",
"@electron-forge/shared-types": "workspace:*",
"cross-zip": "^4.0.0",
"fs-extra": "^10.0.0",
"got": "^14.0.0"
"fs-extra": "^10.0.0"
},
"publishConfig": {
"access": "public"
Expand Down
54 changes: 25 additions & 29 deletions packages/maker/zip/spec/MakerZip.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@ import path from 'node:path';
import { ForgeArch } from '@electron-forge/shared-types';
import { zip } from 'cross-zip';
import fs from 'fs-extra';
import { got } from 'got';
import { describe, expect, it, vi } from 'vitest';
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';

import { MakerZIP } from '../src/MakerZIP';

Expand All @@ -32,19 +31,17 @@ vi.mock(import('fs-extra'), async (importOriginal) => {
};
});

// @ts-expect-error - This mock works but vi.mock isn't happy.
vi.mock(import('got'), async (importOriginal) => {
const mod = await importOriginal();
return {
...mod,
got: {
...mod.got,
get: vi.fn(),
},
};
});

describe('MakerZip', () => {
const mockFetch = vi.fn();

beforeEach(() => {
vi.stubGlobal('fetch', mockFetch);
});

afterEach(() => {
vi.unstubAllGlobals();
});

const dir = path.resolve(import.meta.dirname, 'fixture', 'fake-app');
const darwinDir = path.resolve(
import.meta.dirname,
Expand Down Expand Up @@ -141,7 +138,7 @@ describe('MakerZip', () => {
});

expect(output).toHaveLength(1);
expect(got.get).not.toHaveBeenCalled();
expect(mockFetch).not.toHaveBeenCalled();
},
);

Expand All @@ -155,7 +152,7 @@ describe('MakerZip', () => {
);
maker.prepareConfig(targetArch);
maker.ensureFile = vi.fn();
vi.mocked(got.get).mockResolvedValue({ statusCode: 200, body: '{}' });
mockFetch.mockResolvedValue(new Response('{}', { status: 200 }));
await maker.make({
dir: darwinDir,
makeDir,
Expand All @@ -166,7 +163,7 @@ describe('MakerZip', () => {
forgeConfig: null as any,
});

expect(got.get).toHaveBeenCalledOnce();
expect(mockFetch).toHaveBeenCalledOnce();
expect(fs.writeJson).toHaveBeenCalledWith(expect.anything(), {
currentRelease: '1.2.3',
releases: [
Expand All @@ -193,10 +190,7 @@ describe('MakerZip', () => {
);
maker.prepareConfig(targetArch);
maker.ensureFile = vi.fn();
vi.mocked(got.get).mockResolvedValue({
statusCode: 404,
body: undefined,
});
mockFetch.mockResolvedValue(new Response(null, { status: 404 }));
await maker.make({
dir: darwinDir,
makeDir,
Expand All @@ -207,7 +201,7 @@ describe('MakerZip', () => {
forgeConfig: null as any,
});

expect(got.get).toHaveBeenCalledOnce();
expect(mockFetch).toHaveBeenCalledOnce();
expect(fs.writeJson).toHaveBeenCalledWith(expect.anything(), {
currentRelease: '1.2.3',
releases: [
Expand Down Expand Up @@ -243,13 +237,15 @@ describe('MakerZip', () => {
url: 'fake://test/bar',
},
};
vi.mocked(got.get).mockResolvedValue({
statusCode: 200,
body: JSON.stringify({
currentRelease: '1.1.1',
releases: [oneOneOneRelease],
}),
});
mockFetch.mockResolvedValue(
new Response(
JSON.stringify({
currentRelease: '1.1.1',
releases: [oneOneOneRelease],
}),
{ status: 200 },
),
);
await maker.make({
dir: darwinDir,
makeDir,
Expand Down
9 changes: 3 additions & 6 deletions packages/maker/zip/src/MakerZIP.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import { MakerBase, MakerOptions } from '@electron-forge/maker-base';
import { ForgePlatform } from '@electron-forge/shared-types';
import { zip } from 'cross-zip';
import fs from 'fs-extra';
import { got } from 'got';

import { MakerZIPConfig } from './Config.js';

Expand Down Expand Up @@ -62,15 +61,13 @@ export default class MakerZIP extends MakerBase<MakerZIPConfig> {
if (targetPlatform === 'darwin' && this.config.macUpdateManifestBaseUrl) {
const parsed = new URL(this.config.macUpdateManifestBaseUrl);
parsed.pathname += '/RELEASES.json';
const response = await got.get(parsed.toString(), {
throwHttpErrors: false,
});
const response = await fetch(parsed.toString());
let currentValue: SquirrelMacReleases = {
currentRelease: '',
releases: [],
};
if (response.statusCode === 200) {
currentValue = JSON.parse(response.body);
if (response.status === 200) {
currentValue = (await response.json()) as SquirrelMacReleases;
}
const updateUrl = new URL(this.config.macUpdateManifestBaseUrl);
updateUrl.pathname += `/${zipName}`;
Expand Down
2 changes: 0 additions & 2 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -883,7 +883,6 @@ __metadata:
filenamify: "npm:^4.1.0"
find-up: "npm:^5.0.0"
fs-extra: "npm:^10.0.0"
got: "npm:^14.0.0"
jiti: "npm:^2.4.2"
listr2: "npm:^7.0.2"
log-symbols: "npm:^4.0.0"
Expand Down Expand Up @@ -1067,7 +1066,6 @@ __metadata:
"@electron-forge/test-utils": "workspace:*"
cross-zip: "npm:^4.0.0"
fs-extra: "npm:^10.0.0"
got: "npm:^14.0.0"
vitest: "npm:^4.0.14"
languageName: unknown
linkType: soft
Expand Down
Loading