@kaliber/build 0.0.150 → 0.0.152-beta.1

package/lib/serve.js

@@ -112,7 +112,7 @@ async function findFile(path, file) {
   return null
 }
 
-async function fileExists(path) {
+function fileExists(path) {
   return isProduction
     ? (!fileExists.cache || fileExists.cache[path] === undefined)
       ? accessFile(path).then(exists => (addPathToCache(path, exists), exists))
@@ -124,7 +124,7 @@ async function fileExists(path) {
   }
 }
 
-async function accessFile(path) {
+function accessFile(path) {
   return new Promise(resolve => access(path, err => resolve(!err)))
 }
 
@@ -140,24 +140,44 @@ function possibleDirectories(path) {
 
 function serveIndexWithRouting(req, res, file) {
   const envRequire = isProduction ? require : require('import-fresh')
+
   const routeTemplate = envRequire(file)
 
-  const routes = routeTemplate.routes
   const location = parsePath(req.url)
 
-  return Promise.resolve(routes)
-    .then(routes => (routes && routes.match(location, req)) || { status: 200, data: null })
-    .then(data => {
-      if (!routes || !routes.resolveIndex) return [data, routeTemplate]
-
-      const indexLocation = routes.resolveIndex(location, req)
-      if (!indexLocation) return [data, routeTemplate]
-
-      const indexPath = resolve(target, publicPathDir, indexLocation, indexWithRouting)
-      return [data, envRequire(indexPath)]
-    })
-    .then(([{ status, headers, data }, template]) =>
-      Promise.resolve(template({ location, data })).then(html => [status, headers, html])
-    )
-    .then(([ status, headers, html ]) => res.status(status).set(headers).send(html))
+  const [dataOrPromise, template] = getDataAndRouteTemplate(routeTemplate, { location, req })
+
+  if (dataOrPromise.then)
+    dataOrPromise
+      .then(({ status, headers, data }) => {
+        const html = renderTemplate(template, location, { data })
+        res.status(status).set(headers).send(html)
+      })
+  else {
+    const { data, status, headers } = dataOrPromise
+    const html = renderTemplate(template, location, { data })
+    res.status(status).set(headers).send(html)
+  }
+}
+
+function getDataAndRouteTemplate(routeTemplate, { location, req }) {
+  const envRequire = isProduction ? require : require('import-fresh')
+
+  const routes = routeTemplate.routes
+  const dataOrPromise = (routes && routes.match(location, req)) || { status: 200, data: null }
+
+  if (!routes || !routes.resolveIndex)
+    return [dataOrPromise, routeTemplate]
+
+  const indexLocation = routes.resolveIndex(location, req)
+  if (!indexLocation)
+    return [dataOrPromise, routeTemplate]
+
+  const indexPath = resolve(target, publicPathDir, indexLocation, indexWithRouting)
+  return [dataOrPromise, envRequire(indexPath)]
+}
+
+function renderTemplate(template, location, { data }) {
+  const html = template({ location, data })
+  return html
 }

package/lib/universalComponents.js

@@ -63,9 +63,18 @@ function createVirtualReactContainer({ initialNodes, startNode, endNode }) {
     removeEventListener: (...args) => parent.removeEventListener(...args),
     dispatchEvent: (...args) => parent.dispatchEvent(...args),
     get firstChild() { return nodes[0] || null },
-    get nodeType() { return parent.DOCUMENT_FRAGMENT_NODE },
+    get nodeType() { return parent.ELEMENT_NODE },
     get ownerDocument() { return parent.ownerDocument },
     get nodeName() { return 'virtualized container' },
+    get textContent() { return '' },
+    set textContent(value) {
+      if (value) throw new Error(`Unexpected value set by React: "${value}"`)
+      nodes.forEach(node => parent.removeChild(node))
+      nodes.length = 0
+    },
+    get tagName() { return 'DIV' },
+    get namespaceURI() { return parent.namespaceURI },
+    get onclick() { return undefined }, // this is accessed as part of an obscure fix for bubbling behavior in Safari. By returning undefined we disable that 'fix'
     removeChild(child) {
       const result = parent.removeChild(child)
       nodes = nodes.filter(x => x !== child)
@@ -83,6 +92,7 @@ function createVirtualReactContainer({ initialNodes, startNode, endNode }) {
       return result
     },
   }
+
   // The statement below is a lie. We supply an object that has all methods that React calls on it
   return /** @type {Element} */ (container)
 }

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.0.150",
+  "version": "0.0.152-beta.1",
   "name": "@kaliber/build",
   "description": "Zero configuration, opinionated webpack / react build setup",
   "scripts": {