generator-jhipster-sentry-module 1.0.9 → 1.0.11

package/generators/app/index.js

@@ -5,6 +5,8 @@ const semver = require('semver');
 const Generator = require('yeoman-generator');
 const packageJson = require('../../package.json');
 
+const JHIPSTER_CONFIG_KEY = 'generator-jhipster';
+
 const jhipsterConstants = {
   SERVER_MAIN_SRC_DIR: 'src/main/java/',
   SERVER_MAIN_RES_DIR: 'src/main/resources/',
@@ -14,12 +16,19 @@ const jhipsterConstants = {
 module.exports = class extends Generator {
 
   async initializing() {
-    const yoConfig = this.fs.readJSON(this.destinationPath('.yo-rc.json'), {});
-    this.jhipsterAppConfig = yoConfig['generator-jhipster'];
+    const yoRcPath = this.destinationPath('.yo-rc.json');
+
+    if (!fs.existsSync(yoRcPath)) {
+      this.log(chalk.red('❌ Not a JHipster project (.yo-rc.json not found)'));
+      process.exit(1);
+    }
+
+    const yoRc = this.fs.readJSON(yoRcPath, {});
+    this.jhipsterAppConfig = yoRc[JHIPSTER_CONFIG_KEY];
 
     if (!this.jhipsterAppConfig) {
-      this.log(chalk.red('Cannot read .yo-rc.json or JHipster config missing'));
-      return;
+      this.log(chalk.red('❌ JHipster configuration missing inside .yo-rc.json'));
+      process.exit(1);
     }
 
     this.log(
@@ -28,11 +37,12 @@ module.exports = class extends Generator {
       )}`
     );
 
-    const currentVersion = this.jhipsterAppConfig.jhipsterVersion || '0.0.0';
-    if (!semver.satisfies(currentVersion, '>=8.0.0')) {
+    const currentVersion = this.jhipsterAppConfig.jhipsterVersion;
+
+    if (currentVersion && !semver.satisfies(currentVersion, '>=8.0.0')) {
       this.log(
         chalk.yellow(
-          `Warning: Your JHipster version is ${currentVersion}, minimum required is 8.0.0\n`
+          `⚠ Your JHipster version is ${currentVersion}. Recommended >= 8.0.0\n`
         )
       );
     }
@@ -56,7 +66,10 @@ module.exports = class extends Generator {
   }
 
   writing() {
-    if (!this.jhipsterAppConfig) return;
+    if (!this.promptAnswers.enableSentry) {
+      this.log(chalk.yellow('Sentry disabled — skipping integration'));
+      return;
+    }
 
     const {
       baseName,
@@ -67,34 +80,39 @@ module.exports = class extends Generator {
     } = this.jhipsterAppConfig;
 
     const webappDir = jhipsterConstants.CLIENT_MAIN_SRC_DIR;
-    const resourceDir = jhipsterConstants.SERVER_MAIN_RES_DIR;
 
-    // Save config
-    this.jhipsterAppConfig.sentry = {
-      enabled: this.promptAnswers.enableSentry,
+    this.log('\n--- JHipster Config ---');
+    this.log(`baseName=${baseName}`);
+    this.log(`packageName=${packageName}`);
+    this.log(`clientFramework=${clientFramework}`);
+    this.log(`buildTool=${buildTool}`);
+    this.log('------------------------\n');
+
+    /* ============================
+       Persist config in .yo-rc.json
+    ============================= */
+
+    const yoRcPath = this.destinationPath('.yo-rc.json');
+    const yoRc = this.fs.readJSON(yoRcPath, {});
+    yoRc[JHIPSTER_CONFIG_KEY] = yoRc[JHIPSTER_CONFIG_KEY] || {};
+    yoRc[JHIPSTER_CONFIG_KEY].sentry = {
+      enabled: true,
       dsn: this.promptAnswers.sentryDsn
     };
 
-    const configPath = this.destinationPath('.yo-rc.json');
-    const config = this.fs.readJSON(configPath, {});
-    config['generator-jhipster'].sentry = this.jhipsterAppConfig.sentry;
-    this.fs.writeJSON(configPath, config, null, 2);
+    this.fs.writeJSON(yoRcPath, yoRc, null, 2);
 
-    if (!this.promptAnswers.enableSentry) {
-      this.log(chalk.yellow('Sentry disabled — skipping integration'));
-      return;
-    }
+    /* ============================
+       Backend Dependency Injection
+    ============================= */
 
-    // ======================
-    // Backend (Maven only safe injection)
-    // ======================
     if (buildTool === 'maven') {
       const pomPath = this.destinationPath('pom.xml');
       if (fs.existsSync(pomPath)) {
         let pom = fs.readFileSync(pomPath, 'utf8');
         if (!pom.includes('sentry-spring-boot-starter')) {
           pom = pom.replace(
-            /<\/dependencies>/,
+            '</dependencies>',
             `
         <dependency>
             <groupId>io.sentry</groupId>
@@ -108,33 +126,71 @@ module.exports = class extends Generator {
       }
     }
 
-    // ======================
-    // Frontend
-    // ======================
-    if (clientFramework === 'react') {
-      this.fs.copyTpl(
-        this.templatePath('client/react/sentry.ts.ejs'),
-        this.destinationPath(`${webappDir}app/sentry.ts`),
-        { sentryDsn: this.promptAnswers.sentryDsn }
-      );
+    if (buildTool === 'gradle') {
+      const gradlePath = this.destinationPath('build.gradle');
+      if (fs.existsSync(gradlePath)) {
+        let gradle = fs.readFileSync(gradlePath, 'utf8');
+        if (!gradle.includes('sentry-spring-boot-starter')) {
+          gradle += `
+dependencies {
+    implementation "io.sentry:sentry-spring-boot-starter:7.3.0"
+}
+`;
+          fs.writeFileSync(gradlePath, gradle);
+        }
+      }
+    }
+
+    /* ============================
+       Frontend Dependency Injection
+    ============================= */
+
+    const packagePath = this.destinationPath('package.json');
+    if (fs.existsSync(packagePath)) {
+      const pkg = this.fs.readJSON(packagePath, {});
+      pkg.dependencies = pkg.dependencies || {};
+
+      if (clientFramework === 'react') {
+        pkg.dependencies['@sentry/react'] = '^7.3.0';
+
+        this.fs.copyTpl(
+          this.templatePath('client/react/sentry.ts.ejs'),
+          `${webappDir}app/sentry.ts`,
+          { sentryDsn: this.promptAnswers.sentryDsn }
+        );
+      }
+
+      if (clientFramework === 'angularX') {
+        pkg.dependencies['@sentry/angular'] = '^7.3.0';
 
-      this.addPackageJsonDependency('@sentry/react', '^7.3.0');
+        this.fs.copyTpl(
+          this.templatePath('client/angular/sentry.ts.ejs'),
+          `${webappDir}app/sentry.ts`,
+          { sentryDsn: this.promptAnswers.sentryDsn }
+        );
+      }
+
+      this.fs.writeJSON(packagePath, pkg, null, 2);
     }
+  }
 
-    if (clientFramework === 'angularX') {
-      this.fs.copyTpl(
-        this.templatePath('client/angular/sentry.ts.ejs'),
-        this.destinationPath(`${webappDir}app/sentry.ts`),
-        { sentryDsn: this.promptAnswers.sentryDsn }
-      );
+  install() {
+    if (!this.promptAnswers.enableSentry) return;
 
-      this.addPackageJsonDependency('@sentry/angular', '^7.3.0');
+    const clientPackageManager =
+      this.jhipsterAppConfig.clientPackageManager || 'npm';
+
+    if (this.options['skip-install']) {
+      this.log(
+        `Run ${clientPackageManager} install manually to install dependencies`
+      );
+      return;
     }
 
-    this.log(chalk.green('✔ Sentry files added successfully'));
+    this.spawnCommandSync(clientPackageManager, ['install']);
   }
 
   end() {
-    this.log(chalk.green('✔ Sentry module generation complete'));
+    this.log(chalk.green('\n✔ Sentry module generation complete\n'));
   }
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "generator-jhipster-sentry-module",
-  "version": "1.0.9",
+  "version": "1.0.11",
   "description": "Adding Sentry integration to JHipster projects",
   "keywords": [
     "yeoman-generator",