Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

SSR 的 getManifest()支持req时传入sourceDir表示SSR产物目录 #11715

Merged
merged 13 commits into from
Oct 10, 2023
Merged

SSR 的 getManifest()支持req时传入sourceDir表示SSR产物目录 #11715

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
53f38f2
fix: dev环境构建SSR server.js时，环境判断错误导致输出的dev产物带上了hash
Oct 8, 2023
7f6d6d5
Update packages/preset-umi/src/features/ssr/webpack/webpack.ts
gwuhaolin Oct 8, 2023
5d004a1
fix: dev环境构建SSR server.js时，环境判断错误导致输出的dev产物带上了hash
Oct 8, 2023
3fc62cf
Merge branch 'umijs:master' into master
gwuhaolin Oct 9, 2023
5b0946a
feature: 支持自定义SSR构建目标，默认为node，可配置为webworker以支持运行在类似Cloudflare Workers的平台
Oct 9, 2023
7fe8bdc
feature: getManifest支持传入sourceDir表示SSR产物目录
Oct 9, 2023
542304a
feature: getManifest支持传入sourceDir表示SSR产物目录
Oct 9, 2023
335e6a6
fix: rendertoreadablestream is not a function
Oct 9, 2023
e7fb0c1
Revert "feature: 支持自定义SSR构建目标，默认为node，可配置为webworker以支持运行在类似Cloudflare…
Oct 9, 2023
64a9a42
fix: rendertoreadablestream is not a function
Oct 9, 2023
bfcd087
Update packages/server/src/ssr.ts
gwuhaolin Oct 10, 2023
d1a6e33
Update packages/server/src/ssr.ts
gwuhaolin Oct 10, 2023
e9ced7f
fix: 还原g_getAssets
Oct 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions packages/preset-umi/templates/server.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,9 @@ export function getValidKeys() {
return [{{#validKeys}}'{{{ . }}}',{{/validKeys}}];
}

export function getManifest() {
export function getManifest(sourceDir) {
return JSON.parse(require('fs').readFileSync(
process.env.SSR_RESOURCE_DIR ? process.env.SSR_RESOURCE_DIR + '/build-manifest.json' :
'{{{ assetsPath }}}', 'utf-8'));
sourceDir ? require('path').join(sourceDir,'build-manifest.json') : '{{{ assetsPath }}}', 'utf-8'));
}

export function createHistory(opts) {
Expand All @@ -41,15 +40,14 @@ global.g_getAssets = (fileName) => {
let m = typeof manifest === 'function' ? manifest() : manifest;
return m.assets[fileName];
};

const manifest = {{{ env }}} === 'development' ? getManifest : getManifest();
const createOpts = {
routesWithServerLoader,
PluginManager,
getPlugins,
getValidKeys,
getRoutes,
manifest,
manifest: getManifest,
getClientRootComponent,
helmetContext,
createHistory,
Expand Down
39 changes: 16 additions & 23 deletions packages/server/src/ssr.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ interface CreateRequestHandlerOptions {
routesWithServerLoader: RouteLoaders;
PluginManager: any;
manifest:
| (() => { assets: Record<string, string> })
| ((sourceDir?: string) => { assets: Record<string, string> })
| { assets: Record<string, string> };
getPlugins: () => any;
getValidKeys: () => any;
Expand All @@ -24,6 +24,7 @@ interface CreateRequestHandlerOptions {
helmetContext?: any;
ServerInsertedHTMLContext: React.Context<ServerInsertedHTMLHook | null>;
withoutHTML?: boolean;
sourceDir?: string;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

看起来这里需要注释注明一下 sourceDir 是给 serverless 函数 create handler 专门用的，因为 esbuild 用到的 g_getAssets 没法传 sourceDir ：

global.g_getAssets = (fileName) => {
  let m = typeof manifest === 'function' ? manifest() : manifest;
  return m.assets[fileName];
};
// 生产环境这里的 manifest 就没有机会传参数了
const manifest = {{{ env }}} === 'development' ? getManifest : getManifest();

// ...
// ↓ 人工 create handler 才可以传 sourceDir
  manifest: getManifest,

Copy link
Contributor

@fz6m fz6m Oct 10, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more. 

interface CreateRequestHandlerServerlessOptions {
  /** 注释 */
  withoutHTML?: boolean;
  /** 注释 */
  sourceDir?: string;
}

interface CreateRequestHandlerOptions extends CreateRequestHandlerServerlessOptions {
  // ...
}

}

const createJSXProvider = (
Expand Down Expand Up @@ -55,6 +56,7 @@ function createJSXGenerator(opts: CreateRequestHandlerOptions) {
getValidKeys,
getRoutes,
createHistory,
sourceDir,
} = opts;

// make import { history } from 'umi' work
Expand Down Expand Up @@ -95,7 +97,7 @@ function createJSXGenerator(opts: CreateRequestHandlerOptions) {
);

const manifest =
typeof opts.manifest === 'function' ? opts.manifest() : opts.manifest;
typeof opts.manifest === 'function' ? opts.manifest(sourceDir) : opts.manifest;
const context = {
routes,
routeComponents,
Expand Down Expand Up @@ -237,29 +239,20 @@ export default function createRequestHandler(
};
}

// 新增的给CDN worker用的SSR请求handle
export function createUmiHandler(opts: CreateRequestHandlerOptions) {
const jsxGeneratorDeferrer = createJSXGenerator({
...opts,
withoutHTML: true,
});

return function (req: Request) {
return new Promise(async (resolve, reject) => {
const jsx = await jsxGeneratorDeferrer(new URL(req.url).pathname);

if (!jsx) {
reject(new Error('no page resource'));
return;
}

const stream = await ReactDomServer.renderToReadableStream(jsx.element, {
bootstrapScripts: [jsx.manifest.assets['umi.js'] || '/umi.js'],
onError(err: any) {
reject(err);
},
});
resolve(stream);
return async function (req: Request, params?: CreateRequestHandlerOptions) {
const jsxGeneratorDeferrer = createJSXGenerator({
...opts,
...params,
fz6m marked this conversation as resolved.
Show resolved Hide resolved
});
const jsx = await jsxGeneratorDeferrer(new URL(req.url).pathname);

if (!jsx) {
throw new Error('no page resource')
}

return ReactDomServer.renderToNodeStream(jsx.element);
};
}

Expand Down
Loading