@10stars/config 15.0.10 → 15.0.12

package/.oxfmtrc.json

@@ -6,13 +6,7 @@
   "useTabs": false,
   "bracketSpacing": true,
   "experimentalSortImports": {
-    "groups": [
-      "builtin",
-      "external",
-      "internal",
-      ["parent", "sibling", "index"],
-      "side-effect"
-    ],
+    "groups": ["builtin", "external", "internal", ["parent", "sibling", "index"], "side-effect"],
     "newlinesBetween": true,
     "order": "asc",
     "ignoreCase": true

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@10stars/config",
-  "version": "15.0.10",
+  "version": "15.0.12",
   "private": false,
   "bin": {
     "config": "./src/index.ts"

package/src/vscode-config.ts

@@ -2,6 +2,12 @@ import fs from "node:fs/promises"
 import path from "node:path"
 import { execSync } from "node:child_process"
 
+// Strip JSONC comments while preserving strings (regex matches strings first to skip them)
+const stripJsoncComments = (jsonc: string): string =>
+  jsonc.replace(/"(?:[^"\\]|\\.)*"|'(?:[^'\\]|\\.)*'|\/\/[^\n]*|\/\*[\s\S]*?\*\//g, (match) =>
+    match.startsWith("/") ? "" : match,
+  )
+
 const extensionsJson = {
   recommendations: ["oxc.oxc-vscode"],
   unwantedRecommendations: [
@@ -94,18 +100,16 @@ export const setupVSCode = async (cwd: string) => {
   let existingSettings: Record<string, unknown> = {}
   try {
     const existingContent = await fs.readFile(settingsPath, "utf8")
-    // Strip comments (JSONC support)
-    const jsonWithoutComments = existingContent.replace(/\/\/.*|\/\*[\s\S]*?\*\//g, "")
-    existingSettings = JSON.parse(jsonWithoutComments)
-  } catch {
+    existingSettings = JSON.parse(stripJsoncComments(existingContent))
+  } catch (error) {
+    console.error("Error reading or parsing settings.json:", error)
     // File doesn't exist or is invalid JSON, start fresh
   }
 
   const sortedSettings: Record<string, unknown> = sortObjectKeys(settingsJson)
 
-  // Add serverlessConsole.services last (after sorting) to keep it at the bottom
-  if (existingSettings["serverlessConsole.services"]) {
-    sortedSettings["serverlessConsole.services"] = existingSettings["serverlessConsole.services"]
+  if (existingSettings.serverlessConsole) {
+    sortedSettings.serverlessConsole = existingSettings.serverlessConsole // Add serverlessConsole.services last (after sorting) to keep it at the bottom
   }
 
   await fs.writeFile(settingsPath, JSON.stringify(sortedSettings, null, 2) + "\n")