@vixoniccom/module-packager 2.7.0-test.6 → 2.7.0-test.7

package/CHANGELOG.md

@@ -2,6 +2,13 @@
 
 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.7.0-test.7](https://gitlab.com/mandomedio/vixonic/module-packager/compare/v2.7.0-test.6...v2.7.0-test.7) (2022-07-15)
+
+
+### Bug Fixes
+
+* **Release:** revert __dirname changes ([bb25fe1](https://gitlab.com/mandomedio/vixonic/module-packager/commit/bb25fe10ed9a9368c145530aecdc91f539877a26))
+
 ## [2.7.0-test.6](https://gitlab.com/mandomedio/vixonic/module-packager/compare/v2.7.0-test.5...v2.7.0-test.6) (2022-07-15)
 
 

package/index.html

@@ -18,17 +18,17 @@
       win.show()
       win.focus()
     })
-    webview.src = options.mode === 'watch' ? `http://localhost:${options.port}/index.html` : `file://${path.join(__dirname, options.build, 'index.html')}`
+    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(__dirname, options.src, '/test/parameters.json')).parameters
+        data.parameters = require(path.join(options.src, '/test/parameters.json')).parameters
       } catch (err) {
         console.log('No parameters.')
       }
 
-      let escaped = path.join(__dirname, options.mode === 'watch' ? options.src : options.build, 'test', 'downloads')
+      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}`
@@ -37,7 +37,7 @@
       data.downloadsPath = escaped
 
       try {
-        data.services = require(path.join(__dirname, options.src, '/test/services.json')).services
+        data.services = require(path.join(options.src, '/test/services.json')).services
         console.log(data.services)
       } catch (err) {
         console.log('No services.')
@@ -49,7 +49,7 @@
     function getSchema () {
       let data = {}
       try {
-        data = require(path.join(__dirname, options.src, '../configuration.json')).schema
+        data = require(path.join(options.src, '../configuration.json')).schema
       } catch (err) {
         console.log('No schema.')
       }

package/main.js

@@ -5,9 +5,9 @@ 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: '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' },
@@ -73,7 +73,7 @@ function pack (callback) {
 function installExternals (callback) {
   // Get external versions.
   let externals = options.externals.map(x => {
-    return `${x}@${JSON.parse(fs.readFileSync(path.resolve(__dirname, options.src, '..', 'node_modules', x, 'package.json'))).version}`
+    return `${x}@${JSON.parse(fs.readFileSync(path.resolve(options.src, '..', 'node_modules', x, 'package.json'))).version}`
   })
 
   // Install external versions.
@@ -95,10 +95,10 @@ function installExternals (callback) {
 
 function zip (callback) {
   console.log(clc.blue('Archiving...'))
-  let output = fs.createWriteStream(path.resolve(__dirname, options.build, '../', 'build.zip'))
+  let output = fs.createWriteStream(path.resolve(options.build, '../', 'build.zip'))
   let archive = archiver('zip')
   archive.pipe(output)
-  archive.directory(path.resolve(__dirname, options.build), './')
+  archive.directory(path.resolve(options.build), './')
   archive.finalize()
 
   output.on('close', function () {
@@ -121,7 +121,7 @@ function watch () {
   var environment = process.env
   environment.NODE_ENV = 'development'
 
-  exec(`npm start -- ${path.join(__dirname, 'electron.js')} --src ${path.resolve(__dirname, options.src)} --build ${path.resolve(__dirname, options.build)} --port ${options.port} --mode ${options.mode} --config ${options.config} --externals ${options.externals}`,
+  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
@@ -137,7 +137,7 @@ function run () {
     if (err) {
       throw err
     } else {
-      exec(`npm start -- ${path.join(__dirname, 'electron.js')} --src ${path.resolve(__dirname, options.src)} --build ${path.resolve(__dirname, options.build)} --port ${options.port} --mode ${options.mode} --config ${options.config} --externals ${options.externals}`,
+      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
         })
@@ -148,14 +148,14 @@ function run () {
 function loadConfiguration () {
   require('@vixoniccom/modules')
   require('ts-node').register({compilerOptions: { moduleResolution: 'node', module: 'commonjs', target: 'es2015', checkJs: false }})
-  return require(path.resolve(__dirname, options.confDefinition, 'index.ts')).configuration
+  return require(path.resolve(options.confDefinition, 'index.ts')).configuration
 }
 
 function generateConfiguration () {
   try {
     let configuration = loadConfiguration()
-    fs.writeFileSync(path.resolve(__dirname, options.src, 'parameters.d.ts'), configuration.declarationFileString)
-    fs.writeFileSync(path.resolve(__dirname, options.src, '..', 'configuration.json'), JSON.stringify(configuration, undefined, 2))
+    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'))
@@ -166,10 +166,10 @@ function generateConfiguration () {
 function validateConfiguration () {
   try {
     const { Configuration } = require('@vixoniccom/modules')
-    const json = require(path.resolve(__dirname, options.src, '../', 'configuration.json'))
+    const json = require(path.resolve(options.src, '../', 'configuration.json'))
     const conf = Configuration.fromJSON(json)
     if (conf.durationFormula) {
-      const values = require(path.resolve(__dirname, options.src, 'test', 'parameters.json'))
+      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')

package/package.json

@@ -104,7 +104,7 @@
     "prerelease-test": "standard-version --prerelease test",
     "release": "standard-version"
   },
-  "version": "2.7.0-test.6",
+  "version": "2.7.0-test.7",
   "devDependencies": {
     "standard-version": "^9.3.1"
   }

package/webpack.config.js

@@ -19,15 +19,15 @@ module.exports = (options) => {
   // const typescript = fs.existsSync(typescriptPath) ? path.join(__dirname, path.relative(__dirname, typescriptPath), '/') : 'typescript'
 
   let exclude = options.mode === 'watch'
-    ? [path.join(__dirname, options.src, 'static'), path.join(__dirname, options.src, 'test')]
-    : [path.resolve(__dirname, options.src, 'static'), path.resolve(__dirname, options.src, 'test')]
+    ? [path.join(options.src, 'static'), path.join(options.src, 'test')]
+    : [path.resolve(options.src, 'static'), path.resolve(options.src, 'test')]
 
   console.log('Options: ', options, options.src)
   let config = {
     context: __dirname,
-    entry: ['babel-polyfill', path.resolve(__dirname, options.src, 'main')],
+    entry: ['babel-polyfill', path.resolve(options.src, 'main')],
     output: {
-      path: path.resolve(__dirname, options.build),
+      path: path.resolve(options.build),
       filename: 'main.js'
     },
     node: {
@@ -53,7 +53,7 @@ module.exports = (options) => {
         },
         {
           test: /\.(j|t)sx?$/,
-          include: [path.resolve(__dirname, options.src)],
+          include: [path.resolve(options.src)],
           exclude: exclude,
           rules: [
             {
@@ -93,16 +93,16 @@ module.exports = (options) => {
         if (options.mode !== 'watch' || request === 'electron') {
           return callback(null, "require('" + request + "')")
         } else {
-          return callback(null, "require('" + path.resolve(__dirname, options.src, '..', 'node_modules', request).replace(/\\/g, '\\\\') + "')")
+          return callback(null, "require('" + path.resolve(options.src, '..', 'node_modules', request).replace(/\\/g, '\\\\') + "')")
         }
       }
       callback()
     },
     plugins: [
-      new CopyWebpackPlugin([{ from: path.resolve(__dirname, options.src, 'static'), to: 'static/' }], { copyUnmodified: true }),
+      new CopyWebpackPlugin([{ from: path.resolve(options.src, 'static'), to: 'static/' }], { copyUnmodified: true }),
       new HtmlWebpackPlugin({
         inject: 'head',
-        template: path.resolve(__dirname, options.src, 'index.html')
+        template: path.resolve(options.src, 'index.html')
       }),
       new webpack.LoaderOptionsPlugin({
         options: {
@@ -122,20 +122,20 @@ module.exports = (options) => {
   }
 
   if (options.mode === 'watch') {
-    config.entry.unshift(`webpack-dev-server/client?http://localhost:${options.port}/`, 'webpack/hot/dev-server', path.resolve(__dirname, options.src, 'index.html'))
-    config.plugins.unshift(new CopyWebpackPlugin([{ from: path.resolve(__dirname, options.src, 'test'), to: 'test/' }], { copyUnmodified: true }))
+    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 = {
-      static: path.resolve(__dirname, options.src),
+      static: 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(__dirname, options.build, '..'),
+        root: path.resolve(options.build, '..'),
         verbose: false
       }),
       new webpack.DefinePlugin({
@@ -153,7 +153,7 @@ module.exports = (options) => {
     )
 
     if (options.mode === 'run') {
-      config.plugins.unshift(new CopyWebpackPlugin([{ from: path.resolve(__dirname, options.src, 'test'), to: 'test/' }], { copyUnmodified: true }))
+      config.plugins.unshift(new CopyWebpackPlugin([{ from: path.resolve(options.src, 'test'), to: 'test/' }], { copyUnmodified: true }))
     }
   }