Merge pull request #1120 from pikasTech/issue1112-vue-compiler
fix: use compiler-enabled Vue monitor-web build
This commit is contained in:
@@ -44,7 +44,7 @@ sentinel:
|
|||||||
startCommand: sentinel maintenance start
|
startCommand: sentinel maintenance start
|
||||||
stopCommand: sentinel maintenance stop
|
stopCommand: sentinel maintenance stop
|
||||||
monitorWeb:
|
monitorWeb:
|
||||||
frontendStack: vue3-vendored-runtime
|
frontendStack: vue3-vendored-browser-build
|
||||||
runtimeMode: runner-served-bridge
|
runtimeMode: runner-served-bridge
|
||||||
assetRoot: scripts/assets/web-probe-sentinel-monitor-web
|
assetRoot: scripts/assets/web-probe-sentinel-monitor-web
|
||||||
envReuse:
|
envReuse:
|
||||||
|
|||||||
@@ -44,7 +44,7 @@ sentinel:
|
|||||||
startCommand: sentinel maintenance start
|
startCommand: sentinel maintenance start
|
||||||
stopCommand: sentinel maintenance stop
|
stopCommand: sentinel maintenance stop
|
||||||
monitorWeb:
|
monitorWeb:
|
||||||
frontendStack: vue3-vendored-runtime
|
frontendStack: vue3-vendored-browser-build
|
||||||
runtimeMode: runner-served-bridge
|
runtimeMode: runner-served-bridge
|
||||||
assetRoot: scripts/assets/web-probe-sentinel-monitor-web
|
assetRoot: scripts/assets/web-probe-sentinel-monitor-web
|
||||||
envReuse:
|
envReuse:
|
||||||
|
|||||||
@@ -44,7 +44,7 @@ sentinel:
|
|||||||
startCommand: sentinel maintenance start
|
startCommand: sentinel maintenance start
|
||||||
stopCommand: sentinel maintenance stop
|
stopCommand: sentinel maintenance stop
|
||||||
monitorWeb:
|
monitorWeb:
|
||||||
frontendStack: vue3-vendored-runtime
|
frontendStack: vue3-vendored-browser-build
|
||||||
runtimeMode: runner-served-bridge
|
runtimeMode: runner-served-bridge
|
||||||
assetRoot: scripts/assets/web-probe-sentinel-monitor-web
|
assetRoot: scripts/assets/web-probe-sentinel-monitor-web
|
||||||
envReuse:
|
envReuse:
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
import { createApp, computed, onMounted, ref } from "./vendor/vue.runtime.esm-browser.prod.js";
|
import { createApp, computed, onMounted, ref } from "./vendor/vue.esm-browser.prod.js";
|
||||||
|
|
||||||
const bootstrap = readBootstrap();
|
const bootstrap = readBootstrap();
|
||||||
|
|
||||||
|
|||||||
File diff suppressed because one or more lines are too long
-7
File diff suppressed because one or more lines are too long
@@ -388,7 +388,7 @@ function sentinelDockerfile(baseImage: string, entrypoint: string): string {
|
|||||||
|
|
||||||
function monitorWebCicdPlan(cicd: Record<string, unknown>): Record<string, unknown> {
|
function monitorWebCicdPlan(cicd: Record<string, unknown>): Record<string, unknown> {
|
||||||
return {
|
return {
|
||||||
stack: stringAtNullable(cicd, "monitorWeb.frontendStack") ?? "vue3-vendored-runtime",
|
stack: stringAtNullable(cicd, "monitorWeb.frontendStack") ?? "vue3-vendored-browser-build",
|
||||||
runtimeMode: stringAtNullable(cicd, "monitorWeb.runtimeMode") ?? "runner-served-bridge",
|
runtimeMode: stringAtNullable(cicd, "monitorWeb.runtimeMode") ?? "runner-served-bridge",
|
||||||
assetRoot: stringAtNullable(cicd, "monitorWeb.assetRoot") ?? "scripts/assets/web-probe-sentinel-monitor-web",
|
assetRoot: stringAtNullable(cicd, "monitorWeb.assetRoot") ?? "scripts/assets/web-probe-sentinel-monitor-web",
|
||||||
verifyCommand: "bun scripts/verify-web-probe-sentinel-monitor-web.ts",
|
verifyCommand: "bun scripts/verify-web-probe-sentinel-monitor-web.ts",
|
||||||
@@ -2958,7 +2958,7 @@ function probeSentinelPublicDashboard(state: SentinelCicdState, timeoutSeconds:
|
|||||||
const rootUrl = `${publicBaseUrl}/`;
|
const rootUrl = `${publicBaseUrl}/`;
|
||||||
const cssUrl = `${publicBaseUrl}/monitor-web/assets/monitor-web.css`;
|
const cssUrl = `${publicBaseUrl}/monitor-web/assets/monitor-web.css`;
|
||||||
const jsUrl = `${publicBaseUrl}/monitor-web/assets/monitor-web.js`;
|
const jsUrl = `${publicBaseUrl}/monitor-web/assets/monitor-web.js`;
|
||||||
const vueUrl = `${publicBaseUrl}/monitor-web/assets/vendor/vue.runtime.esm-browser.prod.js`;
|
const vueUrl = `${publicBaseUrl}/monitor-web/assets/vendor/vue.esm-browser.prod.js`;
|
||||||
const script = [
|
const script = [
|
||||||
"set +e",
|
"set +e",
|
||||||
`root_url=${shellQuote(rootUrl)}`,
|
`root_url=${shellQuote(rootUrl)}`,
|
||||||
|
|||||||
@@ -82,7 +82,7 @@ export function webProbeSentinelDashboardAssetResponse(pathname: string): Respon
|
|||||||
if (pathname === "/dashboard/assets/dashboard.js") return textAsset(`${DASHBOARD_ASSET_ROOT}/dashboard.js`, "application/javascript; charset=utf-8");
|
if (pathname === "/dashboard/assets/dashboard.js") return textAsset(`${DASHBOARD_ASSET_ROOT}/dashboard.js`, "application/javascript; charset=utf-8");
|
||||||
if (pathname === "/monitor-web/assets/monitor-web.css") return textAsset(`${MONITOR_WEB_ASSET_ROOT}/monitor-web.css`, "text/css; charset=utf-8");
|
if (pathname === "/monitor-web/assets/monitor-web.css") return textAsset(`${MONITOR_WEB_ASSET_ROOT}/monitor-web.css`, "text/css; charset=utf-8");
|
||||||
if (pathname === "/monitor-web/assets/monitor-web.js") return textAsset(`${MONITOR_WEB_ASSET_ROOT}/monitor-web.js`, "application/javascript; charset=utf-8");
|
if (pathname === "/monitor-web/assets/monitor-web.js") return textAsset(`${MONITOR_WEB_ASSET_ROOT}/monitor-web.js`, "application/javascript; charset=utf-8");
|
||||||
if (pathname === "/monitor-web/assets/vendor/vue.runtime.esm-browser.prod.js") return textAsset(`${MONITOR_WEB_ASSET_ROOT}/vendor/vue.runtime.esm-browser.prod.js`, "application/javascript; charset=utf-8");
|
if (pathname === "/monitor-web/assets/vendor/vue.esm-browser.prod.js") return textAsset(`${MONITOR_WEB_ASSET_ROOT}/vendor/vue.esm-browser.prod.js`, "application/javascript; charset=utf-8");
|
||||||
if (pathname === "/monitor-web/assets/vendor/VUE-LICENSE") return textAsset(`${MONITOR_WEB_ASSET_ROOT}/vendor/VUE-LICENSE`, "text/plain; charset=utf-8");
|
if (pathname === "/monitor-web/assets/vendor/VUE-LICENSE") return textAsset(`${MONITOR_WEB_ASSET_ROOT}/vendor/VUE-LICENSE`, "text/plain; charset=utf-8");
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -26,9 +26,9 @@ const checks: Array<{ readonly path: string; readonly contains: readonly string[
|
|||||||
],
|
],
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
path: "scripts/assets/web-probe-sentinel-monitor-web/vendor/vue.runtime.esm-browser.prod.js",
|
path: "scripts/assets/web-probe-sentinel-monitor-web/vendor/vue.esm-browser.prod.js",
|
||||||
minBytes: 80_000,
|
minBytes: 150_000,
|
||||||
contains: ["createApp"],
|
contains: ["createApp", "compiler"],
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
path: "scripts/assets/web-probe-sentinel-monitor-web/vendor/VUE-LICENSE",
|
path: "scripts/assets/web-probe-sentinel-monitor-web/vendor/VUE-LICENSE",
|
||||||
@@ -62,7 +62,7 @@ if (failures.length > 0) {
|
|||||||
console.log(JSON.stringify({
|
console.log(JSON.stringify({
|
||||||
ok: true,
|
ok: true,
|
||||||
component: "web-probe-sentinel-monitor-web",
|
component: "web-probe-sentinel-monitor-web",
|
||||||
stack: "vue3-vendored-runtime",
|
stack: "vue3-vendored-browser-build",
|
||||||
assets: checks.map((check) => check.path),
|
assets: checks.map((check) => check.path),
|
||||||
valuesRedacted: true,
|
valuesRedacted: true,
|
||||||
}));
|
}));
|
||||||
|
|||||||
Reference in New Issue
Block a user