Merge pull request #14 from CubikNeRubik/fix/postinstall-script

Fix/postinstall script

Author: Vlad Haidei

extra-webpack.config.js

@@ -2,8 +2,6 @@ const path = require('path');
 
 module.exports = {
     target: 'electron-renderer',
-    // don't remove this comments it is used for parsing by postinstall.config.js
-    // start of extra configs
     externals: {
         typeorm: "require('typeorm')",
         sqlite3: "require('sqlite3')",
@@ -13,5 +11,4 @@ module.exports = {
             typeorm: path.resolve(__dirname, "../node_modules/typeorm/typeorm-model-shim")
         }
     }
-    // end of extra configs
 };

postinstall-web.js

@@ -3,21 +3,18 @@ const fs = require('fs');
 const f_angular = 'node_modules/@angular-devkit/build-angular/src/angular-cli-files/models/webpack-configs/browser.js';
 const { getConfigs } = require('./postinstall.config');
 
-getConfigs()
-    .then(({webConfig}) => {
+const { webConfig } = getConfigs();
+fs.readFile(f_angular, 'utf8', function (err, data) {
 
-        fs.readFile(f_angular, 'utf8', function (err, data) {
+    if (err) {
+        return console.log(err);
+    }
 
-            if (err) {
-                return console.log(err);
-            }
+    let result = data.replace(/return {[\s\S]+?$/m, 'return {');
+    result = result.replace(/target: "web",/g, '');
+    result = result.replace(/return \{/g, 'return {' + webConfig);
 
-            var result = data.replace(/return {([\s\S]+)}[\s]+,/, 'return {');
-            var result = result.replace(/target: "web",/g, '');
-            var result = result.replace(/return \{/g, 'return {' + webConfig);
-
-            fs.writeFile(f_angular, result, 'utf8', function (err) {
-                if (err) return console.log(err);
-            });
-        });
+    fs.writeFile(f_angular, result, 'utf8', function (err) {
+        if (err) return console.log(err);
     });
+});

postinstall.config.js

@@ -1,25 +1,14 @@
-const fs = require('fs');
-const f_angular = 'extra-webpack.config.js';
-const regex = /\/\/ start of extra configs([\S\s]+)\/\/ end of extra configs/;
+const config = require('./extra-webpack.config.js');
 
 module.exports.getConfigs = function(){
-    return new Promise((resolve, reject) => {
+    config.target = 'electron-renderer';
+    electronConfig = JSON.stringify(config).slice(1,-1) + ',';
 
-        fs.readFile(f_angular, 'utf8', function (err, data) {
-            if (err) {
-                console.log(err);
-                reject(err);
-            }
+    config.target = 'web';
+    webConfig = JSON.stringify(config).slice(1,-1) + ',';
 
-            var extra = data.match(regex)[1];
-
-            const electronConfig = 'target: "electron-renderer", ' + extra + ',';
-            const webConfig = 'target: "web", ' + extra + ',';
-
-            resolve({
-                electronConfig,
-                webConfig
-            })
-        });
-    });
+    return {
+        electronConfig,
+        webConfig
+    };
 };

postinstall.js

@@ -3,21 +3,18 @@ const fs = require('fs');
 const f_angular = 'node_modules/@angular-devkit/build-angular/src/angular-cli-files/models/webpack-configs/browser.js';
 const { getConfigs } = require('./postinstall.config');
 
-getConfigs()
-    .then(({electronConfig}) => {
+const { electronConfig } = getConfigs();
+fs.readFile(f_angular, 'utf8', function (err, data) {
 
-        fs.readFile(f_angular, 'utf8', function (err, data) {
+    if (err) {
+        return console.log(err);
+    }
 
-            if (err) {
-                return console.log(err);
-            }
+    let result = data.replace(/return {[\s\S]+?$/m, 'return {');
+    result = result.replace(/target: "web",/g, '');
+    result = result.replace(/return \{/g, 'return {' + electronConfig);
 
-            var result = data.replace(/return {([\s\S]+)}[\s]+,/, 'return {');
-            var result = result.replace(/target: "web",/g, '');
-            var result = result.replace(/return \{/g, 'return {' + electronConfig);
-
-            fs.writeFile(f_angular, result, 'utf8', function (err) {
-                if (err) return console.log(err);
-            });
-        });
+    fs.writeFile(f_angular, result, 'utf8', function (err) {
+        if (err) return console.log(err);
     });
+});