Merge branch 'develop'

acms/acms.yml

@@ -4,11 +4,11 @@ starter_kits:
  description: "The low-code starter kit will install Acquia CMS with Site Studio and a UIkit. It provides drag and drop content authoring and low-code site building. An optional content model can be added in the installation process."
  modules:
  require:
- - acquia_cms_site_studio:^1.3.5
- - acquia_cms_page:^1.3.3
- - acquia_cms_search:^1.3.5
- - acquia_cms_tour:^1.3.0
- - acquia_cms_toolbar:^1.3.3
+ - acquia_cms_site_studio
+ - acquia_cms_page
+ - acquia_cms_search
+ - acquia_cms_tour
+ - acquia_cms_toolbar
  install:
  - acquia_cms_site_studio
  - acquia_cms_page
@@ -17,7 +17,7 @@ starter_kits:
  - acquia_cms_toolbar
  themes:
  require:
- - acquia_claro:^1.3.2
+ - acquia_claro
  install:
  - acquia_claro
  admin: acquia_claro
@@ -27,16 +27,16 @@ starter_kits:
  description: "The community starter kit will install Acquia CMS. An optional content model can be added in the installation process."
  modules:
  require:
- - acquia_cms_search:^1.3.5
- - acquia_cms_tour:^1.3.0
- - acquia_cms_toolbar:^1.3.3
+ - acquia_cms_search
+ - acquia_cms_tour
+ - acquia_cms_toolbar
  install:
  - acquia_cms_search
  - acquia_cms_tour
  - acquia_cms_toolbar
  themes:
  require:
- - acquia_claro:^1.3.2
+ - acquia_claro
  install:
  - acquia_claro
  admin: acquia_claro
@@ -46,10 +46,10 @@ starter_kits:
  modules:
  require:
  - acquia_cms_headless
- - acquia_cms_search:^1.3.5
- - acquia_cms_tour:^1.3.0
- - acquia_cms_toolbar:^1.3.3
- - consumer_image_styles:^4.0.7
+ - acquia_cms_search
+ - acquia_cms_tour
+ - acquia_cms_toolbar
+ - consumer_image_styles
  install:
  - acquia_cms_headless_ui
  - acquia_cms_search
@@ -58,7 +58,7 @@ starter_kits:
  - consumer_image_styles
  themes:
  require:
- - acquia_claro:^1.3.2
+ - acquia_claro
  install:
  - acquia_claro
  admin: acquia_claro

src/Cli.php

@@ -135,9 +135,9 @@ public function alterModulesAndThemes(array &$starterKit, array $userInputValues
  $isContentModel = $userInputValues['content_model'] ?? '';
  $isDemoContent = $userInputValues['demo_content'] ?? '';
  $contentModelModules = [
- 'acquia_cms_article:^1.3.4',
- 'acquia_cms_page:^1.3.3',
- 'acquia_cms_event:^1.3.4',
+ 'acquia_cms_article',
+ 'acquia_cms_page',
+ 'acquia_cms_event',
  ];
 
  // Set default theme as olivero (if not defined)
@@ -148,7 +148,7 @@ public function alterModulesAndThemes(array &$starterKit, array $userInputValues
  $starterKit['modules']['install'] = array_merge($starterKit['modules']['install'], $contentModelModules);
  }
  if ($isDemoContent == "yes") {
- $demoContentModules = array_merge($contentModelModules, ['acquia_cms_starter:^1.3.0']);
+ $demoContentModules = array_merge($contentModelModules, ['acquia_cms_starter']);
  $starterKit['modules']['require'] = array_merge($starterKit['modules']['require'], $demoContentModules);
  $starterKit['modules']['install'] = array_merge($starterKit['modules']['install'], $demoContentModules);
  }

src/Helpers/Task/Steps/InitNextjsApp.php

@@ -41,7 +41,17 @@ public function execute(array $args = []) :int {
  if (isset($args['--env-file']) && $args['--env-file']) {
  $initNextjsAppCommand = array_merge($initNextjsAppCommand, ["--env-file=" . $args['--env-file']]);
  }
- return $this->drushCommand->prepare($initNextjsAppCommand)->run();
+
+ $this->drushCommand->prepare($initNextjsAppCommand)->run();
+ // Set config headless settings.
+ $postInitNextjsAppCommand = array_merge([
+ "config:set",
+ "acquia_cms_headless.settings",
+ "starterkit_nextjs",
+ "--yes",
+ ], [TRUE]);
+
+ return $this->drushCommand->prepare($postInitNextjsAppCommand)->run();
  }
 
 }

tests/unit/CliTest.php

@@ -82,11 +82,11 @@ protected function getAcmsFileContents() :array {
  "description" => "The low-code starter kit will install Acquia CMS with Site Studio and a UIkit. It provides drag and drop content authoring and low-code site building. An optional content model can be added in the installation process.",
  "modules" => [
  "require" => [
- "acquia_cms_site_studio:^1.3.5",
- "acquia_cms_page:^1.3.3",
- "acquia_cms_search:^1.3.5",
- "acquia_cms_tour:^1.3.0",
- "acquia_cms_toolbar:^1.3.3",
+ "acquia_cms_site_studio",
+ "acquia_cms_page",
+ "acquia_cms_search",
+ "acquia_cms_tour",
+ "acquia_cms_toolbar",
  ],
  "install" => [
  "acquia_cms_site_studio",
@@ -97,7 +97,7 @@ protected function getAcmsFileContents() :array {
  ],
  ],
  "themes" => [
- "require" => ["acquia_claro:^1.3.2"],
+ "require" => ["acquia_claro"],
  "install" => ["acquia_claro"],
  "admin" => "acquia_claro",
  "default" => "cohesion_theme",
@@ -108,9 +108,9 @@ protected function getAcmsFileContents() :array {
  "description" => "The community starter kit will install Acquia CMS. An optional content model can be added in the installation process.",
  "modules" => [
  "require" => [
- "acquia_cms_search:^1.3.5",
- "acquia_cms_tour:^1.3.0",
- "acquia_cms_toolbar:^1.3.3",
+ "acquia_cms_search",
+ "acquia_cms_tour",
+ "acquia_cms_toolbar",
  ],
  "install" => [
  "acquia_cms_search",
@@ -119,7 +119,7 @@ protected function getAcmsFileContents() :array {
  ],
  ],
  "themes" => [
- "require" => ["acquia_claro:^1.3.2"],
+ "require" => ["acquia_claro"],
  "install" => ["acquia_claro"],
  "admin" => "acquia_claro",
  ],
@@ -130,10 +130,10 @@ protected function getAcmsFileContents() :array {
  "modules" => [
  "require" => [
  "acquia_cms_headless",
- "acquia_cms_search:^1.3.5",
- "acquia_cms_tour:^1.3.0",
- "acquia_cms_toolbar:^1.3.3",
- "consumer_image_styles:^4.0.7",
+ "acquia_cms_search",
+ "acquia_cms_tour",
+ "acquia_cms_toolbar",
+ "consumer_image_styles",
  ],
  "install" => [
  "acquia_cms_headless_ui",
@@ -144,7 +144,7 @@ protected function getAcmsFileContents() :array {
  ],
  ],
  "themes" => [
- "require" => ["acquia_claro:^1.3.2"],
+ "require" => ["acquia_claro"],
  "install" => ["acquia_claro"],
  "admin" => "acquia_claro",
  ],
@@ -439,18 +439,18 @@ public function getUpdatedModulesThemesArray(string $bundle, string $question_ty
  switch ($question_type) :
  case 'content_model':
  $packages = [
- "acquia_cms_article:^1.3.4",
- "acquia_cms_page:^1.3.3",
- "acquia_cms_event:^1.3.4",
+ "acquia_cms_article",
+ "acquia_cms_page",
+ "acquia_cms_event",
  ];
  break;
 
  case 'demo_content':
  $packages = [
- "acquia_cms_article:^1.3.4",
- "acquia_cms_page:^1.3.3",
- "acquia_cms_event:^1.3.4",
- "acquia_cms_starter:^1.3.0",
+ "acquia_cms_article",
+ "acquia_cms_page",
+ "acquia_cms_event",
+ "acquia_cms_starter",
  ];
  break;