generator-jhipster-sentry-module 1.0.5 → 1.0.7

package/generators/app/index.js

@@ -2,7 +2,7 @@ const path = require('path');
 const fs = require('fs');
 const chalk = require('chalk');
 const semver = require('semver');
-const Generator = require('yeoman-generator'); // Use Yeoman directly
+const Generator = require('yeoman-generator');
 const packageJson = require('../../package.json');
 
 // JHipster constants
@@ -14,7 +14,7 @@ const jhipsterConstants = {
 
 module.exports = class extends Generator {
   async initializing() {
-    // Read config
+    // Read JHipster config
     this.jhipsterAppConfig = this.fs.readJSON(this.destinationPath('.yo-rc.json'), {})['generator-jhipster'];
     if (!this.jhipsterAppConfig) {
       this.log(chalk.red('Cannot read .yo-rc.json or JHipster config missing'));
@@ -72,6 +72,7 @@ module.exports = class extends Generator {
     config['generator-jhipster'].sentry = this.jhipsterAppConfig.sentry;
     this.fs.writeJSON(configPath, config, null, 2);
 
+    // Logging
     this.log('\n--- JHipster Config ---');
     this.log(`baseName=${this.baseName}`);
     this.log(`packageName=${this.packageName}`);
@@ -86,7 +87,7 @@ module.exports = class extends Generator {
       return;
     }
 
-    // Backend: add dependencies manually
+    // Backend dependencies
     if (this.buildTool === 'maven') {
       const pomPath = this.destinationPath('pom.xml');
       if (fs.existsSync(pomPath)) {
@@ -117,28 +118,28 @@ module.exports = class extends Generator {
       }
     }
 
-    // Frontend
+    // Frontend templates
     if (this.clientFramework === 'react') {
-      this.npmInstall(['@sentry/react@^7.3.0'], { 'save': true });
       this.fs.copyTpl(this.templatePath('client/react/sentry.ts.ejs'), `${webappDir}app/sentry.ts`);
-    }
-    if (this.clientFramework === 'angularX') {
-      this.npmInstall(['@sentry/angular@^7.3.0'], { 'save': true });
+    } else if (this.clientFramework === 'angularX') {
       this.fs.copyTpl(this.templatePath('client/angular/sentry.ts.ejs'), `${webappDir}app/sentry.ts`);
     }
   }
 
   install() {
-    const logMsg = `To install dependencies manually, run: ${chalk.yellow.bold(`${this.clientPackageManager} install`)}`;
-    if (this.options['skip-install']) {
-      this.log(logMsg);
-      return;
+    if (!this.promptAnswers.enableSentry) return;
+
+    const packages = [];
+    if (this.clientFramework === 'react') {
+      packages.push('@sentry/react@^7.3.0');
+    } else if (this.clientFramework === 'angularX') {
+      packages.push('@sentry/angular@^7.3.0');
+    }
+
+    if (packages.length > 0) {
+      const cmd = this.clientPackageManager === 'yarn' ? 'add' : 'install';
+      this.spawnCommandSync(this.clientPackageManager, [...(this.clientPackageManager === 'yarn' ? ['add'] : ['install']), ...packages]);
     }
-    this.installDependencies({
-      npm: this.clientPackageManager === 'npm',
-      yarn: this.clientPackageManager === 'yarn',
-      bower: false
-    });
   }
 
   end() {

package/package.json

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