Merge dev and add tweaks and fixes.

.eslintrc.js

@@ -1,6 +1,9 @@
 module.exports = {
   plugins: ["no-jquery"],
-  ignorePatterns: ["themes/**/vendor/**"],
+  ignorePatterns: [
+    "themes/**/vendor/**",
+    "themes/**/node_modules/**"
+  ],
   extends: ["eslint:recommended", "plugin:no-jquery/deprecated"],
   env: {
     "browser": true,

.github/workflows/ci.yaml

@@ -11,15 +11,16 @@ jobs:
       VUFIND_LOCAL_DIR: $GITHUB_WORKSPACE/local
     strategy:
       matrix:
-        php-version: ['8.0', '8.1', '8.2']
-        # We run most tests on all platforms, but we only run Javascript-related tests in 8.1.
-        # Since the results should be the same on all platforms, we don't need to repeat them.
+        php-version: ['8.1', '8.2', '8.3']
+        # We run PHP-based tests on all platforms (qa-php), but we only include PHP AND
+        # Javascript-related tests (qa-console) once. Since the JS results should be the
+        # same on all platforms, we don't need to repeat them.
         include:
-          - php-version: 8.0
-            phing_tasks: "qa-php"
           - php-version: 8.1
-            phing_tasks: "qa-console"
+            phing_tasks: "qa-php"
           - php-version: 8.2
+            phing_tasks: "qa-console"
+          - php-version: 8.3
             phing_tasks: "qa-php"
 
     steps:

.gitignore

@@ -16,10 +16,13 @@
 ChangeLog
 TAGS
 composer.phar
+env.bat
+env.sh
 import/solrmarc.log*
 lessphp_*.list
 module/VuFind/tests/.phpunit.result.cache
 node_modules
+package-lock.json
 public/swagger-ui
 local/DirLocations.ini
 local/config/vufind/*.ini

GOVERNANCE.md

@@ -2,7 +2,7 @@
 
 Adopted March 8, 2021.
 
-Last updated December 12, 2022.
+Last updated August 18, 2023.
 
 Developed and drafted by the VuFind® Community Planning Group
 (alphabetically: Oliver Goldschmidt, Leila Gonzales, Christopher
@@ -107,8 +107,9 @@ themselves doing one or more of the following:
 
 Contributors engage with the project through the [issue
 tracker](https://vufind.org/jira), the project's [GitHub
-organization](https://github.com/vufind-org), and the [VuFind®
-Tech](https://sourceforge.net/projects/vufind/lists/vufind-tech)
+organization](https://github.com/vufind-org), and [community support
+channels](https://vufind.org/vufind/support.html#community) such as the
+[VuFind® Tech](https://sourceforge.net/projects/vufind/lists/vufind-tech)
 mailing list, or by writing or editing
 [documentation](https://vufind.org/wiki/) and other
 project-related content. They submit changes to the project itself via
@@ -169,13 +170,15 @@ have been nominated, there will be a vote by the project management
 committee (PMC; see below). Committer voting is one of the few
 activities that takes place through private PMC communication. This is
 to allow PMC members to freely express their opinions about a nominee
-without causing embarrassment. Once the vote has been held, the
-aggregated voting results are published on the [VuFind®
-Tech](https://sourceforge.net/projects/vufind/lists/vufind-tech)
-mailing list. The nominee is entitled to request an explanation of any
-'no' votes against them, regardless of the outcome of the vote. This
-explanation will be provided by the PMC Community Manager (see below)
-and will be anonymous and constructive in nature.
+without causing embarrassment.
+
+The nominee will be directly notified by email of voting results, and is
+entitled to request an explanation of any 'no' votes against them,
+regardless of the outcome of the vote. This explanation will be provided
+by the PMC Community Manager (see below) and will be anonymous and
+constructive in nature. New committers who pass the PMC vote are announced
+in the monthly [VuFind® newsletter](https://vufind.org/wiki/community:newsletter),
+which is shared through multiple communication channels.
 
 Nominees may decline their appointment as a committer. However, this is
 unusual, as the project does not expect any specific time or resource
@@ -300,7 +303,7 @@ The OLF Secretary and Treasurer will be nominated and confirmed by the
 PMC.
 
 The Treasurer is not required to be a member of the PMC, but the
-Secretary should be a member of PMC.
+Secretary must be a member of PMC.
 
 The individual serving as the OLF Secretary may also be called upon to
 serve as an interim VuFind® PMC Community Manager if the current
@@ -523,10 +526,6 @@ release while a minor release is still under development.
 
 #### Merging Rules
 
-Any committer can merge a **trivial** contribution, even if it is their
-own, as long as the Continuous Integration process has passed. All other
-contributions require a review by one or more other community members.
-
 Any contribution with an approved review by the Community Manager may be
 merged immediately. For contributions that fall outside of the Community
 Manager's areas of expertise, the Community Manager may delegate the
@@ -536,13 +535,17 @@ responsibility of the Community Manager and his/her delegees not to
 approve pull requests that may require more review and discussion prior
 to merging.
 
-Any contributions with approvals from one or more committers operate on
-the principle of "lazy consensus" and may be merged if there are no
-objections or suggested changes within 72 hours of the first approval.
-This 72 hour waiting period may be overridden by a majority vote of the
-PMC if there is an urgent need to merge a contribution more quickly. For
-contributions that cannot reach "lazy consensus," the voting process
-described above should be followed.
+Any committer can immediately merge an approved **trivial** contribution,
+regardless of reviewer.
+
+Any non-trivial contributions approved by committers other than the
+Community Manager or his/her delegee operate on the principle of "lazy
+consensus" and may be merged if there are no objections or suggested
+changes within 72 hours of the first approval. This 72 hour waiting
+period may be overridden by a majority vote of the PMC if there is an
+urgent need to merge a contribution more quickly. For contributions
+that cannot reach "lazy consensus," the voting process described above
+should be followed.
 
 #### Communication and Monitoring
 
@@ -559,6 +562,12 @@ mailing list if they do not receive a review in a timely fashion.
 December 12, 2022: Added ® symbol to VuFind® references; added paragraph
 on Conflict of Interest policy and non-voting PMC guests.
 
+August 18, 2023: Added link to community support channels, instead of
+only mentioning the VuFind® Tech list. Expanded/updated language about
+procedure for notifying/announcing new committers. Clarified that the
+OLF Secretary must be a PMC member. Updated language about merging trivial
+pull requests to reflect GitHub policy.
+
 ## Acknowledgements
 
 This document is based in large part on the OSS Watch \"[Template for a Meritocratic Governance Document](http://oss-watch.ac.uk/resources/meritocraticgovernancemodel##template-for-a-meritocratic-governance-document),\"

Gruntfile.js

@@ -1,6 +1,9 @@
 module.exports = function(grunt) {
   const fs = require("fs");
 
+  // Load dart-sass
+  grunt.loadNpmTasks('grunt-dart-sass');
+
   // Local custom tasks
   if (fs.existsSync("./Gruntfile.local.js")) {
     require("./Gruntfile.local.js")(grunt);
@@ -16,6 +19,7 @@ module.exports = function(grunt) {
     // initialize search path with directory containing LESS file
     var retVal = [];
     retVal.push(parts.join('/'));
+    retVal.push(parts.join('/') + '/vendor/');
 
     // Iterate through theme.config.php files collecting parent themes in search path:
     while (config = fs.readFileSync("themes/" + parts[1] + "/theme.config.php", "UTF-8")) {
@@ -39,6 +43,7 @@ module.exports = function(grunt) {
 
       parts[1] = matches[1];
       retVal.push(parts.join('/') + '/');
+      retVal.push(parts.join('/') + '/vendor/');
     }
     return retVal;
   }
@@ -72,13 +77,18 @@ module.exports = function(grunt) {
       }
     },
     // SASS compilation
-    scss: {
-      sass: {
+    'scss': {
+      'dart-sass': {
         options: {
-          style: 'compress'
+          outputStyle: 'compressed',
+          quietDeps: true
         }
       }
     },
+    'check:scss': {
+      'dart-sass': {
+      }
+    },
 
     // Convert LESS to SASS, mostly for development team use
     lessToSass: {
@@ -203,36 +213,13 @@ module.exports = function(grunt) {
   });
 
   grunt.registerMultiTask('scss', function sassScan() {
-    var sassConfig = {},
-      path = require('path'),
-      themeList = fs.readdirSync(path.resolve('themes')).filter(function (theme) {
-        return fs.existsSync(path.resolve('themes/' + theme + '/scss/compiled.scss'));
-      });
-
-    for (var i in themeList) {
-      var config = {
-        options: {
-          implementation: require("node-sass"),
-          outputStyle: 'compressed'
-        },
-        files: [{
-          expand: true,
-          cwd: path.join('themes', themeList[i], 'scss'),
-          src: ['compiled.scss'],
-          dest: path.join('themes', themeList[i], 'css'),
-          ext: '.css'
-        }]
-      };
-      for (var key in this.data.options) {
-        config.options[key] = this.data.options[key] + '';
-      }
-      config.options.includePaths = getLoadPaths('themes/' + themeList[i] + '/scss/compiled.scss');
-
-      sassConfig[themeList[i]] = config;
-    }
+    grunt.config.set('dart-sass', getSassConfig(this.data.options, false));
+    grunt.task.run('dart-sass');
+  });
 
-    grunt.config.set('sass', sassConfig);
-    grunt.task.run('sass');
+  grunt.registerMultiTask('check:scss', function sassCheck() {
+    grunt.config.set('dart-sass', getSassConfig(this.data.options, true));
+    grunt.task.run('dart-sass');
   });
 
   grunt.registerTask('default', function help() {
@@ -241,10 +228,45 @@ module.exports = function(grunt) {
     - grunt less        = compile and compress all themes' LESS files to css.
     - grunt scss        = compile and map all themes' SASS files to css.
     - grunt lessdev     = compile and map all themes' LESS files to css.
+    - grunt check:scss  = check all themes' SASS files.
     - grunt watch:[cmd] = continuous monitor source files and run command when changes are detected.
     - grunt watch:less
     - grunt watch:scss
     - grunt watch:lessdev
     - grunt lessToSass  = transpile all LESS files to SASS.`);
   });
+
+  function getSassConfig(additionalOptions, checkOnly) {
+    var sassConfig = {},
+      path = require('path'),
+      themeList = fs.readdirSync(path.resolve('themes')).filter(function (theme) {
+        return fs.existsSync(path.resolve('themes/' + theme + '/scss/compiled.scss'));
+      });
+
+    for (var i in themeList) {
+      if (Object.prototype.hasOwnProperty.call(themeList, i)) {
+        var config = {
+          options: {},
+          files: [{
+            expand: true,
+            cwd: path.join('themes', themeList[i], 'scss'),
+            src: ['compiled.scss'],
+            dest: checkOnly ? null : path.join('themes', themeList[i], 'css'),
+            ext: '.css'
+          }]
+        };
+        for (var key in additionalOptions) {
+          if (Object.prototype.hasOwnProperty.call(additionalOptions, key)) {
+            config.options[key] = additionalOptions[key];
+          }
+        }
+        config.options.includePaths = getLoadPaths('themes/' + themeList[i] + '/scss/compiled.scss');
+        // This allows loading of styles from composer dependencies:
+        config.options.includePaths.push('vendor/');
+
+        sassConfig[themeList[i]] = config;
+      }
+    }
+    return sassConfig;
+  }
 };