From a6ef8121b494cdcb90d202e22477636c86dd9757 Mon Sep 17 00:00:00 2001
From: "mathias.chouet" <mathias.chouet@irstea.fr>
Date: Tue, 28 May 2019 16:14:46 +0200
Subject: [PATCH] updated package configuration for electron

---
 electron-builder.yml |  6 +++---
 main.js              |  6 +++---
 package.json         | 23 +++++++++++++----------
 3 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/electron-builder.yml b/electron-builder.yml
index edcc31ee3..366acec14 100644
--- a/electron-builder.yml
+++ b/electron-builder.yml
@@ -1,5 +1,5 @@
-appId:        fr.irstea.cassiopee
-productName:  Cassiopee
+appId: fr.irstea.cassiopee
+productName: Cassiopée
 
 directories:
   output: release
@@ -43,6 +43,6 @@ deb:
 
 win:
   target:
-   - portable
    - nsis
+   #- portable
   # icon: "src/app/assets/…
diff --git a/main.js b/main.js
index 7f9d0e1a3..ed3363069 100644
--- a/main.js
+++ b/main.js
@@ -12,10 +12,10 @@ function createWindow () {
     win.setMenuBarVisibility(false)
 
     // Open the DevTools.
-    win.webContents.openDevTools();
+    // win.webContents.openDevTools();
 
     // Open external doc links in specific window
-    win.webContents.on('new-window', (event, url, frameName, disposition, options) => {
+    /* win.webContents.on('new-window', (event, url, frameName, disposition, options) => {
         event.preventDefault();
         // win.src = url;
         const win2 = new BrowserWindow({
@@ -28,7 +28,7 @@ function createWindow () {
             win2.loadURL(url); // existing webContents will be navigated automatically
         }
         event.newGuest = win2;
-    });
+    }); */
 
     // Close the app.
     win.on('close', () => {
diff --git a/package.json b/package.json
index 1454d417a..475233c07 100644
--- a/package.json
+++ b/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "nghyd",
+  "name": "cassiopee",
   "description": "Hydraulic calculators",
   "author": "Irstea",
   "version": "4.1.0",
@@ -7,19 +7,22 @@
   "homepage": "http://cassiopee.g-eau.net",
   "license": "MIT",
   "scripts": {
-    "start": "npm run preprocess; ng serve --host 0.0.0.0",
-    "prod": "npm run preprocess; ng serve --host 0.0.0.0 --prod",
-    "build": "npm run preprocess; ng build --prod --build-optimizer=false",
+    "ng": "ng",
+    "start": "npm run preprocess && ng serve --host 0.0.0.0",
+    "prod": "npm run preprocess && ng serve --host 0.0.0.0 --prod",
+    "build": "npm run preprocess && ng build --prod --build-optimizer=false",
+    "electron": "electron .",
+    "electron-builder": "electron-builder",
     "release-clean": "rm -r release/*",
-    "release-linux": "npm run release-clean && npm run build && electron-builder",
-    "release-windows": "rd /s /q release & ng build --prod --build-optimizer=false && electron-builder",
+    "release-linux": "npm run release-clean & npm run build && electron-builder",
+    "release-windows": "rd /s /q release & ng build --prod --build-optimizer=false && npm run electron-builder",
     "lint": "ng lint",
     "e2e": "ng e2e",
     "e2equick": "ng e2e --dev-server-target= --baseUrl=http://localhost:4200",
-    "jalhyd": "rm node_modules/jalhyd; cd ../jalhyd; npm run build; cd ../nghyd; npm install ../jalhyd;",
-    "mathjax": "rsync -az --delete node_modules/mathjax docs-fr/javascripts;",
-    "mkdocs": "npm run mathjax; find docs-fr/javascripts/ -name '*.md' -type f -delete; python3 -m mkdocs build",
-    "preprocess": "node preprocessors.js; npm run mkdocs;",
+    "jalhyd": "rm node_modules/jalhyd && cd ../jalhyd && npm run build && cd ../nghyd && npm install ../jalhyd",
+    "mathjax": "rsync -az --delete node_modules/mathjax docs-fr/javascripts",
+    "mkdocs": "npm run mathjax && find docs-fr/javascripts/ -name '*.md' -type f -delete && python3 -m mkdocs build",
+    "preprocess": "node preprocessors.js && npm run mkdocs",
     "viz": "tsviz -recursive src/ nghyd_class_diagram.png",
     "compodoc-patch": "sed -i '/Application.prototype.detectAngularJSProjects = function () {/a return false; // patch cracra, voir https://github.com/compodoc/compodoc/issues/667' node_modules/@compodoc/compodoc/dist/index-cli.js",
     "compodoc": "nodejs node_modules/@compodoc/compodoc/bin/index-cli.js -p src/tsconfig.app.json -s --language fr-FR -d compodoc-fr"
-- 
GitLab