jspm 4.0.3 → 4.1.1

package/dist/cli.js

@@ -2326,7 +2326,7 @@ async function writeHtmlOutput(mapFile, generator, pins, env2, flags, silent = f
     htmlUrl: generator.mapUrl,
     // URL of the output map
     rootUrl: generator.rootUrl,
-    preload: getPreloadMode(flags),
+    preload: flags.release ? true : getPreloadMode(flags),
     integrity: flags.integrity,
     whitespace: !flags.compact,
     comment: false
@@ -2403,8 +2403,8 @@ async function getGenerator(flags, configOverride = null, inputMap) {
         rootUrl,
         inputMap: inputMap || await getInputMap(flags),
         env: await getEnv(flags),
-        flattenScopes: flags.flattenScopes,
-        combineSubpaths: flags.combineSubpaths,
+        flattenScopes: flags.flattenScopes === false ? false : flags.release || flags.flattenScopes,
+        combineSubpaths: flags.combineSubpaths === false ? false : flags.release || flags.combineSubpaths,
         defaultProvider,
         resolutions: getResolutions(flags),
         cache: getCacheMode(flags),
@@ -2543,9 +2543,8 @@ function addEnvs(env2, newEnvs) {
   return env2.sort();
 }
 async function getEnv(flags) {
-  const inputMap = await getInputMap(flags);
   const envFlags = Array.isArray(flags?.conditions) ? flags.conditions : (flags.conditions || "").split(",").map((e) => e.trim()).filter(Boolean);
-  let env2 = inputMap.env || ["development", "browser", "module"];
+  let env2 = ["browser", "module", flags.release ? "production" : "development"];
   env2 = removeEnvs(
     env2,
     envFlags.filter((env3) => env3.startsWith("no-")).map((env3) => env3.slice(3))
@@ -3382,7 +3381,7 @@ ${c6.green("Ok:")} Initialization complete.`);
   }
 }
 async function initProject(flags) {
-  const directory = flags.dir || process.cwd();
+  const directory = process.cwd();
   if (!await isDirectory(directory)) {
     throw new JspmError(`Directory does not exist: ${directory}`);
   }
@@ -29259,10 +29258,44 @@ async function build(flags) {
       }
     }
     stopSpinner();
+    if (flags.install !== false) {
+      if (!flags.quiet) {
+        console.log(`${c11.cyan("Info:")} Generating import map in build directory...`);
+      }
+      const map = getInputPath(flags);
+      process.chdir(flags.out);
+      const installFlags = {
+        ...flags,
+        // use local map as source of truth for resolutions
+        map,
+        // output to default importmap.js in build dir
+        out: getOutputPath({}),
+        dir: void 0,
+        release: true,
+        quiet: true
+      };
+      try {
+        await install(installFlags);
+        if (!flags.quiet) {
+          console.log(`${c11.green("\u2713")} Import map generated in ${c11.cyan(flags.out)}`);
+        }
+      } catch (error2) {
+        if (!flags.quiet) {
+          console.warn(`${c11.yellow("Warning:")} Failed to generate import map: ${error2.message}`);
+        }
+      }
+    }
     if (!flags.quiet) {
-      console.log(`${c11.green("\u2713")} Built ${c11.cyan(projectConfig.name)} to ${c11.cyan(flags.out)}.
+      const infoMsg = flags.install !== false ? `${c11.green("\u2713")} Built ${c11.cyan(projectConfig.name)} to ${c11.cyan(
+        flags.out
+      )} with import map.` : `${c11.green("\u2713")} Built ${c11.cyan(projectConfig.name)} to ${c11.cyan(
+        flags.out
+      )}.
 
-${c11.cyan("Info:")} Run ${c11.bold("jspm -d dist install -C production -fs")} to create a production build map.`);
+${c11.cyan("Info:")} Run ${c11.bold(
+        `jspm -d ${flags.out} install --release`
+      )} to create a production import map.`;
+      console.log(infoMsg);
     }
   } catch (e) {
     stopSpinner();
@@ -32328,12 +32361,12 @@ ${error2.snippet}`
                   file: relativePath2,
                   name: `Bare module specifier import ${c15.bold(
                     c15.cyan(`'${module}'`)
-                  )} is not mapped by the import map`,
+                  )} is not mapped by the import map. Either update the package.json "name" or update the HTML to use an import of "jspm" or "jspm/...".`,
                   description: `Only bare specifiers matching the project name ${c15.cyan(
                     c15.bold(`'${projectConfig.name}'`)
                   )} are mapped.`,
                   code: {
-                    title: "package.json:",
+                    title: "Correct JSPM HTML Script:",
                     snippet: `<script type="module">import '${projectConfig.name}';</script>`
                   }
                 });
@@ -32767,31 +32800,33 @@ ${c16.yellow("...")}${c16.bold(remainingCount)} more ${remainingCount === 1 ? "i
 init_init();
 var { version: version2 } = JSON.parse(readFileSync3(new URL("../package.json", import.meta.url), "utf8"));
 var cli = dist_default(c17.yellow("jspm"));
-var generateOpts = (cac2, production = false) => cac2.option(
+var generateOpts = (cac2, release = false) => cac2.option(
   "-m, --map <file>",
   "File containing initial import map (defaults to importmap.json, supports .js with a JSON import map embedded, or HTML with an inline import map)",
   {}
 ).option("-C, --conditions <environments>", "Comma-separated environment condition overrides", {
-  default: production ? ["browser", "production", "module"] : ["browser", "development", "module"]
+  default: []
 }).option("-r, --resolution <resolutions>", "Comma-separated dependency resolution overrides", {}).option(
   "-p, --provider <provider>",
   `Default module provider. Available providers: ${availableProviders.join(", ")}`,
   {}
 ).option("--cache <mode>", "Cache mode for fetches (online, offline, no-cache)", {
   default: "online"
-});
-var outputOpts = (cac2, production = false) => cac2.option("--integrity", "Add module integrity attributes to the import map", { default: false }).option("--preload [mode]", "Add module preloads to HTML output (default: static, dynamic)", {}).option("--root <url>", "URL to treat as server root, i.e. rebase import maps against", {}).option(
-  "-f, --flatten-scopes",
-  "Flatten import map scopes into smaller single top-level scope per origin",
+}).option(
+  "--release",
+  "Enable release mode (--flatten-scopes, --combine-subpaths, --C=production)",
   {
-    default: production
+    default: release
   }
+);
+var outputOpts = (cac2) => cac2.option("--integrity", "Add module integrity attributes to the import map", {}).option("--preload [mode]", "Add module preloads to HTML output (default: static, dynamic)", {}).option("--root <url>", "URL to treat as server root, i.e. rebase import maps against", {}).option(
+  "-f, --flatten-scopes",
+  "Flatten import map scopes into smaller single top-level scope per origin",
+  {}
 ).option(
   "-s, --combine-subpaths",
   "Combine import map subpaths under folder maps (ending in /)",
-  {
-    default: production
-  }
+  {}
 ).option("-c, --compact", "Output a compact import map", { default: false }).option("--stdout", "Output the import map to stdout", { default: false }).option(
   "-o, --out <file>",
   "File to inject the final import map into (default: --map / importmap.js). For JS files outputs an injection wrapper script, for JSON files, the import map only, and for HTML files embeds the import map.",
@@ -32999,7 +33034,7 @@ Start a server that uses importmap.json as the import map.
 `
 ).example(
   (name) => `
-$ ${name} serve --no-watch --no-install --no-type-stripping
+$ ${name} serve --static
     
 Start a server that does not generate the import map on startup, perform type stripping or provide a hot reload watcher
 `
@@ -33033,12 +33068,16 @@ the same options as the 'jspm install' command with no arguments.
 `
 ).action(wrapCommand(serve));
 generateOpts(
-  cli.command("build", "Build package").option("--no-minify", "Disable build minification", {
-    default: true
-  }).option("-o, --out <dir>", "Path to the output directory for the build", {
-    default: "dist"
-  }),
-  true
+  outputOpts(
+    cli.command("build", "Build package").option("--no-minify", "Disable build minification", {
+      default: true
+    }).option("-o, --out <dir>", "Path to the output directory for the build", {
+      default: "dist"
+    }).option("--install", "Generate import map after build completes", {
+      default: true
+    }),
+    true
+  )
 ).example(
   (name) => `
 $ ${name} build
@@ -33106,8 +33145,7 @@ outputOpts(
       {}
     ).option("--eject <package>", "Eject a published package instead of publishing", {}),
     true
-  ),
-  true
+  )
 ).example(
   (name) => `
 $ ${name} publish

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "jspm",
   "type": "module",
-  "version": "4.0.3",
+  "version": "4.1.1",
   "description": "Import Map Package Manager",
   "license": "Apache-2.0",
   "bin": {