u2a 2.1.5 → 2.1.6
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/package.json +1 -1
- package/src/commands/create.js +12 -21
package/package.json
CHANGED
package/src/commands/create.js
CHANGED
|
@@ -51,7 +51,6 @@ function createWindowsShortcut(appInfo) {
|
|
|
51
51
|
}
|
|
52
52
|
}
|
|
53
53
|
|
|
54
|
-
|
|
55
54
|
function createLinuxDesktopEntry(appInfo) {
|
|
56
55
|
try {
|
|
57
56
|
const { domain, url, appDir, iconPath } = appInfo;
|
|
@@ -179,9 +178,7 @@ function removeAppFromOS(domain) {
|
|
|
179
178
|
const desktopFilePath = path.join(os.homedir(), '.local', 'share', 'applications', `u2a-${domain}.desktop`);
|
|
180
179
|
if (fs.existsSync(desktopFilePath)) {
|
|
181
180
|
fs.unlinkSync(desktopFilePath);
|
|
182
|
-
logger.success(`Linux desktop entry removed: ${desktopFilePath}
|
|
183
|
-
|
|
184
|
-
`);
|
|
181
|
+
logger.success(`Linux desktop entry removed: ${desktopFilePath}`);
|
|
185
182
|
}
|
|
186
183
|
}
|
|
187
184
|
} catch (error) {
|
|
@@ -240,17 +237,14 @@ function logAppInfo() {
|
|
|
240
237
|
|
|
241
238
|
function updateSplashScreen(message, isError = false) {
|
|
242
239
|
if (splashWindow && !splashWindow.isDestroyed()) {
|
|
243
|
-
|
|
244
|
-
|
|
245
|
-
|
|
246
|
-
|
|
247
|
-
|
|
248
|
-
|
|
249
|
-
|
|
250
|
-
|
|
251
|
-
: ''}
|
|
252
|
-
\`;
|
|
253
|
-
splashWindow.webContents.executeJavaScript(script).catch(err => console.error('Failed to update splash screen:', err));
|
|
240
|
+
splashWindow.webContents.executeJavaScript(\`
|
|
241
|
+
try {
|
|
242
|
+
document.getElementById('loading-text').innerText = "\${message.replace(/"/g, '\\"')}";
|
|
243
|
+
} catch (e) {
|
|
244
|
+
console.error('Failed to update splash screen:', e);
|
|
245
|
+
}
|
|
246
|
+
\`).catch(err => console.error('Failed to update splash screen:', err));
|
|
247
|
+
|
|
254
248
|
}
|
|
255
249
|
}
|
|
256
250
|
|
|
@@ -273,6 +267,7 @@ function createSplashScreen() {
|
|
|
273
267
|
<html>
|
|
274
268
|
<head>
|
|
275
269
|
<meta charset="UTF-8">
|
|
270
|
+
<meta http-equiv="Content-Security-Policy" content="default-src 'self'; style-src 'self' 'unsafe-inline'; script-src 'self'; object-src 'none';">
|
|
276
271
|
<title>Loading...</title>
|
|
277
272
|
<style>
|
|
278
273
|
body {
|
|
@@ -444,7 +439,6 @@ function createWindow() {
|
|
|
444
439
|
|
|
445
440
|
mainWindow.webContents.on('did-fail-load', (event, errorCode, errorDescription, validatedURL, isMainFrame) => {
|
|
446
441
|
const errorMessage = \`Load error (\${errorCode}): \${errorDescription}\`;
|
|
447
|
-
console.error(errorMessage);
|
|
448
442
|
loadErrors.push(errorMessage);
|
|
449
443
|
|
|
450
444
|
updateSplashScreen(errorMessage, true);
|
|
@@ -469,7 +463,6 @@ function createWindow() {
|
|
|
469
463
|
mainWindow.webContents.on('console-message', (event, level, message, line, sourceId) => {
|
|
470
464
|
if (level === 2) {
|
|
471
465
|
const errorMessage = \`Console: \${message} (line \${line})\`;
|
|
472
|
-
console.error(errorMessage);
|
|
473
466
|
loadErrors.push(errorMessage);
|
|
474
467
|
|
|
475
468
|
updateSplashScreen('JavaScript error detected', true);
|
|
@@ -560,11 +553,9 @@ app.on('activate', () => {
|
|
|
560
553
|
`;
|
|
561
554
|
}
|
|
562
555
|
|
|
563
|
-
|
|
564
|
-
|
|
565
556
|
function generatePackageJson(domain, iconPath) {
|
|
566
557
|
const u2aPackagePath = path.resolve(__dirname, '../../package.json');
|
|
567
|
-
|
|
558
|
+
|
|
568
559
|
let u2aVersion = '1.0.0';
|
|
569
560
|
try {
|
|
570
561
|
const u2aPackageContent = fs.readFileSync(u2aPackagePath, 'utf8');
|
|
@@ -573,7 +564,7 @@ function generatePackageJson(domain, iconPath) {
|
|
|
573
564
|
} catch (error) {
|
|
574
565
|
logger.error('Error while fetching u2a package.json', error)
|
|
575
566
|
}
|
|
576
|
-
|
|
567
|
+
|
|
577
568
|
return {
|
|
578
569
|
name: `u2a-${domain}`,
|
|
579
570
|
version: u2aVersion,
|