feat: added multiple preload scripts support #155

bennymeg · Apr 20, 2022 · 1adc422 · 1adc422
1 parent 8958f32
commit 1adc422
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 5 deletions.
diff --git a/packages/nx-electron/package.json b/packages/nx-electron/package.json
@@ -1,6 +1,6 @@
 {
  "name": "nx-electron",
- "version": "13.0.0-alpha.2",
+ "version": "13.0.0-alpha.3",
  "main": "src/index.js",
  "description": "Electron Plugin for Nx",
  "author": "Benny Megidish",

diff --git a/packages/nx-electron/src/executors/build/executor.ts b/packages/nx-electron/src/executors/build/executor.ts
@@ -1,6 +1,7 @@
 import { join, resolve } from 'path';
 import { map, tap } from 'rxjs/operators';
 import { eachValueFrom } from 'rxjs-for-await';
+import { readdirSync } from 'fs';
 
 import { ExecutorContext } from '@nrwl/devkit';
 import { runWebpack } from '../../utils/run-webpack';
@@ -64,8 +65,15 @@ export function executor(rawOptions: BuildElectronBuilderOptions, context: Execu
  configuration: context.configurationName,
  });
  }
- config.entry['preload'] = join(normalizedOptions.sourceRoot, 'app/api/preload.ts');
 
+ try {
+ const preloadFilesDirectory = join(normalizedOptions.sourceRoot, 'app/api');
+ readdirSync(preloadFilesDirectory, { withFileTypes: true })
+ .filter(entry => entry.isFile() && entry.name.match(/(.+[.])?preload.ts/))
+ .forEach(entry => config.entry[entry.name] = join(preloadFilesDirectory, entry.name));
+ } catch (error) {
+ console.warn('Failed to load preload scripts');
+ }
 
  return eachValueFrom(
  runWebpack(config).pipe(

diff --git a/packages/nx-electron/src/executors/package/executor.ts b/packages/nx-electron/src/executors/package/executor.ts
@@ -129,7 +129,7 @@ function _createBaseConfig(options: PackageElectronBuilderOptions, context: Exec
  {
  from: resolve(options.sourcePath, options.name),
  to: options.name,
- filter: ['main.js', 'preload.js', 'assets']
+ filter: ['main.js', '?(*.)preload.js', 'assets']
  },
  {
  from: resolve(options.sourcePath, options.name),

diff --git a/.../files/app/src/app/api/preload.ts__tmpl__ → ...s/app/src/app/api/main.preload.ts__tmpl__ b/.../files/app/src/app/api/preload.ts__tmpl__ → ...s/app/src/app/api/main.preload.ts__tmpl__
diff --git a/packages/nx-electron/src/generators/nx-electron/files/app/src/app/app.ts__tmpl__ b/packages/nx-electron/src/generators/nx-electron/files/app/src/app/app.ts__tmpl__
@@ -64,7 +64,7 @@ export default class App {
  App.mainWindow = new BrowserWindow({ width: width, height: height, show: false, webPreferences: {
  contextIsolation: true,
  backgroundThrottling: false,
- preload: join(__dirname, 'preload.js')
+ preload: join(__dirname, 'main.preload.js')
  }
  });
  App.mainWindow.setMenu(null);

diff --git a/packages/nx-electron/src/utils/config.ts b/packages/nx-electron/src/utils/config.ts
@@ -29,8 +29,8 @@ export function getBaseWebpackPartial(options: BuildBuilderOptions): Configurati
  const webpackConfig: Configuration = {
  entry: {
  main: [options.main],
- // preload: [options.main.replace(/([.][a-z]+)$/, ".preload$1")],
  ...additionalEntryPoints,
+ // preload entries will be included dynamically
  },
  devtool: options.sourceMap ? 'source-map' : false,
  mode: options.optimization ? 'production' : 'development',