chore: improve json5 merge 🌴 (#7884)

Author: gioboa

.changeset/moody-tigers-cry.md

@@ -0,0 +1,5 @@
+---
+'create-qwik': patch
+---
+
+CHORE: use the new version of @croct/json5-parser to merge JSON5 and preserve comments

packages/qwik/package.json

@@ -30,7 +30,7 @@
   },
   "devDependencies": {
     "@builder.io/qwik": "workspace:^",
-    "@croct/json5-parser": "0.1.1",
+    "@croct/json5-parser": "0.2.0",
     "domino": "2.1.6",
     "ignore": "5.3.1",
     "image-size": "1.2.1",

packages/qwik/src/cli/add/update-files.ts

@@ -119,7 +119,7 @@ async function mergeVSCodeSettings(fileUpdates: FsUpdates, srcPath: string, dest
       await fs.promises.readFile(destPath, 'utf-8'),
       JsonObjectNode
     );
-    destPkgJson.update({ ...destPkgJson.toJSON(), ...srcPkgJson.toJSON() });
+    destPkgJson.merge(srcPkgJson);
 
     fileUpdates.files.push({
       path: destPath,

packages/qwik/src/cli/add/update-files.unit.ts

@@ -120,7 +120,7 @@ describe('mergeIntegrationDir', () => {
       'destDir/subDestDir/package.json': '{"name": "fake"}',
       'destDir/subDestDir/should-stay/should-also-stay.ts': 'fake file',
       'destDir/subDestDir/apps/subpackage/.vscode/settings.json':
-        '{ \n          // Comment Foo\n          "css.lint.unknownAtRules": "ignore",\n          "name": "John Doe",\n          "age": 42\n      }\n',
+        '{ \n          // Comment Foo\n          "css.lint.unknownAtRules": "ignore",\n          // Comment\n          "name": "John Doe",\n          "age": 42,\n      }\n',
       'destDir/subDestDir/apps/subpackage/src/global.css': 'p{color: red}\n\n/* CSS */\n',
     };
     for (const [fileName, content] of Object.entries(tests)) {