Merge pull request #7 from gregoranders/development

Development

Author: gregoranders

.github/actions/create-release/index.ts

@@ -1,7 +1,7 @@
 import * as core from "@actions/core";
 import { context, GitHub } from "@actions/github";
 
-import * as Octokit from "@octokit/rest";
+import { Octokit } from "@actions/github/node_modules/@octokit/rest";
 
 type IResponse = Octokit.Response<Octokit.ReposGetLatestReleaseResponse | Octokit.ReposCreateReleaseResponse>;
 

.github/actions/upload-asset/index.ts

@@ -1,14 +1,14 @@
 import * as core from "@actions/core";
 import { GitHub } from "@actions/github";
 
-import * as Octokit from "@octokit/rest";
+import { Octokit } from "@actions/github/node_modules/@octokit/rest";
 
 import * as fs from "fs";
 import { getType } from "mime";
 import * as path from "path";
 
 async function upload(github: GitHub, filePath: fs.PathLike,
-                      name: string, url: string): Promise<Octokit.ReposUploadReleaseAssetResponseValue> {
+  name: string, url: string): Promise<Octokit.ReposUploadReleaseAssetResponseValue> {
   const headers: Octokit.ReposUploadReleaseAssetParamsHeaders = {
     "content-length": fs.statSync(filePath).size,
     "content-type": getType(filePath.toString()) || "application/zip",
@@ -25,9 +25,9 @@ async function upload(github: GitHub, filePath: fs.PathLike,
 }
 
 async function run(): Promise<void> {
-  const assetUploadURL: string = core.getInput("url", {required: true});
-  const assetName: string = core.getInput("name", {required: true});
-  const assetPath: string = core.getInput("path", {required: true});
+  const assetUploadURL: string = core.getInput("url", { required: true });
+  const assetName: string = core.getInput("name", { required: true });
+  const assetPath: string = core.getInput("path", { required: true });
 
   if (!process.env.GITHUB_TOKEN) {
     core.setFailed("Missing GitHub token");

.github/workflows/development.yml

@@ -59,3 +59,12 @@ jobs:
       with:
         coverageCommand: npm run test
         debug: true
+    - name: integration test
+      if: matrix.os == 'ubuntu-latest'
+      run: |
+        ls -lha /dev/shm
+        sudo apt-get update
+        sudo apt-get install xvfb
+        sudo chmod 1777 /dev/shm
+        npm run build
+        xvfb-run --auto-servernum -- bash -c "npm run it"

.gitignore

@@ -20,6 +20,7 @@ lib-cov
 
 # Coverage directory used by tools like istanbul
 coverage
+coverage-it
 *.lcov
 
 # nyc test coverage

package.json

@@ -34,14 +34,18 @@
     "collectCoverageFrom": [
       "**/*.{ts,tsx}",
       "**/*.{js,jsx}",
-      "!**/node_modules/**"
+      "!**/node_modules/**",
+      "!main.ts",
+      "!renderer.tsx"
     ],
     "moduleFileExtensions": [
       "ts",
       "tsx",
       "js"
     ],
-    "reporters": ["jest-spec-reporter"],
+    "reporters": [
+      "jest-spec-reporter"
+    ],
     "setupFilesAfterEnv": [
       "jest-enzyme"
     ],
@@ -56,36 +60,38 @@
   },
   "homepage": "https://gregoranders.github.io/typescript-react-electron-starter/",
   "dependencies": {
-    "electron": "7.1.7",
+    "electron": "8.2.0",
     "fancy-log": "1.3.3",
-    "react": "16.12.0",
-    "react-dom": "16.12.0"
+    "react": "16.13.1",
+    "react-dom": "16.13.1"
   },
   "devDependencies": {
-    "@actions/core": "1.2.0",
-    "@actions/github": "2.0.0",
-    "@octokit/rest": "16.36.0",
-    "@types/archiver": "3.0.0",
+    "@actions/core": "1.2.3",
+    "@actions/github": "2.1.1",
+    "@octokit/core": "2.4.3",
+    "@octokit/rest": "17.1.4",
+    "@octokit/types": "2.5.1",
+    "@types/archiver": "3.1.0",
     "@types/electron-packager": "14.0.0",
-    "@types/enzyme": "^3.10.4",
-    "@types/enzyme-adapter-react-16": "^1.0.5",
+    "@types/enzyme": "3.10.5",
+    "@types/enzyme-adapter-react-16": "1.0.6",
     "@types/fancy-log": "1.3.1",
     "@types/gulp": "4.0.6",
     "@types/gulp-sass": "4.0.0",
     "@types/gulp-sourcemaps": "0.0.32",
-    "@types/jest": "24.0.25",
+    "@types/jest": "25.1.4",
     "@types/mime": "2.0.1",
-    "@types/react": "16.9.17",
-    "@types/react-dom": "16.9.4",
-    "@types/react-test-renderer": "16.9.1",
+    "@types/react": "16.9.26",
+    "@types/react-dom": "16.9.5",
+    "@types/react-test-renderer": "16.9.2",
     "@types/through2": "2.0.34",
     "@types/webdriverio": "4.13.3",
-    "@zeit/ncc": "0.21.0",
+    "@zeit/ncc": "0.22.0",
     "archiver": "3.1.1",
-    "del": "^5.1.0",
-    "electron-packager": "14.1.1",
-    "enzyme": "^3.11.0",
-    "enzyme-adapter-react-16": "^1.15.2",
+    "del": "5.1.0",
+    "electron-packager": "14.2.1",
+    "enzyme": "3.11.0",
+    "enzyme-adapter-react-16": "1.15.2",
     "gulp": "4.0.2",
     "gulp-git": "2.10.0",
     "gulp-jest": "4.0.3",
@@ -94,20 +100,20 @@
     "gulp-sourcemaps": "2.6.5",
     "gulp-tslint": "8.1.4",
     "gulp-typescript": "6.0.0-alpha.1",
-    "jest": "24.9.0",
-    "jest-cli": "24.9.0",
-    "jest-environment-enzyme": "^7.1.2",
-    "jest-enzyme": "^7.1.2",
-    "jest-spec-reporter": "^1.0.10",
+    "jest": "25.2.3",
+    "jest-cli": "25.2.3",
+    "jest-environment-enzyme": "7.1.2",
+    "jest-enzyme": "7.1.2",
+    "jest-spec-reporter": "1.0.12",
     "mime": "2.4.4",
-    "node-sass": "4.13.0",
-    "react-test-renderer": "16.12.0",
-    "rimraf": "3.0.0",
+    "node-sass": "4.13.1",
+    "react-test-renderer": "16.13.1",
+    "rimraf": "3.0.2",
     "spectre.css": "0.5.8",
-    "spectron": "9.0.0",
+    "spectron": "10.0.1",
     "through2": "3.0.1",
-    "ts-jest": "24.2.0",
-    "tslint": "5.20.1",
-    "typescript": "3.7.4"
+    "ts-jest": "25.2.1",
+    "tslint": "6.1.0",
+    "typescript": "3.8.3"
   }
 }

typings/gulp-jest/index.d.ts

@@ -3,17 +3,17 @@
 
 declare module "gulp-jest" {
 
-    interface GulpJestOptions extends jest.InitialOptions {
-    }
+  interface GulpJestOptions {
+  }
 
-    interface GulpJest {
-      (options?: GulpJestOptions): NodeJS.ReadWriteStream;
-    }
+  interface GulpJest {
+    (options?: GulpJestOptions): NodeJS.ReadWriteStream;
+  }
 
-    const _tmp: {
-      default: GulpJest;
-    }
+  const _tmp: {
+    default: GulpJest;
+  }
 
-    export = _tmp;
+  export = _tmp;
 
 }