publish-microfrontend 0.15.9-beta.5387 → 0.15.9-beta.5415

package/lib/index.js

@@ -26580,6 +26580,7 @@ var bundlerNames = [
   "parcel",
   "parcel2",
   "rollup",
+  "rspack",
   "webpack",
   "webpack5",
   "vite",
@@ -27385,9 +27386,15 @@ function onlyUnique(value, index, self) {
   return self.indexOf(value) === index;
 }
 function isFile(item) {
+  if (!item || typeof item !== "string") {
+    return false;
+  }
   return (0, import_fs2.statSync)(item).isFile();
 }
 function isDirectory(item) {
+  if (!item || typeof item !== "string") {
+    return false;
+  }
   return (0, import_fs2.statSync)(item).isDirectory();
 }
 function matchFiles(baseDir, pattern) {
@@ -27426,17 +27433,29 @@ function getFiles(baseDir, sources, from, ca) {
         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;
+          const createdFiles = yield Promise.all(dirs.map((dir) => __async(this, null, function* () {
+            const packagePath = (0, import_path3.resolve)(dir, "package.json");
+            const packageContent = yield (0, import_promises.readFile)(packagePath, "utf8");
+            try {
+              const { name, version } = JSON.parse(packageContent);
+              const proposedName = `${name.replace("@", "").replace("/", "-")}-${version}.tgz`;
+              const previousFiles = yield (0, import_promises.readdir)(dir);
+              if (previousFiles.includes(proposedName)) {
+                return (0, import_path3.resolve)(dir, proposedName);
+              }
+              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;
+            } catch (e) {
+              logWarn('Encountered error in "%s". Skipping.', dir);
+            }
           })));
+          return createdFiles.filter(isFile);
         }
         return allMatches.filter(isFile);
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "publish-microfrontend",
-  "version": "0.15.9-beta.5387",
+  "version": "0.15.9-beta.5415",
   "description": "A CLI for publishing micro frontends to a feed service.",
   "keywords": [
     "modules",
@@ -69,5 +69,5 @@
     "typescript": "^4.0.0",
     "yargs": "^15.0.0"
   },
-  "gitHead": "7e8a09cd29f25a8986169bad38e270b95be0059a"
+  "gitHead": "85149fa812581dc049a38da51944099330f332db"
 }

package/src/utils.ts

@@ -5,6 +5,7 @@ import { dirname, basename, resolve } from 'path';
 import { MemoryStream } from 'piral-cli/src/common/MemoryStream';
 import { downloadFile } from './http';
 import { runCommand } from './scripts';
+import { logWarn } from './log';
 import { getRandomTempFile } from './io';
 
 function runNpmProcess(args: Array<string>, target: string, output?: NodeJS.WritableStream) {
@@ -29,10 +30,18 @@ function onlyUnique<T>(value: T, index: number, self: Array<T>) {
 }
 
 function isFile(item: string) {
+  if (!item || typeof item !== 'string') {
+    return false;
+  }
+
   return statSync(item).isFile();
 }
 
 function isDirectory(item: string) {
+  if (!item || typeof item !== 'string') {
+    return false;
+  }
+
   return statSync(item).isDirectory();
 }
 
@@ -82,18 +91,37 @@ export async function getFiles(
       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;
-        }));
+        const dirs = allMatches.filter((m) => existsSync(resolve(m, 'package.json')));
+        const createdFiles = await Promise.all(
+          dirs.map(async (dir) => {
+            const packagePath = resolve(dir, 'package.json');
+            const packageContent = await readFile(packagePath, 'utf8');
+
+            try {
+              const { name, version } = JSON.parse(packageContent);
+              const proposedName = `${name.replace('@', '').replace('/', '-')}-${version}.tgz`;
+              const previousFiles = await readdir(dir);
+
+              // what if previousFiles contains already an npm package with the name ... "<name>-<version>.tgz" ?
+              // do not pack package; use this one instead.
+              if (previousFiles.includes(proposedName)) {
+                return resolve(dir, proposedName);
+              }
+
+              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;
+            } catch {
+              logWarn('Encountered error in "%s". Skipping.', dir);
+            }
+          }),
+        );
+        return createdFiles.filter(isFile);
       }
 
       return allMatches.filter(isFile);