wapplr 1.0.75 → 1.0.77
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.
- package/dist/client/app.js +183 -243
- package/dist/client/config.js +1 -5
- package/dist/client/createClient.js +88 -134
- package/dist/client/history.js +10 -39
- package/dist/client/index.js +0 -15
- package/dist/client/middlewares.js +93 -168
- package/dist/common/config.js +1 -4
- package/dist/common/contents.js +91 -142
- package/dist/common/index.js +7 -18
- package/dist/common/log/index.js +27 -48
- package/dist/common/log/renderedContent.js +57 -70
- package/dist/common/logo/index.js +0 -2
- package/dist/common/middlewares.js +7 -61
- package/dist/common/requests.js +98 -143
- package/dist/common/router.js +97 -162
- package/dist/common/states.js +7 -68
- package/dist/common/styles.js +6 -51
- package/dist/common/template/index.js +19 -24
- package/dist/common/template/template_css.js +1 -1
- package/dist/common/utils.js +4 -18
- package/dist/server/app.js +151 -217
- package/dist/server/config.js +1 -13
- package/dist/server/createServer.js +110 -197
- package/dist/server/html.js +34 -45
- package/dist/server/index.js +1 -16
- package/dist/server/middlewares.js +13 -73
- package/dist/server/static.js +0 -26
- package/package.json +1 -1
package/dist/common/states.js
CHANGED
|
@@ -1,21 +1,15 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
3
|
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault")["default"];
|
|
4
|
-
|
|
5
4
|
Object.defineProperty(exports, "__esModule", {
|
|
6
5
|
value: true
|
|
7
6
|
});
|
|
8
7
|
exports.createDefaultStateManager = createDefaultStateManager;
|
|
9
8
|
exports["default"] = createStates;
|
|
10
|
-
|
|
11
9
|
var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
|
|
12
|
-
|
|
13
10
|
var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
|
|
14
|
-
|
|
15
11
|
var _objectSpread6 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
|
|
16
|
-
|
|
17
12
|
var _utils = require("./utils");
|
|
18
|
-
|
|
19
13
|
function createDefaultStateManager() {
|
|
20
14
|
var p = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
|
|
21
15
|
var wapp = p.wapp;
|
|
@@ -24,11 +18,9 @@ function createDefaultStateManager() {
|
|
|
24
18
|
value: function value() {
|
|
25
19
|
var state = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
|
|
26
20
|
var action = arguments.length > 1 ? arguments[1] : undefined;
|
|
27
|
-
|
|
28
21
|
switch (action.type) {
|
|
29
22
|
case "SET_REQ":
|
|
30
23
|
return (0, _objectSpread6["default"])((0, _objectSpread6["default"])({}, state), {}, (0, _defineProperty2["default"])({}, action.payload.name, action.payload.value && typeof action.payload.value == "object" ? (0, _utils.copyObject)(action.payload.value) : action.payload.value));
|
|
31
|
-
|
|
32
24
|
default:
|
|
33
25
|
return state;
|
|
34
26
|
}
|
|
@@ -38,18 +30,14 @@ function createDefaultStateManager() {
|
|
|
38
30
|
value: function value() {
|
|
39
31
|
var state = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
|
|
40
32
|
var action = arguments.length > 1 ? arguments[1] : undefined;
|
|
41
|
-
|
|
42
33
|
switch (action.type) {
|
|
43
34
|
case "SET_RES":
|
|
44
35
|
return (0, _objectSpread6["default"])((0, _objectSpread6["default"])({}, state), {}, (0, _defineProperty2["default"])({}, action.payload.name, action.payload.value && typeof action.payload.value == "object" ? (0, _utils.copyObject)(action.payload.value) : action.payload.value));
|
|
45
|
-
|
|
46
36
|
case "INS_RES":
|
|
47
37
|
if (typeof action.payload.value === "object" && action.payload.value && typeof state[action.payload.name] === "object" && state[action.payload.name]) {
|
|
48
38
|
return (0, _objectSpread6["default"])((0, _objectSpread6["default"])({}, state), {}, (0, _defineProperty2["default"])({}, action.payload.name, (0, _objectSpread6["default"])((0, _objectSpread6["default"])({}, state[action.payload.name]), (0, _utils.copyObject)(action.payload.value))));
|
|
49
39
|
}
|
|
50
|
-
|
|
51
40
|
return (0, _objectSpread6["default"])((0, _objectSpread6["default"])({}, state), {}, (0, _defineProperty2["default"])({}, action.payload.name, action.payload.value && typeof action.payload.value == "object" ? (0, _utils.copyObject)(action.payload.value) : action.payload.value));
|
|
52
|
-
|
|
53
41
|
default:
|
|
54
42
|
return state;
|
|
55
43
|
}
|
|
@@ -60,7 +48,7 @@ function createDefaultStateManager() {
|
|
|
60
48
|
req: (0, _objectSpread6["default"])((0, _objectSpread6["default"])({}, _utils.defaultDescriptor), {}, {
|
|
61
49
|
value: function value(_ref) {
|
|
62
50
|
var name = _ref.name,
|
|
63
|
-
|
|
51
|
+
_value = _ref.value;
|
|
64
52
|
return {
|
|
65
53
|
type: "SET_REQ",
|
|
66
54
|
payload: {
|
|
@@ -73,8 +61,8 @@ function createDefaultStateManager() {
|
|
|
73
61
|
res: (0, _objectSpread6["default"])((0, _objectSpread6["default"])({}, _utils.defaultDescriptor), {}, {
|
|
74
62
|
value: function value(_ref2) {
|
|
75
63
|
var type = _ref2.type,
|
|
76
|
-
|
|
77
|
-
|
|
64
|
+
name = _ref2.name,
|
|
65
|
+
_value2 = _ref2.value;
|
|
78
66
|
return {
|
|
79
67
|
type: type || "SET_RES",
|
|
80
68
|
payload: {
|
|
@@ -85,14 +73,12 @@ function createDefaultStateManager() {
|
|
|
85
73
|
}
|
|
86
74
|
})
|
|
87
75
|
});
|
|
88
|
-
|
|
89
76
|
var defaultRootReducer = function defaultRootReducer(newState, action) {
|
|
90
77
|
Object.keys(stateManager.reducers).forEach(function (key) {
|
|
91
78
|
newState[key] = stateManager.reducers[key](newState[key], action);
|
|
92
79
|
});
|
|
93
80
|
return newState;
|
|
94
81
|
};
|
|
95
|
-
|
|
96
82
|
function createStore() {
|
|
97
83
|
var rootReducer = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : defaultRootReducer;
|
|
98
84
|
var initialState = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
|
|
@@ -104,28 +90,23 @@ function createDefaultStateManager() {
|
|
|
104
90
|
return {
|
|
105
91
|
getState: function getState(p) {
|
|
106
92
|
var keys = p && typeof p == "string" ? p : p && typeof p == "object" && typeof p.keys == "string" ? p.keys : "";
|
|
107
|
-
|
|
108
93
|
if (keys) {
|
|
109
94
|
var find = function find(keys, o) {
|
|
110
95
|
var i = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 0;
|
|
111
|
-
|
|
112
96
|
if (keys[i + 1] && keys[i] && o[keys[i]] && typeof o[keys[i]] == "object") {
|
|
113
97
|
find(keys, o[keys[i]], i + 1);
|
|
114
98
|
} else if (!keys[i + 1] && typeof o[keys[i]] !== "undefined") {
|
|
115
99
|
found = o[keys[i]];
|
|
116
100
|
}
|
|
117
101
|
};
|
|
118
|
-
|
|
119
102
|
var found;
|
|
120
103
|
find(keys.split("."), state);
|
|
121
104
|
return typeof found === "object" && found ? (0, _utils.copyObject)(found) : found;
|
|
122
105
|
}
|
|
123
|
-
|
|
124
106
|
try {
|
|
125
107
|
if (!cachedString) {
|
|
126
108
|
cachedString = JSON.stringify(state);
|
|
127
109
|
}
|
|
128
|
-
|
|
129
110
|
return JSON.parse(cachedString);
|
|
130
111
|
} catch (e) {
|
|
131
112
|
console.log(e);
|
|
@@ -143,9 +124,7 @@ function createDefaultStateManager() {
|
|
|
143
124
|
} catch (e) {
|
|
144
125
|
console.log(e);
|
|
145
126
|
}
|
|
146
|
-
|
|
147
127
|
cachedString = "";
|
|
148
|
-
|
|
149
128
|
try {
|
|
150
129
|
stateManager.runListeners(action);
|
|
151
130
|
} catch (e) {
|
|
@@ -157,27 +136,23 @@ function createDefaultStateManager() {
|
|
|
157
136
|
}
|
|
158
137
|
};
|
|
159
138
|
}
|
|
160
|
-
|
|
161
139
|
function defaultAddListener(listener) {
|
|
162
140
|
stateManager.listeners.push(listener);
|
|
163
141
|
return function unsubscribe() {
|
|
164
142
|
stateManager.removeListener(listener);
|
|
165
143
|
};
|
|
166
144
|
}
|
|
167
|
-
|
|
168
145
|
function defaultRemoveListener(listener) {
|
|
169
146
|
if (stateManager.listeners.indexOf(listener) !== -1) {
|
|
170
147
|
stateManager.listeners.splice(stateManager.listeners.indexOf(listener), 1);
|
|
171
148
|
}
|
|
172
149
|
}
|
|
173
|
-
|
|
174
150
|
function defaultRunListeners(action) {
|
|
175
151
|
var listeners = (0, _toConsumableArray2["default"])(stateManager.listeners);
|
|
176
152
|
listeners.forEach(function (listener) {
|
|
177
153
|
listener(action);
|
|
178
154
|
});
|
|
179
155
|
}
|
|
180
|
-
|
|
181
156
|
var stateManager = Object.create(Object.prototype, {
|
|
182
157
|
wapp: (0, _objectSpread6["default"])((0, _objectSpread6["default"])({}, _utils.defaultDescriptor), {}, {
|
|
183
158
|
writable: false,
|
|
@@ -215,25 +190,24 @@ function createDefaultStateManager() {
|
|
|
215
190
|
});
|
|
216
191
|
return stateManager;
|
|
217
192
|
}
|
|
218
|
-
|
|
219
193
|
function createStates() {
|
|
220
194
|
var p = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
|
|
221
195
|
var wapp = p.wapp,
|
|
222
|
-
|
|
223
|
-
|
|
224
|
-
|
|
196
|
+
_p$stateManager = p.stateManager,
|
|
197
|
+
stateManager = _p$stateManager === void 0 ? createDefaultStateManager(p) : _p$stateManager;
|
|
225
198
|
function addSomePropertyToClientAppFromInitialState(req, res, next) {
|
|
226
199
|
// the client can't set this properties from the window location,
|
|
227
200
|
// so if the server sent these data, then these are setting here to app.req and wappRequest:
|
|
228
201
|
// method, httpVersion, remoteAddress
|
|
202
|
+
|
|
229
203
|
// req.timestamp, res.statusCode, statusMessage, errorMessage will update in every client side update,
|
|
230
204
|
// but the first render need this data from the server
|
|
205
|
+
|
|
231
206
|
if (wapp.target === "web") {
|
|
232
207
|
var wappResponse = res.wappResponse;
|
|
233
208
|
var wappRequest = req.wappRequest;
|
|
234
209
|
var appStateName = wappResponse.appStateName;
|
|
235
210
|
var initialState = window[appStateName];
|
|
236
|
-
|
|
237
211
|
if (initialState) {
|
|
238
212
|
var reqFromState = initialState.req || {};
|
|
239
213
|
var resFromState = initialState.res || {};
|
|
@@ -243,7 +217,6 @@ function createStates() {
|
|
|
243
217
|
wappRequest.method = req.method;
|
|
244
218
|
wappRequest.httpVersion = req.httpVersion;
|
|
245
219
|
wappRequest.remoteAddress = req.remoteAddress;
|
|
246
|
-
|
|
247
220
|
if (statesMiddleware.shouldInitializedStore) {
|
|
248
221
|
req.timestamp = reqFromState.timestamp || req.timestamp;
|
|
249
222
|
wappRequest.timestamp = req.timestamp;
|
|
@@ -256,12 +229,9 @@ function createStates() {
|
|
|
256
229
|
}
|
|
257
230
|
}
|
|
258
231
|
}
|
|
259
|
-
|
|
260
232
|
next();
|
|
261
233
|
}
|
|
262
|
-
|
|
263
234
|
var lastStoreForClient = null;
|
|
264
|
-
|
|
265
235
|
function defaultStatesForReqRes(req, res, next) {
|
|
266
236
|
var wappRequest = req.wappRequest;
|
|
267
237
|
var wappResponse = res.wappResponse;
|
|
@@ -305,7 +275,6 @@ function createStates() {
|
|
|
305
275
|
};
|
|
306
276
|
var init = statesMiddleware.shouldInitializedStore;
|
|
307
277
|
var store = init ? wapp.states.stateManager.createStore(wapp.states.stateManager.rootReducer, initState) : wappResponse.store;
|
|
308
|
-
|
|
309
278
|
if (init) {
|
|
310
279
|
Object.defineProperty(wappResponse, "store", {
|
|
311
280
|
writable: true,
|
|
@@ -313,12 +282,10 @@ function createStates() {
|
|
|
313
282
|
configurable: false,
|
|
314
283
|
value: store
|
|
315
284
|
});
|
|
316
|
-
|
|
317
285
|
if (wapp.target === "web") {
|
|
318
286
|
lastStoreForClient = wappResponse.store;
|
|
319
287
|
}
|
|
320
288
|
}
|
|
321
|
-
|
|
322
289
|
if (!init || init && initState.req.timestamp !== timestamp) {
|
|
323
290
|
if (store.getState("req.timestamp") !== timestamp) {
|
|
324
291
|
wappResponse.store.dispatch(wapp.states.runAction("req", {
|
|
@@ -327,7 +294,6 @@ function createStates() {
|
|
|
327
294
|
}));
|
|
328
295
|
}
|
|
329
296
|
}
|
|
330
|
-
|
|
331
297
|
if (!init || init && initState.req.path !== path) {
|
|
332
298
|
if (store.getState("req.path") !== path) {
|
|
333
299
|
wappResponse.store.dispatch(wapp.states.runAction("req", {
|
|
@@ -336,7 +302,6 @@ function createStates() {
|
|
|
336
302
|
}));
|
|
337
303
|
}
|
|
338
304
|
}
|
|
339
|
-
|
|
340
305
|
if (!init || init && initState.req.url !== url) {
|
|
341
306
|
if (store.getState("req.url") !== url) {
|
|
342
307
|
wappResponse.store.dispatch(wapp.states.runAction("req", {
|
|
@@ -345,7 +310,6 @@ function createStates() {
|
|
|
345
310
|
}));
|
|
346
311
|
}
|
|
347
312
|
}
|
|
348
|
-
|
|
349
313
|
if (!init || init && initState.req.method !== method) {
|
|
350
314
|
if (store.getState("req.method") !== method) {
|
|
351
315
|
wappResponse.store.dispatch(wapp.states.runAction("req", {
|
|
@@ -354,7 +318,6 @@ function createStates() {
|
|
|
354
318
|
}));
|
|
355
319
|
}
|
|
356
320
|
}
|
|
357
|
-
|
|
358
321
|
if (!init || init && initState.req.httpVersion !== httpVersion) {
|
|
359
322
|
if (store.getState("req.httpVersion") !== httpVersion) {
|
|
360
323
|
wappResponse.store.dispatch(wapp.states.runAction("req", {
|
|
@@ -363,7 +326,6 @@ function createStates() {
|
|
|
363
326
|
}));
|
|
364
327
|
}
|
|
365
328
|
}
|
|
366
|
-
|
|
367
329
|
if (!init || init && initState.req.hostname !== hostname) {
|
|
368
330
|
if (store.getState("req.hostname") !== hostname) {
|
|
369
331
|
wappResponse.store.dispatch(wapp.states.runAction("req", {
|
|
@@ -372,7 +334,6 @@ function createStates() {
|
|
|
372
334
|
}));
|
|
373
335
|
}
|
|
374
336
|
}
|
|
375
|
-
|
|
376
337
|
if (!init || init && initState.req.protocol !== protocol) {
|
|
377
338
|
if (store.getState("req.protocol") !== protocol) {
|
|
378
339
|
wappResponse.store.dispatch(wapp.states.runAction("req", {
|
|
@@ -381,7 +342,6 @@ function createStates() {
|
|
|
381
342
|
}));
|
|
382
343
|
}
|
|
383
344
|
}
|
|
384
|
-
|
|
385
345
|
if (!init || init && initState.req.secure !== secure) {
|
|
386
346
|
if (store.getState("req.secure") !== secure) {
|
|
387
347
|
wappResponse.store.dispatch(wapp.states.runAction("req", {
|
|
@@ -390,7 +350,6 @@ function createStates() {
|
|
|
390
350
|
}));
|
|
391
351
|
}
|
|
392
352
|
}
|
|
393
|
-
|
|
394
353
|
if (!init || init && initState.req.remoteAddress !== remoteAddress) {
|
|
395
354
|
if (store.getState("req.remoteAddress") !== remoteAddress) {
|
|
396
355
|
wappResponse.store.dispatch(wapp.states.runAction("req", {
|
|
@@ -399,7 +358,6 @@ function createStates() {
|
|
|
399
358
|
}));
|
|
400
359
|
}
|
|
401
360
|
}
|
|
402
|
-
|
|
403
361
|
if (!init || init && initState.req.userAgent !== userAgent) {
|
|
404
362
|
if (store.getState("req.userAgent") !== userAgent) {
|
|
405
363
|
wappResponse.store.dispatch(wapp.states.runAction("req", {
|
|
@@ -408,7 +366,6 @@ function createStates() {
|
|
|
408
366
|
}));
|
|
409
367
|
}
|
|
410
368
|
}
|
|
411
|
-
|
|
412
369
|
if (!init || init && initState.req.query !== query) {
|
|
413
370
|
if (store.getState("req.query") !== query) {
|
|
414
371
|
wappResponse.store.dispatch(wapp.states.runAction("req", {
|
|
@@ -417,7 +374,6 @@ function createStates() {
|
|
|
417
374
|
}));
|
|
418
375
|
}
|
|
419
376
|
}
|
|
420
|
-
|
|
421
377
|
if (!init || init && initState.res.statusCode !== statusCode) {
|
|
422
378
|
if (store.getState("res.statusCode") !== statusCode) {
|
|
423
379
|
wappResponse.store.dispatch(wapp.states.runAction("res", {
|
|
@@ -426,7 +382,6 @@ function createStates() {
|
|
|
426
382
|
}));
|
|
427
383
|
}
|
|
428
384
|
}
|
|
429
|
-
|
|
430
385
|
if (!init || init && initState.res.statusMessage !== statusMessage) {
|
|
431
386
|
if (store.getState("res.statusMessage") !== statusMessage) {
|
|
432
387
|
wappResponse.store.dispatch(wapp.states.runAction("res", {
|
|
@@ -435,7 +390,6 @@ function createStates() {
|
|
|
435
390
|
}));
|
|
436
391
|
}
|
|
437
392
|
}
|
|
438
|
-
|
|
439
393
|
if (!init || init && initState.res.errorMessage !== errorMessage) {
|
|
440
394
|
if (store.getState("res.errorMessage") !== errorMessage) {
|
|
441
395
|
wappResponse.store.dispatch(wapp.states.runAction("res", {
|
|
@@ -444,7 +398,6 @@ function createStates() {
|
|
|
444
398
|
}));
|
|
445
399
|
}
|
|
446
400
|
}
|
|
447
|
-
|
|
448
401
|
if (!init || init && initState.res.appStateName !== appStateName) {
|
|
449
402
|
if (store.getState("res.appStateName") !== appStateName) {
|
|
450
403
|
wappResponse.store.dispatch(wapp.states.runAction("res", {
|
|
@@ -453,7 +406,6 @@ function createStates() {
|
|
|
453
406
|
}));
|
|
454
407
|
}
|
|
455
408
|
}
|
|
456
|
-
|
|
457
409
|
if (!init || init && initState.res.containerElementId !== containerElementId) {
|
|
458
410
|
if (store.getState("res.containerElementId") !== containerElementId) {
|
|
459
411
|
wappResponse.store.dispatch(wapp.states.runAction("res", {
|
|
@@ -462,16 +414,13 @@ function createStates() {
|
|
|
462
414
|
}));
|
|
463
415
|
}
|
|
464
416
|
}
|
|
465
|
-
|
|
466
417
|
next();
|
|
467
418
|
}
|
|
468
|
-
|
|
469
419
|
function defaultHandle(req, res, out) {
|
|
470
420
|
var statesMiddlewares = Object.keys(statesMiddleware.handles).sort().map(function (key) {
|
|
471
421
|
return statesMiddleware.handles[key];
|
|
472
422
|
});
|
|
473
423
|
var index = 0;
|
|
474
|
-
|
|
475
424
|
function next(err) {
|
|
476
425
|
if (statesMiddlewares[index]) {
|
|
477
426
|
var func = statesMiddlewares[index];
|
|
@@ -483,29 +432,23 @@ function createStates() {
|
|
|
483
432
|
index = 0;
|
|
484
433
|
return out(err);
|
|
485
434
|
}
|
|
486
|
-
|
|
487
435
|
return null;
|
|
488
436
|
}
|
|
489
|
-
|
|
490
437
|
return next();
|
|
491
438
|
}
|
|
492
|
-
|
|
493
439
|
function defaultAddHandle(obj) {
|
|
494
440
|
if (typeof obj === "object" && !obj.length) {
|
|
495
441
|
Object.keys(obj).forEach(function (handleName) {
|
|
496
442
|
var handle = obj[handleName];
|
|
497
|
-
|
|
498
443
|
if (typeof handle == "function") {
|
|
499
444
|
statesMiddleware.handles[handleName] = handle;
|
|
500
445
|
}
|
|
501
446
|
});
|
|
502
447
|
}
|
|
503
448
|
}
|
|
504
|
-
|
|
505
449
|
function defaultRunAction(actionName, props) {
|
|
506
450
|
return statesMiddleware.stateManager.actions[actionName](props);
|
|
507
451
|
}
|
|
508
|
-
|
|
509
452
|
var statesMiddlewareProperties = Object.create(Object.prototype, {
|
|
510
453
|
handle: (0, _objectSpread6["default"])((0, _objectSpread6["default"])({}, _utils.defaultDescriptor), {}, {
|
|
511
454
|
value: defaultHandle
|
|
@@ -529,23 +472,19 @@ function createStates() {
|
|
|
529
472
|
value: false
|
|
530
473
|
})
|
|
531
474
|
});
|
|
532
|
-
|
|
533
475
|
function statesMiddleware(req, res, out) {
|
|
534
476
|
if (typeof statesMiddleware.handle === "function") {
|
|
535
477
|
if (!res.wappResponse.store && wapp.target === "web" && lastStoreForClient) {
|
|
536
478
|
res.wappResponse.store = lastStoreForClient;
|
|
537
479
|
}
|
|
538
|
-
|
|
539
480
|
statesMiddleware.shouldInitializedStore = wapp.target === "node" || !res.wappResponse.store;
|
|
540
481
|
statesMiddleware.handle(req, res, function next() {
|
|
541
482
|
statesMiddleware.shouldInitializedStore = wapp.target === "node" || !res.wappResponse.store;
|
|
542
483
|
out();
|
|
543
484
|
});
|
|
544
485
|
}
|
|
545
|
-
|
|
546
486
|
return statesMiddleware;
|
|
547
487
|
}
|
|
548
|
-
|
|
549
488
|
(0, _utils.mergeProperties)(statesMiddleware, statesMiddlewareProperties);
|
|
550
489
|
Object.defineProperty(statesMiddleware, "wapp", (0, _objectSpread6["default"])((0, _objectSpread6["default"])({}, _utils.defaultDescriptor), {}, {
|
|
551
490
|
writable: false,
|
package/dist/common/styles.js
CHANGED
|
@@ -1,101 +1,79 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
3
|
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault")["default"];
|
|
4
|
-
|
|
5
4
|
Object.defineProperty(exports, "__esModule", {
|
|
6
5
|
value: true
|
|
7
6
|
});
|
|
8
7
|
exports.createDefaultStyleManager = createDefaultStyleManager;
|
|
9
8
|
exports["default"] = createStyleManager;
|
|
10
|
-
|
|
11
9
|
var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
|
|
12
|
-
|
|
13
10
|
var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
|
|
14
|
-
|
|
15
11
|
var _utils = require("./utils");
|
|
16
|
-
|
|
17
12
|
function createDefaultStyleManager() {
|
|
18
13
|
var p = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
|
|
19
14
|
var wapp = p.wapp;
|
|
20
15
|
var lastStyleElemId = null;
|
|
21
|
-
|
|
22
16
|
function defaultInsertCss(css, moduleId) {
|
|
23
17
|
var _targetObject$config;
|
|
24
|
-
|
|
25
18
|
var targetObject = wapp.getTargetObject ? wapp.getTargetObject() : wapp;
|
|
26
19
|
var stylesConfig = ((_targetObject$config = targetObject.config) === null || _targetObject$config === void 0 ? void 0 : _targetObject$config.styles) || {};
|
|
27
20
|
var _stylesConfig$styleId = stylesConfig.styleIdPrefix,
|
|
28
|
-
|
|
21
|
+
styleIdPrefix = _stylesConfig$styleId === void 0 ? "s" : _stylesConfig$styleId;
|
|
29
22
|
var id = "".concat(styleIdPrefix).concat(moduleId);
|
|
30
23
|
var elem = document.getElementById(id);
|
|
31
24
|
var create = false;
|
|
32
|
-
|
|
33
25
|
if (!elem) {
|
|
34
26
|
create = true;
|
|
35
27
|
elem = document.createElement("style");
|
|
36
28
|
elem.setAttribute("type", "text/css");
|
|
37
29
|
elem.id = id;
|
|
38
30
|
}
|
|
39
|
-
|
|
40
31
|
var cssText = css;
|
|
41
|
-
|
|
42
32
|
if ("textContent" in elem) {
|
|
43
33
|
elem.textContent = cssText;
|
|
44
34
|
} else {
|
|
45
35
|
elem.styleSheet.cssText = cssText;
|
|
46
36
|
}
|
|
47
|
-
|
|
48
37
|
if (create) {
|
|
49
38
|
if (lastStyleElemId && document.getElementById(lastStyleElemId)) {
|
|
50
39
|
document.head.insertBefore(elem, document.getElementById(lastStyleElemId));
|
|
51
40
|
} else {
|
|
52
41
|
document.head.appendChild(elem);
|
|
53
42
|
}
|
|
54
|
-
|
|
55
43
|
lastStyleElemId = id;
|
|
56
44
|
}
|
|
57
|
-
|
|
58
45
|
return function remove() {
|
|
59
46
|
var elem = document.getElementById(id);
|
|
60
|
-
|
|
61
47
|
if (elem) {
|
|
62
48
|
elem.parentNode.removeChild(elem);
|
|
63
49
|
}
|
|
64
50
|
};
|
|
65
51
|
}
|
|
66
|
-
|
|
67
52
|
function defaultAdd(style) {
|
|
68
53
|
var cssText = style._getCss ? style._getCss() : '';
|
|
69
|
-
|
|
70
54
|
style._insertCss = function _insertCss() {
|
|
71
55
|
var insertCss = styleManager.insertCss;
|
|
72
56
|
var moduleId = style._module && style._module.id ? style._module.id : "";
|
|
73
57
|
return insertCss(cssText, moduleId);
|
|
74
58
|
};
|
|
75
|
-
|
|
76
59
|
if (style._module && style._module.hot && wapp.getTargetObject().hot) {
|
|
77
60
|
wapp.getTargetObject().hot.accept(style._module.id);
|
|
78
61
|
}
|
|
79
|
-
|
|
80
62
|
var css = styleManager.css;
|
|
81
63
|
var tempLength = css.size;
|
|
82
64
|
var duplicates = false;
|
|
83
65
|
css.add(style);
|
|
84
|
-
|
|
85
66
|
if (tempLength === css.size) {
|
|
86
67
|
duplicates = true;
|
|
87
68
|
}
|
|
88
|
-
|
|
89
69
|
if (!duplicates) {
|
|
90
70
|
if (typeof window !== "undefined") {
|
|
91
71
|
var removeCssFunction = style._insertCss();
|
|
92
|
-
|
|
93
72
|
style._remove = function _remove() {
|
|
94
73
|
removeCssFunction();
|
|
95
74
|
css["delete"](style);
|
|
96
75
|
styleManager.removeCss["delete"](style._remove);
|
|
97
76
|
};
|
|
98
|
-
|
|
99
77
|
styleManager.removeCss.add(style._remove);
|
|
100
78
|
return style._remove;
|
|
101
79
|
} else {
|
|
@@ -103,38 +81,30 @@ function createDefaultStyleManager() {
|
|
|
103
81
|
css["delete"](style);
|
|
104
82
|
styleManager.removeCss["delete"](style._remove);
|
|
105
83
|
};
|
|
106
|
-
|
|
107
84
|
styleManager.removeCss.add(style._remove);
|
|
108
85
|
return style._remove;
|
|
109
86
|
}
|
|
110
87
|
} else {
|
|
111
|
-
style._remove = function () {
|
|
112
|
-
/*fake remove*/
|
|
113
|
-
};
|
|
114
|
-
|
|
88
|
+
style._remove = function () {/*fake remove*/};
|
|
115
89
|
return style._remove;
|
|
116
90
|
}
|
|
117
91
|
}
|
|
118
|
-
|
|
119
92
|
function defaultGetCssText() {
|
|
120
93
|
var globals = wapp.globals || {};
|
|
121
94
|
var _globals$WAPP = globals.WAPP,
|
|
122
|
-
|
|
123
|
-
|
|
95
|
+
WAPP = _globals$WAPP === void 0 ? "buildHash" : _globals$WAPP,
|
|
96
|
+
DEV = globals.DEV;
|
|
124
97
|
var cssText = (0, _toConsumableArray2["default"])(styleManager.css).map(function (style) {
|
|
125
98
|
return style._getCss ? style._getCss() : '';
|
|
126
99
|
}).join("");
|
|
127
|
-
|
|
128
100
|
if (!DEV) {
|
|
129
101
|
cssText = cssText.replace(/(\r\n|\n|\r)/gm, " ").replace(/\s+/gm, " ");
|
|
130
102
|
}
|
|
131
|
-
|
|
132
103
|
return [{
|
|
133
104
|
id: "css_" + WAPP,
|
|
134
105
|
cssText: cssText
|
|
135
106
|
}];
|
|
136
107
|
}
|
|
137
|
-
|
|
138
108
|
function defaultClear() {
|
|
139
109
|
(0, _toConsumableArray2["default"])(styleManager.removeCss).forEach(function (remove) {
|
|
140
110
|
remove();
|
|
@@ -142,12 +112,10 @@ function createDefaultStyleManager() {
|
|
|
142
112
|
styleManager.removeCss = new Set();
|
|
143
113
|
styleManager.css = new Set();
|
|
144
114
|
}
|
|
145
|
-
|
|
146
115
|
function defaultUse(styles) {
|
|
147
116
|
var add = styleManager.add;
|
|
148
117
|
return add(styles);
|
|
149
118
|
}
|
|
150
|
-
|
|
151
119
|
var defaultCss = new Set();
|
|
152
120
|
var defaultRemoveCss = new Set();
|
|
153
121
|
var styleManager = Object.create(Object.prototype, {
|
|
@@ -180,43 +148,33 @@ function createDefaultStyleManager() {
|
|
|
180
148
|
});
|
|
181
149
|
return styleManager;
|
|
182
150
|
}
|
|
183
|
-
|
|
184
151
|
function createStyleManager() {
|
|
185
152
|
var p = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
|
|
186
153
|
var wapp = p.wapp,
|
|
187
|
-
|
|
188
|
-
|
|
189
|
-
|
|
154
|
+
_p$styleManager = p.styleManager,
|
|
155
|
+
styleManager = _p$styleManager === void 0 ? createDefaultStyleManager(p) : _p$styleManager;
|
|
190
156
|
function defaultHandle(req, res, next) {
|
|
191
157
|
var _targetObject$config2, _targetObject$config3, _targetObject$config4, _targetObject$config5, _targetObject$config6;
|
|
192
|
-
|
|
193
158
|
var targetObject = wapp.getTargetObject ? wapp.getTargetObject() : wapp;
|
|
194
|
-
|
|
195
159
|
if (!(targetObject !== null && targetObject !== void 0 && (_targetObject$config2 = targetObject.config) !== null && _targetObject$config2 !== void 0 && (_targetObject$config3 = _targetObject$config2.styles) !== null && _targetObject$config3 !== void 0 && _targetObject$config3.disableClearStyles)) {
|
|
196
160
|
stylesMiddleware.styleManager.clear();
|
|
197
161
|
}
|
|
198
|
-
|
|
199
162
|
if (targetObject !== null && targetObject !== void 0 && (_targetObject$config4 = targetObject.config) !== null && _targetObject$config4 !== void 0 && (_targetObject$config5 = _targetObject$config4.assets) !== null && _targetObject$config5 !== void 0 && (_targetObject$config6 = _targetObject$config5.cssToInlineStyle) !== null && _targetObject$config6 !== void 0 && _targetObject$config6._getCss) {
|
|
200
163
|
wapp.styles.add({
|
|
201
164
|
_getCss: targetObject.config.assets.cssToInlineStyle._getCss
|
|
202
165
|
});
|
|
203
166
|
}
|
|
204
|
-
|
|
205
167
|
next();
|
|
206
168
|
}
|
|
207
|
-
|
|
208
169
|
function defaultAdd(p) {
|
|
209
170
|
return stylesMiddleware.styleManager.add(p);
|
|
210
171
|
}
|
|
211
|
-
|
|
212
172
|
function defaultUse(p) {
|
|
213
173
|
return stylesMiddleware.styleManager.use(p);
|
|
214
174
|
}
|
|
215
|
-
|
|
216
175
|
function defaultGetCssText() {
|
|
217
176
|
return stylesMiddleware.styleManager.getCssText(p);
|
|
218
177
|
}
|
|
219
|
-
|
|
220
178
|
var stylesMiddlewareProperties = Object.create(Object.prototype, {
|
|
221
179
|
handle: (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, _utils.defaultDescriptor), {}, {
|
|
222
180
|
value: defaultHandle
|
|
@@ -234,15 +192,12 @@ function createStyleManager() {
|
|
|
234
192
|
value: defaultGetCssText
|
|
235
193
|
})
|
|
236
194
|
});
|
|
237
|
-
|
|
238
195
|
function stylesMiddleware(req, res, next) {
|
|
239
196
|
if (typeof stylesMiddleware.handle === "function") {
|
|
240
197
|
stylesMiddleware.handle(req, res, next);
|
|
241
198
|
}
|
|
242
|
-
|
|
243
199
|
return stylesMiddleware;
|
|
244
200
|
}
|
|
245
|
-
|
|
246
201
|
(0, _utils.mergeProperties)(stylesMiddleware, stylesMiddlewareProperties);
|
|
247
202
|
Object.defineProperty(stylesMiddleware, "wapp", (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, _utils.defaultDescriptor), {}, {
|
|
248
203
|
writable: false,
|
|
@@ -1,42 +1,37 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
3
|
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault")["default"];
|
|
4
|
-
|
|
5
4
|
Object.defineProperty(exports, "__esModule", {
|
|
6
5
|
value: true
|
|
7
6
|
});
|
|
8
7
|
exports["default"] = template;
|
|
9
|
-
|
|
10
8
|
var _logo = _interopRequireDefault(require("../logo"));
|
|
11
|
-
|
|
12
9
|
var appStyle = require("./app_css.js")["default"];
|
|
13
|
-
|
|
14
10
|
var style = require("./template_css.js")["default"];
|
|
15
|
-
|
|
16
11
|
function template() {
|
|
17
12
|
var p = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
|
|
18
13
|
var wapp = p.wapp,
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
14
|
+
children = p.children,
|
|
15
|
+
_p$footerMenu = p.footerMenu,
|
|
16
|
+
footerMenu = _p$footerMenu === void 0 ? [{
|
|
17
|
+
name: "HOME",
|
|
18
|
+
href: "/"
|
|
19
|
+
}, {
|
|
20
|
+
name: "404",
|
|
21
|
+
href: "/404"
|
|
22
|
+
}, {
|
|
23
|
+
name: "500",
|
|
24
|
+
href: "/500"
|
|
25
|
+
}, {
|
|
26
|
+
name: "EXTERNAL",
|
|
27
|
+
href: "https://google.com",
|
|
28
|
+
target: "_blank"
|
|
29
|
+
}] : _p$footerMenu,
|
|
30
|
+
_p$logo = p.logo,
|
|
31
|
+
logo = _p$logo === void 0 ? _logo["default"] : _p$logo;
|
|
37
32
|
var styles = wapp.styles;
|
|
38
33
|
var _wapp$config$siteName = wapp.config.siteName,
|
|
39
|
-
|
|
34
|
+
siteName = _wapp$config$siteName === void 0 ? "Wapplr" : _wapp$config$siteName;
|
|
40
35
|
var copyright = "".concat(siteName, " ").concat(new Date().getFullYear(), " \xA9");
|
|
41
36
|
var serverRender = typeof window === "undefined";
|
|
42
37
|
styles.use(appStyle);
|