jspm 3.0.0 → 3.0.1

package/README.md

@@ -2,7 +2,7 @@
   <img style="display: inline-block; width: 100px; vertical-align: middle; margin-top: -1em;" src="https://jspm.org/jspm.png"/>
   <h1 style="display: inline-block">JSPM CLI</h1>
 <p><strong>JSPM CLI is the package management of the JSPM project, supporting import map package management.</strong></p>
-<a href="https://jspm.org/getting-started">Getting Started</a> | <a href="https://jspm.org/docs/jspm">Documentation</a> | <a href="https://jspm.org/faq">FAQ</a>
+<a href="https://jspm.org/getting-started">Getting Started</a> | <a href="https://jspm.org/docs/jspm-cli">Documentation</a> | <a href="https://jspm.org/faq">FAQ</a>
 <br />
 <hr style="width:50%"/>
 </div>
@@ -15,7 +15,7 @@
 * Support for a wide range of CDNs, such as `jspm.io`, `jsDeliver`, `esm.sh` and `unpkg`.
 * Import map extraction/injection into HTML files, with module preloading and integrity attributes.
 
-See the [documentation](https://jspm.org/docs/jspm) and [getting started](https://jspm.org/docs/getting-started) guide on jspm.org.
+See the [documentation](https://jspm.org/docs/jspm-cli) and [getting started](https://jspm.org/docs/getting-started) guide on jspm.org.
 
 ## Contributing
 

package/dist/cli.js

@@ -593,7 +593,7 @@ var cac = (name = "") => new CAC(name);
 var dist_default = cac;
 
 // package.json
-var version = "3.0.0";
+var version = "3.0.1";
 
 // src/clearCache.ts
 import c from "picocolors";
@@ -759,7 +759,7 @@ async function writeHtmlOutput(mapFile, generator, pins, env, flags, silent = fa
     htmlUrl: generator.mapUrl,
     // URL of the output map
     rootUrl: generator.rootUrl,
-    preload: flags.preload,
+    preload: getPreloadMode(flags),
     integrity: flags.integrity,
     whitespace: !flags.compact,
     comment: false
@@ -953,10 +953,10 @@ function getCacheMode(flags) {
       )}   Use a locally cached module if available and fresh.
 	${c3.bold(
         "offline"
-      )}  Use a locally cached module if available, even if stale.
+      )}   Use a locally cached module if available, even if stale.
 	${c3.bold(
         "no-cache"
-      )} Never use the local cache.`
+      )}   Never use the local cache.`
     );
   if (flags.cache === "offline")
     return "offline";
@@ -964,6 +964,29 @@ function getCacheMode(flags) {
     return true;
   return false;
 }
+var validPreloadModes = ["static", "dynamic"];
+function getPreloadMode(flags) {
+  if (flags.preload === null || flags.preload === void 0)
+    return false;
+  if (typeof flags.preload === "boolean") {
+    return flags.preload;
+  }
+  if (!validPreloadModes.includes(flags.preload))
+    throw new JspmError(
+      `Invalid preload mode "${flags.preload}". Available modes are: "${validPreloadModes.join('", "')}" (default).
+	${c3.bold(
+        "static"
+      )}  Inject preload tags for static dependencies.
+	${c3.bold(
+        "dynamic"
+      )} Inject preload tags for static and dynamic dependencies.`
+    );
+  if (flags.preload === "static")
+    return "static";
+  if (flags.preload === "dynamic")
+    return "all";
+  return false;
+}
 var spinner = ora({ spinner: "dots" });
 function startSpinner(text) {
   spinner.start(text);
@@ -1035,7 +1058,9 @@ async function install(packages, flags) {
     const imports = {};
     for (const { alias, target } of urlLikePackages) {
       if (!alias)
-        throw new JspmError(`URL-like target "${target}" must be given an alias to install under, such as "name=${target}".`);
+        throw new JspmError(
+          `URL-like target "${target}" must be given an alias to install under, such as "name=${target}".`
+        );
       imports[alias] = target;
     }
     pins.push(...await generator.addMappings(JSON.stringify({ imports })));
@@ -1259,9 +1284,9 @@ var outputOpt = [
   {}
 ];
 var preloadOpt = [
-  "--preload",
-  "Add module preloads to HTML output",
-  { default: false }
+  "--preload [mode]",
+  "Add module preloads to HTML output (default: static, dynamic)",
+  {}
 ];
 var integrityOpt = [
   "--integrity",
@@ -1295,7 +1320,7 @@ Run "jspm" without any arguments to see the help file.`
     );
   })
 );
-cli.command("link [...modules]", "link modules").alias("trace").option(...mapOpt).option(...outputOpt).option(...envOpt).option(...resolutionOpt).option(...providerOpt).option(...cacheOpt).option(...rootOpt).option(...integrityOpt).option(...preloadOpt).option(...compactOpt).option(...freezeOpt).option(...stdoutOpt).example(
+cli.command("link [...modules]", "link modules").alias("trace").option(...mapOpt).option(...outputOpt).option(...envOpt).option(...resolutionOpt).option(...providerOpt).option(...cacheOpt).option(...rootOpt).option(...preloadOpt).option(...integrityOpt).option(...compactOpt).option(...freezeOpt).option(...stdoutOpt).example(
   (name) => `Link a remote package in importmap.json
   $ ${name} link chalk@5.2.0
 `
@@ -1305,7 +1330,7 @@ cli.command("link [...modules]", "link modules").alias("trace").option(...mapOpt
 `
 ).example(
   (name) => `Link an HTML file and update its import map including preload and integrity tags
-  $ ${name} link --map index.html --integrity --preload
+  $ ${name} link --map index.html --integrity --preload dynamic
 `
 ).usage(
   `link [flags] [...modules]
@@ -1320,7 +1345,7 @@ In some cases there may be ambiguity. For instance, you may want to link the NPM
 
 If no modules are given, all "imports" in the initial map are relinked.`
 ).action(wrapCommand(link));
-cli.command("install [...packages]", "install packages").alias("i").option(...mapOpt).option(...outputOpt).option(...envOpt).option(...resolutionOpt).option(...providerOpt).option(...cacheOpt).option(...rootOpt).option(...integrityOpt).option(...preloadOpt).option(...compactOpt).option(...freezeOpt).option(...stdoutOpt).example(
+cli.command("install [...packages]", "install packages").alias("i").option(...mapOpt).option(...outputOpt).option(...envOpt).option(...resolutionOpt).option(...providerOpt).option(...cacheOpt).option(...rootOpt).option(...preloadOpt).option(...integrityOpt).option(...compactOpt).option(...freezeOpt).option(...stdoutOpt).example(
   (name) => `Install a package
   $ ${name} install lit
 `
@@ -1341,13 +1366,13 @@ cli.command("install [...packages]", "install packages").alias("i").option(...ma
   $ ${name} install alias=react
 `
 ).usage(
-  `link [flags] [...packages]
+  `install [flags] [...packages]
 
 Installs packages into an import map, along with all of the dependencies that are necessary to import them.By default, the latest versions of the packages that are compatible with the local "package.json" are installed, unless an explicit version is specified. The given packages must be valid package specifiers, such as \`npm:react@18.0.0\` or \`denoland:oak\`. If a package specifier with no registry is given, such as \`lit\`, the registry is assumed to be NPM. Packages can be installed under an alias by using specifiers such as \`myname=npm:lit@2.1.0\`. An optional subpath can be provided, such as \`npm:lit@2.2.0/decorators.js\`, in which case only the dependencies for that subpath are installed.
 
 If no packages are provided, all "imports" in the initial map are reinstalled.`
 ).action(wrapCommand(install));
-cli.command("uninstall [...packages]", "remove packages").option(...mapOpt).option(...outputOpt).option(...envOpt).option(...resolutionOpt).option(...providerOpt).option(...cacheOpt).option(...rootOpt).option(...integrityOpt).option(...preloadOpt).option(...compactOpt).option(...freezeOpt).option(...stdoutOpt).example(
+cli.command("uninstall [...packages]", "remove packages").option(...mapOpt).option(...outputOpt).option(...envOpt).option(...resolutionOpt).option(...providerOpt).option(...cacheOpt).option(...rootOpt).option(...preloadOpt).option(...integrityOpt).option(...compactOpt).option(...freezeOpt).option(...stdoutOpt).example(
   (name) => `
 $ ${name} uninstall lit lodash
 
@@ -1358,7 +1383,7 @@ Uninstall "lit" and "lodash" from importmap.json.
 
 Uninstalls packages from an import map. The given packages must be valid package specifiers, such as \`npm:react@18.0.0\`, \`denoland:oak\` or \`lit\`, and must be present in the initial import map.`
 ).action(wrapCommand(uninstall));
-cli.command("update [...packages]", "update packages").alias("upgrade").option(...mapOpt).option(...outputOpt).option(...envOpt).option(...resolutionOpt).option(...providerOpt).option(...cacheOpt).option(...rootOpt).option(...integrityOpt).option(...preloadOpt).option(...compactOpt).option(...freezeOpt).option(...stdoutOpt).example(
+cli.command("update [...packages]", "update packages").alias("upgrade").option(...mapOpt).option(...outputOpt).option(...envOpt).option(...resolutionOpt).option(...providerOpt).option(...cacheOpt).option(...rootOpt).option(...preloadOpt).option(...integrityOpt).option(...compactOpt).option(...freezeOpt).option(...stdoutOpt).example(
   (name) => `
 $ ${name} update react-dom
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "jspm",
   "type": "module",
-  "version": "3.0.0",
+  "version": "3.0.1",
   "description": "Import Map Package Manager",
   "license": "Apache-2.0",
   "bin": {
@@ -12,7 +12,7 @@
     "jspm.js"
   ],
   "dependencies": {
-    "@jspm/generator": "^1.1.6",
+    "@jspm/generator": "^1.1.9",
     "cac": "^6.7.14",
     "ora": "^6.3.0",
     "picocolors": "^1.0.0"
@@ -22,7 +22,7 @@
     "@babel/core": "^7.21.4",
     "@types/node": "^18.15.11",
     "esbuild": "^0.16.17",
-    "eslint": "^8.37.0",
+    "eslint": "^8.38.0",
     "eslint-config-prettier": "^8.8.0",
     "prettier": "^2.8.7",
     "tinyspy": "^1.1.1",