From c7dbb3f947a5b2ef9b99092d880acb16925ffa03 Mon Sep 17 00:00:00 2001 From: Maxime GRIS Date: Sat, 17 Jul 2021 13:23:22 +0200 Subject: [PATCH] bugfix/ electron builder 22.11 needs Node 14+ --- .github/workflows/macos.yml | 2 +- .github/workflows/ubuntu.yml | 4 +- .github/workflows/windows.yml | 2 +- README.md | 8 +- package-lock.json | 175 +++++++++++++++++++++++++++--------------- package.json | 4 +- 6 files changed, 121 insertions(+), 74 deletions(-) diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index e64e595..367ab95 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -19,7 +19,7 @@ jobs: build: strategy: matrix: - node-version: [12.x, 14.x, 15.x] + node-version: [14.x, 15.x, 16.x] # The type of runner that the job will run on runs-on: macos-latest diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index 9cea1fd..b24e190 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -19,7 +19,7 @@ jobs: build: strategy: matrix: - node-version: [12.x, 14.x, 15.x] + node-version: [14.x, 15.x, 16.x] # The type of runner that the job will run on runs-on: ubuntu-18.04 @@ -55,7 +55,7 @@ jobs: uses: GabrielBB/xvfb-action@v1 with: run: npm test - + - name: Run headless e2e test uses: GabrielBB/xvfb-action@v1 with: diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index d707492..bd0bb9e 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -19,7 +19,7 @@ jobs: build: strategy: matrix: - node-version: [12.x, 14.x, 15.x] + node-version: [14.x, 15.x, 16.x] # The type of runner that the job will run on runs-on: windows-latest diff --git a/README.md b/README.md index c0834d7..10e7343 100644 --- a/README.md +++ b/README.md @@ -18,9 +18,9 @@ Bootstrap and package your project with Angular 12 and Electron 13 (Typescript + Currently runs with: -- Angular v12.0.5 -- Electron v13.0.1 -- Electron Builder v22.10.5 +- Angular v12.1.2 +- Electron v13.1.7 +- Electron Builder v22.11.9 With this sample, you can: @@ -30,7 +30,7 @@ With this sample, you can: /!\ Hot reload only pertains to the renderer process. The main electron process is not able to be hot reloaded, only restarted. -/!\ Angular 12.x CLI needs Node 11 or later to work correctly. +/!\ Angular CLI & Electron Builder needs Node 14 or later to work correctly. ## Getting Started diff --git a/package-lock.json b/package-lock.json index c5158a1..654f82f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3127,9 +3127,9 @@ "dev": true }, "@types/yargs": { - "version": "16.0.4", - "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz", - "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==", + "version": "17.0.2", + "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.2.tgz", + "integrity": "sha512-JhZ+pNdKMfB0rXauaDlrIvm+U7V4m03PPOSVoPS66z8gf+G4Z/UW8UlrVIj2MRQOBzuoEvYtjS0bqYwnpZaS9Q==", "dev": true, "requires": { "@types/yargs-parser": "*" @@ -3832,15 +3832,15 @@ } }, "app-builder-bin": { - "version": "3.5.13", - "resolved": "https://registry.npmjs.org/app-builder-bin/-/app-builder-bin-3.5.13.tgz", - "integrity": "sha512-ighVe9G+bT1ENGdp9ecO1P+94vv/f+FUwaI+XkNzeg9bYF8Oi3BQ+mJuxS00UgyHs8luuOzjzC+qnAtdb43Mpg==", + "version": "3.7.1", + "resolved": "https://registry.npmjs.org/app-builder-bin/-/app-builder-bin-3.7.1.tgz", + "integrity": "sha512-ql93vEUq6WsstGXD+SBLSIQw6SNnhbDEM0swzgugytMxLp3rT24Ag/jcC80ZHxiPRTdew1niuR7P3/FCrDqIjw==", "dev": true }, "app-builder-lib": { - "version": "22.11.7", - "resolved": "https://registry.npmjs.org/app-builder-lib/-/app-builder-lib-22.11.7.tgz", - "integrity": "sha512-pS9/cR4/TnNZVAHZECiSvvwTBzbwblj7KBBZkMKDG57nibq0I1XY8zAaYeHFdlYTyrRcz9JUXbAqJKezya7UFQ==", + "version": "22.11.9", + "resolved": "https://registry.npmjs.org/app-builder-lib/-/app-builder-lib-22.11.9.tgz", + "integrity": "sha512-mS8aFN16IlzXzD1LwuheHliCI7wiJjC+agiCh+mxRtY8TKinb0vSI4pggib4RHvVq55l3RxDX4EEWGuqGMScIA==", "dev": true, "requires": { "7zip-bin": "~5.1.1", @@ -3849,12 +3849,13 @@ "@malept/flatpak-bundler": "^0.4.0", "async-exit-hook": "^2.0.1", "bluebird-lst": "^1.0.9", - "builder-util": "22.11.7", - "builder-util-runtime": "8.7.7", + "builder-util": "22.11.9", + "builder-util-runtime": "8.7.8", "chromium-pickle-js": "^0.2.0", "debug": "^4.3.2", "ejs": "^3.1.6", - "electron-publish": "22.11.7", + "electron-osx-sign": "^0.5.0", + "electron-publish": "22.11.9", "fs-extra": "^10.0.0", "hosted-git-info": "^4.0.2", "is-ci": "^3.0.0", @@ -4729,6 +4730,22 @@ "ieee754": "^1.1.13" } }, + "buffer-alloc": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/buffer-alloc/-/buffer-alloc-1.2.0.tgz", + "integrity": "sha512-CFsHQgjtW1UChdXgbyJGtnm+O/uLQeZdtbDo8mfUgYXCHSM1wgrVxXm6bSyrUuErEb+4sYVGCzASBRot7zyrow==", + "dev": true, + "requires": { + "buffer-alloc-unsafe": "^1.1.0", + "buffer-fill": "^1.0.0" + } + }, + "buffer-alloc-unsafe": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/buffer-alloc-unsafe/-/buffer-alloc-unsafe-1.1.0.tgz", + "integrity": "sha512-TEM2iMIEQdJ2yjPJoSIsldnleVaAk1oW3DBVUykyOLsEsFmEc9kn+SFFPz+gl54KQNxlDnAwCXosOS9Okx2xAg==", + "dev": true + }, "buffer-crc32": { "version": "0.2.13", "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz", @@ -4741,6 +4758,12 @@ "integrity": "sha1-WWFrSYME1Var1GaWayLu2j7KX74=", "dev": true }, + "buffer-fill": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/buffer-fill/-/buffer-fill-1.0.0.tgz", + "integrity": "sha1-+PeLdniYiO858gXNY39o5wISKyw=", + "dev": true + }, "buffer-from": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz", @@ -4754,17 +4777,17 @@ "dev": true }, "builder-util": { - "version": "22.11.7", - "resolved": "https://registry.npmjs.org/builder-util/-/builder-util-22.11.7.tgz", - "integrity": "sha512-ihqUe5ey82LM9qqQe0/oIcaSm9w+B9UjcsWJZxJliTBsbU+sErOpDFpHW+sim0veiTF/EIcGUh9HoduWw+l9FA==", + "version": "22.11.9", + "resolved": "https://registry.npmjs.org/builder-util/-/builder-util-22.11.9.tgz", + "integrity": "sha512-phiEuT361Pzb8kNN2ZQDr7PHV+TTNMydqIow9Wcrl69VxM1q89qJPLvHsDhR9m9T0OCMHaO0UsZsJ8Jsx2LDJQ==", "dev": true, "requires": { "7zip-bin": "~5.1.1", - "@types/debug": "^4.1.5", + "@types/debug": "^4.1.6", "@types/fs-extra": "^9.0.11", - "app-builder-bin": "3.5.13", + "app-builder-bin": "3.7.1", "bluebird-lst": "^1.0.9", - "builder-util-runtime": "8.7.7", + "builder-util-runtime": "8.7.8", "chalk": "^4.1.1", "debug": "^4.3.2", "fs-extra": "^10.0.0", @@ -4863,9 +4886,9 @@ } }, "builder-util-runtime": { - "version": "8.7.7", - "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-8.7.7.tgz", - "integrity": "sha512-RUfoXzVrmFFI0K/Oft0CtP1LpTIOlBeLJatt5DePTI0KlxE156am4SGUpqtbbdqZNm++LkV9mX4olBDcXyGPow==", + "version": "8.7.8", + "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-8.7.8.tgz", + "integrity": "sha512-j7V45HIXX5dzminZLVKlmgmqaXpt44CcpFVEjlkO6zPM3IQFjeb+jvOKcqygg5MK3Q1Q5l4Jj9m9xZp0Rc4TiQ==", "dev": true, "requires": { "debug": "^4.3.2", @@ -5463,6 +5486,12 @@ "dot-prop": "^5.1.0" } }, + "compare-version": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/compare-version/-/compare-version-0.1.2.tgz", + "integrity": "sha1-AWLsLZNR9d3VmpICy6k1NmpyUIA=", + "dev": true + }, "component-emitter": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.0.tgz", @@ -7023,39 +7052,20 @@ } }, "dmg-builder": { - "version": "22.11.7", - "resolved": "https://registry.npmjs.org/dmg-builder/-/dmg-builder-22.11.7.tgz", - "integrity": "sha512-+I+XfP2DODHB6PwFANgpH/WMzzCA5r5XoMvbFCIYjQjJpXlO0XnqQaamzFl2vh/Wz/Qt0d0lJMgRy8gKR3MGdQ==", + "version": "22.11.9", + "resolved": "https://registry.npmjs.org/dmg-builder/-/dmg-builder-22.11.9.tgz", + "integrity": "sha512-9RCNW4oJI0zFswgumgbgopFZRZ+7zt6J7H6RQ3YB/vjehdfAxzWutFhiy3ExTwSX8QF9rAUWvfH5wk/hJjNrqA==", "dev": true, "requires": { - "app-builder-lib": "22.11.7", - "builder-util": "22.11.7", - "builder-util-runtime": "8.7.6", + "app-builder-lib": "22.11.9", + "builder-util": "22.11.9", + "builder-util-runtime": "8.7.8", "dmg-license": "^1.0.9", "fs-extra": "^10.0.0", "iconv-lite": "^0.6.2", "js-yaml": "^4.1.0" }, "dependencies": { - "builder-util-runtime": { - "version": "8.7.6", - "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-8.7.6.tgz", - "integrity": "sha512-rj9AIY7CzLSuTOXpToiaQkruYh6UEQ+kYnd5UET22ch8MGClEtIZKXHG14qEiXEr2x4EOKDMxkcTa+9TYaE+ug==", - "dev": true, - "requires": { - "debug": "^4.3.2", - "sax": "^1.2.4" - } - }, - "debug": { - "version": "4.3.2", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz", - "integrity": "sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==", - "dev": true, - "requires": { - "ms": "2.1.2" - } - }, "fs-extra": { "version": "10.0.0", "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.0.0.tgz", @@ -7302,17 +7312,17 @@ } }, "electron-builder": { - "version": "22.11.7", - "resolved": "https://registry.npmjs.org/electron-builder/-/electron-builder-22.11.7.tgz", - "integrity": "sha512-yQExSLt7Hbz/P8lLkZDdE/OnJJ7NCX+uiQcV+XIH0TeEZcD87ZnSqBBzGUN5akySU4BXXlrVZKeUsXACWrm5Kw==", + "version": "22.11.9", + "resolved": "https://registry.npmjs.org/electron-builder/-/electron-builder-22.11.9.tgz", + "integrity": "sha512-A+qopfZuFRuMBKLL6/L+VkFmPZFbQwvZEdnHRYlY7B58MhOANUGJKPVAm07U44IjSq5UK5U9/3xRDR7y3jnsug==", "dev": true, "requires": { - "@types/yargs": "^16.0.2", - "app-builder-lib": "22.11.7", - "builder-util": "22.11.7", - "builder-util-runtime": "8.7.7", + "@types/yargs": "^17.0.1", + "app-builder-lib": "22.11.9", + "builder-util": "22.11.9", + "builder-util-runtime": "8.7.8", "chalk": "^4.1.1", - "dmg-builder": "22.11.7", + "dmg-builder": "22.11.9", "fs-extra": "^10.0.0", "is-ci": "^3.0.0", "lazy-val": "^1.0.5", @@ -7481,15 +7491,55 @@ } } }, + "electron-osx-sign": { + "version": "0.5.0", + "resolved": "https://registry.npmjs.org/electron-osx-sign/-/electron-osx-sign-0.5.0.tgz", + "integrity": "sha512-icoRLHzFz/qxzDh/N4Pi2z4yVHurlsCAYQvsCSG7fCedJ4UJXBS6PoQyGH71IfcqKupcKeK7HX/NkyfG+v6vlQ==", + "dev": true, + "requires": { + "bluebird": "^3.5.0", + "compare-version": "^0.1.2", + "debug": "^2.6.8", + "isbinaryfile": "^3.0.2", + "minimist": "^1.2.0", + "plist": "^3.0.1" + }, + "dependencies": { + "debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "dev": true, + "requires": { + "ms": "2.0.0" + } + }, + "isbinaryfile": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-3.0.3.tgz", + "integrity": "sha512-8cJBL5tTd2OS0dM4jz07wQd5g0dCCqIhUxPIGtZfa5L6hWlvV5MHTITy/DBAsF+Oe2LS1X3krBUhNwaGUWpWxw==", + "dev": true, + "requires": { + "buffer-alloc": "^1.2.0" + } + }, + "ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", + "dev": true + } + } + }, "electron-publish": { - "version": "22.11.7", - "resolved": "https://registry.npmjs.org/electron-publish/-/electron-publish-22.11.7.tgz", - "integrity": "sha512-A4EhRRNBVz4SPzUlBrPO6BmuyDeI0pyprggPAV9rQ+SDVSnSB/WKPot9JwWMyArkGj3AUUTMNVT6hwZhMvhfqw==", + "version": "22.11.9", + "resolved": "https://registry.npmjs.org/electron-publish/-/electron-publish-22.11.9.tgz", + "integrity": "sha512-jFMiAsNvssne8RKMihZhPjGr4fJOBIj6N1WCG6jIl99lw1PGl45uCd4yXDxd8fMUvY4f6221LcbUA+ov/jFQnA==", "dev": true, "requires": { "@types/fs-extra": "^9.0.11", - "builder-util": "22.11.7", - "builder-util-runtime": "8.7.7", + "builder-util": "22.11.9", + "builder-util-runtime": "8.7.8", "chalk": "^4.1.1", "fs-extra": "^10.0.0", "lazy-val": "^1.0.5", @@ -13486,7 +13536,6 @@ "resolved": "https://registry.npmjs.org/plist/-/plist-3.0.2.tgz", "integrity": "sha512-MSrkwZBdQ6YapHy87/8hDU8MnIcyxBKjeF+McXnr5A9MtffPewTs7G3hlpodT5TacyfIyFTaJEhh3GGcmasTgQ==", "dev": true, - "optional": true, "requires": { "base64-js": "^1.5.1", "xmlbuilder": "^9.0.7", @@ -13497,8 +13546,7 @@ "version": "9.0.7", "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-9.0.7.tgz", "integrity": "sha1-Ey7mPS7FVlxVfiD0wi35rKaGsQ0=", - "dev": true, - "optional": true + "dev": true } } }, @@ -19487,8 +19535,7 @@ "version": "0.5.0", "resolved": "https://registry.npmjs.org/xmldom/-/xmldom-0.5.0.tgz", "integrity": "sha512-Foaj5FXVzgn7xFzsKeNIde9g6aFBxTPi37iwsno8QvApmtg7KYrr+OPyRHcJF7dud2a5nGRBXK3n0dL62Gf7PA==", - "dev": true, - "optional": true + "dev": true }, "xtend": { "version": "4.0.2", diff --git a/package.json b/package.json index b1e44ec..83adc3b 100644 --- a/package.json +++ b/package.json @@ -76,7 +76,7 @@ "conventional-changelog-cli": "2.1.1", "cross-env": "7.0.3", "electron": "13.1.7", - "electron-builder": "22.11.7", + "electron-builder": "22.11.9", "electron-reload": "1.5.0", "eslint": "7.30.0", "eslint-plugin-import": "2.23.4", @@ -99,7 +99,7 @@ "webdriver-manager": "12.1.8" }, "engines": { - "node": ">=12.0.0" + "node": ">=14.0.0" }, "browserslist": [ "chrome 91"