publish-microfrontend 0.15.6-beta.5105 → 0.15.6-beta.5109

package/README.md

@@ -26,6 +26,25 @@ No API key is necessary. Depending on your feed server you might want to use int
 npx publish-microfrontend --url <feed-url> --interactive
 ```
 
+## Config Options
+
+For the `.microfrontendrc` file the following options exist:
+
+- `url`: The URL of the feed service to use.
+- `apiKey`: The API key to use when authenticating.
+- `interactive`: Determines if the interactive login should be used to retrieve the authentication token / API key. Defaults to *false*.
+- `cert`: The path to the custom certificate to use as CA.
+- `mode`: The auth mode to use (can be 'none', 'basic', 'bearer', 'digest'). Defaults to *basic*.
+- `from`: Describes the source location (can be 'local', 'remote', 'npm'). Defaults to *local*.
+- `fields`: An object using key-value pairs to place additionally in the request's body.
+- `headers`: An object using key-value pairs to place additionally in the request's header.
+
+The config options can all be overriden by the CLI flags. They serve as the default values for the CLI flags.
+
+## CLI Flags
+
+The CLI flags are a superset of the shown config options.
+
 ## License
 
 Piral is released using the MIT license. For more information see the [license file](./LICENSE).

package/lib/index.js

@@ -14642,7 +14642,7 @@ var require_utils2 = __commonJS({
     function isDate(val) {
       return toString.call(val) === "[object Date]";
     }
-    function isFile(val) {
+    function isFile2(val) {
       return toString.call(val) === "[object File]";
     }
     function isBlob(val) {
@@ -14731,7 +14731,7 @@ var require_utils2 = __commonJS({
       isPlainObject,
       isUndefined,
       isDate,
-      isFile,
+      isFile: isFile2,
       isBlob,
       isFunction,
       isStream,
@@ -27070,6 +27070,7 @@ function fail(message, ...args2) {
 
 // src/utils.ts
 var import_glob = __toModule(require_glob());
+var import_fs2 = __toModule(require("fs"));
 var import_promises = __toModule(require("fs/promises"));
 var import_path3 = __toModule(require("path"));
 
@@ -27094,9 +27095,6 @@ var MemoryStream = class extends import_stream.Writable {
 var import_axios2 = __toModule(require_axios2());
 var import_form_data = __toModule(require_form_data());
 var import_https = __toModule(require("https"));
-var import_fs = __toModule(require("fs"));
-var import_os2 = __toModule(require("os"));
-var import_path = __toModule(require("path"));
 
 // src/common.ts
 var import_os = __toModule(require("os"));
@@ -27167,6 +27165,23 @@ function getTokenInteractively(url, httpsAgent) {
   return tokenRetrievers[url];
 }
 
+// src/io.ts
+var import_os2 = __toModule(require("os"));
+var import_path = __toModule(require("path"));
+var import_fs = __toModule(require("fs"));
+function streamToFile(source, target) {
+  const dest = (0, import_fs.createWriteStream)(target);
+  return new Promise((resolve3, reject) => {
+    source.pipe(dest);
+    source.on("error", (err) => reject(err));
+    dest.on("finish", () => resolve3([target]));
+  });
+}
+function getRandomTempFile() {
+  const rid = Math.random().toString(36).split(".").pop();
+  return (0, import_path.join)((0, import_os2.tmpdir)(), `microfrontend_${rid}.tgz`);
+}
+
 // src/http.ts
 function getMessage(body) {
   if (typeof body === "string") {
@@ -27185,14 +27200,6 @@ function getMessage(body) {
   }
   return "";
 }
-function streamToFile(source, target) {
-  const dest = (0, import_fs.createWriteStream)(target);
-  return new Promise((resolve3, reject) => {
-    source.pipe(dest);
-    source.on("error", (err) => reject(err));
-    dest.on("finish", () => resolve3([target]));
-  });
-}
 function downloadFile(url, ca) {
   return __async(this, null, function* () {
     const httpsAgent = ca ? new import_https.Agent({ ca }) : void 0;
@@ -27202,8 +27209,7 @@ function downloadFile(url, ca) {
         headers: standardHeaders,
         httpsAgent
       });
-      const rid = Math.random().toString(36).split(".").pop();
-      const target = (0, import_path.join)((0, import_os2.tmpdir)(), `microfrontend_${rid}.tgz`);
+      const target = getRandomTempFile();
       return streamToFile(res.data, target);
     } catch (error) {
       logWarn("Failed HTTP GET requested: %s", error.message);
@@ -27368,19 +27374,22 @@ function findTarball(packageRef, target = ".", ...flags) {
     return ms.value;
   });
 }
-function getCa(cert) {
+function createPackage(target = ".", ...flags) {
   return __async(this, null, function* () {
-    if (cert && typeof cert === "string") {
-      const statCert = yield (0, import_promises.stat)(cert).catch(() => void 0);
-      if (statCert == null ? void 0 : statCert.isFile()) {
-        const dir = (0, import_path3.dirname)(cert);
-        const file = (0, import_path3.basename)(cert);
-        return yield (0, import_promises.readFile)((0, import_path3.resolve)(dir, file));
-      }
-    }
-    return void 0;
+    const ms = new MemoryStream();
+    yield runNpmProcess(["pack", ...flags], target, ms);
+    return ms.value;
   });
 }
+function onlyUnique(value, index, self) {
+  return self.indexOf(value) === index;
+}
+function isFile(item) {
+  return (0, import_fs2.statSync)(item).isFile();
+}
+function isDirectory(item) {
+  return (0, import_fs2.statSync)(item).isDirectory();
+}
 function matchFiles(baseDir, pattern) {
   return new Promise((resolve3, reject) => {
     (0, import_glob.default)(pattern, {
@@ -27396,12 +27405,40 @@ function matchFiles(baseDir, pattern) {
     });
   });
 }
+function getCa(cert) {
+  return __async(this, null, function* () {
+    if (cert && typeof cert === "string") {
+      const statCert = yield (0, import_promises.stat)(cert).catch(() => void 0);
+      if (statCert == null ? void 0 : statCert.isFile()) {
+        const dir = (0, import_path3.dirname)(cert);
+        const file = (0, import_path3.basename)(cert);
+        return yield (0, import_promises.readFile)((0, import_path3.resolve)(dir, file));
+      }
+    }
+    return void 0;
+  });
+}
 function getFiles(baseDir, sources, from, ca) {
   return __async(this, null, function* () {
     switch (from) {
       case "local": {
         const allFiles = yield Promise.all(sources.map((s) => matchFiles(baseDir, s)));
-        return allFiles.reduce((result, files) => [...result, ...files], []);
+        const allMatches = allFiles.reduce((result, files) => [...result, ...files], []).filter(onlyUnique);
+        if (allMatches.every(isDirectory)) {
+          const dirs = allMatches.filter((m) => (0, import_fs2.existsSync)((0, import_path3.resolve)(m, "package.json")));
+          return Promise.all(dirs.map((dir) => __async(this, null, function* () {
+            const previousFiles = yield (0, import_promises.readdir)(dir);
+            yield createPackage(dir);
+            const currentFiles = yield (0, import_promises.readdir)(dir);
+            const tarball = currentFiles.find((m) => !previousFiles.includes(m) && m.endsWith(".tgz"));
+            const target = getRandomTempFile();
+            const source = (0, import_path3.resolve)(dir, tarball);
+            yield (0, import_promises.copyFile)(source, target);
+            yield (0, import_promises.rm)(source);
+            return target;
+          })));
+        }
+        return allMatches.filter(isFile);
       }
       case "remote": {
         const allFiles = yield Promise.all(sources.map((s) => downloadFile(s, ca)));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "publish-microfrontend",
-  "version": "0.15.6-beta.5105",
+  "version": "0.15.6-beta.5109",
   "description": "A CLI for publishing micro frontends to a feed service.",
   "keywords": [
     "modules",
@@ -15,7 +15,7 @@
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "engines": {
-    "node": ">=12.0"
+    "node": ">=14.0"
   },
   "files": [
     "lib",
@@ -46,7 +46,7 @@
     "@types/inquirer": "^6.0.0",
     "@types/jju": "^1.4.2",
     "@types/mime": "^2.0.0",
-    "@types/node": "^12.7.2",
+    "@types/node": "^14.0.0",
     "@types/rc": "^1.1.0",
     "@types/rimraf": "^2.0.2",
     "@types/tar": "^4.0.0",
@@ -69,5 +69,5 @@
     "typescript": "^4.0.0",
     "yargs": "^15.0.0"
   },
-  "gitHead": "fe9f4af00df8a9281ba22e253e4ace0171160768"
+  "gitHead": "e944c2737f6ede8187b599509961f2314d2534c3"
 }

package/src/http.ts

@@ -2,12 +2,10 @@ import axios from 'axios';
 import FormData from 'form-data';
 import { Agent } from 'https';
 import { Stream } from 'stream';
-import { createWriteStream } from 'fs';
-import { tmpdir } from 'os';
-import { join } from 'path';
 import { logWarn } from './log';
 import { standardHeaders } from './common';
 import { getTokenInteractively } from './interactive';
+import { getRandomTempFile, streamToFile } from './io';
 
 function getMessage(body: string | { message?: string }) {
   if (typeof body === 'string') {
@@ -36,14 +34,6 @@ export interface PostFormResult {
 
 export type FormDataObj = Record<string, string | [Buffer, string]>;
 
-function streamToFile(source: Stream, target: string) {
-  const dest = createWriteStream(target);
-  return new Promise<Array<string>>((resolve, reject) => {
-    source.pipe(dest);
-    source.on('error', (err) => reject(err));
-    dest.on('finish', () => resolve([target]));
-  });
-}
 
 export async function downloadFile(url: string, ca?: Buffer): Promise<Array<string>> {
   const httpsAgent = ca ? new Agent({ ca }) : undefined;
@@ -54,8 +44,7 @@ export async function downloadFile(url: string, ca?: Buffer): Promise<Array<stri
       headers: standardHeaders,
       httpsAgent,
     });
-    const rid = Math.random().toString(36).split('.').pop();
-    const target = join(tmpdir(), `microfrontend_${rid}.tgz`);
+    const target = getRandomTempFile();
     return streamToFile(res.data, target);
   } catch (error) {
     logWarn('Failed HTTP GET requested: %s', error.message);

package/src/io.ts

@@ -0,0 +1,18 @@
+import { tmpdir } from 'os';
+import { join } from 'path';
+import { Stream } from 'stream';
+import { createWriteStream } from 'fs';
+
+export function streamToFile(source: Stream, target: string) {
+  const dest = createWriteStream(target);
+  return new Promise<Array<string>>((resolve, reject) => {
+    source.pipe(dest);
+    source.on('error', (err) => reject(err));
+    dest.on('finish', () => resolve([target]));
+  });
+}
+
+export function getRandomTempFile() {
+  const rid = Math.random().toString(36).split('.').pop();
+  return join(tmpdir(), `microfrontend_${rid}.tgz`);
+}

package/src/utils.ts

@@ -1,36 +1,42 @@
 import glob from 'glob';
-import { stat, readFile } from 'fs/promises';
+import { existsSync, statSync } from 'fs';
+import { stat, readFile, readdir, copyFile, rm } from 'fs/promises';
 import { dirname, basename, resolve } from 'path';
 import { MemoryStream } from 'piral-cli/src/common/MemoryStream';
 import { downloadFile } from './http';
 import { runCommand } from './scripts';
+import { getRandomTempFile } from './io';
 
 function runNpmProcess(args: Array<string>, target: string, output?: NodeJS.WritableStream) {
-    const cwd = resolve(process.cwd(), target);
-    return runCommand('npm', args, cwd, output);
-  }
+  const cwd = resolve(process.cwd(), target);
+  return runCommand('npm', args, cwd, output);
+}
 
 async function findTarball(packageRef: string, target = '.', ...flags: Array<string>) {
-    const ms = new MemoryStream();
-    await runNpmProcess(['view', packageRef, 'dist.tarball', ...flags], target, ms);
-    return ms.value;
-  }
+  const ms = new MemoryStream();
+  await runNpmProcess(['view', packageRef, 'dist.tarball', ...flags], target, ms);
+  return ms.value;
+}
 
-export async function getCa(cert: string | undefined): Promise<Buffer | undefined> {
-  if (cert && typeof cert === 'string') {
-    const statCert = await stat(cert).catch(() => undefined);
+async function createPackage(target = '.', ...flags: Array<string>) {
+  const ms = new MemoryStream();
+  await runNpmProcess(['pack', ...flags], target, ms);
+  return ms.value;
+}
 
-    if (statCert?.isFile()) {
-      const dir = dirname(cert);
-      const file = basename(cert);
-      return await readFile(resolve(dir, file));
-    }
-  }
+function onlyUnique<T>(value: T, index: number, self: Array<T>) {
+  return self.indexOf(value) === index;
+}
 
-  return undefined;
+function isFile(item: string) {
+  return statSync(item).isFile();
+}
+
+function isDirectory(item: string) {
+  return statSync(item).isDirectory();
 }
 
-export function matchFiles(baseDir: string, pattern: string) {
+function matchFiles(baseDir: string, pattern: string) {
   return new Promise<Array<string>>((resolve, reject) => {
     glob(
       pattern,
@@ -50,16 +56,47 @@ export function matchFiles(baseDir: string, pattern: string) {
   });
 }
 
-export async function getFiles(baseDir: string, sources: Array<string>, from: string, ca: Buffer): Promise<Array<string>> {
+export async function getCa(cert: string | undefined): Promise<Buffer | undefined> {
+  if (cert && typeof cert === 'string') {
+    const statCert = await stat(cert).catch(() => undefined);
+
+    if (statCert?.isFile()) {
+      const dir = dirname(cert);
+      const file = basename(cert);
+      return await readFile(resolve(dir, file));
+    }
+  }
+
+  return undefined;
+}
+
+export async function getFiles(
+  baseDir: string,
+  sources: Array<string>,
+  from: string,
+  ca: Buffer,
+): Promise<Array<string>> {
   switch (from) {
     case 'local': {
       const allFiles = await Promise.all(sources.map((s) => matchFiles(baseDir, s)));
-      // TODO:
-      // - Reduced files should be unique.
-      // - can be a mix of directories and files - if files are matched take those, otherwise take directories
-      // - for all matched directories look up if a `package.json` exists - if yes, run "npm pack" and replace the directory by the created npm package
-      // Finally return these files (created npm packages should be taken from a tmp directory, following the download approach below)
-      return allFiles.reduce((result, files) => [...result, ...files], []);
+      const allMatches = allFiles.reduce((result, files) => [...result, ...files], []).filter(onlyUnique);
+
+      if (allMatches.every(isDirectory)) {
+        const dirs = allMatches.filter(m => existsSync(resolve(m, 'package.json')));        
+        return Promise.all(dirs.map(async dir => {
+          const previousFiles = await readdir(dir);
+          await createPackage(dir);
+          const currentFiles = await readdir(dir);
+          const tarball = currentFiles.find(m => !previousFiles.includes(m) && m.endsWith('.tgz'));
+          const target = getRandomTempFile();
+          const source = resolve(dir, tarball);
+          await copyFile(source, target);
+          await rm(source);
+          return target;
+        }));
+      }
+
+      return allMatches.filter(isFile);
     }
     case 'remote': {
       const allFiles = await Promise.all(sources.map((s) => downloadFile(s, ca)));