fix: packager returns promise instead of observable #135

bennymeg · Jan 27, 2022 · 753997a · 753997a
1 parent 5beb469
commit 753997a
Show file tree

Hide file tree

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

diff --git a/packages/nx-electron/src/executors/package/executor.compat.ts b/packages/nx-electron/src/executors/package/executor.compat.ts
@@ -1,12 +1,5 @@
-import { convertNxExecutor, ExecutorContext } from '@nrwl/devkit';
+import { convertNxExecutor } from '@nrwl/devkit';
 
 import executor from './executor';
 
-function executorAdapter(options: any, context: ExecutorContext): 
-    Promise<{ success: boolean; }> | AsyncIterableIterator<{ success: boolean; }> {
-        return executor(options, context).toPromise()
-            .then<any>(output => { success: output.success })
-            .catch(error => { success: false });
-}
-
-export default convertNxExecutor(executorAdapter);
+export default convertNxExecutor(executor);
diff --git a/packages/nx-electron/src/executors/package/executor.ts b/packages/nx-electron/src/executors/package/executor.ts
@@ -38,42 +38,36 @@ export interface PackageElectronBuilderOutput {
   outputPath: string | string[];
 }
 
-export function executor(rawOptions: PackageElectronBuilderOptions, context: ExecutorContext): Observable<PackageElectronBuilderOutput> { 
-  return from(of(getSourceRoot(context))).pipe(
-    tap(_ => {
-      logger.warn(stripIndents`
-        *********************************************************
-        DO NOT FORGET TO REBUILD YOUR FRONTEND & BACKEND PROJECTS
-        FOR PRODUCTION BEFORE PACKAGING / MAKING YOUR ARTIFACT!
-        *********************************************************`);
-    }),
-    map(({ sourceRoot, projectRoot }) =>
-      normalizePackagingOptions(rawOptions, context.root, sourceRoot)
-    ),
-    map(options => 
-      mergePresetOptions(options)
-    ),
-    map(options => 
-      addMissingDefaultOptions(options)
-    ),
-    concatMap(async (options) => {
-      await beforeBuild(options.root, options.sourcePath, options.name);
-
-      const platforms: Platform[] = _createPlatforms(options.platform);
-      const targets: Map<Platform, Map<Arch, string[]>> = _createTargets(platforms, null, options.arch);
-      const baseConfig: Configuration = _createBaseConfig(options, context);
-      const config: Configuration = _createConfigFromOptions(options, baseConfig);
-      const normalizedOptions: CliOptions = _normalizeBuilderOptions(targets, config, rawOptions);
-      const outputPath = await build(normalizedOptions);
-
-      return { success: true, outputPath };
-    }),
-    catchError(error => {
-      console.error(error);
-
-      return of({ success: false, outputPath: null });
-    })
-  );
+export async function executor(rawOptions: PackageElectronBuilderOptions, context: ExecutorContext): Promise<{ success: boolean; }> { 
+  logger.warn(stripIndents`
+  *********************************************************
+  DO NOT FORGET TO REBUILD YOUR FRONTEND & BACKEND PROJECTS
+  FOR PRODUCTION BEFORE PACKAGING / MAKING YOUR ARTIFACT!
+  *********************************************************`);
+  let success: boolean = false;
+
+  try {
+    const { sourceRoot, projectRoot } = getSourceRoot(context);
+
+    let options = normalizePackagingOptions(rawOptions, context.root, sourceRoot);
+    options = mergePresetOptions(options);
+    options = addMissingDefaultOptions(options);
+
+    const platforms: Platform[] = _createPlatforms(options.platform);
+    const targets: Map<Platform, Map<Arch, string[]>> = _createTargets(platforms, null, options.arch);
+    const baseConfig: Configuration = _createBaseConfig(options, context);
+    const config: Configuration = _createConfigFromOptions(options, baseConfig);
+    const normalizedOptions: CliOptions = _normalizeBuilderOptions(targets, config, rawOptions);
+
+    await beforeBuild(options.root, options.sourcePath, options.name);
+    await build(normalizedOptions);
+
+    success = true;
+  } catch (error) {
+    logger.error(error);
+  }
+
+  return { success };
 }
 
 async function beforeBuild(projectRoot: string, sourcePath: string, appName: string) {

diff --git a/packages/nx-electron/src/utils/versions.ts b/packages/nx-electron/src/utils/versions.ts
@@ -1,5 +1,5 @@
 export const nxVersion = '^12.10.0';
-export const nxElectronVersion = '^12.0.0-beta.3';
+export const nxElectronVersion = '^12.0.0-beta.4';
 export const electronVersion = '^16.0.2';
 export const electronBuilderVersion = '^22.14.5';
 export const rimrafVersion = '^3.0.2';