1
0
mirror of https://github.com/laurent22/joplin.git synced 2024-12-24 10:27:10 +02:00

Merge branch 'release-2.12' into dev

This commit is contained in:
Laurent Cozic 2023-09-21 15:22:31 +01:00
commit fc515313cf
3 changed files with 8 additions and 6 deletions

View File

@ -122,7 +122,7 @@
"@types/react": "18.2.21",
"@types/react-redux": "7.1.26",
"@types/styled-components": "5.1.26",
"electron": "25.3.1",
"electron": "25.8.1",
"electron-builder": "24.4.0",
"glob": "10.3.4",
"gulp": "4.0.2",

View File

@ -178,6 +178,8 @@ describe('import-enex-md-gen', () => {
expected = expected.replace(/RESOURCE_ID_2/, svgResource.id);
expect(note.body).toBe(expected);
const filePath = `${enexSampleBaseDir}/invalid_html.enex`;
await expectThrow(async () => importEnex('', filePath));
});
});

View File

@ -4657,7 +4657,7 @@ __metadata:
compare-versions: 3.6.0
countable: 3.0.1
debounce: 1.2.1
electron: 25.3.1
electron: 25.8.1
electron-builder: 24.4.0
electron-window-state: 5.0.3
formatcoords: 1.1.3
@ -15254,16 +15254,16 @@ __metadata:
languageName: node
linkType: hard
"electron@npm:25.3.1":
version: 25.3.1
resolution: "electron@npm:25.3.1"
"electron@npm:25.8.1":
version: 25.8.1
resolution: "electron@npm:25.8.1"
dependencies:
"@electron/get": ^2.0.0
"@types/node": ^18.11.18
extract-zip: ^2.0.1
bin:
electron: cli.js
checksum: c8e6c18722f4d142e3f80c973db9e9c60039fe9f4a32ecdb17ff14834bc6ed26891cb573b7f922eebace1a946c0b6ada18e858080246c52b3b6ce5d383605da0
checksum: 3305f0d3e3d68d8921533b4fd42003812778bd90d1884b2baa859b3a7d900354298e63298fbfbfcac9267223e0d0d3de584137aec52b764081f3c68bf4b09efc
languageName: node
linkType: hard