@shopify/hydrogen 0.11.0-experimental.1 → 0.11.1-experimental.0

package/dist/esnext/utilities/log/log.js

@@ -1,5 +1,6 @@
 import { yellow, red, green, italic, lightBlue } from 'kolorist';
 import { getTime } from '../timing';
+import { parseUrl } from './utils';
 const defaultLogger = {
     trace(context, ...args) {
         // Re-enable following line to show trace debugging information
@@ -17,46 +18,39 @@ const defaultLogger = {
     fatal(context, ...args) {
         console.error(red('FATAL: '), ...args);
     },
+    options: () => ({}),
 };
-let logger = defaultLogger;
-export function getLoggerFromContext(context) {
+globalThis.__logger = defaultLogger;
+function buildLogger() {
     return {
-        trace: (...args) => logger.trace(context, ...args),
-        debug: (...args) => logger.debug(context, ...args),
-        warn: (...args) => logger.warn(context, ...args),
-        error: (...args) => logger.error(context, ...args),
-        fatal: (...args) => logger.fatal(context, ...args),
+        trace: (...args) => globalThis.__logger.trace(this, ...args),
+        debug: (...args) => globalThis.__logger.debug(this, ...args),
+        warn: (...args) => globalThis.__logger.warn(this, ...args),
+        error: (...args) => globalThis.__logger.error(this, ...args),
+        fatal: (...args) => globalThis.__logger.fatal(this, ...args),
+        options: () => globalThis.__logger.options(),
     };
 }
+export const log = buildLogger.call({});
+export function getLoggerWithContext(context = {}) {
+    return buildLogger.call(context);
+}
 export function setLogger(newLogger) {
-    logger = newLogger;
+    globalThis.__logger = newLogger;
+}
+export function setLoggerOptions(options) {
+    globalThis.__logger.options = () => options;
 }
 export function resetLogger() {
-    logger = defaultLogger;
+    globalThis.__logger = defaultLogger;
 }
-export const log = {
-    trace(...args) {
-        return logger.trace({}, ...args);
-    },
-    debug(...args) {
-        return logger.debug({}, ...args);
-    },
-    warn(...args) {
-        return logger.warn({}, ...args);
-    },
-    error(...args) {
-        return logger.error({}, ...args);
-    },
-    fatal(...args) {
-        return logger.fatal({}, ...args);
-    },
-};
 const SERVER_RESPONSE_MAP = {
     str: 'streaming SSR',
     rsc: 'Server Components',
     ssr: 'buffered SSR',
 };
-export function logServerResponse(type, log, request, responseStatus) {
+export function logServerResponse(type, request, responseStatus) {
+    const log = getLoggerWithContext(request);
     const coloredResponseStatus = responseStatus >= 500
         ? red(responseStatus)
         : responseStatus >= 400
@@ -65,13 +59,8 @@ export function logServerResponse(type, log, request, responseStatus) {
                 ? lightBlue(responseStatus)
                 : green(responseStatus);
     const fullType = SERVER_RESPONSE_MAP[type] || type;
-    const styledType = italic(pad(fullType, '                 '));
-    const paddedTiming = pad((getTime() - request.time).toFixed(2) + ' ms', '          ');
-    const url = type === 'rsc'
-        ? decodeURIComponent(request.url.substring(request.url.indexOf('=') + 1))
-        : request.url;
+    const styledType = italic(fullType.padEnd(17));
+    const paddedTiming = ((getTime() - request.time).toFixed(2) + ' ms').padEnd(10);
+    const url = parseUrl(type, request.url);
     log.debug(`${request.method} ${styledType} ${coloredResponseStatus} ${paddedTiming} ${url}`);
 }
-function pad(str, _pad) {
-    return (str + _pad).substring(0, _pad.length);
-}

package/dist/esnext/utilities/log/utils.d.ts

@@ -0,0 +1,3 @@
+import type { RenderType } from './log';
+export declare function findQueryName(key: string): string;
+export declare function parseUrl(type: RenderType, url: string): string;

package/dist/esnext/utilities/log/utils.js

@@ -0,0 +1,13 @@
+export function findQueryName(key) {
+    const decodeKey = decodeURIComponent(key);
+    const match = decodeKey.match(/query ([^\s\()]*)\s?(|\(\{)/);
+    if (match && match.length > 1) {
+        return match[1];
+    }
+    return '<unknown>';
+}
+export function parseUrl(type, url) {
+    return type === 'rsc'
+        ? decodeURIComponent(url.substring(url.indexOf('=') + 1))
+        : url;
+}

package/dist/esnext/utilities/template.d.ts

@@ -0,0 +1,9 @@
+/**
+ * Strip out script `src` values from <script> tags in a given HTML template.
+ * Returns two lists of scripts, split based on whether they are `type="module"`.
+ */
+export declare function stripScriptsFromTemplate(template: string): {
+    noScriptTemplate: string;
+    bootstrapScripts: string[];
+    bootstrapModules: string[];
+};

package/dist/esnext/utilities/template.js

@@ -0,0 +1,23 @@
+/**
+ * Strip out script `src` values from <script> tags in a given HTML template.
+ * Returns two lists of scripts, split based on whether they are `type="module"`.
+ */
+export function stripScriptsFromTemplate(template) {
+    var _a;
+    const bootstrapScripts = [];
+    const bootstrapModules = [];
+    const scripts = template.matchAll(/<script.+?src="(?<script>([^"]+?))".*?><\/script>/g);
+    for (const match of scripts) {
+        const scriptName = (_a = match.groups) === null || _a === void 0 ? void 0 : _a.script;
+        if (!scriptName)
+            continue;
+        if (match[0].includes(`type="module"`)) {
+            bootstrapModules.push(scriptName);
+        }
+        else {
+            bootstrapScripts.push(scriptName);
+        }
+        template = template.replace(match[0], '');
+    }
+    return { noScriptTemplate: template, bootstrapScripts, bootstrapModules };
+}

package/dist/esnext/utilities/web-api-polyfill.js

@@ -0,0 +1,19 @@
+import fetch, { Request, Response, Headers } from 'node-fetch';
+import AbortController from 'abort-controller';
+import { ReadableStream, WritableStream, TransformStream, } from 'web-streams-polyfill/ponyfill';
+if (!globalThis.fetch) {
+    Object.assign(globalThis, {
+        fetch,
+        Request,
+        Response,
+        Headers,
+        AbortController,
+    });
+}
+if (!globalThis.ReadableStream) {
+    Object.assign(globalThis, {
+        ReadableStream,
+        WritableStream,
+        TransformStream,
+    });
+}

package/dist/esnext/version.d.ts

@@ -1 +1 @@
-export declare const LIB_VERSION = "0.11.0-experimental.1";
+export declare const LIB_VERSION = "0.11.0";

package/dist/esnext/version.js

@@ -1 +1 @@
-export const LIB_VERSION = '0.11.0-experimental.1';
+export const LIB_VERSION = '0.11.0';

package/dist/node/entry-server.d.ts

@@ -0,0 +1,22 @@
+/// <reference types="node" />
+import type { ServerHandlerConfig } from './types';
+import type { ServerResponse, IncomingMessage } from 'http';
+import { RuntimeContext } from './framework/runtime';
+declare global {
+    var __WORKER__: boolean;
+}
+interface RequestHandlerOptions {
+    indexTemplate: string | ((url: string) => Promise<string | {
+        default: string;
+    }>);
+    cache?: Cache;
+    streamableResponse?: ServerResponse;
+    dev?: boolean;
+    context?: RuntimeContext;
+    nonce?: string;
+}
+export interface RequestHandler {
+    (request: Request | IncomingMessage, options: RequestHandlerOptions): Promise<Response | undefined>;
+}
+export declare const renderHydrogen: (App: any, { pages }: ServerHandlerConfig) => RequestHandler;
+export default renderHydrogen;