@umijs/preset-umi 4.3.18 → 4.3.20
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -65,11 +65,13 @@ function getExportHtmlData(routes) {
|
|
|
65
65
|
}
|
|
66
66
|
async function getPreRenderedHTML(api, htmlTpl, path) {
|
|
67
67
|
const {
|
|
68
|
-
exportStatic: { ignorePreRenderError = false }
|
|
68
|
+
exportStatic: { ignorePreRenderError = false },
|
|
69
|
+
base
|
|
69
70
|
} = api.config;
|
|
70
71
|
markupRender ?? (markupRender = require((0, import_utils2.absServerBuildPath)(api))._markupGenerator);
|
|
71
72
|
try {
|
|
72
|
-
const
|
|
73
|
+
const location = `${base.endsWith("/") ? base.slice(0, -1) : base}${path}`;
|
|
74
|
+
const html = await markupRender(location);
|
|
73
75
|
import_utils.logger.info(`Pre-render for ${path}`);
|
|
74
76
|
return html;
|
|
75
77
|
} catch (err) {
|
|
@@ -34,7 +34,6 @@ __export(mako_exports, {
|
|
|
34
34
|
module.exports = __toCommonJS(mako_exports);
|
|
35
35
|
var import_path = __toESM(require("path"));
|
|
36
36
|
var import_extractEntryAssets = require("../../utils/extractEntryAssets");
|
|
37
|
-
var import_platform = require("../../utils/platform");
|
|
38
37
|
var mako_default = (api) => {
|
|
39
38
|
api.describe({
|
|
40
39
|
key: "mako",
|
|
@@ -75,10 +74,6 @@ var mako_default = (api) => {
|
|
|
75
74
|
};
|
|
76
75
|
api.modifyConfig((memo) => {
|
|
77
76
|
var _a;
|
|
78
|
-
if (import_platform.isWindows) {
|
|
79
|
-
memo.mako = false;
|
|
80
|
-
process.env.OKAM = "";
|
|
81
|
-
}
|
|
82
77
|
const makoPlugins = ((_a = memo.mako) == null ? void 0 : _a.plugins) || [];
|
|
83
78
|
if (!api.config.mpa) {
|
|
84
79
|
makoPlugins.push({
|
|
@@ -524,7 +524,8 @@ if (process.env.NODE_ENV === 'development') {
|
|
|
524
524
|
__INTERNAL_DO_NOT_USE_OR_YOU_WILL_BE_FIRED: JSON.stringify(
|
|
525
525
|
__INTERNAL_DO_NOT_USE_OR_YOU_WILL_BE_FIRED
|
|
526
526
|
),
|
|
527
|
-
mountElementId
|
|
527
|
+
mountElementId,
|
|
528
|
+
basename: api.config.base
|
|
528
529
|
}
|
|
529
530
|
});
|
|
530
531
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@umijs/preset-umi",
|
|
3
|
-
"version": "4.3.
|
|
3
|
+
"version": "4.3.20",
|
|
4
4
|
"description": "@umijs/preset-umi",
|
|
5
5
|
"homepage": "https://github.com/umijs/umi/tree/master/packages/preset-umi#readme",
|
|
6
6
|
"bugs": "https://github.com/umijs/umi/issues",
|
|
@@ -21,7 +21,7 @@
|
|
|
21
21
|
"dependencies": {
|
|
22
22
|
"@iconify/utils": "2.1.1",
|
|
23
23
|
"@svgr/core": "6.5.1",
|
|
24
|
-
"@umijs/bundler-mako": "0.8.
|
|
24
|
+
"@umijs/bundler-mako": "0.8.11",
|
|
25
25
|
"@umijs/es-module-parser": "0.0.7",
|
|
26
26
|
"@umijs/history": "5.3.1",
|
|
27
27
|
"babel-plugin-dynamic-import-node": "2.3.3",
|
|
@@ -41,21 +41,21 @@
|
|
|
41
41
|
"react-router": "6.3.0",
|
|
42
42
|
"react-router-dom": "6.3.0",
|
|
43
43
|
"regenerator-runtime": "0.13.11",
|
|
44
|
-
"@umijs/bundler-
|
|
45
|
-
"@umijs/babel-preset-umi": "4.3.
|
|
46
|
-
"@umijs/
|
|
47
|
-
"@umijs/
|
|
48
|
-
"@umijs/
|
|
44
|
+
"@umijs/bundler-esbuild": "4.3.20",
|
|
45
|
+
"@umijs/babel-preset-umi": "4.3.20",
|
|
46
|
+
"@umijs/ast": "4.3.20",
|
|
47
|
+
"@umijs/bundler-utils": "4.3.20",
|
|
48
|
+
"@umijs/bundler-vite": "4.3.20",
|
|
49
|
+
"@umijs/bundler-webpack": "4.3.20",
|
|
50
|
+
"@umijs/mfsu": "4.3.20",
|
|
51
|
+
"@umijs/core": "4.3.20",
|
|
52
|
+
"@umijs/plugin-run": "4.3.20",
|
|
49
53
|
"@umijs/did-you-know": "1.0.3",
|
|
50
|
-
"@umijs/
|
|
51
|
-
"@umijs/
|
|
52
|
-
"@umijs/bundler-webpack": "4.3.18",
|
|
53
|
-
"@umijs/bundler-vite": "4.3.18",
|
|
54
|
-
"@umijs/ast": "4.3.18",
|
|
54
|
+
"@umijs/renderer-react": "4.3.20",
|
|
55
|
+
"@umijs/server": "4.3.20",
|
|
55
56
|
"@umijs/ui": "3.0.1",
|
|
56
|
-
"@umijs/
|
|
57
|
-
"@umijs/zod2ts": "4.3.
|
|
58
|
-
"@umijs/utils": "4.3.18"
|
|
57
|
+
"@umijs/utils": "4.3.20",
|
|
58
|
+
"@umijs/zod2ts": "4.3.20"
|
|
59
59
|
},
|
|
60
60
|
"devDependencies": {
|
|
61
61
|
"@manypkg/get-packages": "1.1.3",
|
package/templates/server.tpl
CHANGED
|
@@ -61,8 +61,8 @@ const createOpts = {
|
|
|
61
61
|
ServerInsertedHTMLContext,
|
|
62
62
|
htmlPageOpts: {{{htmlPageOpts}}},
|
|
63
63
|
__INTERNAL_DO_NOT_USE_OR_YOU_WILL_BE_FIRED: {{{__INTERNAL_DO_NOT_USE_OR_YOU_WILL_BE_FIRED}}},
|
|
64
|
-
mountElementId: '{{{mountElementId}}}'
|
|
65
|
-
|
|
64
|
+
mountElementId: '{{{mountElementId}}}',
|
|
65
|
+
basename: '{{{basename}}}'
|
|
66
66
|
};
|
|
67
67
|
const requestHandler = createRequestHandler(createOpts);
|
|
68
68
|
/**
|