@openeuropa/bcl-theme-default 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,7 @@ const bootstrapReplaceIconsPath = path.resolve(
 );
 
 // SCSS includePaths
-const includePaths = [nodeModules];
+const includePaths = [toPackageImportPath("@openeuropa/bcl-bootstrap")];
 const silenceDeprecations = [
   "legacy-js-api",
   "import",
@@ -219,11 +234,9 @@ module.exports = {
       options: { up: 7 },
     },
     {
-      from: [
-        toOutputRelativePackagePath(twigTemplatesPath, "templates/**/*.twig"),
-      ],
+      from: [twigTemplatesGlob],
       to: path.resolve(outputFolder, "templates"),
-      options: { up: 5 },
+      options: { up: getCopyUpToGlobBase(twigTemplatesGlob) },
     },
   ],
 };

package/package.json

@@ -2,7 +2,7 @@
   "name": "@openeuropa/bcl-theme-default",
   "author": "European Commission",
   "license": "EUPL-1.2",
-  "version": "1.13.0",
+  "version": "1.13.2",
   "description": "OE - BCL theme default",
   "scripts": {
     "align-templates": "lerna --scope \"@openeuropa/bcl-twig-templates\" run prepublish",
@@ -23,9 +23,9 @@
     "@ecl/resources-ec-logo": "3.13.0",
     "@ecl/resources-eu-logo": "3.13.0",
     "@ecl/resources-flag-icons": "3.13.0",
-    "@openeuropa/bcl-bootstrap": "^1.13.0",
-    "@openeuropa/bcl-builder": "^1.13.0",
-    "@openeuropa/bcl-twig-templates": "^1.13.0",
+    "@openeuropa/bcl-bootstrap": "^1.13.2",
+    "@openeuropa/bcl-builder": "^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",
@@ -51,5 +51,5 @@
     "design-system",
     "twig"
   ],
-  "gitHead": "34e56d7f9c42b8a331a6fdd483958fa17ecaf8ca"
+  "gitHead": "13e3e4489e4ab19744c8231f0f84bd9e5dfd92f4"
 }