hale-commenting-system 2.1.0 → 2.2.0

package/README.md

@@ -20,7 +20,7 @@ After installation, the onboarding flow will automatically start to help you con
 
 ## Requirements
 
-- PatternFly Seed project
+- PatternFly Seed project with PatternFly v6+ (`@patternfly/react-core` ^6.0.0)
 - GitHub account with OAuth app
 - Jira access (Red Hat Jira: issues.redhat.com)
 

package/bin/generators.d.ts

@@ -1,17 +1,19 @@
 interface GitHubConfig {
-    clientId: string;
-    clientSecret: string;
-    owner: string;
-    repo: string;
+    clientId?: string;
+    clientSecret?: string;
+    owner?: string;
+    repo?: string;
 }
 interface JiraConfig {
-    baseUrl: string;
-    apiToken: string;
+    baseUrl?: string;
+    apiToken?: string;
     email?: string;
 }
 interface Config {
-    github: GitHubConfig;
-    jira: JiraConfig;
+    github: GitHubConfig | null;
+    jira: JiraConfig | null;
+    owner: string;
+    repo: string;
 }
 export declare function generateFiles(config: Config): Promise<void>;
 export declare function integrateIntoProject(): Promise<void>;

package/bin/generators.js

@@ -41,16 +41,50 @@ async function generateFiles(config) {
     const cwd = process.cwd();
     // Generate .env file (client-safe)
     const envPath = path.join(cwd, '.env');
-    const envContent = `# GitHub OAuth (client-side; safe to expose)
+    let envContent = `# Hale Commenting System Configuration
+# Client-safe environment variables (these are exposed to the browser)
+
+`;
+    if (config.github && config.github.clientId) {
+        envContent += `# GitHub OAuth (client-side; safe to expose)
+# Get your Client ID from: https://github.com/settings/developers
+# 1. Click "New OAuth App"
+# 2. Fill in the form (Homepage: http://localhost:9000, Callback: http://localhost:9000/api/github-oauth-callback)
+# 3. Copy the Client ID
 VITE_GITHUB_CLIENT_ID=${config.github.clientId}
 
 # Target repo for Issues/Comments
-VITE_GITHUB_OWNER=${config.github.owner}
-VITE_GITHUB_REPO=${config.github.repo}
+VITE_GITHUB_OWNER=${config.github.owner || config.owner}
+VITE_GITHUB_REPO=${config.github.repo || config.repo}
+
+`;
+    }
+    else {
+        envContent += `# GitHub OAuth (client-side; safe to expose)
+# Get your Client ID from: https://github.com/settings/developers
+# 1. Click "New OAuth App"
+# 2. Fill in the form (Homepage: http://localhost:9000, Callback: http://localhost:9000/api/github-oauth-callback)
+# 3. Copy the Client ID
+VITE_GITHUB_CLIENT_ID=
+
+# Target repo for Issues/Comments
+VITE_GITHUB_OWNER=${config.owner}
+VITE_GITHUB_REPO=${config.repo}
 
-# Jira Base URL
+`;
+    }
+    if (config.jira && config.jira.baseUrl) {
+        envContent += `# Jira Base URL
+# For Red Hat Jira, use: https://issues.redhat.com
 VITE_JIRA_BASE_URL=${config.jira.baseUrl}
 `;
+    }
+    else {
+        envContent += `# Jira Base URL
+# For Red Hat Jira, use: https://issues.redhat.com
+VITE_JIRA_BASE_URL=
+`;
+    }
     // Check if .env exists and append or create
     if (fs.existsSync(envPath)) {
         const existing = fs.readFileSync(envPath, 'utf-8');
@@ -67,15 +101,56 @@ VITE_JIRA_BASE_URL=${config.jira.baseUrl}
         fs.writeFileSync(envPath, envContent);
         console.log('   ✅ Created .env file');
     }
+    // Note about empty values
+    if (!config.github || !config.jira) {
+        console.log('   ℹ️  Some values are empty - see comments in .env for setup instructions');
+    }
     // Generate .env.server file (secrets)
     const envServerPath = path.join(cwd, '.env.server');
-    let envServerContent = `# GitHub OAuth Client Secret (server-only)
+    let envServerContent = `# Hale Commenting System - Server Secrets
+# ⚠️  DO NOT COMMIT THIS FILE - It contains sensitive credentials
+# This file is automatically added to .gitignore
+
+`;
+    if (config.github && config.github.clientSecret) {
+        envServerContent += `# GitHub OAuth Client Secret (server-only)
+# Get this from your GitHub OAuth App settings: https://github.com/settings/developers
+# Click on your OAuth App, then "Generate a new client secret"
 GITHUB_CLIENT_SECRET=${config.github.clientSecret}
 
-# Jira API Token (server-only)
+`;
+    }
+    else {
+        envServerContent += `# GitHub OAuth Client Secret (server-only)
+# Get this from your GitHub OAuth App settings: https://github.com/settings/developers
+# Click on your OAuth App, then "Generate a new client secret"
+GITHUB_CLIENT_SECRET=
+
+`;
+    }
+    if (config.jira && config.jira.apiToken) {
+        envServerContent += `# Jira API Token (server-only)
+# For Red Hat Jira, generate a Personal Access Token:
+# 1. Visit: https://issues.redhat.com/secure/ViewProfile.jspa
+# 2. Click "Personal Access Tokens" in the left sidebar
+# 3. Click "Create token"
+# 4. Give it a name and remove expiration
+# 5. Copy the token
 JIRA_API_TOKEN=${config.jira.apiToken}
 `;
-    if (config.jira.email) {
+    }
+    else {
+        envServerContent += `# Jira API Token (server-only)
+# For Red Hat Jira, generate a Personal Access Token:
+# 1. Visit: https://issues.redhat.com/secure/ViewProfile.jspa
+# 2. Click "Personal Access Tokens" in the left sidebar
+# 3. Click "Create token"
+# 4. Give it a name and remove expiration
+# 5. Copy the token
+JIRA_API_TOKEN=
+`;
+    }
+    if (config.jira && config.jira.email) {
         envServerContent += `JIRA_EMAIL=${config.jira.email}\n`;
     }
     if (fs.existsSync(envServerPath)) {
@@ -92,6 +167,10 @@ JIRA_API_TOKEN=${config.jira.apiToken}
         fs.writeFileSync(envServerPath, envServerContent);
         console.log('   ✅ Created .env.server file');
     }
+    // Note about empty values
+    if (!config.github || !config.jira) {
+        console.log('   ℹ️  Some values are empty - see comments in .env.server for setup instructions');
+    }
     // Ensure .env.server is in .gitignore
     const gitignorePath = path.join(cwd, '.gitignore');
     if (fs.existsSync(gitignorePath)) {
@@ -121,8 +200,8 @@ async function integrateIntoProject() {
         return;
     }
     // Read the template
-    // In compiled output, templates will be in the package root
-    const packageRoot = path.resolve(__dirname, '../../..');
+    // In compiled output, templates are in the package root (same level as bin/)
+    const packageRoot = path.resolve(__dirname, '..');
     const templatePath = path.join(packageRoot, 'templates', 'webpack-middleware.js');
     if (!fs.existsSync(templatePath)) {
         console.log('   ⚠️  Template file not found. Manual integration required.');

package/bin/onboarding.js

@@ -228,117 +228,168 @@ async function runOnboarding() {
             repo = repoAnswers.repo;
         }
     }
-    // Step 2: GitHub OAuth Setup
-    console.log('\n📦 Step 2: GitHub OAuth Setup\n');
-    console.log('To sync comments with GitHub Issues, we need to authenticate with GitHub.');
-    console.log('This requires creating a GitHub OAuth App.\n');
-    console.log('Instructions:');
-    console.log('1. Visit: https://github.com/settings/developers');
-    console.log('2. Click "New OAuth App"');
-    console.log('3. Fill in the form:');
-    console.log('   - Application name: Your app name (e.g., "My Design Comments")');
-    console.log('   - Homepage URL: http://localhost:9000 (or your dev server URL)');
-    console.log('   - Authorization callback URL: http://localhost:9000/api/github-oauth-callback');
-    console.log('4. Click "Register application"');
-    console.log('5. Copy the Client ID and generate a Client Secret\n');
-    const githubAnswers = await inquirer_1.default.prompt([
+    // Step 2: GitHub OAuth Setup (Optional)
+    console.log('\n📦 Step 2: GitHub Integration (Optional)\n');
+    console.log('GitHub integration allows comments to sync with GitHub Issues.');
+    console.log('You can set this up now or add it later.\n');
+    const setupGitHub = await inquirer_1.default.prompt([
         {
-            type: 'input',
-            name: 'clientId',
-            message: 'GitHub OAuth Client ID:',
-            validate: (input) => {
-                if (!input.trim())
-                    return 'Client ID is required';
-                return true;
-            }
-        },
-        {
-            type: 'password',
-            name: 'clientSecret',
-            message: 'GitHub OAuth Client Secret:',
-            mask: '*',
-            validate: (input) => {
-                if (!input.trim())
-                    return 'Client Secret is required';
-                return true;
-            }
+            type: 'confirm',
+            name: 'setup',
+            message: 'Do you want to set up GitHub integration now?',
+            default: true
         }
     ]);
-    // Validate GitHub credentials
-    console.log('\n🔍 Validating GitHub credentials...');
-    const githubValid = await validators.validateGitHubCredentials(githubAnswers.clientId, githubAnswers.clientSecret, owner, repo);
-    if (!githubValid) {
-        console.error('❌ GitHub validation failed. Please check your credentials and try again.');
-        process.exit(1);
-    }
-    console.log('✅ GitHub credentials validated!\n');
-    // Step 3: Jira Setup
-    console.log('🎫 Step 3: Jira Setup\n');
-    console.log('You can link Jira tickets to pages in your design. This helps connect');
-    console.log('design work to development tracking.\n');
-    console.log('For Red Hat Jira, generate a Personal Access Token from:');
-    console.log('https://issues.redhat.com/secure/ViewProfile.jspa\n');
-    console.log('Note: We use Bearer token authentication (no email required for Red Hat Jira).\n');
-    const jiraAnswers = await inquirer_1.default.prompt([
-        {
-            type: 'input',
-            name: 'baseUrl',
-            message: 'Jira Base URL:',
-            default: 'https://issues.redhat.com',
-            validate: (input) => {
-                if (!input.trim())
-                    return 'Base URL is required';
-                try {
-                    new URL(input);
+    let githubConfig = null;
+    let githubValid = false;
+    if (setupGitHub.setup) {
+        console.log('\nTo sync comments with GitHub Issues, we need to authenticate with GitHub.');
+        console.log('This requires creating a GitHub OAuth App.\n');
+        console.log('Instructions:');
+        console.log('1. Visit: https://github.com/settings/developers');
+        console.log('2. Click "New OAuth App"');
+        console.log('3. Fill in the form:');
+        console.log('   - Application name: Your app name (e.g., "My Design Comments")');
+        console.log('   - Homepage URL: http://localhost:9000 (or your dev server URL)');
+        console.log('   - Authorization callback URL: http://localhost:9000/api/github-oauth-callback');
+        console.log('4. Click "Register application"');
+        console.log('5. Copy the Client ID and generate a Client Secret\n');
+        const githubAnswers = await inquirer_1.default.prompt([
+            {
+                type: 'input',
+                name: 'clientId',
+                message: 'GitHub OAuth Client ID:',
+                validate: (input) => {
+                    if (!input.trim())
+                        return 'Client ID is required';
                     return true;
                 }
-                catch {
-                    return 'Please enter a valid URL';
+            },
+            {
+                type: 'password',
+                name: 'clientSecret',
+                message: 'GitHub OAuth Client Secret:',
+                mask: '*',
+                validate: (input) => {
+                    if (!input.trim())
+                        return 'Client Secret is required';
+                    return true;
                 }
             }
-        },
-        {
-            type: 'password',
-            name: 'apiToken',
-            message: 'Jira API Token:',
-            mask: '*',
-            validate: (input) => {
-                if (!input.trim())
-                    return 'API Token is required';
-                return true;
-            }
+        ]);
+        // Validate GitHub credentials
+        console.log('\n🔍 Validating GitHub credentials...');
+        githubValid = await validators.validateGitHubCredentials(githubAnswers.clientId, githubAnswers.clientSecret, owner, repo);
+        if (!githubValid) {
+            console.error('❌ GitHub validation failed. Please check your credentials and try again.');
+            process.exit(1);
         }
-    ]);
-    // Validate Jira credentials
-    console.log('\n🔍 Validating Jira credentials...');
-    const jiraValid = await validators.validateJiraCredentials(jiraAnswers.baseUrl, jiraAnswers.apiToken, undefined // No email for Bearer token
-    );
-    if (!jiraValid) {
-        console.error('❌ Jira validation failed. Please check your credentials and try again.');
-        process.exit(1);
-    }
-    console.log('✅ Jira credentials validated!\n');
-    // Step 4: Generate files
-    console.log('📝 Step 4: Generating configuration files...\n');
-    await generators.generateFiles({
-        github: {
+        console.log('✅ GitHub credentials validated!\n');
+        githubConfig = {
             clientId: githubAnswers.clientId,
             clientSecret: githubAnswers.clientSecret,
             owner: owner,
             repo: repo
-        },
-        jira: {
+        };
+    }
+    else {
+        console.log('\n⏭️  Skipping GitHub setup. You can add it later by editing .env and .env.server files.\n');
+    }
+    // Step 3: Jira Setup (Optional)
+    console.log('🎫 Step 3: Jira Integration (Optional)\n');
+    console.log('Jira integration allows you to link Jira tickets to pages in your design.');
+    console.log('You can set this up now or add it later.\n');
+    const setupJira = await inquirer_1.default.prompt([
+        {
+            type: 'confirm',
+            name: 'setup',
+            message: 'Do you want to set up Jira integration now?',
+            default: true
+        }
+    ]);
+    let jiraConfig = null;
+    let jiraValid = false;
+    if (setupJira.setup) {
+        console.log('\nFor Red Hat Jira, generate a Personal Access Token:');
+        console.log('1. Visit: https://issues.redhat.com/secure/ViewProfile.jspa');
+        console.log('2. Click "Personal Access Tokens" in the left sidebar');
+        console.log('3. Click "Create token"');
+        console.log('4. Give it a name (e.g., "Hale Commenting System")');
+        console.log('5. Remove expiration (or set a long expiration)');
+        console.log('6. Click "Create" and copy the token\n');
+        console.log('Note: We use Bearer token authentication (no email required for Red Hat Jira).\n');
+        const jiraAnswers = await inquirer_1.default.prompt([
+            {
+                type: 'input',
+                name: 'baseUrl',
+                message: 'Jira Base URL (press Enter for Red Hat Jira):',
+                default: 'https://issues.redhat.com',
+                validate: (input) => {
+                    if (!input.trim())
+                        return 'Base URL is required';
+                    try {
+                        new URL(input);
+                        return true;
+                    }
+                    catch {
+                        return 'Please enter a valid URL';
+                    }
+                }
+            },
+            {
+                type: 'password',
+                name: 'apiToken',
+                message: 'Jira API Token:',
+                mask: '*',
+                validate: (input) => {
+                    if (!input.trim())
+                        return 'API Token is required';
+                    return true;
+                }
+            }
+        ]);
+        // Validate Jira credentials
+        console.log('\n🔍 Validating Jira credentials...');
+        jiraValid = await validators.validateJiraCredentials(jiraAnswers.baseUrl, jiraAnswers.apiToken, undefined // No email for Bearer token
+        );
+        if (!jiraValid) {
+            console.error('❌ Jira validation failed. Please check your credentials and try again.');
+            process.exit(1);
+        }
+        console.log('✅ Jira credentials validated!\n');
+        jiraConfig = {
             baseUrl: jiraAnswers.baseUrl,
             apiToken: jiraAnswers.apiToken,
-            email: undefined // Not used for Bearer token
-        }
+            email: undefined
+        };
+    }
+    else {
+        console.log('\n⏭️  Skipping Jira setup. You can add it later by editing .env and .env.server files.\n');
+    }
+    // Step 4: Generate files
+    console.log('📝 Step 4: Generating configuration files...\n');
+    await generators.generateFiles({
+        github: githubConfig,
+        jira: jiraConfig,
+        owner: owner,
+        repo: repo
     });
     // Step 5: Integrate into project
     console.log('🔧 Step 5: Integrating into PatternFly Seed project...\n');
     await generators.integrateIntoProject();
     console.log('\n✅ Setup complete!');
     console.log('\nNext steps:');
-    console.log('1. Review the generated .env and .env.server files');
-    console.log('2. Restart your dev server: npm run start:dev');
-    console.log('3. The commenting system will be available in your app!\n');
+    console.log('1. Start your dev server: npm run start:dev');
+    console.log('   (If it\'s already running, restart it to load the new configuration)');
+    console.log('2. The commenting system will be available in your app!\n');
+    if (!githubConfig || !jiraConfig) {
+        console.log('📝 To add integrations later:');
+        if (!githubConfig) {
+            console.log('   • GitHub: Edit .env and .env.server files (see comments in files for instructions)');
+        }
+        if (!jiraConfig) {
+            console.log('   • Jira: Edit .env and .env.server files (see comments in files for instructions)');
+        }
+        console.log('   • Then restart your dev server\n');
+    }
 }

package/dist/cli/generators.d.ts

@@ -1,17 +1,19 @@
 interface GitHubConfig {
-    clientId: string;
-    clientSecret: string;
-    owner: string;
-    repo: string;
+    clientId?: string;
+    clientSecret?: string;
+    owner?: string;
+    repo?: string;
 }
 interface JiraConfig {
-    baseUrl: string;
-    apiToken: string;
+    baseUrl?: string;
+    apiToken?: string;
     email?: string;
 }
 interface Config {
-    github: GitHubConfig;
-    jira: JiraConfig;
+    github: GitHubConfig | null;
+    jira: JiraConfig | null;
+    owner: string;
+    repo: string;
 }
 export declare function generateFiles(config: Config): Promise<void>;
 export declare function integrateIntoProject(): Promise<void>;

package/dist/cli/generators.js

@@ -41,16 +41,50 @@ async function generateFiles(config) {
     const cwd = process.cwd();
     // Generate .env file (client-safe)
     const envPath = path.join(cwd, '.env');
-    const envContent = `# GitHub OAuth (client-side; safe to expose)
+    let envContent = `# Hale Commenting System Configuration
+# Client-safe environment variables (these are exposed to the browser)
+
+`;
+    if (config.github && config.github.clientId) {
+        envContent += `# GitHub OAuth (client-side; safe to expose)
+# Get your Client ID from: https://github.com/settings/developers
+# 1. Click "New OAuth App"
+# 2. Fill in the form (Homepage: http://localhost:9000, Callback: http://localhost:9000/api/github-oauth-callback)
+# 3. Copy the Client ID
 VITE_GITHUB_CLIENT_ID=${config.github.clientId}
 
 # Target repo for Issues/Comments
-VITE_GITHUB_OWNER=${config.github.owner}
-VITE_GITHUB_REPO=${config.github.repo}
+VITE_GITHUB_OWNER=${config.github.owner || config.owner}
+VITE_GITHUB_REPO=${config.github.repo || config.repo}
+
+`;
+    }
+    else {
+        envContent += `# GitHub OAuth (client-side; safe to expose)
+# Get your Client ID from: https://github.com/settings/developers
+# 1. Click "New OAuth App"
+# 2. Fill in the form (Homepage: http://localhost:9000, Callback: http://localhost:9000/api/github-oauth-callback)
+# 3. Copy the Client ID
+VITE_GITHUB_CLIENT_ID=
+
+# Target repo for Issues/Comments
+VITE_GITHUB_OWNER=${config.owner}
+VITE_GITHUB_REPO=${config.repo}
 
-# Jira Base URL
+`;
+    }
+    if (config.jira && config.jira.baseUrl) {
+        envContent += `# Jira Base URL
+# For Red Hat Jira, use: https://issues.redhat.com
 VITE_JIRA_BASE_URL=${config.jira.baseUrl}
 `;
+    }
+    else {
+        envContent += `# Jira Base URL
+# For Red Hat Jira, use: https://issues.redhat.com
+VITE_JIRA_BASE_URL=
+`;
+    }
     // Check if .env exists and append or create
     if (fs.existsSync(envPath)) {
         const existing = fs.readFileSync(envPath, 'utf-8');
@@ -67,15 +101,56 @@ VITE_JIRA_BASE_URL=${config.jira.baseUrl}
         fs.writeFileSync(envPath, envContent);
         console.log('   ✅ Created .env file');
     }
+    // Note about empty values
+    if (!config.github || !config.jira) {
+        console.log('   ℹ️  Some values are empty - see comments in .env for setup instructions');
+    }
     // Generate .env.server file (secrets)
     const envServerPath = path.join(cwd, '.env.server');
-    let envServerContent = `# GitHub OAuth Client Secret (server-only)
+    let envServerContent = `# Hale Commenting System - Server Secrets
+# ⚠️  DO NOT COMMIT THIS FILE - It contains sensitive credentials
+# This file is automatically added to .gitignore
+
+`;
+    if (config.github && config.github.clientSecret) {
+        envServerContent += `# GitHub OAuth Client Secret (server-only)
+# Get this from your GitHub OAuth App settings: https://github.com/settings/developers
+# Click on your OAuth App, then "Generate a new client secret"
 GITHUB_CLIENT_SECRET=${config.github.clientSecret}
 
-# Jira API Token (server-only)
+`;
+    }
+    else {
+        envServerContent += `# GitHub OAuth Client Secret (server-only)
+# Get this from your GitHub OAuth App settings: https://github.com/settings/developers
+# Click on your OAuth App, then "Generate a new client secret"
+GITHUB_CLIENT_SECRET=
+
+`;
+    }
+    if (config.jira && config.jira.apiToken) {
+        envServerContent += `# Jira API Token (server-only)
+# For Red Hat Jira, generate a Personal Access Token:
+# 1. Visit: https://issues.redhat.com/secure/ViewProfile.jspa
+# 2. Click "Personal Access Tokens" in the left sidebar
+# 3. Click "Create token"
+# 4. Give it a name and remove expiration
+# 5. Copy the token
 JIRA_API_TOKEN=${config.jira.apiToken}
 `;
-    if (config.jira.email) {
+    }
+    else {
+        envServerContent += `# Jira API Token (server-only)
+# For Red Hat Jira, generate a Personal Access Token:
+# 1. Visit: https://issues.redhat.com/secure/ViewProfile.jspa
+# 2. Click "Personal Access Tokens" in the left sidebar
+# 3. Click "Create token"
+# 4. Give it a name and remove expiration
+# 5. Copy the token
+JIRA_API_TOKEN=
+`;
+    }
+    if (config.jira && config.jira.email) {
         envServerContent += `JIRA_EMAIL=${config.jira.email}\n`;
     }
     if (fs.existsSync(envServerPath)) {
@@ -92,6 +167,10 @@ JIRA_API_TOKEN=${config.jira.apiToken}
         fs.writeFileSync(envServerPath, envServerContent);
         console.log('   ✅ Created .env.server file');
     }
+    // Note about empty values
+    if (!config.github || !config.jira) {
+        console.log('   ℹ️  Some values are empty - see comments in .env.server for setup instructions');
+    }
     // Ensure .env.server is in .gitignore
     const gitignorePath = path.join(cwd, '.gitignore');
     if (fs.existsSync(gitignorePath)) {
@@ -121,8 +200,8 @@ async function integrateIntoProject() {
         return;
     }
     // Read the template
-    // In compiled output, templates will be in the package root
-    const packageRoot = path.resolve(__dirname, '../../..');
+    // In compiled output, templates are in the package root (same level as bin/)
+    const packageRoot = path.resolve(__dirname, '..');
     const templatePath = path.join(packageRoot, 'templates', 'webpack-middleware.js');
     if (!fs.existsSync(templatePath)) {
         console.log('   ⚠️  Template file not found. Manual integration required.');

package/dist/cli/onboarding.js

@@ -228,117 +228,168 @@ async function runOnboarding() {
             repo = repoAnswers.repo;
         }
     }
-    // Step 2: GitHub OAuth Setup
-    console.log('\n📦 Step 2: GitHub OAuth Setup\n');
-    console.log('To sync comments with GitHub Issues, we need to authenticate with GitHub.');
-    console.log('This requires creating a GitHub OAuth App.\n');
-    console.log('Instructions:');
-    console.log('1. Visit: https://github.com/settings/developers');
-    console.log('2. Click "New OAuth App"');
-    console.log('3. Fill in the form:');
-    console.log('   - Application name: Your app name (e.g., "My Design Comments")');
-    console.log('   - Homepage URL: http://localhost:9000 (or your dev server URL)');
-    console.log('   - Authorization callback URL: http://localhost:9000/api/github-oauth-callback');
-    console.log('4. Click "Register application"');
-    console.log('5. Copy the Client ID and generate a Client Secret\n');
-    const githubAnswers = await inquirer_1.default.prompt([
+    // Step 2: GitHub OAuth Setup (Optional)
+    console.log('\n📦 Step 2: GitHub Integration (Optional)\n');
+    console.log('GitHub integration allows comments to sync with GitHub Issues.');
+    console.log('You can set this up now or add it later.\n');
+    const setupGitHub = await inquirer_1.default.prompt([
         {
-            type: 'input',
-            name: 'clientId',
-            message: 'GitHub OAuth Client ID:',
-            validate: (input) => {
-                if (!input.trim())
-                    return 'Client ID is required';
-                return true;
-            }
-        },
-        {
-            type: 'password',
-            name: 'clientSecret',
-            message: 'GitHub OAuth Client Secret:',
-            mask: '*',
-            validate: (input) => {
-                if (!input.trim())
-                    return 'Client Secret is required';
-                return true;
-            }
+            type: 'confirm',
+            name: 'setup',
+            message: 'Do you want to set up GitHub integration now?',
+            default: true
         }
     ]);
-    // Validate GitHub credentials
-    console.log('\n🔍 Validating GitHub credentials...');
-    const githubValid = await validators.validateGitHubCredentials(githubAnswers.clientId, githubAnswers.clientSecret, owner, repo);
-    if (!githubValid) {
-        console.error('❌ GitHub validation failed. Please check your credentials and try again.');
-        process.exit(1);
-    }
-    console.log('✅ GitHub credentials validated!\n');
-    // Step 3: Jira Setup
-    console.log('🎫 Step 3: Jira Setup\n');
-    console.log('You can link Jira tickets to pages in your design. This helps connect');
-    console.log('design work to development tracking.\n');
-    console.log('For Red Hat Jira, generate a Personal Access Token from:');
-    console.log('https://issues.redhat.com/secure/ViewProfile.jspa\n');
-    console.log('Note: We use Bearer token authentication (no email required for Red Hat Jira).\n');
-    const jiraAnswers = await inquirer_1.default.prompt([
-        {
-            type: 'input',
-            name: 'baseUrl',
-            message: 'Jira Base URL:',
-            default: 'https://issues.redhat.com',
-            validate: (input) => {
-                if (!input.trim())
-                    return 'Base URL is required';
-                try {
-                    new URL(input);
+    let githubConfig = null;
+    let githubValid = false;
+    if (setupGitHub.setup) {
+        console.log('\nTo sync comments with GitHub Issues, we need to authenticate with GitHub.');
+        console.log('This requires creating a GitHub OAuth App.\n');
+        console.log('Instructions:');
+        console.log('1. Visit: https://github.com/settings/developers');
+        console.log('2. Click "New OAuth App"');
+        console.log('3. Fill in the form:');
+        console.log('   - Application name: Your app name (e.g., "My Design Comments")');
+        console.log('   - Homepage URL: http://localhost:9000 (or your dev server URL)');
+        console.log('   - Authorization callback URL: http://localhost:9000/api/github-oauth-callback');
+        console.log('4. Click "Register application"');
+        console.log('5. Copy the Client ID and generate a Client Secret\n');
+        const githubAnswers = await inquirer_1.default.prompt([
+            {
+                type: 'input',
+                name: 'clientId',
+                message: 'GitHub OAuth Client ID:',
+                validate: (input) => {
+                    if (!input.trim())
+                        return 'Client ID is required';
                     return true;
                 }
-                catch {
-                    return 'Please enter a valid URL';
+            },
+            {
+                type: 'password',
+                name: 'clientSecret',
+                message: 'GitHub OAuth Client Secret:',
+                mask: '*',
+                validate: (input) => {
+                    if (!input.trim())
+                        return 'Client Secret is required';
+                    return true;
                 }
             }
-        },
-        {
-            type: 'password',
-            name: 'apiToken',
-            message: 'Jira API Token:',
-            mask: '*',
-            validate: (input) => {
-                if (!input.trim())
-                    return 'API Token is required';
-                return true;
-            }
+        ]);
+        // Validate GitHub credentials
+        console.log('\n🔍 Validating GitHub credentials...');
+        githubValid = await validators.validateGitHubCredentials(githubAnswers.clientId, githubAnswers.clientSecret, owner, repo);
+        if (!githubValid) {
+            console.error('❌ GitHub validation failed. Please check your credentials and try again.');
+            process.exit(1);
         }
-    ]);
-    // Validate Jira credentials
-    console.log('\n🔍 Validating Jira credentials...');
-    const jiraValid = await validators.validateJiraCredentials(jiraAnswers.baseUrl, jiraAnswers.apiToken, undefined // No email for Bearer token
-    );
-    if (!jiraValid) {
-        console.error('❌ Jira validation failed. Please check your credentials and try again.');
-        process.exit(1);
-    }
-    console.log('✅ Jira credentials validated!\n');
-    // Step 4: Generate files
-    console.log('📝 Step 4: Generating configuration files...\n');
-    await generators.generateFiles({
-        github: {
+        console.log('✅ GitHub credentials validated!\n');
+        githubConfig = {
             clientId: githubAnswers.clientId,
             clientSecret: githubAnswers.clientSecret,
             owner: owner,
             repo: repo
-        },
-        jira: {
+        };
+    }
+    else {
+        console.log('\n⏭️  Skipping GitHub setup. You can add it later by editing .env and .env.server files.\n');
+    }
+    // Step 3: Jira Setup (Optional)
+    console.log('🎫 Step 3: Jira Integration (Optional)\n');
+    console.log('Jira integration allows you to link Jira tickets to pages in your design.');
+    console.log('You can set this up now or add it later.\n');
+    const setupJira = await inquirer_1.default.prompt([
+        {
+            type: 'confirm',
+            name: 'setup',
+            message: 'Do you want to set up Jira integration now?',
+            default: true
+        }
+    ]);
+    let jiraConfig = null;
+    let jiraValid = false;
+    if (setupJira.setup) {
+        console.log('\nFor Red Hat Jira, generate a Personal Access Token:');
+        console.log('1. Visit: https://issues.redhat.com/secure/ViewProfile.jspa');
+        console.log('2. Click "Personal Access Tokens" in the left sidebar');
+        console.log('3. Click "Create token"');
+        console.log('4. Give it a name (e.g., "Hale Commenting System")');
+        console.log('5. Remove expiration (or set a long expiration)');
+        console.log('6. Click "Create" and copy the token\n');
+        console.log('Note: We use Bearer token authentication (no email required for Red Hat Jira).\n');
+        const jiraAnswers = await inquirer_1.default.prompt([
+            {
+                type: 'input',
+                name: 'baseUrl',
+                message: 'Jira Base URL (press Enter for Red Hat Jira):',
+                default: 'https://issues.redhat.com',
+                validate: (input) => {
+                    if (!input.trim())
+                        return 'Base URL is required';
+                    try {
+                        new URL(input);
+                        return true;
+                    }
+                    catch {
+                        return 'Please enter a valid URL';
+                    }
+                }
+            },
+            {
+                type: 'password',
+                name: 'apiToken',
+                message: 'Jira API Token:',
+                mask: '*',
+                validate: (input) => {
+                    if (!input.trim())
+                        return 'API Token is required';
+                    return true;
+                }
+            }
+        ]);
+        // Validate Jira credentials
+        console.log('\n🔍 Validating Jira credentials...');
+        jiraValid = await validators.validateJiraCredentials(jiraAnswers.baseUrl, jiraAnswers.apiToken, undefined // No email for Bearer token
+        );
+        if (!jiraValid) {
+            console.error('❌ Jira validation failed. Please check your credentials and try again.');
+            process.exit(1);
+        }
+        console.log('✅ Jira credentials validated!\n');
+        jiraConfig = {
             baseUrl: jiraAnswers.baseUrl,
             apiToken: jiraAnswers.apiToken,
-            email: undefined // Not used for Bearer token
-        }
+            email: undefined
+        };
+    }
+    else {
+        console.log('\n⏭️  Skipping Jira setup. You can add it later by editing .env and .env.server files.\n');
+    }
+    // Step 4: Generate files
+    console.log('📝 Step 4: Generating configuration files...\n');
+    await generators.generateFiles({
+        github: githubConfig,
+        jira: jiraConfig,
+        owner: owner,
+        repo: repo
     });
     // Step 5: Integrate into project
     console.log('🔧 Step 5: Integrating into PatternFly Seed project...\n');
     await generators.integrateIntoProject();
     console.log('\n✅ Setup complete!');
     console.log('\nNext steps:');
-    console.log('1. Review the generated .env and .env.server files');
-    console.log('2. Restart your dev server: npm run start:dev');
-    console.log('3. The commenting system will be available in your app!\n');
+    console.log('1. Start your dev server: npm run start:dev');
+    console.log('   (If it\'s already running, restart it to load the new configuration)');
+    console.log('2. The commenting system will be available in your app!\n');
+    if (!githubConfig || !jiraConfig) {
+        console.log('📝 To add integrations later:');
+        if (!githubConfig) {
+            console.log('   • GitHub: Edit .env and .env.server files (see comments in files for instructions)');
+        }
+        if (!jiraConfig) {
+            console.log('   • Jira: Edit .env and .env.server files (see comments in files for instructions)');
+        }
+        console.log('   • Then restart your dev server\n');
+    }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hale-commenting-system",
-  "version": "2.1.0",
+  "version": "2.2.0",
   "description": "Commenting system for PatternFly Seed projects with GitHub and Jira integration",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",