.gitlab-ci.yml

@@ -24,7 +24,7 @@ workflow:
     - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
 
 default:
-  image: node:20.18.0-bookworm
+  image: node:20.18.1-bookworm
   tags:
     - gitlab-org
 

.tool-versions

-nodejs 20.18.0
+nodejs 20.18.1
 yarn 1.22.19

build_scripts/index.js

@@ -2,7 +2,7 @@ const path = require('path');
 const rimraf = require('rimraf');
 
 const { optimizeSVGs } = require('./src/svg_optimization');
-const { createIconSprite } = require('./src/svg_sprite_icons');
+const { createSvgSprite } = require('./src/svg_sprite');
 const { copyFolderRecursive, copyFile } = require('./src/utils');
 const { collectIllustrations } = require('./src/illustrations');
 const { collectLogos } = require('./src/logos');
@@ -15,7 +15,7 @@ const STATIC_PATH = path.normalize(path.join(BASE_PATH, 'svgpreviewer', 'static'
 
 async function buildFiles() {
   console.log('Creating Icon Sprite...');
-  await createIconSprite(
+  await createSvgSprite(
     BASE_PATH,
     DIST_PATH,
     path.join(BASE_PATH, 'sprite_icons', '*.svg'),
@@ -24,7 +24,7 @@ async function buildFiles() {
   console.log('Created Icon Sprite');
 
   console.log('Creating File Icon Sprite...');
-  await createIconSprite(
+  await createSvgSprite(
     BASE_PATH,
     FILE_ICONS_DIST_PATH,
     path.join(BASE_PATH, 'file_icons', '*.svg'),
@@ -32,6 +32,16 @@ async function buildFiles() {
   );
   console.log('Created File Icon Sprite');
 
+  console.log('Creating Illustration Sprite...');
+  await createSvgSprite(
+    BASE_PATH,
+    DIST_PATH,
+    path.join(BASE_PATH, 'illustrations', '*.svg'),
+    'illustrations',
+    path.join(BASE_PATH, 'illustrations/!(logos|third-party-logos)', '**', '**.svg'),
+  );
+  console.log('Created Illustration Sprite');
+
   console.log('Optimizing icons...');
   await optimizeSVGs(
     BASE_PATH,

build_scripts/src/svg_sprite_icons.js → build_scripts/src/svg_sprite.js

@@ -6,9 +6,12 @@ const SVGSpriter = require('svg-sprite');
 const { getFilesizeInBytes } = require('./utils');
 
 // eslint-disable-next-line max-params
-const createIconSprite = (BASE_PATH, destPath, globPattern, targetFile) => {
+const createSvgSprite = (BASE_PATH, destPath, globPattern, targetFile, additionalGlobPattern) => {
   const spriteFiles = glob.sync(globPattern);
 
+  if (additionalGlobPattern)
+    spriteFiles.push(...glob.sync(additionalGlobPattern))
+
   const spriter = new SVGSpriter({
     dest: destPath,
     shape: {
@@ -104,4 +107,4 @@ const createIconSprite = (BASE_PATH, destPath, globPattern, targetFile) => {
   });
 };
 
-module.exports = { createIconSprite };
+module.exports = { createSvgSprite };

package.json

 {
   "name": "@gitlab/svgs",
-  "version": "3.122.0",
+  "version": "3.123.0",
   "description": "SVG Assets for GitLab",
   "main": "./index.js",
   "repository": "git@gitlab.com:gitlab-org/gitlab-svgs.git",
@@ -18,7 +18,7 @@
   "dependencies": {},
   "devDependencies": {
     "@arkweid/lefthook": "^0.7.7",
-    "@gitlab/eslint-plugin": "20.6.0",
+    "@gitlab/eslint-plugin": "20.7.1",
     "bootstrap": "^4.3.1",
     "eslint": "8.57.1",
     "glob": "^7.1.3",

sprite_icons/duo-chat-new.svg

+<svg width="16" height="16" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" clip-rule="evenodd" d="M1.5 4A1.5 1.5 0 0 1 3 2.5h10A1.5 1.5 0 0 1 14.5 4v3.25a.75.75 0 0 0 1.5 0V4a3 3 0 0 0-3-3H3a3 3 0 0 0-3 3v11.25a.75.75 0 0 0 1.28.53L4.063 13H8.25a.75.75 0 0 0 0-1.5H3.443l-.22.22L1.5 13.44V4ZM13 14a.75.75 0 0 1-.75-.75v-1.5h-1.5a.75.75 0 0 1 0-1.5h1.5v-1.5a.75.75 0 0 1 1.5 0v1.5h1.5a.75.75 0 0 1 0 1.5h-1.5v1.5A.75.75 0 0 1 13 14Z" fill="#000"/></svg>
\ No newline at end of file

src/file_icon_map.js

@@ -121,6 +121,7 @@ const fileExtensionIcons = {
   jsp: 'java',
   c: 'c',
   m: 'c',
+  matlab: 'matlab',
   h: 'h',
   cc: 'cpp',
   cpp: 'cpp',

svgpreviewer/components/svg_image.vue

@@ -64,7 +64,7 @@ export default {
         <svg v-if="imageSprite" :class="[imageClass]">
           <use v-bind="{ 'xlink:href': spritePath }" />
         </svg>
-        <img v-else :class="[imageClass]" :src="imagePath" />
+        <img v-else :class="[imageClass]" :src="imagePath" :alt="imageName" />
       </div>
       <div class="image-name">
         {{ imageName }}

yarn.lock

@@ -744,10 +744,10 @@
   resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.57.1.tgz#de633db3ec2ef6a3c89e2f19038063e8a122e2c2"
   integrity sha512-d9zaMRSTIKDLhctzH12MtXvJKSSUhaHcjV+2Z+GK+EEY7XKpP5yR4x+N3TAcHTcu963nIr+TMcCb4DBCYX1z6Q==
 
-"@gitlab/eslint-plugin@20.6.0":
-  version "20.6.0"
-  resolved "https://registry.yarnpkg.com/@gitlab/eslint-plugin/-/eslint-plugin-20.6.0.tgz#ff3b5cda779b4d9984796bf81286f70bfe7d5915"
-  integrity sha512-9y/slEJ+aWXUnK1UcaG+EzB/JjCrK10sHCzxOcEEuML5DUpRqH7axGFYBmug7sR65w66pZZf/IDXe1nUEk/quQ==
+"@gitlab/eslint-plugin@20.7.1":
+  version "20.7.1"
+  resolved "https://registry.yarnpkg.com/@gitlab/eslint-plugin/-/eslint-plugin-20.7.1.tgz#89dfb95bf6ffec50bd7d9bace42622634a529cf0"
+  integrity sha512-BSB5SC86ITaauEab0HMWLTiaA1QgFlwz5keoO8YQ0JSjPaKusVOGDYDoxQHtZVuRBVfYQi0Cwf5dSWiHJWAeEw==
   dependencies:
     "@typescript-eslint/eslint-plugin" "^7.14.1"
     eslint-config-airbnb-base "^15.0.0"