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
3 changes: 2 additions & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ jobs:
- 44
- 45
runs-on: ubuntu-22.04
timeout-minutes: 15
steps:
- name: Checkout
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
Expand All @@ -69,7 +70,7 @@ jobs:
- name: Install Dependencies
run: yarn install --immutable
- name: Install Electron
run: yarn add "electron@${{ matrix.electron-version }}" -P
run: yarn add -D "electron@${{ matrix.electron-version }}"
- name: Build
run: yarn tsc
- name: Test (Electron 12)
Expand Down
942 changes: 0 additions & 942 deletions .yarn/releases/yarn-4.10.3.cjs

This file was deleted.

1,000 changes: 1,000 additions & 0 deletions .yarn/releases/yarn-4.18.1.cjs

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion .yarnrc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ npmPreapprovedPackages:
- "@electron/*"
- electron

yarnPath: .yarn/releases/yarn-4.10.3.cjs
yarnPath: .yarn/releases/yarn-4.18.1.cjs
9 changes: 5 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,13 @@
"chai": "^4.2.0",
"chai-as-promised": "^7.1.1",
"dirty-chai": "^2.0.1",
"electron": "39.x",
"mocha": "^11.7.4",
"electron": "45.x",
"mocha": "^10.8.2",
"mocha-junit-reporter": "^1.23.3",
"mocha-multi-reporters": "^1.1.7",
"ts-node": "^8.10.2",
"typescript": "^4.1.3"
"typescript": "^7.0.2",
"typescript6": "npm:typescript@^6.0.3"
},
"scripts": {
"prepack": "tsc",
Expand All @@ -43,7 +44,7 @@
"publishConfig": {
"provenance": true
},
"packageManager": "yarn@4.10.3+sha512.c38cafb5c7bb273f3926d04e55e1d8c9dfa7d9c3ea1f36a4868fa028b9e5f72298f0b7f401ad5eb921749eb012eb1c3bb74bf7503df3ee43fd600d14a018266f",
"packageManager": "yarn@4.18.1+sha512.b2e1e7524f654f2749d32b4ebcb4622473cb5bcbc485df2007e12a154e50162a4d795526768bc5f5b8f81717bfd79deb2472813d86fb5ae2eb551fa9c872b08f",
"dependenciesMeta": {
"electron": {
"built": true
Expand Down
2 changes: 2 additions & 0 deletions src/common/module-names.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ export const browserModuleNames = [
'BaseWindow',
'BrowserView',
'BrowserWindow',
'ClipboardItem',
'contentTracing',
'crashReporter',
'dialog',
Expand All @@ -33,6 +34,7 @@ export const browserModuleNames = [
'screen',
'session',
'ServiceWorkerMain',
'sharedTexture',
'ShareMenu',
'systemPreferences',
'TopLevelWindow',
Expand Down
10 changes: 10 additions & 0 deletions test/index.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
// ts-node 8 cannot drive TypeScript 7 (which no longer exposes the JS
// compiler API), so the specs are compiled with the TypeScript 6 alias.
if (!process.env.TS_NODE_COMPILER) {
process.env.TS_NODE_COMPILER = 'typescript6'
}

const chai = require('chai')
chai.use(require('chai-as-promised'))
chai.use(require('dirty-chai'))
Expand All @@ -7,4 +13,8 @@ app.on('window-all-closed', () => null)

app.whenReady().then(() => {
require('mocha/bin/mocha')
}).catch((err) => {
// Fail fast instead of leaving the app running until the CI job times out.
console.error(err)
app.exit(1)
})
11 changes: 10 additions & 1 deletion tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,22 @@
"lib": [
"es2019",
"esnext.weakref",
"es2021.intl",
"dom",
"dom.iterable"
],
"module": "commonjs",
"outDir": "./dist",
"strict": true,
"esModuleInterop": true
"esModuleInterop": true,
"skipLibCheck": true,
"types": [
"node",
"mocha",
"chai",
"chai-as-promised",
"dirty-chai"
]
},
"exclude": ["dist", "main", "renderer"]
}
Loading
Loading