@vixoniccom/module-packager 2.10.2-test.5 → 2.10.2-test.7

package/index.html

@@ -1,67 +1,88 @@
 <!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" nodeintegration autosize plugins disablewebsecurity></webview>
-<script type="text/javascript">
-  const path = require('path')
-  const ModuleController = require('@vixoniccom/module-controller')
-  const { ipcRenderer } = require('electron')
-  const remote = require('@electron/remote')
-
-  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.')
-      }
+  <webview style="width: 100%; height: 100%; margin: 0; padding: 0;" id="webview"></webview>
+  <script type="text/javascript">
+    // import path from 'path'
+    // import { ipcRenderer } from 'electron'
+    // import remote from '@electron/remote'
+    // import ModuleController from '@vixoniccom/module-controller'
+    const path = require('path')
+    const ModuleController = require('@vixoniccom/module-controller')
+    const { ipcRenderer } = require('electron')
+    const remote = require('@electron/remote')
 
-      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, '/')
+    ipcRenderer.on('init', (event, options) => {
+      console.log('[WEBVIEW] init', options)
+      let webview = document.getElementById('webview')
+      let win = remote.getCurrentWindow()
+      webview.setAttribute('nodeintegration', '');
+      webview.setAttribute('webpreferences', 'contextIsolation=no, nodeIntegration=yes');
+      webview.addEventListener('did-finish-load', () => {
+        console.log('[WEBVIEW] did-finish-load fired');
+        win.show()
+        win.focus()
+      })
 
-      data.downloadsPath = escaped
+      webview.addEventListener('did-fail-load', (e) => {
+        console.error('[WEBVIEW] did-fail-load', e);
+      });
 
-      try {
-        data.services = require(path.join(options.src, '/test/services.json')).services
-        console.log(data.services)
-      } catch (err) {
-        console.log('No services.')
-      }
+      console.log('[WEBVIEW] Resolved src:', options.mode === 'watch'
+        ? `http://localhost:${options.port}/index.html`
+        : `file://${path.join(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(options.src, '/test/parameters.json')).parameters
+        } catch (err) {
+          console.log(err)
+          console.log('No parameters.')
+        }
 
-      return data
-    }
+        let escaped = path.join(options.mode === 'watch' ? options.src : options.build, 'test', 'downloads')
+        console.log("🚀 ~ getData ~ escaped:", escaped)
 
-    function getSchema () {
-      let data = {}
-      try {
-        data = require(path.join(options.src, '../configuration.json')).schema
-      } catch (err) {
-        console.log('No schema.')
+        // 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
       }
-      return data
-    }
 
-    ModuleController.init(win, webview, getData(), getSchema(), options.mode === 'watch')
-  })
-</script>
+      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>
+
+</html>

package/package.json

@@ -59,11 +59,7 @@
     "@vixoniccom/module-controller": "1.3.0-dev.5",
     "@vixoniccom/modules": "^2.20.0",
     "archiver": "^5.3.0",
-    "@babel/core": "^7.27.1",
-    "babel-loader": "^10.0.0",
-    "babel-polyfill": "^6.26.0",
-    "@babel/preset-env": "^7.27.2",
-    "@babel/preset-react": "^7.26.3",
+    "clean-webpack-plugin": "^4.0.0",
     "cli-color": "^1.2.0",
     "command-line-args": "^3.0.1",
     "copy-webpack-plugin": "^13.0.0",
@@ -74,12 +70,11 @@
     "html-webpack-plugin": "^4.5.2",
     "lodash": "^4.17.21",
     "raw-loader": "^0.5.1",
-    "ts-loader": "^8.2.0",
+    "ts-loader": "^9.5.0",
     "ts-node": "^10.9.1",
-    "clean-webpack-plugin": "^4.0.0",
     "typescript": "^5.8.3",
-    "webpack": "5",
-    "webpack-cli": "^4.10.0",
+    "webpack": "^5.99.8",
+    "webpack-cli": "^6.0.1",
     "webpack-dev-server": "^5.2.1"
   },
   "directories": {},
@@ -87,7 +82,7 @@
     "shasum": "9735f3bcbf2101d404d7bb058cb8337b0a87c503",
     "tarball": "https://registry.npmjs.org/@vixoniccom/module-packager/-/module-packager-1.2.0.tgz"
   },
-  "main": "main.js",
+  "main": "dist/build/main.bundle.js",
   "maintainers": [
     {
       "name": "vixonic",
@@ -97,23 +92,33 @@
   "name": "@vixoniccom/module-packager",
   "readme": "ERROR: No README data found!",
   "scripts": {
-    "start": "electron",
-    "clean": "rimraf dist",
-    "build-test": "npm run clean && tsc && webpack --config webpack.config.js --mode=production",
-    "build": "tsc && cp webpack.config.js dist/",
-    "prepare": "npm run build",
+    "start": "electron dist/electron.js --mode run --build ./dist/build",
+    "build:renderer": "webpack ./webpack.config.js --mode production --env src=./ --env build=./dist/build",
+    "build:main": "tsc -p tsconfig.json",
+    "build": "npm-run-all -p build:renderer build:main",
+    "dev:renderer": "webpack serve ./webpack.config.js --mode development --env src=./src --env build=./dist/build --env port=8080",
+    "dev:electron": "wait-on http://localhost:8080/index.html && electron dist/electron.js --mode watch --port 8080 --build ./dist/build",
+    "dev": "npm-run-all -p dev:renderer dev:electron",
     "prerelease-dev": "standard-version --prerelease dev",
     "prerelease-rc": "standard-version --prerelease rc",
     "prerelease-test": "standard-version --prerelease test",
     "release": "standard-version"
   },
-  "version": "2.10.2-test.5",
+  "type": "module",
+  "version": "2.10.2-test.7",
   "license": "ISC",
   "devDependencies": {
-    "@babel/preset-env": "^7.26.9",
-    "@babel/preset-react": "^7.26.3",
-    "@babel/preset-typescript": "^7.27.0",
+    "@types/archiver": "^6.0.3",
+    "@types/cli-color": "^2.0.6",
+    "@types/command-line-args": "^5.2.3",
     "@types/node": "^20.11.25",
-    "standard-version": "^9.3.1"
+    "concurrently": "^9.1.2",
+    "css-loader": "^7.1.2",
+    "npm-run-all": "^4.1.5",
+    "sass": "^1.88.0",
+    "sass-loader": "^16.0.5",
+    "standard-version": "^9.3.1",
+    "style-loader": "^4.0.0",
+    "wait-on": "^8.0.3"
   }
 }