Skip to content

Commit 886884a

Browse files
committed
removed aegir; linted with ts-standard and standard
1 parent ca06dc6 commit 886884a

File tree

10 files changed

+17516
-45598
lines changed

10 files changed

+17516
-45598
lines changed

package-lock.json

Lines changed: 17498 additions & 45571 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"main": "src/index.js",
88
"scripts": {
99
"start": "cross-env NODE_ENV=development electron .",
10-
"lint": "aegir lint",
10+
"lint": "ts-standard && standard",
1111
"lint:fix": "ts-standard --fix && standard --fix",
1212
"test": "cross-env NODE_ENV=test playwright test 'test/unit/.*.spec.js'",
1313
"test:e2e": "xvfb-maybe cross-env NODE_ENV=test playwright test -c test/e2e/playwright.config.js",
@@ -68,7 +68,6 @@
6868
"xvfb-maybe": "^0.2.1"
6969
},
7070
"dependencies": {
71-
"aegir": "^47.0.16",
7271
"countly-sdk-nodejs": "^20.11.0",
7372
"electron-serve": "^1.1.0",
7473
"electron-store": "^8.1.0",
@@ -104,11 +103,5 @@
104103
"ignore": [
105104
"**/*.js"
106105
]
107-
},
108-
"aegir": {
109-
"tsRepo": false,
110-
"lint": {
111-
"files": [ "src/**/*.js", "src/**/*.ts" ]
112-
}
113106
}
114107
}

pkgs/macos/build-universal-kubo-binary.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ const execLog = (cmd) => {
4242
await downloadKubo({
4343
version: kuboVersion,
4444
platform: 'darwin',
45-
arch: arch,
45+
arch,
4646
distUrl: 'https://dist.ipfs.tech',
4747
installPath: archDir
4848
})

src/common/types.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
export interface DesktopPersistentStore_IpfsdConfig {
2-
path: string,
2+
path: string
33
flags: string[]
44
}
55

66
export interface DesktopPersistentStore {
77

8-
ipfsConfig: DesktopPersistentStore_IpfsdConfig,
9-
language: string,
10-
experiments: Record<string, boolean>,
8+
ipfsConfig: DesktopPersistentStore_IpfsdConfig
9+
language: string
10+
experiments: Record<string, boolean>
1111
binaryPath?: string
1212
}

src/dialogs/errors.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,6 @@ function generateErrorIssueUrl (e) {
5959
return 'https://github.com/ipfs/ipfs-desktop/issues/2092#issuecomment-1088124521'
6060
case stack.includes('error loading filesroot from dagservice: block was not found locally (offline): ipld: could not find'):
6161
return 'https://github.com/ipfs/ipfs-desktop/issues/2882#issuecomment-2658038042'
62-
default:
63-
return `https://github.com/ipfs/ipfs-desktop/issues/new?labels=kind%2Fbug%2C+need%2Ftriage&template=bug_report.md&title=${encodeURIComponent(issueTitle(e))}&body=${encodeURIComponent(issueTemplate(e))}`.substring(0, 1999)
6462
}
6563
}
6664
// Something else, prefill new issue form with error details

src/types.ts

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
export type CONFIG_KEYS = 'AUTO_LAUNCH'
2-
| 'AUTO_GARBAGE_COLLECTOR'
3-
| 'AUTO_UPDATE'
4-
| 'SCREENSHOT_SHORTCUT'
5-
| 'OPEN_WEBUI_LAUNCH'
6-
| 'MONOCHROME_TRAY_ICON'
7-
| 'EXPERIMENT_PUBSUB'
8-
| 'EXPERIMENT_PUBSUB_NAMESYS'
9-
| 'DISABLE_AUTO_UPDATE'
2+
| 'AUTO_GARBAGE_COLLECTOR'
3+
| 'AUTO_UPDATE'
4+
| 'SCREENSHOT_SHORTCUT'
5+
| 'OPEN_WEBUI_LAUNCH'
6+
| 'MONOCHROME_TRAY_ICON'
7+
| 'EXPERIMENT_PUBSUB'
8+
| 'EXPERIMENT_PUBSUB_NAMESYS'
9+
| 'DISABLE_AUTO_UPDATE'

src/webui/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ module.exports = async function () {
202202
// Set user agent
203203
session.defaultSession.webRequest.onBeforeSendHeaders((details, callback) => {
204204
details.requestHeaders['User-Agent'] = `ipfs-desktop/${VERSION} (Electron ${ELECTRON_VERSION})`
205-
callback({ cancel: false, requestHeaders: details.requestHeaders })
205+
callback({ cancel: false, requestHeaders: details.requestHeaders }) // eslint-disable-line
206206
})
207207

208208
const launchWebUI = ctx.getFn('launchWebUI')

test/unit/add-to-ipfs.spec.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ test.describe('Add To Ipfs', function () {
3737
electron = mockElectron()
3838
notify = mockNotify()
3939
addToIpfs = proxyquire('../../src/add-to-ipfs', {
40-
electron: electron,
40+
electron,
4141
'./common/notify': notify,
4242
'./common/logger': mockLogger(),
4343
'./context': () => ctx

test/unit/create-toggler.spec.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ test.describe('Create toggler', () => {
1515
store = mockStore()
1616
logger = mockLogger()
1717
createToggler = proxyquire('../../src/utils/create-toggler', {
18-
electron: electron,
18+
electron,
1919
'../common/logger': logger,
2020
'../common/store': store,
2121
'./safe-store-set': (key, val, onSuccess) => { store.set(key, val); onSuccess() }

test/unit/store.spec.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ test.describe('store', () => {
1212
electron = mockElectron()
1313
logger = mockLogger()
1414
store = proxyquire('../../src/common/store', {
15-
electron: electron,
15+
electron,
1616
'./logger': logger
1717
})
1818
sinon.spy(logger, 'error')

0 commit comments

Comments
 (0)