@vixoniccom/module-packager 2.11.0-dev.12 → 2.11.0-dev.3

package/dist/electron.js

@@ -29,7 +29,6 @@ function createWindow() {
         height: 768,
         webPreferences: {
             nodeIntegrationInSubFrames: true,
-            allowRunningInsecureContent: true,
             nodeIntegration: true,
             contextIsolation: false,
             webSecurity: false,

package/dist/launcher.html

@@ -26,7 +26,7 @@
       const win = remote.getCurrentWindow()
 
       webview.setAttribute('nodeintegration', '')
-      webview.setAttribute('webpreferences', 'webSecurity=false, allowRunningInsecureContent=true, nodeIntegration=yes, contextIsolation=no')
+      webview.setAttribute('webpreferences', 'contextIsolation=no, nodeIntegration=yes')
 
       webview.addEventListener('did-finish-load', () => {
         win.show()
@@ -49,14 +49,10 @@
         }
 
         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
         } catch (err) {
@@ -83,4 +79,4 @@
   </script>
 </body>
 
-</html>
+</html>

package/dist/main.js

@@ -100,8 +100,7 @@ function setupChildProcessLogging(child) {
 }
 // Función centralizada para compilar webpack
 async function compileWebpack() {
-    // CORREGIDO: Usar __dirname para el webpack.config.js del module-packager
-    const cfgPath = path.resolve(__dirname, 'webpack.config.js');
+    const cfgPath = path.resolve(__dirname, '..', 'dist/webpack.config.js');
     const webpackConfigFactory = (await import(cfgPath)).default;
     const compiler = webpack(webpackConfigFactory(options));
     return new Promise((resolve, reject) => {
@@ -238,8 +237,7 @@ function zip() {
     clc.move(-2, 0);
 }
 async function watch() {
-    // CORREGIDO: Usar __dirname para el webpack.config.js del module-packager
-    const cfgPath = path.resolve(__dirname, 'webpack.config.js');
+    const cfgPath = path.resolve(__dirname, '..', 'dist/webpack.config.js');
     const webpackConfigFactory = (await import(cfgPath)).default;
     const compiler = webpack(webpackConfigFactory(options));
     const server = new WebpackDevServer({

package/dist/webpack.config.js

@@ -7,8 +7,7 @@ import CopyWebpackPlugin from 'copy-webpack-plugin';
 import TerserPlugin from 'terser-webpack-plugin';
 import webpack from 'webpack';
 const __filename = fileURLToPath(import.meta.url);
-const __dirname = path.dirname(__filename);
-console.log("🚀 ~ __dirname:", __dirname);
+// const __dirname = path.dirname(__filename)
 export default (env = {}, argv = {}) => {
     const require = createRequire(import.meta.url);
     const options = {
@@ -20,16 +19,13 @@ export default (env = {}, argv = {}) => {
     const isDev = options.mode === 'watch';
     const buildPath = path.resolve(options.build);
     const controllerHtmlPath = path.resolve(options.src, 'index.html');
+    console.log("🚀 ~ controllerHtmlPath:", controllerHtmlPath);
     const controllerStaticPath = path.resolve(path.dirname(controllerHtmlPath), '../static');
     const controllerFontsPath = path.resolve(path.dirname(controllerHtmlPath), '../fonts');
     return {
         mode: isDev ? 'development' : 'production',
         target: 'electron-renderer',
-        entry: isDev ? [
-            `webpack-dev-server/client?http://localhost:${options.port}/`,
-            'webpack/hot/dev-server',
-            path.resolve(options.src, 'main.ts')
-        ] : path.resolve(options.src, 'main.ts'),
+        entry: path.resolve(options.src, 'main.ts'),
         output: {
             path: buildPath,
             filename: '[name].js',
@@ -52,7 +48,7 @@ export default (env = {}, argv = {}) => {
                 process: require.resolve('process/browser.js'),
                 global: require.resolve('global')
             },
-            modules: ['node_modules', 'src', 'static']
+            modules: ['node_modules']
         },
         module: {
             rules: [
@@ -76,10 +72,10 @@ export default (env = {}, argv = {}) => {
                     exclude: /node_modules/
                 },
                 {
-                    test: /\.(png|jpe?g|gif|svg|woff|woff2|ttf|eot|mp4)$/,
+                    test: /\.(png|jpe?g|gif|svg|woff2?|ttf|eot)$/,
                     type: 'asset/resource',
                     generator: {
-                        filename: '[name][ext]'
+                        filename: 'assets/[hash][ext][query]'
                     }
                 },
                 {
@@ -128,15 +124,9 @@ export default (env = {}, argv = {}) => {
                 })
             ]
         },
-        devtool: isDev ? 'source-map' : false,
+        devtool: isDev ? 'eval' : false,
         devServer: isDev ? {
-            static: [
-                {
-                    directory: path.resolve(options.src, 'test'),
-                    publicPath: '/test',
-                    watch: true,
-                }
-            ],
+            static: false,
             open: false,
             client: {
                 overlay: true

package/package.json

@@ -1,12 +1,13 @@
 {
   "name": "@vixoniccom/module-packager",
-  "version": "2.11.0-dev.12",
+  "version": "2.11.0-dev.3",
   "type": "module",
   "bin": {
     "vixonic-module-packager": "./dist/main.js"
   },
   "files": [
-    "dist"
+    "dist",
+    "index.html"
   ],
   "main": "dist/main.js",
   "scripts": {
@@ -26,15 +27,13 @@
   },
   "dependencies": {
     "@electron/remote": "^2.1.2",
-    "@types/which": "^3.0.4",
-    "@vixoniccom/module-controller": "2.0.0-dev.6",
-    "@vixoniccom/modules": "2.20.1-dev.0",
+    "@vixoniccom/module-controller": "^2.0.0-dev.3",
+    "@vixoniccom/modules": "^2.20.1-dev.0",
     "archiver": "^5.3.0",
     "clean-webpack-plugin": "^4.0.0",
     "cli-color": "^1.2.0",
     "command-line-args": "^3.0.1",
     "copy-webpack-plugin": "^13.0.0",
-    "css-loader": "^7.1.2",
     "electron": "^36.1.0",
     "electron-debug": "^3.2.0",
     "global": "^4.4.0",
@@ -43,14 +42,12 @@
     "lodash": "^4.17.21",
     "process": "^0.11.10",
     "raw-loader": "^0.5.1",
-    "style-loader": "^4.0.0",
     "ts-loader": "^9.5.0",
     "ts-node": "^10.9.1",
     "typescript": "^5.8.3",
     "webpack": "^5.99.8",
     "webpack-cli": "^6.0.1",
-    "webpack-dev-server": "^5.2.1",
-    "which": "^5.0.0"
+    "webpack-dev-server": "^5.2.1"
   },
   "devDependencies": {
     "@types/archiver": "^6.0.3",
@@ -58,11 +55,14 @@
     "@types/command-line-args": "^5.2.3",
     "@types/node": "^20.11.25",
     "@types/webpack-env": "^1.18.8",
+    "@types/which": "^3.0.4",
     "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"
   }
 }