Skip to content
Open
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
21 changes: 12 additions & 9 deletions packages/api/cli/spec/util/check-system.spec.ts
Original file line number Diff line number Diff line change
@@ -1,19 +1,22 @@
import {
resolvePackageManager,
spawnPackageManager,
} from '@electron-forge/core-utils';
} from '@electron-forge/core-utils/package-manager';
import { describe, expect, it, vi } from 'vitest';

import { checkPackageManager } from '../../src/util/check-system';

vi.mock(import('@electron-forge/core-utils'), async (importOriginal) => {
const mod = await importOriginal();
return {
...mod,
resolvePackageManager: vi.fn(),
spawnPackageManager: vi.fn(),
};
});
vi.mock(
import('@electron-forge/core-utils/package-manager'),
async (importOriginal) => {
const mod = await importOriginal();
return {
...mod,
resolvePackageManager: vi.fn(),
spawnPackageManager: vi.fn(),
};
},
);

describe('checkPackageManager', () => {
it('should consider allowlisted versions to be valid', async () => {
Expand Down
2 changes: 1 addition & 1 deletion packages/api/cli/src/electron-forge-make.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { styleText } from 'node:util';

import { initializeProxy } from '@electron/get';
import { api, MakeOptions } from '@electron-forge/core';
import { resolveWorkingDir } from '@electron-forge/core-utils';
import { resolveWorkingDir } from '@electron-forge/core-utils/resolve-working-dir';
import { program } from 'commander';

import './util/terminate.js';
Expand Down
2 changes: 1 addition & 1 deletion packages/api/cli/src/electron-forge-package.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { initializeProxy } from '@electron/get';
import { api, PackageOptions } from '@electron-forge/core';
import { resolveWorkingDir } from '@electron-forge/core-utils';
import { resolveWorkingDir } from '@electron-forge/core-utils/resolve-working-dir';
import { program } from 'commander';

import './util/terminate.js';
Expand Down
2 changes: 1 addition & 1 deletion packages/api/cli/src/electron-forge-release.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { styleText } from 'node:util';

import { initializeProxy } from '@electron/get';
import { api, ReleaseOptions } from '@electron-forge/core';
import { resolveWorkingDir } from '@electron-forge/core-utils';
import { resolveWorkingDir } from '@electron-forge/core-utils/resolve-working-dir';
import { program } from 'commander';

import './util/terminate.js';
Expand Down
2 changes: 1 addition & 1 deletion packages/api/cli/src/electron-forge-start.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { api, StartOptions } from '@electron-forge/core';
import { resolveWorkingDir } from '@electron-forge/core-utils';
import { resolveWorkingDir } from '@electron-forge/core-utils/resolve-working-dir';
import { ElectronProcess } from '@electron-forge/shared-types';
import { Option, program } from 'commander';

Expand Down
4 changes: 2 additions & 2 deletions packages/api/cli/src/util/check-system.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@ import { exec } from 'node:child_process';
import os from 'node:os';
import path from 'node:path';

import { pathExists } from '@electron-forge/core-utils/fs';
import {
PACKAGE_MANAGERS,
pathExists,
resolvePackageManager,
spawnPackageManager,
SupportedPackageManager,
} from '@electron-forge/core-utils';
} from '@electron-forge/core-utils/package-manager';
import { ForgeListrTask } from '@electron-forge/shared-types';
import debug from 'debug';
import semver from 'semver';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,20 @@ import {
DepType,
DepVersionRestriction,
installDependencies,
PACKAGE_MANAGERS,
} from '@electron-forge/core-utils';
} from '@electron-forge/core-utils/install-dependencies';
import { PACKAGE_MANAGERS } from '@electron-forge/core-utils/package-manager';
import { ForgeListrTask } from '@electron-forge/shared-types';
import { beforeEach, describe, expect, it, vi } from 'vitest';

import { deps, devDeps, initNPM } from '../../../src/init-scripts/init-npm.js';

vi.mock(import('@electron-forge/core-utils'), async (importOriginal) => ({
...(await importOriginal()),
installDependencies: vi.fn(),
}));
vi.mock(
import('@electron-forge/core-utils/install-dependencies'),
async (importOriginal) => ({
...(await importOriginal()),
installDependencies: vi.fn(),
}),
);

describe('init-npm', () => {
const mockTask = {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import fs from 'node:fs';
import { styleText } from 'node:util';

import { resolveWorkingDir } from '@electron-forge/core-utils';
import { resolveWorkingDir } from '@electron-forge/core-utils/resolve-working-dir';
import { confirm, select } from '@inquirer/prompts';
import { ListrInquirerPromptAdapter } from '@listr2/prompt-adapter-inquirer';
import { program } from 'commander';
Expand Down
10 changes: 5 additions & 5 deletions packages/external/create-electron-app/src/import.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,17 @@ import fs from 'node:fs/promises';
import path from 'node:path';
import { styleText } from 'node:util';

import { updateElectronDependency } from '@electron-forge/core-utils/electron-version';
import { pathExists, readJson, writeJson } from '@electron-forge/core-utils/fs';
import {
DepType,
DepVersionRestriction,
installDependencies,
pathExists,
} from '@electron-forge/core-utils/install-dependencies';
import {
PMDetails,
readJson,
resolvePackageManager,
updateElectronDependency,
writeJson,
} from '@electron-forge/core-utils';
} from '@electron-forge/core-utils/package-manager';
import { ForgeListrOptions } from '@electron-forge/shared-types';
import baseTemplate from '@electron-forge/template-base';
import debug from 'debug';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,10 @@ import { spawnSync } from 'node:child_process';
import fs from 'node:fs';
import path from 'node:path';

import { PMDetails, spawnPackageManager } from '@electron-forge/core-utils';
import {
PMDetails,
spawnPackageManager,
} from '@electron-forge/core-utils/package-manager';
import { ForgeListrTask } from '@electron-forge/shared-types';
import debug from 'debug';

Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import path from 'node:path';

import { readJsonSync } from '@electron-forge/core-utils/fs';
import {
DepType,
DepVersionRestriction,
installDependencies,
PMDetails,
readJsonSync,
} from '@electron-forge/core-utils';
} from '@electron-forge/core-utils/install-dependencies';
import { PMDetails } from '@electron-forge/core-utils/package-manager';
import { ForgeListrTask } from '@electron-forge/shared-types';
import debug from 'debug';
import semver from 'semver';
Expand Down
4 changes: 3 additions & 1 deletion packages/external/create-electron-app/src/init.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,11 @@ import {
DepType,
DepVersionRestriction,
installDependencies,
} from '@electron-forge/core-utils/install-dependencies';
import {
PMDetails,
resolvePackageManager,
} from '@electron-forge/core-utils';
} from '@electron-forge/core-utils/package-manager';
import { ForgeTemplate } from '@electron-forge/shared-types';
import { spawn } from '@malept/cross-spawn-promise';
import debug from 'debug';
Expand Down
3 changes: 2 additions & 1 deletion packages/maker/appx/src/MakerAppX.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
import fs from 'node:fs/promises';
import path from 'node:path';

import { getNameFromAuthor, pathExists } from '@electron-forge/core-utils';
import { getNameFromAuthor } from '@electron-forge/core-utils/author-name';
import { pathExists } from '@electron-forge/core-utils/fs';
import { MakerBase, MakerOptions } from '@electron-forge/maker-base';
import { ForgePlatform } from '@electron-forge/shared-types';
// eslint-disable-next-line n/no-missing-import
Expand Down
4 changes: 2 additions & 2 deletions packages/maker/msix/spec/MakerMSIX.spec.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import path from 'node:path';

import { move } from '@electron-forge/core-utils';
import { move } from '@electron-forge/core-utils/fs';
import { ForgeArch } from '@electron-forge/shared-types';
import { packageMSIX } from 'electron-windows-msix';
import { describe, expect, it, vi } from 'vitest';
Expand Down Expand Up @@ -28,7 +28,7 @@ vi.mock(import('node:fs/promises'), async (importOriginal) => {
};
});

vi.mock(import('@electron-forge/core-utils'), async (importOriginal) => {
vi.mock(import('@electron-forge/core-utils/fs'), async (importOriginal) => {
const mod = await importOriginal();
return {
...mod,
Expand Down
3 changes: 2 additions & 1 deletion packages/maker/msix/src/MakerMSIX.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@ import fs from 'node:fs/promises';
import os from 'node:os';
import path from 'node:path';

import { getNameFromAuthor, move } from '@electron-forge/core-utils';
import { getNameFromAuthor } from '@electron-forge/core-utils/author-name';
import { move } from '@electron-forge/core-utils/fs';
import { MakerBase, MakerOptions } from '@electron-forge/maker-base';
import { ForgePlatform } from '@electron-forge/shared-types';
import { packageMSIX } from 'electron-windows-msix';
Expand Down
2 changes: 1 addition & 1 deletion packages/maker/squirrel/src/MakerSquirrel.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import fs from 'node:fs/promises';
import os from 'node:os';
import path from 'node:path';

import { pathExists } from '@electron-forge/core-utils';
import { pathExists } from '@electron-forge/core-utils/fs';
import { MakerBase, MakerOptions } from '@electron-forge/maker-base';
import { ForgePlatform } from '@electron-forge/shared-types';
import {
Expand Down
2 changes: 1 addition & 1 deletion packages/maker/wix/src/MakerWix.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import path from 'node:path';
import { styleText } from 'node:util';

import { getNameFromAuthor } from '@electron-forge/core-utils';
import { getNameFromAuthor } from '@electron-forge/core-utils/author-name';
import { MakerBase, type MakerOptions } from '@electron-forge/maker-base';
import { ForgePlatform } from '@electron-forge/shared-types';
import { MSICreator, type MSICreatorOptions } from 'electron-wix-msi';
Expand Down
4 changes: 2 additions & 2 deletions packages/maker/zip/spec/MakerZip.spec.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import os from 'node:os';
import path from 'node:path';

import { writeJson } from '@electron-forge/core-utils';
import { writeJson } from '@electron-forge/core-utils/fs';
import { ForgeArch } from '@electron-forge/shared-types';
import { zip } from 'cross-zip';
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
Expand All @@ -20,7 +20,7 @@ vi.mock(import('cross-zip'), async (importOriginal) => {
};
});

vi.mock(import('@electron-forge/core-utils'), async (importOriginal) => {
vi.mock(import('@electron-forge/core-utils/fs'), async (importOriginal) => {
const mod = await importOriginal();
return {
...mod,
Expand Down
2 changes: 1 addition & 1 deletion packages/maker/zip/src/MakerZIP.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import path from 'node:path';
import { promisify } from 'node:util';

import { writeJson } from '@electron-forge/core-utils';
import { writeJson } from '@electron-forge/core-utils/fs';
import { MakerBase, MakerOptions } from '@electron-forge/maker-base';
import { ForgePlatform } from '@electron-forge/shared-types';
import { zip } from 'cross-zip';
Expand Down
2 changes: 1 addition & 1 deletion packages/plugin/vite/src/VitePlugin.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import fs from 'node:fs/promises';
import path from 'node:path';
import { styleText } from 'node:util';

import { readJson, writeJson } from '@electron-forge/core-utils';
import { readJson, writeJson } from '@electron-forge/core-utils/fs';
import { namedHookWithTaskFn, PluginBase } from '@electron-forge/plugin-base';
import debug from 'debug';
import { Listr, PRESET_TIMER } from 'listr2';
Expand Down
10 changes: 3 additions & 7 deletions packages/plugin/webpack/src/WebpackPlugin.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,9 @@ import path from 'node:path';
import { styleText } from 'node:util';
import { pipeline } from 'stream/promises';

import {
getElectronVersion,
listrCompatibleRebuildHook,
move,
readJson,
writeJson,
} from '@electron-forge/core-utils';
import { getElectronVersion } from '@electron-forge/core-utils/electron-version';
import { move, readJson, writeJson } from '@electron-forge/core-utils/fs';
import { listrCompatibleRebuildHook } from '@electron-forge/core-utils/rebuild';
import { namedHookWithTaskFn, PluginBase } from '@electron-forge/plugin-base';
import {
ForgeArch,
Expand Down
2 changes: 1 addition & 1 deletion packages/publisher/snapcraft/src/PublisherSnapcraft.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import path from 'node:path';

import { pathExists } from '@electron-forge/core-utils';
import { pathExists } from '@electron-forge/core-utils/fs';
import {
PublisherBase,
PublisherOptions,
Expand Down
4 changes: 2 additions & 2 deletions packages/template/base/src/BaseTemplate.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ import path from 'node:path';
import {
readJson,
readJsonSync,
resolvePackageManager,
writeJson,
} from '@electron-forge/core-utils';
} from '@electron-forge/core-utils/fs';
import { resolvePackageManager } from '@electron-forge/core-utils/package-manager';
import {
ForgeListrTaskDefinition,
ForgeTemplate,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import path from 'node:path';
import {
PACKAGE_MANAGERS,
spawnPackageManager,
} from '@electron-forge/core-utils';
} from '@electron-forge/core-utils/package-manager';
import * as testUtils from '@electron-forge/test-utils';
import { afterAll, beforeAll, describe, expect, it } from 'vitest';

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import fs from 'node:fs/promises';
import path from 'node:path';

import { move, readJson, writeJson } from '@electron-forge/core-utils';
import { move, readJson, writeJson } from '@electron-forge/core-utils/fs';
import {
ForgeListrTaskDefinition,
InitTemplateOptions,
Expand Down
2 changes: 1 addition & 1 deletion packages/template/vite/src/ViteTemplate.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import path from 'node:path';

import { moveSync } from '@electron-forge/core-utils';
import { moveSync } from '@electron-forge/core-utils/fs';
import {
ForgeListrTaskDefinition,
InitTemplateOptions,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import path from 'node:path';
import {
PACKAGE_MANAGERS,
spawnPackageManager,
} from '@electron-forge/core-utils';
} from '@electron-forge/core-utils/package-manager';
import * as testUtils from '@electron-forge/test-utils';
import { afterAll, beforeAll, describe, expect, it } from 'vitest';

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import fs from 'node:fs/promises';
import path from 'node:path';

import { readJson, writeJson } from '@electron-forge/core-utils';
import { readJson, writeJson } from '@electron-forge/core-utils/fs';
import {
ForgeListrTaskDefinition,
InitTemplateOptions,
Expand Down
11 changes: 10 additions & 1 deletion packages/utils/core-utils/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,16 @@
"repository": "https://github.com/electron/forge",
"author": "Samuel Attard",
"license": "MIT",
"exports": "./dist/index.js",
"exports": {
".": "./dist/index.js",
"./author-name": "./dist/author-name.js",
"./electron-version": "./dist/electron-version.js",
"./fs": "./dist/fs.js",
"./install-dependencies": "./dist/install-dependencies.js",
"./package-manager": "./dist/package-manager.js",
"./rebuild": "./dist/rebuild.js",
"./resolve-working-dir": "./dist/resolve-working-dir.js"
},
"typings": "dist/index.d.ts",
"dependencies": {
"@electron-forge/shared-types": "workspace:*",
Expand Down
Loading