From 6033638ccb0dab77a7f77f0db8fed74c74883cf3 Mon Sep 17 00:00:00 2001 From: Vishal Khode Date: Wed, 30 Oct 2024 00:21:39 +0530 Subject: [PATCH] Revert "Merge pull request #1680 from acquia/ACMS-2008-2.x-gin-admin-theme" This reverts commit d7183f316f6f44450224b0a2f8f681d8badee971, reversing changes made to 934a751cbef03195354eefab1717dc33c42106b6. --- DEVELOPING.md | 5 +++++ acms-run-tests.sh | 5 +++++ acquia-pipelines.yml | 7 +++++++ composer.json | 8 ++++++++ 4 files changed, 25 insertions(+) diff --git a/DEVELOPING.md b/DEVELOPING.md index d186ef702..94557713b 100644 --- a/DEVELOPING.md +++ b/DEVELOPING.md @@ -291,6 +291,11 @@ The Acquia CMS profile contains both core and module-specific Site Studio Sync P To update Site Studio configuration, you can run the `drush acms:config-reset` command and follow the instructions. Note that this will overwrite *any* changes you've made to the default ACMS configuration for Site Studio, and may affect your site in unexpected ways. *You should test using this command in a non-production environment before running it in production.* +### Updating Acquia Claro theming +* Update SCSS as per requirement in Acquia Claro theme. +* Use `composer install:frontend` and `composer build:frontend` to compile SCSS into CSS. +* Commit both CSS and SCSS files. + ### Contributing to Acquia CMS Refer to our [Contributor's guide](/CONTRIBUTING.md). diff --git a/acms-run-tests.sh b/acms-run-tests.sh index 783f520ed..ca880e8c1 100755 --- a/acms-run-tests.sh +++ b/acms-run-tests.sh @@ -136,6 +136,11 @@ case $OSTYPE in ;; esac +# Compile scss and run css analysis tests. +echo -e "${GREEN} Installing npm & analysing css ${NOCOLOR}" +# Install npm & run front end gulp task test. +cd docroot/themes/contrib/acquia_claro && npm install && npm run test && cd - + # Run code quality checks. vendor/bin/grumphp run diff --git a/acquia-pipelines.yml b/acquia-pipelines.yml index ec65d18a9..c889b1a8a 100644 --- a/acquia-pipelines.yml +++ b/acquia-pipelines.yml @@ -18,6 +18,13 @@ events: - mkdir -p docroot/profiles/acquia_cms - composer archive --format zip --file acquia_cms - unzip acquia_cms.zip -d docroot/profiles/acquia_cms + - front-end: + type: script + script: + - cd docroot/themes/contrib/acquia_claro + - npm install + - npm run build + - cd - - cleanup: type: script script: diff --git a/composer.json b/composer.json index 191866238..83b061747 100644 --- a/composer.json +++ b/composer.json @@ -148,6 +148,10 @@ "acms:install": [ "bash install-acms" ], + "build:frontend": [ + "Composer\\Config::disableProcessTimeout", + "cd docroot/themes/contrib/acquia_claro && npm run build" + ], "build:local": [ "cp -f phpunit.xml ./docroot/core" ], @@ -160,6 +164,10 @@ "rm -rf $TMPDIR/cex" ], "configure-tarball": "Drupal\\acquia_cms\\Composer\\ConfigureProject::execute", + "install:frontend": [ + "Composer\\Config::disableProcessTimeout", + "cd docroot/themes/contrib/acquia_claro && npm install" + ], "nuke": "rm -r -f docroot vendor" } }