Skip to content
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

Jump to bottom

fix(babel-plugin-react-intl): idInterpolationPattern #2311

Merged
merged 2 commits into from Nov 15, 2020
Merged

fix(babel-plugin-react-intl): idInterpolationPattern #2311

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
8d6991e
fix(babel-plugin-react-intl): idInterpolationPattern
johakr Nov 14, 2020
9e41865
test(babel-plugin-react-intl): idInterpolationPattern
johakr Nov 15, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/babel-plugin-react-intl/index.ts
View file
Open in desktop
Expand Up @@ -207,7 +207,7 @@ function evaluateMessageDescriptor(
id = overrideIdFn(id, defaultMessage, description, filename);
} else if (!id && idInterpolationPattern && defaultMessage) {
id = interpolateName(
{sourcePath: filename} as any,
{resourcePath: filename} as any,
idInterpolationPattern,
{
content: description
Expand Down
12 changes: 6 additions & 6 deletions packages/babel-plugin-react-intl/tests/__snapshots__/index.test.ts.snap
View file
Open in desktop
Expand Up @@ -591,7 +591,7 @@ Object {
import { defineMessages, FormattedMessage } from 'react-intl';
const msgs = defineMessages({
header: {
\\"id\\": \\"4d1460\\",
\\"id\\": \\"idInterpolationPattern.actual.4d1460\\",
\\"defaultMessage\\": \\"Hello World!\\"
},
content: {
Expand All @@ -608,8 +608,8 @@ export default class Foo extends Component {
<p>
<FormattedMessage {...msgs.content} />
</p>
<FormattedMessage id=\\"36a8c8\\" defaultMessage=\\"Hello World!\\" />
<FormattedMessage id=\\"5ce864\\" defaultMessage=\\"NO ID\\" />
<FormattedMessage id=\\"idInterpolationPattern.actual.36a8c8\\" defaultMessage=\\"Hello World!\\" />
<FormattedMessage id=\\"idInterpolationPattern.actual.5ce864\\" defaultMessage=\\"NO ID\\" />
</div>;
}

Expand All @@ -619,7 +619,7 @@ export default class Foo extends Component {
Object {
"defaultMessage": "Hello World!",
"description": "The default message",
"id": "4d1460",
"id": "idInterpolationPattern.actual.4d1460",
},
Object {
"defaultMessage": "Hello Nurse!",
Expand All @@ -632,12 +632,12 @@ export default class Foo extends Component {
Object {
"defaultMessage": "Hello World!",
"description": "Something for the translator. Another description",
"id": "36a8c8",
"id": "idInterpolationPattern.actual.36a8c8",
},
Object {
"defaultMessage": "NO ID",
"description": "Something for the translator. Another description",
"id": "5ce864",
"id": "idInterpolationPattern.actual.5ce864",
},
],
"meta": Object {},
Expand Down
2 changes: 1 addition & 1 deletion packages/babel-plugin-react-intl/tests/index.test.ts
View file
Open in desktop
Expand Up @@ -26,7 +26,7 @@ const TESTS: Record<string, OptionsSchema> = {
formatMessageCall: {},
FormattedMessage: {},
idInterpolationPattern: {
idInterpolationPattern: '[sha512:contenthash:hex:6]',
idInterpolationPattern: '[folder].[name].[sha512:contenthash:hex:6]',
},
inline: {},
templateLiteral: {},
Expand Down