Merge branch 'main' into feat/add-resolutions-to-build-command

package.json

@@ -12,7 +12,7 @@
     "jspm.js"
   ],
   "dependencies": {
-    "@jspm/generator": "^1.1.10",
+    "@jspm/generator": "^1.1.12",
     "cac": "^6.7.14",
     "ora": "^6.3.0",
     "picocolors": "^1.0.0",

src/cli.ts

@@ -294,6 +294,7 @@ Clears the global module fetch cache, for situations where the contents of a dep
 cli
   .command("build [entry]", "Build the module using importmap")
   .option(...resolutionOpt)
+  .option(...mapOpt)
   .option(...buildConfigOpt)
   .option(...buildOutputOpt)
   .action(wrapCommand(build));

src/utils.ts

@@ -30,7 +30,11 @@ export const availableProviders = [
   "jsdelivr",
   "skypack",
   "unpkg",
-  "esm.sh",
+  /*
+    Disabling esm.sh provider for now. There is a bug for installing lit.
+    https://github.com/jspm/generator/issues/335
+  */
+  // "esm.sh",
   "jspm.io#system",
 ];
 

test/ownname.test.ts

@@ -9,11 +9,11 @@ const scenarios: Scenario[] = [
     commands: ["jspm install app"],
     validationFn: async (files: Map<string, string>) => {
       // Installing the own-name package "app" should result in the version of
-      // es-module-lexer in the import map being upgraded to 1.3.1, since it's a
+      // es-module-lexer in the import map being upgraded to 1.4.1, since it's a
       // transitive dependency of "./app.js".
       const map = JSON.parse(files.get("importmap.json"));
       assert(
-        map?.imports?.["es-module-lexer"]?.includes("es-module-lexer@1.3.1")
+        map?.imports?.["es-module-lexer"]?.includes("es-module-lexer@1.4.1")
       );
     },
   },