fixes

Author: Chetan11-dev

.erb/configs/getAnalyzerPlugins.ts

@@ -0,0 +1,8 @@
+import { BundleAnalyzerPlugin } from 'webpack-bundle-analyzer'
+
+export function getAnalyzerPlugins() {
+  return process.env.ANALYZE === 'true' ? [new BundleAnalyzerPlugin({
+    analyzerMode: 'server',
+    analyzerPort: 8888,
+  })] : []
+}

.erb/configs/webpack.config.main.dev.ts

@@ -4,19 +4,49 @@
 
 import path from 'path';
 import webpack from 'webpack';
-import { BundleAnalyzerPlugin } from 'webpack-bundle-analyzer';
 import { merge } from 'webpack-merge';
 import checkNodeEnv from '../scripts/check-node-env';
 import baseConfig from './webpack.config.base';
 import webpackPaths from './webpack.paths';
 import { devMainCopyPlugins } from './copy-plugin'
-import { LogContentsPlugin } from './webpack.custom-plugins'
+import { GenerateApiPropsPlugin } from './webpack.custom-plugins'
+import { getAnalyzerPlugins } from './getAnalyzerPlugins'
+import WatchExternalFilesPlugin from 'webpack-watch-files-plugin'
+import touch from 'touch';
 
+
+class WebpackForceRebuildOnEmitPlugin {
+  apply(compiler) {
+    compiler.hooks.emit.tapAsync('WebpackForceRebuildOnEmitPlugin', (compilation, callback) => {
+      const outputPath = compilation.outputOptions.path;
+      const firstAssetName = compilation.getAssets()[0].name;
+      const assetToTouch = path.resolve(outputPath, firstAssetName);
+      touch(assetToTouch);
+      callback();
+    });
+  }
+}
+
+
+function getWatchingPlugins() {
+  const IS_WATCH_MODE = process.argv?.includes('--watch');
+  return IS_WATCH_MODE ? [
+    // @ts-ignore
+    new WatchExternalFilesPlugin({
+      verbose: false,
+      files: [
+        './inputs/**/*.js',
+      ]
+    }) as any,
+    new WebpackForceRebuildOnEmitPlugin(),
+  ] : []
+}
 // When an ESLint server is running, we can't set the NODE_ENV so we'll check if it's
 // at the dev webpack config is not accidentally run in a production environment
 if (process.env.NODE_ENV === 'production') {
   checkNodeEnv('development');
 }
+const generateApiProps = process.env.GENERATE_APP_PROPS === 'true';
 const configuration: webpack.Configuration = {
   devtool: 'inline-source-map',
 
@@ -39,13 +69,11 @@ const configuration: webpack.Configuration = {
 
   plugins: [
     ...devMainCopyPlugins,
-    new LogContentsPlugin(),
+    ...(generateApiProps ? [new GenerateApiPropsPlugin()] : []),
+    ...getWatchingPlugins(),
     // eslint-disable-next-line @typescript-eslint/ban-ts-comment
     // @ts-ignore
-    new BundleAnalyzerPlugin({
-      analyzerMode: process.env.ANALYZE === 'true' ? 'server' : 'disabled',
-      analyzerPort: 8888,
-    }),
+    ...getAnalyzerPlugins(),
 
     new webpack.DefinePlugin({
       'process.type': '"browser"',

.erb/configs/webpack.config.main.prod.ts

@@ -6,7 +6,7 @@ import path from 'path';
 import webpack from 'webpack';
 import { merge } from 'webpack-merge';
 import TerserPlugin from 'terser-webpack-plugin';
-import { BundleAnalyzerPlugin } from 'webpack-bundle-analyzer';
+import { getAnalyzerPlugins } from './getAnalyzerPlugins';
 import baseConfig from './webpack.config.base';
 import webpackPaths from './webpack.paths';
 import checkNodeEnv from '../scripts/check-node-env';
@@ -51,10 +51,7 @@ const configuration: webpack.Configuration = {
 
   plugins: [
     ...prodMainCopyPlugins,
-    new BundleAnalyzerPlugin({
-      analyzerMode: process.env.ANALYZE === 'true' ? 'server' : 'disabled',
-      analyzerPort: 8888,
-    }),
+    ...getAnalyzerPlugins(),
 
     /**
      * Create global constants which can be configured at compile time.

.erb/configs/webpack.config.preload.dev.ts

@@ -1,7 +1,7 @@
 import path from 'path';
 import webpack from 'webpack';
 import { merge } from 'webpack-merge';
-import { BundleAnalyzerPlugin } from 'webpack-bundle-analyzer';
+import { getAnalyzerPlugins } from './getAnalyzerPlugins';
 import baseConfig from './webpack.config.base';
 import webpackPaths from './webpack.paths';
 import checkNodeEnv from '../scripts/check-node-env';
@@ -30,9 +30,7 @@ const configuration: webpack.Configuration = {
   },
 
   plugins: [
-    new BundleAnalyzerPlugin({
-      analyzerMode: process.env.ANALYZE === 'true' ? 'server' : 'disabled',
-    }),
+    ...getAnalyzerPlugins(),
 
     /**
      * Create global constants which can be configured at compile time.

.erb/configs/webpack.config.renderer.dev.ts

@@ -208,7 +208,7 @@ const configuration: webpack.Configuration = {
         .on('error', (spawnError) => console.error(spawnError));
 
       console.log('Starting Main Process...');
-      let args = ['run', 'start:main'];
+      let args = ['run',  process.env.K8S_MODE === 'master' ? 'start:main:master' : 'start:main'];
       if (process.env.MAIN_ARGS) {
         args = args.concat(
           ['--', ...process.env.MAIN_ARGS.matchAll(/"[^"]+"|[^\s"]+/g)].flat(),

.erb/configs/webpack.config.renderer.prod.ts

@@ -6,7 +6,7 @@ import path from 'path';
 import webpack from 'webpack';
 import HtmlWebpackPlugin from 'html-webpack-plugin';
 import MiniCssExtractPlugin from 'mini-css-extract-plugin';
-import { BundleAnalyzerPlugin } from 'webpack-bundle-analyzer';
+import { getAnalyzerPlugins } from './getAnalyzerPlugins';
 import CssMinimizerPlugin from 'css-minimizer-webpack-plugin';
 import { merge } from 'webpack-merge';
 import TerserPlugin from 'terser-webpack-plugin';
@@ -50,7 +50,7 @@ const configuration: webpack.Configuration = {
               importLoaders: 1,
             },
           },
-          'sass-loader',
+          // 'sass-loader',  // no need as no sass files, and throws warnings
         ],
         include: /\.module\.s?(c|a)ss$/,
       },
@@ -59,19 +59,18 @@ const configuration: webpack.Configuration = {
         use: [
           MiniCssExtractPlugin.loader,
           'css-loader',
-          'sass-loader',
           {
             loader: 'postcss-loader',
             options: {
-            postcssOptions: {
-              plugins:
-                [
+              postcssOptions: {
+                plugins: [
                   require('tailwindcss'),
                   require('autoprefixer'),
                 ]
               },
             },
           },
+          // 'sass-loader',  // no need as no sass files, and throws warnings
         ],
         exclude: /\.module\.s?(c|a)ss$/,
       },
@@ -132,10 +131,7 @@ const configuration: webpack.Configuration = {
       filename: 'style.css',
     }),
 
-    new BundleAnalyzerPlugin({
-      analyzerMode: process.env.ANALYZE === 'true' ? 'server' : 'disabled',
-      analyzerPort: 8889,
-    }),
+    ...getAnalyzerPlugins(),
 
     new HtmlWebpackPlugin({
       filename: 'index.html',

.erb/configs/webpack.custom-plugins.ts

@@ -1,55 +1,64 @@
 import { writeFile } from "botasaurus/output"
 import { exec } from 'child_process'
 import * as path from 'path'
+import * as fs from 'fs'
+
+function ensureDllDirExists(): void {
+  const dllDir = path.join(__dirname, "../dll/")
+  if (!fs.existsSync(dllDir)) {
+    fs.mkdirSync(dllDir, { recursive: true })
+  }
+}
+
+function getTempPath(): string {
+  return path.join(__dirname, "../dll/", "temp.js")
+}
+
+
 
 function runCode(contents) {
-  writeFile(contents, path.join(__dirname, "../../", "temp.js"), false)
-  // Execute temp.js using Node.js
-  exec('node temp.js', (error, stdout, stderr) => {
+  ensureDllDirExists()
+  writeFile(contents, getTempPath(), false)
+
+  exec('node ./.erb/dll/temp.js', (error, stdout, stderr) => {
     if (error) {
       console.error(`Error executing temp.js: ${error}`)
       return
     }
     if (stderr) {
       console.error(`stderr: ${stderr}`)
+      process.exit(1)
     }
   })
 }
 
-function getAssetNames(assets) {
-  const ls:any[] = []
-  for (const assetName in assets) {
-    ls.push(assetName)
-  }
-  return ls
-}
-
-export class LogContentsPlugin {
+export class GenerateApiPropsPlugin {
   apply(compiler) {
-    compiler.hooks.emit.tapAsync('LogContentsPlugin', async (compilation, callback) => {
+    compiler.hooks.emit.tapAsync('GenerateApiPropsPlugin', async (compilation, callback) => {
  const compAssets = compilation.assets
-    // console.log(getAssetNames(compAssets))
   for (const assetName in compAssets) {
-        const targetFiles = ["main.bundle.dev.js",
-          //  "main.js",
-          ]
+        const targetFiles = ["main.bundle.dev.js"]
         if (targetFiles.includes( assetName ) ){
           const asset = compAssets[assetName]
           const source:string = asset.source()
-          // make dev, and also fix resolve errors of bota server
-          let contents = source.replace("process.env.CREATE_API_CONFIG", "true")
-          // fix native modules imports
+          let contents = source.replace("main() {", "main() {(0,_utils_generate_app_props__WEBPACK_IMPORTED_MODULE_1__.generateAppProps)();return;")
+
+
+          // Fixes Input JS and README paths
+          contents = contents.replaceAll('if (isElectron) {', 'if (false) {')
+          
+          // Disable master logging
+          contents = contents.replaceAll('static async enableKubernetes({ masterEndpoint, taskTimeout = master_executor_1.DEFAULT_TASK_TIMEOUT }) {', 'static async enableKubernetes({ masterEndpoint, taskTimeout = master_executor_1.DEFAULT_TASK_TIMEOUT }) {return;')
           contents = contents.replaceAll('factory(require("', 'factory(require("./release/app/node_modules/')
-          // factory(require("
+          // Sentry FIX
+          contents = contents.replace('function __webpack_require__(moduleId) {', 'function __webpack_require__(moduleId) {if (moduleId.includes("sentry")){return {}};')
           try {
-            // console.log("Updating index.html")
             runCode(contents)
           } catch (error) {
             console.error(error)
           }
         }
       }
-      // console.log(JSON.stringify(ls))
       callback()
     })
   }