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

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

@@ -1,107 +1,108 @@
-{
-  "_args": [
-    [
-      {
-        "raw": "@vixoniccom/module-packager@^1.2.0",
-        "scope": "@vixoniccom",
-        "escapedName": "@vixonic%2fmodule-packager",
-        "name": "@vixoniccom/module-packager",
-        "rawSpec": "^1.2.0",
-        "spec": ">=1.2.0 <2.0.0",
-        "type": "range"
-      }
-    ]
-  ],
-  "_from": "@vixoniccom/module-packager@>=1.2.0 <2.0.0",
-  "_id": "@vixoniccom/module-packager@1.2.0",
-  "_inCache": true,
-  "_location": "/@vixoniccom/module-packager",
-  "_nodeVersion": "7.6.0",
-  "_npmOperationalInternal": {
-    "host": "packages-12-west.internal.npmjs.com",
-    "tmp": "tmp/module-packager-1.2.0.tgz_1487918846893_0.5388180573936552"
-  },
-  "_npmUser": {
-    "name": "vixonic",
-    "email": "tdadone@vixonic.net"
-  },
-  "_npmVersion": "2.15.9",
-  "_phantomChildren": {},
-  "_requested": {
-    "raw": "@vixoniccom/module-packager@^1.2.0",
-    "scope": "@vixonic",
-    "escapedName": "@vixonic%2fmodule-packager",
-    "name": "@vixoniccom/module-packager",
-    "rawSpec": "^1.2.0",
-    "spec": ">=1.2.0 <2.0.0",
-    "type": "range"
-  },
-  "_requiredBy": [
-    "#DEV:/"
-  ],
-  "_resolved": "https://registry.npmjs.org/@vixoniccom/module-packager/-/module-packager-1.2.0.tgz",
-  "_shasum": "9735f3bcbf2101d404d7bb058cb8337b0a87c503",
-  "_shrinkwrap": null,
-  "_spec": "@vixoniccom/module-packager@^1.2.0",
-  "_where": "c:\\Development\\menuboard",
-  "author": {
-    "name": "tdadone"
-  },
-  "bin": {
-    "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",
-    "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",
-    "copy-webpack-plugin": "^3.0.1",
-    "css-loader": "^0.24.0",
-    "electron": "^2.0.2",
-    "electron-debug": "^1.0.1",
-    "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",
-    "raw-loader": "^0.5.1",
-    "sass-loader": "^4.0.2",
-    "style-loader": "^0.13.1",
-    "ts-node": "^3.3.0",
-    "typescript": "^2.9.2",
-    "webpack": "^2.6.1",
-    "webpack-dev-server": "^1.15.1"
-  },
-  "directories": {},
-  "dist": {
-    "shasum": "9735f3bcbf2101d404d7bb058cb8337b0a87c503",
-    "tarball": "https://registry.npmjs.org/@vixoniccom/module-packager/-/module-packager-1.2.0.tgz"
-  },
-  "main": "main.js",
-  "maintainers": [
-    {
-      "name": "vixonic",
-      "email": "tdadone@vixonic.net"
-    }
-  ],
-  "name": "@vixoniccom/module-packager",
-  "optionalDependencies": {},
-  "readme": "ERROR: No README data found!",
-  "scripts": {
-    "start": "electron",
-    "release": "standard-version"
-  },
-  "version": "2.4.1",
-  "devDependencies": {
-    "standard-version": "^4.4.0"
-  }
-}
+{
+  "_args": [
+    [
+      {
+        "raw": "@vixoniccom/module-packager@^1.2.0",
+        "scope": "@vixoniccom",
+        "escapedName": "@vixoniccom%2fmodule-packager",
+        "name": "@vixoniccom/module-packager",
+        "rawSpec": "^1.2.0",
+        "spec": ">=1.2.0 <2.0.0",
+        "type": "range"
+      }
+    ]
+  ],
+  "_from": "@vixoniccom/module-packager@>=1.2.0 <2.0.0",
+  "_id": "@vixoniccom/module-packager@1.2.0",
+  "_inCache": true,
+  "_location": "/@vixoniccom/module-packager",
+  "_nodeVersion": "7.6.0",
+  "_npmOperationalInternal": {
+    "host": "packages-12-west.internal.npmjs.com",
+    "tmp": "tmp/module-packager-1.2.0.tgz_1487918846893_0.5388180573936552"
+  },
+  "_npmUser": {
+    "name": "vixonic",
+    "email": "tdadone@vixonic.net"
+  },
+  "_npmVersion": "2.15.9",
+  "_phantomChildren": {},
+  "_requested": {
+    "raw": "@vixoniccom/module-packager@^1.2.0",
+    "scope": "@vixonic",
+    "escapedName": "@vixonic%2fmodule-packager",
+    "name": "@vixoniccom/module-packager",
+    "rawSpec": "^1.2.0",
+    "spec": ">=1.2.0 <2.0.0",
+    "type": "range"
+  },
+  "_requiredBy": [
+    "#DEV:/"
+  ],
+  "_resolved": "https://registry.npmjs.org/@vixoniccom/module-packager/-/module-packager-1.2.0.tgz",
+  "_shasum": "9735f3bcbf2101d404d7bb058cb8337b0a87c503",
+  "_shrinkwrap": null,
+  "_spec": "@vixoniccom/module-packager@^1.2.0",
+  "_where": "c:\\Development\\menuboard",
+  "author": {
+    "name": "tdadone"
+  },
+  "bin": {
+    "vixonic-module-packager": "main.js"
+  },
+  "dependencies": {
+    "@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": "^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": "^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.21",
+    "node-sass": "^4.14.1",
+    "raw-loader": "^0.5.1",
+    "sass-loader": "^4.0.2",
+    "style-loader": "^0.13.1",
+    "ts-node": "^10.2.1",
+    "typescript": "^4.3.5",
+    "webpack": "^2.6.1",
+    "webpack-dev-server": "^1.15.1"
+  },
+  "directories": {},
+  "dist": {
+    "shasum": "9735f3bcbf2101d404d7bb058cb8337b0a87c503",
+    "tarball": "https://registry.npmjs.org/@vixoniccom/module-packager/-/module-packager-1.2.0.tgz"
+  },
+  "main": "main.js",
+  "maintainers": [
+    {
+      "name": "vixonic",
+      "email": "tdadone@vixonic.net"
+    }
+  ],
+  "name": "@vixoniccom/module-packager",
+  "optionalDependencies": {},
+  "readme": "ERROR: No README data found!",
+  "scripts": {
+    "start": "electron",
+    "release": "standard-version",
+    "prerelease-dev": "standard-version --prerelease dev"
+  },
+  "version": "2.4.3-dev.0",
+  "devDependencies": {
+    "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/**/*"
+  ]
 }