@jsenv/package-publish 1.11.57 → 1.11.59

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsenv/package-publish",
-  "version": "1.11.57",
+  "version": "1.11.59",
   "type": "module",
   "description": "Publish package to one or many registry.",
   "repository": {
@@ -23,8 +23,8 @@
     "/src/"
   ],
   "dependencies": {
-    "@jsenv/filesystem": "4.15.26",
-    "@jsenv/humanize": "1.8.4",
+    "@jsenv/filesystem": "4.15.28",
+    "@jsenv/humanize": "1.8.6",
     "semver": "7.8.5"
   },
   "devDependencies": {

package/src/internal/publish.js

@@ -16,12 +16,16 @@ export const publish = async ({
 }) => {
   const publishTask = createTaskLog(`publish ${packageSlug} on ${registryUrl}`);
   try {
-    // process.env.NODE_AUTH_TOKEN
-    const previousValue = process.env.NODE_AUTH_TOKEN;
-    const restoreProcessEnv = () => {
-      process.env.NODE_AUTH_TOKEN = previousValue;
-    };
-    process.env.NODE_AUTH_TOKEN = token;
+    // without a token npm authenticates by itself, for instance through
+    // trusted publishing (OIDC) in a GitHub workflow
+    let restoreProcessEnv = () => {};
+    if (token) {
+      const previousValue = process.env.NODE_AUTH_TOKEN;
+      restoreProcessEnv = () => {
+        process.env.NODE_AUTH_TOKEN = previousValue;
+      };
+      process.env.NODE_AUTH_TOKEN = token;
+    }
     // updating package.json to publish on the correct registry
     let restorePackageFile = () => {};
     const rootPackageFileUrl = new URL("./package.json", rootDirectoryUrl);
@@ -41,7 +45,7 @@ export const publish = async ({
         JSON.stringify(packageObject, null, "  "),
       );
     }
-    // updating .npmrc to add the token
+    // updating .npmrc to add the registry (and the token when there is one)
     const npmConfigFileUrl = new URL("./.npmrc", rootDirectoryUrl);
     let restoreNpmConfigFile;
     let npmConfigFileContent;
@@ -60,7 +64,7 @@ export const publish = async ({
     writeFileSync(
       npmConfigFileUrl,
       setNpmConfig(npmConfigFileContent, {
-        [computeRegistryTokenKey(registryUrl)]: token,
+        ...(token ? { [computeRegistryTokenKey(registryUrl)]: token } : {}),
         [computeRegistryKey(packageObject.name)]: registryUrl,
       }),
     );

package/src/internal/staged_version.js

@@ -47,16 +47,34 @@ export const checkVersionStatusInRegistry = async ({
   return VERSION_STATUS.ABSENT;
 };
 
-export const waitForStagedVersionToLand = async ({
+export const waitForStagedVersionToLand = ({
   registryUrl,
   packageName,
   packageVersion,
   token,
+}) => {
+  return waitForVersionInRegistry({
+    registryUrl,
+    packageName,
+    packageVersion,
+    token,
+    timeout: STAGED_VERSION_TIMEOUT_MS,
+    timeoutErrorMessage: `${packageName}@${packageVersion} is staged on ${registryUrl} but did not get published. Run the publish again to keep waiting; a staged version cannot be published again.`,
+  });
+};
+
+export const waitForVersionInRegistry = async ({
+  registryUrl,
+  packageName,
+  packageVersion,
+  token,
+  timeout,
+  timeoutErrorMessage,
 }) => {
   const waitTask = createTaskLog(
     `wait for ${packageName}@${packageVersion} to be published by ${registryUrl}`,
   );
-  const msBeforeTimeout = Date.now() + STAGED_VERSION_TIMEOUT_MS;
+  const msBeforeTimeout = Date.now() + timeout;
   try {
     while (true) {
       const versionIsInRegistry = await checkVersionIsInRegistry({
@@ -70,9 +88,7 @@ export const waitForStagedVersionToLand = async ({
         return;
       }
       if (Date.now() > msBeforeTimeout) {
-        throw new Error(
-          `${packageName}@${packageVersion} is staged on ${registryUrl} but did not get published. Run the publish again to keep waiting; a staged version cannot be published again.`,
-        );
+        throw new Error(timeoutErrorMessage);
       }
       await new Promise((resolve) => {
         setTimeout(resolve, STAGED_VERSION_POLL_INTERVAL_MS);