self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2025-08-10 22:11:50 +02:00
Code Issues Releases Activity

Desktop: Fixes #12451: Fix incorrect line numbers/files in debug output (#12664)

Browse Source
This commit is contained in:
Henry Heino
2025-07-03 09:48:11 -07:00
committed by GitHub
parent d2274319f9
commit fc38691f3a
9 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.eslintignore
View File

@@ -604,6 +604,7 @@ packages/app-desktop/utils/isSafeToOpen.test.js
packages/app-desktop/utils/isSafeToOpen.js packages/app-desktop/utils/isSafeToOpen.js
packages/app-desktop/utils/restartInSafeModeFromMain.test.js packages/app-desktop/utils/restartInSafeModeFromMain.test.js
packages/app-desktop/utils/restartInSafeModeFromMain.js packages/app-desktop/utils/restartInSafeModeFromMain.js
packages/app-desktop/utils/sourceMapSetup.js
packages/app-desktop/utils/window/types.js packages/app-desktop/utils/window/types.js
packages/app-mobile/PluginAssetsLoader.js packages/app-mobile/PluginAssetsLoader.js
packages/app-mobile/commands/dismissPluginPanels.js packages/app-mobile/commands/dismissPluginPanels.js

1
.gitignore vendored
View File

@@ -579,6 +579,7 @@ packages/app-desktop/utils/isSafeToOpen.test.js
packages/app-desktop/utils/isSafeToOpen.js packages/app-desktop/utils/isSafeToOpen.js
packages/app-desktop/utils/restartInSafeModeFromMain.test.js packages/app-desktop/utils/restartInSafeModeFromMain.test.js
packages/app-desktop/utils/restartInSafeModeFromMain.js packages/app-desktop/utils/restartInSafeModeFromMain.js
packages/app-desktop/utils/sourceMapSetup.js
packages/app-desktop/utils/window/types.js packages/app-desktop/utils/window/types.js
packages/app-mobile/PluginAssetsLoader.js packages/app-mobile/PluginAssetsLoader.js
packages/app-mobile/commands/dismissPluginPanels.js packages/app-mobile/commands/dismissPluginPanels.js

1
packages/app-desktop/main-html.js
View File

@@ -10,6 +10,7 @@ window.__REACT_DEVTOOLS_GLOBAL_HOOK__ = {
onCommitFiberUnmount: function() {}, onCommitFiberUnmount: function() {},
}; };
require('./utils/sourceMapSetup');
const app = require('./app').default; const app = require('./app').default;
const Folder = require('@joplin/lib/models/Folder').default; const Folder = require('@joplin/lib/models/Folder').default;
const Resource = require('@joplin/lib/models/Resource').default; const Resource = require('@joplin/lib/models/Resource').default;

1
packages/app-desktop/main.js
View File

@@ -1,5 +1,6 @@
// This is the basic initialization for the Electron MAIN process // This is the basic initialization for the Electron MAIN process
require('./utils/sourceMapSetup');
const electronApp = require('electron').app; const electronApp = require('electron').app;
require('@electron/remote/main').initialize(); require('@electron/remote/main').initialize();
const ElectronAppWrapper = require('./ElectronAppWrapper').default; const ElectronAppWrapper = require('./ElectronAppWrapper').default;

3
packages/app-desktop/package.json
View File

@@ -12,7 +12,7 @@
"electronRebuild": "gulp electronRebuild", "electronRebuild": "gulp electronRebuild",
"tsc": "tsc --project tsconfig.json", "tsc": "tsc --project tsconfig.json",
"watch": "tsc --watch --preserveWatchOutput --project tsconfig.json", "watch": "tsc --watch --preserveWatchOutput --project tsconfig.json",
"start": "gulp before-start && electron . --env dev --log-level debug --open-dev-tools --no-welcome", "start": "gulp before-start && JOPLIN_SOURCE_MAP_ENABLED=1 electron . --env dev --log-level debug --open-dev-tools --no-welcome",
"test": "jest", "test": "jest",
"test-ui": "gulp before-start && playwright test", "test-ui": "gulp before-start && playwright test",
"test-ci": "yarn test", "test-ci": "yarn test",
@@ -196,6 +196,7 @@
"reselect": "4.1.8", "reselect": "4.1.8",
"roboto-fontface": "0.10.0", "roboto-fontface": "0.10.0",
"smalltalk": "2.5.1", "smalltalk": "2.5.1",
"source-map-support": "0.5.21",
"styled-components": "5.3.11", "styled-components": "5.3.11",
"styled-system": "5.1.5", "styled-system": "5.1.5",
"taboverride": "4.0.3", "taboverride": "4.0.3",

3
packages/app-desktop/tools/bundleJs.ts
View File

@@ -12,9 +12,10 @@ const makeBuildContext = (entryPoint: string, renderer: boolean, computeFileSize
outfile: `${filename(entryPoint)}.bundle.js`, outfile: `${filename(entryPoint)}.bundle.js`,
bundle: true, bundle: true,
minify: true, minify: true,
keepNames: true, keepNames: true, // Preserve original function names -- useful for debugging
format: 'iife', // Immediately invoked function expression format: 'iife', // Immediately invoked function expression
sourcemap: true, sourcemap: true,
sourcesContent: false, // Do not embed full source file content in the .map file
metafile: computeFileSizeStats, metafile: computeFileSizeStats,
platform: 'node', platform: 'node',
target: ['node20.0'], target: ['node20.0'],

6
packages/app-desktop/utils/sourceMapSetup.ts Normal file
View File

@@ -0,0 +1,6 @@
// source-map-support can add 1-3 seconds to the application startup
// time -- disable it unless requested:
if (process.env.JOPLIN_SOURCE_MAP_ENABLED) {
require('source-map-support').install();
}

1
packages/tools/cspell/dictionary4.txt
View File

@@ -183,3 +183,4 @@ topagency
esbuild esbuild
mapbox mapbox
outfile outfile

1
yarn.lock
View File

@@ -9002,6 +9002,7 @@ __metadata:
reselect: "npm:4.1.8" reselect: "npm:4.1.8"
roboto-fontface: "npm:0.10.0" roboto-fontface: "npm:0.10.0"
smalltalk: "npm:2.5.1" smalltalk: "npm:2.5.1"
source-map-support: "npm:0.5.21"
sqlite3: "npm:5.1.6" sqlite3: "npm:5.1.6"
styled-components: "npm:5.3.11" styled-components: "npm:5.3.11"
styled-system: "npm:5.1.5" styled-system: "npm:5.1.5"