jspm 4.0.1 → 4.0.3

package/dist/cli.js

@@ -2494,19 +2494,23 @@ function getInputPath(flags, fallbackDefaultMap = defaultMapPath) {
   if (mapPath) {
     return resolve(mapPath);
   }
-  if (exists(defaultMapPath)) {
-    return resolve(defaultMapPath);
+  const defaultMapPathResolved = resolve(flags.dir ?? ".", defaultMapPath);
+  if (exists(defaultMapPathResolved)) {
+    return defaultMapPathResolved;
   }
-  return resolve(fallbackDefaultMap);
+  const fallbackDefaultMapResolved = resolve(flags.dir ?? ".", fallbackDefaultMap);
+  return fallbackDefaultMapResolved;
 }
 function getOutputPath(flags) {
   if (flags.out || flags.map) {
     return resolve(flags.out || flags.map);
   }
-  if (exists(defaultMapPath)) {
-    return resolve(defaultMapPath);
+  const defaultMapPathResolved = resolve(flags.dir ?? ".", defaultMapPath);
+  if (defaultMapPathResolved) {
+    return defaultMapPathResolved;
   }
-  return resolve(defaultMapPath);
+  const fallbackDefaultMapResolved = resolve(flags.dir ?? ".", defaultMapPath);
+  return fallbackDefaultMapResolved;
 }
 function getOutputMapUrl(flags) {
   return pathToFileURL(getOutputPath(flags));
@@ -29205,7 +29209,7 @@ async function build(flags) {
       format: "esm",
       assetFileNames: "[name][extname]",
       entryFileNames: "[name]",
-      chunkFileNames: "[name]",
+      chunkFileNames: "lib/[name]-[hash:8].js",
       sourcemap: true,
       compact: flags.minify
     });
@@ -29219,7 +29223,18 @@ async function build(flags) {
         await writeFile3(`${outPath}.map`, JSON.stringify(chunk.map));
       }
     }
-    const generatedFiles = new Set(output.map((chunk) => chunk.fileName));
+    const projectBase = `${pathToFileURL4(projectConfig.projectPath).href}/`;
+    const generatedFiles = /* @__PURE__ */ new Set();
+    for (const chunk of output) {
+      generatedFiles.add(chunk.fileName);
+      if (chunk.type === "chunk") {
+        for (const refFile of chunk.moduleIds) {
+          if (refFile.startsWith(projectBase)) {
+            generatedFiles.add(relative3(projectBase, refFile).replace(/\\/g, "/"));
+          }
+        }
+      }
+    }
     {
       const pjson = JSON.parse(
         readFileSync2(join3(projectConfig.projectPath, "package.json"), "utf8")
@@ -29245,7 +29260,9 @@ async function build(flags) {
     }
     stopSpinner();
     if (!flags.quiet) {
-      console.log(`${c11.green("\u2713")} Built ${c11.cyan(projectConfig.name)} to ${c11.cyan(flags.out)}`);
+      console.log(`${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.`);
     }
   } catch (e) {
     stopSpinner();
@@ -29299,7 +29316,7 @@ function cssPlugin({ minify, baseUrl }) {
   };
 }
 
-// src/deploy.ts
+// src/publish.ts
 import fs8 from "node:fs/promises";
 import path6 from "node:path";
 import { pathToFileURL as pathToFileURL5 } from "node:url";
@@ -29774,7 +29791,7 @@ defineLazyProperty(apps, "browser", () => "browser");
 defineLazyProperty(apps, "browserPrivate", () => "browserPrivate");
 var open_default = open;
 
-// src/deploy.ts
+// src/publish.ts
 init_utils();
 init_logger();
 init_config();
@@ -29790,7 +29807,7 @@ function showShortcuts(directory) {
  \u2192 ${c12.bold(c12.bgBlueBright(c12.whiteBright(" p ")))} ${c12.dim(
     "Open self-contained preview URL in the browser"
   )}
- \u2192 ${c12.bold(c12.bgBlueBright(c12.whiteBright(" r ")))} ${c12.dim("Force redeployment")}
+ \u2192 ${c12.bold(c12.bgBlueBright(c12.whiteBright(" r ")))} ${c12.dim("Force republish")}
  \u2192 ${c12.bold(c12.bgBlueBright(c12.whiteBright(" q ")))} ${c12.dim("Stop (or Ctrl+C)")}`);
   console.log(`${c12.blue("Info:")} Watching for changes in ${c12.cyan(directory)}...`);
   process.stdin.setRawMode?.(true);
@@ -29812,18 +29829,16 @@ async function readJsonFile(filePath, defaultValue = {}) {
   return defaultValue;
 }
 async function eject(flags) {
-  const log2 = withType("deploy/eject");
+  const log2 = withType("publish/eject");
   const pkg = flags.eject;
   if (!pkg.startsWith("app:")) {
-    throw new JspmError(
-      `Only the app: JSPM deployment registry is currently supported for ejection.`
-    );
+    throw new JspmError(`Only the app: JSPM registry is currently supported for ejection.`);
   }
   const config = await loadConfig();
   log2(
     `Loaded config with ${config.providers ? Object.keys(config.providers).length : 0} provider configurations`
   );
-  const provider2 = flags.provider || config.defaultDeployProvider || "jspm.io";
+  const provider2 = flags.provider || config.defaultPublishProvider || "jspm.io";
   const generator = await getGenerator(flags);
   let name = pkg.slice(4);
   if (name[0] !== "@")
@@ -29836,14 +29851,14 @@ async function eject(flags) {
   startSpinner(`Ejecting ${c12.bold(pkg)}...`);
   await generator.eject({ name, version: version3, provider: provider2 }, ".");
   stopSpinner();
-  startSpinner(`Merging deployment import map for ${c12.bold(pkg)}...`);
+  startSpinner(`Merging published import map for ${c12.bold(pkg)}...`);
   const env2 = await getEnv(flags);
   await writeOutput(generator, null, env2, flags, flags.quiet);
   stopSpinner();
   console.log(`${c12.green("Ok:")} Package ${c12.green(pkg)} ejected into ${c12.bold(flags.dir)}`);
 }
 async function publish(flags = {}) {
-  const log2 = withType("deploy/publish");
+  const log2 = withType("publish/publish");
   const { initProject: initProject2 } = await Promise.resolve().then(() => (init_init(), init_exports));
   try {
     const projectConfig = await initProject2({
@@ -29869,7 +29884,7 @@ async function publish(flags = {}) {
     if (flags.watch) {
       if (semverVersion || !version3.match(/^[a-zA-Z0-9_\-]+$/)) {
         throw new JspmError(
-          `Invalid version "${version3}" for deploy --watch. Watched deployments must be to mutable versions, which are alphanumeric only with - or _ separators.`
+          `Invalid version "${version3}" for publish --watch. Watched publishes must be to mutable versions, which are alphanumeric only with - or _ separators.`
         );
       }
       return startWatchMode(
@@ -29882,7 +29897,7 @@ async function publish(flags = {}) {
         prepareScript
       );
     }
-    return deployOnce(
+    return publishOnce(
       name,
       version3,
       projectConfig.projectPath,
@@ -29897,16 +29912,16 @@ async function publish(flags = {}) {
     throw new JspmError(`Failed to initialize project: ${error2.message}`);
   }
 }
-async function deployOnce(name, version3, directory, flags, logSnippet, prepareScript) {
-  const log2 = withType("deploy");
+async function publishOnce(name, version3, directory, flags, logSnippet, prepareScript) {
+  const log2 = withType("publish");
   const config = await loadConfig();
   log2(
     `Loaded config with ${config.providers ? Object.keys(config.providers).length : 0} provider configurations`
   );
-  const deployProvider = flags.provider || config.defaultDeployProvider;
-  if (!deployProvider) {
+  const publishProvider = flags.provider || config.defaultPublishProvider;
+  if (!publishProvider) {
     throw new JspmError(
-      `No deploy provider specified. Please provide a provider with the --provider flag (e.g., jspm deploy -p jspm.io) or set a default provider in your config.`
+      `No publish provider specified. Please provide a provider with the --provider flag (e.g., jspm publish -p jspm.io) or set a default provider in your config.`
     );
   }
   if (prepareScript) {
@@ -29914,22 +29929,22 @@ async function deployOnce(name, version3, directory, flags, logSnippet, prepareS
     await runPackageScript(prepareScript, directory);
     console.log(`${c12.blue("Info:")} ${c12.bold("prepare")} script completed`);
   }
-  startSpinner(`Deploying ${c12.bold(`${name}@${version3}`)} to ${deployProvider}...`);
+  startSpinner(`Publishing ${c12.bold(`${name}@${version3}`)} to ${publishProvider}...`);
   const generator = await getGenerator(flags, {
     mapUrl: pathToFileURL5(`${directory}/`)
   });
   try {
-    const { packageUrl, mapUrl, codeSnippet } = await generator.deploy({
+    const { packageUrl, mapUrl, codeSnippet } = await generator.publish({
       package: pathToFileURL5(directory).href,
       name,
       version: version3,
-      provider: deployProvider,
+      provider: publishProvider,
       importMap: true,
       install: true
     });
     stopSpinner();
     console.log(
-      `${c12.green("Ok:")} Package deployed to ${c12.green(packageUrl)} with import map ${c12.green(
+      `${c12.green("Ok:")} Package published to ${c12.green(packageUrl)} with import map ${c12.green(
         mapUrl
       )}`
     );
@@ -29946,14 +29961,14 @@ ${c12.greenBright(
     return { packageUrl, mapUrl, codeSnippet };
   } catch (error2) {
     stopSpinner();
-    throw new JspmError(`Failed to deploy: ${error2.message}`);
+    throw new JspmError(`Failed to publish: ${error2.message}`);
   }
 }
 async function startWatchMode(name, version3, directory, ignore2, include, flags, prepareScript) {
-  let lastDeployTime = 0;
+  let lastPublishTime = 0;
   const fileMTimes = /* @__PURE__ */ new Map();
   let packageUrl, codeSnippet;
-  let forcedRedeploy = false;
+  let forcedRepublish = false;
   let lastRunWasError = false;
   let waiting = false;
   await watchLoop(true);
@@ -29997,7 +30012,7 @@ ${c12.blue("Info:")} Watch mode stopped`);
           open_default(packageUrl.endsWith("/") ? packageUrl : `${packageUrl}/`);
         break;
       case "r":
-        forcedRedeploy = true;
+        forcedRepublish = true;
         break;
       case "c":
         if (codeSnippet)
@@ -30017,7 +30032,7 @@ ${codeSnippet.split("\n").filter((l) => !l.startsWith("<!--") || !l.endsWith("--
   });
   async function watchLoop(firstRun) {
     try {
-      if (Date.now() - lastDeployTime < 2e3) {
+      if (Date.now() - lastPublishTime < 2e3) {
         return;
       }
       const changes = [];
@@ -30044,7 +30059,7 @@ ${codeSnippet.split("\n").filter((l) => !l.startsWith("<!--") || !l.endsWith("--
           fileMTimes.delete(filePath);
         }
       }
-      if (changes.length || forcedRedeploy) {
+      if (changes.length || forcedRepublish) {
         waiting = false;
         if (!firstRun) {
           if (lastRunWasError)
@@ -30052,11 +30067,11 @@ ${codeSnippet.split("\n").filter((l) => !l.startsWith("<!--") || !l.endsWith("--
           else
             hideShortcuts();
           console.log(
-            `${c12.blue("Info:")} ${forcedRedeploy ? "Requesting redeploy" : changes.length > 1 ? "Multiple changes detected" : `${path6.relative(directory, changes[0]).replace(/\\/g, "/")} changed`}, redeploying...`
+            `${c12.blue("Info:")} ${forcedRepublish ? "Requesting republish" : changes.length > 1 ? "Multiple changes detected" : `${path6.relative(directory, changes[0]).replace(/\\/g, "/")} changed`}, republishing...`
           );
         }
-        forcedRedeploy = false;
-        ({ packageUrl, codeSnippet } = await deployOnce(
+        forcedRepublish = false;
+        ({ packageUrl, codeSnippet } = await publishOnce(
           name,
           version3,
           directory,
@@ -30064,7 +30079,7 @@ ${codeSnippet.split("\n").filter((l) => !l.startsWith("<!--") || !l.endsWith("--
           (flags.usage ?? true) && firstRun,
           prepareScript
         ));
-        lastDeployTime = Date.now();
+        lastPublishTime = Date.now();
         showShortcuts(directory);
         lastRunWasError = false;
         waiting = true;
@@ -33056,19 +33071,30 @@ Uses RollupJS under the hood to create optimized bundles.
 
 The package entry points as defined in the package.json "exports" field are built, with the
 entire package copied into the output directory. As such, it is a whole-package transformation.
+
+Build externals are taken from the package.json "dependencies" to form a roughly configurationless
+build workflow (dependencies in "devDependencies" or otherwise are inlined into the build).
+
 Includes and ignores can be specified using the package.json "files" and "ignore" fields,
 optionally using the JSPM overrides for these via the "jspm" property in the package.json.
+
+Any build import map shoud be generated separately via a subsequent install operation on the
+build folder, for example like:
+
+${c17.bold("jspm install -d dist -C production --flatten-scopes --combine-subpaths")}
+
+to generate an optimized production map.
 `
 ).action(wrapCommand(build));
 outputOpts(
   generateOpts(
-    cli.command("deploy", `Deploy package to a provider (experimental)`).option(
+    cli.command("publish", `Publish package to a provider (experimental)`).option(
       "--no-usage",
-      "Disable printing HTML/JS import code examples after successful deployment",
+      "Disable printing HTML/JS import code examples after successful publish",
       {
         default: true
       }
-    ).option("-w, --watch", "Watch for changes and redeploy (experimental)", {
+    ).option("-w, --watch", "Watch for changes and republish (experimental)", {
       default: false
     }).option(
       "-n, --name <name>",
@@ -33078,60 +33104,60 @@ outputOpts(
       "-v, --version <version>",
       "Publish with a custom version instead of the version from package.json",
       {}
-    ).option("--eject <package>", "Eject a deployed package instead of publishing", {}),
+    ).option("--eject <package>", "Eject a published package instead of publishing", {}),
     true
   ),
   true
 ).example(
   (name) => `
-$ ${name} deploy
+$ ${name} publish
 
-Deploy the current directory as a package to the JSPM CDN.
+Publish the current directory as a package to the JSPM CDN.
 `
 ).example(
   (name) => `
-$ ${name} deploy -p jspm.io
+$ ${name} publish -p jspm.io
 
-Deploy the current package as a package to the JSPM CDN.
+Publish the current package as a package to the JSPM CDN.
 `
 ).example(
   (name) => `
-$ ${name} deploy --dir dist --version dev-feat-2 --watch
+$ ${name} publish --dir dist --version dev-feat-2 --watch
 
-Start a watched deployment to a custom mutable version tag (dev-feat-2) instead of the version from package.json.
+Start a watched publish to a custom mutable version tag (dev-feat-2) instead of the version from package.json.
 `
 ).example(
   (name) => `
-$ ${name} deploy --eject app:foo@bar --dir foo
+$ ${name} publish --eject app:foo@bar --dir foo
 
 Download the application package foo@bar into the folder foo, merging its import map into foo/importmap.js.
 `
 ).example(
   (name) => `
-$ ${name} deploy --eject app:foo@bar --dir foo -o test.html
+$ ${name} publish --eject app:foo@bar --dir foo -o test.html
 
 Download the application package foo@bar into the folder foo, merging its import map into the provided HTML file.
 `
 ).usage(
-  `deploy [options]
+  `publish [options]
 
-Manages deployments to the JSPM providers, currently in experimental preview.
+Manages publishes to the JSPM providers, currently in experimental preview.
 
 For publishing (default):
 
-  jspm deploy
+  jspm publish
 
   - The provider flag is always required, with limited signups only available on the jspm.io provider currently
   - The package must have a valid package.json with name and version fields.
   - The package.json "files" and "ignore" arrays will be respected.
-  - Semver versions are always immutable deployments that cannot be redeployed.
-  - Mutable versions supporting redeployment must only contain alphanumeric characters, hyphens, and underscores [a-zA-Z0-9_-].
+  - Semver versions are always immutable publishes that cannot be republished.
+  - Mutable versions supporting republishing must only contain alphanumeric characters, hyphens, and underscores [a-zA-Z0-9_-].
 
 For ejecting a published package:
 
-  jspm deploy --eject <packagename@packageversion> --dir <directory>
+  jspm download --eject <packagename@packageversion> --dir <directory>
 
-  - Ejects a deployed package into a local directory, stitching its deployment import map into the target import map.
+  - Ejects a published package into a local directory, stitching its published import map into the target import map.
   - The --dir flag is required to specify the output project directory when using --eject.
 `
 ).action(

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "jspm",
   "type": "module",
-  "version": "4.0.1",
+  "version": "4.0.3",
   "description": "Import Map Package Manager",
   "license": "Apache-2.0",
   "bin": {
@@ -17,7 +17,7 @@
   },
   "dependencies": {
     "@babel/core": "^7.24.7",
-    "@jspm/generator": "^2.6.0",
+    "@jspm/generator": "^2.6.1",
     "@jspm/plugin-rollup": "^1.2.4",
     "ora": "^8.2.0",
     "picocolors": "^1.1.1"