@bobfrankston/npmglobalize 1.0.182 → 1.0.184

package/lib.js

@@ -3883,10 +3883,10 @@ export async function globalize(cwd, options = {}, configOptions = {}) {
             if (adoptable) {
                 choice = await promptChoice('How would you like to set up git?\n'
                     + '  1) Adopt history from existing remote (recommended)\n'
-                    + '  2) Initialize fresh git repository\n'
                     + '  a) Adopt ALL (don\'t ask again for remaining deps)\n'
+                    + '  2) Initialize fresh git repository\n'
                     + '  3) Use local install only (skip git/publish)\n'
-                    + '  4) Abort\nChoice:', ['1', '2', 'a', '3', '4', '']);
+                    + '  4) Abort\nChoice:', ['1', 'a', '2', '3', '4', '']);
                 if (choice === '3') {
                     console.log(colors.dim('Switching to local-only mode...'));
                     writeConfig(cwd, { ...configOptions, local: true }, new Set(['local']));
@@ -5591,11 +5591,13 @@ export async function globalize(cwd, options = {}, configOptions = {}) {
         if (!publishResult.success) {
             // Check for specific error types before recording
             const output = (publishResult.output + '\n' + publishResult.stderr).toLowerCase();
+            let alreadyPublished = false;
             // "Already published" is benign — don't record as error
             if (output.includes('cannot publish over') || output.includes('previously published')) {
                 const currentPkgVersion = readPackageJson(cwd).version;
                 if (output.includes(currentPkgVersion)) {
                     console.log(colors.green('✓ Already published — continuing'));
+                    alreadyPublished = true;
                 }
                 else {
                     console.error(colors.red('\nERROR: npm publish failed\n'));
@@ -5644,15 +5646,20 @@ export async function globalize(cwd, options = {}, configOptions = {}) {
                 recordBuildIssue(pkg.name || path.basename(cwd), 'error', 'npm publish failed');
                 console.error(colors.yellow('Publish failed — run npm login or check npm whoami'));
             }
-            if (transformResult.transformed) {
-                console.log('Restoring file: dependencies...');
-                const failPkg = readPackageJson(cwd);
-                restoreDeps(failPkg, verbose);
-                writePackageJson(cwd, failPkg);
-                runCommand('git', ['add', 'package.json'], { cwd, silent: true });
-                gitCommit('Restore file: dependencies', cwd);
+            if (alreadyPublished) {
+                // Treat as success — fall through to post-publish steps (push, tags, .commitmsg)
+            }
+            else {
+                if (transformResult.transformed) {
+                    console.log('Restoring file: dependencies...');
+                    const failPkg = readPackageJson(cwd);
+                    restoreDeps(failPkg, verbose);
+                    writePackageJson(cwd, failPkg);
+                    runCommand('git', ['add', 'package.json'], { cwd, silent: true });
+                    gitCommit('Restore file: dependencies', cwd);
+                }
+                return false;
             }
-            return false;
         }
         // Determine what was published
         const finalAccess = effectiveNpmVisibility || currentAccess || (isScoped ? 'restricted' : 'public');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bobfrankston/npmglobalize",
-  "version": "1.0.182",
+  "version": "1.0.184",
   "description": "Transform file: dependencies to npm versions for publishing",
   "main": "index.js",
   "type": "module",
@@ -33,8 +33,6 @@
   "dependencies": {
     "@bobfrankston/freezepak": "^0.1.8",
     "@bobfrankston/importgen": "^0.1.36",
-    "@bobfrankston/mailx": "^1.0.466",
-    "@bobfrankston/npmglobalize": "^1.0.153",
     "@bobfrankston/themecolors": "^0.1.6",
     "@bobfrankston/userconfig": "^1.0.9",
     "@npmcli/package-json": "^7.0.4",
@@ -50,8 +48,6 @@
   ".dependencies": {
     "@bobfrankston/freezepak": "file:../freezepak",
     "@bobfrankston/importgen": "file:../importgen",
-    "@bobfrankston/mailx": "^1.0.466",
-    "@bobfrankston/npmglobalize": "^1.0.153",
     "@bobfrankston/themecolors": "file:../themecolors",
     "@bobfrankston/userconfig": "file:../userconfig",
     "@npmcli/package-json": "^7.0.4",
@@ -65,8 +61,6 @@
     "dependencies": {
       "@bobfrankston/freezepak": "^0.1.8",
       "@bobfrankston/importgen": "^0.1.36",
-      "@bobfrankston/mailx": "^1.0.466",
-      "@bobfrankston/npmglobalize": "^1.0.153",
       "@bobfrankston/themecolors": "^0.1.6",
       "@bobfrankston/userconfig": "^1.0.9",
       "@npmcli/package-json": "^7.0.4",