core(hreflang): remove eval, import axe valid-langs.js directly #13385

connorjclark · 2021-11-16T21:53:38Z

connorjclark · 2021-11-16T22:00:50Z

PASS lighthouse-core/test/audits/metrics-test.js
PASS lighthouse-core/test/lib/emulation-test.js
Segmentation fault (core dumped)
npm ERR! code ELIFECYCLE
npm ERR! errno 139
npm ERR! lighthouse@9.0.0 jest: `node --experimental-vm-modules ./node_modules/jest/bin/jest.js`
npm ERR! Exit status 139
npm ERR! 
npm ERR! Failed at the lighthouse@9.0.0 jest script.
npm ERR! This is probably not a problem with npm. There is likely additional logging output above.

npm ERR! A complete log of this run can be found in:
npm ERR!     /home/runner/.npm/_logs/2021-11-16T21_58_00_618Z-debug.log
error Command failed with exit code 139.

oh no

adamraine · 2021-11-16T22:01:53Z

lighthouse-core/scripts/copy-axe-valid-langs.sh

+
+echo '// @ts-nocheck' > "$OUT_FILE"
+echo '// Auto-generated by lighthouse-core/scripts/copy-axe-valid-langs.sh' >> "$OUT_FILE"
+sed 's/Sting/string/' "$LH_ROOT_DIR"/node_modules/axe-core/lib/core/utils/valid-langs.js >> "$OUT_FILE"


Suggested change

sed 's/Sting/string/' "$LH_ROOT_DIR"/node_modules/axe-core/lib/core/utils/valid-langs.js >> "$OUT_FILE"

sed 's/String/string/' "$LH_ROOT_DIR"/node_modules/axe-core/lib/core/utils/valid-langs.js >> "$OUT_FILE"

Indeed, it is Sting.

I think they fixed it so it is String now

brendankenny

maybe we should talk to the axe folks about putting a package.json in e.g. the lib/ directory so it doesn't interfere with their main but allows importing modules under lib/?

brendankenny · 2021-11-16T22:13:09Z

.github/workflows/ci.yml

@@ -50,6 +50,7 @@ jobs:
    - run: yarn i18n:checks
    - run: yarn dogfood-lhci
    - run: bash lighthouse-core/scripts/copy-util-commonjs.sh
+    - run: bash lighthouse-core/scripts/copy-axe-valid-langs.sh


can we skip introducing machinery to update? The list of langs hasn't changed since March 2018. The third-party directory needs a readme anyways, we could just put update instructions in there too. Ideally long term we just get the file to be importable from the node_modules/ dependency.

brendankenny · 2021-11-16T22:14:50Z

lighthouse-core/audits/seo/hreflang.js

 * @return {boolean}
 */
-function isExpectedLanguageCode(hreflang) {
+function isExpectedLanguageCode(hreflang, isValidLang) {


Any reason to make this a callback? Could import where needed:

Suggested change

function isExpectedLanguageCode(hreflang, isValidLang) {

async function isExpectedLanguageCode(hreflang) {

// TODO(esmodules): use static import when file is esm.

const isValidLang = (await import('../../../third-party/axe/valid-langs.js')).default;

// ...

I was trying to limit the async from going where it made less sense.

brendankenny · 2021-11-16T22:26:41Z

third-party/axe/package.json

@@ -0,0 +1,4 @@
+{
+  "type": "module",


directory needs a license/readme (or metadata but readme is fine, honestly): go/thirdparty/non-google3

connorjclark · 2021-11-17T22:08:48Z

dequelabs/axe-core#3293

connorjclark · 2021-11-23T01:23:46Z

Get this error when running the integration recipe test: A dynamic import callback was not specified

I suppose this is related to jest, although apparently jest has supported dynamic imports for over a year now jestjs/jest#10620

connorjclark · 2021-11-23T01:24:03Z

.npmignore

@@ -12,7 +12,6 @@ docs/
 lighthouse-core/lib/sd-validation/
 lighthouse-core/scripts/*
 lighthouse-core/test/
-lighthouse-core/third_party/src/


drive by: this is not a folder

adamraine · 2022-02-04T17:03:26Z

third-party/axe/package.json

@@ -0,0 +1,4 @@
+{
+  "license": "MPL-2.0",
+  "//": "Any directory that uses `import ... from` or `export ...` must be type module. Temporary file until root package.json is type: module"


There is no "type": "module" anymore, should this comment refer to the license or can we remove this file?

adamraine · 2022-02-04T17:06:45Z

lighthouse-core/audits/seo/hreflang.js

   */
-  static audit({LinkElements}) {


This doesn't need to be async anymore

adamraine · 2022-02-04T17:09:36Z

lighthouse-core/scripts/copy-axe-valid-langs.sh

+
+echo '// @ts-nocheck' > "$OUT_FILE"
+echo '// Auto-generated by lighthouse-core/scripts/copy-axe-valid-langs.sh' >> "$OUT_FILE"
+sed 's/Sting/string/' "$LH_ROOT_DIR"/node_modules/axe-core/lib/core/utils/valid-langs.js >> "$OUT_FILE"


I think they fixed it so it is String now

core(hreflang): remove usage of eval, import axe-core/valid-langs.js

bc735b6

connorjclark requested a review from a team as a code owner November 16, 2021 21:53

connorjclark requested review from adamraine and removed request for a team November 16, 2021 21:53

google-cla bot added the cla: yes label Nov 16, 2021

connorjclark changed the title ~~core(hreflang): remove usage of eval, import axe-core/valid-langs.js~~ core(hreflang): remove eval, import axe-core/valid-langs.js Nov 16, 2021

devtools-bot assigned adamraine Nov 16, 2021

devtools-bot added the waiting4reviewer label Nov 16, 2021

connorjclark changed the title ~~core(hreflang): remove eval, import axe-core/valid-langs.js~~ core(hreflang): remove eval, import axe valid-langs.js directly Nov 16, 2021

adamraine reviewed Nov 16, 2021

View reviewed changes

brendankenny reviewed Nov 16, 2021

View reviewed changes

readme

1f808b7

vercel bot deployed to Preview November 23, 2021 00:32 View deployment

license

f94ccbd

vercel bot deployed to Preview November 23, 2021 00:34 View deployment

update

4bdd212

vercel bot deployed to Preview November 23, 2021 01:23 View deployment

connorjclark commented Nov 23, 2021

View reviewed changes

Merge remote-tracking branch 'origin/master' into no-eval

20c0a06

vercel bot deployed to Preview January 26, 2022 23:55 View deployment

connorjclark added 2 commits February 3, 2022 17:21

Merge remote-tracking branch 'origin/master' into no-eval

33fc5cb

fix

0d6d0c6

vercel bot deployed to Preview February 4, 2022 01:38 View deployment

adamraine reviewed Feb 4, 2022

View reviewed changes

fix

3fb89f0

vercel bot deployed to Preview February 4, 2022 20:14 View deployment

fix

6fea81d

vercel bot deployed to Preview February 4, 2022 20:16 View deployment

adamraine approved these changes Feb 4, 2022

View reviewed changes

connorjclark merged commit 16248c1 into master Feb 4, 2022

connorjclark deleted the no-eval branch February 4, 2022 22:13

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

core(hreflang): remove eval, import axe valid-langs.js directly #13385

core(hreflang): remove eval, import axe valid-langs.js directly #13385

connorjclark commented Nov 16, 2021

connorjclark commented Nov 16, 2021

adamraine Nov 16, 2021

connorjclark Nov 16, 2021

adamraine Feb 4, 2022

brendankenny left a comment

brendankenny Nov 16, 2021 •

edited

Loading

brendankenny Nov 16, 2021

connorjclark Nov 16, 2021

brendankenny Nov 16, 2021

connorjclark commented Nov 17, 2021

connorjclark commented Nov 23, 2021

connorjclark Nov 23, 2021

adamraine Feb 4, 2022

adamraine Feb 4, 2022

adamraine Feb 4, 2022

	sed 's/Sting/string/' "$LH_ROOT_DIR"/node_modules/axe-core/lib/core/utils/valid-langs.js >> "$OUT_FILE"
	sed 's/String/string/' "$LH_ROOT_DIR"/node_modules/axe-core/lib/core/utils/valid-langs.js >> "$OUT_FILE"

-function isExpectedLanguageCode(hreflang, isValidLang) {
+async function isExpectedLanguageCode(hreflang) {
+  // TODO(esmodules): use static import when file is esm.
+  const isValidLang = (await import('../../../third-party/axe/valid-langs.js')).default;
+  // ...

core(hreflang): remove eval, import axe valid-langs.js directly #13385

core(hreflang): remove eval, import axe valid-langs.js directly #13385

Conversation

connorjclark commented Nov 16, 2021

connorjclark commented Nov 16, 2021

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

brendankenny left a comment

Choose a reason for hiding this comment

brendankenny Nov 16, 2021 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

connorjclark commented Nov 17, 2021

connorjclark commented Nov 23, 2021

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

brendankenny Nov 16, 2021 •

edited

Loading