@sitecore-jss/sitecore-jss-rendering-host 21.1.0-canary.93 → 21.1.0-canary.94

package/dist/cjs/defaultAppInvocationInfoResolver.js

@@ -28,7 +28,7 @@ function getDefaultAppInvocationInfoResolver({ appPathResolver = (requestJson) =
         // default resolution assumes folder structure of:
         // ./dist/{JSSAppName}/{ServerBundleName}.js
         const modulePath = appPathResolver(requestJson);
-        const resolvedModule = import_fresh_1.default(modulePath);
+        const resolvedModule = (0, import_fresh_1.default)(modulePath);
         const resolvedRenderFunctionName = requestJson.functionName || 'renderView';
         const renderFunction = resolvedModule[resolvedRenderFunctionName];
         if (!renderFunction) {

package/dist/cjs/devServer.js

@@ -52,7 +52,7 @@ function startDevServer({ port = 0, tunnelUrl, configFactory, buildArtifactsPath
     }
     // Give devs a chance to modify the webpack configurations before creating the compiler instance.
     invokeHook(hooks.beforeWebpackCompilerCreation, configs.clientWebpackConfig, configs.ssrWebpackConfig);
-    const compiler = webpack_1.default([configs.clientWebpackConfig, configs.ssrWebpackConfig]);
+    const compiler = (0, webpack_1.default)([configs.clientWebpackConfig, configs.ssrWebpackConfig]);
     // `open` and `openPage` don't seem to work when starting webpack dev server via Node API.
     // Seems like this is a known issue with a potential PR: https://github.com/webpack/webpack-dev-server/issues/1510
     // But for now, need to work around it by using the `opn` module. Note: CRA does something similar.
@@ -65,7 +65,7 @@ function startDevServer({ port = 0, tunnelUrl, configFactory, buildArtifactsPath
         compiler.compilers[compiler.compilers.length - 1].hooks.done.tap('OpenBrowserAfterCompilationPlugin', (stats) => {
             if (!browserOpened) {
                 console.log('opening browser', stats.compilation.compiler.name);
-                opn_1.default(urlToOpenOnStart).then(() => {
+                (0, opn_1.default)(urlToOpenOnStart).then(() => {
                     browserOpened = true;
                 });
             }
@@ -93,10 +93,17 @@ function startDevServer({ port = 0, tunnelUrl, configFactory, buildArtifactsPath
     if (tunnelUrl) {
         serverOptions.public = tunnelUrl;
     }
-    const modulePath = path_1.default.join(buildArtifactsPath, serverBundleFileName);
+    let resolvedServerBundleFilename;
+    if (typeof serverBundleFileName === 'function') {
+        resolvedServerBundleFilename = serverBundleFileName({ filename: 'server.bundle.js' });
+    }
+    else {
+        resolvedServerBundleFilename = serverBundleFileName;
+    }
+    const modulePath = path_1.default.join(buildArtifactsPath, resolvedServerBundleFilename);
     console.log('Resolved server bundle path', modulePath);
     const appInvocationInfoResolver = customAppInvocationInfoResolver ||
-        defaultAppInvocationInfoResolver_1.getDefaultAppInvocationInfoResolver({ appPathResolver: () => modulePath });
+        (0, defaultAppInvocationInfoResolver_1.getDefaultAppInvocationInfoResolver)({ appPathResolver: () => modulePath });
     // Devs may have assigned a value to `serverOptions.after` via `configs.devServerConfig`, so
     // preserve the existing value so we can invoke it later.
     const originalAfter = serverOptions.after;
@@ -105,7 +112,7 @@ function startDevServer({ port = 0, tunnelUrl, configFactory, buildArtifactsPath
             ? ssrMiddleware({
                 appInvocationInfoResolver,
             })
-            : ssrMiddleware_1.ssrMiddleware({
+            : (0, ssrMiddleware_1.ssrMiddleware)({
                 appInvocationInfoResolver,
             });
         // Give devs a chance to add custom middleware before the SSR middleware is registered,
@@ -122,7 +129,7 @@ function startDevServer({ port = 0, tunnelUrl, configFactory, buildArtifactsPath
     if (clean) {
         const cleanPaths = [`${path_1.default.join(buildArtifactsPath, '**')}`, `!${buildArtifactsPath}`];
         console.log('cleaning paths', cleanPaths);
-        const cleanedPaths = del_1.sync(cleanPaths);
+        const cleanedPaths = (0, del_1.deleteSync)(cleanPaths);
         console.log('cleaned paths', cleanedPaths);
     }
     // Give devs a chance to modify serverOptions and/or the compiler before creating the WDS instance.

package/dist/cjs/renderingHostServer.js

@@ -14,19 +14,19 @@ const defaultAppInvocationInfoResolver_1 = require("./defaultAppInvocationInfoRe
  * @param {RenderingHostServerOptions} config
  */
 function startRenderingHostServer({ port = 0, hostname = 'localhost', hooks = {}, middlewares = {}, enableCompression = true, ssrMiddleware, ssrMiddlewarePath, appInvocationInfoResolver: customAppInvocationInfoResolver, }) {
-    const server = express_1.default();
+    const server = (0, express_1.default)();
     if (enableCompression) {
         const compressionMiddleware = middlewares.compression && typeof middlewares.compression === 'function'
             ? middlewares.compression
-            : compression_1.default();
+            : (0, compression_1.default)();
         server.use(compressionMiddleware);
     }
-    const appInvocationInfoResolver = customAppInvocationInfoResolver || defaultAppInvocationInfoResolver_1.getDefaultAppInvocationInfoResolver({});
+    const appInvocationInfoResolver = customAppInvocationInfoResolver || (0, defaultAppInvocationInfoResolver_1.getDefaultAppInvocationInfoResolver)({});
     const middleware = ssrMiddleware
         ? ssrMiddleware({
             appInvocationInfoResolver,
         })
-        : ssrMiddleware_1.ssrMiddleware({
+        : (0, ssrMiddleware_1.ssrMiddleware)({
             appInvocationInfoResolver,
         });
     // Give devs a chance to add custom middleware before the SSR middleware is registered.

package/dist/esm/devServer.js

@@ -1,4 +1,4 @@
-import { sync as delSync } from 'del';
+import { deleteSync } from 'del';
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore
 import openBrowser from 'opn';
@@ -87,7 +87,14 @@ export function startDevServer({ port = 0, tunnelUrl, configFactory, buildArtifa
     if (tunnelUrl) {
         serverOptions.public = tunnelUrl;
     }
-    const modulePath = path.join(buildArtifactsPath, serverBundleFileName);
+    let resolvedServerBundleFilename;
+    if (typeof serverBundleFileName === 'function') {
+        resolvedServerBundleFilename = serverBundleFileName({ filename: 'server.bundle.js' });
+    }
+    else {
+        resolvedServerBundleFilename = serverBundleFileName;
+    }
+    const modulePath = path.join(buildArtifactsPath, resolvedServerBundleFilename);
     console.log('Resolved server bundle path', modulePath);
     const appInvocationInfoResolver = customAppInvocationInfoResolver ||
         getDefaultAppInvocationInfoResolver({ appPathResolver: () => modulePath });
@@ -116,7 +123,7 @@ export function startDevServer({ port = 0, tunnelUrl, configFactory, buildArtifa
     if (clean) {
         const cleanPaths = [`${path.join(buildArtifactsPath, '**')}`, `!${buildArtifactsPath}`];
         console.log('cleaning paths', cleanPaths);
-        const cleanedPaths = delSync(cleanPaths);
+        const cleanedPaths = deleteSync(cleanPaths);
         console.log('cleaned paths', cleanedPaths);
     }
     // Give devs a chance to modify serverOptions and/or the compiler before creating the WDS instance.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sitecore-jss/sitecore-jss-rendering-host",
-  "version": "21.1.0-canary.93",
+  "version": "21.1.0-canary.94",
   "main": "dist/cjs/index.js",
   "module": "dist/esm/index.js",
   "sideEffects": false,
@@ -27,31 +27,30 @@
     "url": "https://github.com/sitecore/jss/issues"
   },
   "dependencies": {
-    "del": "^5.1.0",
-    "import-fresh": "^3.1.0",
-    "ngrok": "^4.2.2",
+    "del": "^7.0.0",
+    "import-fresh": "^3.3.0",
+    "ngrok": "^4.3.3",
     "opn": "^6.0.0",
-    "webpack": "4.41.0",
+    "webpack": "5.75.0",
     "webpack-dev-server": "3.11.0"
   },
   "devDependencies": {
     "@types/chai": "^4.2.3",
-    "@types/compression": "^1.0.1",
-    "@types/express": "4.17.8",
-    "@types/express-serve-static-core": "^4.17.24",
-    "@types/glob": "^7.1.1",
-    "@types/mocha": "^9.0.0",
-    "@types/node": "^12.7.11",
-    "@types/webpack": "4.39.2",
+    "@types/compression": "^1.7.2",
+    "@types/express-serve-static-core": "^4.17.33",
+    "@types/glob": "^8.0.1",
+    "@types/mocha": "^10.0.1",
+    "@types/node": "^18.11.18",
+    "@types/webpack": "5.28.0",
     "@types/webpack-dev-middleware": "2.0.5",
     "@types/webpack-dev-server": "3.1.7",
-    "chai": "^4.2.0",
+    "chai": "^4.3.0",
     "del-cli": "^5.0.0",
-    "eslint": "^7.15.0",
-    "mocha": "^9.1.3",
+    "eslint": "^8.33.0",
+    "mocha": "^10.2.0",
     "nyc": "^15.1.0",
-    "ts-node": "^8.4.1",
-    "typescript": "~4.3.5"
+    "ts-node": "^10.9.1",
+    "typescript": "~4.9.5"
   },
   "description": "",
   "types": "types/index.d.ts",
@@ -67,5 +66,5 @@
     "types",
     "/global.d.ts"
   ],
-  "gitHead": "04517c0cbbe3b9a4f475e760ddc2edb927a74df7"
+  "gitHead": "e89a1c56c8872128f5dc5fcc62435d34a55f5dc6"
 }

package/types/devServer.d.ts

@@ -9,7 +9,7 @@ export interface ConfigFactoryResult {
     clientWebpackConfig: webpack.Configuration;
     devServerConfig: WebpackDevServer.Configuration;
 }
-export declare type ConfigFactory = (nodeEnv?: string, tunnelUrl?: string) => ConfigFactoryResult;
+export type ConfigFactory = (nodeEnv?: string, tunnelUrl?: string) => ConfigFactoryResult;
 export interface DevServerOptions {
     configFactory: ConfigFactory;
     /**

package/types/ssrMiddleware.d.ts

@@ -1,27 +1,28 @@
 /// <reference types="node" />
+/// <reference types="node" />
 import { IncomingMessage, ServerResponse } from 'http';
-export declare type RenderCallback = (errorValue: Error, successValue?: string | {
+export type RenderCallback = (errorValue: Error, successValue?: string | {
     [key: string]: unknown;
 } | null) => void;
-export declare type RenderFunction = (callback: RenderCallback, ...args: unknown[]) => void;
+export type RenderFunction = (callback: RenderCallback, ...args: unknown[]) => void;
 export interface AppInvocationInfo {
     renderFunction: RenderFunction;
     renderFunctionArgs: unknown[];
     renderFunctionCallback?: RenderCallback;
 }
-export declare type JsonObject = {
+export type JsonObject = {
     [key: string]: unknown;
     id: string;
     functionName: string;
     moduleName: string;
     args: string[];
 };
-export declare type AppInvocationInfoResolver = (bodyJson: string | JsonObject, req: IncomingMessage, res: ServerResponse) => AppInvocationInfo;
+export type AppInvocationInfoResolver = (bodyJson: string | JsonObject, req: IncomingMessage, res: ServerResponse) => AppInvocationInfo;
 export interface SSRMiddlewareOptions {
     appInvocationInfoResolver: AppInvocationInfoResolver;
 }
-export declare type WebServerMiddleware = (req: IncomingMessage, res: ServerResponse, next?: (err?: unknown) => void) => void;
-export declare type SSRMiddleware = (options: SSRMiddlewareOptions) => WebServerMiddleware;
+export type WebServerMiddleware = (req: IncomingMessage, res: ServerResponse, next?: (err?: unknown) => void) => void;
+export type SSRMiddleware = (options: SSRMiddlewareOptions) => WebServerMiddleware;
 export declare const ssrMiddleware: SSRMiddleware;
 /**
  * @param {ServerResponse} res