diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 5ace4600a..09bb0c37e 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -4,3 +4,11 @@ updates: directory: "/" schedule: interval: "weekly" + - package-ecosystem: "composer" + directory: "/" + schedule: + interval: "weekly" + - package-ecosystem: "npm" + directory: "/" + schedule: + interval: "weekly" diff --git a/Makefile b/Makefile index 4e2395cb9..c029a8b2c 100644 --- a/Makefile +++ b/Makefile @@ -61,21 +61,18 @@ roundcubemail-git: buildtools git clone --branch=$(GITBRANCH) --depth=1 $(GITREMOTE) roundcubemail-git (cd roundcubemail-git; bin/jsshrink.sh; bin/updatecss.sh; bin/cssshrink.sh) (cd roundcubemail-git/skins/elastic; \ - lessc --clean-css="--s1 --advanced" styles/styles.less > styles/styles.min.css; \ - lessc --clean-css="--s1 --advanced" styles/print.less > styles/print.min.css; \ - lessc --clean-css="--s1 --advanced" styles/embed.less > styles/embed.min.css) + ../../node_modules/.bin/lessc --clean-css="--s1 --advanced" styles/styles.less > styles/styles.min.css; \ + ../../node_modules/.bin/lessc --clean-css="--s1 --advanced" styles/print.less > styles/print.min.css; \ + ../../node_modules/.bin/lessc --clean-css="--s1 --advanced" styles/embed.less > styles/embed.min.css) (cd roundcubemail-git/bin; rm -f transifexpull.sh package2composer.sh) (cd roundcubemail-git; find . -name '.gitignore' | xargs rm -f) (cd roundcubemail-git; find . -name '.travis.yml' | xargs rm -f) - (cd roundcubemail-git; rm -rf tests plugins/*/tests .git* .tx* .ci* .editorconfig* index-test.php Dockerfile Makefile) + (cd roundcubemail-git; rm -rf tests plugins/*/tests .git* .tx* .ci* .editorconfig* index-test.php Dockerfile Makefile package.json package-lock.json node_modules) (cd roundcubemail-git; $(SEDI) 's/1.7-git/$(VERSION)/' index.php public_html/index.php installer/index.php program/include/iniset.php program/lib/Roundcube/bootstrap.php) (cd roundcubemail-git; $(SEDI) 's/# Unreleased/# Release $(VERSION)'/ CHANGELOG.md) buildtools: /tmp/composer.phar - npm install uglify-js - npm install lessc - npm install less-plugin-clean-css - npm install csso-cli + npm install --include=dev --omit=optional /tmp/composer.phar: curl -sS https://getcomposer.org/installer | php -- --install-dir=/tmp/ diff --git a/package.json b/package.json new file mode 100644 index 000000000..b9f4b9a01 --- /dev/null +++ b/package.json @@ -0,0 +1,20 @@ +{ + "devDependencies": { + "csso-cli": "^4.0.2", + "eslint": "^8.57.0", + "eslint-config-airbnb-base": "^15.0.0", + "eslint-plugin-import": "^2.29.1", + "eslint-plugin-unicorn": "^53.0.0", + "less": "^4.2.0", + "less-plugin-clean-css": "^1.5.1", + "uglify-js": "^3.17.4" + }, + "optionalDependencies": { + "jquery": "^3.7.1", + "tinymce": "^5.10.9", + "openpgp": "^5.0.0", + "codemirror": "^5.58.3", + "bootstrap": "^4.5.3", + "less": "^4.1.3" + } +}