npm - @ms-cloudpack/app-server - Versions diffs - 0.20.34 → 0.20.36 - Mend

@ms-cloudpack/app-server 0.20.34 → 0.20.36

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.

Files changed (3) hide show

package/lib/renderRoute/renderRoute.js +4 -4
package/lib/renderRoute/renderRoute.js.map +1 -1
package/package.json +9 -9

package/lib/renderRoute/renderRoute.js CHANGED Viewed

@@ -1,4 +1,4 @@
-import { javascriptExtensions, sourceExtensions, typescriptExtensions } from '@ms-cloudpack/path-utilities';
+import { javascriptRegex, sourceRegex, typescriptRegex } from '@ms-cloudpack/path-utilities';
 import fsPromises from 'fs/promises';
 import path from 'path';
 import { getDefaultHtmlResponse } from './getDefaultHtmlResponse.js';
@@ -20,7 +20,7 @@ export async function renderRoute(options, context) {
     // Prefer serverEntry if given
     if (route.serverEntry) {
         const serverEntryPath = path.resolve(appPath, route.serverEntry.sourcePath);
-        if (sourceExtensions.includes(path.extname(serverEntryPath).toLowerCase())) {
+        if (sourceRegex.test(serverEntryPath)) {
             // Server entry is a source file, so bundle it
             const serverEntryResult = await bundleServerEntry({ definition: options.definition, handleCustomRenderError, serverEntryPath }, context);
             if (typeof serverEntryResult === 'string') {
@@ -56,7 +56,7 @@ export async function renderRoute(options, context) {
                 });
             }
         }
-        else if (javascriptExtensions.includes(scriptExt)) {
+        else if (javascriptRegex.test(scriptExt)) {
             // JS file (potentially was bundled): run its function
             rawResult = await renderCustomScript({ ...options, renderScriptPath, handleCustomRenderError }, context);
         }
@@ -65,7 +65,7 @@ export async function renderRoute(options, context) {
             // content type logic, but this probably indicates there's been a misunderstanding and we
             // should direct them to use a more appropriate type of route instead.
             let message = 'is not a supported file type. ';
-            if (typescriptExtensions.includes(scriptExt)) {
+            if (typescriptRegex.test(scriptExt)) {
                 message += 'Use `serverEntry` for TS files.';
             }
             else {

package/lib/renderRoute/renderRoute.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"renderRoute.js","sourceRoot":"","sources":["../../src/renderRoute/renderRoute.ts"],"names":[],"mappings":"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","sourcesContent":["import type { EnsurePackageBundledContext } from '@ms-cloudpack/api-server';\nimport type { ExpandedRenderFunctionResult, RenderFunctionResult } from '@ms-cloudpack/common-types';\nimport { javascriptExtensions, sourceExtensions, typescriptExtensions } from '@ms-cloudpack/path-utilities';\nimport fsPromises from 'fs/promises';\nimport path from 'path';\nimport { getDefaultHtmlResponse } from './getDefaultHtmlResponse.js';\nimport { getCustomRenderErrorHandler } from './getCustomRenderErrorHandler.js';\nimport { injectScripts } from './injectScripts.js';\nimport { isHtmlAcceptable, isHtmlType } from './isHtmlAcceptable.js';\nimport { bundleServerEntry } from './ssr/bundleServerEntry.js';\nimport { renderCustomScript } from './ssr/renderCustomScript.js';\nimport type { RenderRouteOptions } from '../types/RenderRouteOptions.js';\n\n/*\n Get the response for the given route. If the route has a custom render script, use that.\n * Returns an error response if the file referenced by the script doesn't exist or throws an error.\n /\nexport async function renderRoute(\n options: RenderRouteOptions,\n context: EnsurePackageBundledContext,\n): Promise<ExpandedRenderFunctionResult \| null> {\n const { route } = options;\n const { appPath, features } = context.session.config;\n\n const handleCustomRenderError = getCustomRenderErrorHandler({ req: options.req, route, appPath });\n\n /* Absolute custom render script path (if any). For `serverEntry`, this is the bundled path. /\n let renderScriptPath: string \| undefined;\n\n // Prefer serverEntry if given\n if (route.serverEntry) {\n const serverEntryPath = path.resolve(appPath, route.serverEntry.sourcePath);\n\n if (sourceExtensions.includes(path.extname(serverEntryPath).toLowerCase())) {\n // Server entry is a source file, so bundle it\n const serverEntryResult = await bundleServerEntry(\n { definition: options.definition, handleCustomRenderError, serverEntryPath },\n context,\n );\n if (typeof serverEntryResult === 'string') {\n renderScriptPath = serverEntryResult;\n } else {\n // This means there was an error\n return serverEntryResult;\n }\n } else {\n // HTML or something, so use it as-is\n renderScriptPath = path.resolve(appPath, serverEntryPath);\n }\n } else {\n // Fall back to renderScript or the default renderer\n // eslint-disable-next-line etc/no-deprecated\n renderScriptPath = route.renderScript && path.resolve(appPath, route.renderScript);\n }\n\n // Get an initial result from either the renderScript/serverEntry or default handler.\n let rawResult: RenderFunctionResult;\n if (renderScriptPath) {\n const scriptExt = path.extname(renderScriptPath).toLowerCase();\n if (scriptExt === '.html' \|\| scriptExt === '.htm') {\n // HTML file: just read it\n try {\n rawResult = (await fsPromises.readFile(renderScriptPath, 'utf8')) \|\| '';\n } catch (e) {\n return handleCustomRenderError({\n message: `could not be read:\\n${(e as Error).message \|\| e}`,\n });\n }\n } else if (javascriptExtensions.includes(scriptExt)) {\n // JS file (potentially was bundled): run its function\n rawResult = await renderCustomScript({ ...options, renderScriptPath, handleCustomRenderError }, context);\n } else {\n // Other file type: error. Technically we could just serve it as-is following the non-HTML\n // content type logic, but this probably indicates there's been a misunderstanding and we\n // should direct them to use a more appropriate type of route instead.\n let message = 'is not a supported file type. ';\n if (typescriptExtensions.includes(scriptExt)) {\n message += 'Use `serverEntry` for TS files.';\n } else {\n message +=\n `\\n\\nSupported file types are ${route.serverEntry ? 'TS, JS, or HTML' : 'JS or HTML (use `serverEntry` for TS)'}. ` +\n 'If you want to serve a static non-HTML file, use a route with `staticPath`, or a `serverEntry` ' +\n 'which returns the file content for advanced scenarios.';\n }\n return handleCustomRenderError({ message });\n }\n } else {\n rawResult = getDefaultHtmlResponse(options);\n }\n\n if (rawResult === null) {\n if (features?.enableSSR) {\n // null is not valid in new SSR mode\n // (technically this error came from the bundled script, but that's irrelevant to the issue)\n return handleCustomRenderError({\n message: `returned null, which is not supported with the \"enableSSR\" feature.`,\n });\n }\n // This means the custom renderScript fully handled the request.\n return null;\n }\n\n if (rawResult === undefined) {\n return handleCustomRenderError({\n message: `returned undefined. Ensure that the function returns the content to be rendered.`,\n });\n }\n\n const result: ExpandedRenderFunctionResult = {\n contentType: 'text/html',\n statusCode: 200,\n ...(typeof rawResult === 'string' ? { content: rawResult } : rawResult),\n };\n\n // Add any custom headers (for success or error)\n if (result.headers) {\n for (const [key, value] of Object.entries(result.headers)) {\n options.res.header(key, value);\n }\n }\n\n // If it's HTML and a success statusCode, inject the import map and appropriate scripts.\n if (\n result.injectScripts !== false &&\n result.statusCode === 200 &&\n typeof result.content === 'string' &&\n isHtmlType(result.contentType)\n ) {\n if (isHtmlAcceptable(options.req)) {\n // Inject the import map and scripts.\n await injectScripts(options, result, context);\n } else {\n // It appears we're accidentally returning HTML when a different file type was requested.\n // This could happen for overly broad route matches such as '', or if no routes are configured.\n return handleCustomRenderError({\n message:\n 'returned HTML, but this appears to be a non-HTML request. This is likely due to an ' +\n 'overly broad match or other misconfiguration of server.routes in the cloudpack config.',\n });\n }\n }\n\n return result;\n}\n"]}
1	+ {"version":3,"file":"renderRoute.js","sourceRoot":"","sources":["../../src/renderRoute/renderRoute.ts"],"names":[],"mappings":"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","sourcesContent":["import type { EnsurePackageBundledContext } from '@ms-cloudpack/api-server';\nimport type { ExpandedRenderFunctionResult, RenderFunctionResult } from '@ms-cloudpack/common-types';\nimport { javascriptRegex, sourceRegex, typescriptRegex } from '@ms-cloudpack/path-utilities';\nimport fsPromises from 'fs/promises';\nimport path from 'path';\nimport { getDefaultHtmlResponse } from './getDefaultHtmlResponse.js';\nimport { getCustomRenderErrorHandler } from './getCustomRenderErrorHandler.js';\nimport { injectScripts } from './injectScripts.js';\nimport { isHtmlAcceptable, isHtmlType } from './isHtmlAcceptable.js';\nimport { bundleServerEntry } from './ssr/bundleServerEntry.js';\nimport { renderCustomScript } from './ssr/renderCustomScript.js';\nimport type { RenderRouteOptions } from '../types/RenderRouteOptions.js';\n\n/*\n Get the response for the given route. If the route has a custom render script, use that.\n * Returns an error response if the file referenced by the script doesn't exist or throws an error.\n /\nexport async function renderRoute(\n options: RenderRouteOptions,\n context: EnsurePackageBundledContext,\n): Promise<ExpandedRenderFunctionResult \| null> {\n const { route } = options;\n const { appPath, features } = context.session.config;\n\n const handleCustomRenderError = getCustomRenderErrorHandler({ req: options.req, route, appPath });\n\n /* Absolute custom render script path (if any). For `serverEntry`, this is the bundled path. /\n let renderScriptPath: string \| undefined;\n\n // Prefer serverEntry if given\n if (route.serverEntry) {\n const serverEntryPath = path.resolve(appPath, route.serverEntry.sourcePath);\n\n if (sourceRegex.test(serverEntryPath)) {\n // Server entry is a source file, so bundle it\n const serverEntryResult = await bundleServerEntry(\n { definition: options.definition, handleCustomRenderError, serverEntryPath },\n context,\n );\n if (typeof serverEntryResult === 'string') {\n renderScriptPath = serverEntryResult;\n } else {\n // This means there was an error\n return serverEntryResult;\n }\n } else {\n // HTML or something, so use it as-is\n renderScriptPath = path.resolve(appPath, serverEntryPath);\n }\n } else {\n // Fall back to renderScript or the default renderer\n // eslint-disable-next-line etc/no-deprecated\n renderScriptPath = route.renderScript && path.resolve(appPath, route.renderScript);\n }\n\n // Get an initial result from either the renderScript/serverEntry or default handler.\n let rawResult: RenderFunctionResult;\n if (renderScriptPath) {\n const scriptExt = path.extname(renderScriptPath).toLowerCase();\n if (scriptExt === '.html' \|\| scriptExt === '.htm') {\n // HTML file: just read it\n try {\n rawResult = (await fsPromises.readFile(renderScriptPath, 'utf8')) \|\| '';\n } catch (e) {\n return handleCustomRenderError({\n message: `could not be read:\\n${(e as Error).message \|\| e}`,\n });\n }\n } else if (javascriptRegex.test(scriptExt)) {\n // JS file (potentially was bundled): run its function\n rawResult = await renderCustomScript({ ...options, renderScriptPath, handleCustomRenderError }, context);\n } else {\n // Other file type: error. Technically we could just serve it as-is following the non-HTML\n // content type logic, but this probably indicates there's been a misunderstanding and we\n // should direct them to use a more appropriate type of route instead.\n let message = 'is not a supported file type. ';\n if (typescriptRegex.test(scriptExt)) {\n message += 'Use `serverEntry` for TS files.';\n } else {\n message +=\n `\\n\\nSupported file types are ${route.serverEntry ? 'TS, JS, or HTML' : 'JS or HTML (use `serverEntry` for TS)'}. ` +\n 'If you want to serve a static non-HTML file, use a route with `staticPath`, or a `serverEntry` ' +\n 'which returns the file content for advanced scenarios.';\n }\n return handleCustomRenderError({ message });\n }\n } else {\n rawResult = getDefaultHtmlResponse(options);\n }\n\n if (rawResult === null) {\n if (features?.enableSSR) {\n // null is not valid in new SSR mode\n // (technically this error came from the bundled script, but that's irrelevant to the issue)\n return handleCustomRenderError({\n message: `returned null, which is not supported with the \"enableSSR\" feature.`,\n });\n }\n // This means the custom renderScript fully handled the request.\n return null;\n }\n\n if (rawResult === undefined) {\n return handleCustomRenderError({\n message: `returned undefined. Ensure that the function returns the content to be rendered.`,\n });\n }\n\n const result: ExpandedRenderFunctionResult = {\n contentType: 'text/html',\n statusCode: 200,\n ...(typeof rawResult === 'string' ? { content: rawResult } : rawResult),\n };\n\n // Add any custom headers (for success or error)\n if (result.headers) {\n for (const [key, value] of Object.entries(result.headers)) {\n options.res.header(key, value);\n }\n }\n\n // If it's HTML and a success statusCode, inject the import map and appropriate scripts.\n if (\n result.injectScripts !== false &&\n result.statusCode === 200 &&\n typeof result.content === 'string' &&\n isHtmlType(result.contentType)\n ) {\n if (isHtmlAcceptable(options.req)) {\n // Inject the import map and scripts.\n await injectScripts(options, result, context);\n } else {\n // It appears we're accidentally returning HTML when a different file type was requested.\n // This could happen for overly broad route matches such as '', or if no routes are configured.\n return handleCustomRenderError({\n message:\n 'returned HTML, but this appears to be a non-HTML request. This is likely due to an ' +\n 'overly broad match or other misconfiguration of server.routes in the cloudpack config.',\n });\n }\n }\n\n return result;\n}\n"]}

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@ms-cloudpack/app-server",
-  "version": "0.20.34",
+  "version": "0.20.36",
   "description": "Internal app server for Cloudpack",
   "license": "MIT",
   "type": "module",
@@ -24,15 +24,15 @@
     "test": "cloudpack-scripts test"
   },
   "dependencies": {
-    "@ms-cloudpack/api-server": "^0.65.10",
-    "@ms-cloudpack/bundle-server": "^0.8.34",
-    "@ms-cloudpack/common-types": "^0.33.0",
-    "@ms-cloudpack/create-express-app": "^1.10.65",
+    "@ms-cloudpack/api-server": "^0.65.12",
+    "@ms-cloudpack/bundle-server": "^0.8.36",
+    "@ms-cloudpack/common-types": "^0.33.1",
+    "@ms-cloudpack/create-express-app": "^1.10.66",
     "@ms-cloudpack/environment": "^0.1.1",
-    "@ms-cloudpack/import-map": "^0.10.61",
-    "@ms-cloudpack/inline-scripts": "^0.2.56",
+    "@ms-cloudpack/import-map": "^0.10.62",
+    "@ms-cloudpack/inline-scripts": "^0.2.58",
     "@ms-cloudpack/path-string-parsing": "^1.2.7",
-    "@ms-cloudpack/path-utilities": "^3.2.1",
+    "@ms-cloudpack/path-utilities": "^3.2.2",
     "@ms-cloudpack/task-reporter": "^0.17.4",
     "@ms-cloudpack/worker-pool": "^0.4.1",
     "happy-dom": "^20.0.2",
@@ -40,7 +40,7 @@
   },
   "devDependencies": {
     "@ms-cloudpack/common-types-browser": "^0.6.4",
-    "@ms-cloudpack/config": "^0.38.20",
+    "@ms-cloudpack/config": "^0.38.21",
     "@ms-cloudpack/eslint-plugin-internal": "^0.0.1",
     "@ms-cloudpack/scripts": "^0.0.1",
     "@ms-cloudpack/test-utilities": "^0.5.0"