refactor(@ngtools/webpack): remove direct rxjs dependency

Author: clydin

packages/ngtools/webpack/BUILD.bazel

@@ -42,7 +42,6 @@ ts_library(
         "@npm//@types/webpack",
         "@npm//@types/webpack-sources",
         "@npm//enhanced-resolve",
-        "@npm//rxjs",
         "@npm//typescript",
         "@npm//webpack",
         "@npm//webpack-sources",

packages/ngtools/webpack/package.json

@@ -23,7 +23,6 @@
   "dependencies": {
     "@angular-devkit/core": "0.0.0",
     "enhanced-resolve": "4.3.0",
-    "rxjs": "6.6.2",
     "webpack-sources": "1.4.3"
   },
   "peerDependencies": {

packages/ngtools/webpack/src/angular_compiler_plugin.ts

@@ -80,7 +80,7 @@ import {
   NodeWatchFileSystemInterface,
   NormalModuleFactoryRequest,
 } from './webpack';
-import { WebpackInputHost } from './webpack-input-host';
+import { createWebpackInputHost } from './webpack-input-host';
 
 export class AngularCompilerPlugin {
   private _options: AngularCompilerPluginOptions;
@@ -741,7 +741,7 @@ export class AngularCompilerPlugin {
         watchFileSystem: NodeWatchFileSystemInterface,
       };
 
-      let host: virtualFs.Host<fs.Stats> = this._options.host || new WebpackInputHost(
+      let host: virtualFs.Host<fs.Stats> = this._options.host || createWebpackInputHost(
         compilerWithFileSystems.inputFileSystem,
       );
 

packages/ngtools/webpack/src/webpack-input-host.ts

@@ -5,92 +5,61 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-import { Path, PathFragment, fragment, getSystemPath, virtualFs } from '@angular-devkit/core';
+import { PathFragment, fragment, getSystemPath, virtualFs } from '@angular-devkit/core';
 import { Stats } from 'fs';
-import { Observable, throwError } from 'rxjs';
-import { map } from 'rxjs/operators';
 import { InputFileSystem } from 'webpack';
 
 // Host is used instead of ReadonlyHost due to most decorators only supporting Hosts
-export class WebpackInputHost implements virtualFs.Host<Stats> {
+export function createWebpackInputHost(inputFileSystem: InputFileSystem) {
+  return virtualFs.createSyncHost<Stats>({
+    write() {
+      throw new Error('Not supported.');
+    },
 
-  constructor(public readonly inputFileSystem: InputFileSystem) { }
+    delete() {
+      throw new Error('Not supported.');
+    },
 
-  get capabilities(): virtualFs.HostCapabilities {
-    return { synchronous: true };
-  }
+    rename() {
+      throw new Error('Not supported.');
+    },
 
-  write(_path: Path, _content: virtualFs.FileBufferLike) {
-    return throwError(new Error('Not supported.'));
-  }
+    read(path): virtualFs.FileBuffer {
+      const data = inputFileSystem.readFileSync(getSystemPath(path));
 
-  delete(_path: Path) {
-    return throwError(new Error('Not supported.'));
-  }
+      return new Uint8Array(data).buffer as ArrayBuffer;
+    },
 
-  rename(_from: Path, _to: Path) {
-    return throwError(new Error('Not supported.'));
-  }
+    list(path): PathFragment[] {
+      // readdirSync exists but is not in the Webpack typings
+      const names: string[] = ((inputFileSystem as unknown) as {
+        readdirSync: (path: string) => string[];
+      }).readdirSync(getSystemPath(path));
 
-  read(path: Path): Observable<virtualFs.FileBuffer> {
-    return new Observable(obs => {
-      // TODO: remove this try+catch when issue https://github.com/ReactiveX/rxjs/issues/3740 is
-      // fixed.
-      try {
-        const data = this.inputFileSystem.readFileSync(getSystemPath(path));
-        obs.next(new Uint8Array(data).buffer as ArrayBuffer);
-        obs.complete();
-      } catch (e) {
-        obs.error(e);
-      }
-    });
-  }
+      return names.map((name) => fragment(name));
+    },
 
-  list(path: Path): Observable<PathFragment[]> {
-    return new Observable(obs => {
-      // TODO: remove this try+catch when issue https://github.com/ReactiveX/rxjs/issues/3740 is
-      // fixed.
-      try {
-        // tslint:disable-next-line:no-any
-        const names: string[] = (this.inputFileSystem as any).readdirSync(getSystemPath(path));
-        obs.next(names.map(name => fragment(name)));
-        obs.complete();
-      } catch (err) {
-        obs.error(err);
-      }
-    });
-  }
-
-  exists(path: Path): Observable<boolean> {
-    return this.stat(path).pipe(map(stats => stats != null));
-  }
+    exists(path): boolean {
+      return !!this.stat(path);
+    },
 
-  isDirectory(path: Path): Observable<boolean> {
-    return this.stat(path).pipe(map(stats => stats != null && stats.isDirectory()));
-  }
+    isDirectory(path): boolean {
+      return this.stat(path)?.isDirectory() ?? false;
+    },
 
-  isFile(path: Path): Observable<boolean> {
-    return this.stat(path).pipe(map(stats => stats != null && stats.isFile()));
-  }
+    isFile(path): boolean {
+      return this.stat(path)?.isFile() ?? false;
+    },
 
-  stat(path: Path): Observable<Stats | null> {
-    return new Observable(obs => {
+    stat(path): Stats | null {
       try {
-        const stats = this.inputFileSystem.statSync(getSystemPath(path));
-        obs.next(stats);
-        obs.complete();
+        return inputFileSystem.statSync(getSystemPath(path));
       } catch (e) {
         if (e.code === 'ENOENT') {
-          obs.next(null);
-          obs.complete();
-        } else {
-          obs.error(e);
+          return null;
         }
+        throw e;
       }
-    });
-  }
-
-  watch(_path: Path, _options?: virtualFs.HostWatchOptions): null {
-    return null;
-  }
+    },
+  });
 }