wapplr 1.0.71 → 1.0.73
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.
|
@@ -85,7 +85,7 @@ function createServer() {
|
|
|
85
85
|
};
|
|
86
86
|
|
|
87
87
|
var intersection = a.filter(function (x) {
|
|
88
|
-
return assets.cssToInlineStyle.css.includes(x);
|
|
88
|
+
return wapp.server.config.assets.cssToInlineStyle.css.includes(x);
|
|
89
89
|
});
|
|
90
90
|
|
|
91
91
|
if (intersection.length === a.length) {
|
|
@@ -107,14 +107,14 @@ function createServer() {
|
|
|
107
107
|
}
|
|
108
108
|
}
|
|
109
109
|
});
|
|
110
|
-
assets.cssToInlineStyle.text = text;
|
|
111
|
-
assets.cssToInlineStyle.css = css;
|
|
110
|
+
wapp.server.config.assets.cssToInlineStyle.text = text;
|
|
111
|
+
wapp.server.config.assets.cssToInlineStyle.css = css;
|
|
112
112
|
}
|
|
113
113
|
}
|
|
114
114
|
}),
|
|
115
115
|
_getCss: (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, _utils.defaultDescriptor), {}, {
|
|
116
116
|
value: function value() {
|
|
117
|
-
return assets.cssToInlineStyle.
|
|
117
|
+
return wapp.server.config.assets.cssToInlineStyle.text || "";
|
|
118
118
|
}
|
|
119
119
|
}),
|
|
120
120
|
text: (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, _utils.defaultDescriptor), {}, {
|
|
@@ -180,9 +180,9 @@ function createServer() {
|
|
|
180
180
|
if (key === 'client') {
|
|
181
181
|
var files = assets.chunks[key].sort();
|
|
182
182
|
files.forEach(function (style) {
|
|
183
|
-
var
|
|
183
|
+
var _wapp$server$config$a;
|
|
184
184
|
|
|
185
|
-
if (style && style.match(".css") && chunks.indexOf(style) === -1 && !(((
|
|
185
|
+
if (style && style.match(".css") && chunks.indexOf(style) === -1 && !(((_wapp$server$config$a = wapp.server.config.assets.cssToInlineStyle.css) === null || _wapp$server$config$a === void 0 ? void 0 : _wapp$server$config$a.indexOf(style)) > -1)) {
|
|
186
186
|
chunks.push(style);
|
|
187
187
|
}
|
|
188
188
|
});
|
|
@@ -195,9 +195,9 @@ function createServer() {
|
|
|
195
195
|
if (assets) {
|
|
196
196
|
Object.keys(assets).forEach(function (key) {
|
|
197
197
|
if (key !== "chunks" && styles.indexOf(assets[key]) === -1) {
|
|
198
|
-
var
|
|
198
|
+
var _wapp$server$config$a2;
|
|
199
199
|
|
|
200
|
-
if (assets[key] && assets[key].match(".css") && !(((
|
|
200
|
+
if (assets[key] && assets[key].match(".css") && !(((_wapp$server$config$a2 = wapp.server.config.assets.cssToInlineStyle.css) === null || _wapp$server$config$a2 === void 0 ? void 0 : _wapp$server$config$a2.indexOf(assets[key])) > -1)) {
|
|
201
201
|
styles.push(assets[key]);
|
|
202
202
|
}
|
|
203
203
|
}
|
package/dist/server/html.js
CHANGED
|
@@ -108,5 +108,5 @@ function html(_ref) {
|
|
|
108
108
|
var headComponent = wapp.contents.getComponent("head");
|
|
109
109
|
var headText = headComponent ? headComponent.render(wapp) : "";
|
|
110
110
|
var htmlLang = lang.split("_")[0];
|
|
111
|
-
return "<!DOCTYPE html>\n<html lang=\"".concat(htmlLang, "\">\n <head>\n <meta charset=\"
|
|
111
|
+
return "<!DOCTYPE html>\n<html lang=\"".concat(htmlLang, "\">\n <head>\n <meta charset=\"UTF-8\">\n <title>").concat(title, "</title>\n <meta name=\"description\" content=\"").concat(description, "\">\n <meta name=\"author\" content=\"").concat(author, "\">\n <meta name=\"viewport\" content=\"").concat(viewport, "\">\n <meta name=\"theme-color\" content=\"").concat(themeColor, "\">\n <link rel=\"manifest\" href=\"").concat(manifest, "\" />\n <link rel=\"icon\" href=").concat(icon, ">\n <link rel=\"apple-touch-icon\" href=\"").concat(appleTouchIcon || icon, "\">\n ").concat(headText, "\n ").concat(styleText, "\n ").concat(cssText, "\n </head>\n <body>\n <div class=\"").concat(appStyle.app, "\" id=\"").concat(containerElementId, "\">").concat(render, "</div>\n ").concat(stateText, "\n ").concat(scriptText, "\n </body>\n</html>\n");
|
|
112
112
|
}
|