fix: not enable precompile options (#2002)

kazupon · web-flow · commit b896eaa81994 · 2023-04-15T19:07:14.000+09:00
* fix: not enable precompile options

* fix: lock file
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/specs/fixtures/lazy/lang/en.json b/specs/fixtures/lazy/lang/en.json
@@ -2,5 +2,6 @@
   "home": "Homepage",
   "about": "About us",
   "posts": "Posts",
-  "dynamic": "Dynamic"
+  "dynamic": "Dynamic",
+  "html": "<span>This is the danger</span>"
 }
diff --git a/specs/fixtures/lazy/nuxt.config.ts b/specs/fixtures/lazy/nuxt.config.ts
@@ -5,22 +5,6 @@ export default defineNuxtConfig({
   i18n: {
     baseUrl: 'http://localhost:3000',
     langDir: 'lang',
-    /*
-    locales: [
-      {
-        code: 'en',
-        iso: 'en-US',
-        file: 'en.json',
-        name: 'English'
-      },
-      {
-        code: 'fr',
-        iso: 'fr-FR',
-        file: 'fr.json5',
-        name: 'Français'
-      }
-    ],
-    */
     defaultLocale: 'fr',
     detectBrowserLanguage: false
   }
diff --git a/specs/fixtures/lazy/pages/index.vue b/specs/fixtures/lazy/pages/index.vue
@@ -45,5 +45,6 @@ useHead({
     <NuxtLink id="link-about" exact :to="localePath('about')">{{ $t('about') }}</NuxtLink>
     <p id="profile-js">{{ $t('settings.nest.foo.bar.profile') }}</p>
     <p id="profile-ts">{{ $t('settings_nest_foo_bar_profile') }}</p>
+    <p id="html-message" v-html="$t('html')"></p>
   </div>
 </template>
diff --git a/specs/fixtures/lazy/server/api/[locale].ts b/specs/fixtures/lazy/server/api/[locale].ts
@@ -2,6 +2,7 @@ import type { LocaleMessages, DefineLocaleMessage } from 'vue-i18n'
 
 const locales: LocaleMessages<DefineLocaleMessage> = {
   'en-GB': {
+    html: '<span>This is the danger</span>',
     settings: {
       nest: {
         foo: {
diff --git a/specs/fixtures/server/app.vue b/specs/fixtures/server/app.vue
@@ -0,0 +1,10 @@
+<template>
+  <div>
+  </div>
+</template>
+
+<style>
+section {
+  margin: 1rem 0;
+}
+</style>
diff --git a/specs/fixtures/server/i18n.config.ts b/specs/fixtures/server/i18n.config.ts
@@ -0,0 +1,5 @@
+export default {
+  legacy: false,
+  messages: {},
+  fallbackLocale: 'en'
+}
diff --git a/specs/fixtures/server/nuxt.config.ts b/specs/fixtures/server/nuxt.config.ts
@@ -0,0 +1,6 @@
+// https://nuxt.com/docs/guide/directory-structure/nuxt.config
+export default defineNuxtConfig({
+  modules: ['@nuxtjs/i18n'],
+
+  i18n: {}
+})
diff --git a/specs/fixtures/server/package.json b/specs/fixtures/server/package.json
@@ -0,0 +1,14 @@
+{
+  "name": "nuxt3-test-server",
+  "private": true,
+  "type": "module",
+  "scripts": {
+    "dev": "nuxi dev",
+    "build": "nuxt build",
+    "start": "node .output/server/index.mjs"
+  },
+  "devDependencies": {
+    "@nuxtjs/i18n": "latest",
+    "nuxt": "latest"
+  }
+}
diff --git a/specs/fixtures/server/server/api/[locale].ts b/specs/fixtures/server/server/api/[locale].ts
@@ -0,0 +1,24 @@
+import type { LocaleMessages, DefineLocaleMessage } from 'vue-i18n'
+
+const locales: LocaleMessages<DefineLocaleMessage> = {
+  'en-GB': {
+    html: '<span>This is the danger</span>',
+    settings: {
+      nest: {
+        foo: {
+          bar: {
+            profile: 'Profile1'
+          }
+        }
+      }
+    }
+  }
+}
+
+export default defineEventHandler(event => {
+  const locale = event.context.params?.locale
+  if (locale == null) {
+    return {}
+  }
+  return locales[locale] || {}
+})
diff --git a/specs/lazy_load/basic.spec.ts b/specs/lazy_load/basic.spec.ts
@@ -12,6 +12,9 @@ await setup({
       experimental: {
         jsTsFormatResource: true
       },
+      precompile: {
+        strictMessage: false
+      },
       defaultLocale: 'en',
       langDir: 'lang',
       lazy: true,
diff --git a/specs/lazy_load/server.spec.ts b/specs/lazy_load/server.spec.ts
@@ -5,37 +5,14 @@ import { validateSyntax } from '../helper'
 import { NUXT_I18N_PRECOMPILE_ENDPOINT } from '../../src/constants'
 
 await setup({
-  rootDir: fileURLToPath(new URL(`../fixtures/lazy`, import.meta.url)),
+  rootDir: fileURLToPath(new URL(`../fixtures/server`, import.meta.url)),
   browser: true,
   // overrides
   nuxtConfig: {
     i18n: {
-      experimental: {
-        jsTsFormatResource: true
-      },
-      defaultLocale: 'en',
-      langDir: 'lang',
-      lazy: true,
-      locales: [
-        {
-          code: 'en',
-          iso: 'en-US',
-          file: 'en.json',
-          name: 'English'
-        },
-        {
-          code: 'en-GB',
-          iso: 'en-GB',
-          files: ['en.json', 'en-GB.js', 'en-GB.ts'],
-          name: 'English (UK)'
-        },
-        {
-          code: 'fr',
-          iso: 'fr-FR',
-          file: 'fr.json5',
-          name: 'Français'
-        }
-      ]
+      // precompile: {
+      //   strictMessage: false
+      // }
     }
   }
 })
diff --git a/src/runtime/server/precompile.ts b/src/runtime/server/precompile.ts
@@ -83,7 +83,9 @@ async function getCacheCode({ type, locale, configId }: I18nBody) {
 function generateCode(body: I18nBody): [string, string[]] {
   const errors = [] as string[]
   const {
-    i18n: { strictMessage, escapeHtml }
+    i18n: {
+      precompile: { strictMessage, escapeHtml }
+    }
   } = useRuntimeConfig()
   const env = process.dev ? 'development' : 'production'
 

Original file line number	Diff line number	Diff line change
`@@ -2,5 +2,6 @@`
`2`	`2`	`"home": "Homepage",`
`3`	`3`	`"about": "About us",`
`4`	`4`	`"posts": "Posts",`
`5`		`- "dynamic": "Dynamic"`
	`5`	`+ "dynamic": "Dynamic",`
	`6`	`+ "html": "<span>This is the danger</span>"`
`6`	`7`	`}`