@bobfrankston/npmglobalize 1.0.30 → 1.0.32

package/cli.js

@@ -186,6 +186,9 @@ function parseArgs(args) {
             case '--rebase':
                 options.rebase = true;
                 break;
+            case '--show':
+                options.show = true;
+                break;
             case '--update-deps':
                 options.updateDeps = true;
                 break;

package/lib.d.ts

@@ -49,6 +49,8 @@ export interface GlobalizeOptions {
     fixTags?: boolean;
     /** Automatically rebase if local is behind remote */
     rebase?: boolean;
+    /** Show package.json dependency changes */
+    show?: boolean;
 }
 /** Read and parse package.json from a directory */
 export declare function readPackageJson(dir: string): any;

package/lib.js

@@ -1085,7 +1085,7 @@ export function getToolVersion() {
 }
 export async function globalize(cwd, options = {}) {
     const { bump = 'patch', noPublish = false, cleanup = false, install = false, wsl = false, force = false, files = true, dryRun = false, quiet = true, verbose = false, init = false, gitVisibility = 'private', npmVisibility = 'public', message, conform = false, asis = false, updateDeps = false, updateMajor = false, publishDeps = true, // Default to publishing deps for safety
-    forcePublish = false, fix = false, fixTags = false, rebase = false } = options;
+    forcePublish = false, fix = false, fixTags = false, rebase = false, show = false } = options;
     // Show tool version
     const toolVersion = getToolVersion();
     console.log(colors.italic(`npmglobalize v${toolVersion}`));
@@ -1344,6 +1344,27 @@ export async function globalize(cwd, options = {}) {
     const transformResult = transformDeps(pkg, cwd, verbose, forcePublish);
     if (transformResult.transformed) {
         console.log('  Dependencies transformed.');
+        // Show dependency changes if requested
+        if (show || verbose) {
+            console.log('');
+            console.log(colors.italic('Dependency changes:'));
+            for (const key of DEP_KEYS) {
+                const backupKey = '.' + key;
+                if (pkg[backupKey]) {
+                    console.log('');
+                    console.log(colors.yellow(`${key}:`));
+                    const original = pkg[backupKey];
+                    const transformed = pkg[key];
+                    for (const [name, origValue] of Object.entries(original)) {
+                        const newValue = transformed?.[name];
+                        console.log(`  ${name}:`);
+                        console.log(`    ${colors.red('- ' + origValue)}`);
+                        console.log(`    ${colors.green('+ ' + newValue)}`);
+                    }
+                }
+            }
+            console.log('');
+        }
         // Check if target packages need to be published
         if (transformResult.unpublished.length > 0) {
             console.log('');
@@ -1520,14 +1541,45 @@ export async function globalize(cwd, options = {}) {
     // Version bump
     console.log(`Bumping version (${bump})...`);
     if (!dryRun) {
+        // Temporarily disable postversion hook to prevent double-publishing
+        const pkg = readPackageJson(cwd);
+        const originalPostversion = pkg.scripts?.postversion;
+        let postversDisabled = false;
+        if (originalPostversion && originalPostversion.includes('npm publish')) {
+            if (verbose) {
+                console.log('Temporarily disabling postversion hook to prevent double-publish...');
+            }
+            delete pkg.scripts.postversion;
+            writePackageJson(cwd, pkg);
+            postversDisabled = true;
+            // Commit this change so working directory is clean for version bump
+            const addResult = runCommand('git', ['add', 'package.json'], { cwd, silent: true });
+            if (addResult.success) {
+                runCommand('git', ['commit', '-m', 'Temporarily disable postversion hook'], { cwd, silent: true });
+            }
+        }
         try {
-            // Use libnpmversion - disable git operations to avoid conflicts with postversion hooks
-            // We handle git push ourselves after successful npm publish
+            // Use libnpmversion - it will create commit and tag automatically
             const newVersion = await libversion(bump, {
                 path: cwd,
-                'git-tag-version': true, // Create git commit and tag
-                'commit-hooks': false // Skip git hooks to prevent postversion from running
+                'git-tag-version': true
             });
+            // Restore postversion hook
+            if (postversDisabled && originalPostversion) {
+                const updatedPkg = readPackageJson(cwd);
+                if (!updatedPkg.scripts)
+                    updatedPkg.scripts = {};
+                updatedPkg.scripts.postversion = originalPostversion;
+                writePackageJson(cwd, updatedPkg);
+                // Commit the restoration
+                const addResult = runCommand('git', ['add', 'package.json'], { cwd, silent: true });
+                if (addResult.success) {
+                    runCommand('git', ['commit', '--amend', '--no-edit'], { cwd, silent: true });
+                }
+                if (verbose) {
+                    console.log('Restored postversion hook');
+                }
+            }
             console.log(colors.green(`Version bumped to ${newVersion}`));
         }
         catch (error) {
@@ -1729,11 +1781,11 @@ export async function globalize(cwd, options = {}) {
                 console.error(colors.green('Solution: Wait a few more minutes and try again'));
                 console.error('');
             }
-            else if (output.includes('403') || output.includes('forbidden')) {
+            else if (output.includes('403') || output.includes('forbidden') || output.includes('cannot publish over')) {
                 // Check if it's the "version already published" case
                 if (output.includes('cannot publish over') || output.includes('previously published')) {
                     // Extract the version number from the error if possible
-                    const versionMatch = output.match(/versions?:\s*(\d+\.\d+\.\d+)/);
+                    const versionMatch = output.match(/versions?[:\s]+(\d+\.\d+\.\d+)/);
                     const failedVersion = versionMatch ? versionMatch[1] : null;
                     // Check if this is the version we just bumped to
                     const currentPkgVersion = readPackageJson(cwd).version;
@@ -1748,6 +1800,9 @@ export async function globalize(cwd, options = {}) {
                         console.error('');
                         console.error('Verify with: ' + colors.yellow(`npm view ${pkg.name}@${currentPkgVersion}`));
                         console.error('');
+                        console.error(colors.yellow('Note: You may have a postversion script that auto-publishes.'));
+                        console.error(colors.yellow('npmglobalize will now skip that hook to prevent this issue.'));
+                        console.error('');
                         // Treat as success and continue
                         console.log(colors.green('✓ Treating as successful publish'));
                         // Don't return false - let it continue to push git tags

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bobfrankston/npmglobalize",
-  "version": "1.0.30",
+  "version": "1.0.32",
   "description": "Transform file: dependencies to npm versions for publishing",
   "main": "index.js",
   "type": "module",