build(deps-dev): bump electron from 11.3.0 to 12.0.0 (#633)

* build(deps-dev): bump electron from 11.3.0 to 12.0.0 Bumps [electron](https://github.com/electron/electron) from 11.3.0 to 12.0.0. - [Release notes](https://github.com/electron/electron/releases) - [Changelog](https://github.com/electron/electron/blob/master/docs/breaking-changes.md) - [Commits](https://github.com/electron/electron/compare/v11.3.0...v12.0.0) Signed-off-by: dependabot[bot] <support@github.com> * build: update xcode * test(macOS): increase timeout for rebuild all modules test to 5m * build(deps-dev): upgrade electron to ^12.0.2 Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Samuel Attard <sattard@slack-corp.com> Co-authored-by: Mark Lee <electronjs@lazymalevolence.com>
2021-04-09 15:44:20 -07:00 · 2021-04-09 15:44:20 -07:00 · 858ec5b41e
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@ -53,7 +53,7 @@ jobs:
    <<: *steps-test
  test-mac:
    macos:
-      xcode: "10.2.0"
+      xcode: "12.2.0"
    <<: *steps-test
  test-windows:
    executor:
--- a/package-lock.json
+++ b/package-lock.json
@ -1755,9 +1755,9 @@
      }
    },
    "boolean": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/boolean/-/boolean-3.0.2.tgz",
-      "integrity": "sha512-RwywHlpCRc3/Wh81MiCKun4ydaIFyW5Ea6JbL6sRCVx5q5irDw7pMXBUFYF/jArQ6YrG36q0kpovc9P/Kd3I4g==",
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/boolean/-/boolean-3.0.3.tgz",
+      "integrity": "sha512-EqrTKXQX6Z3A2nRmMEIlAIfjQOgFnVO2nqZGpbcsPnYGWBwpFqzlrozU1dy+S2iqfYDLh26ef4KrgTxu9xQrxA==",
      "dev": true,
      "optional": true
    },
@ -2208,9 +2208,9 @@
      }
    },
    "core-js": {
-      "version": "3.9.0",
-      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.9.0.tgz",
-      "integrity": "sha512-PyFBJaLq93FlyYdsndE5VaueA9K5cNB7CGzeCj191YYLhkQM0gdZR2SKihM70oF0wdqKSKClv/tEBOpoRmdOVQ==",
+      "version": "3.10.1",
+      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.10.1.tgz",
+      "integrity": "sha512-pwCxEXnj27XG47mu7SXAwhLP3L5CrlvCB91ANUkIz40P27kUcvNfSdvyZJ9CLHiVoKSp+TTChMQMSKQEH/IQxA==",
      "dev": true,
      "optional": true
    },
@ -2497,9 +2497,9 @@
      "integrity": "sha1-+hN8S9aY7fVc1c0CrFWfkaTEups="
    },
    "detect-node": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/detect-node/-/detect-node-2.0.4.tgz",
-      "integrity": "sha512-ZIzRpLJrOj7jjP2miAtgqIfmzbxa4ZOr5jJc601zklsfEx9oTzmmj2nVpIPRpNlRTIh8lc1kyViIY7BWSGNmKw==",
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/detect-node/-/detect-node-2.0.5.tgz",
+      "integrity": "sha512-qi86tE6hRcFHy8jI1m2VG+LaPUR1LhqDa5G8tVjuUXmOrpuAgqsA1pN0+ldgr3aKUH+QLI9hCY/OcRYisERejw==",
      "dev": true,
      "optional": true
    },
@ -2569,22 +2569,14 @@
      }
    },
    "electron": {
-      "version": "11.3.0",
-      "resolved": "https://registry.npmjs.org/electron/-/electron-11.3.0.tgz",
-      "integrity": "sha512-MhdS0gok3wZBTscLBbYrOhLaQybCSAfkupazbK1dMP5c+84eVMxJE/QGohiWQkzs0tVFIJsAHyN19YKPbelNrQ==",
+      "version": "12.0.2",
+      "resolved": "https://registry.npmjs.org/electron/-/electron-12.0.2.tgz",
+      "integrity": "sha512-14luh9mGzfL4e0sncyy0+kW37IU7Y0Y1tvI97FDRSW0ZBQxi5cmAwSs5dmPmNBFBIGtzkaGaEB01j9RjZuCmow==",
      "dev": true,
      "requires": {
        "@electron/get": "^1.0.1",
-        "@types/node": "^12.0.12",
+        "@types/node": "^14.6.2",
        "extract-zip": "^1.0.3"
-      },
-      "dependencies": {
-        "@types/node": {
-          "version": "12.20.4",
-          "resolved": "https://registry.npmjs.org/@types/node/-/node-12.20.4.tgz",
-          "integrity": "sha512-xRCgeE0Q4pT5UZ189TJ3SpYuX/QGl6QIAOAIeDSbAVAd2gX1NxSZup4jNVK7cxIeP8KDSbJgcckun495isP1jQ==",
-          "dev": true
-        }
      }
    },
    "emoji-regex": {
@ -3499,9 +3491,9 @@
      }
    },
    "global-agent": {
-      "version": "2.1.12",
-      "resolved": "https://registry.npmjs.org/global-agent/-/global-agent-2.1.12.tgz",
-      "integrity": "sha512-caAljRMS/qcDo69X9BfkgrihGUgGx44Fb4QQToNQjsiWh+YlQ66uqYVAdA8Olqit+5Ng0nkz09je3ZzANMZcjg==",
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/global-agent/-/global-agent-2.2.0.tgz",
+      "integrity": "sha512-+20KpaW6DDLqhG7JDiJpD1JvNvb8ts+TNl7BPOYcURqCrXqnN1Vf+XVOrkKJAFPqfX+oEhsdzOj1hLWkBTdNJg==",
      "dev": true,
      "optional": true,
      "requires": {
@ -3515,9 +3507,9 @@
      },
      "dependencies": {
        "semver": {
-          "version": "7.3.4",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.4.tgz",
-          "integrity": "sha512-tCfb2WLjqFAtXn4KEdxIhalnRtoKFN7nAwj0B3ZXCbQloV2tq5eDbcTmT68JJD3nRJq24/XgxtQKFIpQdtvmVw==",
+          "version": "7.3.5",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
+          "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
          "dev": true,
          "optional": true,
          "requires": {
@ -3557,9 +3549,9 @@
      }
    },
    "globalthis": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/globalthis/-/globalthis-1.0.1.tgz",
-      "integrity": "sha512-mJPRTc/P39NH/iNG4mXa9aIhNymaQikTrnspeCa2ZuJ+mH2QN/rXwtX3XwKrHqWgUQFbNZKtHM105aHzJalElw==",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/globalthis/-/globalthis-1.0.2.tgz",
+      "integrity": "sha512-ZQnSFO1la8P7auIOQECnm0sSuoMeaSq0EEdXMBFF2QJO4uNcwbyhSgG3MruWNbFTqCLmxVwGOl7LZ9kASvHdeQ==",
      "dev": true,
      "optional": true,
      "requires": {
--- a/package.json
+++ b/package.json
@ -69,7 +69,7 @@
    "chai-as-promised": "^7.1.1",
    "codecov": "^3.7.2",
    "cross-env": "^7.0.2",
-    "electron": "^11.0.2",
+    "electron": "^12.0.2",
    "eslint": "^7.7.0",
    "eslint-plugin-mocha": "^8.0.0",
    "mocha": "^8.1.1",
--- a/test/rebuild.ts
+++ b/test/rebuild.ts
@ -9,11 +9,12 @@ import { expectNativeModuleToBeRebuilt, expectNativeModuleToNotBeRebuilt } from
 import { getExactElectronVersionSync } from './helpers/electron-version';
 import { rebuild, RebuildOptions } from '../src/rebuild';

+const MINUTES_IN_MILLISECONDS = 60 * 1000;
 const testElectronVersion = getExactElectronVersionSync();

 describe('rebuilder', () => {
  const testModulePath = path.resolve(os.tmpdir(), 'electron-rebuild-test');
-  const timeoutSeconds = process.platform === 'win32' ? 5 : 2;
+  const timeoutMinutes = process.platform === 'win32' ? 5 : 2;
  const msvs_version: string | undefined = process.env.GYP_MSVS_VERSION;

  const resetMSVSVersion = () => {
@ -50,7 +51,7 @@ describe('rebuilder', () => {
  ];
  for (const options of optionSets) {
    describe(`core behavior -- ${options.name}`, function() {
-      this.timeout(timeoutSeconds * 60 * 1000);
+      this.timeout(timeoutMinutes * MINUTES_IN_MILLISECONDS);

      before(async () => {
        await resetTestModule();
@ -107,7 +108,7 @@ describe('rebuilder', () => {
  }

  describe('force rebuild', function() {
-    this.timeout(timeoutSeconds * 60 * 1000);
+    this.timeout(timeoutMinutes * MINUTES_IN_MILLISECONDS);

    before(resetTestModule);
    after(cleanupTestModule);
@ -137,7 +138,10 @@ describe('rebuilder', () => {
      expect(skipped).to.equal(0);
    });

-    it('should rebuild all modules again when enabled', async () => {
+    it('should rebuild all modules again when enabled', async function() {
+      if (process.platform === 'darwin') {
+        this.timeout(5 * MINUTES_IN_MILLISECONDS);
+      }
      await rebuild(testModulePath, testElectronVersion, process.arch);
      resetMSVSVersion();
      const rebuilder = rebuild(testModulePath, testElectronVersion, process.arch, [], true);
@ -151,7 +155,7 @@ describe('rebuilder', () => {
  });

  describe('only rebuild', function() {
-    this.timeout(2 * 60 * 1000);
+    this.timeout(2 * MINUTES_IN_MILLISECONDS);

    beforeEach(resetTestModule);
    afterEach(cleanupTestModule);
@ -190,7 +194,7 @@ describe('rebuilder', () => {
  });

  describe('debug rebuild', function() {
-    this.timeout(10 * 60 * 1000);
+    this.timeout(10 * MINUTES_IN_MILLISECONDS);

    before(resetTestModule);
    after(cleanupTestModule);
@ -210,7 +214,7 @@ describe('rebuilder', () => {
  });

  describe('useElectronClang rebuild', function() {
-    this.timeout(10 * 60 * 1000);
+    this.timeout(10 * MINUTES_IN_MILLISECONDS);

    before(resetTestModule);
    after(cleanupTestModule);