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-fbt): detect fbt JS callsites from FbtCollector [master] #263

Closed
wants to merge 1 commit into from
Closed

fix(babel-plugin-fbt): detect fbt JS callsites from FbtCollector [master] #263

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion packages/babel-plugin-fbt/src/bin/FbtCollector.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@

const {extractEnumsAndFlattenPhrases} = require('../FbtShiftEnums');
const fbt = require('../index');
const FbtUtil = require('../FbtUtil');
const fs = require('graceful-fs');

export type ExternalTransform = (
Expand Down Expand Up @@ -107,7 +108,7 @@ class FbtCollector implements IFbtCollector {
reactNativeMode: this._config.reactNativeMode,
};

if (!/<[Ff]bt|fbt(\.c)?\s*\(/.test(source)) {
if (!FbtUtil.textContainsFbtLikeModule(source)) {
return;
}

Expand Down
40 changes: 31 additions & 9 deletions packages/babel-plugin-fbt/src/bin/__tests__/__snapshots__/collectFBT-test.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1288,30 +1288,29 @@ Object {
}
`;

exports[`collectFbt should extract fbt.c strings 1`] = `
exports[`collectFbt should extract fbs strings 1`] = `
Object {
"childParentMappings": Object {},
"phrases": Array [
Object {
"col_beg": 6,
"col_end": 23,
"common": true,
"col_beg": 27,
"col_end": 52,
"jsfbt": Object {
"m": Array [],
"t": Object {
"desc": "Indicates an editor field is required.",
"text": "Required",
"desc": "foo",
"text": "bar",
},
},
"line_beg": 3,
"line_end": 3,
"line_beg": 1,
"line_end": 1,
"project": "",
},
],
}
`;

exports[`collectFbt should extract strings 1`] = `
exports[`collectFbt should extract fbt strings 1`] = `
Object {
"childParentMappings": Object {},
"phrases": Array [
Expand All @@ -1333,6 +1332,29 @@ Object {
}
`;

exports[`collectFbt should extract fbt.c strings 1`] = `
Object {
"childParentMappings": Object {},
"phrases": Array [
Object {
"col_beg": 6,
"col_end": 23,
"common": true,
"jsfbt": Object {
"m": Array [],
"t": Object {
"desc": "Indicates an editor field is required.",
"text": "Required",
},
},
"line_beg": 3,
"line_end": 3,
"project": "",
},
],
}
`;

exports[`collectFbt should extract strings from a custom collector 1`] = `
Object {
"childParentMappings": Object {
Expand Down
7 changes: 6 additions & 1 deletion packages/babel-plugin-fbt/src/bin/__tests__/collectFBT-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,11 +41,16 @@ describe('collectFbt', () => {
return JSON.parse(JSON.stringify(output));
}

it('should extract strings', () => {
it('should extract fbt strings', () => {
var res = collect('const fbt = require(\'fbt\');<fbt desc="foo">bar</fbt>');
expect(res).toMatchSnapshot();
});

it('should extract fbs strings', () => {
var res = collect('const fbs = require(\'fbs\');<fbs desc="foo">bar</fbs>');
expect(res).toMatchSnapshot();
});

it('should extract the author from Docblock', () => {
var res = collect(
[
Expand Down