feat: upgrade electron

lukasbach · Mar 23, 2023 · f4fbccc · f4fbccc
1 parent 847ff17
commit f4fbccc
Show file tree

Hide file tree

Showing 8 changed files with 781 additions and 290 deletions.
diff --git a/package.json b/package.json
@@ -35,7 +35,6 @@
     "unzipper": "^0.10.11"
   },
   "devDependencies": {
-    "@lukasbach/campaigns-react": "^0.1.0",
     "@atlaskit/button": "^15.1.5",
     "@atlaskit/editor-common": "^55.4.3",
     "@atlaskit/editor-core": "^140.0.0",
@@ -57,6 +56,7 @@
     "@blueprintjs/select": "^3.13.7",
     "@emotion/core": "^10.0.35",
     "@emotion/css": "^10.0.27",
+    "@lukasbach/campaigns-react": "^0.1.0",
     "@types/archiver": "^3.1.1",
     "@types/chalk": "^2.2.0",
     "@types/classnames": "^2.2.10",
@@ -118,7 +118,7 @@
     "styled-components": "3.4.6",
     "ts-loader": "^8.0.3",
     "ts-node": "^9.0.0",
-    "typescript": "^4.0.2",
+    "typescript": "^5.0.2",
     "uuid": "^8.3.1",
     "webpack": "^4.44.1",
     "webpack-cli": "^3.3.12",
@@ -139,5 +139,9 @@
   "repository": {
     "type": "git",
     "url": "https://github.com/lukasbach/yana.git"
+  },
+  "volta": {
+    "node": "16.19.1",
+    "yarn": "1.22.19"
   }
 }
diff --git a/src/appdata/AppDataExportService.ts b/src/appdata/AppDataExportService.ts
@@ -92,7 +92,7 @@ export class AppDataExportService {
 
     archive.directory(folder + '/', false);
 
-    return new Promise(res => {
+    return new Promise<void>(res => {
       output.on('close', function () {
         onUpdate('Clearing temporary folder');
         rimraf(folder, () => {});

diff --git a/src/appdata/AppDataProvider.tsx b/src/appdata/AppDataProvider.tsx
@@ -152,7 +152,7 @@ export const AppDataProvider: React.FC = props => {
       }
 
       if (deleteData) {
-        await new Promise((res, rev) => {
+        await new Promise<void>((res, rev) => {
           rimraf(workspace.dataSourceOptions.sourcePath, error => {
             if (error) {
               Alerter.Instance.alert({ content: 'Error: ' + error.message });

diff --git a/src/appdata/runImport.ts b/src/appdata/runImport.ts
@@ -23,7 +23,7 @@ export const runImport = async (
     const folder = path.resolve(getElectronPath('temp'), 'yana-import');
 
     onUpdate('Clearing temporary folder');
-    await new Promise(r => rimraf(folder, r));
+    await new Promise<void>((r: any) => rimraf(folder, r));
     await fs.promises.mkdir(folder, { recursive: true });
 
     onUpdate('Creating new workspace');
@@ -43,7 +43,7 @@ export const runImport = async (
     await di.load();
 
     onUpdate('Unzipping exported zip');
-    await new Promise(res =>
+    await new Promise<void>(res =>
       fs
         .createReadStream(sourcePath)
         .pipe(unzipper.Extract({ path: folder }))

diff --git a/src/common/runWithoutClose.ts b/src/common/runWithoutClose.ts
@@ -1,8 +1,8 @@
 import { closeEventEmitter } from './closeEventEmitter';
 
 export const runWithoutClose = async (handler: () => Promise<any>) => {
-  let resolve: () => void = () => {};
-  const completePromise = new Promise(res => {
+  let resolve: any;
+  const completePromise = new Promise<void>(res => {
     resolve = res;
   });
 

diff --git a/src/datasource/LocalSqliteDataSource.ts b/src/datasource/LocalSqliteDataSource.ts
@@ -144,7 +144,7 @@ export class LocalSqliteDataSource implements AbstractDataSource {
       }
 
       // Create and wait for database just so its created on file. We do not need a reference to it here.
-      await new Promise(res => {
+      await new Promise<void>(res => {
         new sqlite3.Database(path.join(sourcePath, DB_FILE), sqlite3.OPEN_CREATE, () => res());
       });
 

diff --git a/tsconfig.json b/tsconfig.json
@@ -7,14 +7,17 @@
     "skipLibCheck": true,
     "esModuleInterop": true,
     "allowSyntheticDefaultImports": true,
-    "strict": true,
+    "strict": false,
+    "strictNullChecks": false,
     "forceConsistentCasingInFileNames": true,
     "moduleResolution": "node",
     "resolveJsonModule": true,
     "isolatedModules": false,
     "jsx": "react",
     "outDir": "app",
-    "downlevelIteration": true
+    "downlevelIteration": true,
+    "experimentalDecorators": true,
+    "useUnknownInCatchVariables": false
   },
   "include": ["src"]
 }