Merge remote-tracking branch 'origin/main' into feat/concept-npm-requests

Author: danielroe

.nuxtrc

@@ -1 +1 @@
-setups.@nuxt/test-utils="3.23.0"
+setups.@nuxt/test-utils="4.0.0"

docs/package.json

@@ -21,6 +21,6 @@
   "dependencies": {
     "better-sqlite3": "12.5.0",
     "docus": "5.4.4",
-    "nuxt": "4.3.0"
+    "nuxt": "4.3.1"
   }
 }

lunaria/prepare-json-files.ts

@@ -88,7 +88,7 @@ async function mergeLocale(locale: LocaleObject): Promise<void> {
 
   await fs.writeFile(
     path.resolve(`${destFolder}/${locale.code}.json`),
-    JSON.stringify(source, null, 2),
+    `${JSON.stringify(source, null, 2)}\n`,
     'utf-8',
   )
 }

nuxt.config.ts

@@ -4,20 +4,6 @@ import { isCI, provider } from 'std-env'
 
 export default defineNuxtConfig({
   modules: [
-    // Workaround for Nuxt 4.3.0 regression: https://github.com/nuxt/nuxt/issues/34140
-    // shared-imports.d.ts pulls in app composables during type-checking of shared context,
-    // but the shared context doesn't have access to auto-import globals.
-    // TODO: Remove when Nuxt fixes this upstream
-    function (_, nuxt) {
-      nuxt.hook('prepare:types', ({ sharedReferences }) => {
-        const idx = sharedReferences.findIndex(
-          ref => 'path' in ref && ref.path.endsWith('shared-imports.d.ts'),
-        )
-        if (idx !== -1) {
-          sharedReferences.splice(idx, 1)
-        }
-      })
-    },
     '@unocss/nuxt',
     '@nuxtjs/html-validator',
     '@nuxt/scripts',

package.json

@@ -61,10 +61,10 @@
     "@nuxt/a11y": "1.0.0-alpha.1",
     "@nuxt/fonts": "0.13.0",
     "@nuxt/scripts": "0.13.2",
-    "@nuxt/test-utils": "https://pkg.pr.new/@nuxt/test-utils@1499a48",
+    "@nuxt/test-utils": "4.0.0",
     "@nuxtjs/color-mode": "4.0.0",
     "@nuxtjs/html-validator": "2.1.0",
-    "@nuxtjs/i18n": "10.2.1",
+    "@nuxtjs/i18n": "10.2.3",
     "@shikijs/langs": "3.21.0",
     "@shikijs/themes": "3.21.0",
     "@unocss/nuxt": "66.6.0",
@@ -83,7 +83,7 @@
     "gray-matter": "4.0.3",
     "marked": "17.0.1",
     "module-replacements": "2.11.0",
-    "nuxt": "4.3.0",
+    "nuxt": "4.3.1",
     "nuxt-og-image": "5.1.13",
     "ofetch": "1.5.1",
     "ohash": "2.0.11",

pnpm-lock.yaml

@@ -209,12 +209,25 @@ const logSection = (
 }
 
 const processLocale = async (
+  singleLocale: boolean,
   localeFile: string,
   referenceContent: NestedObject,
   fix = false,
 ): Promise<SyncStats> => {
   const filePath = join(LOCALES_DIRECTORY, localeFile)
   const localeInfo = checkJsonName(filePath)
+
+  // prevent updating wrong locale file:
+  // - language locale files at countries allowed: e.g. es.json
+  // - country locale file forbidden: e.g. es-ES.json
+  // - target locale file forbidden: e.g. es-419.json
+  if (fix && localeInfo.mergeLocale && singleLocale) {
+    console.error(
+      `${COLORS.red}Error: Locale "${localeInfo.locale}" cannot be fixed, fix the ${localeInfo.lang} locale instead!${COLORS.reset}`,
+    )
+    process.exit(1)
+  }
+
   const targetContent = await loadJson(localeInfo)
 
   const stats: SyncStats = {
@@ -226,7 +239,7 @@ const processLocale = async (
   const newContent = syncLocaleData(referenceContent, targetContent, stats, fix)
 
   // Write if there are removals (always) or we are in fix mode
-  if (stats.extra.length > 0 || fix) {
+  if (!localeInfo.mergeLocale && (stats.extra.length > 0 || fix)) {
     writeFileSync(filePath, JSON.stringify(newContent, null, 2) + '\n', 'utf-8')
   }
 
@@ -246,7 +259,12 @@ const runSingleLocale = async (
     process.exit(1)
   }
 
-  const { missing, extra, referenceKeys } = await processLocale(localeFile, referenceContent, fix)
+  const { missing, extra, referenceKeys } = await processLocale(
+    true,
+    localeFile,
+    referenceContent,
+    fix,
+  )
 
   console.log(
     `${COLORS.cyan}=== Missing keys for ${localeFile}${fix ? ' (with --fix)' : ''} ===${COLORS.reset}`,
@@ -286,7 +304,7 @@ const runAllLocales = async (referenceContent: NestedObject, fix = false): Promi
   let totalAdded = 0
 
   for (const localeFile of localeFiles) {
-    const stats = await processLocale(localeFile, referenceContent, fix)
+    const stats = await processLocale(false, localeFile, referenceContent, fix)
     results.push({
       file: localeFile,
       ...stats,