@monkeyplus/flow 3.1.3 → 3.2.0
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/helper.js +3 -6
- package/dist/helper.js.map +1 -1
- package/dist/index.js +3 -3
- package/dist/index.js.map +1 -1
- package/dist/pages.js +2 -2
- package/dist/pages.js.map +1 -1
- package/package.json +4 -4
- package/types/flow.d.ts +2 -1
package/dist/helper.js
CHANGED
|
@@ -47,7 +47,7 @@ const handlerPage = async (req, h) => {
|
|
|
47
47
|
...flow.seo,
|
|
48
48
|
...req.pre.seo,
|
|
49
49
|
url: configs.url,
|
|
50
|
-
pageUrl: `${configs.url}${
|
|
50
|
+
pageUrl: `${configs.url}${req.url.pathname}`
|
|
51
51
|
// utils
|
|
52
52
|
};
|
|
53
53
|
const contextMethod = {
|
|
@@ -87,10 +87,7 @@ const handlerPage = async (req, h) => {
|
|
|
87
87
|
Object.assign(local, _context);
|
|
88
88
|
}
|
|
89
89
|
const context = {
|
|
90
|
-
view:
|
|
91
|
-
bundle: flow.bundle,
|
|
92
|
-
template: flow.template
|
|
93
|
-
},
|
|
90
|
+
view: flow.view,
|
|
94
91
|
context: Object.freeze({ ...local, ...req.plugins.flow.local }),
|
|
95
92
|
seo,
|
|
96
93
|
page,
|
|
@@ -102,7 +99,7 @@ const handlerPage = async (req, h) => {
|
|
|
102
99
|
return context;
|
|
103
100
|
}
|
|
104
101
|
context.utils = utils;
|
|
105
|
-
return h.view(`${configs.dirTemplates}${flow.template}`, context);
|
|
102
|
+
return h.view(`${configs.dirTemplates}${flow.view.template}`, context);
|
|
106
103
|
};
|
|
107
104
|
exports.handlerPage = handlerPage;
|
|
108
105
|
//# sourceMappingURL=helper.js.map
|
package/dist/helper.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"helper.js","sourceRoot":"","sources":["../src/helper.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;AAEA,yCAA2B;AAEpB,MAAM,WAAW,GAAqB,KAAK,EAAE,GAAG,EAAE,CAAC,EAAE,EAAE;;IAC5D,MAAM,EAAE,OAAO,EAAE,GAAG,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC;IAC5C,MAAM,EAAE,IAAI,EAAE,GAAG,GAAG,CAAC,KAAK,CAAC,QAAQ,CAAC,GAAI,CAAC;IACzC,yCAAyC;IAEzC,wBAAwB;IAExB,MAAM,KAAK,GAAG,EAAE,CAAC;IACjB,MAAM,MAAM,GAAG,EAAE,CAAC;IAClB,MAAM,IAAI,GAAG;QACX,GAAG,CAAC,CAAC,IAAI,CAAC,CAAC,YAAY,EAAE,MAAM,CAAC,EAAE,IAAI,CAAC,SAAS,CAAC;QACjD,GAAG,CAAC,CAAC,IAAI,CACP,CAAC,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,UAAU,CAAC,EAC7D,IAAI,CACL;KACF,CAAC;IACF,MAAM,WAAW,GAAG,EAAE,CAAC;IACvB,wBAAwB;IAExB,IAAI;IACJ,MAAM,KAAK,GAAG;QACZ,GAAG,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK;QACzB,WAAW,EAAE,CAAC,IAAY,EAAE,EAAE;YAC5B,OAAO,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;QACrC,CAAC;QACD,MAAM,EAAE,CAAC,CAAC,MAAM;KACjB,CAAC;IAEF,MAAM,GAAG,GAAG;QACV,GAAG,IAAI,CAAC,GAAG;QACX,GAAG,GAAG,CAAC,GAAG,CAAC,GAAG;QACd,GAAG,EAAE,OAAO,CAAC,GAAG;QAChB,OAAO,EAAE,GAAG,OAAO,CAAC,GAAG,GAAG,
|
|
1
|
+
{"version":3,"file":"helper.js","sourceRoot":"","sources":["../src/helper.ts"],"names":[],"mappings":"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"}
|
package/dist/index.js
CHANGED
|
@@ -126,11 +126,11 @@ exports.plugin = {
|
|
|
126
126
|
Object.assign(plugins, { generate: '.html' });
|
|
127
127
|
const flow = (_a = route.settings.app) === null || _a === void 0 ? void 0 : _a.flow;
|
|
128
128
|
const runCommons = (pageInfo) => {
|
|
129
|
-
helpers.addUrl(pageInfo.
|
|
129
|
+
helpers.addUrl(pageInfo.localeName, {
|
|
130
130
|
url: route.path,
|
|
131
131
|
locale: pageInfo.locale,
|
|
132
|
-
|
|
133
|
-
|
|
132
|
+
localeName: pageInfo.localeName,
|
|
133
|
+
name: pageInfo.name
|
|
134
134
|
});
|
|
135
135
|
if (pageInfo.redirect) {
|
|
136
136
|
helpers.addRedirect(pageInfo.redirect, route.path);
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|
package/dist/pages.js
CHANGED
|
@@ -67,9 +67,9 @@ const definePage = (pageOptions) => (levelOptions) => (configs) => {
|
|
|
67
67
|
},
|
|
68
68
|
handler: {
|
|
69
69
|
flow: {
|
|
70
|
-
name: page.
|
|
70
|
+
name: page.localeName,
|
|
71
71
|
locale: page.locale,
|
|
72
|
-
view:
|
|
72
|
+
view: page.view
|
|
73
73
|
}
|
|
74
74
|
}
|
|
75
75
|
};
|
package/dist/pages.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pages.js","sourceRoot":"","sources":["../src/pages.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;AAEA,qDAAgE;AAChE,yCAA2B;AAKpB,MAAM,UAAU,
|
|
1
|
+
{"version":3,"file":"pages.js","sourceRoot":"","sources":["../src/pages.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@monkeyplus/flow",
|
|
3
|
-
"version": "3.
|
|
3
|
+
"version": "3.2.0",
|
|
4
4
|
"description": "Utils hapi",
|
|
5
5
|
"author": "Andres Navarrete",
|
|
6
6
|
"license": "MIT",
|
|
@@ -21,11 +21,11 @@
|
|
|
21
21
|
"@types/ramda": "^0.27.40"
|
|
22
22
|
},
|
|
23
23
|
"dependencies": {
|
|
24
|
-
"@monkeyplus/flow-core": "^3.
|
|
24
|
+
"@monkeyplus/flow-core": "^3.2.0",
|
|
25
25
|
"chalk": "^4.1.1",
|
|
26
26
|
"consola": "^2.15.3",
|
|
27
|
-
"fs-extra": "^
|
|
27
|
+
"fs-extra": "^10.0.0",
|
|
28
28
|
"ramda": "^0.27.1"
|
|
29
29
|
},
|
|
30
|
-
"gitHead": "
|
|
30
|
+
"gitHead": "8a14f33b373ea4ee4c4092fc78e6359d0465a7b1"
|
|
31
31
|
}
|
package/types/flow.d.ts
CHANGED
|
@@ -64,8 +64,8 @@ export namespace Flow {
|
|
|
64
64
|
interface Url {
|
|
65
65
|
url: string;
|
|
66
66
|
locale: string;
|
|
67
|
+
localeName: string;
|
|
67
68
|
name: string;
|
|
68
|
-
originalName: string;
|
|
69
69
|
}
|
|
70
70
|
export type Urls = Record<string, Url>;
|
|
71
71
|
export type Pages = Record<string, ServerRoute>;
|
|
@@ -135,6 +135,7 @@ export namespace Flow {
|
|
|
135
135
|
view: {
|
|
136
136
|
template: string;
|
|
137
137
|
bundle?: Bundle;
|
|
138
|
+
[key: string]: any;
|
|
138
139
|
};
|
|
139
140
|
context?: RunContextHapi;
|
|
140
141
|
content?: string;
|