Skip to content

Commit 295f74f

Browse files
authored
build(deps): update ESLint (#1403)
1 parent 2f2630e commit 295f74f

File tree

81 files changed

+1137
-638
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

81 files changed

+1137
-638
lines changed

package.json

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
"lint:templates": "standard \"static/**/*.js\"",
1616
"lint:links": "electron-lint-markdown-links --root . --fetch-external-links \"*.md\"",
1717
"lint:fix": "npm-run-all \"lint:!(fix) -- --fix\"",
18-
"lint": "npm-run-all \"lint:*\"",
18+
"lint": "npm-run-all \"lint:!(fix)\"",
1919
"make": "electron-forge make",
2020
"package": "electron-forge package",
2121
"publish": "electron-forge publish",
@@ -101,8 +101,8 @@
101101
"@types/semver": "^7.3.4",
102102
"@types/tmp": "0.2.0",
103103
"@types/valid-url": "^1.0.3",
104-
"@typescript-eslint/eslint-plugin": "^4.15.2",
105-
"@typescript-eslint/parser": "^4.15.2",
104+
"@typescript-eslint/eslint-plugin": "^6.0.0",
105+
"@typescript-eslint/parser": "^6.0.0",
106106
"@vercel/webpack-asset-relocator-loader": "^1.7.2",
107107
"copy-webpack-plugin": "^11.0.0",
108108
"cross-fetch": "^3.1.0",
@@ -111,12 +111,12 @@
111111
"enzyme": "^3.11.0",
112112
"enzyme-adapter-react-16": "^1.15.6",
113113
"enzyme-to-json": "^3.6.1",
114-
"eslint": "^7.21.0",
115-
"eslint-config-prettier": "^8.1.0",
116-
"eslint-import-resolver-typescript": "^3.4.0",
117-
"eslint-plugin-import": "^2.26.0",
118-
"eslint-plugin-prettier": "^3.3.1",
119-
"eslint-plugin-react": "^7.22.0",
114+
"eslint": "^8.45.0",
115+
"eslint-config-prettier": "^8.8.0",
116+
"eslint-import-resolver-typescript": "^3.5.5",
117+
"eslint-plugin-import": "^2.27.5",
118+
"eslint-plugin-prettier": "^5.0.0",
119+
"eslint-plugin-react": "^7.32.2",
120120
"fetch-mock-jest": "^1.5.1",
121121
"fork-ts-checker-webpack-plugin": "^8.0.0",
122122
"husky": "^5.1.1",
@@ -133,7 +133,7 @@
133133
"npm-run-all": "^4.1.5",
134134
"postcss": "^8.4.25",
135135
"postcss-less": "^6.0.0",
136-
"prettier": "^2.2.1",
136+
"prettier": "^3.0.0",
137137
"recursive-readdir": "^2.2.2",
138138
"resolve-url-loader": "^5.0.0",
139139
"rimraf": "^3.0.2",

src/main/command-line.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ import * as commander from 'commander';
44
import * as fs from 'fs-extra';
55
import getos from 'getos';
66

7+
import { ipcMainManager } from './ipc';
8+
import { findProtocolArg } from './protocol';
79
import {
810
ElectronReleaseChannel,
911
OutputEntry,
@@ -12,8 +14,6 @@ import {
1214
} from '../interfaces';
1315
import { IpcEvents } from '../ipc-events';
1416
import { getGistId } from '../utils/gist';
15-
import { ipcMainManager } from './ipc';
16-
import { findProtocolArg } from './protocol';
1717

1818
function getSetup(opts: commander.OptionValues): SetupRequest {
1919
const config: SetupRequest = {

src/main/content.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@ import fetch from 'cross-fetch';
44
import { IpcMainEvent, app } from 'electron';
55
import * as fs from 'fs-extra';
66

7-
import { EditorValues } from '../interfaces';
8-
import { IpcEvents } from '../ipc-events';
9-
import { readFiddle } from '../utils/read-fiddle';
107
import { STATIC_DIR } from './constants';
118
import { ipcMainManager } from './ipc';
129
import { isReleasedMajor } from './versions';
10+
import { EditorValues } from '../interfaces';
11+
import { IpcEvents } from '../ipc-events';
12+
import { readFiddle } from '../utils/read-fiddle';
1313

1414
// parent directory of all the downloaded template fiddles
1515
const TEMPLATES_DIR = path.join(app.getPath('userData'), 'Templates');

src/main/context-menu.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ import {
55
MenuItemConstructorOptions,
66
} from 'electron';
77

8-
import { IpcEvents } from '../ipc-events';
98
import { ipcMainManager } from './ipc';
109
import { isDevMode } from './utils/devmode';
10+
import { IpcEvents } from '../ipc-events';
1111

1212
/**
1313
* Returns items related to running the current fiddle.

src/main/dialogs.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ import { Installer } from '@electron/fiddle-core';
44
import { dialog } from 'electron';
55
import * as fs from 'fs-extra';
66

7-
import { SelectedLocalVersion } from '../interfaces';
8-
import { IpcEvents } from '../ipc-events';
97
import { ipcMainManager } from './ipc';
108
import { getOrCreateMainWindow } from './windows';
9+
import { SelectedLocalVersion } from '../interfaces';
10+
import { IpcEvents } from '../ipc-events';
1111

1212
/**
1313
* Build a default name for a local Electron version

src/main/files.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import { app, dialog } from 'electron';
22
import * as fs from 'fs-extra';
33

4+
import { ipcMainManager } from './ipc';
45
import { IpcEvents } from '../ipc-events';
56
import { isSupportedFile } from '../utils/editor-utils';
6-
import { ipcMainManager } from './ipc';
77

88
/**
99
* Ensures that we're listening to file events

src/main/ipc.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@ import { EventEmitter } from 'node:events';
22

33
import { MessagePortMain, ipcMain } from 'electron';
44

5+
import { getOrCreateMainWindow } from './windows';
56
import {
67
IpcEvents,
78
WEBCONTENTS_READY_FOR_IPC_SIGNAL,
89
ipcMainEvents,
910
} from '../ipc-events';
10-
import { getOrCreateMainWindow } from './windows';
1111

1212
/**
1313
* The main purpose of this class is to be the central

src/main/main.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import {
99
systemPreferences,
1010
} from 'electron';
1111

12-
import { IpcEvents } from '../ipc-events';
1312
import { setupAboutPanel } from './about-panel';
1413
import { processCommandLine } from './command-line';
1514
import { setupContent } from './content';
@@ -28,6 +27,7 @@ import { getProjectName } from './utils/get-project-name';
2827
import { getUsername } from './utils/get-username';
2928
import { setupVersions } from './versions';
3029
import { getOrCreateMainWindow } from './windows';
30+
import { IpcEvents } from '../ipc-events';
3131

3232
let argv: string[] = [];
3333

src/main/menu.ts

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,16 @@ import {
66
shell,
77
} from 'electron';
88

9+
import { showOpenDialog, showSaveDialog } from './files';
10+
import { ipcMainManager } from './ipc';
11+
import { createMainWindow } from './windows';
912
import {
1013
BlockableAccelerator,
1114
SetUpMenuOptions,
1215
Templates,
1316
} from '../interfaces';
1417
import { IpcEvents } from '../ipc-events';
1518
import { SHOW_ME_TEMPLATES } from '../templates';
16-
import { showOpenDialog, showSaveDialog } from './files';
17-
import { ipcMainManager } from './ipc';
18-
import { createMainWindow } from './windows';
1919

2020
/**
2121
* Is the passed object a constructor for an Electron Menu?
@@ -312,10 +312,9 @@ export function setupMenu(options?: SetUpMenuOptions) {
312312

313313
// Get template for default menu
314314
const defaultMenu = require('electron-default-menu');
315-
const menu = (defaultMenu(
316-
app,
317-
shell,
318-
) as Array<MenuItemConstructorOptions>).map((item) => {
315+
const menu = (
316+
defaultMenu(app, shell) as Array<MenuItemConstructorOptions>
317+
).map((item) => {
319318
const { label } = item;
320319

321320
// Append the "Settings" item

src/main/npm.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import { IpcMainEvent } from 'electron';
22

3-
import { IPackageManager, PMOperationOptions } from '../interfaces';
4-
import { IpcEvents } from '../ipc-events';
53
import { ipcMainManager } from './ipc';
64
import { exec } from './utils/exec';
5+
import { IPackageManager, PMOperationOptions } from '../interfaces';
6+
import { IpcEvents } from '../ipc-events';
77

88
let isNpmInstalled: boolean | null = null;
99
let isYarnInstalled: boolean | null = null;

0 commit comments

Comments
 (0)