fix: ACNA-1687 | fixed option skipInstall for appGen, extGen, addActi…

…onGen
adobe · Jul 25, 2022 · 341f25d · 341f25d
1 parent ac0cd12
commit 341f25d
Show file tree

Hide file tree

Showing 4 changed files with 59 additions and 63 deletions.
diff --git a/src/commands/app/add/action.js b/src/commands/app/add/action.js
@@ -46,17 +46,18 @@ class AddActionCommand extends AddCommand {
     const supportedOrgServices = aioConfigLoader.get('project.org.details.services') || []
 
     const env = yeoman.createEnv()
+    env.options = { skipInstall: true }
     const addActionGen = env.instantiate(generators['add-action'], {
       options: {
         'skip-prompt': flags.yes,
         'action-folder': actionFolder,
         'config-path': configData.file,
         'adobe-services': servicesToGeneratorInput(workspaceServices),
         'supported-adobe-services': servicesToGeneratorInput(supportedOrgServices),
-        'full-key-to-manifest': configData.key,
+        'full-key-to-manifest': configData.key
         // force: true,
         // by default yeoman runs the install, we control installation from the app plugin
-        'skip-install': true
+        // Moving ['skip-install': true] to env.options due to yeoman environment issue https://github.com/yeoman/environment/issues/421
       }
     })
     await env.runGenerator(addActionGen)

diff --git a/src/commands/app/init.js b/src/commands/app/init.js
@@ -271,15 +271,16 @@ class InitCommand extends AddCommand {
 
   async runCodeGenerators (flags, extensionPoints, projectName) {
     let env = yeoman.createEnv()
+    env.options = { skipInstall: true }
     const initialGenerators = ['base-app', 'add-ci']
     // first run app generator that will generate the root skeleton + ci
     for (const generatorKey of initialGenerators) {
       const appGen = env.instantiate(generators[generatorKey], {
         options: {
           'skip-prompt': flags.yes,
-          'project-name': projectName,
+          'project-name': projectName
           // by default yeoman runs the install, we control installation from the app plugin
-          'skip-install': true
+          // Moving ['skip-install': true] to env.options due to yeoman environment issue https://github.com/yeoman/environment/issues/421
         }
       })
       await env.runGenerator(appGen)
@@ -289,6 +290,7 @@ class InitCommand extends AddCommand {
     // https://github.com/yeoman/environment/issues/324
 
     env = yeoman.createEnv()
+    env.options = { skipInstall: true }
     // try to use appGen.composeWith
     for (let i = 0; i < extensionPoints.length; ++i) {
       const extGen = env.instantiate(
@@ -297,9 +299,9 @@ class InitCommand extends AddCommand {
           options: {
             'skip-prompt': flags.yes,
             // do not prompt for overwrites
-            force: true,
+            force: true
             // by default yeoman runs the install, we control installation from the app plugin
-            'skip-install': true
+            // Moving ['skip-install': true] to env.options due to yeoman environment issue https://github.com/yeoman/environment/issues/421
           }
         })
       await env.runGenerator(extGen)

diff --git a/test/commands/app/add/action.test.js b/test/commands/app/add/action.test.js
@@ -100,8 +100,7 @@ describe('good flags', () => {
         'config-path': undefined,
         'adobe-services': undefined,
         'supported-adobe-services': undefined,
-        'full-key-to-manifest': 'undefined.runtimeManifest',
-        'skip-install': true
+        'full-key-to-manifest': 'undefined.runtimeManifest'
       }
     })
     expect(mockRunGenerator).toHaveBeenCalledWith('actionGen')
@@ -120,8 +119,7 @@ describe('good flags', () => {
         'config-path': undefined,
         'adobe-services': undefined,
         'supported-adobe-services': undefined,
-        'full-key-to-manifest': 'undefined.runtimeManifest',
-        'skip-install': true
+        'full-key-to-manifest': 'undefined.runtimeManifest'
       }
     })
     expect(helpers.installPackages).toHaveBeenCalledTimes(0)
@@ -139,8 +137,7 @@ describe('good flags', () => {
         'config-path': undefined,
         'adobe-services': undefined,
         'supported-adobe-services': undefined,
-        'full-key-to-manifest': 'undefined.runtimeManifest',
-        'skip-install': true
+        'full-key-to-manifest': 'undefined.runtimeManifest'
       }
     })
   })
@@ -157,8 +154,7 @@ describe('good flags', () => {
         'config-path': undefined,
         'adobe-services': undefined,
         'supported-adobe-services': undefined,
-        'full-key-to-manifest': 'undefined.runtimeManifest',
-        'skip-install': true
+        'full-key-to-manifest': 'undefined.runtimeManifest'
       }
     })
   })
@@ -174,8 +170,7 @@ describe('good flags', () => {
         'config-path': undefined,
         'adobe-services': undefined,
         'supported-adobe-services': undefined,
-        'full-key-to-manifest': 'undefined.runtimeManifest',
-        'skip-install': true
+        'full-key-to-manifest': 'undefined.runtimeManifest'
       }
     })
   })
@@ -203,8 +198,7 @@ describe('good flags', () => {
         'config-path': undefined,
         'adobe-services': 'CampaignSDK,AdobeAnalyticsSDK',
         'supported-adobe-services': 'CampaignSDK,AdobeAnalyticsSDK,AnotherOneSDK',
-        'full-key-to-manifest': 'undefined.runtimeManifest',
-        'skip-install': true
+        'full-key-to-manifest': 'undefined.runtimeManifest'
       }
     })
   })
@@ -232,8 +226,7 @@ describe('good flags', () => {
         'config-path': undefined,
         'adobe-services': 'CampaignSDK,AdobeAnalyticsSDK',
         'supported-adobe-services': 'CampaignSDK,AdobeAnalyticsSDK,AnotherOneSDK',
-        'full-key-to-manifest': 'undefined.runtimeManifest',
-        'skip-install': true
+        'full-key-to-manifest': 'undefined.runtimeManifest'
       }
     })
   })