wapplr 1.0.75 → 1.0.76

package/dist/server/html.js

@@ -4,51 +4,48 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports["default"] = html;
-
 var style = require("./../common/template/app_css.js")["default"];
-
 function html(_ref) {
   var wapp = _ref.wapp,
-      req = _ref.req,
-      res = _ref.res;
+    req = _ref.req,
+    res = _ref.res;
   var config = wapp.server.config;
   var _config$siteName = config.siteName,
-      siteName = _config$siteName === void 0 ? "Wapplr" : _config$siteName,
-      _config$assets = config.assets,
-      assets = _config$assets === void 0 ? {} : _config$assets,
-      _config$lang = config.lang,
-      lang = _config$lang === void 0 ? "en_US" : _config$lang,
-      _config$viewport = config.viewport,
-      viewport = _config$viewport === void 0 ? "width=device-width, initial-scale=1" : _config$viewport,
-      _config$themeColor = config.themeColor,
-      themeColor = _config$themeColor === void 0 ? "#ffffff" : _config$themeColor,
-      _config$manifest = config.manifest,
-      manifest = _config$manifest === void 0 ? "/manifest.json" : _config$manifest,
-      _config$icon = config.icon,
-      icon = _config$icon === void 0 ? "data:image/png;base64,iVBORw0KGgo=" : _config$icon,
-      appleTouchIcon = config.appleTouchIcon,
-      _config$appStyle = config.appStyle,
-      appStyle = _config$appStyle === void 0 ? style : _config$appStyle;
+    siteName = _config$siteName === void 0 ? "Wapplr" : _config$siteName,
+    _config$assets = config.assets,
+    assets = _config$assets === void 0 ? {} : _config$assets,
+    _config$lang = config.lang,
+    lang = _config$lang === void 0 ? "en_US" : _config$lang,
+    _config$viewport = config.viewport,
+    viewport = _config$viewport === void 0 ? "width=device-width, initial-scale=1" : _config$viewport,
+    _config$themeColor = config.themeColor,
+    themeColor = _config$themeColor === void 0 ? "#ffffff" : _config$themeColor,
+    _config$manifest = config.manifest,
+    manifest = _config$manifest === void 0 ? "/manifest.json" : _config$manifest,
+    _config$icon = config.icon,
+    icon = _config$icon === void 0 ? "data:image/png;base64,iVBORw0KGgo=" : _config$icon,
+    appleTouchIcon = config.appleTouchIcon,
+    _config$appStyle = config.appStyle,
+    appStyle = _config$appStyle === void 0 ? style : _config$appStyle;
   var _res$wappResponse = res.wappResponse,
-      store = _res$wappResponse.store,
-      _res$wappResponse$con = _res$wappResponse.content,
-      content = _res$wappResponse$con === void 0 ? {} : _res$wappResponse$con,
-      _res$wappResponse$sta = _res$wappResponse.statusCode,
-      statusCode = _res$wappResponse$sta === void 0 ? 200 : _res$wappResponse$sta,
-      _res$wappResponse$con2 = _res$wappResponse.containerElementId,
-      containerElementId = _res$wappResponse$con2 === void 0 ? "app" : _res$wappResponse$con2,
-      _res$wappResponse$app = _res$wappResponse.appStateName,
-      appStateName = _res$wappResponse$app === void 0 ? "APP_STATE" : _res$wappResponse$app;
+    store = _res$wappResponse.store,
+    _res$wappResponse$con = _res$wappResponse.content,
+    content = _res$wappResponse$con === void 0 ? {} : _res$wappResponse$con,
+    _res$wappResponse$sta = _res$wappResponse.statusCode,
+    statusCode = _res$wappResponse$sta === void 0 ? 200 : _res$wappResponse$sta,
+    _res$wappResponse$con2 = _res$wappResponse.containerElementId,
+    containerElementId = _res$wappResponse$con2 === void 0 ? "app" : _res$wappResponse$con2,
+    _res$wappResponse$app = _res$wappResponse.appStateName,
+    appStateName = _res$wappResponse$app === void 0 ? "APP_STATE" : _res$wappResponse$app;
   var state = store ? store.getState() : {};
   var _content$render = content.render,
-      render = _content$render === void 0 ? "" : _content$render,
-      _content$title = content.title,
-      title = _content$title === void 0 ? "" : _content$title,
-      _content$description = content.description,
-      description = _content$description === void 0 ? "" : _content$description,
-      _content$author = content.author,
-      author = _content$author === void 0 ? "" : _content$author;
-
+    render = _content$render === void 0 ? "" : _content$render,
+    _content$title = content.title,
+    title = _content$title === void 0 ? "" : _content$title,
+    _content$description = content.description,
+    description = _content$description === void 0 ? "" : _content$description,
+    _content$author = content.author,
+    author = _content$author === void 0 ? "" : _content$author;
   if (typeof title === "function") {
     title = title({
       wapp: wapp,
@@ -56,9 +53,7 @@ function html(_ref) {
       res: res
     });
   }
-
   title = "".concat(title ? title : statusCode === 404 ? "Not Found | " + siteName : "Untitled Page | " + siteName);
-
   if (typeof description === "function") {
     description = description({
       wapp: wapp,
@@ -66,9 +61,7 @@ function html(_ref) {
       res: res
     });
   }
-
   description = description ? description : title && title.split ? title.split(" | ")[0] : title;
-
   if (typeof author === "function") {
     author = author({
       wapp: wapp,
@@ -76,9 +69,7 @@ function html(_ref) {
       res: res
     });
   }
-
   author = author || siteName;
-
   if (typeof render === "function") {
     render = render({
       wapp: wapp,
@@ -86,7 +77,6 @@ function html(_ref) {
       res: res
     });
   }
-
   wapp.styles.use(appStyle);
   var styles = wapp.styles.getCssText();
   var styleText = styles.map(function (style) {
@@ -102,7 +92,6 @@ function html(_ref) {
     if (script) {
       return "<script src=\"".concat(script, "\" ></script>");
     }
-
     return "";
   }).join(" ");
   var headComponent = wapp.contents.getComponent("head");

package/dist/server/index.js

@@ -1,32 +1,25 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault")["default"];
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.createMiddleware = createMiddleware;
 exports["default"] = _default;
 exports.run = run;
-
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
-
 var _createServer = _interopRequireDefault(require("./createServer"));
-
 var _config = _interopRequireDefault(require("./config"));
-
 // eslint-disable-next-line import/no-anonymous-default-export
 function _default() {
   var p = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
   return p.wapp || (0, _createServer["default"])((0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, (0, _config["default"])(p)), p));
 }
-
 function createMiddleware() {
   var p = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
   var wapp = p.wapp || (0, _createServer["default"])(p);
   return wapp.server.app;
 }
-
 var defaultConfig = {
   config: {
     globals: {
@@ -39,35 +32,27 @@ var defaultConfig = {
     }
   }
 };
-
 function run() {
   var _p$config;
-
   var p = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : defaultConfig;
-
   if (p !== null && p !== void 0 && (_p$config = p.config) !== null && _p$config !== void 0 && _p$config.globals && !p.config.globals.RUN) {
     var _p$config2;
-
     p.config.globals.RUN = ((_p$config2 = p.config) === null || _p$config2 === void 0 ? void 0 : _p$config2.globals.NAME) || "wapplr";
   }
-
   var _process = process,
-      env = _process.env;
+    env = _process.env;
   env.NODE_ENV = process.env.NODE_ENV;
   var wapp = (0, _createServer["default"])(p);
   var globals = wapp.globals;
   var DEV = globals.DEV;
   var app = wapp.server.app;
   wapp.server.listen();
-
   if (typeof DEV !== "undefined" && DEV && module.hot) {
     app.hot = module.hot;
     module.hot.accept("./index");
   }
-
   return wapp;
 }
-
 if (typeof RUN !== "undefined" && RUN === "wapplr") {
   run();
 }

package/dist/server/middlewares.js

@@ -1,7 +1,6 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault")["default"];
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -9,19 +8,13 @@ exports.createNotModifiedMiddleware = createNotModifiedMiddleware;
 exports.createRenderMiddleware = createRenderMiddleware;
 exports["default"] = createMiddlewares;
 exports.mimeType = void 0;
-
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
-
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
-
 var _utils = require("../common/utils");
-
 var _middlewares = _interopRequireDefault(require("../common/middlewares"));
-
 var _html2 = _interopRequireDefault(require("./html"));
-
 var _excluded = ["log"];
-var mimeType = {
+var mimeType = exports.mimeType = {
   ".ico": "image/x-icon",
   ".html": "text/html",
   ".js": "application/javascript",
@@ -45,15 +38,11 @@ var mimeType = {
   ".xml": "application/xml",
   ".map": "application/json"
 };
-exports.mimeType = mimeType;
-
 function createRenderMiddleware() {
   var p = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
   var wapp = p.wapp;
-
   function defaultRenderHandle(req, res, next) {
     var wappResponse = res.wappResponse;
-
     if (wappResponse.content && !wappResponse.content.renderType) {
       res.wappResponse.status(wappResponse.statusCode || 200);
       var render = wapp.contents.getComponent("html");
@@ -67,20 +56,17 @@ function createRenderMiddleware() {
       next();
     }
   }
-
   function defaultHandle(req, res, out) {
     if (!wapp.contents.getComponent("html")) {
       wapp.contents.addComponent({
         html: defaultRender
       });
     }
-
     var renderMiddlewares = Object.keys(renderMiddleware.handles).map(function (key) {
       return renderMiddleware.handles[key];
     });
     renderMiddlewares.sort();
     var index = 0;
-
     function next(err) {
       if (renderMiddlewares[index]) {
         var func = renderMiddlewares[index];
@@ -92,27 +78,21 @@ function createRenderMiddleware() {
         index = 0;
         return out(err);
       }
-
       return null;
     }
-
     return next();
   }
-
   var defaultRender = _html2["default"];
-
   function defaultAddHandle(obj) {
     if (typeof obj === "object" && !obj.length) {
       Object.keys(obj).forEach(function (handleName) {
         var handle = obj[handleName];
-
         if (typeof handle == "function") {
           renderMiddleware.handles[handleName] = handle;
         }
       });
     }
   }
-
   var renderMiddlewareProperties = Object.create(Object.prototype, {
     handle: (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, _utils.defaultDescriptor), {}, {
       value: defaultHandle
@@ -129,15 +109,12 @@ function createRenderMiddleware() {
       value: defaultAddHandle
     })
   });
-
   function renderMiddleware(req, res, next) {
     if (typeof renderMiddleware.handle === "function") {
       renderMiddleware.handle(req, res, next);
     }
-
     return renderMiddleware;
   }
-
   (0, _utils.mergeProperties)(renderMiddleware, renderMiddlewareProperties);
   Object.defineProperty(renderMiddleware, "wapp", (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, _utils.defaultDescriptor), {}, {
     writable: false,
@@ -146,11 +123,9 @@ function createRenderMiddleware() {
   }));
   return renderMiddleware;
 }
-
 function createNotModifiedMiddleware() {
   var p = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
   var wapp = p.wapp;
-
   function defaultIsFromCache(req, res) {
     var ifMatch = req.headers["if-match"];
     var ifUnmodifiedSince = req.headers["if-unmodified-since"];
@@ -163,19 +138,15 @@ function createNotModifiedMiddleware() {
     var isCacheable = res.wappResponse.statusCode >= 200 && res.wappResponse.statusCode < 300 || res.wappResponse.statusCode === 304;
     var noCache = cacheControl && /(?:^|,)\s*?no-cache\s*?(?:,|$)/.test(cacheControl);
     var unconditional = !ifUnmodifiedSince && !ifNoneMatch;
-
     if (unconditional || noCache || !isCacheable || !conditionalGet) {
       return false;
     }
-
     var fromCache = false;
-
     if (ifNoneMatch && ifNoneMatch !== "*" && etag) {
       var parseTokenList = function parseTokenList(str) {
         var end = 0;
         var list = [];
         var start = 0;
-
         for (var i = 0, len = str.length; i < len; i++) {
           switch (str.charCodeAt(i)) {
             case 0x20:
@@ -183,54 +154,42 @@ function createNotModifiedMiddleware() {
               if (start === end) {
                 start = end = i + 1;
               }
-
               break;
-
             case 0x2c:
               /* , */
               list.push(str.substring(start, end));
               start = end = i + 1;
               break;
-
             default:
               end = i + 1;
               break;
           }
         }
-
         list.push(str.substring(start, end));
         return list;
       };
-
       var matches = parseTokenList(ifNoneMatch);
-
       for (var i = 0; i < matches.length; i++) {
         var match = matches[i];
-
         if (match === etag || match === "W/" + etag || "W/" + match === etag) {
           fromCache = true;
           break;
         }
       }
     }
-
     if (ifModifiedSince && lastModified) {
       var parseHttpDate = function parseHttpDate(date) {
         var timestamp = date && Date.parse(date);
         return typeof timestamp === 'number' ? timestamp : NaN;
       };
-
       if (parseHttpDate(lastModified) <= parseHttpDate(ifModifiedSince)) {
         fromCache = true;
       }
     }
-
     return fromCache;
   }
-
   function defaultHandle(req, res, next) {
     var fromCache = notModifiedMiddleware.isFromCache(req, res);
-
     if (fromCache) {
       res.wappResponse.status(304);
       res.wapp.log(req, res);
@@ -239,7 +198,6 @@ function createNotModifiedMiddleware() {
       return next();
     }
   }
-
   var notModifiedMiddlewareProperties = Object.create(Object.prototype, {
     handle: (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, _utils.defaultDescriptor), {}, {
       value: defaultHandle
@@ -248,15 +206,12 @@ function createNotModifiedMiddleware() {
       value: defaultIsFromCache
     })
   });
-
   function notModifiedMiddleware(req, res, next) {
     if (typeof notModifiedMiddleware.handle === "function") {
       notModifiedMiddleware.handle(req, res, next);
     }
-
     return notModifiedMiddleware;
   }
-
   (0, _utils.mergeProperties)(notModifiedMiddleware, notModifiedMiddlewareProperties);
   Object.defineProperty(notModifiedMiddleware, "wapp", (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, _utils.defaultDescriptor), {}, {
     writable: false,
@@ -265,84 +220,70 @@ function createNotModifiedMiddleware() {
   }));
   return notModifiedMiddleware;
 }
-
 function createMiddlewares(p) {
   var _commonMiddlewares = (0, _middlewares["default"])(p),
-      log = _commonMiddlewares.log,
-      rest = (0, _objectWithoutProperties2["default"])(_commonMiddlewares, _excluded);
-
+    log = _commonMiddlewares.log,
+    rest = (0, _objectWithoutProperties2["default"])(_commonMiddlewares, _excluded);
   var wapp = p.wapp;
   var wappMiddleware = wapp.middleware;
   var notModifiedMiddleware = createNotModifiedMiddleware(p);
   wappMiddleware.addSendMiddleware({
     headers: function headers(req, res, next) {
       var _res$wappResponse$sen = res.wappResponse.sendData,
-          sendData = _res$wappResponse$sen === void 0 ? {} : _res$wappResponse$sen;
-
+        sendData = _res$wappResponse$sen === void 0 ? {} : _res$wappResponse$sen;
       if (res.setHeader) {
         var data = sendData.data,
-            _sendData$stats = sendData.stats,
-            stats = _sendData$stats === void 0 ? {} : _sendData$stats,
-            _sendData$parsedPath = sendData.parsedPath,
-            parsedPath = _sendData$parsedPath === void 0 ? {} : _sendData$parsedPath,
-            dontSetContentLength = sendData.dontSetContentLength;
+          _sendData$stats = sendData.stats,
+          stats = _sendData$stats === void 0 ? {} : _sendData$stats,
+          _sendData$parsedPath = sendData.parsedPath,
+          parsedPath = _sendData$parsedPath === void 0 ? {} : _sendData$parsedPath,
+          dontSetContentLength = sendData.dontSetContentLength;
         var _html = data;
         var _parsedPath$ext = parsedPath.ext,
-            ext = _parsedPath$ext === void 0 ? ".html" : _parsedPath$ext;
+          ext = _parsedPath$ext === void 0 ? ".html" : _parsedPath$ext;
         var charSet = sendData.charSet ? sendData.charSet : ext === '.html' ? 'utf-8' : '';
         var mtime = stats.mtime;
-
         if (!res.getHeader("Accept-Ranges")) {
           res.setHeader("Accept-Ranges", "bytes");
         }
-
         if (!res.getHeader("Content-Type")) {
           res.setHeader("Content-Type", [mimeType[ext] || "text/plain", charSet ? 'charset=' + charSet : ''].filter(function (t) {
             return t;
           }).join('; '));
         }
-
         if (!res.getHeader("Content-Length") && !dontSetContentLength) {
           res.setHeader("Content-Length", Buffer.byteLength(_html));
         }
-
         if (!res.getHeader("Last-Modified") && mtime) {
           res.setHeader("Last-Modified", mtime.toUTCString());
         }
-
         if (!res.getHeader("Cache-Control")) {
           res.setHeader("Cache-Control", "public, max-age=0");
         }
-
         if (!res.getHeader("X-Powered-By")) {
           res.setHeader("X-Powered-By", "Wapplr");
         }
       }
-
       return next();
     },
     etag: function etag(req, res, next) {
       var _res$wappResponse$sen2 = res.wappResponse.sendData,
-          sendData = _res$wappResponse$sen2 === void 0 ? {} : _res$wappResponse$sen2;
-
+        sendData = _res$wappResponse$sen2 === void 0 ? {} : _res$wappResponse$sen2;
       if (res.setHeader) {
         var _sendData$stats2 = sendData.stats,
-            stats = _sendData$stats2 === void 0 ? {} : _sendData$stats2;
+          stats = _sendData$stats2 === void 0 ? {} : _sendData$stats2;
         var mtime = stats.mtime,
-            size = stats.size;
-
+          size = stats.size;
         if (!res.getHeader("ETag") && mtime && size) {
           var etag = "W/\"".concat(size.toString(16), "-").concat(mtime.getTime().toString(16), "\"");
           res.setHeader("ETag", etag);
         }
       }
-
       return next();
     },
     notModified: function notModified(req, res, next) {
       if (res.setHeader) {
         var fromCache = notModifiedMiddleware.isFromCache(req, res);
-
         if (fromCache) {
           res.wappResponse.status(304);
           res.wapp.log(req, res);
@@ -350,7 +291,6 @@ function createMiddlewares(p) {
           return;
         }
       }
-
       return next();
     }
   });

package/dist/server/static.js

@@ -6,16 +6,12 @@ Object.defineProperty(exports, "__esModule", {
 exports.addCloseEventsForReadableStream = addCloseEventsForReadableStream;
 exports["default"] = serveStatic;
 exports.endStream = endStream;
-
 var fs = require("fs");
-
 var path = require("path");
-
 function destroy(stream) {
   if (!(stream !== null && stream !== void 0 && stream.__destroyed)) {
     stream.destroy();
     stream.__destroyed = true;
-
     if (typeof stream.close === "function") {
       stream.on("open", function onOpenClose() {
         if (typeof this.fd === "number") {
@@ -24,68 +20,52 @@ function destroy(stream) {
       });
     }
   }
-
   return stream;
 }
-
 function onFinished(req, res, callback) {
   function isFinishedResponse() {
     var socket = res.socket;
-
     if (typeof res.finished === "boolean") {
       return Boolean(res.finished || res.writableEnded || socket && !socket.writable);
     }
   }
-
   function isFinishedRequest() {
     var socket = req.socket;
-
     if (typeof req.complete === "boolean") {
       return Boolean(req.upgrade || !socket || !socket.readable || req.complete && !req.readable);
     }
   }
-
   function removeListener() {
     if (req.__onFinishedInterval) {
       clearInterval(req.__onFinishedInterval);
       req.__onFinishedInterval = 0;
     }
-
     if (res.__onFinishedInterval) {
       clearInterval(res.__onFinishedInterval);
       res.__onFinishedInterval = 0;
     }
   }
-
   function listener() {
     var result = isFinishedRequest() || isFinishedResponse();
-
     if (result) {
       removeListener();
       callback();
     }
   }
-
   req.__onFinishedInterval = res.__onFinishedInterval = setInterval(listener, 100);
   req.__onFinishedRemoveListener = res.__onFinishedRemoveListener = removeListener;
 }
-
 function endStream(req, res, stream) {
   if (req.__onFinishedRemoveListener) {
     req.__onFinishedRemoveListener();
-
     req.__onFinishedRemoveListener = null;
   }
-
   if (res.__onFinishedRemoveListener) {
     res.__onFinishedRemoveListener();
-
     res.__onFinishedRemoveListener = null;
   }
-
   destroy(stream);
 }
-
 function addCloseEventsForReadableStream(req, res, stream) {
   req.on("close", function () {
     endStream(req, res, stream);
@@ -100,28 +80,22 @@ function addCloseEventsForReadableStream(req, res, stream) {
     endStream(req, res, stream);
   });
 }
-
 function serveStatic(publicPath) {
   return function staticMiddleware(req, res, next) {
     var parsedUrl = {
       pathname: req.wappRequest.path
     };
-
     try {
       parsedUrl = new URL(req.wappRequest.url);
     } catch (e) {}
-
     var sanitizePath = path.normalize(parsedUrl.pathname).replace(/^(\.\.[\/\\])+/, "");
     var pathname = path.join(publicPath, sanitizePath);
     var parsedSanitizePath = path.parse(pathname);
     var ext = parsedSanitizePath.ext;
-
     if (!fs.existsSync(pathname) || !ext) {
       return next();
     }
-
     var stream;
-
     try {
       var data = fs.readFileSync(pathname);
       var stats = fs.statSync(pathname);

package/package.json

@@ -22,7 +22,7 @@
     "files": [
         "dist/*"
     ],
-    "version": "1.0.75",
+    "version": "1.0.76",
     "main": "dist/server",
     "browser": "dist/client",
     "repository": {