mirror of
https://github.com/vector-im/hydrogen-web.git
synced 2024-12-23 03:25:12 +01:00
Add license comments to make GNU LibreJS accept Hydrogen's JS
This adds proper license comments to all _internal_ JS scripts in the /target build. This way the code self-identifies as Apache-2.0 which prevents LibreJS from blocking it. Closes: #209 Signed-off-by: Johannes Marbach <n0-0ne+github@mailbox.org>
This commit is contained in:
parent
f4bb95f459
commit
37bb078547
@ -161,13 +161,15 @@ async function buildHtml(doc, version, baseConfig, globalHash, modernOnly, asset
|
|||||||
wasmBundle: assets.resolve("olm.js"),
|
wasmBundle: assets.resolve("olm.js"),
|
||||||
}
|
}
|
||||||
}));
|
}));
|
||||||
|
const modernScript = `import {main, Platform} from "./${assets.resolve(`hydrogen.js`)}"; main(new Platform(document.body, ${configJSON}));`;
|
||||||
const mainScripts = [
|
const mainScripts = [
|
||||||
`<script type="module">import {main, Platform} from "./${assets.resolve(`hydrogen.js`)}"; main(new Platform(document.body, ${configJSON}));</script>`
|
`<script type="module">${wrapWithLicenseComments(modernScript)}</script>`
|
||||||
];
|
];
|
||||||
if (!modernOnly) {
|
if (!modernOnly) {
|
||||||
|
const legacyScript = `hydrogen.main(new hydrogen.Platform(document.body, ${configJSON}));`;
|
||||||
mainScripts.push(
|
mainScripts.push(
|
||||||
`<script type="text/javascript" nomodule src="${assets.resolve(`hydrogen-legacy.js`)}"></script>`,
|
`<script type="text/javascript" nomodule src="${assets.resolve(`hydrogen-legacy.js`)}"></script>`,
|
||||||
`<script type="text/javascript" nomodule>hydrogen.main(new hydrogen.Platform(document.body, ${configJSON}));</script>`
|
`<script type="text/javascript" nomodule>${wrapWithLicenseComments(legacyScript)}</script>`
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
doc("script#main").replaceWith(mainScripts.join(""));
|
doc("script#main").replaceWith(mainScripts.join(""));
|
||||||
@ -177,7 +179,7 @@ async function buildHtml(doc, version, baseConfig, globalHash, modernOnly, asset
|
|||||||
let vSource = versionScript.contents().text();
|
let vSource = versionScript.contents().text();
|
||||||
vSource = vSource.replace(`"%%VERSION%%"`, `"${version}"`);
|
vSource = vSource.replace(`"%%VERSION%%"`, `"${version}"`);
|
||||||
vSource = vSource.replace(`"%%GLOBAL_HASH%%"`, `"${globalHash}"`);
|
vSource = vSource.replace(`"%%GLOBAL_HASH%%"`, `"${globalHash}"`);
|
||||||
versionScript.text(vSource);
|
versionScript.text(wrapWithLicenseComments(vSource));
|
||||||
doc("head").append(`<link rel="manifest" href="${assets.resolve("manifest.json")}">`);
|
doc("head").append(`<link rel="manifest" href="${assets.resolve("manifest.json")}">`);
|
||||||
await assets.writeUnhashed("index.html", doc.html());
|
await assets.writeUnhashed("index.html", doc.html());
|
||||||
}
|
}
|
||||||
@ -198,7 +200,7 @@ async function buildJs(mainFile, extraFiles, importOverrides) {
|
|||||||
name: `hydrogen`
|
name: `hydrogen`
|
||||||
});
|
});
|
||||||
const code = output[0].code;
|
const code = output[0].code;
|
||||||
return code;
|
return wrapWithLicenseComments(code);
|
||||||
}
|
}
|
||||||
|
|
||||||
async function buildJsLegacy(mainFile, extraFiles, importOverrides) {
|
async function buildJsLegacy(mainFile, extraFiles, importOverrides) {
|
||||||
@ -240,7 +242,14 @@ async function buildJsLegacy(mainFile, extraFiles, importOverrides) {
|
|||||||
name: `hydrogen`
|
name: `hydrogen`
|
||||||
});
|
});
|
||||||
const code = output[0].code;
|
const code = output[0].code;
|
||||||
return code;
|
return wrapWithLicenseComments(code);
|
||||||
|
}
|
||||||
|
|
||||||
|
function wrapWithLicenseComments(code) {
|
||||||
|
// Add proper license comments to make GNU LibreJS accept the file
|
||||||
|
const start = '// @license magnet:?xt=urn:btih:8e4f440f4c65981c5bf93c76d35135ba5064d8b7&dn=apache-2.0.txt Apache-2.0';
|
||||||
|
const end = '// @license-end';
|
||||||
|
return `${start}\n${code}\n${end}`;
|
||||||
}
|
}
|
||||||
|
|
||||||
const NON_PRECACHED_JS = [
|
const NON_PRECACHED_JS = [
|
||||||
|
Loading…
Reference in New Issue
Block a user