piral-cli 1.3.1-beta.6128 → 1.3.1-beta.6133

package/lib/types/common.js

@@ -29,5 +29,5 @@ var LogLevels;
      * timestamps.
      */
     LogLevels[LogLevels["debug"] = 5] = "debug";
-})(LogLevels = exports.LogLevels || (exports.LogLevels = {}));
+})(LogLevels || (exports.LogLevels = LogLevels = {}));
 //# sourceMappingURL=common.js.map

package/lib/types/common.js.map

@@ -1 +1 @@
-{"version":3,"file":"common.js","sourceRoot":"","sources":["../../src/types/common.ts"],"names":[],"mappings":";;;AAoDA,IAAY,SA2BX;AA3BD,WAAY,SAAS;IACnB;;OAEG;IACH,iDAAY,CAAA;IACZ;;OAEG;IACH,2CAAS,CAAA;IACT;;OAEG;IACH,+CAAW,CAAA;IACX;;OAEG;IACH,yCAAQ,CAAA;IACR;;;OAGG;IACH,+CAAW,CAAA;IACX;;;OAGG;IACH,2CAAS,CAAA;AACX,CAAC,EA3BW,SAAS,GAAT,iBAAS,KAAT,iBAAS,QA2BpB"}
+{"version":3,"file":"common.js","sourceRoot":"","sources":["../../src/types/common.ts"],"names":[],"mappings":";;;AAoDA,IAAY,SA2BX;AA3BD,WAAY,SAAS;IACnB;;OAEG;IACH,iDAAY,CAAA;IACZ;;OAEG;IACH,2CAAS,CAAA;IACT;;OAEG;IACH,+CAAW,CAAA;IACX;;OAEG;IACH,yCAAQ,CAAA;IACR;;;OAGG;IACH,+CAAW,CAAA;IACX;;;OAGG;IACH,2CAAS,CAAA;AACX,CAAC,EA3BW,SAAS,yBAAT,SAAS,QA2BpB"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "piral-cli",
-  "version": "1.3.1-beta.6128",
+  "version": "1.3.1-beta.6133",
   "description": "The standard CLI for creating and building a Piral instance or a Pilet.",
   "keywords": [
     "portal",
@@ -81,5 +81,5 @@
     "typescript": "^5.0.0",
     "yargs": "^15.0.0"
   },
-  "gitHead": "0a7041321aa3b3c86371377f74094df506ec3bae"
+  "gitHead": "753b70c9eb69d73f0277952e22100ab16a3cfd43"
 }

package/src/common/importmap.ts

@@ -147,11 +147,12 @@ async function resolveImportmap(
   const inheritedImports = importmap?.inherit;
   const excludedImports = importmap?.exclude;
 
-  const onUnresolved = (entry: string) => {
+  const onUnresolved = (name: string, version: string) => {
     if (options.ignoreFailure) {
-      log('skipUnresolvedDependency_0054', entry);
+      const id = version ? `${name}@${version}` : name;
+      log('skipUnresolvedDependency_0054', id);
     } else {
-      fail('importMapReferenceNotFound_0027', dir, entry);
+      fail('importMapReferenceNotFound_0027', dir, name);
     }
   };
 
@@ -199,7 +200,7 @@ async function resolveImportmap(
             isAsync,
           );
         } else {
-          onUnresolved(identifier);
+          onUnresolved(identifier, versionSpec);
         }
       } else if (!url.startsWith('.') && !isAbsolute(url)) {
         const entry = tryResolvePackage(url, dir);
@@ -224,7 +225,7 @@ async function resolveImportmap(
             isAsync,
           );
         } else {
-          onUnresolved(url);
+          onUnresolved(url, versionSpec);
         }
       } else {
         const entry = resolve(dir, url);
@@ -256,7 +257,7 @@ async function resolveImportmap(
               isAsync,
             );
           } else if (isDirectory) {
-            onUnresolved(entry);
+            onUnresolved(entry, versionSpec);
           } else {
             const hash = await getHash(entry);
 
@@ -271,16 +272,15 @@ async function resolveImportmap(
             });
           }
         } else {
-          onUnresolved(url);
+          onUnresolved(url, versionSpec);
         }
       }
     }
   }
 
   if (Array.isArray(inheritedImports)) {
-    const excluded = Array.isArray(excludedImports)
-      ? [...options.excludedDependencies, ...excludedImports]
-      : options.excludedDependencies;
+    const includedImports = [...options.excludedDependencies, ...dependencies.map((m) => m.name)];
+    const excluded = Array.isArray(excludedImports) ? [...includedImports, ...excludedImports] : includedImports;
 
     for (const inheritedImport of inheritedImports) {
       const otherDependencies = await getInheritedDependencies(inheritedImport, dir, excluded);