cicd

.gitlab-ci.yml

@@ -13,7 +13,7 @@ build:
     - echo "VERSION=$VERSION" >> variables.env
     - export APPNAME=$(node -e "console.log(require('./package.json').productName)")
     - echo "APPNAME=$APPNAME" >> variables.env
-    - yarn build
+    - yarn electron:build --macos dmg
   artifacts:
     reports:
       dotenv: variables.env

package.json

@@ -1,42 +1,18 @@
 {
   "name": "Crimata",
-  "productName": "Crimata Messenger",
-  "description": "Cross-platform messenger application built with electron, vue3, and TS.",
   "version": "0.9.1",
   "private": true,
+  "description": "Cross-platform messenger application built with electron, vue3, and TS.",
   "author": {
     "name": "Enrique Hernandez"
   },
-  "main": "background.js",
   "scripts": {
-    "dev": "vue-cli-service electron:serve",
+    "electron:build": "vue-cli-service electron:build",
-    "build": "vue-cli-service electron:build --mac"
+    "electron:serve": "vue-cli-service electron:serve",
-  },
+    "postinstall": "electron-builder install-app-deps",
-  "repository": {
+    "postuninstall": "electron-builder install-app-deps"
-    "type": "git",
-    "url": "https://gitlab.com/crimata/electron-app.git",
-    "release": "latest"
-  },
-  "vue": {
-    "lintOnSave": false,
-    "pluginOptions": {
-      "electronBuilder": {
-        "preload": "src/preload.ts",
-        "builderOptions": {
-          "mac": {
-            "target": "dmg"
-          },
-          "appId": "com.crimata.${name}",
-          "productName": "Crimata Messenger",
-          "artifactName": "${productName}-${version}.${ext}",
-          "publish": {
-            "provider": "generic",
-            "url": "https://gitlab.com/api/v4/projects/25637892/jobs/artifacts/master/raw/dist?job=build"
-          }
-        }
-      }
-    }
   },
+  "main": "background.js",
   "dependencies": {
     "@google-cloud/speech": "^4.2.0",
     "@types/animejs": "^3.1.2",
@@ -60,6 +36,7 @@
     "ws": "^7.3.1"
   },
   "devDependencies": {
+    "@types/electron-devtools-installer": "^2.2.0",
     "@types/jest": "^24.0.19",
     "@typescript-eslint/eslint-plugin": "^2.33.0",
     "@typescript-eslint/parser": "^2.33.0",
@@ -83,11 +60,31 @@
     "node-sass": "^4.12.0",
     "optimize-wasm-webpack-plugin": "^1.0.12",
     "sass-loader": "^8.0.2",
-    "spectron": "^11.0.0",
+    "spectron": "11.0.0",
     "typescript": "~3.9.3",
-    "vue-cli-plugin-electron-builder": "~2.0.0-rc.4",
+    "vue-cli-plugin-electron-builder": "~2.0.0-rc.6",
     "vue-jest": "^5.0.0-0"
   },
+  "vue": {
+    "lintOnSave": false,
+    "pluginOptions": {
+      "electronBuilder": {
+        "preload": "src/preload.ts",
+        "builderOptions": {
+          "mac": {
+            "target": "dmg"
+          },
+          "appId": "com.crimata.${name}",
+          "productName": "Crimata Messenger",
+          "artifactName": "${productName}-${version}.${ext}",
+          "publish": {
+            "provider": "generic",
+            "url": "https://gitlab.com/api/v4/projects/25637892/jobs/artifacts/master/raw/dist?job=build"
+          }
+        }
+      }
+    }
+  },
   "gitHooks": {
     "pre-commit": "lint-staged"
   },
@@ -96,5 +93,11 @@
       "vue-cli-service lint",
       "git add"
     ]
+  },
+  "productName": "Crimata Messenger",
+  "repository": {
+    "type": "git",
+    "url": "https://gitlab.com/crimata/electron-app.git",
+    "release": "latest"
   }
 }

tests/unit/electron.spec.js

@@ -24,7 +24,7 @@ test('Window Loads Properly', async () => {
   // App is loaded properly
   expect(
     /Welcome to Your Vue\.js (\+ TypeScript )?App/.test(
-      await client.getHTML('#app')
+      await (await app.client.$('#app')).getHTML()
     )
   ).toBe(true)