create-nextblock 0.12.13 → 0.12.15

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (42) hide show
  1. package/package.json +1 -1
  2. package/templates/nextblock-template/app/(auth-pages)/sign-in/page.tsx +0 -13
  3. package/templates/nextblock-template/app/(auth-pages)/sign-up/SignUpForm.tsx +0 -14
  4. package/templates/nextblock-template/app/[slug]/page.tsx +12 -4
  5. package/templates/nextblock-template/app/api/cron/reset-sandbox/sandboxResetSql.ts +209 -101
  6. package/templates/nextblock-template/app/cms/CmsClientLayout.tsx +2 -3
  7. package/templates/nextblock-template/app/cms/components/FeatureImageField.tsx +1 -0
  8. package/templates/nextblock-template/app/cms/interactions/InteractionsModerationClient.tsx +1 -1
  9. package/templates/nextblock-template/app/cms/interactions/page.tsx +1 -1
  10. package/templates/nextblock-template/app/cms/media/components/MediaPickerDialog.tsx +38 -35
  11. package/templates/nextblock-template/app/cms/media/components/MediaUploadForm.tsx +14 -11
  12. package/templates/nextblock-template/app/cms/products/ProductFormClientShell.tsx +62 -14
  13. package/templates/nextblock-template/app/cms/products/[id]/edit/page.tsx +2 -2
  14. package/templates/nextblock-template/app/cms/revisions/RevisionHistoryButton.tsx +2 -2
  15. package/templates/nextblock-template/app/cms/revisions/actions.ts +5 -5
  16. package/templates/nextblock-template/app/cms/settings/languages/actions.ts +53 -1
  17. package/templates/nextblock-template/app/cms/settings/languages/components/LanguageDetectionPanel.tsx +188 -0
  18. package/templates/nextblock-template/app/cms/settings/languages/page.tsx +12 -1
  19. package/templates/nextblock-template/app/cms/users/actions.ts +0 -3
  20. package/templates/nextblock-template/app/cms/users/components/UserForm.tsx +0 -2
  21. package/templates/nextblock-template/app/cms/users/page.tsx +0 -2
  22. package/templates/nextblock-template/app/layout.tsx +42 -1
  23. package/templates/nextblock-template/app/product/[slug]/page.tsx +12 -4
  24. package/templates/nextblock-template/app/profile/ProfileAccountSidebar.tsx +1 -1
  25. package/templates/nextblock-template/app/profile/account-data.ts +1 -1
  26. package/templates/nextblock-template/app/profile/account-types.ts +0 -1
  27. package/templates/nextblock-template/app/profile/page.tsx +0 -1
  28. package/templates/nextblock-template/app/providers.tsx +2 -0
  29. package/templates/nextblock-template/components/PostCommentsSection.tsx +2 -2
  30. package/templates/nextblock-template/components/ProductReviewsSection.tsx +2 -2
  31. package/templates/nextblock-template/components/header-auth.tsx +1 -1
  32. package/templates/nextblock-template/context/LanguageContext.tsx +22 -7
  33. package/templates/nextblock-template/docs/TECHNICAL_SPECIFICATION.md +46 -43
  34. package/templates/nextblock-template/lib/custom-block-relation-registry.ts +3 -3
  35. package/templates/nextblock-template/lib/i18n/country-languages.ts +247 -0
  36. package/templates/nextblock-template/lib/i18n/detection.test.ts +197 -0
  37. package/templates/nextblock-template/lib/i18n/detection.ts +192 -0
  38. package/templates/nextblock-template/lib/setup/migrations-bundle.ts +72 -37
  39. package/templates/nextblock-template/package.json +1 -1
  40. package/templates/nextblock-template/proxy.ts +141 -8
  41. package/templates/nextblock-template/tsconfig.tsbuildinfo +1 -1
  42. package/templates/nextblock-template/components/GitHubLoginButton.tsx +0 -36
@@ -0,0 +1,197 @@
1
+ import { describe, expect, it } from 'vitest';
2
+ import {
3
+ DEFAULT_LANGUAGE_DETECTION_SETTINGS,
4
+ detectLocaleFromBrowser,
5
+ detectLocaleFromCountry,
6
+ getCountryFromRequestHeaders,
7
+ matchLocale,
8
+ normalizeLanguageDetectionSettings,
9
+ parseAcceptLanguage,
10
+ resolveDetectedLocale,
11
+ } from './detection';
12
+
13
+ function headersOf(record: Record<string, string>) {
14
+ const lower = Object.fromEntries(
15
+ Object.entries(record).map(([key, value]) => [key.toLowerCase(), value]),
16
+ );
17
+ return { get: (name: string) => lower[name.toLowerCase()] ?? null };
18
+ }
19
+
20
+ describe('normalizeLanguageDetectionSettings', () => {
21
+ it('returns defaults for absent or malformed values', () => {
22
+ expect(normalizeLanguageDetectionSettings(null)).toEqual(DEFAULT_LANGUAGE_DETECTION_SETTINGS);
23
+ expect(normalizeLanguageDetectionSettings(undefined)).toEqual(
24
+ DEFAULT_LANGUAGE_DETECTION_SETTINGS,
25
+ );
26
+ expect(normalizeLanguageDetectionSettings('browser')).toEqual(
27
+ DEFAULT_LANGUAGE_DETECTION_SETTINGS,
28
+ );
29
+ expect(normalizeLanguageDetectionSettings([])).toEqual(DEFAULT_LANGUAGE_DETECTION_SETTINGS);
30
+ });
31
+
32
+ it('keeps valid fields and coerces invalid ones individually', () => {
33
+ expect(
34
+ normalizeLanguageDetectionSettings({ mode: 'country', rememberVisitorChoice: false }),
35
+ ).toEqual({ mode: 'country', rememberVisitorChoice: false });
36
+ expect(
37
+ normalizeLanguageDetectionSettings({ mode: 'ip-magic', rememberVisitorChoice: false }),
38
+ ).toEqual({ mode: 'browser', rememberVisitorChoice: false });
39
+ expect(
40
+ normalizeLanguageDetectionSettings({ mode: 'default', rememberVisitorChoice: 'yes' }),
41
+ ).toEqual({ mode: 'default', rememberVisitorChoice: true });
42
+ });
43
+ });
44
+
45
+ describe('parseAcceptLanguage', () => {
46
+ it('parses tags sorted by q-value with defaults', () => {
47
+ expect(parseAcceptLanguage('fr-CH, fr;q=0.9, en;q=0.8, de;q=0.7')).toEqual([
48
+ { tag: 'fr-ch', base: 'fr', quality: 1 },
49
+ { tag: 'fr', base: 'fr', quality: 0.9 },
50
+ { tag: 'en', base: 'en', quality: 0.8 },
51
+ { tag: 'de', base: 'de', quality: 0.7 },
52
+ ]);
53
+ });
54
+
55
+ it('drops wildcards, q=0 entries, and malformed tags', () => {
56
+ expect(parseAcceptLanguage('*, en;q=0, <script>;q=1, fr')).toEqual([
57
+ { tag: 'fr', base: 'fr', quality: 1 },
58
+ ]);
59
+ });
60
+
61
+ it('handles empty and missing headers', () => {
62
+ expect(parseAcceptLanguage(null)).toEqual([]);
63
+ expect(parseAcceptLanguage('')).toEqual([]);
64
+ });
65
+
66
+ it('keeps original order among equal q-values', () => {
67
+ expect(parseAcceptLanguage('es, pt').map((entry) => entry.tag)).toEqual(['es', 'pt']);
68
+ });
69
+ });
70
+
71
+ describe('matchLocale', () => {
72
+ it('prefers exact matches, case-insensitively', () => {
73
+ expect(matchLocale(['fr-ca'], ['en', 'fr-CA'])).toBe('fr-CA');
74
+ });
75
+
76
+ it('falls back from a regional candidate to its base language', () => {
77
+ expect(matchLocale(['fr-CA'], ['en', 'fr'])).toBe('fr');
78
+ });
79
+
80
+ it('matches a base candidate to a regional site code', () => {
81
+ expect(matchLocale(['pt'], ['en', 'pt-BR'])).toBe('pt-BR');
82
+ });
83
+
84
+ it('respects candidate priority over match quality', () => {
85
+ // First candidate only base-matches, but it still beats later exact matches.
86
+ expect(matchLocale(['de-AT', 'en'], ['en', 'de'])).toBe('de');
87
+ });
88
+
89
+ it('returns null when nothing matches', () => {
90
+ expect(matchLocale(['ja', 'ko'], ['en', 'fr'])).toBeNull();
91
+ expect(matchLocale([], ['en'])).toBeNull();
92
+ expect(matchLocale(['en'], [])).toBeNull();
93
+ });
94
+ });
95
+
96
+ describe('detectLocaleFromBrowser', () => {
97
+ it('uses q-value order against the site languages', () => {
98
+ expect(detectLocaleFromBrowser('de;q=0.5, fr;q=0.9', ['en', 'fr', 'de'])).toBe('fr');
99
+ });
100
+
101
+ it('returns null without a usable header', () => {
102
+ expect(detectLocaleFromBrowser(null, ['en'])).toBeNull();
103
+ expect(detectLocaleFromBrowser('ja', ['en'])).toBeNull();
104
+ });
105
+ });
106
+
107
+ describe('detectLocaleFromCountry', () => {
108
+ it('maps countries to their primary languages in order', () => {
109
+ expect(detectLocaleFromCountry('FR', ['en', 'fr'])).toBe('fr');
110
+ expect(detectLocaleFromCountry('BR', ['en', 'pt'])).toBe('pt');
111
+ // Belgium lists nl before fr; the site only offers fr.
112
+ expect(detectLocaleFromCountry('BE', ['en', 'fr'])).toBe('fr');
113
+ expect(detectLocaleFromCountry('be', ['nl', 'fr'])).toBe('nl');
114
+ });
115
+
116
+ it('returns null for unknown countries or unmatched languages', () => {
117
+ expect(detectLocaleFromCountry('ZZ', ['en'])).toBeNull();
118
+ expect(detectLocaleFromCountry('JP', ['en', 'fr'])).toBeNull();
119
+ expect(detectLocaleFromCountry(null, ['en'])).toBeNull();
120
+ });
121
+ });
122
+
123
+ describe('getCountryFromRequestHeaders', () => {
124
+ it('reads host geo headers in precedence order', () => {
125
+ expect(getCountryFromRequestHeaders(headersOf({ 'x-vercel-ip-country': 'CA' }))).toBe('CA');
126
+ expect(getCountryFromRequestHeaders(headersOf({ 'cf-ipcountry': 'fr' }))).toBe('FR');
127
+ expect(
128
+ getCountryFromRequestHeaders(
129
+ headersOf({ 'x-vercel-ip-country': 'DE', 'cf-ipcountry': 'US' }),
130
+ ),
131
+ ).toBe('DE');
132
+ expect(getCountryFromRequestHeaders(headersOf({ 'cloudfront-viewer-country': 'JP' }))).toBe(
133
+ 'JP',
134
+ );
135
+ expect(getCountryFromRequestHeaders(headersOf({ 'x-country-code': 'BR' }))).toBe('BR');
136
+ });
137
+
138
+ it('rejects unknown-country sentinels and malformed values', () => {
139
+ expect(getCountryFromRequestHeaders(headersOf({ 'cf-ipcountry': 'XX' }))).toBeNull();
140
+ expect(getCountryFromRequestHeaders(headersOf({ 'cf-ipcountry': 'T1' }))).toBeNull();
141
+ expect(getCountryFromRequestHeaders(headersOf({ 'x-country-code': 'USA' }))).toBeNull();
142
+ expect(getCountryFromRequestHeaders(headersOf({}))).toBeNull();
143
+ });
144
+ });
145
+
146
+ describe('resolveDetectedLocale', () => {
147
+ const base = {
148
+ acceptLanguage: 'fr-CA, en;q=0.5',
149
+ countryCode: 'DE',
150
+ availableCodes: ['en', 'fr', 'de'],
151
+ defaultCode: 'en',
152
+ };
153
+
154
+ it('browser mode uses Accept-Language', () => {
155
+ expect(resolveDetectedLocale({ ...base, mode: 'browser' })).toBe('fr');
156
+ });
157
+
158
+ it('country mode uses the geo country', () => {
159
+ expect(resolveDetectedLocale({ ...base, mode: 'country' })).toBe('de');
160
+ });
161
+
162
+ it('browser_then_country prefers the browser and falls back to country', () => {
163
+ expect(resolveDetectedLocale({ ...base, mode: 'browser_then_country' })).toBe('fr');
164
+ expect(
165
+ resolveDetectedLocale({
166
+ ...base,
167
+ mode: 'browser_then_country',
168
+ acceptLanguage: 'ja',
169
+ }),
170
+ ).toBe('de');
171
+ });
172
+
173
+ it('default mode ignores all signals', () => {
174
+ expect(resolveDetectedLocale({ ...base, mode: 'default' })).toBe('en');
175
+ });
176
+
177
+ it('always falls back to the default language when detection finds nothing', () => {
178
+ expect(
179
+ resolveDetectedLocale({
180
+ mode: 'browser_then_country',
181
+ acceptLanguage: 'ja',
182
+ countryCode: 'JP',
183
+ availableCodes: ['en', 'fr'],
184
+ defaultCode: 'fr',
185
+ }),
186
+ ).toBe('fr');
187
+ expect(
188
+ resolveDetectedLocale({
189
+ mode: 'country',
190
+ acceptLanguage: null,
191
+ countryCode: null,
192
+ availableCodes: ['en'],
193
+ defaultCode: 'en',
194
+ }),
195
+ ).toBe('en');
196
+ });
197
+ });
@@ -0,0 +1,192 @@
1
+ // Pure language-detection helpers shared by proxy.ts (edge), app/layout.tsx and
2
+ // the CMS languages settings. Keep this module free of server-only / next/*
3
+ // imports so the proxy can use it.
4
+ import { COUNTRY_PRIMARY_LANGUAGES } from './country-languages';
5
+
6
+ /** site_settings key holding the detection config (non-sensitive, anon-readable). */
7
+ export const LANGUAGE_DETECTION_SETTING_KEY = 'language_detection_settings';
8
+
9
+ /** next/cache tag for the layout's cached read of the detection settings. */
10
+ export const LANGUAGE_DETECTION_CACHE_TAG = 'public-language-detection';
11
+
12
+ export const LANGUAGE_DETECTION_MODES = [
13
+ 'browser',
14
+ 'country',
15
+ 'browser_then_country',
16
+ 'default',
17
+ ] as const;
18
+
19
+ export type LanguageDetectionMode = (typeof LANGUAGE_DETECTION_MODES)[number];
20
+
21
+ export interface LanguageDetectionSettings {
22
+ /** How the first language served to a new visitor is chosen. */
23
+ mode: LanguageDetectionMode;
24
+ /** true = persist the visitor's language for a year; false = session-only cookie. */
25
+ rememberVisitorChoice: boolean;
26
+ }
27
+
28
+ // "browser" matches the long-standing page-level Accept-Language fallback, so an
29
+ // absent row keeps today's intended behavior.
30
+ export const DEFAULT_LANGUAGE_DETECTION_SETTINGS: LanguageDetectionSettings = {
31
+ mode: 'browser',
32
+ rememberVisitorChoice: true,
33
+ };
34
+
35
+ /** Coerce an arbitrary site_settings jsonb value into valid settings. */
36
+ export function normalizeLanguageDetectionSettings(value: unknown): LanguageDetectionSettings {
37
+ const fallback = DEFAULT_LANGUAGE_DETECTION_SETTINGS;
38
+ if (!value || typeof value !== 'object' || Array.isArray(value)) {
39
+ return { ...fallback };
40
+ }
41
+ const record = value as Record<string, unknown>;
42
+ const mode = LANGUAGE_DETECTION_MODES.includes(record.mode as LanguageDetectionMode)
43
+ ? (record.mode as LanguageDetectionMode)
44
+ : fallback.mode;
45
+ const rememberVisitorChoice =
46
+ typeof record.rememberVisitorChoice === 'boolean'
47
+ ? record.rememberVisitorChoice
48
+ : fallback.rememberVisitorChoice;
49
+ return { mode, rememberVisitorChoice };
50
+ }
51
+
52
+ export interface AcceptLanguageEntry {
53
+ /** Full lowercased tag, e.g. "fr-ca". */
54
+ tag: string;
55
+ /** Base language, e.g. "fr". */
56
+ base: string;
57
+ quality: number;
58
+ }
59
+
60
+ /** Parse an Accept-Language header into tags sorted by q-value (wildcards and q=0 dropped). */
61
+ export function parseAcceptLanguage(header: string | null | undefined): AcceptLanguageEntry[] {
62
+ if (!header) return [];
63
+ const entries: AcceptLanguageEntry[] = [];
64
+ for (const part of header.split(',')) {
65
+ const [rawTag, ...params] = part.trim().split(';');
66
+ const tag = rawTag?.trim().toLowerCase();
67
+ if (!tag || tag === '*' || !/^[a-z]{1,8}(-[a-z0-9]{1,8})*$/.test(tag)) continue;
68
+ let quality = 1;
69
+ for (const param of params) {
70
+ const eq = param.indexOf('=');
71
+ if (eq === -1) continue;
72
+ if (param.slice(0, eq).trim() !== 'q') continue;
73
+ const parsed = Number(param.slice(eq + 1).trim());
74
+ if (!Number.isNaN(parsed)) quality = Math.min(Math.max(parsed, 0), 1);
75
+ }
76
+ if (quality <= 0) continue;
77
+ entries.push({ tag, base: tag.split('-')[0] as string, quality });
78
+ }
79
+ // Stable sort: q descending, original order preserved among equals.
80
+ return entries
81
+ .map((entry, index) => ({ entry, index }))
82
+ .sort((a, b) => b.entry.quality - a.entry.quality || a.index - b.index)
83
+ .map(({ entry }) => entry);
84
+ }
85
+
86
+ /**
87
+ * Match ordered candidate tags against the site's language codes.
88
+ * Candidate priority wins: for each candidate (in order) try, exact tag
89
+ * ("fr-ca" = "fr-CA"), then candidate base to site code ("fr-CA" -> "fr"),
90
+ * then candidate base to site code base ("fr" -> "fr-CA") — so a visitor's
91
+ * top language matched loosely beats a lower preference matched exactly.
92
+ * Returns the site code as configured (original casing) or null.
93
+ */
94
+ export function matchLocale(candidates: string[], availableCodes: string[]): string | null {
95
+ if (candidates.length === 0 || availableCodes.length === 0) return null;
96
+ const available = availableCodes.map((code) => ({
97
+ code,
98
+ lower: code.toLowerCase(),
99
+ base: code.toLowerCase().split('-')[0] as string,
100
+ }));
101
+
102
+ for (const candidate of candidates) {
103
+ const tag = candidate.toLowerCase();
104
+ const base = tag.split('-')[0] as string;
105
+ const match =
106
+ available.find((lang) => lang.lower === tag) ??
107
+ available.find((lang) => lang.lower === base) ??
108
+ available.find((lang) => lang.base === base);
109
+ if (match) return match.code;
110
+ }
111
+ return null;
112
+ }
113
+
114
+ // Geo country headers injected by the popular hosts/CDNs, in precedence order.
115
+ const COUNTRY_HEADER_NAMES = [
116
+ 'x-vercel-ip-country', // Vercel
117
+ 'cf-ipcountry', // Cloudflare
118
+ 'cloudfront-viewer-country', // AWS CloudFront
119
+ 'x-country-code', // generic reverse proxies
120
+ ] as const;
121
+
122
+ /** Read the visitor's ISO 3166-1 alpha-2 country from host geo headers, if any. */
123
+ export function getCountryFromRequestHeaders(headers: {
124
+ get(name: string): string | null;
125
+ }): string | null {
126
+ for (const name of COUNTRY_HEADER_NAMES) {
127
+ const value = headers.get(name)?.trim().toUpperCase();
128
+ // Cloudflare uses XX/T1 for unknown/Tor; only accept real alpha-2 codes.
129
+ if (value && /^[A-Z]{2}$/.test(value) && value !== 'XX' && value !== 'T1') {
130
+ return value;
131
+ }
132
+ }
133
+ return null;
134
+ }
135
+
136
+ export function detectLocaleFromBrowser(
137
+ acceptLanguage: string | null | undefined,
138
+ availableCodes: string[],
139
+ ): string | null {
140
+ return matchLocale(
141
+ parseAcceptLanguage(acceptLanguage).map((entry) => entry.tag),
142
+ availableCodes,
143
+ );
144
+ }
145
+
146
+ export function detectLocaleFromCountry(
147
+ countryCode: string | null | undefined,
148
+ availableCodes: string[],
149
+ ): string | null {
150
+ if (!countryCode) return null;
151
+ const candidates = COUNTRY_PRIMARY_LANGUAGES[countryCode.toUpperCase()];
152
+ if (!candidates || candidates.length === 0) return null;
153
+ return matchLocale(candidates, availableCodes);
154
+ }
155
+
156
+ export interface ResolveDetectedLocaleInput {
157
+ mode: LanguageDetectionMode;
158
+ acceptLanguage: string | null | undefined;
159
+ countryCode: string | null | undefined;
160
+ availableCodes: string[];
161
+ defaultCode: string;
162
+ }
163
+
164
+ /**
165
+ * Pick the first language for a visitor with no (valid) language cookie.
166
+ * Always falls back to the site's default language when detection finds no match.
167
+ */
168
+ export function resolveDetectedLocale({
169
+ mode,
170
+ acceptLanguage,
171
+ countryCode,
172
+ availableCodes,
173
+ defaultCode,
174
+ }: ResolveDetectedLocaleInput): string {
175
+ let detected: string | null = null;
176
+ switch (mode) {
177
+ case 'browser':
178
+ detected = detectLocaleFromBrowser(acceptLanguage, availableCodes);
179
+ break;
180
+ case 'country':
181
+ detected = detectLocaleFromCountry(countryCode, availableCodes);
182
+ break;
183
+ case 'browser_then_country':
184
+ detected =
185
+ detectLocaleFromBrowser(acceptLanguage, availableCodes) ??
186
+ detectLocaleFromCountry(countryCode, availableCodes);
187
+ break;
188
+ case 'default':
189
+ break;
190
+ }
191
+ return detected ?? defaultCode;
192
+ }