开发:升级到jest27并且优化代码,使得可以正常跑在node上

pull/1554/MERGE
ChenX 3 years ago
parent d9582893d4
commit 74ac7c30c1

@ -1,5 +1,5 @@
import { Purge } from "../../src/Add-on/Purge"; import { Purge } from "../../src/Add-on/Purge";
import { CADFiler } from "../../src/api"; import { CADFiler } from "../../src/DatabaseServices/CADFiler";
import { Database } from "../../src/DatabaseServices/Database"; import { Database } from "../../src/DatabaseServices/Database";
import { LoadEntityFromFileData } from "../Utils/LoadEntity.util"; import { LoadEntityFromFileData } from "../Utils/LoadEntity.util";
LoadEntityFromFileData; LoadEntityFromFileData;

@ -30,16 +30,16 @@
"@types/flatbush": "^3.3.0", "@types/flatbush": "^3.3.0",
"@types/html-webpack-plugin": "^3.2.5", "@types/html-webpack-plugin": "^3.2.5",
"@types/jest": "^26.0.23", "@types/jest": "^26.0.23",
"@types/node": "^14.14.43", "@types/node": "^14.17.3",
"@types/pako": "^1.0.1", "@types/pako": "^1.0.1",
"@types/react": "^17.0.4", "@types/react": "^17.0.11",
"@types/react-color": "^3.0.4", "@types/react-color": "^3.0.4",
"@types/react-dom": "^17.0.3", "@types/react-dom": "^17.0.7",
"@types/request-promise-native": "^1.0.17", "@types/request-promise-native": "^1.0.17",
"@types/stats.js": "^0.17.0", "@types/stats.js": "^0.17.0",
"@types/terser-webpack-plugin": "^5.0.3", "@types/terser-webpack-plugin": "^5.0.3",
"@types/webpack": "^4.41.28", "@types/webpack": "^4.41.29",
"@types/webpack-dev-server": "^3.11.3", "@types/webpack-dev-server": "^3.11.4",
"@types/webpack-env": "^1.16.0", "@types/webpack-env": "^1.16.0",
"@types/webpack-merge": "^4.1.5", "@types/webpack-merge": "^4.1.5",
"@wessberg/rollup-plugin-ts": "^1.3.14", "@wessberg/rollup-plugin-ts": "^1.3.14",
@ -55,8 +55,8 @@
"gitlog": "^4.0.4", "gitlog": "^4.0.4",
"html-loader": "^1.3.2", "html-loader": "^1.3.2",
"html-webpack-plugin": "^4.5.2", "html-webpack-plugin": "^4.5.2",
"jest": "^26.6.3", "jest": "^27.0.4",
"jest-snapshot": "^27.0.2", "jest-snapshot": "^27.0.4",
"less": "^4.1.1", "less": "^4.1.1",
"less-loader": "7.3.0", "less-loader": "7.3.0",
"react-hot-loader": "^4.13.0", "react-hot-loader": "^4.13.0",
@ -64,7 +64,7 @@
"request-promise-native": "^1.0.9", "request-promise-native": "^1.0.9",
"required-loader": "^1.3.16", "required-loader": "^1.3.16",
"resize-observer-polyfill": "^1.5.1", "resize-observer-polyfill": "^1.5.1",
"rollup": "^2.45.2", "rollup": "^2.51.2",
"rollup-plugin-dts": "^1.4.14", "rollup-plugin-dts": "^1.4.14",
"rollup-plugin-shader": "0.0.3", "rollup-plugin-shader": "0.0.3",
"rollup-plugin-sourcemaps": "^0.6.3", "rollup-plugin-sourcemaps": "^0.6.3",
@ -73,7 +73,7 @@
"style-loader": "^2.0.0", "style-loader": "^2.0.0",
"terser-webpack-plugin": "^4.2.3", "terser-webpack-plugin": "^4.2.3",
"ts-declaration-webpack-plugin": "^1.2.3", "ts-declaration-webpack-plugin": "^1.2.3",
"ts-jest": "^26.5.5", "ts-jest": "^27.0.3",
"ts-loader": "^8.3.0", "ts-loader": "^8.3.0",
"ts-node": "^9.1.1", "ts-node": "^9.1.1",
"tsconfig-paths": "^3.9.0", "tsconfig-paths": "^3.9.0",

@ -1,9 +1,9 @@
function GetCurHost() function GetCurHost()
{ {
let searchParams = new URLSearchParams(location.search); let searchParams = new URLSearchParams(globalThis.location?.search);
if (searchParams.has("server")) if (searchParams.has("server"))
return searchParams.get("server"); return searchParams.get("server");
else if (window.location.hostname === "cfcad.cn" || window.location.hostname === "www.cfcad.cn") else if (globalThis.location?.hostname === "cfcad.cn" || globalThis.location?.hostname === "www.cfcad.cn")
return "https://cad.leye.site"; return "https://cad.leye.site";
else else
return "https://chenfeng.tech:7779"; return "https://chenfeng.tech:7779";

@ -111,7 +111,7 @@ export class UserConfig implements IConfigStore
} }
Init() Init()
{ {
let type = Number(localStorage.getItem(StoreageKeys.RenderType)); let type = Number(globalThis.localStorage?.getItem(StoreageKeys.RenderType));
if (type && type !== RenderType.Edge) if (type && type !== RenderType.Edge)
this._renderType = type; this._renderType = type;
} }

@ -32,11 +32,15 @@ export async function LoadImageFromUrl(url: string): Promise<HTMLImageElement>
{ {
return new Promise<HTMLImageElement>(async (res, rej) => return new Promise<HTMLImageElement>(async (res, rej) =>
{ {
loader.load(url, img => if (!globalThis.document)
{ {
res(img); res(undefined);
}, e => { }, return;
err => { res(undefined); } };
loader.load(url,
img => res(img), e => { },
err => res(undefined)
); );
}); });
} }

Loading…
Cancel
Save