piral-cli 0.15.3 → 0.15.4-beta.5013

package/lib/common/watcher.js

@@ -1,20 +1,77 @@
 "use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.watcherTask = void 0;
+const fs_1 = require("fs");
 function watcherTask(cb) {
-    return new Promise((resolve, reject) => {
-        const disposers = [];
-        const context = {
-            onClean(dispose) {
-                disposers.push(dispose);
-            },
-            watch(file) { },
-        };
-        cb(context).then(() => {
-            resolve();
-        }, (err) => {
-            reject(err);
+    let running = Promise.resolve();
+    let pending = false;
+    let notify = () => { };
+    const disposers = [];
+    const triggers = [];
+    const end = new Promise(resolve => {
+        notify = resolve;
+    });
+    const ref = {
+        data: undefined,
+        onTrigger(cb) {
+            triggers.push(cb);
+        },
+        end,
+    };
+    const reRun = () => __awaiter(this, void 0, void 0, function* () {
+        if (!pending) {
+            pending = true;
+            yield running;
+            disposers.splice(0, disposers.length).forEach((dispose) => {
+                dispose();
+            });
+            pending = false;
+            context.status = 'reoccuring';
+            yield run();
+            triggers.splice(0, triggers.length).forEach((trigger) => {
+                trigger();
+            });
+        }
+    });
+    const context = {
+        onClean(dispose) {
+            disposers.push(dispose);
+        },
+        watch(file) {
+            if ((0, fs_1.existsSync)(file)) {
+                const watcher = (0, fs_1.watch)(file, {
+                    persistent: false,
+                }, reRun);
+                disposers.push(() => watcher.close());
+            }
+        },
+        dependOn(anotherRef) {
+            anotherRef.onTrigger(reRun);
+        },
+        close() {
+            cb = () => Promise.resolve(undefined);
+            reRun().then(notify);
+        },
+        status: 'initial',
+    };
+    const run = () => __awaiter(this, void 0, void 0, function* () {
+        running = cb(context).then((data) => {
+            ref.data = data;
         });
+        yield running;
+        return ref;
+    });
+    return new Promise((resolve, reject) => {
+        run().then(resolve, reject);
     });
 }
 exports.watcherTask = watcherTask;

package/lib/common/watcher.js.map

@@ -1 +1 @@
-{"version":3,"file":"watcher.js","sourceRoot":"","sources":["../../src/common/watcher.ts"],"names":[],"mappings":";;;AAKA,SAAgB,WAAW,CAAC,EAAqD;IAC/E,OAAO,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QAC3C,MAAM,SAAS,GAAsB,EAAE,CAAC;QACxC,MAAM,OAAO,GAAmB;YAC9B,OAAO,CAAC,OAAO;gBACb,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YAC1B,CAAC;YACD,KAAK,CAAC,IAAI,IAAG,CAAC;SACf,CAAC;QACF,EAAE,CAAC,OAAO,CAAC,CAAC,IAAI,CACd,GAAG,EAAE;YACH,OAAO,EAAE,CAAC;QACZ,CAAC,EACD,CAAC,GAAG,EAAE,EAAE;YACN,MAAM,CAAC,GAAG,CAAC,CAAC;QACd,CAAC,CACF,CAAC;IACJ,CAAC,CAAC,CAAC;AACL,CAAC;AAlBD,kCAkBC"}
+{"version":3,"file":"watcher.js","sourceRoot":"","sources":["../../src/common/watcher.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2BAAuC;AAgBvC,SAAgB,WAAW,CAAW,EAAkD;IACtF,IAAI,OAAO,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;IAChC,IAAI,OAAO,GAAG,KAAK,CAAC;IACpB,IAAI,MAAM,GAAG,GAAG,EAAE,GAAE,CAAC,CAAC;IAEtB,MAAM,SAAS,GAAsB,EAAE,CAAC;IACxC,MAAM,QAAQ,GAAsB,EAAE,CAAC;IACvC,MAAM,GAAG,GAAG,IAAI,OAAO,CAAO,OAAO,CAAC,EAAE;QACtC,MAAM,GAAG,OAAO,CAAC;IACnB,CAAC,CAAC,CAAC;IACH,MAAM,GAAG,GAAkB;QACzB,IAAI,EAAE,SAAS;QACf,SAAS,CAAC,EAAE;YACV,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QACpB,CAAC;QACD,GAAG;KACJ,CAAC;IAEF,MAAM,KAAK,GAAG,GAAS,EAAE;QACvB,IAAI,CAAC,OAAO,EAAE;YACZ,OAAO,GAAG,IAAI,CAAC;YACf,MAAM,OAAO,CAAC;YACd,SAAS,CAAC,MAAM,CAAC,CAAC,EAAE,SAAS,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;gBACxD,OAAO,EAAE,CAAC;YACZ,CAAC,CAAC,CAAC;YACH,OAAO,GAAG,KAAK,CAAC;YAChB,OAAO,CAAC,MAAM,GAAG,YAAY,CAAC;YAC9B,MAAM,GAAG,EAAE,CAAC;YAEZ,QAAQ,CAAC,MAAM,CAAC,CAAC,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;gBACtD,OAAO,EAAE,CAAC;YACZ,CAAC,CAAC,CAAC;SACJ;IACH,CAAC,CAAA,CAAC;IAEF,MAAM,OAAO,GAAmB;QAC9B,OAAO,CAAC,OAAO;YACb,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAC1B,CAAC;QACD,KAAK,CAAC,IAAI;YACR,IAAI,IAAA,eAAU,EAAC,IAAI,CAAC,EAAE;gBACpB,MAAM,OAAO,GAAG,IAAA,UAAK,EACnB,IAAI,EACJ;oBACE,UAAU,EAAE,KAAK;iBAClB,EACD,KAAK,CACN,CAAC;gBACF,SAAS,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC,CAAC;aACvC;QACH,CAAC;QACD,QAAQ,CAAC,UAAU;YACjB,UAAU,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;QAC9B,CAAC;QACD,KAAK;YACH,EAAE,GAAG,GAAG,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;YACtC,KAAK,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QACvB,CAAC;QACD,MAAM,EAAE,SAAS;KAClB,CAAC;IAEF,MAAM,GAAG,GAAG,GAAS,EAAE;QACrB,OAAO,GAAG,EAAE,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE;YAClC,GAAG,CAAC,IAAI,GAAG,IAAI,CAAC;QAClB,CAAC,CAAC,CAAC;QACH,MAAM,OAAO,CAAC;QACd,OAAO,GAAG,CAAC;IACb,CAAC,CAAA,CAAC;IAEF,OAAO,IAAI,OAAO,CAAgB,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACpD,GAAG,EAAE,CAAC,IAAI,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;IAC9B,CAAC,CAAC,CAAC;AACL,CAAC;AAxED,kCAwEC"}

package/lib/types/public.d.ts

@@ -76,6 +76,7 @@ export interface BuildPiralParameters extends BaseBundleParameters {
     emulator: boolean;
     standalone: boolean;
     sourceMaps: boolean;
+    watch: boolean;
     contentHash: boolean;
     minify: boolean;
     externals: Array<string>;
@@ -100,6 +101,7 @@ export interface DebugPiletParameters extends BaseBundleParameters {
 export interface BuildPiletParameters extends BaseBundleParameters {
     piralInstances: Array<string>;
     sourceMaps: boolean;
+    watch: boolean;
     contentHash: boolean;
     minify: boolean;
     externals: Array<string>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "piral-cli",
-  "version": "0.15.3",
+  "version": "0.15.4-beta.5013",
   "description": "The standard CLI for creating and building a Piral instance or a Pilet.",
   "keywords": [
     "portal",
@@ -80,5 +80,5 @@
     "typescript": "^4.0.0",
     "yargs": "^15.0.0"
   },
-  "gitHead": "14b0f1a34c86dd85bd66b66ebbca9c1dc5eb7f59"
+  "gitHead": "58a5f43b7d8f4ed1bf34b8cf79ac6f38de998419"
 }

package/src/apps/build-pilet.ts

@@ -112,6 +112,11 @@ export interface BuildPiletOptions {
    */
   sourceMaps?: boolean;
 
+  /**
+   * States if the build should run continuously and re-build when files change.
+   */
+  watch?: boolean;
+
   /**
    * Sets the bundler to use for building, if any specific.
    */
@@ -165,6 +170,7 @@ export const buildPiletDefaults: BuildPiletOptions = {
   type: 'default',
   fresh: false,
   sourceMaps: true,
+  watch: false,
   contentHash: true,
   optimizeModules: false,
   schemaVersion: config.schemaVersion,
@@ -180,6 +186,7 @@ export async function buildPilet(baseDir = process.cwd(), options: BuildPiletOpt
     logLevel = buildPiletDefaults.logLevel,
     minify = buildPiletDefaults.minify,
     sourceMaps = buildPiletDefaults.sourceMaps,
+    watch = buildPiletDefaults.watch,
     contentHash = buildPiletDefaults.contentHash,
     fresh = buildPiletDefaults.fresh,
     concurrency = buildPiletDefaults.concurrency,
@@ -233,6 +240,7 @@ export async function buildPilet(baseDir = process.cwd(), options: BuildPiletOpt
         piralInstances,
         optimizeModules,
         sourceMaps,
+        watch,
         contentHash,
         minify,
         externals,
@@ -313,6 +321,7 @@ export async function buildPilet(baseDir = process.cwd(), options: BuildPiletOpt
           standalone: true,
           optimizeModules: false,
           sourceMaps,
+          watch: false,
           contentHash,
           minify,
           externals: [],
@@ -338,6 +347,7 @@ export async function buildPilet(baseDir = process.cwd(), options: BuildPiletOpt
           standalone: true,
           optimizeModules: false,
           sourceMaps,
+          watch: false,
           contentHash,
           minify,
           externals: externals.map(m => m.name),

package/src/apps/build-piral.ts

@@ -69,6 +69,11 @@ export interface BuildPiralOptions {
    */
   sourceMaps?: boolean;
 
+  /**
+   * States if the build should run continuously and re-build when files change.
+   */
+  watch?: boolean;
+
   /**
    * Sets the bundler to use for building, if any specific.
    */
@@ -114,6 +119,7 @@ export const buildPiralDefaults: BuildPiralOptions = {
   type: 'all',
   subdir: true,
   sourceMaps: true,
+  watch: false,
   contentHash: true,
   optimizeModules: false,
 };
@@ -138,6 +144,7 @@ export async function buildPiral(baseDir = process.cwd(), options: BuildPiralOpt
     logLevel = buildPiralDefaults.logLevel,
     minify = buildPiralDefaults.minify,
     sourceMaps = buildPiralDefaults.sourceMaps,
+    watch = buildPiralDefaults.watch,
     contentHash = buildPiralDefaults.contentHash,
     subdir = buildPiralDefaults.subdir,
     fresh = buildPiralDefaults.fresh,
@@ -190,6 +197,7 @@ export async function buildPiral(baseDir = process.cwd(), options: BuildPiralOpt
         standalone: false,
         optimizeModules,
         sourceMaps,
+        watch,
         contentHash,
         minify: false,
         externals: externals.map(m => m.name),
@@ -261,6 +269,7 @@ export async function buildPiral(baseDir = process.cwd(), options: BuildPiralOpt
         standalone: false,
         optimizeModules,
         sourceMaps,
+        watch,
         contentHash,
         minify,
         externals: externals.map(m => m.name),

package/src/apps/debug-piral.ts

@@ -124,14 +124,16 @@ export async function debugPiral(baseDir = process.cwd(), options: DebugPiralOpt
 
   await hooks.onBegin?.({ options, fullBase });
 
-  await watcherTask(async (watcherContext) => {
-    progress('Reading configuration ...');
+  progress('Reading configuration ...');
+
+  const buildRef = await watcherTask(async (watcherContext) => {
     const entryFiles = await retrievePiralRoot(fullBase, entry);
-    const targetDir = dirname(entryFiles);
     const { externals, name, root, ignored } = await retrievePiletsInfo(entryFiles);
     const piralInstances = [name];
     const dest = getDestination(entryFiles, resolve(fullBase, target));
 
+    watcherContext.watch(join(root, 'package.json'));
+
     await checkCliCompatibility(root);
 
     await hooks.beforeBuild?.({ root, publicUrl, externals, entryFiles, piralInstances });
@@ -160,7 +162,14 @@ export async function debugPiral(baseDir = process.cwd(), options: DebugPiralOpt
     });
 
     bundler.start();
+    return { bundler, entryFiles, root };
+  });
+
+  const serverRef = await watcherTask(async (watcherContext) => {
+    watcherContext.dependOn(buildRef);
 
+    const { bundler, entryFiles, root } = buildRef.data;
+    const targetDir = dirname(entryFiles);
     const krasBaseConfig = resolve(fullBase, krasrc);
     const krasRootConfig = resolve(root, krasrc);
     const mocks = join(targetDir, 'mocks');
@@ -182,6 +191,10 @@ export async function debugPiral(baseDir = process.cwd(), options: DebugPiralOpt
         },
       },
     };
+
+    watcherContext.watch(krasBaseConfig);
+    watcherContext.watch(krasRootConfig);
+
     const krasConfig = readKrasConfig({ port, initial, required }, krasBaseConfig, krasRootConfig);
 
     log('generalVerbose_0004', `Using kras with configuration: ${JSON.stringify(krasConfig, undefined, 2)}`);
@@ -195,8 +208,11 @@ export async function debugPiral(baseDir = process.cwd(), options: DebugPiralOpt
     await krasServer.start();
     openBrowser(open, port, publicUrl, !!krasConfig.ssl);
     await hooks.afterOnline?.({ krasServer, krasConfig, open, port, publicUrl });
-    await new Promise((resolve) => krasServer.on('close', resolve));
+
+    watcherContext.onClean(() => krasServer.stop());
   });
 
+  await Promise.all([buildRef.end, serverRef.end]);
+
   await hooks.onEnd?.({});
 }

package/src/apps/publish-pilet.ts

@@ -159,6 +159,7 @@ async function getFiles(
             piralInstances,
             optimizeModules: false,
             sourceMaps: true,
+            watch: false,
             contentHash: true,
             minify: true,
             externals,

package/src/apps/run-emulator-piral.ts

@@ -117,7 +117,7 @@ always-auth=true`,
 
   const npmClient = await determineNpmClient(appRoot, defaultNpmClient);
   const [packageName] = await installPiralInstance(app, fullBase, appRoot, npmClient);
-  const piral = findPiralInstance(packageName, appRoot, originalPort);
+  const piral = await findPiralInstance(packageName, appRoot, originalPort);
   const port = await getAvailablePort(piral.port);
 
   const krasBaseConfig = resolve(fullBase, krasrc);

package/src/build/run-build-pilet.ts

@@ -7,6 +7,7 @@ function run(
   root: string,
   piralInstances: Array<string>,
   sourceMaps: boolean,
+  watch: boolean,
   contentHash: boolean,
   minify: boolean,
   externals: Array<string>,
@@ -40,7 +41,7 @@ function run(
     contentHash,
     minify,
     logLevel,
-    watch: false,
+    watch,
     args,
   });
 }
@@ -56,6 +57,7 @@ process.on('message', async (msg) => {
           process.cwd(),
           msg.piralInstances,
           msg.sourceMaps,
+          msg.watch,
           msg.contentHash,
           msg.minify,
           msg.externals,

package/src/build/run-build-piral.ts

@@ -9,6 +9,7 @@ function run(
   emulator: boolean,
   standalone: boolean,
   sourceMaps: boolean,
+  watch: boolean,
   contentHash: boolean,
   minify: boolean,
   externals: Array<string>,
@@ -42,7 +43,7 @@ function run(
     publicUrl,
     hmr: false,
     logLevel,
-    watch: false,
+    watch,
     args,
   });
 }
@@ -60,6 +61,7 @@ process.on('message', async (msg) => {
           msg.emulator,
           msg.standalone,
           msg.sourceMaps,
+          msg.watch,
           msg.contentHash,
           msg.minify,
           msg.externals,

package/src/commands.ts

@@ -142,6 +142,9 @@ const allCommands: Array<ToolCommand<any>> = [
         .boolean('source-maps')
         .describe('source-maps', 'Create associated source maps for the bundles.')
         .default('source-maps', apps.buildPiralDefaults.sourceMaps)
+        .boolean('watch')
+        .describe('watch', 'Continuously re-builds while watching the source files.')
+        .default('watch', apps.buildPiralDefaults.watch)
         .boolean('subdir')
         .describe(
           'subdir',
@@ -175,6 +178,7 @@ const allCommands: Array<ToolCommand<any>> = [
         subdir: args.subdir as boolean,
         contentHash: args['content-hash'] as boolean,
         sourceMaps: args['source-maps'] as boolean,
+        watch: args.watch as boolean,
         optimizeModules: args['optimize-modules'] as boolean,
         logLevel: args['log-level'] as LogLevels,
         type: args.type as PiralBuildType,
@@ -507,6 +511,9 @@ const allCommands: Array<ToolCommand<any>> = [
         .boolean('source-maps')
         .describe('source-maps', 'Creates source maps for the bundles.')
         .default('source-maps', apps.buildPiletDefaults.sourceMaps)
+        .boolean('watch')
+        .describe('watch', 'Continuously re-builds while watching the source files.')
+        .default('watch', apps.buildPiletDefaults.watch)
         .boolean('fresh')
         .describe('fresh', 'Performs a fresh build by removing the target directory first.')
         .default('fresh', apps.buildPiletDefaults.fresh)
@@ -547,6 +554,7 @@ const allCommands: Array<ToolCommand<any>> = [
         bundlerName: args.bundler as string,
         declaration: args.declaration as boolean,
         sourceMaps: args['source-maps'] as boolean,
+        watch: args.watch as boolean,
         optimizeModules: args['optimize-modules'] as boolean,
         type: args.type as PiletBuildType,
         fresh: args.fresh as boolean,

package/src/common/envs.ts

@@ -1,4 +1,5 @@
 import { join } from 'path';
+import { readFileSync } from 'fs';
 import { log } from './log';
 import { frameworkLibs } from './constants';
 import { pathSeparator, cliVersion, compatVersion } from './info';
@@ -11,7 +12,7 @@ function hasPath(path: string) {
 
 export function setStandardEnvs(options: StandardEnvProps) {
   log('generalDebug_0003', `Setting environment variables in "${options.root}" ...`);
-  const packageJson = require(join(options.root, 'package.json'));
+  const packageJson = JSON.parse(readFileSync(join(options.root, 'package.json'), 'utf8'));
   const binDir = join(options.root, 'node_modules', '.bin');
 
   process.env.BUILD_TIME = new Date().toDateString();

package/src/common/importmap.ts

@@ -1,4 +1,4 @@
-import { resolve, dirname, isAbsolute } from 'path';
+import { resolve, dirname, isAbsolute, basename } from 'path';
 import { log, fail } from './log';
 import { satisfies, validate } from './version';
 import { computeHash } from './hash';
@@ -16,12 +16,14 @@ function getDependencyDetails(depName: string): [assetName: string, identifier:
   return [assetName, id, version];
 }
 
-function getLocalDependencyVersion(
+async function getLocalDependencyVersion(
   packageJson: string,
   depName: string,
   versionSpec: string,
-): [offeredVersion: string, requiredVersion: string] {
-  const details = require(packageJson);
+): Promise<[offeredVersion: string, requiredVersion: string]> {
+  const packageDir = dirname(packageJson);
+  const packageFile = basename(packageJson);
+  const details = await readJson(packageDir, packageFile);
 
   if (versionSpec) {
     if (!validate(versionSpec)) {
@@ -38,24 +40,24 @@ function getLocalDependencyVersion(
   return [details.version, details.version];
 }
 
-function getInheritedDependencies(inheritedImport: string, dir: string): Promise<Array<SharedDependency>> {
+async function getInheritedDependencies(inheritedImport: string, dir: string): Promise<Array<SharedDependency>> {
   const packageJson = tryResolvePackage(`${inheritedImport}/package.json`, dir);
 
   if (packageJson) {
     const packageDir = dirname(packageJson);
-    const packageDetails = require(packageJson);
+    const packageDetails = await readJson(packageDir, 'package.json');
     return readImportmap(packageDir, packageDetails, true);
   } else {
     const directImportmap = tryResolvePackage(inheritedImport, dir);
 
     if (directImportmap) {
-      const content = require(directImportmap);
       const baseDir = dirname(directImportmap);
-      return resolveImportmap(baseDir, content);
+      const content = await readJson(baseDir, basename(directImportmap));
+      return await resolveImportmap(baseDir, content);
     }
   }
 
-  return Promise.resolve([]);
+  return [];
 }
 
 async function resolveImportmap(dir: string, importmap: Importmap): Promise<Array<SharedDependency>> {
@@ -86,7 +88,7 @@ async function resolveImportmap(dir: string, importmap: Importmap): Promise<Arra
 
         if (entry) {
           const packageJson = await findFile(dirname(entry), 'package.json');
-          const [version, requireVersion] = getLocalDependencyVersion(packageJson, depName, versionSpec);
+          const [version, requireVersion] = await getLocalDependencyVersion(packageJson, depName, versionSpec);
 
           dependencies.push({
             id: `${identifier}@${version}`,
@@ -104,7 +106,7 @@ async function resolveImportmap(dir: string, importmap: Importmap): Promise<Arra
 
         if (entry) {
           const packageJson = await findFile(dirname(entry), 'package.json');
-          const [version, requireVersion] = getLocalDependencyVersion(packageJson, depName, versionSpec);
+          const [version, requireVersion] = await getLocalDependencyVersion(packageJson, depName, versionSpec);
 
           dependencies.push({
             id: `${identifier}@${version}`,
@@ -129,7 +131,7 @@ async function resolveImportmap(dir: string, importmap: Importmap): Promise<Arra
           const packageJsonExists = await checkExists(packageJson);
 
           if (packageJsonExists) {
-            const [version, requireVersion] = getLocalDependencyVersion(packageJson, depName, versionSpec);
+            const [version, requireVersion] = await getLocalDependencyVersion(packageJson, depName, versionSpec);
 
             dependencies.push({
               id: `${identifier}@${version}`,

package/src/common/npm.test.ts

@@ -27,9 +27,23 @@ import {
 jest.mock('child_process');
 
 jest.mock('../external', () => ({
+  ...jest.requireActual('../external'),
   rc() {},
   ora() {
-    return {};
+    return {
+      succeed(msg) {
+        console.warn(msg);
+      },
+      warn(msg) {
+        console.warn(msg);
+      },
+      info(msg) {
+        console.info(msg);
+      },
+      fail(msg) {
+        console.error(msg);
+      },
+    };
   },
   getModulePath(root, moduleName) {
     return require.resolve(moduleName, {
@@ -54,9 +68,7 @@ jest.mock('./scripts', () => ({
 }));
 
 jest.mock('fs', () => ({
-  createReadStream() {
-    return undefined;
-  },
+  ...jest.requireActual('fs'),
   exists: (file: string, cb: (status: boolean) => void) =>
     cb(
       shouldFind &&
@@ -67,6 +79,12 @@ jest.mock('fs', () => ({
     return true;
   },
   readFile: (file: string, type: string, callback: (err: NodeJS.ErrnoException | undefined, data: string) => void) => {
+    const fs = jest.requireActual('fs');
+
+    if (fs.existsSync(file)) {
+      return fs.readFile(file, type, callback);
+    }
+
     return callback(undefined, '');
   },
   realpathSync: () => ({}),
@@ -384,11 +402,12 @@ describe('npm Module', () => {
   });
 
   it('verify whether package is linked', () => {
-    let result = isLinkedPackage('foo', 'registry', false);
+    const target = process.cwd();
+    let result = isLinkedPackage('foo', 'registry', false, target);
     expect(result).toBeFalsy();
-    result = isLinkedPackage('foo', 'file', false);
+    result = isLinkedPackage('foo', 'file', false, target);
     expect(result).toBeFalsy();
-    result = isLinkedPackage('foo', 'git', false);
+    result = isLinkedPackage('foo', 'git', false, target);
     expect(result).toBeFalsy();
   });
 
@@ -403,16 +422,16 @@ describe('npm Module', () => {
     expect(result).toBe('foo');
   });
 
-  it('retrieve package name', () => {
+  it('retrieve package name', async () => {
     let result = getPackageName('./', 'foo', 'file');
     expect(result).toBeInstanceOf(Promise);
-    result.then((message) => expect(message).toBeUndefined());
+    await result.then((message) => expect(message).toBeUndefined());
     result = getPackageName('./', 'foo', 'git');
     expect(result).toBeInstanceOf(Promise);
-    result.then((message) => expect(message).toBeUndefined());
+    await result.then((message) => expect(message).toBeUndefined());
     result = getPackageName('./', 'foo', 'registry');
     expect(result).toBeInstanceOf(Promise);
-    result.then((name) => expect(name).toEqual('foo'));
+    await result.then((name) => expect(name).toEqual('foo'));
   });
 
   it('gets path to file package', () => {
@@ -436,39 +455,39 @@ describe('npm Module', () => {
     expect(result).toEqual('git+https://.foo.git');
   });
 
-  it('gets path to git package', () => {
+  it('gets path to git package', async () => {
     const result = getCurrentPackageDetails('./', './foo.tgz', '', 'file://foo.tgz', './');
-    result.then(([path, version]) => {
+    await result.then(([path, version]) => {
       expect(path).not.toBeUndefined();
     });
     const result2 = getCurrentPackageDetails('./', './foo.tgz', '', 'git+https://.foo.git', './');
-    result2.then(([path, version]) => {
+    await result2.then(([path, version]) => {
       expect(path).not.toBeUndefined();
     });
     const result3 = getCurrentPackageDetails('./', './foo.tgz', '1.0.0', 'latest', './');
-    result3.then(([path, version]) => {
+    await result3.then(([path, version]) => {
       expect(path).toEqual('./foo.tgz@latest');
       expect(version).toEqual('latest');
     });
   });
 
-  it('makeExternals without externals returns coreExternals', () => {
-    const externals = makeExternals(process.cwd(), { piral: '*' });
+  it('makeExternals without externals returns coreExternals', async () => {
+    const externals = await makeExternals(process.cwd(), { piral: '*' }, []);
     expect(externals).toEqual(['react', 'react-dom', 'react-router', 'react-router-dom', 'tslib']);
   });
 
-  it('makeExternals with no externals returns coreExternals', () => {
-    const externals = makeExternals(process.cwd(), { piral: '*' }, []);
+  it('makeExternals with no externals returns coreExternals', async () => {
+    const externals = await makeExternals(process.cwd(), { piral: '*' }, []);
     expect(externals).toEqual(['react', 'react-dom', 'react-router', 'react-router-dom', 'tslib']);
   });
 
-  it('makeExternals with exclude coreExternals returns empty set', () => {
-    const externals = makeExternals(process.cwd(), { piral: '*' }, ['!*']);
+  it('makeExternals with exclude coreExternals returns empty set', async () => {
+    const externals = await makeExternals(process.cwd(), { piral: '*' }, ['!*']);
     expect(externals).toEqual([]);
   });
 
-  it('makeExternals with externals concats coreExternals', () => {
-    const externals = makeExternals(process.cwd(), { piral: '*' }, ['foo', 'bar']);
+  it('makeExternals with externals concats coreExternals', async () => {
+    const externals = await makeExternals(process.cwd(), { piral: '*' }, ['foo', 'bar']);
     expect(externals).toEqual([
       'foo',
       'bar',
@@ -480,18 +499,18 @@ describe('npm Module', () => {
     ]);
   });
 
-  it('makeExternals with external duplicate only reflects coreExternals', () => {
-    const externals = makeExternals(process.cwd(), { piral: '*' }, ['react', 'foo']);
+  it('makeExternals with external duplicate only reflects coreExternals', async () => {
+    const externals = await makeExternals(process.cwd(), { piral: '*' }, ['react', 'foo']);
     expect(externals).toEqual(['react', 'foo', 'react-dom', 'react-router', 'react-router-dom', 'tslib']);
   });
 
-  it('makeExternals with explicit include and exclude', () => {
-    const externals = makeExternals(process.cwd(), { piral: '*' }, ['react', 'react-calendar', '!tslib']);
+  it('makeExternals with explicit include and exclude', async () => {
+    const externals = await makeExternals(process.cwd(), { piral: '*' }, ['react', 'react-calendar', '!tslib']);
     expect(externals).toEqual(['react', 'react-calendar', 'react-dom', 'react-router', 'react-router-dom']);
   });
 
-  it('makeExternals with all exclude and explicit include', () => {
-    const externals = makeExternals(process.cwd(), { piral: '*' }, ['react', 'react-router-dom', '!*']);
+  it('makeExternals with all exclude and explicit include', async () => {
+    const externals = await makeExternals(process.cwd(), { piral: '*' }, ['react', 'react-router-dom', '!*']);
     expect(externals).toEqual(['react', 'react-router-dom']);
   });
 });