From 32fdd3a819e4397c2fa853d9c9e637153a7c44ea Mon Sep 17 00:00:00 2001
From: Florian Rappl <florian.rappl@smapiot.com>
Date: Tue, 15 Mar 2022 18:11:45 +0100
Subject: [PATCH] Fixed getCurrentLayout SSR issue

---
 CHANGELOG.md                                 | 2 ++
 jest.config.js                               | 5 ++---
 src/framework/piral-core/src/utils/media.ts  | 3 +--
 src/tooling/piral-cli/src/injectors/pilet.ts | 5 -----
 src/utilities/piral-jest-utils/src/config.ts | 1 +
 5 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a3fa7f625..2a4ddcbe0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,7 +2,9 @@
 
 ## 0.14.19 (tbd)
 
+- Improved pilet injector to always return an array as metadata response
 - Removed dependency to `webpack-inject-plugin` in `piral-cli-webpack5`
+- Fixed issue with `getCurrentLayout` not returning default layout in SSR
 
 ## 0.14.18 (March 15, 2022)
 
diff --git a/jest.config.js b/jest.config.js
index 2f2cbc9a2..10d3cbf5a 100644
--- a/jest.config.js
+++ b/jest.config.js
@@ -1,4 +1,3 @@
 module.exports = {
-  testEnvironment: 'jsdom',
-  ...require('piral-jest-utils').default
-}
+  ...require('piral-jest-utils').default,
+};
diff --git a/src/framework/piral-core/src/utils/media.ts b/src/framework/piral-core/src/utils/media.ts
index a52901f53..f4569376c 100644
--- a/src/framework/piral-core/src/utils/media.ts
+++ b/src/framework/piral-core/src/utils/media.ts
@@ -1,5 +1,4 @@
 import { isfunc } from 'piral-base';
-import { none } from './helpers';
 import { LayoutTypes, LayoutBreakpoints } from '../types';
 
 export const defaultLayouts: LayoutTypes = ['desktop', 'tablet', 'mobile'];
@@ -8,7 +7,7 @@ export const defaultBreakpoints: LayoutBreakpoints = ['(min-width: 991px)', '(mi
 
 const mm =
   typeof window === 'undefined' || !isfunc(window.matchMedia)
-    ? () => ({ matches: none })
+    ? () => ({ matches: undefined })
     : (q: string) => window.matchMedia(q);
 
 export function getCurrentLayout<T>(breakpoints: Array<string>, layouts: Array<T>, defaultLayout: T) {
diff --git a/src/tooling/piral-cli/src/injectors/pilet.ts b/src/tooling/piral-cli/src/injectors/pilet.ts
index a01278d94..d5312917e 100644
--- a/src/tooling/piral-cli/src/injectors/pilet.ts
+++ b/src/tooling/piral-cli/src/injectors/pilet.ts
@@ -128,11 +128,6 @@ export default class PiletInjector implements KrasInjector {
     const { pilets, feed } = this.config;
     const localPilets = pilets.map((pilet) => pilet.meta).filter(Boolean);
     const mergedPilets = this.mergePilets(localPilets, await this.loadRemoteFeed(feed));
-
-    if (mergedPilets.length === 1) {
-      return JSON.stringify(mergedPilets[0]);
-    }
-
     return JSON.stringify(mergedPilets);
   }
 
diff --git a/src/utilities/piral-jest-utils/src/config.ts b/src/utilities/piral-jest-utils/src/config.ts
index e007cf9e9..dd7308817 100644
--- a/src/utilities/piral-jest-utils/src/config.ts
+++ b/src/utilities/piral-jest-utils/src/config.ts
@@ -5,6 +5,7 @@ const config: Config.InitialOptions = {
   collectCoverage: true,
   setupFiles: [resolve(__dirname, 'setup.js')],
   roots: ['src/'],
+  testEnvironment: 'jsdom',
   transform: {
     '^.+\\.tsx?$': 'ts-jest',
     '^.+\\.jsx?$': 'babel-jest',