fix: isolate latest HiCAD startup
This commit is contained in:
parent
bbe27bd555
commit
623ab0f8b5
@ -4,7 +4,8 @@ import type { Metadata } from "next";
|
|||||||
import { redirect } from "next/navigation";
|
import { redirect } from "next/navigation";
|
||||||
import { auth } from "@/app/(auth)/auth";
|
import { auth } from "@/app/(auth)/auth";
|
||||||
|
|
||||||
const ZOO_MODELING_APP_SRC = "/vendor/zoo-modeling-app/index.html";
|
const ZOO_MODELING_APP_SRC =
|
||||||
|
"/vendor/zoo-modeling-app/index.html?v=f2b345db";
|
||||||
|
|
||||||
export const dynamic = "force-dynamic";
|
export const dynamic = "force-dynamic";
|
||||||
export const metadata: Metadata = {
|
export const metadata: Metadata = {
|
||||||
|
|||||||
@ -31,6 +31,8 @@ const outputDir = path.join(root, "public/vendor/zoo-modeling-app");
|
|||||||
const customizationDir = path.join(root, "vendor/zoo-modeling-app");
|
const customizationDir = path.join(root, "vendor/zoo-modeling-app");
|
||||||
const proxyToken = "hicad-session";
|
const proxyToken = "hicad-session";
|
||||||
const brandedFaviconUrl = "/api/favicon?surface=hicad";
|
const brandedFaviconUrl = "/api/favicon?surface=hicad";
|
||||||
|
const enableManufacturingExtension =
|
||||||
|
process.env.HICAD_MANUFACTURING_EXTENSION === "1";
|
||||||
|
|
||||||
function run(command, args, options = {}) {
|
function run(command, args, options = {}) {
|
||||||
const result = spawnSync(command, args, {
|
const result = spawnSync(command, args, {
|
||||||
@ -134,18 +136,20 @@ function patchOfficialSource() {
|
|||||||
path.join(customizationDir, "Logo.tsx"),
|
path.join(customizationDir, "Logo.tsx"),
|
||||||
path.join(sourceDir, "src/components/Logo.tsx")
|
path.join(sourceDir, "src/components/Logo.tsx")
|
||||||
);
|
);
|
||||||
copyFileSync(
|
if (enableManufacturingExtension) {
|
||||||
path.join(customizationDir, "manufacturing.ts"),
|
copyFileSync(
|
||||||
path.join(sourceDir, "src/components/manufacturing.ts")
|
path.join(customizationDir, "manufacturing.ts"),
|
||||||
);
|
path.join(sourceDir, "src/components/manufacturing.ts")
|
||||||
copyFileSync(
|
);
|
||||||
path.join(customizationDir, "HicadManufacturingPanel.tsx"),
|
copyFileSync(
|
||||||
path.join(sourceDir, "src/components/HicadManufacturingPanel.tsx")
|
path.join(customizationDir, "HicadManufacturingPanel.tsx"),
|
||||||
);
|
path.join(sourceDir, "src/components/HicadManufacturingPanel.tsx")
|
||||||
copyFileSync(
|
);
|
||||||
path.join(customizationDir, "HicadManufacturingLauncher.tsx"),
|
copyFileSync(
|
||||||
path.join(sourceDir, "src/components/HicadManufacturingLauncher.tsx")
|
path.join(customizationDir, "HicadManufacturingLauncher.tsx"),
|
||||||
);
|
path.join(sourceDir, "src/components/HicadManufacturingLauncher.tsx")
|
||||||
|
);
|
||||||
|
}
|
||||||
copyFileSync(
|
copyFileSync(
|
||||||
path.join(customizationDir, "localization.ts"),
|
path.join(customizationDir, "localization.ts"),
|
||||||
path.join(sourceDir, "src/lib/hicadLocalization.ts")
|
path.join(sourceDir, "src/lib/hicadLocalization.ts")
|
||||||
@ -211,16 +215,29 @@ function patchOfficialSource() {
|
|||||||
" <HicadManufacturingPanel projectName={projectName ?? 'HiCAD 模型'} />\n",
|
" <HicadManufacturingPanel projectName={projectName ?? 'HiCAD 模型'} />\n",
|
||||||
""
|
""
|
||||||
);
|
);
|
||||||
replaceSource(
|
if (enableManufacturingExtension) {
|
||||||
"src/components/OpenedProject.tsx",
|
replaceSource(
|
||||||
"import { AppHeader } from '@src/components/AppHeader'\n",
|
"src/components/OpenedProject.tsx",
|
||||||
"import { AppHeader } from '@src/components/AppHeader'\nimport { HicadManufacturingLauncher } from '@src/components/HicadManufacturingLauncher'\n"
|
"import { AppHeader } from '@src/components/AppHeader'\n",
|
||||||
);
|
"import { AppHeader } from '@src/components/AppHeader'\nimport { HicadManufacturingLauncher } from '@src/components/HicadManufacturingLauncher'\n"
|
||||||
replaceSource(
|
);
|
||||||
"src/components/OpenedProject.tsx",
|
replaceSource(
|
||||||
" <StatusBar\n",
|
"src/components/OpenedProject.tsx",
|
||||||
" <HicadManufacturingLauncher projectName={projectName ?? 'HiCAD 模型'} />\n <StatusBar\n"
|
" <StatusBar\n",
|
||||||
);
|
" <HicadManufacturingLauncher projectName={projectName ?? 'HiCAD 模型'} />\n <StatusBar\n"
|
||||||
|
);
|
||||||
|
} else {
|
||||||
|
replaceSource(
|
||||||
|
"src/components/OpenedProject.tsx",
|
||||||
|
"import { HicadManufacturingLauncher } from '@src/components/HicadManufacturingLauncher'\n",
|
||||||
|
""
|
||||||
|
);
|
||||||
|
replaceSource(
|
||||||
|
"src/components/OpenedProject.tsx",
|
||||||
|
" <HicadManufacturingLauncher projectName={projectName ?? 'HiCAD 模型'} />\n",
|
||||||
|
""
|
||||||
|
);
|
||||||
|
}
|
||||||
replaceSource(
|
replaceSource(
|
||||||
"src/lib/socket.ts",
|
"src/lib/socket.ts",
|
||||||
` ws.addEventListener('open', () => {\n ws.send(\n JSON.stringify({\n type: 'headers',\n headers: {\n Authorization: 'Bearer ' + token,\n },\n })\n )\n resolve(ws)\n })`,
|
` ws.addEventListener('open', () => {\n ws.send(\n JSON.stringify({\n type: 'headers',\n headers: {\n Authorization: 'Bearer ' + token,\n },\n })\n )\n resolve(ws)\n })`,
|
||||||
|
|||||||
@ -44,6 +44,9 @@ test.describe('HiCAD manufacturing extension', () => {
|
|||||||
'utf8'
|
'utf8'
|
||||||
)
|
)
|
||||||
|
|
||||||
|
expect(vendorScript).toContain(
|
||||||
|
'process.env.HICAD_MANUFACTURING_EXTENSION === "1"'
|
||||||
|
)
|
||||||
expect(vendorScript).toContain(
|
expect(vendorScript).toContain(
|
||||||
'vendor/zoo-modeling-app/HicadManufacturingLauncher.tsx'
|
'vendor/zoo-modeling-app/HicadManufacturingLauncher.tsx'
|
||||||
.split('/')
|
.split('/')
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user