@openeuropa/bcl-theme-joinup 0.4748.202605190849 → 0.4820.202607291300

package/bcl-builder.config.js

@@ -34,13 +34,28 @@ const resolvePackagePath = (packageName, ...segments) => {
 
 const outputFolder = path.resolve(__dirname);
 const repoRoot = path.resolve(__dirname, "../../../");
-const nodeModules = path.resolve(__dirname, "../../../node_modules");
 const toOutputRelativePath = (targetPath) =>
   path.relative(outputFolder, targetPath);
 const toOutputRelativePackagePath = (packagePath, ...segments) =>
   toOutputRelativePath(path.resolve(packagePath, ...segments));
+const toPackageImportPath = (packageName) => {
+  const packagePath = resolvePackagePath(packageName);
+
+  return packageName.startsWith("@")
+    ? path.dirname(path.dirname(packagePath))
+    : path.dirname(packagePath);
+};
+const getCopyUpToGlobBase = (sourceGlob) =>
+  path
+    .normalize(sourceGlob.split("**")[0])
+    .replace(/[\\/]+$/, "")
+    .split(/[\\/]+/).length;
 const bootstrapIconsPath = resolvePackagePath("bootstrap-icons");
 const twigTemplatesPath = resolvePackagePath("@openeuropa/bcl-twig-templates");
+const twigTemplatesGlob = toOutputRelativePackagePath(
+  twigTemplatesPath,
+  "templates/**/*.twig",
+);
 const resourcesFlagIconsPath = resolvePackagePath("@ecl/resources-flag-icons");
 const resourcesEcLogoPath = resolvePackagePath("@ecl/resources-ec-logo");
 const resourcesEuLogoPath = resolvePackagePath("@ecl/resources-eu-logo");
@@ -52,7 +67,12 @@ const bootstrapReplaceIconsPath = path.resolve(
 );
 
 // SCSS includePaths
-const includePaths = [nodeModules];
+const includePaths = [
+  ...new Set([
+    toPackageImportPath("@openeuropa/bcl-bootstrap"),
+    toPackageImportPath("@openeuropa/bcl-theme-default"),
+  ]),
+];
 const silenceDeprecations = [
   "legacy-js-api",
   "import",
@@ -196,19 +216,20 @@ module.exports = {
     {
       from: [toOutputRelativePackagePath(resourcesEcLogoPath, "**/*.svg")],
       to: path.resolve(outputFolder, "logos/ec"),
-      options: { up: 6 },
+      options: { up: 7 },
     },
     {
       from: [toOutputRelativePackagePath(resourcesEuLogoPath, "**/*.svg")],
       to: path.resolve(outputFolder, "logos/eu"),
-      options: { up: 6 },
+      options: { up: 7 },
     },
     {
-      from: [
-        toOutputRelativePackagePath(twigTemplatesPath, "templates/**/*.twig"),
-      ],
+      from: [twigTemplatesGlob],
       to: path.resolve(outputFolder, "templates"),
-      options: { up: 5, exclude: excludePaths },
+      options: {
+        up: getCopyUpToGlobBase(twigTemplatesGlob),
+        exclude: excludePaths,
+      },
     },
     {
       from: ["src/templates/**/*.twig"],

package/bin/copy-fonts.js

@@ -0,0 +1,73 @@
+#!/usr/bin/env node
+
+const fs = require("fs");
+const path = require("path");
+
+const outputDir = path.resolve(__dirname, "..", "fonts");
+
+const resolvePackagePath = (packageName) => {
+  let packageRoot;
+
+  try {
+    packageRoot = path.dirname(
+      require.resolve(`${packageName}/package.json`, { paths: [__dirname] }),
+    );
+  } catch (error) {
+    if (error.code !== "ERR_PACKAGE_PATH_NOT_EXPORTED") {
+      throw error;
+    }
+
+    let currentPath = fs.realpathSync(
+      require.resolve(packageName, { paths: [__dirname] }),
+    );
+
+    while (!packageRoot) {
+      currentPath = path.dirname(currentPath);
+
+      if (fs.existsSync(path.resolve(currentPath, "package.json"))) {
+        packageRoot = currentPath;
+      }
+    }
+  }
+
+  return fs.realpathSync(packageRoot);
+};
+
+const robotoPath = resolvePackagePath("@fontsource/roboto");
+const cssPattern = /^(?:lat|cyr|gree).+-(?:400|500|700).*\.css$/;
+const fontPattern =
+  /^roboto-(?:latin.*|cyrillic|greek)-(?:400|500|700)-.+\.woff2?$/;
+
+fs.mkdirSync(path.join(outputDir, "files"), { recursive: true });
+
+let copiedFiles = 0;
+
+for (const fileName of fs.readdirSync(robotoPath)) {
+  if (!cssPattern.test(fileName)) {
+    continue;
+  }
+
+  fs.copyFileSync(
+    path.join(robotoPath, fileName),
+    path.join(outputDir, fileName),
+  );
+  copiedFiles += 1;
+}
+
+for (const fileName of fs.readdirSync(path.join(robotoPath, "files"))) {
+  if (!fontPattern.test(fileName)) {
+    continue;
+  }
+
+  fs.copyFileSync(
+    path.join(robotoPath, "files", fileName),
+    path.join(outputDir, "files", fileName),
+  );
+  copiedFiles += 1;
+}
+
+if (copiedFiles === 0) {
+  throw new Error("No Roboto font files were copied.");
+}
+
+console.log(`Copied ${copiedFiles} Roboto font files.`);

package/css/oe-bcl-joinup.css

@@ -17341,6 +17341,11 @@ svg {
 .card {
   border-color: #dadee0;
 }
+.card > .bcl-card__image-wrapper:first-child {
+  overflow: hidden;
+  border-top-left-radius: var(--bs-card-border-radius);
+  border-top-right-radius: var(--bs-card-border-radius);
+}
 
 .card.text-bg-primary .card-header,
 .card.text-bg-primary .card-footer {
@@ -19502,9 +19507,14 @@ ul.bcl-mega-menu__items > li > button[aria-expanded=true] {
   height: 150px;
 }
 .bcl-banner p {
+  margin-bottom: 0;
   font-size: 1.125rem;
   font-weight: 500;
 }
+.bcl-banner p + .bcl-banner__link {
+  display: inline-block;
+  margin-top: 1.5rem;
+}
 .bcl-banner.shade {
   color: #212529;
 }