Skip to content

fix: use hook filters in optimize-locales-plugin #10302

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wojtekmaj wants to merge 2 commits into
base: main
Choose a base branch
from
+38 −23
Open

fix: use hook filters in optimize-locales-plugin #10302

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4d967e7
fix: use hook filters in optimize-locales-plugin
wojtekmaj Jul 6, 2026
d1cd401
test: update optimize-locales-plugin resolveId tests
wojtekmaj Jul 8, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 20 additions & 16 deletions packages/dev/optimize-locales-plugin/LocalesPlugin.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,32 +12,36 @@
const {createUnplugin} = require('unplugin');
const path = require('path');

const localeSpecifierRegex = /[a-z]{2}-[A-Z]{2}/;
const sourcePathRegex =
/[/\\](@react-stately|@react-aria|@react-spectrum|@adobe[/\\]react-spectrum|react-stately|react-aria|react-aria-components)[/\\]/;

module.exports = createUnplugin(({locales}) => {
locales = locales.map(l => new Intl.Locale(l));
return {
name: 'locales-plugin',
vite: {
enforce: 'pre'
},
resolveId(specifier, sourcePath, options) {
if (
!/[/\\](@react-stately|@react-aria|@react-spectrum|@adobe[/\\]react-spectrum|react-stately|react-aria|react-aria-components)[/\\]/.test(
sourcePath
) ||
options?.ssr
) {
return;
}
resolveId: {
filter: {
id: localeSpecifierRegex
},
handler(specifier, sourcePath, options) {
if (!sourcePathRegex.test(sourcePath) || options?.ssr) {
return;
}

let match = specifier.match(/[a-z]{2}-[A-Z]{2}/);
if (match) {
let locale = new Intl.Locale(match[0]);
if (!locales.some(l => localeMatches(locale, l))) {
return path.join(__dirname, 'empty.js');
let match = specifier.match(localeSpecifierRegex);
if (match) {
let locale = new Intl.Locale(match[0]);
if (!locales.some(l => localeMatches(locale, l))) {
return path.join(__dirname, 'empty.js');
}
}
}

return null;
return null;
}
}
};
});
Expand Down
25 changes: 18 additions & 7 deletions packages/dev/optimize-locales-plugin/test/LocalesPlugin.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,18 @@ function fakeImporter(pkgName) {
return `/repo/node_modules/${pkgName}/dist/intlStrings.mjs`;
}

function resolveId(plugin, ...args) {
return plugin.resolveId.handler(...args);
}

describe('@react-aria/optimize-locales-plugin', () => {
test('resolveId filters locale-looking specifiers', () => {
const plugin = createPlugin(['en-US']);

expect(plugin.resolveId.filter.id.test('./fr-FR.json')).toBe(true);
expect(plugin.resolveId.filter.id.test('./helpers')).toBe(false);
});

describe('resolveId redirects non-included locales to empty.js for', () => {
const cases = [
['@react-stately/combobox', fakeImporter('@react-stately/combobox')],
Expand All @@ -36,40 +47,40 @@ describe('@react-aria/optimize-locales-plugin', () => {

test.each(cases)('importer under %s', (_label, sourcePath) => {
const plugin = createPlugin(['en-US']);
const resolved = plugin.resolveId('./fr-FR.json', sourcePath, {});
const resolved = resolveId(plugin, './fr-FR.json', sourcePath, {});
expect(resolved).toBe(EMPTY_JS);
});
});

describe('resolveId leaves things alone when', () => {
test('importer is outside React Spectrum / React Aria scopes', () => {
const plugin = createPlugin(['en-US']);
const resolved = plugin.resolveId('./fr-FR.json', fakeImporter('some-other-pkg'), {});
const resolved = resolveId(plugin, './fr-FR.json', fakeImporter('some-other-pkg'), {});
expect(resolved).toBeUndefined();
});

test('specifier targets an included locale', () => {
const plugin = createPlugin(['en-US', 'fr-FR']);
const resolved = plugin.resolveId('./fr-FR.json', fakeImporter('@adobe/react-spectrum'), {});
const resolved = resolveId(plugin, './fr-FR.json', fakeImporter('@adobe/react-spectrum'), {});
expect(resolved).toBeNull();
});

test('specifier targets a regional locale whose language is included without a region', () => {
// Including a bare language ("fr") should keep every regional variant.
const plugin = createPlugin(['en-US', 'fr']);
const resolved = plugin.resolveId('./fr-CA.json', fakeImporter('@react-aria/button'), {});
const resolved = resolveId(plugin, './fr-CA.json', fakeImporter('@react-aria/button'), {});
expect(resolved).toBeNull();
});

test('specifier does not look like a locale', () => {
const plugin = createPlugin(['en-US']);
const resolved = plugin.resolveId('./helpers', fakeImporter('@adobe/react-spectrum'), {});
const resolved = resolveId(plugin, './helpers', fakeImporter('@adobe/react-spectrum'), {});
expect(resolved).toBeNull();
});

test('options.ssr is true', () => {
const plugin = createPlugin(['en-US']);
const resolved = plugin.resolveId('./fr-FR.json', fakeImporter('@adobe/react-spectrum'), {
const resolved = resolveId(plugin, './fr-FR.json', fakeImporter('@adobe/react-spectrum'), {
ssr: true
});
expect(resolved).toBeUndefined();
Expand All @@ -79,7 +90,7 @@ describe('@react-aria/optimize-locales-plugin', () => {
test('handles Windows-style importer paths', () => {
const plugin = createPlugin(['en-US']);
const windowsImporter = 'C:\\repo\\node_modules\\@adobe\\react-spectrum\\dist\\intlStrings.mjs';
const resolved = plugin.resolveId('./fr-FR.json', windowsImporter, {});
const resolved = resolveId(plugin, './fr-FR.json', windowsImporter, {});
expect(resolved).toBe(EMPTY_JS);
});
});