Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

FIX: `crypto.randomUUID` is only available in newer node releases (#12983) 

Also, we should properly surface the error instead of saying it was
`bootstrap.json`
This commit is contained in:
Robin Ward 2021-05-07 09:59:45 -04:00 committed by GitHub
parent 116ae8ebc1
commit b7d6cc5b1c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
app/assets/javascripts/discourse/lib/bootstrap-json/index.js
View File

@ -6,7 +6,15 @@ const { encode } = require("html-entities");
const cleanBaseURL = require("clean-base-url"); const cleanBaseURL = require("clean-base-url");
const path = require("path"); const path = require("path");
const fs = require("fs"); const fs = require("fs");
const crypto = require("crypto");
// via https://stackoverflow.com/a/6248722/165668
function generateUID() {
let firstPart = (Math.random() * 46656) | 0; // eslint-disable-line no-bitwise
let secondPart = (Math.random() * 46656) | 0; // eslint-disable-line no-bitwise
firstPart = ("000" + firstPart.toString(36)).slice(-3);
secondPart = ("000" + secondPart.toString(36)).slice(-3);
return firstPart + secondPart;
}
const IGNORE_PATHS = [ const IGNORE_PATHS = [
/\/ember-cli-live-reload\.js$/, /\/ember-cli-live-reload\.js$/,
@ -94,7 +102,7 @@ function bodyFooter(buffer, bootstrap, headers) {
buffer.push(bootstrap.theme_html.body_tag); buffer.push(bootstrap.theme_html.body_tag);
buffer.push(bootstrap.html.before_body_close); buffer.push(bootstrap.html.before_body_close);
let v = crypto.randomUUID(); let v = generateUID();
buffer.push(` buffer.push(`
<script async type="text/javascript" id="mini-profiler" src="/mini-profiler-resources/includes.js?v=${v}" data-css-url="/mini-profiler-resources/includes.css?v=${v}" data-version="${v}" data-path="/mini-profiler-resources/" data-horizontal-position="left" data-vertical-position="top" data-trivial="false" data-children="false" data-max-traces="20" data-controls="false" data-total-sql-count="false" data-authorized="true" data-toggle-shortcut="alt+p" data-start-hidden="false" data-collapse-results="true" data-html-container="body" data-hidden-custom-fields="x" data-ids="${headers["x-miniprofiler-ids"]}"></script> <script async type="text/javascript" id="mini-profiler" src="/mini-profiler-resources/includes.js?v=${v}" data-css-url="/mini-profiler-resources/includes.css?v=${v}" data-version="${v}" data-path="/mini-profiler-resources/" data-horizontal-position="left" data-vertical-position="top" data-trivial="false" data-children="false" data-max-traces="20" data-controls="false" data-total-sql-count="false" data-authorized="true" data-toggle-shortcut="alt+p" data-start-hidden="false" data-collapse-results="true" data-html-container="body" data-hidden-custom-fields="x" data-ids="${headers["x-miniprofiler-ids"]}"></script>
`); `);
@ -158,8 +166,8 @@ function buildFromBootstrap(assetPath, proxy, req, headers) {
.then((json) => { .then((json) => {
resolve(applyBootstrap(json.bootstrap, template, headers)); resolve(applyBootstrap(json.bootstrap, template, headers));
}) })
.catch(() => { .catch((e) => {
reject(`Could not get ${proxy}/bootstrap.json`); reject(`Could not get ${proxy}/bootstrap.json\n\n${e.toString()}`);
}); });
} }
); );
@ -204,7 +212,7 @@ async function handleRequest(assetPath, proxy, req, res) {
res.send(` res.send(`
<html> <html>
<h1>Discourse Build Error</h1> <h1>Discourse Build Error</h1>
<p>${e.toString()}</p> <pre><code>${e.toString()}</code></pre>
</html> </html>
`); `);
} }