@squiz/dxp-cli-next 5.33.0-develop.2 → 5.33.0-develop.3

package/lib/page/utils/definitions.js

@@ -82,7 +82,7 @@ function loadLayoutFromFile(layoutFile) {
             encoding: 'utf-8',
         });
         try {
-            const layout = (0, yaml_1.parse)(content);
+            const layout = fileType === 'json' ? JSON.parse(content) : (0, yaml_1.parse)(content);
             const fileName = path.basename(layoutFile);
             if (fileName === exports.LAYOUT_MANIFEST_FILE) {
                 exports.InputLayoutDefinitionV2.parse(layout);

package/lib/page/utils/definitions.spec.js

@@ -198,14 +198,25 @@ entry: template.hbs
             }
             throw new Error('File not found');
         });
-        yield expect((0, definitions_1.loadLayoutDefinition)(manifestJson)).rejects
-            .toThrowErrorMatchingInlineSnapshot(`
-      "Failed loading layout definition: Failed to parse ./some-dir/manifest.json: Flow map must end with a } at line 1, column 15:
-
-      {invalid: json
-                    ^
-      "
-    `);
+        yield expect((0, definitions_1.loadLayoutDefinition)(manifestJson)).rejects.toThrowErrorMatchingInlineSnapshot('"Failed loading layout definition: Failed to parse ./some-dir/manifest.json: Expected property name or \'}\' in JSON at position 1 (line 1 column 2)"');
+    }));
+    it('should throw an error if JSON layout file uses single quotes instead of double quotes', () => __awaiter(void 0, void 0, void 0, function* () {
+        fs.readFile.mockImplementation((filePath) => {
+            if (filePath.endsWith('manifest.json')) {
+                // Single quotes are not valid JSON - only double quotes are allowed for string values
+                return `{
+        "name": 'test-layout',
+        "displayName": "Test Layout",
+        "entry": "template.hbs",
+        "zones": []
+        }`;
+            }
+            if (filePath.endsWith('template.hbs')) {
+                return templateContent;
+            }
+            throw new Error('File not found');
+        });
+        yield expect((0, definitions_1.loadLayoutDefinition)(manifestJson)).rejects.toThrowErrorMatchingInlineSnapshot('"Failed loading layout definition: Failed to parse ./some-dir/manifest.json: Unexpected token \'\'\', ..."  "name": \'test-layo"... is not valid JSON"');
     }));
     it('should throw an error if layout file do not have valid extension', () => __awaiter(void 0, void 0, void 0, function* () {
         yield expect((0, definitions_1.loadLayoutDefinition)('/foo/manifest.html')).rejects.toThrow('Layout file must have a valid extension: [yaml|json]');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@squiz/dxp-cli-next",
-  "version": "5.33.0-develop.2",
+  "version": "5.33.0-develop.3",
   "repository": {
     "url": "https://gitlab.squiz.net/dxp/dxp-cli-next"
   },