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

clients(devtools): expose registerLocaleData to worker #9645

Merged
merged 7 commits into from
Sep 19, 2019
Merged

clients(devtools): expose registerLocaleData to worker #9645

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
75b8ea8
clients(devtools): expose registerLocaleData to worker
paulirish Sep 6, 2019
a979374
only export register() from i18n
paulirish Sep 9, 2019
ade7757
a few random notes on chinese locales
paulirish Sep 9, 2019
2e47b75
tests: dont permanently mutate locales
paulirish Sep 9, 2019
cd9f8fd
assign by reference lol
paulirish Sep 18, 2019
34db89b
expose lookupLocale. fixes #9651
paulirish Sep 18, 2019
573042f
lint
paulirish Sep 18, 2019
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
4 changes: 4 additions & 0 deletions clients/devtools-entry.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
const lighthouse = require('../lighthouse-core/index.js');
const RawProtocol = require('../lighthouse-core/gather/connections/raw.js');
const log = require('lighthouse-logger');
const {registerLocaleData} = require('../lighthouse-core/lib/i18n/i18n.js');
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Would you like to export the lookupLocale with this function too?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

good call. done.


/** @typedef {import('../lighthouse-core/gather/connections/connection.js')} Connection */

Expand Down Expand Up @@ -53,6 +54,7 @@ if (typeof module !== 'undefined' && module.exports) {
module.exports = {
runLighthouseInWorker,
listenForStatus,
registerLocaleData,
};
}

Expand All @@ -63,4 +65,6 @@ if (typeof self !== 'undefined') {
self.runLighthouseInWorker = runLighthouseInWorker;
// @ts-ignore
self.listenForStatus = listenForStatus;
// @ts-ignore
self.registerLocaleData = registerLocaleData;
}
1 change: 0 additions & 1 deletion lighthouse-core/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,5 @@ lighthouse.traceCategories = require('./gather/driver.js').traceCategories;
lighthouse.Audit = require('./audits/audit.js');
lighthouse.Gatherer = require('./gather/gatherers/gatherer.js');
lighthouse.NetworkRecords = require('./computed/network-records.js');
lighthouse.registerLocaleData = require('./lib/i18n/i18n.js').registerLocaleData;

module.exports = lighthouse;
6 changes: 3 additions & 3 deletions lighthouse-core/lib/i18n/locales.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,9 +107,9 @@ const locales = {
'tr': require('./locales/tr.json'),
'uk': require('./locales/uk.json'),
'vi': require('./locales/vi.json'),
'zh': require('./locales/zh.json'), // zh-CN identical, so it falls back into zh
'zh-HK': require('./locales/zh-HK.json'),
'zh-TW': require('./locales/zh-TW.json'),
'zh': require('./locales/zh.json'), // aka ZH-Hans, sometimes seen as zh-CN, zh-Hans-CN, Simplified Chinese
'zh-HK': require('./locales/zh-HK.json'), // aka zh-Hant-HK. Note: yue-Hant-HK is not supported.
'zh-TW': require('./locales/zh-TW.json'), // aka zh-Hant, zh-Hant-TW, Traditional Chinese
};

module.exports = locales;
10 changes: 10 additions & 0 deletions lighthouse-core/test/lib/i18n/i18n-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,16 @@ describe('i18n', () => {
});

describe('#registerLocaleData', () => {
const moduleLocales = require('../../../lib/i18n/locales.js');
const clonedLocales = JSON.parse(JSON.stringify(moduleLocales));

// Restore locales to original state
afterEach(() => {
// eslint-disable-next-line no-unused-vars
let replacedLocales = require('../../../lib/i18n/locales.js');
replacedLocales = clonedLocales;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

seems like this wouldn't restore it (just overwrite the local var)? It might have to restore all the individual props (or just the single test could do it for just the one locale)

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

quite true. addressed in cd9f8fd

});

it('installs new locale strings', () => {
const localeData = {
'lighthouse-core/test/lib/i18n/i18n-test.js | testString': {
Expand Down