Merge pull request #164 from 4gray/master

Merge back from release branch to electron
4gray · Sep 19, 2022 · fb844b5 · fb844b5 · vercel · Sep 19, 2022
2 parents cd3496f + 1666376
commit fb844b5
Show file tree

Hide file tree

Showing 8 changed files with 30 additions and 24 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -37,11 +37,9 @@ jobs:
           npx electron-builder --linux snap --armv7l --publish always
           npx electron-builder --linux snap --x64 --publish always
           npx electron-builder --linux deb rpm --x64 --publish always
-          npx electron-builder --linux deb --ia32 --publish always
           npx electron-builder --linux deb --arm64 --publish always
           npx electron-builder --linux deb --armv7l --publish always
           npx electron-builder --linux AppImage --x64 --publish always
-          npx electron-builder --linux AppImage --ia32 --publish always
           npx electron-builder --linux AppImage --arm64 --publish always
           npx electron-builder --linux AppImage --armv7l --publish always
         env:
@@ -69,4 +67,4 @@ jobs:
 
           # If the commit is tagged with a version (e.g. "v1.0.0"),
           # release the app after building
-          release: ${{ startsWith(github.ref, 'refs/tags/v') }}
+          release: ${{ startsWith(github.ref, 'refs/tags/v') }}
diff --git a/angular.json b/angular.json
@@ -21,7 +21,7 @@
         "build": {
           "builder": "@angular-builders/custom-webpack:browser",
           "options": {
-            "outputPath": "build",
+            "outputPath": "dist",
             "index": "src/index.html",
             "main": "src/main.ts",
             "tsConfig": "src/tsconfig.app.json",

diff --git a/electron-builder.json b/electron-builder.json
@@ -5,20 +5,26 @@
     },
     "files": [
         "**/*",
+        "dist",
         "!**/*.ts",
         "!*.code-workspace",
         "!LICENSE.md",
+        "!README.md",
+        "!CHANGELOG.md",
         "!package.json",
         "!package-lock.json",
         "!src/",
         "!e2e/",
         "!hooks/",
         "!angular.json",
         "!tsconfig.json",
-        "!tslint.json"
+        "!tsconfig.*.json",
+        "!tslint.json",
+        "!*.png",
+        "!coverage"
     ],
     "win": {
-        "icon": "build/assets/icons",
+        "icon": "dist/assets/icons",
         "compression": "maximum",
         "target": [
             {
@@ -28,31 +34,31 @@
         ]
     },
     "mac": {
-        "icon": "build/assets/icons/icon-1024.png",
+        "icon": "dist/assets/icons/icon-1024.png",
         "target": {
             "target": "dmg",
             "arch": ["universal"]
         }
     },
     "linux": {
-        "icon": "build/assets/icons",
+        "icon": "dist/assets/icons",
         "category": "Video",
         "target": [
             {
                 "target": "AppImage",
-                "arch": ["x64", "ia32", "armv7l", "arm64"]
+                "arch": ["x64", "armv7l", "arm64"]
             },
             {
                 "target": "deb",
-                "arch": ["x64", "ia32", "armv7l", "arm64"]
+                "arch": ["x64", "armv7l", "arm64"]
             },
             {
                 "target": "rpm",
-                "arch": ["x64", "ia32", "arm64", "armv7l"]
+                "arch": ["x64", "arm64", "armv7l"]
             },
             {
                 "target": "Snap",
-                "arch": ["x64", "ia32", "arm64", "armv7l"]
+                "arch": ["x64", "arm64", "armv7l"]
             }
         ]
     }

diff --git a/electron/main.ts b/electron/main.ts
@@ -33,7 +33,7 @@ function createWindow(): BrowserWindow {
         },
         resizable: true,
         darkTheme: true,
-        icon: path.join(__dirname, '../build/assets/icons/icon.png'),
+        icon: path.join(__dirname, '../dist/assets/icons/icon.png'),
         titleBarStyle: 'hidden',
         frame: false,
         minWidth: 900,
@@ -50,7 +50,7 @@ function createWindow(): BrowserWindow {
     } else {
         win.loadURL(
             url.format({
-                pathname: path.join(__dirname, '../build/index.html'),
+                pathname: path.join(__dirname, '../dist/index.html'),
                 protocol: 'file:',
                 slashes: true,
             })

diff --git a/electron/menu.ts b/electron/menu.ts
@@ -111,7 +111,7 @@ export class AppMenu {
                         openAboutWindow({
                             icon_path: path.join(
                                 __dirname,
-                                'build/assets/icons/icon.png'
+                                '../dist/assets/icons/icon.png'
                             ),
                             copyright: 'Copyright (c) 2020-2022 4gray',
                             package_json_dir: __dirname,

diff --git a/package-lock.json b/package-lock.json
diff --git a/src/app/app.module.ts b/src/app/app.module.ts
@@ -61,12 +61,14 @@ export function DataFactory(dbService: NgxIndexedDBService, http: HttpClient) {
                 deps: [HttpClient],
             },
         }),
-        ServiceWorkerModule.register('ngsw-worker.js', {
-            enabled: AppConfig.production,
-            // Register the ServiceWorker as soon as the app is stable
-            // or after 30 seconds (whichever comes first).
-            registrationStrategy: 'registerWhenStable:30000',
-        }),
+        !isElectron
+            ? ServiceWorkerModule.register('ngsw-worker.js', {
+                  enabled: AppConfig.production,
+                  // Register the ServiceWorker as soon as the app is stable
+                  // or after 30 seconds (whichever comes first).
+                  registrationStrategy: 'registerWhenStable:30000',
+              })
+            : [],
     ],
     providers: [
         {

diff --git a/src/app/shared/components/header/header.component.html b/src/app/shared/components/header/header.component.html
@@ -71,7 +71,7 @@
     </mat-menu>
 </ng-template>
 <ngx-whats-new
-    *ngIf="isDialogVisible$ | async"
+    *ngIf="!isElectron && isDialogVisible$ | async"
     (closeModal)="setDialogVisibility(false)"
     [items]="modals"
     [options]="options"