hale-commenting-system 2.2.1 → 2.2.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hale-commenting-system",
-  "version": "2.2.1",
+  "version": "2.2.3",
   "description": "An open source build scaffolding utility for web apps.",
   "repository": "https://github.com/patternfly/patternfly-react-seed.git",
   "homepage": "https://patternfly-react-seed.surge.sh",
@@ -67,17 +67,17 @@
     "webpack-bundle-analyzer": "^4.10.2",
     "webpack-cli": "^5.1.4",
     "webpack-dev-server": "^5.2.1",
-    "webpack-merge": "^6.0.1",
-    "@babel/core": "^7.23.0",
-    "@babel/traverse": "^7.23.0",
-    "@babel/generator": "^7.23.0",
-    "@babel/types": "^7.23.0"
+    "webpack-merge": "^6.0.1"
   },
   "dependencies": {
     "@patternfly/react-core": "^6.4.0",
     "@patternfly/react-icons": "^6.4.0",
     "@patternfly/react-styles": "^6.4.0",
     "react": "^18",
+    "@babel/parser": "^7.23.0",
+    "@babel/traverse": "^7.23.0",
+    "@babel/generator": "^7.23.0",
+    "@babel/types": "^7.23.0",
     "react-dom": "^18",
     "sirv-cli": "^3.0.0"
   },

package/scripts/integrate.js

@@ -14,14 +14,14 @@ const { execSync } = require('child_process');
 // Check if required dependencies are available
 let parser, traverse, generate, types;
 try {
-  const babel = require('@babel/core');
-  parser = babel.parse;
+  parser = require('@babel/parser').parse;
   traverse = require('@babel/traverse').default;
   generate = require('@babel/generator').default;
   types = require('@babel/types');
 } catch (e) {
-  console.error('❌ Error: @babel/core, @babel/traverse, and @babel/generator are required.');
-  console.error('   Please install: npm install --save-dev @babel/core @babel/traverse @babel/generator @babel/types');
+  console.error('❌ Error: @babel/parser, @babel/traverse, @babel/generator, and @babel/types are required.');
+  console.error('   These should be included with hale-commenting-system package.');
+  console.error('   If the error persists, please report this issue.');
   process.exit(1);
 }
 
@@ -43,6 +43,8 @@ function findFile(filename, startDir = process.cwd()) {
     path.join(startDir, filename),
     path.join(startDir, 'src', filename),
     path.join(startDir, 'src', 'app', filename),
+    // Support for AppLayout subdirectory
+    path.join(startDir, 'src', 'app', 'AppLayout', filename),
   ];
 
   for (const filePath of possiblePaths) {
@@ -53,6 +55,30 @@ function findFile(filename, startDir = process.cwd()) {
   return null;
 }
 
+function getPackageVersion() {
+  try {
+    // Get the script's directory and find package.json relative to it
+    const scriptDir = __dirname || path.dirname(require.resolve('./integrate.js'));
+    const packageJsonPath = path.join(scriptDir, '..', 'package.json');
+    const packageJson = JSON.parse(fs.readFileSync(packageJsonPath, 'utf8'));
+    return packageJson.version || 'unknown';
+  } catch (e) {
+    // Fallback: try to find package.json in current working directory or parent
+    try {
+      const cwdPackageJson = path.join(process.cwd(), 'package.json');
+      if (fs.existsSync(cwdPackageJson)) {
+        const packageJson = JSON.parse(fs.readFileSync(cwdPackageJson, 'utf8'));
+        if (packageJson.name === 'hale-commenting-system') {
+          return packageJson.version || 'unknown';
+        }
+      }
+    } catch (e2) {
+      // ignore
+    }
+    return 'unknown';
+  }
+}
+
 function modifyIndexTsx(filePath) {
   const content = fs.readFileSync(filePath, 'utf8');
   
@@ -341,9 +367,15 @@ function modifyAppLayoutTsx(filePath) {
 }
 
 async function main() {
-  console.log('\n╔══════════════════════════════════════════════════════════╗');
-  console.log('║   🎨 Hale Commenting System - Integration                ║');
-  console.log('╚══════════════════════════════════════════════════════════╝\n');
+  const version = getPackageVersion();
+  const title = `Hale Commenting System (v.${version})`;
+  const titleLength = title.length;
+  const borderLength = Math.max(titleLength + 4, 54);
+  const padding = Math.floor((borderLength - titleLength - 2) / 2);
+  
+  console.log('\n' + '╔' + '═'.repeat(borderLength - 2) + '╗');
+  console.log('║' + ' '.repeat(padding) + title + ' '.repeat(borderLength - titleLength - padding - 2) + '║');
+  console.log('╚' + '═'.repeat(borderLength - 2) + '╝\n');
 
   console.log('We\'ll automatically integrate the commenting system into your project.\n');
   console.log('This will modify the following files:');
@@ -363,7 +395,7 @@ async function main() {
 
   const indexPath = findFile('index.tsx');
   const routesPath = findFile('routes.tsx');
-  const appLayoutPath = findFile('AppLayout.tsx');
+  const appLayoutPath = findFile('AppLayout/AppLayout.tsx') || findFile('AppLayout.tsx');
 
   if (!indexPath) {
     console.error('❌ Could not find src/app/index.tsx');