@openeuropa/bcl-theme-joinup 1.13.0 → 1.13.2

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",
@@ -204,11 +224,12 @@ module.exports = {
       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/package.json

@@ -2,13 +2,12 @@
   "name": "@openeuropa/bcl-theme-joinup",
   "author": "European Commission",
   "license": "EUPL-1.2",
-  "version": "1.13.0",
+  "version": "1.13.2",
   "description": "OE - BCL theme joinup",
   "scripts": {
     "align-templates": "lerna --scope \"@openeuropa/bcl-twig-templates\" run prepublish",
     "build": "npm-run-all 'build:*'",
-    "build:fonts-css": "copyfiles -f ../../../node_modules/@fontsource/roboto/{lat*,cyr*,gree*}-{400,500,700}*.css fonts",
-    "build:font-files": "copyfiles -u 6 ../../../node_modules/@fontsource/roboto/files/roboto-{latin*,cyrillic,greek}-{400,500,700}* fonts",
+    "build:fonts": "node bin/copy-fonts.js",
     "build:styles": "cross-env bcl-builder styles",
     "build:scripts": "cross-env bcl-builder scripts",
     "prebuild:copy": "rimraf templates",
@@ -29,10 +28,10 @@
     "@ecl/resources-eu-logo": "3.13.0",
     "@ecl/resources-flag-icons": "3.13.0",
     "@fontsource/roboto": "5.2.9",
-    "@openeuropa/bcl-bootstrap": "^1.13.0",
-    "@openeuropa/bcl-builder": "^1.13.0",
-    "@openeuropa/bcl-theme-default": "^1.13.0",
-    "@openeuropa/bcl-twig-templates": "^1.13.0",
+    "@openeuropa/bcl-bootstrap": "^1.13.2",
+    "@openeuropa/bcl-builder": "^1.13.2",
+    "@openeuropa/bcl-theme-default": "^1.13.2",
+    "@openeuropa/bcl-twig-templates": "^1.13.2",
     "@rollup/plugin-replace": "6.0.3",
     "copyfiles": "2.4.1",
     "cross-env": "10.1.0",
@@ -58,5 +57,5 @@
     "design-system",
     "twig"
   ],
-  "gitHead": "34e56d7f9c42b8a331a6fdd483958fa17ecaf8ca"
+  "gitHead": "13e3e4489e4ab19744c8231f0f84bd9e5dfd92f4"
 }