@quilted/quilt 0.5.107 → 0.5.108

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @quilted/quilt
 
+## 0.5.108
+
+### Patch Changes
+
+- [`a12c3576`](https://github.com/lemonmade/quilt/commit/a12c357693b173461f51a35fb7efdd0a9267e471) Thanks [@lemonmade](https://github.com/lemonmade)! - Fix more build issues
+
 ## 0.5.107
 
 ### Patch Changes

package/build/cjs/AppContext.cjs

@@ -8,8 +8,9 @@ var jsxRuntime = require('react/jsx-runtime');
 
 // TODO: have craft options to remove the bundle impact of parts of this that are
 // unused.
-function AppContext(_ref) {
-  var children = _ref.children;
+function AppContext({
+  children
+}) {
   reactHtml.useHtmlUpdater();
   return /*#__PURE__*/jsxRuntime.jsx(reactHttp.HttpContext, {
     children: /*#__PURE__*/jsxRuntime.jsx(reactHttp.CookieContext, {

package/build/cjs/env.cjs

@@ -2,6 +2,6 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var Env = {};
+const Env = {};
 
 exports["default"] = Env;

package/build/cjs/server/ServerContext.cjs

@@ -8,13 +8,14 @@ var server$2 = require('@quilted/react-async/server');
 var server = require('@quilted/react-http/server');
 var react = require('../utilities/react.cjs');
 
-function ServerContext(_ref) {
-  var url = _ref.url,
-      html = _ref.html,
-      http = _ref.http,
-      asyncAssets = _ref.asyncAssets,
-      children = _ref.children;
-  var normalizedUrl = typeof url === 'string' ? new URL(url) : url;
+function ServerContext({
+  url,
+  html,
+  http,
+  asyncAssets,
+  children
+}) {
+  const normalizedUrl = typeof url === 'string' ? new URL(url) : url;
   return react.maybeWrapContext(server$2.AsyncAssetContext, asyncAssets, react.maybeWrapContext(server.HttpServerContext, http, react.maybeWrapContext(server$1.HtmlContext, html, react.maybeWrapContext(reactRouter.InitialUrlContext, normalizedUrl, children))));
 }
 

package/build/cjs/server/http-handler.cjs

@@ -2,203 +2,87 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var _slicedToArray = require('@babel/runtime/helpers/slicedToArray');
-var _defineProperty = require('@babel/runtime/helpers/defineProperty');
-var _asyncToGenerator = require('@babel/runtime/helpers/asyncToGenerator');
-var _objectWithoutProperties = require('@babel/runtime/helpers/objectWithoutProperties');
-var _regeneratorRuntime = require('@babel/runtime/regenerator');
 var server = require('@quilted/react-html/server');
 var httpHandlers = require('@quilted/http-handlers');
 var render = require('./render.cjs');
 var jsxRuntime = require('react/jsx-runtime');
 
-function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
-
-var _slicedToArray__default = /*#__PURE__*/_interopDefaultLegacy(_slicedToArray);
-var _defineProperty__default = /*#__PURE__*/_interopDefaultLegacy(_defineProperty);
-var _asyncToGenerator__default = /*#__PURE__*/_interopDefaultLegacy(_asyncToGenerator);
-var _objectWithoutProperties__default = /*#__PURE__*/_interopDefaultLegacy(_objectWithoutProperties);
-var _regeneratorRuntime__default = /*#__PURE__*/_interopDefaultLegacy(_regeneratorRuntime);
-
-var _excluded = ["handler"],
-    _excluded2 = ["context"],
-    _excluded3 = ["assets"];
-
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty__default["default"](target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-function createServerRenderingHttpHandler(render, _ref) {
-  var _ref$handler = _ref.handler,
-      handler = _ref$handler === void 0 ? httpHandlers.createHttpHandler() : _ref$handler,
-      options = _objectWithoutProperties__default["default"](_ref, _excluded);
-
+function createServerRenderingHttpHandler(render, {
+  handler = httpHandlers.createHttpHandler(),
+  ...options
+}) {
   handler.get(createServerRenderingRequestHandler(render, options));
   return handler;
 }
-function createServerRenderingRequestHandler(render) {
-  var _ref2 = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {},
-      context = _ref2.context,
-      options = _objectWithoutProperties__default["default"](_ref2, _excluded2);
-
-  return /*#__PURE__*/function () {
-    var _ref3 = _asyncToGenerator__default["default"]( /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee(request, requestContext) {
-      var _context;
-
-      var app;
-      return _regeneratorRuntime__default["default"].wrap(function _callee$(_context2) {
-        while (1) {
-          switch (_context2.prev = _context2.next) {
-            case 0:
-              _context2.next = 2;
-              return render(request, requestContext);
-
-            case 2:
-              app = _context2.sent;
-              return _context2.abrupt("return", renderToResponse(app, request, _objectSpread(_objectSpread({}, options), {}, {
-                context: (_context = context === null || context === void 0 ? void 0 : context(request, requestContext)) !== null && _context !== void 0 ? _context : requestContext
-              })));
-
-            case 4:
-            case "end":
-              return _context2.stop();
-          }
-        }
-      }, _callee);
-    }));
-
-    return function (_x, _x2) {
-      return _ref3.apply(this, arguments);
-    };
-  }();
+function createServerRenderingRequestHandler(render, {
+  context,
+  ...options
+} = {}) {
+  return async (request, requestContext) => {
+    var _context;
+
+    const app = await render(request, requestContext);
+    return renderToResponse(app, request, { ...options,
+      context: (_context = context === null || context === void 0 ? void 0 : context(request, requestContext)) !== null && _context !== void 0 ? _context : requestContext
+    });
+  };
 }
-function renderToResponse(_x3, _x4) {
-  return _renderToResponse.apply(this, arguments);
-}
-
-function _renderToResponse() {
-  _renderToResponse = _asyncToGenerator__default["default"]( /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee2(app, request) {
-    var _ref4,
-        assets,
-        options,
-        accepts,
-        _yield$renderApp,
-        htmlManager,
-        http,
-        markup,
-        asyncAssets,
-        _http$state,
-        headers,
-        _http$state$statusCod,
-        statusCode,
-        redirectUrl,
-        usedAssets,
-        assetOptions,
-        _ref5,
-        _ref6,
-        styles,
-        scripts,
-        preload,
-        _args2 = arguments;
-
-    return _regeneratorRuntime__default["default"].wrap(function _callee2$(_context3) {
-      while (1) {
-        switch (_context3.prev = _context3.next) {
-          case 0:
-            _ref4 = _args2.length > 2 && _args2[2] !== undefined ? _args2[2] : {}, assets = _ref4.assets, options = _objectWithoutProperties__default["default"](_ref4, _excluded3);
-            accepts = request.headers.get('Accept');
-
-            if (!(accepts != null && !accepts.includes('text/html'))) {
-              _context3.next = 4;
-              break;
-            }
-
-            return _context3.abrupt("return");
-
-          case 4:
-            _context3.next = 6;
-            return render.renderApp(app, _objectSpread(_objectSpread({}, options), {}, {
-              url: request.url,
-              headers: request.headers
-            }));
-
-          case 6:
-            _yield$renderApp = _context3.sent;
-            htmlManager = _yield$renderApp.html;
-            http = _yield$renderApp.http;
-            markup = _yield$renderApp.markup;
-            asyncAssets = _yield$renderApp.asyncAssets;
-            _http$state = http.state, headers = _http$state.headers, _http$state$statusCod = _http$state.statusCode, statusCode = _http$state$statusCod === void 0 ? 200 : _http$state$statusCod, redirectUrl = _http$state.redirectUrl;
-
-            if (!redirectUrl) {
-              _context3.next = 14;
-              break;
-            }
-
-            return _context3.abrupt("return", httpHandlers.redirect(redirectUrl, {
-              status: statusCode,
-              headers: headers
-            }));
-
-          case 14:
-            usedAssets = asyncAssets.used({
-              timing: 'load'
-            });
-            assetOptions = {
-              userAgent: request.headers.get('User-Agent')
-            };
-
-            if (!assets) {
-              _context3.next = 22;
-              break;
-            }
-
-            _context3.next = 19;
-            return Promise.all([assets.styles({
-              async: usedAssets,
-              options: assetOptions
-            }), assets.scripts({
-              async: usedAssets,
-              options: assetOptions
-            }), assets.asyncAssets(asyncAssets.used({
-              timing: 'preload'
-            }), {
-              options: assetOptions
-            })]);
-
-          case 19:
-            _context3.t0 = _context3.sent;
-            _context3.next = 23;
-            break;
-
-          case 22:
-            _context3.t0 = [];
-
-          case 23:
-            _ref5 = _context3.t0;
-            _ref6 = _slicedToArray__default["default"](_ref5, 3);
-            styles = _ref6[0];
-            scripts = _ref6[1];
-            preload = _ref6[2];
-            return _context3.abrupt("return", httpHandlers.html(server.render( /*#__PURE__*/jsxRuntime.jsx(server.Html, {
-              url: new URL(request.url),
-              manager: htmlManager,
-              styles: styles,
-              scripts: scripts,
-              preloadAssets: preload,
-              children: markup
-            })), {
-              headers: headers,
-              status: statusCode
-            }));
-
-          case 29:
-          case "end":
-            return _context3.stop();
-        }
-      }
-    }, _callee2);
-  }));
-  return _renderToResponse.apply(this, arguments);
+async function renderToResponse(app, request, {
+  assets,
+  ...options
+} = {}) {
+  const accepts = request.headers.get('Accept');
+  if (accepts != null && !accepts.includes('text/html')) return;
+  const {
+    html: htmlManager,
+    http,
+    markup,
+    asyncAssets
+  } = await render.renderApp(app, { ...options,
+    url: request.url,
+    headers: request.headers
+  });
+  const {
+    headers,
+    statusCode = 200,
+    redirectUrl
+  } = http.state;
+
+  if (redirectUrl) {
+    return httpHandlers.redirect(redirectUrl, {
+      status: statusCode,
+      headers
+    });
+  }
+
+  const usedAssets = asyncAssets.used({
+    timing: 'load'
+  });
+  const assetOptions = {
+    userAgent: request.headers.get('User-Agent')
+  };
+  const [styles, scripts, preload] = assets ? await Promise.all([assets.styles({
+    async: usedAssets,
+    options: assetOptions
+  }), assets.scripts({
+    async: usedAssets,
+    options: assetOptions
+  }), assets.asyncAssets(asyncAssets.used({
+    timing: 'preload'
+  }), {
+    options: assetOptions
+  })]) : [];
+  return httpHandlers.html(server.render( /*#__PURE__*/jsxRuntime.jsx(server.Html, {
+    url: new URL(request.url),
+    manager: htmlManager,
+    styles: styles,
+    scripts: scripts,
+    preloadAssets: preload,
+    children: markup
+  })), {
+    headers,
+    status: statusCode
+  });
 }
 
 exports.createServerRenderingHttpHandler = createServerRenderingHttpHandler;

package/build/cjs/server/render.cjs

@@ -2,10 +2,6 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var _defineProperty = require('@babel/runtime/helpers/defineProperty');
-var _objectWithoutProperties = require('@babel/runtime/helpers/objectWithoutProperties');
-var _asyncToGenerator = require('@babel/runtime/helpers/asyncToGenerator');
-var _regeneratorRuntime = require('@babel/runtime/regenerator');
 var server$3 = require('@quilted/react-server-render/server');
 var server = require('@quilted/react-html/server');
 var server$2 = require('@quilted/react-http/server');
@@ -13,77 +9,38 @@ var server$1 = require('@quilted/react-async/server');
 var ServerContext = require('./ServerContext.cjs');
 var jsxRuntime = require('react/jsx-runtime');
 
-function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
-
-var _defineProperty__default = /*#__PURE__*/_interopDefaultLegacy(_defineProperty);
-var _objectWithoutProperties__default = /*#__PURE__*/_interopDefaultLegacy(_objectWithoutProperties);
-var _asyncToGenerator__default = /*#__PURE__*/_interopDefaultLegacy(_asyncToGenerator);
-var _regeneratorRuntime__default = /*#__PURE__*/_interopDefaultLegacy(_regeneratorRuntime);
-
-var _excluded = ["decorate", "url", "headers"];
-
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty__default["default"](target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-function renderApp(_x) {
-  return _renderApp.apply(this, arguments);
-}
-
-function _renderApp() {
-  _renderApp = _asyncToGenerator__default["default"]( /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee(app) {
-    var _ref,
-        _decorate,
-        url,
-        headers,
-        rest,
-        html,
-        asyncAssets,
-        http,
-        markup,
-        _args = arguments;
-
-    return _regeneratorRuntime__default["default"].wrap(function _callee$(_context) {
-      while (1) {
-        switch (_context.prev = _context.next) {
-          case 0:
-            _ref = _args.length > 1 && _args[1] !== undefined ? _args[1] : {}, _decorate = _ref.decorate, url = _ref.url, headers = _ref.headers, rest = _objectWithoutProperties__default["default"](_ref, _excluded);
-            html = new server.HtmlManager();
-            asyncAssets = new server$1.AsyncAssetManager();
-            http = new server$2.HttpManager({
-              headers: headers
-            });
-            _context.next = 6;
-            return server$3.extract(app, _objectSpread({
-              decorate: function decorate(app) {
-                var _decorate2;
-
-                return /*#__PURE__*/jsxRuntime.jsx(ServerContext.ServerContext, {
-                  asyncAssets: asyncAssets,
-                  http: http,
-                  html: html,
-                  url: url,
-                  children: (_decorate2 = _decorate === null || _decorate === void 0 ? void 0 : _decorate(app)) !== null && _decorate2 !== void 0 ? _decorate2 : app
-                });
-              }
-            }, rest));
-
-          case 6:
-            markup = _context.sent;
-            return _context.abrupt("return", {
-              markup: markup,
-              http: http,
-              html: html,
-              asyncAssets: asyncAssets
-            });
-
-          case 8:
-          case "end":
-            return _context.stop();
-        }
-      }
-    }, _callee);
-  }));
-  return _renderApp.apply(this, arguments);
+async function renderApp(app, {
+  decorate,
+  url,
+  headers,
+  ...rest
+} = {}) {
+  const html = new server.HtmlManager();
+  const asyncAssets = new server$1.AsyncAssetManager();
+  const http = new server$2.HttpManager({
+    headers
+  });
+  const markup = await server$3.extract(app, {
+    decorate(app) {
+      var _decorate;
+
+      return /*#__PURE__*/jsxRuntime.jsx(ServerContext.ServerContext, {
+        asyncAssets: asyncAssets,
+        http: http,
+        html: html,
+        url: url,
+        children: (_decorate = decorate === null || decorate === void 0 ? void 0 : decorate(app)) !== null && _decorate !== void 0 ? _decorate : app
+      });
+    },
+
+    ...rest
+  });
+  return {
+    markup,
+    http,
+    html,
+    asyncAssets
+  };
 }
 
 exports.renderApp = renderApp;

package/build/cjs/static/StaticContext.cjs

@@ -8,13 +8,14 @@ var server$2 = require('@quilted/react-async/server');
 var server = require('@quilted/react-http/server');
 var react = require('../utilities/react.cjs');
 
-function StaticContext(_ref) {
-  var url = _ref.url,
-      html = _ref.html,
-      http = _ref.http,
-      asyncAssets = _ref.asyncAssets,
-      children = _ref.children;
-  var normalizedUrl = typeof url === 'string' ? new URL(url) : url;
+function StaticContext({
+  url,
+  html,
+  http,
+  asyncAssets,
+  children
+}) {
+  const normalizedUrl = typeof url === 'string' ? new URL(url) : url;
   return react.maybeWrapContext(server$2.AsyncAssetContext, asyncAssets, react.maybeWrapContext(server.HttpServerContext, http, react.maybeWrapContext(server$1.HtmlContext, html, react.maybeWrapContext(reactRouter.InitialUrlContext, normalizedUrl, children))));
 }