frosty 0.0.81 → 0.0.83

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "frosty",
-  "version": "0.0.81",
+  "version": "0.0.83",
   "main": "dist/index",
   "module": "dist/index",
   "types": "dist/index",

package/packages/frosty-cli/src/server/index.js

@@ -28,14 +28,10 @@ import fs from 'fs';
 import path from 'path';
 import { Server } from '@o2ter/server-js';
 import { ReactRoute } from './route';
+import __SERVER__ from '__SERVER__';
 import * as __APPLICATIONS__ from '__APPLICATIONS__';
 import { PORT } from './env';
 
-let __SERVER__ = {};
-try {
-  __SERVER__ = await import('__SERVER__');
-} catch {};
-
 const app = 'serverOptions' in __SERVER__ ? new Server(__SERVER__.serverOptions) : new Server;
 
 app.use(Server.static(path.join(__dirname, 'public'), { cacheControl: true }));

package/packages/frosty-cli/src/server/render.js

@@ -25,7 +25,7 @@
 
 import _ from 'lodash';
 import { ServerDOMRenderer } from 'frosty/server-dom';
-import { JSDOM, CookieJar } from 'jsdom';
+import { JSDOM, CookieJar, ResourceLoader } from 'jsdom';
 
 export const renderToHTML = async (App, {
   request: req,
@@ -33,12 +33,15 @@ export const renderToHTML = async (App, {
   jsSrc,
   cssSrc,
 }) => {
+  const referrer = req.get('Referrer');
+  const userAgent = req.get('User-Agent');
   const url = `${req.protocol}://${req.get('host')}${req.originalUrl}`;
   const cookieJar = new CookieJar();
   for (const cookie of _.split(req.get('cookie'), ';')) {
     cookieJar.setCookieSync(cookie, url);
   }
-  const dom = new JSDOM(undefined, { url, referrer: req.get('Referrer'), cookieJar });
+  const loader = new ResourceLoader({ userAgent });
+  const dom = new JSDOM(undefined, { url, referrer, userAgent, resources: loader, cookieJar });
   const renderer = new ServerDOMRenderer(dom);
   res.setHeader('Content-Type', 'text/html');
   res.send(await renderer.renderToString(

package/packages/frosty-cli/webpack.mjs

@@ -44,13 +44,10 @@ export default async (env, argv) => {
   } = env;
 
   const serverConfig = await (async () => {
-    try {
-      const { default: resolved } = await import(path.resolve(process.cwd(), CONFIG_FILE));
-      return resolved;
-    } catch (e) {
-      console.log(e);
-      return {};
-    }
+    const configPath = path.resolve(process.cwd(), CONFIG_FILE);
+    if (!fs.existsSync(configPath)) return {};
+    const { default: resolved } = await import(configPath);
+    return resolved;
   })();
 
   const config = _.isFunction(serverConfig) ? serverConfig(env, argv) : serverConfig;
@@ -201,7 +198,7 @@ export default async (env, argv) => {
     ...config.options?.plugins ?? [],
   ];
 
-  const server = config.serverEntry ? path.resolve(process.cwd(), config.serverEntry) : path.resolve(__dirname, './src/server/default.js');
+  const server = config.serverEntry ? path.resolve(process.cwd(), config.serverEntry) : path.resolve(__dirname, './src/server/default.ts');
 
   const random = crypto.randomUUID();
   const tempDir = fs.mkdtempSync(`${os.tmpdir()}${path.sep}`);