jspm 4.1.2 → 4.1.4

package/dist/cli.js

@@ -2295,7 +2295,7 @@ async function writeOutput(generator, pins, env2, flags, silent = false) {
     return writeStdoutOutput(generator, pins);
   const mapFile = getOutputPath(flags);
   if (mapFile.endsWith(".html")) {
-    return writeHtmlOutput(mapFile, generator, pins, env2, flags, silent);
+    return writeHtmlOutput(mapFile, generator, pins || [], env2, flags, silent);
   } else if (mapFile.endsWith(".js")) {
     return writeJsOutput(mapFile, generator, pins, env2, flags, silent);
   }
@@ -2421,7 +2421,7 @@ async function getGenerator(flags, configOverride = null, inputMap) {
 }
 function findJsMap(input, mapPath) {
   try {
-    const jspmMapRegex = /({(?:\s*"env"\s*:\s*\[[^\]]*\],)?(?:\s*"imports"\s*:\s*{[^{}]*(?:{[^{}]*}[^{}]*)*})(?:\s*,\s*"scopes"\s*:\s*{[^{}]*(?:{[^{}]*}[^{}]*)*})?(?:\s*,\s*"integrity"\s*:\s*{[^{}]*})?(?:\s*,\s*"env"\s*:\s*\[[^\]]*\])?\s*})/;
+    const jspmMapRegex = /({(?:\s*"env"\s*:\s*\[[^\]]*\],)?(?:\s*"imports"\s*:\s*{[^{}]*(?:{[^{}]*}[^{}]*)*})?(?:\s*(?:,\s*)?"scopes"\s*:\s*{[^{}]*(?:{[^{}]*}[^{}]*)*})?(?:\s*(?:,\s*)?"integrity"\s*:\s*{[^{}]*})?(?:\s*(?:,\s*)?"env"\s*:\s*\[[^\]]*\])?\s*})/;
     const mapMatch = jspmMapRegex.exec(input);
     if (mapMatch && mapMatch[1]) {
       try {
@@ -3033,7 +3033,6 @@ var init_utils = __esm({
       "nodemodules",
       "deno",
       "jsdelivr",
-      "skypack",
       "unpkg",
       "esm.sh",
       "jspm.io#system"
@@ -28731,7 +28730,7 @@ var dist_default = cac;
 import c from "picocolors";
 import { clearCache as _clearCache } from "@jspm/generator";
 async function clearCache(flags) {
-  _clearCache();
+  await _clearCache();
   !flags.quiet && console.warn(`${c.green("Ok:")} Cache cleared successfully`);
 }
 
@@ -28796,11 +28795,10 @@ async function link(modules, flags) {
   log2(`Flags: ${JSON.stringify(flags)}`);
   const fallbackMap = !modules[0] || isJsExtension(extname(modules[0])) ? void 0 : modules[0];
   const env2 = await getEnv(flags);
-  const inputMapPath = getInputPath(flags, fallbackMap);
-  const outputMapPath = getOutputPath(flags);
-  const generator = await getGenerator(flags);
-  let pins;
+  const generator = await getGenerator(flags, { scopedLink: true });
+  let pins = null;
   if (modules.length === 0) {
+    console.log("no modules");
     if (!flags.quiet) {
       startSpinner(`Linking import map`);
     }
@@ -28843,12 +28841,9 @@ async function link(modules, flags) {
     } finally {
       stopSpinner();
     }
+    pins = allPins.concat(pins);
   }
-  if (inputMapPath !== outputMapPath && modules.length !== 0) {
-    return await writeOutput(generator, pins, env2, flags, flags.quiet);
-  } else {
-    return await writeOutput(generator, null, env2, flags, flags.quiet);
-  }
+  return await writeOutput(generator, pins, env2, flags, flags.quiet);
 }
 async function resolveModule(p, inlinePins, generator) {
   const log2 = withType("link/resolveModule");

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "jspm",
   "type": "module",
-  "version": "4.1.2",
+  "version": "4.1.4",
   "description": "Import Map Package Manager",
   "license": "Apache-2.0",
   "bin": {
@@ -17,7 +17,7 @@
   },
   "dependencies": {
     "@babel/core": "^7.24.7",
-    "@jspm/generator": "^2.6.4",
+    "@jspm/generator": "^2.7.3",
     "@jspm/plugin-rollup": "^1.2.4",
     "ora": "^8.2.0",
     "picocolors": "^1.1.1"
@@ -28,7 +28,7 @@
     "amaro": "^0.5.3",
     "cac": "^6.7.14",
     "esbuild": "^0.16.17",
-    "eslint": "^8.38.0",
+    "eslint": "^9.34.0",
     "eslint-config-prettier": "^8.8.0",
     "mime": "^4.0.7",
     "minimatch": "^10.0.1",