Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
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 .eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,4 @@ packages/*/*/doc
packages/*/*/index.ts
packages/**/bad.js
tmpl
packages/api/core/helper/dynamic-import.js
packages/api/core/spec/fixture/api-tester/
2 changes: 0 additions & 2 deletions packages/api/cli/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,6 @@
"@electron-forge/core-utils": "workspace:*",
"@electron-forge/shared-types": "workspace:*",
"@electron/get": "^4.0.2",
"@inquirer/prompts": "^6.0.1",
"@listr2/prompt-adapter-inquirer": "^2.0.22",
"chalk": "^4.0.0",
"commander": "^11.1.0",
"debug": "^4.3.1",
Expand Down
32 changes: 0 additions & 32 deletions packages/api/cli/src/electron-forge-import.ts

This file was deleted.

3 changes: 1 addition & 2 deletions packages/api/cli/src/electron-forge-make.ts
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
import { initializeProxy } from '@electron/get';
import { api, MakeOptions } from '@electron-forge/core';
import { resolveWorkingDir } from '@electron-forge/core-utils';
import chalk from 'chalk';
import { program } from 'commander';

import './util/terminate.js';
import packageJSON from '../package.json' with { type: 'json' };

import { resolveWorkingDir } from './util/resolve-working-dir.js';

export async function getMakeOptions(): Promise<MakeOptions> {
let workingDir: string;
program
Expand Down
3 changes: 1 addition & 2 deletions packages/api/cli/src/electron-forge-package.ts
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
import { initializeProxy } from '@electron/get';
import { api, PackageOptions } from '@electron-forge/core';
import { resolveWorkingDir } from '@electron-forge/core-utils';
import { program } from 'commander';

import './util/terminate.js';
import packageJSON from '../package.json' with { type: 'json' };

import { resolveWorkingDir } from './util/resolve-working-dir.js';

program
.version(packageJSON.version, '-V, --version', 'Output the current version')
.helpOption('-h, --help', 'Output usage information')
Expand Down
2 changes: 1 addition & 1 deletion packages/api/cli/src/electron-forge-publish.ts
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
import { initializeProxy } from '@electron/get';
import { api, PublishOptions } from '@electron-forge/core';
import { resolveWorkingDir } from '@electron-forge/core-utils';
import chalk from 'chalk';
import { program } from 'commander';

import './util/terminate.js';
import packageJSON from '../package.json' with { type: 'json' };

import { getMakeOptions } from './electron-forge-make.js';
import { resolveWorkingDir } from './util/resolve-working-dir.js';

program
.version(packageJSON.version, '-V, --version', 'Output the current version.')
Expand Down
3 changes: 1 addition & 2 deletions packages/api/cli/src/electron-forge-start.ts
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
import { api, StartOptions } from '@electron-forge/core';
import { resolveWorkingDir } from '@electron-forge/core-utils';
import { ElectronProcess } from '@electron-forge/shared-types';
import { Option, program } from 'commander';

import './util/terminate.js';
import packageJSON from '../package.json' with { type: 'json' };

import { resolveWorkingDir } from './util/resolve-working-dir.js';

(async () => {
let commandArgs = process.argv;
let appArgs;
Expand Down
2 changes: 0 additions & 2 deletions packages/api/cli/src/electron-forge.ts
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,6 @@ import { Listr } from 'listr2';
program
.version(packageJSON.version, '-V, --version', 'Output the current version.')
.helpOption('-h, --help', 'Output usage information.')
.command('init', 'Initialize a new Electron application.')
.command('import', 'Import an existing Electron project to Forge.')
.command(
'start',
'Start the current Electron application in development mode.',
Expand Down
6 changes: 0 additions & 6 deletions packages/api/core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,6 @@
"@electron-forge/plugin-base": "workspace:*",
"@electron-forge/publisher-base": "workspace:*",
"@electron-forge/shared-types": "workspace:*",
"@electron-forge/template-base": "workspace:*",
"@electron-forge/template-vite": "workspace:*",
"@electron-forge/template-vite-typescript": "workspace:*",
"@electron-forge/template-webpack": "workspace:*",
"@electron-forge/template-webpack-typescript": "workspace:*",
"@electron-forge/tracer": "workspace:*",
"@electron/get": "^4.0.2",
"@electron/packager": "^19.0.1",
Expand All @@ -53,7 +48,6 @@
"got": "^14.0.0",
"jiti": "^2.4.2",
"listr2": "^7.0.2",
"lodash-es": "^4.17.21",
"log-symbols": "^4.0.0",
"semver": "^7.2.1",
"source-map-support": "^0.5.13",
Expand Down
4 changes: 2 additions & 2 deletions packages/api/core/spec/fast/publish.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
import { listrMake } from '../../src/api/make';
import publish from '../../src/api/publish';
import findConfig from '../../src/util/forge-config.js';
import importSearch from '../../src/util/import-search.js';
import { importSearch } from '../../src/util/import-search.js';

vi.mock(import('../../src/api/make'), async (importOriginal) => {
const mod = await importOriginal();
Expand Down Expand Up @@ -41,7 +41,7 @@
const mod = await importOriginal();
return {
...mod,
default: vi.fn(),
importSearch: vi.fn(),
};
});

Expand Down Expand Up @@ -76,7 +76,7 @@

return {
run: vi.fn(),
} as any;

Check warning on line 79 in packages/api/core/spec/fast/publish.spec.ts

View workflow job for this annotation

GitHub Actions / lint-and-build

Unexpected any. Specify a different type
});

await publish({
Expand Down Expand Up @@ -163,7 +163,7 @@

return {
run: vi.fn(),
} as any;

Check warning on line 166 in packages/api/core/spec/fast/publish.spec.ts

View workflow job for this annotation

GitHub Actions / lint-and-build

Unexpected any. Specify a different type
});
});

Expand Down
2 changes: 1 addition & 1 deletion packages/api/core/spec/fast/util/import-search.spec.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { describe, expect, it } from 'vitest';

import findConfig from '../../../src/util/forge-config.js';
import importSearch from '../../../src/util/import-search.js';
import { importSearch } from '../../../src/util/import-search.js';

describe('import-search', () => {
it('should resolve null if no file exists', async () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,12 @@ import fs from 'node:fs/promises';
import os from 'node:os';
import path from 'node:path';

import { PACKAGE_MANAGERS } from '@electron-forge/core-utils';
import {
installDependencies,
PACKAGE_MANAGERS,
} from '@electron-forge/core-utils';
import { afterAll, beforeAll, describe, expect, it } from 'vitest';

import { installDependencies } from '../../src/util/install-dependencies.js';

describe.runIf(!(process.platform === 'linux' && process.env.CI))(
'install-dependencies',
() => {
Expand Down
Loading
Loading