@openeuropa/bcl-theme-joinup 1.11.0 → 1.12.0

package/bcl-builder.config.js

@@ -29,19 +29,22 @@ const resolvePackagePath = (packageName, ...segments) => {
     }
   }
 
-  return path.resolve(packageRoot, ...segments);
+  return path.resolve(fs.realpathSync(packageRoot), ...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 bootstrapIconsPath = resolvePackagePath("bootstrap-icons");
 const twigTemplatesPath = resolvePackagePath("@openeuropa/bcl-twig-templates");
 const resourcesFlagIconsPath = resolvePackagePath("@ecl/resources-flag-icons");
 const resourcesEcLogoPath = resolvePackagePath("@ecl/resources-ec-logo");
 const resourcesEuLogoPath = resolvePackagePath("@ecl/resources-eu-logo");
 const slimSelectPath = resolvePackagePath("slim-select");
-const slimSelect2Path = resolvePackagePath("slim-select-2");
 const flagIconsPath = resolvePackagePath("flag-icons");
 const bootstrapReplaceIconsPath = path.resolve(
   repoRoot,
@@ -50,11 +53,21 @@ const bootstrapReplaceIconsPath = path.resolve(
 
 // SCSS includePaths
 const includePaths = [nodeModules];
+const silenceDeprecations = [
+  "legacy-js-api",
+  "import",
+  "color-functions",
+  "if-function",
+  "global-builtin",
+];
 const excludePaths = [];
 if (templates.length) {
   templates.forEach((template) => {
     excludePaths.push(
-      path.resolve(twigTemplatesPath, `templates/bcl-${template}/*.html.twig`),
+      toOutputRelativePackagePath(
+        twigTemplatesPath,
+        `templates/bcl-${template}/*.html.twig`,
+      ),
     );
   });
 }
@@ -130,14 +143,8 @@ module.exports = {
       dest: path.resolve(outputFolder, "css/oe-bcl-joinup.css"),
       options: {
         includePaths,
+        silenceDeprecations,
         sourceMap: "file",
-        silenceDeprecations: [
-          "legacy-js-api",
-          "import",
-          "color-functions",
-          "if-function",
-          "global-builtin",
-        ],
       },
     },
     {
@@ -145,15 +152,9 @@ module.exports = {
       dest: path.resolve(outputFolder, "css/oe-bcl-joinup.min.css"),
       options: {
         includePaths,
+        silenceDeprecations,
         sourceMap: "file",
         minify: true,
-        silenceDeprecations: [
-          "legacy-js-api",
-          "import",
-          "color-functions",
-          "if-function",
-          "global-builtin",
-        ],
       },
     },
   ],
@@ -175,11 +176,6 @@ module.exports = {
       to: path.resolve(outputFolder, "js"),
       options: { up: true },
     },
-    {
-      from: [path.resolve(slimSelect2Path, "dist/slimselect.min.js")],
-      to: path.resolve(outputFolder, "js/slim-select-2"),
-      options: { up: true },
-    },
     {
       from: [path.resolve(bootstrapIconsPath, "bootstrap-icons.svg")],
       to: path.resolve(outputFolder, "icons"),
@@ -193,24 +189,26 @@ module.exports = {
       options: { up: true },
     },
     {
-      from: [path.resolve(flagIconsPath, "flags/**/*.svg")],
+      from: [toOutputRelativePackagePath(flagIconsPath, "flags/**/*.svg")],
       to: path.resolve(outputFolder, "icons/world-flags"),
-      options: { up: 6 },
+      options: { up: 5 },
     },
     {
-      from: [path.resolve(resourcesEcLogoPath, "**/*.svg")],
+      from: [toOutputRelativePackagePath(resourcesEcLogoPath, "**/*.svg")],
       to: path.resolve(outputFolder, "logos/ec"),
-      options: { up: 7 },
+      options: { up: 6 },
     },
     {
-      from: [path.resolve(resourcesEuLogoPath, "**/*.svg")],
+      from: [toOutputRelativePackagePath(resourcesEuLogoPath, "**/*.svg")],
       to: path.resolve(outputFolder, "logos/eu"),
-      options: { up: 7 },
+      options: { up: 6 },
     },
     {
-      from: [path.resolve(twigTemplatesPath, "templates/**/*.twig")],
+      from: [
+        toOutputRelativePackagePath(twigTemplatesPath, "templates/**/*.twig"),
+      ],
       to: path.resolve(outputFolder, "templates"),
-      options: { up: 8, exclude: excludePaths },
+      options: { up: 5, exclude: excludePaths },
     },
     {
       from: ["src/templates/**/*.twig"],