@vixoniccom/module-packager 2.4.2 → 2.4.3-dev.0

package/.babelrc

@@ -1,3 +1,3 @@
-{
-  "presets": ["env", "react"]
-}
+{
+  "presets": ["env", "react"]
+}

package/.eslintrc

@@ -1,3 +1,3 @@
-{
-  "extends": ["standard", "standard-react"]
+{
+  "extends": ["standard", "standard-react"]
 }

package/CHANGELOG.md

@@ -1,91 +1,98 @@
-# Change Log
+# Changelog
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+### [2.4.3-dev.0](https://gitlab.com/mandomedio/vixonic/module-packager/compare/v2.4.2...v2.4.3-dev.0) (2021-08-19)
+
+
+### Bug Fixes
+
+* **release:** typescript and electron were upgrated to v4 and also new vixoniccom dependencies versions were applied ([be351e6](https://gitlab.com/mandomedio/vixonic/module-packager/commit/be351e6efd18458180032148c24cd6be4741397f))
+
 <a name="2.4.2"></a>
 ## 2.4.2 (2019-07-11)
 
 
 
-<a name="2.4.0"></a>
-# [2.4.0](https://bitbucket.org/vixonicmodules/module-packager/compare/v2.3.1...v2.4.0) (2019-06-14)
-
-
-### Features
-
-* added transpileOnly and tsOverride options ([a7227de](https://bitbucket.org/vixonicmodules/module-packager/commits/a7227de))
-* update typescript ([95f7b64](https://bitbucket.org/vixonicmodules/module-packager/commits/95f7b64))
-
-
-
-<a name="2.3.1"></a>
-## [2.3.1](https://bitbucket.org/vixonicmodules/module-packager/compare/v2.3.0...v2.3.1) (2018-11-07)
-
-
-
-<a name="2.3.0"></a>
-# 2.3.0 (2018-09-24)
-
-
-### Bug Fixes
-
-* conflicts resolved ([ab8264e](https://bitbucket.org/vixonicmodules/module-packager/commits/ab8264e))
-* escaped downloadsPath in windows. ([11347b8](https://bitbucket.org/vixonicmodules/module-packager/commits/11347b8))
-* externals not working with npm 3. ([6ad554a](https://bitbucket.org/vixonicmodules/module-packager/commits/6ad554a))
-* merge conflict ([2829371](https://bitbucket.org/vixonicmodules/module-packager/commits/2829371))
-* merge duplicated node property ([abc0232](https://bitbucket.org/vixonicmodules/module-packager/commits/abc0232))
-* missing dependencies and default tsconfig modules mode set to es2015 ([12cbc21](https://bitbucket.org/vixonicmodules/module-packager/commits/12cbc21))
-* package-lock error ([8c7f54c](https://bitbucket.org/vixonicmodules/module-packager/commits/8c7f54c))
-* prevent installing externals if target is not electron-renderer ([49aa362](https://bitbucket.org/vixonicmodules/module-packager/commits/49aa362))
-* ts-node configuration chechJs set to false ([648b0a8](https://bitbucket.org/vixonicmodules/module-packager/commits/648b0a8))
-* updated dependencies ([bbc7c20](https://bitbucket.org/vixonicmodules/module-packager/commits/bbc7c20))
-* watch paths not relative to filesystem. ([f91d680](https://bitbucket.org/vixonicmodules/module-packager/commits/f91d680))
-
-
-### Features
-
-* added babel env and polyfill. ([95c8a8a](https://bitbucket.org/vixonicmodules/module-packager/commits/95c8a8a))
-* added default tsconfig. ([64c85a4](https://bitbucket.org/vixonicmodules/module-packager/commits/64c85a4))
-* added target as an option. ([8a0ea52](https://bitbucket.org/vixonicmodules/module-packager/commits/8a0ea52))
-* added typescript loader and changed to webpack 2. ([651d805](https://bitbucket.org/vixonicmodules/module-packager/commits/651d805))
-* added typescript loader. ([5b3eddf](https://bitbucket.org/vixonicmodules/module-packager/commits/5b3eddf))
-* added vixonic modules definition. ([de80168](https://bitbucket.org/vixonicmodules/module-packager/commits/de80168))
-* added web mode to generate Android compatible apps. ([80431a9](https://bitbucket.org/vixonicmodules/module-packager/commits/80431a9))
-* duration calculation ([19175f6](https://bitbucket.org/vixonicmodules/module-packager/commits/19175f6))
-* electron 2.0.2 + vixonic modules 1.1.0 ([dcd6b67](https://bitbucket.org/vixonicmodules/module-packager/commits/dcd6b67))
-* tsx support and hot loading ([dc6c03e](https://bitbucket.org/vixonicmodules/module-packager/commits/dc6c03e))
-* updated [@vixonic](https://bitbucket.org/vixonic)/modules dependency ([dc92913](https://bitbucket.org/vixonicmodules/module-packager/commits/dc92913))
-* upgrade module-controler dependency ([8502347](https://bitbucket.org/vixonicmodules/module-packager/commits/8502347))
-
-
-
-<a name="2.2.0"></a>
-# 2.2.0 (2018-08-22)
-
-
-### Bug Fixes
-
-* conflicts resolved ([ab8264e](https://bitbucket.org/vixonicmodules/module-packager/commits/ab8264e))
-* escaped downloadsPath in windows. ([11347b8](https://bitbucket.org/vixonicmodules/module-packager/commits/11347b8))
-* externals not working with npm 3. ([6ad554a](https://bitbucket.org/vixonicmodules/module-packager/commits/6ad554a))
-* merge conflict ([2829371](https://bitbucket.org/vixonicmodules/module-packager/commits/2829371))
-* merge duplicated node property ([abc0232](https://bitbucket.org/vixonicmodules/module-packager/commits/abc0232))
-* missing dependencies and default tsconfig modules mode set to es2015 ([12cbc21](https://bitbucket.org/vixonicmodules/module-packager/commits/12cbc21))
-* package-lock error ([8c7f54c](https://bitbucket.org/vixonicmodules/module-packager/commits/8c7f54c))
-* prevent installing externals if target is not electron-renderer ([49aa362](https://bitbucket.org/vixonicmodules/module-packager/commits/49aa362))
-* updated dependencies ([bbc7c20](https://bitbucket.org/vixonicmodules/module-packager/commits/bbc7c20))
-* watch paths not relative to filesystem. ([f91d680](https://bitbucket.org/vixonicmodules/module-packager/commits/f91d680))
-
-
-### Features
-
-* added babel env and polyfill. ([95c8a8a](https://bitbucket.org/vixonicmodules/module-packager/commits/95c8a8a))
-* added default tsconfig. ([64c85a4](https://bitbucket.org/vixonicmodules/module-packager/commits/64c85a4))
-* added target as an option. ([8a0ea52](https://bitbucket.org/vixonicmodules/module-packager/commits/8a0ea52))
-* added typescript loader and changed to webpack 2. ([651d805](https://bitbucket.org/vixonicmodules/module-packager/commits/651d805))
-* added typescript loader. ([5b3eddf](https://bitbucket.org/vixonicmodules/module-packager/commits/5b3eddf))
-* added vixonic modules definition. ([de80168](https://bitbucket.org/vixonicmodules/module-packager/commits/de80168))
-* added web mode to generate Android compatible apps. ([80431a9](https://bitbucket.org/vixonicmodules/module-packager/commits/80431a9))
-* electron 2.0.2 + vixonic modules 1.1.0 ([dcd6b67](https://bitbucket.org/vixonicmodules/module-packager/commits/dcd6b67))
-* tsx support and hot loading ([dc6c03e](https://bitbucket.org/vixonicmodules/module-packager/commits/dc6c03e))
-* upgrade module-controler dependency ([8502347](https://bitbucket.org/vixonicmodules/module-packager/commits/8502347))
+<a name="2.4.0"></a>
+# [2.4.0](https://bitbucket.org/vixonicmodules/module-packager/compare/v2.3.1...v2.4.0) (2019-06-14)
+
+
+### Features
+
+* added transpileOnly and tsOverride options ([a7227de](https://bitbucket.org/vixonicmodules/module-packager/commits/a7227de))
+* update typescript ([95f7b64](https://bitbucket.org/vixonicmodules/module-packager/commits/95f7b64))
+
+
+
+<a name="2.3.1"></a>
+## [2.3.1](https://bitbucket.org/vixonicmodules/module-packager/compare/v2.3.0...v2.3.1) (2018-11-07)
+
+
+
+<a name="2.3.0"></a>
+# 2.3.0 (2018-09-24)
+
+
+### Bug Fixes
+
+* conflicts resolved ([ab8264e](https://bitbucket.org/vixonicmodules/module-packager/commits/ab8264e))
+* escaped downloadsPath in windows. ([11347b8](https://bitbucket.org/vixonicmodules/module-packager/commits/11347b8))
+* externals not working with npm 3. ([6ad554a](https://bitbucket.org/vixonicmodules/module-packager/commits/6ad554a))
+* merge conflict ([2829371](https://bitbucket.org/vixonicmodules/module-packager/commits/2829371))
+* merge duplicated node property ([abc0232](https://bitbucket.org/vixonicmodules/module-packager/commits/abc0232))
+* missing dependencies and default tsconfig modules mode set to es2015 ([12cbc21](https://bitbucket.org/vixonicmodules/module-packager/commits/12cbc21))
+* package-lock error ([8c7f54c](https://bitbucket.org/vixonicmodules/module-packager/commits/8c7f54c))
+* prevent installing externals if target is not electron-renderer ([49aa362](https://bitbucket.org/vixonicmodules/module-packager/commits/49aa362))
+* ts-node configuration chechJs set to false ([648b0a8](https://bitbucket.org/vixonicmodules/module-packager/commits/648b0a8))
+* updated dependencies ([bbc7c20](https://bitbucket.org/vixonicmodules/module-packager/commits/bbc7c20))
+* watch paths not relative to filesystem. ([f91d680](https://bitbucket.org/vixonicmodules/module-packager/commits/f91d680))
+
+
+### Features
+
+* added babel env and polyfill. ([95c8a8a](https://bitbucket.org/vixonicmodules/module-packager/commits/95c8a8a))
+* added default tsconfig. ([64c85a4](https://bitbucket.org/vixonicmodules/module-packager/commits/64c85a4))
+* added target as an option. ([8a0ea52](https://bitbucket.org/vixonicmodules/module-packager/commits/8a0ea52))
+* added typescript loader and changed to webpack 2. ([651d805](https://bitbucket.org/vixonicmodules/module-packager/commits/651d805))
+* added typescript loader. ([5b3eddf](https://bitbucket.org/vixonicmodules/module-packager/commits/5b3eddf))
+* added vixonic modules definition. ([de80168](https://bitbucket.org/vixonicmodules/module-packager/commits/de80168))
+* added web mode to generate Android compatible apps. ([80431a9](https://bitbucket.org/vixonicmodules/module-packager/commits/80431a9))
+* duration calculation ([19175f6](https://bitbucket.org/vixonicmodules/module-packager/commits/19175f6))
+* electron 2.0.2 + vixonic modules 1.1.0 ([dcd6b67](https://bitbucket.org/vixonicmodules/module-packager/commits/dcd6b67))
+* tsx support and hot loading ([dc6c03e](https://bitbucket.org/vixonicmodules/module-packager/commits/dc6c03e))
+* updated [@vixonic](https://bitbucket.org/vixonic)/modules dependency ([dc92913](https://bitbucket.org/vixonicmodules/module-packager/commits/dc92913))
+* upgrade module-controler dependency ([8502347](https://bitbucket.org/vixonicmodules/module-packager/commits/8502347))
+
+
+
+<a name="2.2.0"></a>
+# 2.2.0 (2018-08-22)
+
+
+### Bug Fixes
+
+* conflicts resolved ([ab8264e](https://bitbucket.org/vixonicmodules/module-packager/commits/ab8264e))
+* escaped downloadsPath in windows. ([11347b8](https://bitbucket.org/vixonicmodules/module-packager/commits/11347b8))
+* externals not working with npm 3. ([6ad554a](https://bitbucket.org/vixonicmodules/module-packager/commits/6ad554a))
+* merge conflict ([2829371](https://bitbucket.org/vixonicmodules/module-packager/commits/2829371))
+* merge duplicated node property ([abc0232](https://bitbucket.org/vixonicmodules/module-packager/commits/abc0232))
+* missing dependencies and default tsconfig modules mode set to es2015 ([12cbc21](https://bitbucket.org/vixonicmodules/module-packager/commits/12cbc21))
+* package-lock error ([8c7f54c](https://bitbucket.org/vixonicmodules/module-packager/commits/8c7f54c))
+* prevent installing externals if target is not electron-renderer ([49aa362](https://bitbucket.org/vixonicmodules/module-packager/commits/49aa362))
+* updated dependencies ([bbc7c20](https://bitbucket.org/vixonicmodules/module-packager/commits/bbc7c20))
+* watch paths not relative to filesystem. ([f91d680](https://bitbucket.org/vixonicmodules/module-packager/commits/f91d680))
+
+
+### Features
+
+* added babel env and polyfill. ([95c8a8a](https://bitbucket.org/vixonicmodules/module-packager/commits/95c8a8a))
+* added default tsconfig. ([64c85a4](https://bitbucket.org/vixonicmodules/module-packager/commits/64c85a4))
+* added target as an option. ([8a0ea52](https://bitbucket.org/vixonicmodules/module-packager/commits/8a0ea52))
+* added typescript loader and changed to webpack 2. ([651d805](https://bitbucket.org/vixonicmodules/module-packager/commits/651d805))
+* added typescript loader. ([5b3eddf](https://bitbucket.org/vixonicmodules/module-packager/commits/5b3eddf))
+* added vixonic modules definition. ([de80168](https://bitbucket.org/vixonicmodules/module-packager/commits/de80168))
+* added web mode to generate Android compatible apps. ([80431a9](https://bitbucket.org/vixonicmodules/module-packager/commits/80431a9))
+* electron 2.0.2 + vixonic modules 1.1.0 ([dcd6b67](https://bitbucket.org/vixonicmodules/module-packager/commits/dcd6b67))
+* tsx support and hot loading ([dc6c03e](https://bitbucket.org/vixonicmodules/module-packager/commits/dc6c03e))
+* upgrade module-controler dependency ([8502347](https://bitbucket.org/vixonicmodules/module-packager/commits/8502347))

package/electron.js

@@ -1,45 +1,45 @@
-'use strict'
-const { app, BrowserWindow } = require('electron')
-
-let mainWindow = null
-
-const path = require('path')
-const commandLineArgs = require('command-line-args')
-const optionDefinitions = [
-  { name: 'externals', type: String, defaultValue: [], multiple: true },
-  { name: 'src', type: String, defaultValue: '../../src' },
-  { name: 'build', type: String, defaultValue: '../../build' },
-  { name: 'config', type: String, defaultValue: './webpack.config.js' },
-  { name: 'port', type: Number, defaultValue: 8080 },
-  { name: 'mode', type: String, defaultValue: 'build' }
-]
-const options = commandLineArgs(optionDefinitions)
-
-if (options.mode === 'watch') {
-  require('electron-debug')()
-}
-
-app.on('window-all-closed', () => {
-  app.quit()
-})
-
-app.on('ready', () => {
-  mainWindow = new BrowserWindow({
-    show: false,
-    width: 600,
-    height: 400,
-    webPreferences: {
-      webSecurity: false
-    }
-  })
-
-  mainWindow.loadURL(`file://${path.join(__dirname, 'index.html')}`)
-
-  mainWindow.webContents.on('did-finish-load', () => {
-    mainWindow.webContents.send('init', options)
-  })
-
-  mainWindow.on('closed', () => {
-    mainWindow = null
-  })
-})
+'use strict'
+const { app, BrowserWindow } = require('electron')
+
+let mainWindow = null
+
+const path = require('path')
+const commandLineArgs = require('command-line-args')
+const optionDefinitions = [
+  { name: 'externals', type: String, defaultValue: [], multiple: true },
+  { name: 'src', type: String, defaultValue: '../../src' },
+  { name: 'build', type: String, defaultValue: '../../build' },
+  { name: 'config', type: String, defaultValue: './webpack.config.js' },
+  { name: 'port', type: Number, defaultValue: 8080 },
+  { name: 'mode', type: String, defaultValue: 'build' }
+]
+const options = commandLineArgs(optionDefinitions)
+
+if (options.mode === 'watch') {
+  require('electron-debug')()
+}
+
+app.on('window-all-closed', () => {
+  app.quit()
+})
+
+app.on('ready', () => {
+  mainWindow = new BrowserWindow({
+    show: false,
+    width: 600,
+    height: 400,
+    webPreferences: {
+      webSecurity: false
+    }
+  })
+
+  mainWindow.loadURL(`file://${path.join(__dirname, 'index.html')}`)
+
+  mainWindow.webContents.on('did-finish-load', () => {
+    mainWindow.webContents.send('init', options)
+  })
+
+  mainWindow.on('closed', () => {
+    mainWindow = null
+  })
+})

package/index.html

@@ -1,64 +1,64 @@
-<!DOCTYPE html>
-<html style="width: 100%; height: 100%; margin: 0; padding: 0;">
-<head>
-  <title></title>
-</head>
-<body style="width: 100%; height: 100%; margin: 0; padding: 0;">
-<webview style="width: 100%; height: 100%; margin: 0; padding: 0;" id="webview" autosize nodeintegration plugins disablewebsecurity></webview>
-<script type="text/javascript">
-  const path = require('path')
-  const ModuleController = require('@vixoniccom/module-controller')
-  const { ipcRenderer, remote } = require('electron')
-
-  ipcRenderer.on('init', (event, options) => {
-    let webview = document.getElementById('webview')
-    let win = remote.getCurrentWindow()
-
-    webview.addEventListener('did-finish-load', () => {
-      win.show()
-      win.focus()
-    })
-    webview.src = options.mode === 'watch' ? `http://localhost:${options.port}/index.html` : `file://${path.join(options.build, 'index.html')}`
-
-    function getData () {
-      let data = {}
-      try {
-        data.parameters = require(path.join(options.src, '/test/parameters.json')).parameters
-      } catch (err) {
-        console.log('No parameters.')
-      }
-
-      let escaped = path.join(options.mode === 'watch' ? options.src : options.build, 'test', 'downloads')
-      
-      // Add file:// to watch because in this mode the app will be in a localhost hosted environment.
-      if (options.mode === 'watch') escaped = `file://${escaped}`
-      escaped = escaped.replace(/\\/g, '/')
-
-      data.downloadsPath = escaped
-
-      try {
-        data.services = require(path.join(options.src, '/test/services.json')).services
-        console.log(data.services)
-      } catch (err) {
-        console.log('No services.')
-      }
-
-      return data
-    }
-
-    function getSchema () {
-      let data = {}
-      try {
-        data = require(path.join(options.src, '../configuration.json')).schema
-      } catch (err) {
-        console.log('No schema.')
-      }
-      return data
-    }
-
-    ModuleController.init(win, webview, getData(), getSchema(), options.mode === 'watch')
-  })
-</script>
-
-</body>
-</html>
+<!DOCTYPE html>
+<html style="width: 100%; height: 100%; margin: 0; padding: 0;">
+<head>
+  <title></title>
+</head>
+<body style="width: 100%; height: 100%; margin: 0; padding: 0;">
+<webview style="width: 100%; height: 100%; margin: 0; padding: 0;" id="webview" autosize nodeintegration plugins disablewebsecurity></webview>
+<script type="text/javascript">
+  const path = require('path')
+  const ModuleController = require('@vixoniccom/module-controller')
+  const { ipcRenderer, remote } = require('electron')
+
+  ipcRenderer.on('init', (event, options) => {
+    let webview = document.getElementById('webview')
+    let win = remote.getCurrentWindow()
+
+    webview.addEventListener('did-finish-load', () => {
+      win.show()
+      win.focus()
+    })
+    webview.src = options.mode === 'watch' ? `http://localhost:${options.port}/index.html` : `file://${path.join(options.build, 'index.html')}`
+
+    function getData () {
+      let data = {}
+      try {
+        data.parameters = require(path.join(options.src, '/test/parameters.json')).parameters
+      } catch (err) {
+        console.log('No parameters.')
+      }
+
+      let escaped = path.join(options.mode === 'watch' ? options.src : options.build, 'test', 'downloads')
+      
+      // Add file:// to watch because in this mode the app will be in a localhost hosted environment.
+      if (options.mode === 'watch') escaped = `file://${escaped}`
+      escaped = escaped.replace(/\\/g, '/')
+
+      data.downloadsPath = escaped
+
+      try {
+        data.services = require(path.join(options.src, '/test/services.json')).services
+        console.log(data.services)
+      } catch (err) {
+        console.log('No services.')
+      }
+
+      return data
+    }
+
+    function getSchema () {
+      let data = {}
+      try {
+        data = require(path.join(options.src, '../configuration.json')).schema
+      } catch (err) {
+        console.log('No schema.')
+      }
+      return data
+    }
+
+    ModuleController.init(win, webview, getData(), getSchema(), options.mode === 'watch')
+  })
+</script>
+
+</body>
+</html>

package/main.js

@@ -1,182 +1,182 @@
-#!/usr/bin/env node
-
-'use strict'
-const commandLineArgs = require('command-line-args')
-const optionDefinitions = [
-  { name: 'externals', type: String, defaultValue: [], multiple: true },
-  { name: 'target', type: String, defaultValue: 'web' },
-  { name: 'src', type: String, defaultValue: './src' },
-  { name: 'build', type: String, defaultValue: './build' },
-  { name: 'confDefinition', type: String, defaultValue: './configuration' },
-  { name: 'config', type: String, defaultValue: './webpack.config.js' },
-  { name: 'port', type: Number, defaultValue: 8080 },
-  { name: 'mode', type: String, defaultValue: 'build' },
-  { name: 'transpileOnly', type: Boolean },
-  { name: 'tsOverride', type: Boolean }
-]
-const options = commandLineArgs(optionDefinitions)
-const path = require('path')
-const webpack = require('webpack')
-const WebpackDevServer = require('webpack-dev-server')
-const { exec } = require('child_process')
-const fs = require('fs')
-const archiver = require('archiver')
-const clc = require('cli-color')
-
-var pjson = require('./package.json')
-console.log(`VIXONIC PACKAGER: Version ${pjson.version}`)
-
-if (options.target !== 'electron-renderer' && options.externals.length > 0) {
-  throw new Error(`Can't use external dependencies if target is not electron-renderer.`)
-}
-
-if (options.mode === 'build') {
-  pack(() => {
-    // Install externals only if not web.
-    if (options.target === 'electron-renderer') {
-      installExternals(() => {
-        zip()
-      })
-    } else {
-      zip()
-    }
-  })
-} else if (options.mode === 'watch') {
-  watch()
-} else if (options.mode === 'run') {
-  run()
-} else if (options.mode === 'generate-configuration') {
-  generateConfiguration()
-} else if (options.mode === 'validate-configuration') {
-  validateConfiguration()
-}
-
-function pack (callback) {
-  console.log(clc.blue('Building module...'))
-  validateConfiguration()
-  webpack(require(options.config)(options), function (err, stats) {
-    if (err) {
-      console.log(err)
-      throw err
-    } else {
-      if (stats.hasErrors()) {
-        console.log(clc.red(stats.toJson('errors-only')))
-        callback && callback(stats)
-      } else {
-        console.log(clc.green('Build OK.'))
-        callback && callback(null)
-      }
-    }
-  })
-}
-
-function installExternals (callback) {
-  // Get external versions.
-  let externals = options.externals.map(x => {
-    return `${x}@${JSON.parse(fs.readFileSync(path.resolve(options.src, '..', 'node_modules', x, 'package.json'))).version}`
-  })
-
-  // Install external versions.
-  if (externals.length) {
-    externals = externals.join(' ')
-    console.log(clc.blue(`Installing externals ${externals}...`))
-    exec(`npm install --prefix ./ --production ${externals}`, {
-      cwd: options.build
-    },
-    (err, stdout) => {
-      if (err) throw err
-      console.log(clc.green('Externals installed.'))
-      callback && callback(null)
-    })
-  } else {
-    callback && callback(null)
-  }
-}
-
-function zip (callback) {
-  console.log(clc.blue('Archiving...'))
-  let output = fs.createWriteStream(path.resolve(options.build, '../', 'build.zip'))
-  let archive = archiver('zip')
-  archive.pipe(output)
-  archive.directory(path.resolve(options.build), './')
-  archive.finalize()
-
-  output.on('close', function () {
-    console.log(clc.green('Generated build.zip.'))
-    callback && callback(null)
-  })
-
-  archive.on('error', function (err) {
-    throw err
-  })
-  clc.move(-2, 0)
-}
-
-function watch () {
-  var server = new WebpackDevServer(webpack(require(options.config)(options)), {
-    contentBase: path.join(__dirname, options.src, '..')
-  })
-  server.listen(options.port)
-
-  var environment = process.env
-  environment.NODE_ENV = 'development'
-
-  exec(`npm start -- ${path.join(__dirname, 'electron.js')} --src ${path.resolve(options.src)} --build ${path.resolve(options.build)} --port ${options.port} --mode ${options.mode} --config ${options.config} --externals ${options.externals}`,
-    {
-      cwd: __dirname,
-      env: environment
-    },
-    (err) => {
-      if (err) throw err
-      process.exit()
-    })
-}
-
-function run () {
-  pack((err) => {
-    if (err) {
-      throw err
-    } else {
-      exec(`npm start -- ${path.join(__dirname, 'electron.js')} --src ${path.resolve(options.src)} --build ${path.resolve(options.build)} --port ${options.port} --mode ${options.mode} --config ${options.config} --externals ${options.externals}`,
-        {
-          cwd: __dirname
-        })
-    }
-  })
-}
-
-function loadConfiguration () {
-  require('@vixoniccom/modules')
-  require('ts-node').register({compilerOptions: { moduleResolution: 'node', module: 'commonjs', target: 'es2015', checkJs: false }})
-  return require(path.resolve(options.confDefinition, 'index.ts')).configuration
-}
-
-function generateConfiguration () {
-  try {
-    let configuration = loadConfiguration()
-    fs.writeFileSync(path.resolve(options.src, 'parameters.d.ts'), configuration.declarationFileString)
-    fs.writeFileSync(path.resolve(options.src, '..', 'configuration.json'), JSON.stringify(configuration, undefined, 2))
-    console.log(clc.green(`Configuration generated`))
-  } catch (e) {
-    console.log(clc.red('Configuration generation failed'))
-    throw e
-  }
-}
-
-function validateConfiguration () {
-  try {
-    const { Configuration } = require('@vixoniccom/modules')
-    const json = require(path.resolve(options.src, '../', 'configuration.json'))
-    const conf = Configuration.fromJSON(json)
-    if (conf.durationFormula) {
-      const values = require(path.resolve(options.src, 'test', 'parameters.json'))
-      console.log('Validate duration')
-      console.log('Duration on undefined:', conf.getDuration({}), 'seconds')
-      console.log('Duration:', conf.getDuration(values.parameters), 'seconds')
-    }
-    console.log(clc.green('Valid configuration'))
-  } catch (e) {
-    console.log(clc.red('Invalid configuration'))
-    throw e
-  }
-}
+#!/usr/bin/env node
+
+'use strict'
+const commandLineArgs = require('command-line-args')
+const optionDefinitions = [
+  { name: 'externals', type: String, defaultValue: [], multiple: true },
+  { name: 'target', type: String, defaultValue: 'web' },
+  { name: 'src', type: String, defaultValue: './src' },
+  { name: 'build', type: String, defaultValue: './build' },
+  { name: 'confDefinition', type: String, defaultValue: './configuration' },
+  { name: 'config', type: String, defaultValue: './webpack.config.js' },
+  { name: 'port', type: Number, defaultValue: 8080 },
+  { name: 'mode', type: String, defaultValue: 'build' },
+  { name: 'transpileOnly', type: Boolean },
+  { name: 'tsOverride', type: Boolean }
+]
+const options = commandLineArgs(optionDefinitions)
+const path = require('path')
+const webpack = require('webpack')
+const WebpackDevServer = require('webpack-dev-server')
+const { exec } = require('child_process')
+const fs = require('fs')
+const archiver = require('archiver')
+const clc = require('cli-color')
+
+var pjson = require('./package.json')
+console.log(`VIXONIC PACKAGER: Version ${pjson.version}`)
+
+if (options.target !== 'electron-renderer' && options.externals.length > 0) {
+  throw new Error(`Can't use external dependencies if target is not electron-renderer.`)
+}
+
+if (options.mode === 'build') {
+  pack(() => {
+    // Install externals only if not web.
+    if (options.target === 'electron-renderer') {
+      installExternals(() => {
+        zip()
+      })
+    } else {
+      zip()
+    }
+  })
+} else if (options.mode === 'watch') {
+  watch()
+} else if (options.mode === 'run') {
+  run()
+} else if (options.mode === 'generate-configuration') {
+  generateConfiguration()
+} else if (options.mode === 'validate-configuration') {
+  validateConfiguration()
+}
+
+function pack (callback) {
+  console.log(clc.blue('Building module...'))
+  validateConfiguration()
+  webpack(require(options.config)(options), function (err, stats) {
+    if (err) {
+      console.log(err)
+      throw err
+    } else {
+      if (stats.hasErrors()) {
+        console.log(clc.red(stats.toJson('errors-only')))
+        callback && callback(stats)
+      } else {
+        console.log(clc.green('Build OK.'))
+        callback && callback(null)
+      }
+    }
+  })
+}
+
+function installExternals (callback) {
+  // Get external versions.
+  let externals = options.externals.map(x => {
+    return `${x}@${JSON.parse(fs.readFileSync(path.resolve(options.src, '..', 'node_modules', x, 'package.json'))).version}`
+  })
+
+  // Install external versions.
+  if (externals.length) {
+    externals = externals.join(' ')
+    console.log(clc.blue(`Installing externals ${externals}...`))
+    exec(`npm install --prefix ./ --production ${externals}`, {
+      cwd: options.build
+    },
+    (err, stdout) => {
+      if (err) throw err
+      console.log(clc.green('Externals installed.'))
+      callback && callback(null)
+    })
+  } else {
+    callback && callback(null)
+  }
+}
+
+function zip (callback) {
+  console.log(clc.blue('Archiving...'))
+  let output = fs.createWriteStream(path.resolve(options.build, '../', 'build.zip'))
+  let archive = archiver('zip')
+  archive.pipe(output)
+  archive.directory(path.resolve(options.build), './')
+  archive.finalize()
+
+  output.on('close', function () {
+    console.log(clc.green('Generated build.zip.'))
+    callback && callback(null)
+  })
+
+  archive.on('error', function (err) {
+    throw err
+  })
+  clc.move(-2, 0)
+}
+
+function watch () {
+  var server = new WebpackDevServer(webpack(require(options.config)(options)), {
+    contentBase: path.join(__dirname, options.src, '..')
+  })
+  server.listen(options.port)
+
+  var environment = process.env
+  environment.NODE_ENV = 'development'
+
+  exec(`npm start -- ${path.join(__dirname, 'electron.js')} --src ${path.resolve(options.src)} --build ${path.resolve(options.build)} --port ${options.port} --mode ${options.mode} --config ${options.config} --externals ${options.externals}`,
+    {
+      cwd: __dirname,
+      env: environment
+    },
+    (err) => {
+      if (err) throw err
+      process.exit()
+    })
+}
+
+function run () {
+  pack((err) => {
+    if (err) {
+      throw err
+    } else {
+      exec(`npm start -- ${path.join(__dirname, 'electron.js')} --src ${path.resolve(options.src)} --build ${path.resolve(options.build)} --port ${options.port} --mode ${options.mode} --config ${options.config} --externals ${options.externals}`,
+        {
+          cwd: __dirname
+        })
+    }
+  })
+}
+
+function loadConfiguration () {
+  require('@vixoniccom/modules')
+  require('ts-node').register({compilerOptions: { moduleResolution: 'node', module: 'commonjs', target: 'es2015', checkJs: false }})
+  return require(path.resolve(options.confDefinition, 'index.ts')).configuration
+}
+
+function generateConfiguration () {
+  try {
+    let configuration = loadConfiguration()
+    fs.writeFileSync(path.resolve(options.src, 'parameters.d.ts'), configuration.declarationFileString)
+    fs.writeFileSync(path.resolve(options.src, '..', 'configuration.json'), JSON.stringify(configuration, undefined, 2))
+    console.log(clc.green(`Configuration generated`))
+  } catch (e) {
+    console.log(clc.red('Configuration generation failed'))
+    throw e
+  }
+}
+
+function validateConfiguration () {
+  try {
+    const { Configuration } = require('@vixoniccom/modules')
+    const json = require(path.resolve(options.src, '../', 'configuration.json'))
+    const conf = Configuration.fromJSON(json)
+    if (conf.durationFormula) {
+      const values = require(path.resolve(options.src, 'test', 'parameters.json'))
+      console.log('Validate duration')
+      console.log('Duration on undefined:', conf.getDuration({}), 'seconds')
+      console.log('Duration:', conf.getDuration(values.parameters), 'seconds')
+    }
+    console.log(clc.green('Valid configuration'))
+  } catch (e) {
+    console.log(clc.red('Invalid configuration'))
+    throw e
+  }
+}

package/package.json

@@ -51,33 +51,33 @@
     "vixonic-module-packager": "main.js"
   },
   "dependencies": {
-    "@vixoniccom/module-controller": "^1.2.1",
-    "@vixoniccom/modules": "^2.7.1",
-    "archiver": "^1.3.0",
-    "awesome-typescript-loader": "^3.2.3",
-    "babel-core": "^6.14.0",
+    "@vixoniccom/module-controller": "^1.2.2-dev.0",
+    "@vixoniccom/modules": "^2.12.0-dev.1",
+    "archiver": "^3.1.1",
+    "awesome-typescript-loader": "^3.5.0",
+    "babel-core": "^6.26.3",
     "babel-loader": "^6.2.5",
     "babel-polyfill": "^6.26.0",
     "babel-preset-env": "^1.7.0",
     "babel-preset-react": "^6.24.1",
-    "clean-webpack-plugin": "^0.1.10",
-    "cli-color": "^1.2.0",
-    "command-line-args": "^3.0.1",
+    "clean-webpack-plugin": "^3.0.0",
+    "cli-color": "^2.0.0",
+    "command-line-args": "^5.2.0",
     "copy-webpack-plugin": "^3.0.1",
     "css-loader": "^0.24.0",
-    "electron": "^2.0.2",
-    "electron-debug": "^1.0.1",
+    "electron": "^4.2.12",
+    "electron-debug": "^3.2.0",
     "file-loader": "^0.9.0",
     "html-loader": "^0.4.3",
     "html-webpack-plugin": "^2.22.0",
     "json-loader": "^0.5.4",
-    "lodash": "^4.17.4",
-    "node-sass": "^3.9.3",
+    "lodash": "^4.17.21",
+    "node-sass": "^4.14.1",
     "raw-loader": "^0.5.1",
     "sass-loader": "^4.0.2",
     "style-loader": "^0.13.1",
-    "ts-node": "^3.3.0",
-    "typescript": "^2.9.2",
+    "ts-node": "^10.2.1",
+    "typescript": "^4.3.5",
     "webpack": "^2.6.1",
     "webpack-dev-server": "^1.15.1"
   },
@@ -98,10 +98,11 @@
   "readme": "ERROR: No README data found!",
   "scripts": {
     "start": "electron",
-    "release": "standard-version"
+    "release": "standard-version",
+    "prerelease-dev": "standard-version --prerelease dev"
   },
-  "version": "2.4.2",
+  "version": "2.4.3-dev.0",
   "devDependencies": {
-    "standard-version": "^4.4.0"
+    "standard-version": "^9.3.1"
   }
 }

package/tsconfig.json

@@ -1,16 +1,16 @@
-{
-  "compilerOptions": {
-    "target": "es5",
-    "module": "es2015",
-    "moduleResolution": "node",
-    "jsx": "preserve",
-    "outDir": "dist",
-    "allowJs": true,
-    "checkJs": false,
-    "allowSyntheticDefaultImports": true,
-    "sourceMap": true
-  },
-  "include": [
-    "./src/**/*"
-  ]
+{
+  "compilerOptions": {
+    "target": "es5",
+    "module": "es2015",
+    "moduleResolution": "node",
+    "jsx": "preserve",
+    "outDir": "dist",
+    "allowJs": true,
+    "checkJs": false,
+    "allowSyntheticDefaultImports": true,
+    "sourceMap": true
+  },
+  "include": [
+    "./src/**/*"
+  ]
 }

package/webpack.config.js

@@ -1,162 +1,162 @@
-'use strict'
-
-const CleanWebpackPlugin = require('clean-webpack-plugin')
-const CopyWebpackPlugin = require('copy-webpack-plugin')
-const HtmlWebpackPlugin = require('html-webpack-plugin')
-const webpack = require('webpack')
-const path = require('path')
-const _ = require('lodash')
-const fs = require('fs')
-
-module.exports = (options) => {
-  if (options.target === 'web') {
-    options.externals = [...(options.externals || []), 'electron']
-  }
-
-  let tsconfigPath = fs.existsSync(path.join(options.src, '..', 'tsconfig.json')) ? path.join(options.src, '..', 'tsconfig.json') : path.join(__dirname, 'tsconfig.json')
-  const typescriptPath = path.join(options.src, '..', 'node_modules', 'typescript', '/')
-  const typescript = fs.existsSync(typescriptPath) ? path.join(__dirname, path.relative(__dirname, typescriptPath), '/') : 'typescript'
-
-  let exclude = options.mode === 'watch'
-    ? [path.join(options.src, 'static'), path.join(options.src, 'test')]
-    : [path.resolve(options.src, 'static'), path.resolve(options.src, 'test')]
-
-  let config = {
-    context: __dirname,
-    entry: ['babel-polyfill', path.resolve(options.src, 'main')],
-    output: {
-      path: path.resolve(options.build),
-      filename: 'main.js'
-    },
-    node: {
-      __dirname: options.mode === 'watch',
-      fs: 'empty',
-      net: 'empty',
-      tls: 'empty'
-    },
-    resolve: {
-      extensions: ['.ts', '.tsx', '.js', '.jsx'],
-      modules: [
-        'node_modules',
-        'src',
-        'static'
-      ]
-    },
-    module: {
-      loaders: [
-        {
-          test: /\.json$/,
-          exclude: exclude,
-          loader: 'json-loader'
-        },
-        {
-          test: /\.(j|t)sx?$/,
-          include: [path.resolve(options.src)],
-          exclude: exclude,
-          loaders: [
-            {
-              loader: 'babel-loader?babelrc=false&extends=' + path.join(__dirname, '/.babelrc')
-            },
-            {
-              loader: 'awesome-typescript-loader',
-              options: {
-                configFileName: tsconfigPath,
-                transpileOnly: options.transpileOnly,
-                compiler: typescript
-              }
-            }
-          ]
-        },
-        {
-          test: /\.scss$/,
-          exclude: exclude,
-          loaders: ['style', 'css', 'sass']
-        },
-        {
-          test: /\.css$/,
-          exclude: exclude,
-          loader: 'style-loader!css-loader'
-        },
-        {
-          test: /\.(png|jpg|jpeg|gif|svg|woff|woff2|ttf|eot|mp4)$/,
-          exclude: exclude,
-          loader: 'file-loader'
-        },
-        {
-          test: /\.html$/,
-          loader: 'raw-loader'
-        }
-      ]
-    },
-    externals: (context, request, callback) => {
-      if (_.indexOf(options.externals, request) !== -1) {
-        if (options.mode !== 'watch' || request === 'electron') {
-          return callback(null, "require('" + request + "')")
-        } else {
-          return callback(null, "require('" + path.resolve(options.src, '..', 'node_modules', request).replace(/\\/g, '\\\\') + "')")
-        }
-      }
-      callback()
-    },
-    plugins: [
-      new CopyWebpackPlugin([{ from: path.resolve(options.src, 'static'), to: 'static/' }], { copyUnmodified: true }),
-      new HtmlWebpackPlugin({
-        inject: 'head',
-        template: path.resolve(options.src, 'index.html')
-      }),
-      new webpack.LoaderOptionsPlugin({
-        options: {
-          test: /\.tsx?$/,
-          ts: {
-            compiler: 'typescript',
-            configFileName: 'tsconfig.json'
-          },
-          tslint: {
-            emitErrors: true,
-            failOnHint: true
-          }
-        }
-      })
-    ],
-    target: options.target
-  }
-
-  if (options.mode === 'watch') {
-    config.entry.unshift(`webpack-dev-server/client?http://localhost:${options.port}/`, 'webpack/hot/dev-server', path.resolve(options.src, 'index.html'))
-    config.plugins.unshift(new CopyWebpackPlugin([{ from: path.resolve(options.src, 'test'), to: 'test/' }], { copyUnmodified: true }))
-    config.plugins.unshift(new webpack.HotModuleReplacementPlugin())
-    config.output.publicPath = `http://localhost:${options.port}/`
-    config.devtool = 'source-map'
-    config.devServer = {
-      contentBase: path.resolve(options.src),
-      publicPath: `http://localhost:${options.port}/`,
-      inline: true
-    }
-  } else {
-    config.plugins.unshift(
-      new CleanWebpackPlugin([path.basename(options.build), path.basename(options.build) + '.zip'], {
-        root: path.resolve(options.build, '..'),
-        verbose: false
-      }),
-      new webpack.DefinePlugin({
-        'process.env': {
-          NODE_ENV: JSON.stringify('production')
-        }
-      }),
-      new webpack.optimize.UglifyJsPlugin({
-        compress: {
-          warnings: false
-        },
-        mangle: true,
-        minimize: true,
-        comments: false
-      })
-    )
-
-    if (options.mode === 'run') {
-      config.plugins.unshift(new CopyWebpackPlugin([{ from: path.resolve(options.src, 'test'), to: 'test/' }], { copyUnmodified: true }))
-    }
-  }
-
-  return config
-}
+'use strict'
+
+const CleanWebpackPlugin = require('clean-webpack-plugin')
+const CopyWebpackPlugin = require('copy-webpack-plugin')
+const HtmlWebpackPlugin = require('html-webpack-plugin')
+const webpack = require('webpack')
+const path = require('path')
+const _ = require('lodash')
+const fs = require('fs')
+
+module.exports = (options) => {
+  if (options.target === 'web') {
+    options.externals = [...(options.externals || []), 'electron']
+  }
+
+  let tsconfigPath = fs.existsSync(path.join(options.src, '..', 'tsconfig.json')) ? path.join(options.src, '..', 'tsconfig.json') : path.join(__dirname, 'tsconfig.json')
+  const typescriptPath = path.join(options.src, '..', 'node_modules', 'typescript', '/')
+  const typescript = fs.existsSync(typescriptPath) ? path.join(__dirname, path.relative(__dirname, typescriptPath), '/') : 'typescript'
+
+  let exclude = options.mode === 'watch'
+    ? [path.join(options.src, 'static'), path.join(options.src, 'test')]
+    : [path.resolve(options.src, 'static'), path.resolve(options.src, 'test')]
+
+  let config = {
+    context: __dirname,
+    entry: ['babel-polyfill', path.resolve(options.src, 'main')],
+    output: {
+      path: path.resolve(options.build),
+      filename: 'main.js'
+    },
+    node: {
+      __dirname: options.mode === 'watch',
+      fs: 'empty',
+      net: 'empty',
+      tls: 'empty'
+    },
+    resolve: {
+      extensions: ['.ts', '.tsx', '.js', '.jsx'],
+      modules: [
+        'node_modules',
+        'src',
+        'static'
+      ]
+    },
+    module: {
+      loaders: [
+        {
+          test: /\.json$/,
+          exclude: exclude,
+          loader: 'json-loader'
+        },
+        {
+          test: /\.(j|t)sx?$/,
+          include: [path.resolve(options.src)],
+          exclude: exclude,
+          loaders: [
+            {
+              loader: 'babel-loader?babelrc=false&extends=' + path.join(__dirname, '/.babelrc')
+            },
+            {
+              loader: 'awesome-typescript-loader',
+              options: {
+                configFileName: tsconfigPath,
+                transpileOnly: options.transpileOnly,
+                compiler: typescript
+              }
+            }
+          ]
+        },
+        {
+          test: /\.scss$/,
+          exclude: exclude,
+          loaders: ['style', 'css', 'sass']
+        },
+        {
+          test: /\.css$/,
+          exclude: exclude,
+          loader: 'style-loader!css-loader'
+        },
+        {
+          test: /\.(png|jpg|jpeg|gif|svg|woff|woff2|ttf|eot|mp4)$/,
+          exclude: exclude,
+          loader: 'file-loader'
+        },
+        {
+          test: /\.html$/,
+          loader: 'raw-loader'
+        }
+      ]
+    },
+    externals: (context, request, callback) => {
+      if (_.indexOf(options.externals, request) !== -1) {
+        if (options.mode !== 'watch' || request === 'electron') {
+          return callback(null, "require('" + request + "')")
+        } else {
+          return callback(null, "require('" + path.resolve(options.src, '..', 'node_modules', request).replace(/\\/g, '\\\\') + "')")
+        }
+      }
+      callback()
+    },
+    plugins: [
+      new CopyWebpackPlugin([{ from: path.resolve(options.src, 'static'), to: 'static/' }], { copyUnmodified: true }),
+      new HtmlWebpackPlugin({
+        inject: 'head',
+        template: path.resolve(options.src, 'index.html')
+      }),
+      new webpack.LoaderOptionsPlugin({
+        options: {
+          test: /\.tsx?$/,
+          ts: {
+            compiler: 'typescript',
+            configFileName: 'tsconfig.json'
+          },
+          tslint: {
+            emitErrors: true,
+            failOnHint: true
+          }
+        }
+      })
+    ],
+    target: options.target
+  }
+
+  if (options.mode === 'watch') {
+    config.entry.unshift(`webpack-dev-server/client?http://localhost:${options.port}/`, 'webpack/hot/dev-server', path.resolve(options.src, 'index.html'))
+    config.plugins.unshift(new CopyWebpackPlugin([{ from: path.resolve(options.src, 'test'), to: 'test/' }], { copyUnmodified: true }))
+    config.plugins.unshift(new webpack.HotModuleReplacementPlugin())
+    config.output.publicPath = `http://localhost:${options.port}/`
+    config.devtool = 'source-map'
+    config.devServer = {
+      contentBase: path.resolve(options.src),
+      publicPath: `http://localhost:${options.port}/`,
+      inline: true
+    }
+  } else {
+    config.plugins.unshift(
+      new CleanWebpackPlugin([path.basename(options.build), path.basename(options.build) + '.zip'], {
+        root: path.resolve(options.build, '..'),
+        verbose: false
+      }),
+      new webpack.DefinePlugin({
+        'process.env': {
+          NODE_ENV: JSON.stringify('production')
+        }
+      }),
+      new webpack.optimize.UglifyJsPlugin({
+        compress: {
+          warnings: false
+        },
+        mangle: true,
+        minimize: true,
+        comments: false
+      })
+    )
+
+    if (options.mode === 'run') {
+      config.plugins.unshift(new CopyWebpackPlugin([{ from: path.resolve(options.src, 'test'), to: 'test/' }], { copyUnmodified: true }))
+    }
+  }
+
+  return config
+}