NEXT-24341 - Fix e2e inter font errors

Author: seggewiss

.danger.php

@@ -313,7 +313,7 @@ function checkMigrationForBundle(string $bundle, Context $context): void
                 continue;
             }
 
-            if ($file->status !== File::STATUS_REMOVED && preg_match('/^([-\.\w\/]+)$/', $file->name) === 0) {
+            if ($file->status !== File::STATUS_REMOVED && preg_match('/^([-+\.\w\/]+)$/', $file->name) === 0) {
                 $invalidFiles[] = $file->name;
             }
         }

changelog/_unreleased/2022-12-12-fix-inter-ui-apache-incompatibility.md

@@ -0,0 +1,9 @@
+---
+title: Fix inter-ui apache incompatibility
+issue: NEXT-24341
+author: Sebastian Seggewiss
+author_email: s.seggewiss@shopware.com
+author_github: @seggewiss
+---
+# Administration
+* Changed `inter-ui` web css suffix from `var` to `variable`

src/Administration/Resources/app/administration/patches/inter-ui+3.19.3.patch

@@ -0,0 +1,12 @@
+diff --git a/node_modules/inter-ui/Inter (web)/Inter-italic.var.woff2 b/node_modules/inter-ui/Inter (web)/Inter-italic.variable.woff2
+similarity index 100%
+rename from node_modules/inter-ui/Inter (web)/Inter-italic.var.woff2
+rename to node_modules/inter-ui/Inter (web)/Inter-italic.variable.woff2
+diff --git a/node_modules/inter-ui/Inter (web)/Inter-roman.var.woff2 b/node_modules/inter-ui/Inter (web)/Inter-roman.variable.woff2
+similarity index 100%
+rename from node_modules/inter-ui/Inter (web)/Inter-roman.var.woff2
+rename to node_modules/inter-ui/Inter (web)/Inter-roman.variable.woff2
+diff --git a/node_modules/inter-ui/Inter (web)/Inter.var.woff2 b/node_modules/inter-ui/Inter (web)/Inter.variable.woff2
+similarity index 100%
+rename from node_modules/inter-ui/Inter (web)/Inter.var.woff2
+rename to node_modules/inter-ui/Inter (web)/Inter.variable.woff2

src/Administration/Resources/app/administration/src/app/assets/scss/fonts/inter.font.scss

@@ -7,7 +7,8 @@
 // Variable font
 @use "~inter-ui/variable" as inter-ui-variable with (
   $inter-font-display: swap,
-  $inter-font-path: '~inter-ui/Inter (web)'
+  $inter-font-path: '~inter-ui/Inter (web)',
+  $inter-font-variable-suffix: '.variable'
 );
 
 @include inter-ui.weight-400;

src/Administration/Resources/app/administration/src/scripts/create-spec-file/index.mjs

@@ -50,7 +50,7 @@ rl.question(chalk.blueBright('Enter the component name/path you want to test: ')
         const fileName = orgFileName.substr(orgFileName.indexOf('app/administration/src') + 19, orgFileName.length);
         let specFileName = '';
 
-        if (fileName.endsWith('index.js') || fileName.endsWith('index.ts')) {
+        if (fileName.endsWith('index.js') || fileName.endsWith('index.ts')) {
             const regex = /^.*\/(.*)\/index\.(js|ts)/;
             const [_, lastFolder, fileExtension] = fileName.match(regex);