chore: merge branch 'release/1.0.2'

2020-09-29 23:03:57 +02:00
parent 731ce15206 433dfeb7f5
commit ce29f13f41
10 changed files with 22045 additions and 12615 deletions
--- a/.browserslistrc
+++ b/.browserslistrc
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,7 +10,7 @@ addons:
 services:
  - xvfb
 install:
-  - yarn install
+  - npm install
 script:
-  - yarn e2e
-  - yarn package
+  - npm run e2e
+  - npm run package
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,40 @@
+## 1.0.2 (2020-09-29)
+
+
+### Bug Fixes
+
+* reopening window crash on macos ([f442df7](https://github.com/sourcygen/electron-angular-quick-start/commit/f442df72c4120fb616d21c5c4e245a5eb478f57e))
+
+
+### Features
+
+*  disable remote content execution ([0c82cf4](https://github.com/sourcygen/electron-angular-quick-start/commit/0c82cf425930de7368debfbc6176a3ef8ed7591e))
+* adapt angular part ([83301e0](https://github.com/sourcygen/electron-angular-quick-start/commit/83301e0fe7387e791d23f7c1d6cdaeb1f53e3cf4))
+* adapt electron part ([73acf88](https://github.com/sourcygen/electron-angular-quick-start/commit/73acf88a079984e50c15e23e5ad0aa98b0a7c2a1))
+* add electron dependencies ([f506c0c](https://github.com/sourcygen/electron-angular-quick-start/commit/f506c0c2ab613ec0d72863f5a30c2c1ce553dcd2))
+* add electron e2e launch scripts ([7e02b37](https://github.com/sourcygen/electron-angular-quick-start/commit/7e02b37b10f54f7bbb66e88f7e433ba67594287b))
+* add electron packaging scripts ([afd8916](https://github.com/sourcygen/electron-angular-quick-start/commit/afd8916d7143b258ed273d613f15135f91cb8edd))
+* add spectron and utility dependencies ([a100e3c](https://github.com/sourcygen/electron-angular-quick-start/commit/a100e3c488fde1cc2d60229f47032331b201f7b5))
+* angular upgrade : 9.1.1 => 10.1.3 ([b3a22e8](https://github.com/sourcygen/electron-angular-quick-start/commit/b3a22e8023b56d2e9707b98ec871c496d054a74d))
+* change project structure to meet targeted architecture ([9c8788f](https://github.com/sourcygen/electron-angular-quick-start/commit/9c8788fb2e419ae63c3a6545f4c5966547232702))
+* change project structure to meet targeted architecture ([ea90fd8](https://github.com/sourcygen/electron-angular-quick-start/commit/ea90fd845f8188c5fd4f867d7ec7f80ffd1b6e3f))
+* conventional commit setup ([4a0397f](https://github.com/sourcygen/electron-angular-quick-start/commit/4a0397f56e10e6e88312eeda2f9716d4314b1ea0))
+* decrease security in e2e tests ([8543cf1](https://github.com/sourcygen/electron-angular-quick-start/commit/8543cf148c498caa3e3298d8f08b14d16b5426b0))
+* electron upgrade : 8.2.3 => 10.1.3 ([c53b0d4](https://github.com/sourcygen/electron-angular-quick-start/commit/c53b0d497ea5d0823d425b445449cff2a9c1ddc7))
+* env config setup ([8822440](https://github.com/sourcygen/electron-angular-quick-start/commit/8822440f7dfa4452b588520cca5179121b276188))
+* i18n setup with ngx-translate ([f17719c](https://github.com/sourcygen/electron-angular-quick-start/commit/f17719c7e8d4c7798b299a6d500712f903ddda3e))
+* icon settings ([720223e](https://github.com/sourcygen/electron-angular-quick-start/commit/720223ec7ff4984445dcb52fe06ffe3386756367))
+* init electron e2e code source ([45a02e3](https://github.com/sourcygen/electron-angular-quick-start/commit/45a02e392c0fd755df33760db7f4adbbd31d9616))
+* init new angular project with angular cli ([cae7f62](https://github.com/sourcygen/electron-angular-quick-start/commit/cae7f629aafe69edb9aaaa6907615e5a2138b05a))
+* init shared code source ([647889c](https://github.com/sourcygen/electron-angular-quick-start/commit/647889cd70d8d334122ea33c376f8cb51cf3fe7d))
+* log setup with winston ([fd598bb](https://github.com/sourcygen/electron-angular-quick-start/commit/fd598bb10de942869a857e8927831aa87f768024))
+* move production dependencies into development dependencies ([47c74d0](https://github.com/sourcygen/electron-angular-quick-start/commit/47c74d015d130a15768be5e783b80f9bfcc97754))
+* other dependencies upgrade ([5db39a1](https://github.com/sourcygen/electron-angular-quick-start/commit/5db39a1f8b7135d1ed668dd4a77674bbfd9f4ef6))
+* packaging config ([2559e97](https://github.com/sourcygen/electron-angular-quick-start/commit/2559e973dcf1478f81e25d6acb7332f3edf91dcc))
+* use npm instead of yarn (issues with binaries) ([29e4dd9](https://github.com/sourcygen/electron-angular-quick-start/commit/29e4dd95bae61025faf820d141206deb81fdcf61))
+
+
+
 ## [1.0.1](https://github.com/sourcygen/electron-angular-quick-start/compare/v1.0.0...v1.0.1) (2020-04-30)


--- a/README.md
+++ b/README.md
@@ -1,11 +1,10 @@
 <a href="https://gitHub.com/sourcygen/electron-angular-quick-start/graphs/commit-activity"><img src="https://img.shields.io/badge/maintained-yes-brightgreen.svg" alt="Maintenance Status"/></a>
-    <a href="https://travis-ci.org/sourcygen/electron-angular-quick-start"><img src="https://travis-ci.org/sourcygen/electron-angular-quick-start.svg?branch=master" alt="Build Status"/></a>
-    <a href="https://github.com/sourcygen/electron-angular-quick-start/blob/master/LICENSE"><img src="https://img.shields.io/badge/license-MIT-brightgreen.svg" alt="License MIT"></a>
-    <a href="http://makeapullrequest.com"><img src="https://img.shields.io/badge/PRs-welcome-brightgreen.svg" alt="PRs Welcome"></a>
-    <a href="https://twitter.com/share?text=Build%20cross%20platform%20desktop%20app%20with%20Electron%20and%20Angular%20%F0%9F%9A%80&url=https://github.com/sourcygen/electron-angular-quick-start"><img src="https://img.shields.io/twitter/url/https/github.com/sourcygen/electron-angular-quick-start.svg?style=social" alt="Tweet" align="right"></a>
-    <a href="https://github.com/sourcygen/electron-angular-quick-start/watchers"><img src="https://img.shields.io/github/watchers/sourcygen/electron-angular-quick-start.svg?style=social" alt="Watch on GitHub" align="right"></a>
-    <a href="https://github.com/sourcygen/electron-angular-quick-start/stargazers"><img src="https://img.shields.io/github/stars/sourcygen/electron-angular-quick-start.svg?style=social" alt="Star on GitHub" align="right"></a>
-
+<a href="https://travis-ci.org/sourcygen/electron-angular-quick-start"><img src="https://travis-ci.org/sourcygen/electron-angular-quick-start.svg?branch=master" alt="Build Status"/></a>
+<a href="https://github.com/sourcygen/electron-angular-quick-start/blob/master/LICENSE"><img src="https://img.shields.io/badge/license-MIT-brightgreen.svg" alt="License MIT"></a>
+<a href="http://makeapullrequest.com"><img src="https://img.shields.io/badge/PRs-welcome-brightgreen.svg" alt="PRs Welcome"></a>
+<a href="https://twitter.com/share?text=Build%20cross%20platform%20desktop%20app%20with%20Electron%20and%20Angular%20%F0%9F%9A%80&url=https://github.com/sourcygen/electron-angular-quick-start"><img src="https://img.shields.io/twitter/url/https/github.com/sourcygen/electron-angular-quick-start.svg?style=social" alt="Tweet" align="right"></a>
+<a href="https://github.com/sourcygen/electron-angular-quick-start/watchers"><img src="https://img.shields.io/github/watchers/sourcygen/electron-angular-quick-start.svg?style=social" alt="Watch on GitHub" align="right"></a>
+<a href="https://github.com/sourcygen/electron-angular-quick-start/stargazers"><img src="https://img.shields.io/github/stars/sourcygen/electron-angular-quick-start.svg?style=social" alt="Star on GitHub" align="right"></a>

 ![Electron Angular Quick Start](https://repository-images.githubusercontent.com/256546297/5eb5eb80-8ad1-11ea-87e4-a93b57e7590d)

@@ -37,6 +36,7 @@ electron-angular-quick-start
 ├── electron-builder.json
 ├── electron-webpack.json
 ├── karma.conf.js
+├── package-lock.json
 ├── package.json
 ├── src
 │   ├── angular              # Angular source directory (web part)
@@ -45,15 +45,12 @@ electron-angular-quick-start
 ├── tsconfig.app.json
 ├── tsconfig.json
 ├── tsconfig.spec.json
-├── tslint.json
-└── yarn.lock
+└── tslint.json
 ```

 ## Getting started

-To clone and run this repository, you'll need [Git](https://git-scm.com), [Node.js](https://nodejs.org/en/download/), [Yarn](https://classic.yarnpkg.com/fr/docs/install) and [Angular-CLI](https://angular.io/cli) installed on your computer. And then from your command line:
-
-> [Yarn](http://yarnpkg.com/) is strongly recommended instead of npm (see this [issue](https://github.com/electron-userland/electron-builder/issues/1147#issuecomment-276284477)).
+To clone and run this repository, you'll need [Git](https://git-scm.com), [Node.js](https://nodejs.org/en/download/) and [Angular-CLI](https://angular.io/cli) installed on your computer. And then from your command line:

 ```bash
 # First, clone this repository
@@ -63,24 +60,24 @@ git clone https://github.com/sourcygen/electron-angular-quick-start.git
 cd electron-angular-quick-start

 # After that, install dependencies
-yarn install
+npm install

 # And finally run the app (dev mode)
-yarn start
+npm start
 ```

 ## How to use

-| Command             | Description                               |
-| ------------------- | ----------------------------------------- |
-| `yarn install`      | Install dependencies                      |
-| `yarn start`        | Run the app on desktop (dev mode)         |
-| `yarn ng:serve`     | Run the app on browser (dev mode)         |
-| `yarn e2e`          | Run glogbal end-to-end tests              |
-| `yarn ng:e2e`       | Run **angular** end-to-end tests          |
-| `yarn electron:e2e` | Run **electron** end-to-end tests         |
-| `yarn build`        | Build artifact content                    |
-| `yarn package`      | Generate platform packages (dist/release) |
+| Command                | Description                               |
+| ---------------------- | ----------------------------------------- |
+| `npm run install`      | Install dependencies                      |
+| `npm run start`        | Run the app on desktop (dev mode)         |
+| `npm run ng:serve`     | Run the app on browser (dev mode)         |
+| `npm run e2e`          | Run glogbal end-to-end tests              |
+| `npm run ng:e2e`       | Run **angular** end-to-end tests          |
+| `npm run electron:e2e` | Run **electron** end-to-end tests         |
+| `npm run build`        | Build artifact content                    |
+| `npm run package`      | Generate platform packages (dist/release) |

 ## Resources

--- a/e2e/angular/tsconfig.json
+++ b/e2e/angular/tsconfig.json
@@ -3,7 +3,7 @@
  "compilerOptions": {
    "outDir": "../out-tsc/e2e",
    "module": "commonjs",
-    "target": "es5",
+    "target": "es2018",
    "types": ["jasmine", "jasminewd2", "node"]
  }
 }
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@@ -1,16 +1,17 @@
 {
  "name": "electron-angular-quick-start",
-  "version": "1.0.1",
+  "version": "1.0.2",
  "description": "An Electron and Angular Quick-starter",
  "repository": "https://github.com/sourcygen/electron-angular-quick-start.git",
  "author": "Sourcygen",
  "license": "MIT",
  "keywords": [
    "angular",
-    "angular 9",
+    "angular 10",
    "electron",
    "electron 8",
    "typescript",
+    "typescript 4",
    "spectron",
    "spectron 10",
    "scss",
@@ -23,76 +24,76 @@
    "ng:e2e": "ng e2e",
    "ng:serve": "ng serve",
    "ng:build": "ng build --prod --base-href ./",
-    "electron:e2e": "yarn build && cross-env X_NODE_ENV=e2e-test node e2e/electron/jasmine.js",
+    "electron:e2e": "npm run build && cross-env X_NODE_ENV=e2e-test node e2e/electron/jasmine.js",
    "electron:serve": "wait-on http://localhost:4200 && npm-run-all -p electron:build:tsc electron:build:webpack",
    "electron:build:tsc": "tsc -b src/electron -w",
    "electron:build:webpack": "wait-on dist/electron/preload.js && electron-webpack dev",
    "electron:build": "tsc -b src/electron && electron-webpack",
-    "e2e": "yarn ng:e2e && yarn electron:e2e",
+    "e2e": "npm run ng:e2e && npm run electron:e2e",
    "start": "del -f dist && npm-run-all -p ng:serve electron:serve",
-    "build:dist": "del -f dist && yarn ng:build && yarn electron:build",
+    "build:dist": "del -f dist && npm run ng:build && npm run electron:build",
    "build:copy:ng": "cpy '**/*' '../build' --cwd=dist/angular --parents",
    "build:copy:static": "cpy 'static' '../dist/build' --cwd=src --parents",
-    "build:copy:electron": "cpy '**/*' '../build' --cwd=dist/main --parents && yarn build:copy:static",
-    "build:copy": "cpy package.json dist/build && yarn build:copy:ng && yarn build:copy:electron",
-    "build": "yarn build:dist && yarn build:copy && cd dist/build && yarn --prod",
-    "package": "yarn build && electron-builder -p never",
-    "version": "conventional-changelog -p angular -i CHANGELOG.md -s && git add CHANGELOG.md"
+    "build:copy:electron": "cpy '**/*' '../build' --cwd=dist/main --parents && npm run build:copy:static",
+    "build:copy": "cpy package.json dist/build && npm run build:copy:ng && npm run build:copy:electron",
+    "build": "npm run build:dist && npm run build:copy && cd dist/build && npm run --prod",
+    "package": "npm run build && electron-builder -p never",
+    "version": "npx conventional-changelog -p angular -i CHANGELOG.md -s && git add CHANGELOG.md"
  },
  "private": true,
  "dependencies": {
    "source-map-support": "^0.5.17"
  },
  "devDependencies": {
-    "@angular-devkit/build-angular": "~0.901.1",
-    "@angular/animations": "~9.1.1",
-    "@angular/cli": "~9.1.1",
-    "@angular/common": "~9.1.1",
-    "@angular/compiler": "~9.1.1",
-    "@angular/compiler-cli": "~9.1.1",
-    "@angular/core": "~9.1.1",
-    "@angular/forms": "~9.1.1",
-    "@angular/language-service": "~9.1.1",
-    "@angular/platform-browser": "~9.1.1",
-    "@angular/platform-browser-dynamic": "~9.1.1",
-    "@angular/router": "~9.1.1",
-    "@commitlint/cli": "^8.3.5",
-    "@commitlint/config-conventional": "^8.3.4",
-    "@ngx-translate/core": "^12.1.2",
-    "@ngx-translate/http-loader": "^4.0.0",
+    "@angular-devkit/build-angular": "~0.1001.3",
+    "@angular/animations": "~10.1.3",
+    "@angular/cli": "~10.1.3",
+    "@angular/common": "~10.1.3",
+    "@angular/compiler": "~10.1.3",
+    "@angular/compiler-cli": "~10.1.3",
+    "@angular/core": "~10.1.3",
+    "@angular/forms": "~10.1.3",
+    "@angular/language-service": "~10.1.3",
+    "@angular/platform-browser": "~10.1.3",
+    "@angular/platform-browser-dynamic": "~10.1.3",
+    "@angular/router": "~10.1.3",
+    "@commitlint/cli": "^11.0.0",
+    "@commitlint/config-conventional": "^11.0.0",
+    "@ngx-translate/core": "^13.0.0",
+    "@ngx-translate/http-loader": "^6.0.0",
    "@types/jasmine": "~3.5.0",
    "@types/jasminewd2": "~2.0.3",
-    "@types/node": "^12.11.1",
-    "chromedriver": "^81.0.0",
-    "codelyzer": "^5.1.2",
+    "@types/node": "^14.11.2",
+    "chromedriver": "^85.0.1",
+    "codelyzer": "^6.0.0",
    "conventional-changelog-cli": "^2.0.31",
    "cpy-cli": "^3.1.0",
    "cross-env": "^7.0.2",
    "del-cli": "^3.0.0",
-    "electron": "^8.2.3",
+    "electron": "^10.1.3",
    "electron-builder": "^22.5.1",
    "electron-webpack": "^2.8.2",
    "fs-extra": "^9.0.0",
    "husky": "^4.2.5",
-    "jasmine-core": "~3.5.0",
-    "jasmine-spec-reporter": "~4.2.1",
-    "karma": "~4.4.1",
+    "jasmine-core": "^3.6.0",
+    "jasmine-spec-reporter": "^6.0.0",
+    "karma": "^5.2.3",
    "karma-chrome-launcher": "~3.1.0",
-    "karma-coverage-istanbul-reporter": "~2.1.0",
-    "karma-jasmine": "~3.0.1",
-    "karma-jasmine-html-reporter": "^1.4.2",
+    "karma-coverage-istanbul-reporter": "~3.0.2",
+    "karma-jasmine": "~4.0.0",
+    "karma-jasmine-html-reporter": "^1.5.0",
    "npm-run-all": "^4.1.5",
-    "protractor": "~5.4.3",
-    "rxjs": "~6.5.4",
-    "spectron": "^10.0.1",
-    "ts-node": "~8.3.0",
-    "tslib": "^1.10.0",
+    "protractor": "~7.0.0",
+    "rxjs": "^6.6.3",
+    "spectron": "^12.0.0",
+    "ts-node": "^9.0.0",
+    "tslib": "^2.0.0",
    "tslint": "~6.1.0",
-    "typescript": "~3.8.3",
-    "wait-on": "^4.0.2",
+    "typescript": "~4.0.3",
+    "wait-on": "^5.2.0",
    "webpack": "^4.42.1",
    "winston": "^3.2.1",
-    "zone.js": "~0.10.2"
+    "zone.js": "^0.10.3"
  },
  "husky": {
    "hooks": {
--- a/src/electron/components/window.ts
+++ b/src/electron/components/window.ts
@@ -31,6 +31,9 @@ export class Window {
        // Isolate window context to protect against prototype pollution
        // except in e2e test when that access is required by Spectron
        contextIsolation: global.gConfig.isContextIsolation,
+        // Ensure that JS values can't unsafely cross between worlds
+        // when using contextIsolation
+        worldSafeExecuteJavaScript: global.gConfig.isContextIsolation,
        // Disable the remote module to enhance security
        // except in e2e test when that access is required by Spectron
        enableRemoteModule: global.gConfig.isEnableRemoteModule,
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -7,7 +7,7 @@
    "declaration": false,
    "downlevelIteration": true,
    "experimentalDecorators": true,
-    "module": "esnext",
+    "module": "es2020",
    "moduleResolution": "node",
    "importHelpers": true,
    "target": "es2015",
--- a/yarn.lock
+++ b/yarn.lock