Upgrading electron to v7.3.2 and node to v12.18.3

OakLabsInc · Jul 28, 2020 · 39776c8 · 39776c8
1 parent 5bf59bc
commit 39776c8
Show file tree

Hide file tree

Showing 11 changed files with 869 additions and 651 deletions.
diff --git a/.nvmrc b/.nvmrc
@@ -1 +1 @@
-v12.18.1
+v12.18.3
diff --git a/.travis.yml b/.travis.yml
@@ -4,7 +4,7 @@ git:
 notifications:
   email: false
 node_js:
-  - "12.18.1"
+  - "12.18.3"
 matrix:
   include:
     - os: linux

diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:12.18.1-stretch
+FROM node:12.18.3-stretch
 
 ARG DEBIAN_FRONTEND=noninteractive
 
@@ -42,14 +42,14 @@ RUN npm install \
 
 ENTRYPOINT ["oak"]
 
-ENV npm_config_target=6.1.12 \
+ENV npm_config_target=7.3.2 \
     npm_config_runtime=electron \
     npm_config_arch=x64 \
     npm_config_target_arch=x64 \
     npm_config_disturl=https://atom.io/download/electron \
     DEBUG=false \
     NODE_ENV=production \
-    ELECTRON_VERSION=6.1.12 \
+    ELECTRON_VERSION=7.3.2 \
     DISPLAY=:0 \
     IGNORE_GPU_BLACKLIST=false \
     NODE_TLS_REJECT_UNAUTHORIZED=0 \

diff --git a/README.md b/README.md
@@ -1,8 +1,8 @@
 # Oak
 
-[![release](https://img.shields.io/badge/release-v6.0.1-green.svg)](https://github.com/OakLabsInc/oak/releases/tag/6.0.1)
-[![node](https://img.shields.io/badge/node-v12.18.1-green.svg)](https://github.com/nodejs/node/releases/tag/v12.18.1)
-[![electron](https://img.shields.io/badge/electron-v6.1.12-green.svg)](https://github.com/electron/electron/releases/tag/v6.1.12)
+[![release](https://img.shields.io/badge/release-v7.0.0-green.svg)](https://github.com/OakLabsInc/oak/releases/tag/7.0.0)
+[![node](https://img.shields.io/badge/node-v12.18.3-green.svg)](https://github.com/nodejs/node/releases/tag/v12.18.3)
+[![electron](https://img.shields.io/badge/electron-v7.3.2-green.svg)](https://github.com/electron/electron/releases/tag/v7.3.2)
 [![Coverage Status](https://coveralls.io/repos/github/OakLabsInc/oak/badge.svg?t=zYcBU6)](https://coveralls.io/github/OakLabsInc/oak)
 [![Standard - JavaScript Style Guide](https://img.shields.io/badge/code%20style-standard-green.svg)](http://standardjs.com/)
 
@@ -21,8 +21,8 @@ We recommend that you install Nodejs via Node Version Manager: [https://github.c
 After you install and follow the instructions at the end (adding `nvm` to your path),
 
 ```sh
-$ nvm install 12.18.1
-$ nvm use 12.18.1
+$ nvm install 12.18.3
+$ nvm use 12.18.3
 ```
 
 ## Install

diff --git a/docker-deploy.sh b/docker-deploy.sh
@@ -1,11 +1,11 @@
 #!/bin/bash -e
 
-OAK_VERSION="6.0.1"
+OAK_VERSION="7.0.0"
 BASE="oaklabs/oak"
 
 # our FROM line in the Dockerfile, should ideally match the current electron node version
-ELECTRON_VERSION="6.1.12"
-FROM="node:12.18.1-stretch"
+ELECTRON_VERSION="7.3.2"
+FROM="node:12.18.3-stretch"
 
 NPM_URL="https://registry.npmjs.org/"
 

diff --git a/examples/inject-scripts/.nvmrc b/examples/inject-scripts/.nvmrc
@@ -1 +1 @@
-v12.18.1
+v12.18.3
diff --git a/examples/multiple-windows/.nvmrc b/examples/multiple-windows/.nvmrc
@@ -1 +1 @@
-v12.18.1
+v12.18.3
diff --git a/examples/simple-script/.nvmrc b/examples/simple-script/.nvmrc
@@ -1 +1 @@
-v12.18.1
+v12.18.3
diff --git a/examples/simple-url/.nvmrc b/examples/simple-url/.nvmrc
@@ -1 +1 @@
-v12.18.1
+v12.18.3