Merge branch 'dev' into fix-remove-card-selection

NatLibFi · Dec 3, 2024 · 1157ecb · 1157ecb
2 parents a59ab54 + d710006
commit 1157ecb
Show file tree

Hide file tree

Showing 111 changed files with 76 additions and 20,925 deletions.
diff --git a/Gruntfile.local.js b/Gruntfile.local.js
@@ -1,228 +1,26 @@
 module.exports = function(grunt) {
   const fs = require("fs");
-  const path = require("path");
   const os = require("node:os");
-  const fsPromises = require("node:fs/promises");
+
+  const style = grunt.option('style') ?? 'expanded';
 
   grunt.registerTask("finna:scss", function finnaScssFunc() {
     const config = getFinnaSassConfig({
-        outputStyle: 'compressed',
-        quietDeps: true
-      }, false);
+      outputStyle: style,
+      quietDeps: true
+    }, false);
     grunt.config.set('dart-sass', config);
     grunt.task.run('dart-sass');
   });
 
   grunt.registerTask('finna:check:scss', function sassCheck() {
     const config = getFinnaSassConfig({
-        quietDeps: true
-      }, true);
+      quietDeps: true
+    }, true);
     grunt.config.set('dart-sass', config);
     grunt.task.run('dart-sass');
   });
 
-  grunt.registerTask("finna:lessToSass", function finnaLessToSassFunc() {
-    const exclude = grunt.option('exclude');
-    const excludedFiles = exclude ? exclude.split(',') : [];
-    const include = grunt.option('include');
-    const includedFiles = include ? include.split(',') : [];
-
-    const sharedFileOpts = {
-        expand: true,
-        src: ['*.less', '**/*.less'],
-        filter: function(filepath) {
-          if (includedFiles.length > 0) {
-            for (let included of includedFiles) {
-              if (filepath.endsWith(included)) {
-                return true;
-              }
-            }
-            return false;
-          }
-          for (let excluded of excludedFiles) {
-            if (filepath.endsWith(excluded)) {
-              return false;
-            }
-          }
-          return true;
-        },
-        ext: '.scss'
-    };
-
-    let files = [];
-    let viewsDir = grunt.option('views-dir');
-    let themeDirs = grunt.option('theme-dirs');
-    if (viewsDir) {
-      const isViewDir = function (dir) {
-        const stat = fs.lstatSync(dir);
-        return stat.isDirectory() && fs.existsSync(dir + '/themes/custom');
-      };
-      const entries = grunt.file.expand(
-        {
-          filter: isViewDir,
-        },
-        viewsDir + '/*/*'
-      );
-      for (const viewDir of entries) {
-        files.push({
-          ...sharedFileOpts,
-          cwd: viewDir + '/themes/custom/less',
-          dest: viewDir + '/themes/custom/scss'
-        });
-      }
-    } else if (themeDirs) {
-      Object.entries(themeDirs.split(',')).forEach(([, themeDir]) => {
-        themeDir = path.resolve(themeDir);
-        files.push({
-          ...sharedFileOpts,
-          cwd: themeDir + '/less',
-          dest: themeDir + '/scss'
-        });
-      });
-    } else {
-      files = [
-        {
-          ...sharedFileOpts,
-          cwd: 'themes/finna2/less',
-          dest: 'themes/finna2/scss'
-        },
-        {
-          ...sharedFileOpts,
-          cwd: 'themes/custom/less',
-          dest: 'themes/custom/scss'
-        },
-      ];
-    }
-
-    const replacements = [
-      // Activate SCSS
-      {
-        pattern: /\/\* #SCSS>/gi,
-        replacement: "/* #SCSS> */",
-        order: -1 // Do before anything else
-      },
-      {
-        pattern: /<#SCSS \*\//gi,
-        replacement: "/* <#SCSS */",
-        order: -1
-      },
-      // Deactivate LESS
-      {
-        pattern: /\/\* #LESS> \*\/.*?\/\* <#LESS \*\//gis,
-        replacement: "",
-        order: -1
-      },
-      { // Change separator in @include statements
-        pattern: /@include ([^\(]+)\(([^\)]+)\);/gi,
-        replacement: function mixinCommas(match, $1, $2) {
-          return '@include ' + $1 + '(' + $2.replace(/;/g, ',') + ');';
-        },
-        order: 4 // after defaults included in less-to-sass
-      },
-      { // Remove unquote
-        pattern: /unquote\("([^"]+)"\)/gi,
-        replacement: function ununquote(match, $1) {
-          return $1;
-        },
-        order: 4
-      },
-      { // Fix tilde literals
-        pattern: /~'(.*?)'/gi,
-        replacement: '$1',
-        order: 4
-      },
-      { // Inline &:extends converted
-        pattern: /&:extend\(([^\)]+?)( all)?\)/gi,
-        replacement: '@extend $1',
-        order: 4
-      },
-      { // Wrap variables in calcs with #{}
-        pattern: /calc\([^;]+/gi,
-        replacement: function calcVariables(match) {
-          return match.replace(/(\$[\w\-]+)/gi, '#{$1}');
-        },
-        order: 4
-      },
-      { // Wrap variables set to css variables with #{}
-        pattern: /(--[\w-:]+:\s*)((\$|darken\(|lighten\()[^;]+)/gi,
-        replacement: '$1#{$2}',
-        order: 5
-      },
-      { // Remove !default from extends (icons.scss)
-        pattern: /@extend ([^;}]+) !default;/gi,
-        replacement: '@extend $1;',
-        order: 6
-      },
-      { // Revert invalid @ => $ changes for css rules:
-        pattern: /\$(supports|container) \(/gi,
-        replacement: '@$1 (',
-        order: 7
-      },
-      { // Revert @if => $if change:
-        pattern: /\$if \(/gi,
-        replacement: '@if (',
-        order: 7
-      },
-      { // Revert @use => $use change:
-        pattern: /\$use '/gi,
-        replacement: "@use '",
-        order: 7
-      },
-      { // Fix comparison:
-        pattern: / ==< /gi,
-        replacement: ' <= ',
-        order: 7
-      },
-      { // Remove !important from variables:
-        pattern: /(?<!\(.*)(\$.+):(.+)\s*!important\s*;/g,
-        replacement: '$1:$2;',
-        order: 8
-      },
-      { // fadein => fade-in:
-        pattern: /fadein\((\S+),\s*(\S+)\)/g,
-        replacement: function (match, color, adjustment) {
-          return 'fade-in(' + color + ', ' + (adjustment.replace('%', '') / 100) + ')';
-        },
-        order: 8
-      },
-      { // fadeout => fade-out:
-        pattern: /fadeout\((\S+),\s*(\S+)\)/g,
-        replacement: function (match, color, adjustment) {
-          return 'fade-out(' + color + ', ' + (adjustment.replace('%', '') / 100) + ')';
-        },
-        order: 8
-      },
-      { // replace invalid characters in variable names:
-        pattern: /\$([^: };/]+)/g,
-        replacement: function (match, variable) {
-          return '$' + variable.replace('.', '__');
-        },
-        order: 9
-      },
-    ];
-    if (!grunt.option('no-default')) {
-      replacements.push(
-        { // Add !default (but avoid messing with function params):
-          pattern: /(?<!\(.*)(\$.+):(.+);/g,
-          replacement: '$1:$2 !default;',
-          order: 19
-        }
-      );
-    }
-
-    console.log(themeDirs || viewsDir ? "Converting specified themes" : "Converting Finna default themes");
-    grunt.config.set('lessToSass', {
-     convert: {
-        files: files,
-        options: {
-          excludes: ['important'],
-          replacements: replacements
-        }
-      }
-    });
-    grunt.task.run('lessToSass');
-  });
-
   function getLoadPaths(file) {
     var config;
     var parts = file.split('/');

diff --git a/build.xml b/build.xml
@@ -312,7 +312,7 @@
   <!-- Run LessToSass, error if there are uncommitted changes (used by continuous integration) -->
   <target name="checkLessToSass">
     <exec executable="npm" checkreturn="true" passthru="true">
-      <arg line="run finna:lessToSass" />
+      <arg line="run lessToSass" />
     </exec>
     <exec executable="git" checkreturn="true" passthru="true">
       <arg line="diff --exit-code *.scss" />