Merge pull request #1671 from nextcloud/refactor/welcome-ts

refactor(welcome): migrate to ts

Author: ShGKme

forge.config.js

@@ -438,7 +438,7 @@ module.exports = {
 						{
 							name: 'talk_desktop__window_welcome',
 							html: './src/welcome/welcome.html',
-							js: './src/welcome/welcome.js',
+							js: './src/welcome/welcome.main.ts',
 							preload: {
 								js: './src/preload.js',
 							},

src/main.js

@@ -30,7 +30,7 @@ const { installVueDevtools } = require('./install-vue-devtools.js')
 const { BUILD_CONFIG } = require('./shared/build.config.ts')
 const { createTalkWindow } = require('./talk/talk.window.js')
 const { createUpgradeWindow } = require('./upgrade/upgrade.window.ts')
-const { createWelcomeWindow } = require('./welcome/welcome.window.js')
+const { createWelcomeWindow } = require('./welcome/welcome.window.ts')
 
 const argv = mri(process.argv.slice(app.isPackaged ? 1 : 2))
 

src/welcome/welcome.js src/welcome/welcome.main.tssrc/welcome/welcome.js renamed to src/welcome/welcome.main.ts

@@ -1,4 +1,4 @@
-/**
+/*!
  * SPDX-FileCopyrightText: 2023 Nextcloud GmbH and Nextcloud contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
@@ -11,19 +11,19 @@ import { applyAxiosInterceptors } from '../shared/setupWebPage.js'
 
 import '@global-styles/dist/icons.css'
 
-const quitButton = document.querySelector('.quit')
+const quitButton = document.querySelector<HTMLButtonElement>('.quit')!
 quitButton.addEventListener('click', () => window.TALK_DESKTOP.quit())
 
 if (__CHANNEL__ !== 'stable') {
-	document.querySelector('.footer').textContent = __VERSION_TAG__
+	document.querySelector<HTMLDivElement>('.footer')!.textContent = __VERSION_TAG__
 }
 
-window.TALK_DESKTOP.getSystemInfo().then((os) => {
-	quitButton.classList.remove('hidden')
-	if (os.isMac) {
-		quitButton.classList.add('quit_mac')
-	}
-})
+window.TALK_DESKTOP.systemInfo = await window.TALK_DESKTOP.getSystemInfo() as { isMac: boolean }
+
+quitButton.classList.remove('hidden')
+if (window.TALK_DESKTOP.systemInfo.isMac) {
+	quitButton.classList.add('quit_mac')
+}
 
 appData.restore()
 
@@ -37,7 +37,8 @@ if (appData.credentials) {
 	// TODO: replace with a proper migration when the migration system supports it
 	await initAppConfig()
 	const accounts = getAppConfigValue('accounts')
-	if (!accounts.length) {
+	if (!accounts?.length) {
+		// @ts-expect-error - appData is not typed yet
 		await setAppConfigValue('accounts', [`${appData.credentials.user}@${appData.serverUrl.replace(/^https?:\/\//, '')}`])
 	}
 }

src/welcome/welcome.window.js src/welcome/welcome.window.tssrc/welcome/welcome.window.js renamed to src/welcome/welcome.window.ts

@@ -1,19 +1,19 @@
-/**
+/*!
  * SPDX-FileCopyrightText: 2022 Nextcloud GmbH and Nextcloud contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
-const { BrowserWindow } = require('electron')
-const { getAppConfig } = require('../app/AppConfig.ts')
-const { isMac } = require('../app/system.utils.ts')
-const { getScaledWindowSize, applyZoom, getWindowUrl } = require('../app/utils.ts')
-const { BUILD_CONFIG } = require('../shared/build.config.ts')
-const { getBrowserWindowIcon } = require('../shared/icons.utils.js')
+import { BrowserWindow } from 'electron'
+import { getAppConfig } from '../app/AppConfig.ts'
+import { isMac } from '../app/system.utils.ts'
+import { applyZoom, getScaledWindowSize, getWindowUrl } from '../app/utils.ts'
+import { BUILD_CONFIG } from '../shared/build.config.ts'
+import { getBrowserWindowIcon } from '../shared/icons.utils.js'
 
 /**
- * @return {import('electron').BrowserWindow}
+ * Creates the welcome window
  */
-function createWelcomeWindow() {
+export function createWelcomeWindow() {
 	const zoomFactor = getAppConfig('zoomFactor')
 	const window = new BrowserWindow({
 		...getScaledWindowSize({
@@ -46,7 +46,3 @@ function createWelcomeWindow() {
 
 	return window
 }
-
-module.exports = {
-	createWelcomeWindow,
-}