Skip to content

Commit

Permalink
Merge branch 'dev' into checkbox-label
Browse files Browse the repository at this point in the history
  • Loading branch information
@maccabeelevine
maccabeelevine committed Oct 22, 2024
2 parents 71ae34f + e639cae commit ecc4c52
Show file tree
Hide file tree
Showing 1,812 changed files with 184,898 additions and 12,385 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ jobs:

- name: Setup node
if: ${{ matrix.phing_tasks == 'qa-console' }}
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: '20'

Expand Down
4 changes: 3 additions & 1 deletion .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
/themes/minktest
/vendor
ChangeLog
TAGS
/TAGS
composer.phar
env.bat
env.sh
Expand All @@ -26,7 +26,9 @@ node_modules
package-lock.json
public/swagger-ui
tests/phpcs.cache.json
themes/bootstrap5/scss/vendor/bootstrap
local/DirLocations.ini
local/config/vufind/*.ini
local/config/vufind/*.json
local/config/vufind/*.key
local/config/vufind/*.yaml
31 changes: 24 additions & 7 deletions Gruntfile.js
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
module.exports = function(grunt) {
const fs = require("fs");
const os = require("node:os");

// Load dart-sass
grunt.loadNpmTasks('grunt-dart-sass');
Expand All @@ -16,11 +17,14 @@ module.exports = function(grunt) {
var parts = file.split('/');
parts.pop(); // eliminate filename

// initialize search path with directory containing LESS file
// initialize search path with directory containing the LESS or SCSS file
var retVal = [];
retVal.push(parts.join('/'));
retVal.push(parts.join('/') + '/vendor/');

var themeBase = parts.slice(0, -1);
retVal.push(themeBase.join('/') + '/node_modules/');

// Iterate through theme.config.php files collecting parent themes in search path:
while (config = fs.readFileSync("themes/" + parts[1] + "/theme.config.php", "UTF-8")) {
// First identify mixins:
Expand All @@ -44,6 +48,9 @@ module.exports = function(grunt) {
parts[1] = matches[1];
retVal.push(parts.join('/') + '/');
retVal.push(parts.join('/') + '/vendor/');

var parentThemeBase = parts.slice(0, -1);
retVal.push(parentThemeBase.join('/') + '/node_modules/');
}
return retVal;
}
Expand All @@ -57,7 +64,7 @@ module.exports = function(grunt) {
}
}];

grunt.initConfig({
const gruntConfig = {
// LESS compilation
less: {
compile: {
Expand All @@ -77,6 +84,7 @@ module.exports = function(grunt) {
}
},
// SASS compilation
// 'scss' is also mapped to 'scssonly' below
'scss': {
'dart-sass': {
options: {
Expand Down Expand Up @@ -201,7 +209,11 @@ module.exports = function(grunt) {
tasks: ['scss']
}
}
});
};
// scssonly compiles scss files for themes that don't use less
gruntConfig.scssonly = gruntConfig.scss;

grunt.initConfig(gruntConfig);

grunt.registerMultiTask('lessdev', function lessWithMaps() {
grunt.config.set('less', {
Expand All @@ -224,9 +236,13 @@ module.exports = function(grunt) {
grunt.config.set('dart-sass', getSassConfig(this.data.options, false));
grunt.task.run('dart-sass');
});
grunt.registerMultiTask('scssonly', function sassScan() {
grunt.config.set('dart-sass', getSassConfig(this.data.options, false, false));
grunt.task.run('dart-sass');
});

grunt.registerMultiTask('check:scss', function sassCheck() {
grunt.config.set('dart-sass', getSassConfig(this.data.options, true));
grunt.config.set('dart-sass', getSassConfig(this.data.options, true, true));
grunt.task.run('dart-sass');
});

Expand All @@ -244,11 +260,12 @@ module.exports = function(grunt) {
- grunt lessToSass = transpile all LESS files to SASS.`);
});

function getSassConfig(additionalOptions, checkOnly) {
function getSassConfig(additionalOptions, checkOnly, themesWithLess = null) {
var sassConfig = {},
path = require('path'),
themeList = fs.readdirSync(path.resolve('themes')).filter(function (theme) {
return fs.existsSync(path.resolve('themes/' + theme + '/scss/compiled.scss'));
return fs.existsSync(path.resolve('themes/' + theme + '/scss/compiled.scss'))
&& (null === themesWithLess || themesWithLess === fs.existsSync(path.resolve('themes/' + theme + '/less/compiled.less')));
});

for (var i in themeList) {
Expand All @@ -259,7 +276,7 @@ module.exports = function(grunt) {
expand: true,
cwd: path.join('themes', themeList[i], 'scss'),
src: ['compiled.scss'],
dest: checkOnly ? null : path.join('themes', themeList[i], 'css'),
dest: path.join(checkOnly ? os.tmpdir() : 'themes', themeList[i], 'css'),
ext: '.css'
}]
};
Expand Down
692 changes: 583 additions & 109 deletions build.xml
View file

Large diffs are not rendered by default.

88 changes: 47 additions & 41 deletions composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,65 +30,67 @@
"apereo/phpcas": "1.6.1",
"browscap/browscap-php": "^7.2",
"cap60552/php-sip2": "1.0.0",
"colinmollenhour/credis": "1.16.0",
"colinmollenhour/credis": "1.16.1",
"composer/package-versions-deprecated": "1.11.99.5",
"composer/semver": "3.4.0",
"endroid/qr-code": "5.0.7",
"guzzlehttp/guzzle": "7.8.1",
"laminas/laminas-cache": "3.12.1",
"composer/semver": "3.4.3",
"endroid/qr-code": "5.1.0",
"guzzlehttp/guzzle": "7.9.2",
"jaybizzle/crawler-detect": "^1.2",
"laminas/laminas-cache": "3.12.2",
"laminas/laminas-cache-storage-adapter-blackhole": "^2.0",
"laminas/laminas-cache-storage-adapter-filesystem": "^2.0",
"laminas/laminas-cache-storage-adapter-memcached": "^2.0",
"laminas/laminas-cache-storage-adapter-memory": "^2.0",
"laminas/laminas-captcha": "2.17.0",
"laminas/laminas-code": "4.13.0",
"laminas/laminas-code": "4.14.0",
"laminas/laminas-config": "3.9.0",
"laminas/laminas-crypt": "3.11.0",
"laminas/laminas-db": "2.19.0",
"laminas/laminas-diactoros": "3.3.1",
"laminas/laminas-db": "2.20.0",
"laminas/laminas-diactoros": "3.5.0",
"laminas/laminas-dom": "2.14.0",
"laminas/laminas-escaper": "2.13.0",
"laminas/laminas-eventmanager": "3.13.0",
"laminas/laminas-feed": "2.22.0",
"laminas/laminas-filter": "2.34.0",
"laminas/laminas-form": "3.19.2",
"laminas/laminas-http": "2.19.0",
"laminas/laminas-i18n": "2.26.0",
"laminas/laminas-loader": "2.10.0",
"laminas/laminas-eventmanager": "3.13.1",
"laminas/laminas-feed": "2.23.0",
"laminas/laminas-form": "3.21.0",
"laminas/laminas-http": "2.20.0",
"laminas/laminas-i18n": "2.29.0",
"laminas/laminas-loader": "2.11.0",
"laminas/laminas-log": "2.17.0",
"laminas/laminas-mail": "2.25.1",
"laminas/laminas-modulemanager": "2.15.0",
"laminas/laminas-modulemanager": "2.16.0",
"laminas/laminas-mvc": "3.7.0",
"laminas/laminas-mvc-i18n": "1.8.0",
"laminas/laminas-mvc-i18n": "1.9.0",
"laminas/laminas-mvc-plugin-flashmessenger": "1.10.1",
"laminas/laminas-paginator": "2.18.1",
"laminas/laminas-paginator": "2.19.0",
"laminas/laminas-paginator-adapter-laminasdb": "1.4.0",
"laminas/laminas-psr7bridge": "1.11.0",
"laminas/laminas-recaptcha": "3.7.0",
"laminas/laminas-serializer": "2.17.0",
"laminas/laminas-servicemanager": "3.22.1",
"laminas/laminas-session": "2.20.0",
"laminas/laminas-session": "2.21.0",
"laminas/laminas-stdlib": "3.19.0",
"laminas/laminas-text": "2.11.0",
"laminas/laminas-validator": "2.50.0",
"laminas/laminas-validator": "2.55.0",
"laminas/laminas-view": "2.27.0",
"league/commonmark": "2.4.2",
"league/commonmark": "2.5.3",
"league/oauth2-server": "8.5.4",
"lm-commons/lmc-rbac-mvc": "3.3.2",
"lm-commons/lmc-rbac-mvc": "3.4.0",
"matthiasmullie/minify": "1.3.73",
"pear/archive_tar": "^1.4",
"pear/http_request2": "2.6.0",
"phing/phing": "2.17.4",
"phing/phing": "3.0.0",
"ppito/laminas-whoops": "2.2.0",
"scssphp/scssphp": "1.12.1",
"ramsey/uuid": "^4.7",
"scssphp/scssphp": "1.13.0",
"serialssolutions/summon": "1.3.1",
"slm/locale": "1.1.0",
"slm/locale": "1.2.0",
"steverhoades/oauth2-openid-connect-server": "2.6.1",
"swagger-api/swagger-ui": "5.11.10",
"symfony/console": "6.4.4",
"symfony/var-dumper": "6.4.6",
"symfony/yaml": "6.4.3",
"vstelmakh/url-highlight": "3.0.3",
"swagger-api/swagger-ui": "5.17.14",
"symfony/console": "6.4.12",
"symfony/rate-limiter": "^6.4",
"symfony/var-dumper": "6.4.11",
"symfony/yaml": "6.4.12",
"vstelmakh/url-highlight": "3.1.1",
"vufind-org/vufindcode": "1.2",
"vufind-org/vufinddate": "1.2.0",
"vufind-org/vufindharvest": "5.3.0",
Expand All @@ -97,21 +99,21 @@
"webfontkit/open-sans": "^1.0",
"webmozart/glob": "^4.7",
"wikimedia/composer-merge-plugin": "2.1.0",
"yajra/laravel-pdo-via-oci8": "3.4.2"
"yajra/laravel-pdo-via-oci8": "3.4.4"
},
"require-dev": {
"behat/mink": "1.11.0",
"behat/mink-selenium2-driver": "1.7.0",
"dmore/chrome-mink-driver": "2.9.2",
"firebase/php-jwt": "6.10.0",
"friendsofphp/php-cs-fixer": "3.51.0",
"dmore/chrome-mink-driver": "2.9.3",
"firebase/php-jwt": "6.10.1",
"friendsofphp/php-cs-fixer": "3.64.0",
"phpmd/phpmd": "2.15.0",
"phpstan/phpstan": "1.10.59",
"phpunit/php-code-coverage": "10.1.11",
"phpstan/phpstan": "1.12.7",
"phpunit/php-code-coverage": "10.1.16",
"phpunit/phpcov": "^9.0",
"phpunit/phpunit": "10.5.11",
"pietercolpaert/hardf": "0.4.0",
"squizlabs/php_codesniffer": "3.9.0"
"phpunit/phpunit": "10.5.36",
"pietercolpaert/hardf": "0.5.0",
"squizlabs/php_codesniffer": "3.10.3"
},
"extra": {
"merge-plugin": {
Expand All @@ -134,9 +136,13 @@
"post-update-cmd": "@phing-install-dependencies",
"qa": "phing qa-console -Ddefaultconfigs=true",
"show-outdated": "composer show -oD --ignore-platform-req=ext-oci8",
"update-npm-dependencies": [
"update-npm-deps": [
"npm update",
"cd themes/bootstrap3 && npm run updateDeps"
"cd themes/bootstrap3 && npm run updateDeps",
"cd themes/bootstrap5 && npm run updateDeps"
],
"install-build-deps": [
"cd themes/bootstrap5 && npm run installBuildDeps"
]
}
}
Loading

0 comments on commit ecc4c52

Please sign in to comment.