Just to check assets build on Jenkins.
Depends on D7032
Differential D7037
package.json: Upgrade dependencies Authored by anlambert on Jan 25 2022, 4:46 PM. Tags None Subscribers None
Details
Diff Detail
Event TimelineComment Actions Build is green Patch application report for D7037 (id=25507)Could not rebase; Attempt merge onto 1f6bf0c1f5... Updating 1f6bf0c1..936c7de2 Fast-forward .../dump-highlightjs-languages-data-plugin.js | 45 +- .../generate-weblabels-webpack-plugin/index.js | 22 +- assets/config/webpack.config.development.js | 16 + assets/src/bundles/origin/visits-reporting.css | 2 +- assets/src/bundles/revision/diff-utils.js | 2 +- assets/src/bundles/revision/revision.css | 2 +- assets/src/bundles/vendors/index.js | 3 +- assets/src/utils/highlightjs.js | 59 +- cypress/integration/language-select.spec.js | 4 +- package.json | 76 +- static/json/highlightjs-languages.json | 92 ++- swh/web/browse/utils.py | 2 +- swh/web/browse/views/content.py | 6 +- swh/web/common/highlightjs.py | 25 +- swh/web/tests/browse/views/test_content.py | 2 +- swh/web/tests/common/test_highlightjs.py | 12 +- swh/web/tests/conftest.py | 5 +- yarn.lock | 778 +++++++++++++-------- 18 files changed, 812 insertions(+), 341 deletions(-) Changes applied before testcommit 936c7de299f4fe07727c1dc42f42b118ce2031a6
Author: Antoine Lambert <anlambert@softwareheritage.org>
Date: Tue Jan 25 15:15:45 2022 +0100
package.json: Upgrade dependencies
commit 7ea3aab33ed8f7c9a748f6dfa85a87645aa6079e
Author: Antoine Lambert <anlambert@softwareheritage.org>
Date: Tue Jan 25 14:36:30 2022 +0100
assets/highlightjs: Add new languages to highlight and fix some issues
Add support for new programming languages to highlight in the webapp
by integrating highlight.js language plugins in the highlightjs chunk
generated by webpack.
Fix issue in Python code that was preventing to map a mimetype to a
language through its aliases.
commit bce990970824d00ec818fdfb677df54652976a3b
Author: Antoine Lambert <anlambert@softwareheritage.org>
Date: Tue Jan 25 14:37:55 2022 +0100
webpack/weblabels-plugin: Read package.json file only when required
Some module folders do not have package.json file in it but licenses can
still be overridden using the licenseOverride option of the plugin.
Previously, package.json file was attempted to be read regardless of
possible license override, which was causing error.See https://jenkins.softwareheritage.org/job/DWAPPS/job/tests-on-diff/1304/ for more details. |