obsidian-plugin-config 1.6.18 → 1.7.1

package/scripts/acp.ts

@@ -2,78 +2,74 @@ import { execSync } from 'child_process';
 import fs from 'fs';
 import path from 'path';
 import {
-	askQuestion,
-	cleanInput,
-	createReadlineInterface,
-	gitExec,
-	ensureGitSync
+  askQuestion,
+  cleanInput,
+  createReadlineInterface,
+  gitExec,
+  ensureGitSync
 } from './utils.js';
 
 const rl = createReadlineInterface();
 
-// Check if we're in the centralized config repo
+/** Check if we're in the centralized config repo */
 function isInCentralizedRepo(): boolean {
-	const packageJsonPath = path.join(process.cwd(), 'package.json');
-	if (!fs.existsSync(packageJsonPath)) return false;
+  const packageJsonPath = path.join(process.cwd(), 'package.json');
+  if (!fs.existsSync(packageJsonPath)) return false;
 
-	const packageJson = JSON.parse(fs.readFileSync(packageJsonPath, 'utf8'));
-	return packageJson.name === 'obsidian-plugin-config';
+  const packageJson = JSON.parse(fs.readFileSync(packageJsonPath, 'utf8'));
+  return packageJson.name === 'obsidian-plugin-config';
 }
 
 async function main(): Promise<void> {
-	try {
-		if (process.argv.includes('-b')) {
-			console.log('Building...');
-			// For obsidian-plugin-config, just run TypeScript check
-			if (isInCentralizedRepo()) {
-				gitExec('npx tsc --noEmit');
-			} else {
-				gitExec('yarn build');
-			}
-			console.log('Build successful.');
-		}
+  try {
+    if (process.argv.includes('-b')) {
+      console.log('Building...');
+      // For obsidian-plugin-config, just run TypeScript check
+      if (isInCentralizedRepo()) {
+        gitExec('npx tsc --noEmit');
+      } else {
+        gitExec('yarn build');
+      }
+      console.log('Build successful.');
+    }
 
+    const input: string = await askQuestion('Enter commit message: ', rl);
 
+    const cleanedInput = cleanInput(input);
 
-		const input: string = await askQuestion('Enter commit message: ', rl);
+    try {
+      gitExec('git add -A');
+      gitExec(`git commit -m "${cleanedInput}"`);
+    } catch {
+      console.log('Commit already exists or failed.');
+      return;
+    }
 
-		const cleanedInput = cleanInput(input);
+    // get current branch name
+    const currentBranch = execSync('git rev-parse --abbrev-ref HEAD').toString().trim();
 
-		try {
-			gitExec('git add -A');
-			gitExec(`git commit -m "${cleanedInput}"`);
-		} catch {
-			console.log('Commit already exists or failed.');
-			return;
-		}
+    // Ensure Git is synchronized before pushing
+    await ensureGitSync();
 
-		// get current branch name
-		const currentBranch = execSync('git rev-parse --abbrev-ref HEAD')
-			.toString()
-			.trim();
-
-		// Ensure Git is synchronized before pushing
-		await ensureGitSync();
-
-		try {
-			gitExec(`git push origin ${currentBranch}`);
-			console.log('Commit and push successful.');
-		} catch {
-			// new branch
-			console.log(`New branch detected. Setting upstream for ${currentBranch}...`);
-			gitExec(`git push --set-upstream origin ${currentBranch}`);
-			console.log('Upstream branch set and push successful.');
-		}
-	} catch (error) {
-		console.error('Error:', error instanceof Error ? error.message : String(error));
-	} finally {
-		rl.close();
-	}
+    try {
+      gitExec(`git push origin ${currentBranch}`);
+      console.log(`Commit and push successful to origin/${currentBranch}`);
+    } catch {
+      // new branch
+      console.log(`New branch detected. Setting upstream for ${currentBranch}...`);
+      gitExec(`git push --set-upstream origin ${currentBranch}`);
+      console.log('Upstream branch set and push successful.');
+    }
+  } catch (error) {
+    console.error('Error:', error instanceof Error ? error.message : String(error));
+  } finally {
+    rl.close();
+  }
 }
 
 main()
-	.catch(console.error)
-	.finally(() => {
-		console.log('Exiting...');
-		process.exit();
-	});
+  .catch(console.error)
+  .finally(() => {
+    console.log('Exiting...');
+    process.exit();
+  });

package/scripts/build-npm.ts

@@ -8,21 +8,21 @@ import { execSync } from 'child_process';
  * Generate bin/obsidian-inject.js from template
  */
 async function generateBinFile(): Promise<void> {
-	console.log(`\n🔧 Generating bin/obsidian-inject.js...`);
+  console.log(`\n🔧 Generating bin/obsidian-inject.js...`);
 
-	const binDir = 'bin';
-	const binPath = path.join(binDir, 'obsidian-inject.js');
+  const binDir = 'bin';
+  const binPath = path.join(binDir, 'obsidian-inject.js');
 
-	// Ensure bin directory exists
-	if (!fs.existsSync(binDir)) {
-		fs.mkdirSync(binDir, { recursive: true });
-		console.log(`   📁 Created ${binDir} directory`);
-	}
+  // Ensure bin directory exists
+  if (!fs.existsSync(binDir)) {
+    fs.mkdirSync(binDir, { recursive: true });
+    console.log(`   📁 Created ${binDir} directory`);
+  }
 
-	// Read package.json for version info
-	const packageJson = JSON.parse(fs.readFileSync('package.json', 'utf8'));
+  // Read package.json for version info
+  const packageJson = JSON.parse(fs.readFileSync('package.json', 'utf8'));
 
-	const binContent = `#!/usr/bin/env node
+  const binContent = `#!/usr/bin/env node
 
 /**
  * Obsidian Plugin Config - CLI Entry Point
@@ -52,19 +52,16 @@ USAGE:
   obsidian-inject                    # Inject in current directory (with confirmation)
   obsidian-inject <path>             # Inject by path (with confirmation)
   obsidian-inject <path> --no        # Inject without confirmation
-  obsidian-inject <path> --sass      # Inject with SASS support
   obsidian-inject --help, -h         # Show this help
 
 OPTIONS:
   --no, -n                           # Skip confirmation prompts (auto-confirm all)
-  --sass                             # Add SASS support (esbuild-sass-plugin)
   --dry-run                          # Verification only (no changes)
 
 EXAMPLES:
   cd my-plugin && obsidian-inject
   obsidian-inject ../my-other-plugin
   obsidian-inject ../my-plugin --no
-  obsidian-inject ../my-plugin --sass
   obsidian-inject "C:\\\\Users\\\\dev\\\\plugins\\\\my-plugin"
 
 WHAT IS INJECTED:
@@ -73,7 +70,6 @@ WHAT IS INJECTED:
   ✅ Config files (tsconfig, eslint, prettier, vscode, github)
   ✅ Yarn protection enforced
   ✅ Automatic dependency installation
-  🎨 SASS support (with --sass option): esbuild-sass-plugin + SCSS compilation
 
 ARCHITECTURE:
   - Plugin becomes AUTONOMOUS with local scripts
@@ -102,7 +98,6 @@ function main() {
 
   // Parse arguments
   const noConfirm = args.includes('--no') || args.includes('-n');
-  const sassFlag = args.includes('--sass');
   const dryRun = args.includes('--dry-run');
   const pathArg = args.find(arg => !arg.startsWith('-'));
 
@@ -117,7 +112,6 @@ function main() {
 
   console.log(\`🎯 Obsidian Plugin Config - Global Injection\`);
   console.log(\`📁 Target: \${targetPath}\`);
-  console.log(\`🎨 SASS: \${sassFlag ? 'Enabled' : 'Disabled'}\`);
   console.log(\`❓ Confirmation: \${noConfirm ? 'Disabled (auto-confirm)' : 'Enabled'}\`);
   console.log(\`📦 From: \${packageRoot}\\n\`);
 
@@ -163,7 +157,6 @@ function main() {
     }
 
     // Check if tsx is available locally in target
-    let tsxCommand = 'npx tsx';
     try {
       execSync('npx tsx --version', {
         cwd: targetPath,
@@ -188,10 +181,9 @@ function main() {
     }
 
     // Execute the injection script with tsx
-    const sassOption = sassFlag ? ' --sass' : '';
     const yesOption = noConfirm ? ' --yes' : '';
     const dryRunOption = dryRun ? ' --dry-run' : '';
-    const command = \`npx tsx "\${injectScriptPath}" "\${targetPath}"\${yesOption}\${sassOption}\${dryRunOption}\`;
+    const command = \`npx tsx "\${injectScriptPath}" "\${targetPath}"\${yesOption}\${dryRunOption}\`;
 
     execSync(command, {
       stdio: 'inherit',
@@ -210,170 +202,191 @@ function main() {
 main();
 `;
 
-	fs.writeFileSync(binPath, binContent, 'utf8');
-	console.log(`   ✅ Generated ${binPath}`);
+  fs.writeFileSync(binPath, binContent, 'utf8');
+  console.log(`   ✅ Generated ${binPath}`);
 }
 
 /**
- * Check NPM authentication and prompt login if needed
+ * Ensure NPM authentication, prompting login if needed, then verifying success.
  */
 async function ensureNpmAuth(): Promise<void> {
-	console.log(`🔐 Checking NPM authentication...`);
-
-	try {
-		const whoami = execSync('npm whoami --registry https://registry.npmjs.org/', {
-			stdio: 'pipe',
-			encoding: 'utf8'
-		}).trim();
-		console.log(`   ✅ Logged in as: ${whoami}\n`);
-	} catch {
-		console.log(`   ⚠️  Not logged in to NPM\n`);
-		console.log(`🔑 Please login to NPM to publish the package`);
-		console.log(`   Opening browser for authentication...\n`);
-
-		try {
-			execSync('npm login --auth-type=web --registry https://registry.npmjs.org/', {
-				stdio: 'inherit'
-			});
-			console.log(`\n   ✅ Successfully logged in to NPM\n`);
-		} catch {
-			console.error(`\n   ❌ NPM login failed`);
-			console.error(`   Please run 'npm login' manually and try again`);
-			throw new Error('NPM authentication required');
-		}
-	}
+  console.log(`🔐 Checking NPM authentication...`);
+
+  const checkWhoami = (): string | null => {
+    try {
+      return execSync('npm whoami --registry https://registry.npmjs.org/', {
+        stdio: 'pipe',
+        encoding: 'utf8'
+      }).trim();
+    } catch {
+      return null;
+    }
+  };
+
+  const whoami = checkWhoami();
+  if (whoami) {
+    console.log(`   ✅ Logged in as: ${whoami}\n`);
+    return;
+  }
+
+  console.log(`   ⚠️  Not logged in to NPM`);
+  console.log(`🔑 Please login to NPM to publish the package`);
+  console.log(`   Opening browser for authentication...\n`);
+
+  try {
+    execSync('npm login --auth-type=web --registry https://registry.npmjs.org/', {
+      stdio: 'inherit'
+    });
+  } catch {
+    console.error(`\n   ❌ NPM login failed`);
+    console.error(`   Please run 'npm login' manually and try again`);
+    throw new Error('NPM authentication required');
+  }
+
+  // Verify login actually succeeded
+  const whoamiAfter = checkWhoami();
+  if (!whoamiAfter) {
+    console.error(`\n   ❌ Login appeared to complete but authentication could not be verified`);
+    throw new Error('NPM authentication required');
+  }
+
+  console.log(`\n   ✅ Successfully logged in as: ${whoamiAfter}\n`);
 }
 
 /**
  * Complete NPM workflow - Version, Commit, Push, Publish
  */
 async function buildAndPublishNpm(): Promise<void> {
-	console.log(`🚀 Obsidian Plugin Config - NPM Publish Workflow`);
-	console.log(`Automation: version → bin → verify → commit → publish\n`);
-
-	try {
-		// Step 0: Check NPM authentication
-		await ensureNpmAuth();
-
-		// Step 1: Update version
-		console.log(`📋 Step 1/5: Updating version...`);
-		execSync('tsx scripts/update-version-config.ts', { stdio: 'inherit' });
-
-		// Step 2: Generate bin file
-		console.log(`\n🔧 Step 2/5: Generating bin/obsidian-inject.js...`);
-		await generateBinFile();
-
-		// Step 3: Verify package
-		console.log(`\n📋 Step 3/5: Verifying package...`);
-		verifyPackage();
-
-		// Step 4: Commit and push
-		console.log(`\n📤 Step 4/5: Committing and pushing changes...`);
-		try {
-			// Add all changes
-			execSync('git add -A', { stdio: 'pipe' });
-			
-			// Check if there are changes to commit
-			const status = execSync('git status --porcelain', { encoding: 'utf8' });
-			if (status.trim()) {
-				const packageJson = JSON.parse(fs.readFileSync('package.json', 'utf8'));
-				execSync(`git commit -m "Publish NPM package v${packageJson.version}"`, {
-					stdio: 'pipe'
-				});
-				
-				// Get current branch and push
-				const currentBranch = execSync('git rev-parse --abbrev-ref HEAD', {
-					encoding: 'utf8'
-				}).trim();
-				execSync(`git push origin ${currentBranch}`, { stdio: 'inherit' });
-				console.log(`   ✅ Changes committed and pushed`);
-			} else {
-				console.log(`   ℹ️  No changes to commit`);
-			}
-		} catch (error) {
-			console.error(`   ❌ Commit/push failed: ${error instanceof Error ? error.message : String(error)}`);
-			throw error;
-		}
-
-		// Step 5: Publish to NPM
-		console.log(`\n📤 Step 5/5: Publishing to NPM...`);
-		execSync('npm publish --registry https://registry.npmjs.org/', {
-			stdio: 'inherit'
-		});
-
-		// Optional: Update global CLI automatically
-		console.log(`\n🌍 Updating global CLI...`);
-		console.log(`   ⏳ Waiting 30s for NPM registry propagation...`);
-		await new Promise((resolve) => setTimeout(resolve, 30000));
-		try {
-			execSync(
-				'npm install -g obsidian-plugin-config@latest --force --engine-strict=false',
-				{ stdio: 'inherit' }
-			);
-			console.log(`   ✅ Global CLI updated`);
-		} catch {
-			console.log(`   ⚠️  Global CLI update failed (NPM registry may need more time)`);
-			console.log(`   💡 Run manually in a few minutes: npm install -g obsidian-plugin-config@latest --force`);
-		}
-		console.log(`\n🎉 Complete workflow successful!`);
-		console.log(`   Test: cd any-plugin && obsidian-inject`);
-	} catch (error) {
-		console.error(
-			`\n❌ Workflow failed: ${error instanceof Error ? error.message : String(error)}`
-		);
-		process.exit(1);
-	}
+  console.log(`🚀 Obsidian Plugin Config - NPM Publish Workflow`);
+  console.log(`Automation: version → bin → verify → commit → publish\n`);
+
+  try {
+    // Step 0: Check NPM authentication
+    await ensureNpmAuth();
+
+    // Step 1: Update version
+    console.log(`📋 Step 1/5: Updating version...`);
+    execSync('tsx scripts/update-version-config.ts', { stdio: 'inherit' });
+
+    // Step 2: Generate bin file
+    console.log(`\n🔧 Step 2/5: Generating bin/obsidian-inject.js...`);
+    await generateBinFile();
+
+    // Step 3: Verify package
+    console.log(`\n📋 Step 3/5: Verifying package...`);
+    verifyPackage();
+
+    // Step 4: Commit and push
+    console.log(`\n📤 Step 4/5: Committing and pushing changes...`);
+    try {
+      // Add all changes
+      execSync('git add -A', { stdio: 'pipe' });
+
+      // Check if there are changes to commit
+      const status = execSync('git status --porcelain', { encoding: 'utf8' });
+      if (status.trim()) {
+        const packageJson = JSON.parse(fs.readFileSync('package.json', 'utf8'));
+        execSync(`git commit -m "Publish NPM package v${packageJson.version}"`, {
+          stdio: 'pipe'
+        });
+
+        // Get current branch and push
+        const currentBranch = execSync('git rev-parse --abbrev-ref HEAD', {
+          encoding: 'utf8'
+        }).trim();
+        execSync(`git push origin ${currentBranch}`, { stdio: 'inherit' });
+        console.log(`   ✅ Changes committed and pushed`);
+      } else {
+        console.log(`   ℹ️  No changes to commit`);
+      }
+    } catch (error) {
+      console.error(
+        `   ❌ Commit/push failed: ${error instanceof Error ? error.message : String(error)}`
+      );
+      throw error;
+    }
+
+    // Step 5: Publish to NPM
+    console.log(`\n📤 Step 5/5: Publishing to NPM...`);
+    execSync('npm publish --registry https://registry.npmjs.org/', {
+      stdio: 'inherit'
+    });
+
+    // Optional: Update global CLI automatically
+    console.log(`\n🌍 Updating global CLI...`);
+    console.log(`   ⏳ Waiting 30s for NPM registry propagation...`);
+    await new Promise((resolve) => setTimeout(resolve, 30000));
+    try {
+      execSync(
+        'npm install -g obsidian-plugin-config@latest --force --engine-strict=false',
+        { stdio: 'inherit' }
+      );
+      console.log(`   ✅ Global CLI updated`);
+    } catch {
+      console.log(`   ⚠️  Global CLI update failed (NPM registry may need more time)`);
+      console.log(
+        `   💡 Run manually in a few minutes: npm install -g obsidian-plugin-config@latest --force`
+      );
+    }
+    console.log(`\n🎉 Complete workflow successful!`);
+    console.log(`   Test: cd any-plugin && obsidian-inject`);
+  } catch (error) {
+    console.error(
+      `\n❌ Workflow failed: ${error instanceof Error ? error.message : String(error)}`
+    );
+    process.exit(1);
+  }
 }
 
 /**
  * Verify package is ready for publication
  */
 function verifyPackage(): void {
-	// Check required scripts
-	const requiredScripts = [
-		'scripts/inject-path.ts',
-		'scripts/inject-prompt.ts',
-		'scripts/inject-core.ts',
-		'scripts/utils.ts',
-		'scripts/acp.ts',
-		'scripts/update-version-config.ts',
-		'scripts/help.ts'
-	];
-
-	for (const script of requiredScripts) {
-		if (!fs.existsSync(script)) {
-			throw new Error(`Missing required script: ${script}`);
-		}
-	}
-	console.log(`   ✅ All required scripts present`);
-
-	// Check package.json
-	const packageJson = JSON.parse(fs.readFileSync('package.json', 'utf8'));
-	const requiredFields = [
-		'name',
-		'version',
-		'description',
-		'bin',
-		'repository',
-		'author'
-	];
-
-	for (const field of requiredFields) {
-		if (!packageJson[field]) {
-			throw new Error(`Missing required package.json field: ${field}`);
-		}
-	}
-	console.log(`   ✅ Package.json valid (v${packageJson.version})`);
-
-	// Check bin file exists
-	if (!fs.existsSync('bin/obsidian-inject.js')) {
-		throw new Error(`Missing bin file: bin/obsidian-inject.js`);
-	}
-	console.log(`   ✅ Bin file ready`);
-
-	// Quick build test
-	execSync('tsc --noEmit', { stdio: 'pipe' });
-	console.log(`   ✅ TypeScript check passed`);
+  // Check required scripts
+  const requiredScripts = [
+    'scripts/inject-path.ts',
+    'scripts/inject-prompt.ts',
+    'scripts/inject-core.ts',
+    'scripts/utils.ts',
+    'scripts/acp.ts',
+    'scripts/update-version-config.ts',
+    'scripts/help.ts'
+  ];
+
+  for (const script of requiredScripts) {
+    if (!fs.existsSync(script)) {
+      throw new Error(`Missing required script: ${script}`);
+    }
+  }
+  console.log(`   ✅ All required scripts present`);
+
+  // Check package.json
+  const packageJson = JSON.parse(fs.readFileSync('package.json', 'utf8'));
+  const requiredFields = [
+    'name',
+    'version',
+    'description',
+    'bin',
+    'repository',
+    'author'
+  ];
+
+  for (const field of requiredFields) {
+    if (!packageJson[field]) {
+      throw new Error(`Missing required package.json field: ${field}`);
+    }
+  }
+  console.log(`   ✅ Package.json valid (v${packageJson.version})`);
+
+  // Check bin file exists
+  if (!fs.existsSync('bin/obsidian-inject.js')) {
+    throw new Error(`Missing bin file: bin/obsidian-inject.js`);
+  }
+  console.log(`   ✅ Bin file ready`);
+
+  // Quick build test
+  execSync('tsc --noEmit', { stdio: 'pipe' });
+  console.log(`   ✅ TypeScript check passed`);
 }
 
 // Run the script

package/scripts/help.ts

@@ -18,7 +18,6 @@ LINTING:
 INJECTION (local testing):
   yarn inject-prompt              # Interactive injection
   yarn inject-path <path>         # Direct injection
-  yarn inject <path> --sass       # Injection with SASS support
   yarn check-plugin <path>        # Verification only (dry-run)
 
 NPM PUBLISHING:
@@ -43,7 +42,6 @@ PURE INJECTION TOOL:
 
 templates/ → what gets injected:
   templates/package.json          # Base deps/scripts for target plugins
-  templates/package-sass.json     # Extra deps when --sass is used
   templates/tsconfig.json         # TypeScript config
   templates/scripts/*             # Scripts copied to target
   templates/eslint.config.mts     # ESLint config
@@ -55,7 +53,7 @@ inject-core.ts — shared injection logic:
   performInjection()              # Main orchestration
 
 inject-path.ts — CLI entry point:
-  Parses --yes, --dry-run, --sass flags
+  Parses --yes, --dry-run flags
 
 inject-prompt.ts — interactive entry:
   Prompts for target path
@@ -72,7 +70,6 @@ Development:
 Global CLI Usage:
   obsidian-inject                 # Inject in current dir
   obsidian-inject ../my-plugin    # Inject by path
-  obsidian-inject ../my-plugin --sass  # With SASS
   obsidian-inject --help          # Show help
 
 Local Testing:
@@ -80,10 +77,10 @@ Local Testing:
   yarn inject-path ../my-plugin   # Direct
   yarn check-plugin ../my-plugin  # Dry-run
 
-SASS Support (--sass flag):
-  ✅ esbuild-sass-plugin dependency
+SASS Support (automatic):
   ✅ Automatic .scss detection (src/styles.scss priority)
   ✅ CSS cleanup after compilation
+  💡 Install esbuild-sass-plugin manually if you use SCSS
 
 ═══════════════════════════════════════════════════════════════════