Skip to content

Commit ef46346

Browse files
committed
Remove remaining Grunt-era leftovers from docs/build/packaging
README.md and Framework.php's comment still told developers to install grunt-cli for minified CSS; that's done via "npm run css" (build-css.mjs) now, grunt itself isn't a dependency anywhere. doc/docker/development/Dockerfile dropped the same now-pointless grunt-cli install. egroupware-epl.spec still packaged updateGruntfile.php, which was removed earlier - would have broken an RPM build.
1 parent 31c70e0 commit ef46346

4 files changed

Lines changed: 3 additions & 7 deletions

File tree

README.md

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,9 @@ EGroupware 26 can be installed via Docker, in fact the DEB/RPM packages also doe
2020

2121
### Deprecated EGroupware development installation:
2222
* install composer.phar from https://getcomposer.org/download/
23-
* for JavaScript dependencies and build install nodejs and npm
24-
* optional: for minified CSS install grunt
23+
* for JavaScript and CSS dependencies and build install nodejs and npm
2524
```
26-
apt/yum/zypper install nodejs
27-
npm install -g grunt-cli
25+
apt/yum/zypper install nodejs npm
2826
```
2927
* install EGroupware and dependencies
3028
```

api/src/Framework.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1046,7 +1046,7 @@ public function _get_css(array $themes_to_check = array())
10461046
{
10471047
if (file_exists(EGW_SERVER_ROOT.$theme_css)) break;
10481048
}
1049-
// no longer available in config, of you don't want minified CSS on a developer install, don't install grunt/generate the files
1049+
// no longer available in config, if you don't want minified CSS on a developer install, don't run "npm run css" to generate the files
10501050
//$debug_minify = !empty($GLOBALS['egw_info']['server']['debug_minify']) && $GLOBALS['egw_info']['server']['debug_minify'] === 'True';
10511051
if (/*!$debug_minify &&*/ file_exists(EGW_SERVER_ROOT.($theme_min_css = str_replace('.css', '.min.css', $theme_css))))
10521052
{

doc/docker/development/Dockerfile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@ RUN set -e \
5757
&& ln -s /dev/stderr /var/log/php$PHP_VERSION-fpm.log \
5858
# install tools to build EGroupware
5959
&& apt-get install -y rsync zip curl sudo cron patch \
60-
&& npm install -g grunt-cli \
6160
&& bash -c \
6261
'EXPECTED_SIGNATURE=$(curl https://composer.github.io/installer.sig); \
6362
curl https://getcomposer.org/installer > composer-setup.php; \

doc/rpm-build/egroupware-epl.spec

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -617,7 +617,6 @@ ln -s ../../..%{egwdatadir}/header.inc.php
617617
%{egwdir}/README.md
618618
%{egwdir}/package.json
619619
%{egwdir}/Gruntfile.js
620-
%{egwdir}/updateGruntfile.php
621620
%{egwdir}/groupdav.htaccess
622621
%{egwdir}/webdav.php
623622
%{egwdir}/addressbook

0 commit comments

Comments
 (0)