@dwp/govuk-casa 8.15.0 → 9.1.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/README.md +9 -9
- package/dist/assets/css/casa.css +2 -1
- package/dist/assets/css/casa.css.map +1 -0
- package/dist/casa.d.ts +122 -99
- package/dist/casa.js +120 -88
- package/dist/casa.js.map +1 -1
- package/dist/lib/CasaTemplateLoader.d.ts +4 -4
- package/dist/lib/CasaTemplateLoader.js +16 -16
- package/dist/lib/CasaTemplateLoader.js.map +1 -1
- package/dist/lib/JourneyContext.d.ts +38 -40
- package/dist/lib/JourneyContext.js +89 -75
- package/dist/lib/JourneyContext.js.map +1 -1
- package/dist/lib/MutableRouter.d.ts +40 -41
- package/dist/lib/MutableRouter.js +64 -71
- package/dist/lib/MutableRouter.js.map +1 -1
- package/dist/lib/Plan.d.ts +29 -26
- package/dist/lib/Plan.js +85 -71
- package/dist/lib/Plan.js.map +1 -1
- package/dist/lib/ValidationError.d.ts +16 -15
- package/dist/lib/ValidationError.js +21 -20
- package/dist/lib/ValidationError.js.map +1 -1
- package/dist/lib/ValidatorFactory.d.ts +15 -13
- package/dist/lib/ValidatorFactory.js +14 -12
- package/dist/lib/ValidatorFactory.js.map +1 -1
- package/dist/lib/configuration-ingestor.d.ts +37 -40
- package/dist/lib/configuration-ingestor.js +93 -93
- package/dist/lib/configuration-ingestor.js.map +1 -1
- package/dist/lib/configure.d.ts +6 -6
- package/dist/lib/configure.js +14 -12
- package/dist/lib/configure.js.map +1 -1
- package/dist/lib/constants.d.ts +1 -3
- package/dist/lib/constants.js +9 -11
- package/dist/lib/constants.js.map +1 -1
- package/dist/lib/context-id-generators.d.ts +3 -5
- package/dist/lib/context-id-generators.js +7 -6
- package/dist/lib/context-id-generators.js.map +1 -1
- package/dist/lib/end-session.d.ts +4 -4
- package/dist/lib/end-session.js +5 -5
- package/dist/lib/field.d.ts +24 -29
- package/dist/lib/field.js +41 -70
- package/dist/lib/field.js.map +1 -1
- package/dist/lib/index.d.ts +13 -13
- package/dist/lib/logger.d.ts +7 -6
- package/dist/lib/logger.js +7 -7
- package/dist/lib/logger.js.map +1 -1
- package/dist/lib/mount.d.ts +5 -5
- package/dist/lib/mount.js +12 -17
- package/dist/lib/mount.js.map +1 -1
- package/dist/lib/nunjucks-filters.d.ts +10 -12
- package/dist/lib/nunjucks-filters.js +35 -35
- package/dist/lib/nunjucks-filters.js.map +1 -1
- package/dist/lib/nunjucks.d.ts +7 -5
- package/dist/lib/nunjucks.js +10 -8
- package/dist/lib/nunjucks.js.map +1 -1
- package/dist/lib/utils.d.ts +19 -19
- package/dist/lib/utils.js +62 -55
- package/dist/lib/utils.js.map +1 -1
- package/dist/lib/validators/dateObject.d.ts +29 -22
- package/dist/lib/validators/dateObject.js +58 -49
- package/dist/lib/validators/dateObject.js.map +1 -1
- package/dist/lib/validators/email.d.ts +4 -4
- package/dist/lib/validators/email.js +4 -4
- package/dist/lib/validators/inArray.d.ts +4 -4
- package/dist/lib/validators/inArray.js +7 -8
- package/dist/lib/validators/inArray.js.map +1 -1
- package/dist/lib/validators/index.d.ts +10 -10
- package/dist/lib/validators/index.js +1 -3
- package/dist/lib/validators/index.js.map +1 -1
- package/dist/lib/validators/nino.d.ts +9 -8
- package/dist/lib/validators/nino.js +14 -10
- package/dist/lib/validators/nino.js.map +1 -1
- package/dist/lib/validators/postalAddressObject.d.ts +37 -24
- package/dist/lib/validators/postalAddressObject.js +65 -46
- package/dist/lib/validators/postalAddressObject.js.map +1 -1
- package/dist/lib/validators/range.d.ts +12 -8
- package/dist/lib/validators/range.js +11 -9
- package/dist/lib/validators/range.js.map +1 -1
- package/dist/lib/validators/regex.d.ts +4 -4
- package/dist/lib/validators/regex.js +5 -5
- package/dist/lib/validators/required.d.ts +6 -6
- package/dist/lib/validators/required.js +9 -11
- package/dist/lib/validators/required.js.map +1 -1
- package/dist/lib/validators/strlen.d.ts +12 -8
- package/dist/lib/validators/strlen.js +13 -11
- package/dist/lib/validators/strlen.js.map +1 -1
- package/dist/lib/validators/wordCount.d.ts +12 -8
- package/dist/lib/validators/wordCount.js +15 -11
- package/dist/lib/validators/wordCount.js.map +1 -1
- package/dist/lib/waypoint-url.d.ts +16 -13
- package/dist/lib/waypoint-url.js +39 -36
- package/dist/lib/waypoint-url.js.map +1 -1
- package/dist/middleware/body-parser.d.ts +1 -1
- package/dist/middleware/body-parser.js +6 -6
- package/dist/middleware/body-parser.js.map +1 -1
- package/dist/middleware/data.d.ts +1 -1
- package/dist/middleware/data.js +8 -7
- package/dist/middleware/data.js.map +1 -1
- package/dist/middleware/gather-fields.d.ts +2 -2
- package/dist/middleware/gather-fields.js +6 -4
- package/dist/middleware/gather-fields.js.map +1 -1
- package/dist/middleware/i18n.js +13 -15
- package/dist/middleware/i18n.js.map +1 -1
- package/dist/middleware/post.js +30 -18
- package/dist/middleware/post.js.map +1 -1
- package/dist/middleware/pre.d.ts +2 -2
- package/dist/middleware/pre.js +46 -26
- package/dist/middleware/pre.js.map +1 -1
- package/dist/middleware/progress-journey.d.ts +1 -1
- package/dist/middleware/progress-journey.js +5 -5
- package/dist/middleware/progress-journey.js.map +1 -1
- package/dist/middleware/sanitise-fields.d.ts +1 -1
- package/dist/middleware/sanitise-fields.js +13 -11
- package/dist/middleware/sanitise-fields.js.map +1 -1
- package/dist/middleware/serve-first-waypoint.d.ts +3 -3
- package/dist/middleware/serve-first-waypoint.js +8 -6
- package/dist/middleware/serve-first-waypoint.js.map +1 -1
- package/dist/middleware/session.js +14 -11
- package/dist/middleware/session.js.map +1 -1
- package/dist/middleware/skip-waypoint.d.ts +1 -1
- package/dist/middleware/skip-waypoint.js +3 -3
- package/dist/middleware/skip-waypoint.js.map +1 -1
- package/dist/middleware/steer-journey.d.ts +1 -1
- package/dist/middleware/steer-journey.js +16 -14
- package/dist/middleware/steer-journey.js.map +1 -1
- package/dist/middleware/strip-proxy-path.d.ts +1 -1
- package/dist/middleware/strip-proxy-path.js +3 -3
- package/dist/middleware/strip-proxy-path.js.map +1 -1
- package/dist/middleware/validate-fields.d.ts +1 -1
- package/dist/middleware/validate-fields.js +2 -5
- package/dist/middleware/validate-fields.js.map +1 -1
- package/dist/routes/ancillary.d.ts +3 -3
- package/dist/routes/ancillary.js +4 -4
- package/dist/routes/ancillary.js.map +1 -1
- package/dist/routes/journey.d.ts +2 -2
- package/dist/routes/journey.js +91 -39
- package/dist/routes/journey.js.map +1 -1
- package/dist/routes/static.d.ts +7 -5
- package/dist/routes/static.js +20 -20
- package/dist/routes/static.js.map +1 -1
- package/package.json +17 -16
- package/src/casa.js +134 -102
- package/src/lib/CasaTemplateLoader.js +24 -19
- package/src/lib/JourneyContext.js +147 -107
- package/src/lib/MutableRouter.js +72 -74
- package/src/lib/Plan.js +145 -97
- package/src/lib/ValidationError.js +25 -21
- package/src/lib/ValidatorFactory.js +17 -13
- package/src/lib/configuration-ingestor.js +147 -110
- package/src/lib/configure.js +34 -32
- package/src/lib/constants.js +9 -11
- package/src/lib/context-id-generators.js +40 -43
- package/src/lib/end-session.js +6 -6
- package/src/lib/field.js +74 -78
- package/src/lib/index.js +12 -12
- package/src/lib/logger.js +9 -9
- package/src/lib/mount.js +70 -80
- package/src/lib/nunjucks-filters.js +56 -59
- package/src/lib/nunjucks.js +23 -18
- package/src/lib/utils.js +78 -57
- package/src/lib/validators/dateObject.js +71 -60
- package/src/lib/validators/email.js +8 -8
- package/src/lib/validators/inArray.js +10 -11
- package/src/lib/validators/index.js +12 -14
- package/src/lib/validators/nino.js +29 -15
- package/src/lib/validators/postalAddressObject.js +87 -63
- package/src/lib/validators/range.js +14 -12
- package/src/lib/validators/regex.js +8 -8
- package/src/lib/validators/required.js +16 -16
- package/src/lib/validators/strlen.js +16 -14
- package/src/lib/validators/wordCount.js +22 -14
- package/src/lib/waypoint-url.js +64 -46
- package/src/middleware/body-parser.js +10 -10
- package/src/middleware/csrf.js +1 -1
- package/src/middleware/data.js +28 -24
- package/src/middleware/gather-fields.js +10 -9
- package/src/middleware/i18n.js +35 -37
- package/src/middleware/post.js +41 -21
- package/src/middleware/pre.js +62 -40
- package/src/middleware/progress-journey.js +32 -18
- package/src/middleware/sanitise-fields.js +43 -20
- package/src/middleware/serve-first-waypoint.js +14 -12
- package/src/middleware/session.js +74 -61
- package/src/middleware/skip-waypoint.js +7 -9
- package/src/middleware/steer-journey.js +40 -28
- package/src/middleware/strip-proxy-path.js +8 -7
- package/src/middleware/validate-fields.js +5 -12
- package/src/routes/ancillary.js +5 -7
- package/src/routes/journey.js +159 -85
- package/src/routes/static.js +62 -30
- package/views/casa/components/character-count/README.md +2 -2
- package/views/casa/components/checkboxes/README.md +6 -6
- package/views/casa/components/date-input/README.md +7 -7
- package/views/casa/components/input/README.md +2 -2
- package/views/casa/components/journey-form/README.md +33 -14
- package/views/casa/components/postal-address-object/README.md +4 -4
- package/views/casa/components/radios/README.md +6 -6
- package/views/casa/components/select/README.md +6 -6
- package/views/casa/components/textarea/README.md +2 -2
- package/views/casa/partials/scripts.njk +5 -3
- package/views/casa/partials/styles.njk +1 -4
- package/dist/assets/css/casa-ie8.css +0 -1
package/dist/routes/journey.js
CHANGED
|
@@ -15,18 +15,18 @@ const waypoint_url_js_1 = __importDefault(require("../lib/waypoint-url.js"));
|
|
|
15
15
|
const logger_js_1 = __importDefault(require("../lib/logger.js"));
|
|
16
16
|
const utils_js_1 = require("../lib/utils.js");
|
|
17
17
|
const constants_js_1 = require("../lib/constants.js");
|
|
18
|
-
const log = (0, logger_js_1.default)(
|
|
18
|
+
const log = (0, logger_js_1.default)("routes:journey");
|
|
19
19
|
/**
|
|
20
|
+
* @param {import("../casa.js").GlobalHook} GlobalHook
|
|
20
21
|
* @access private
|
|
21
|
-
* @param {import('../casa.js').GlobalHook} GlobalHook
|
|
22
22
|
*/
|
|
23
23
|
/**
|
|
24
|
+
* @param {import("../casa.js").Page} Page
|
|
24
25
|
* @access private
|
|
25
|
-
* @param {import('../casa.js').Page} Page
|
|
26
26
|
*/
|
|
27
27
|
/**
|
|
28
|
+
* @param {import("../casa.js").Plan} Plan
|
|
28
29
|
* @access private
|
|
29
|
-
* @param {import('../casa.js').Plan} Plan
|
|
30
30
|
*/
|
|
31
31
|
/**
|
|
32
32
|
* @typedef {object} JourneyRouterOptions Options to configure static router
|
|
@@ -50,38 +50,41 @@ const renderMiddlewareFactory = (view, contextFactory) => [
|
|
|
50
50
|
},
|
|
51
51
|
];
|
|
52
52
|
/**
|
|
53
|
-
*
|
|
53
|
+
* Generate page validation error
|
|
54
54
|
*
|
|
55
|
-
* @param {object} errors
|
|
56
|
-
* @param {object} req
|
|
57
|
-
* @returns {object[]}
|
|
55
|
+
* @param {object} errors Object of page validation error
|
|
56
|
+
* @param {object} req Casa request object
|
|
57
|
+
* @returns {object[]} Array of error objects
|
|
58
58
|
*/
|
|
59
59
|
const generateGovukErrors = (errors, req) => Object.values(errors || {}).map(([error]) => ({
|
|
60
60
|
text: req.t(error.summary, error.variables),
|
|
61
61
|
href: error.fieldHref,
|
|
62
62
|
}));
|
|
63
63
|
/**
|
|
64
|
-
*
|
|
64
|
+
* Handle errorVisibility flag and function and return boolean
|
|
65
65
|
*
|
|
66
|
-
* @param {
|
|
67
|
-
* @param {
|
|
68
|
-
* @returns {boolean}
|
|
66
|
+
* @param {object} req Casa request object
|
|
67
|
+
* @param {symbol | Function} errorVisibility ErrorVisibility config option
|
|
68
|
+
* @returns {boolean} True if errorVisibility is "always" or function condition
|
|
69
|
+
* true
|
|
69
70
|
*/
|
|
70
|
-
const resolveErrorVisibility = (req, errorVisibility) =>
|
|
71
|
+
const resolveErrorVisibility = (req, errorVisibility) => typeof errorVisibility === "function"
|
|
72
|
+
? errorVisibility({ req })
|
|
73
|
+
: errorVisibility === constants_js_1.CONFIG_ERROR_VISIBILITY_ALWAYS;
|
|
71
74
|
/**
|
|
72
75
|
* Create an instance of the router for all waypoints visited during a Journey
|
|
73
76
|
* through the Plan.
|
|
74
77
|
*
|
|
75
|
-
* @access private
|
|
76
78
|
* @param {JourneyRouterOptions} opts Options
|
|
77
79
|
* @returns {MutableRouter} Router
|
|
80
|
+
* @access private
|
|
78
81
|
*/
|
|
79
82
|
function journeyRouter({ globalHooks, pages, plan, csrfMiddleware, globalErrorVisibility, }) {
|
|
80
83
|
// Router
|
|
81
84
|
const router = new MutableRouter_js_1.default();
|
|
82
85
|
// Special "_" route which handles redirecting the user between sub-apps
|
|
83
86
|
// /app1/_/?refmount=app2&route=prev
|
|
84
|
-
router.all(
|
|
87
|
+
router.all("/_", (req, res) => {
|
|
85
88
|
var _a, _b;
|
|
86
89
|
const mountUrl = `${req.baseUrl}/`;
|
|
87
90
|
const refmount = (_a = req.query) === null || _a === void 0 ? void 0 : _a.refmount;
|
|
@@ -91,7 +94,7 @@ function journeyRouter({ globalHooks, pages, plan, csrfMiddleware, globalErrorVi
|
|
|
91
94
|
const fallback = (0, waypoint_url_js_1.default)({
|
|
92
95
|
mountUrl,
|
|
93
96
|
waypoint: plan.traverse(req.casa.journeyContext, {
|
|
94
|
-
stopCondition: () =>
|
|
97
|
+
stopCondition: () => true, // we only need one; stop at the first
|
|
95
98
|
})[0],
|
|
96
99
|
});
|
|
97
100
|
// If the refmount doesn't exist in our Plan, we can assume that the two
|
|
@@ -100,35 +103,41 @@ function journeyRouter({ globalHooks, pages, plan, csrfMiddleware, globalErrorVi
|
|
|
100
103
|
if (!plan.getWaypoints().includes(refmount)) {
|
|
101
104
|
redirectTo = fallback;
|
|
102
105
|
}
|
|
103
|
-
else if (route ===
|
|
104
|
-
const routes = plan.traversePrevRoutes(req.casa.journeyContext, {
|
|
105
|
-
|
|
106
|
+
else if (route === "prev") {
|
|
107
|
+
const routes = plan.traversePrevRoutes(req.casa.journeyContext, {
|
|
108
|
+
startWaypoint: refmount,
|
|
109
|
+
});
|
|
110
|
+
redirectTo = routes.length
|
|
111
|
+
? (0, waypoint_url_js_1.default)({ mountUrl, waypoint: routes[0].target })
|
|
112
|
+
: fallback;
|
|
106
113
|
}
|
|
107
114
|
else {
|
|
108
|
-
const routes = plan.traverseNextRoutes(req.casa.journeyContext, {
|
|
115
|
+
const routes = plan.traverseNextRoutes(req.casa.journeyContext, {
|
|
116
|
+
startWaypoint: refmount,
|
|
117
|
+
});
|
|
109
118
|
if (routes[0].target !== null) {
|
|
110
|
-
redirectTo = routes.length
|
|
119
|
+
redirectTo = routes.length
|
|
120
|
+
? (0, waypoint_url_js_1.default)({ mountUrl, waypoint: routes[0].target })
|
|
121
|
+
: fallback;
|
|
111
122
|
}
|
|
112
123
|
else {
|
|
113
124
|
redirectTo = fallback;
|
|
114
125
|
}
|
|
115
126
|
}
|
|
116
127
|
// Carry over any params
|
|
117
|
-
const url = new URL(redirectTo,
|
|
128
|
+
const url = new URL(redirectTo, "https://placeholder.test/");
|
|
118
129
|
const searchParams = new URLSearchParams(req.query);
|
|
119
|
-
searchParams.delete(
|
|
120
|
-
searchParams.delete(
|
|
130
|
+
searchParams.delete("refmount");
|
|
131
|
+
searchParams.delete("route");
|
|
121
132
|
url.search = searchParams.toString();
|
|
122
|
-
redirectTo = `${url.pathname.replace(/\/+/g,
|
|
133
|
+
redirectTo = `${url.pathname.replace(/\/+/g, "/")}${url.search}`;
|
|
123
134
|
log.trace(`Redirect to ${redirectTo}`);
|
|
124
135
|
return res.redirect(redirectTo);
|
|
125
136
|
});
|
|
126
137
|
// Create GET / POST routes for each page
|
|
127
|
-
const commonMiddleware = [
|
|
128
|
-
...csrfMiddleware,
|
|
129
|
-
];
|
|
138
|
+
const commonMiddleware = [...csrfMiddleware];
|
|
130
139
|
pages.forEach((page) => {
|
|
131
|
-
const { waypoint, view, hooks: pageHooks = [], fields, errorVisibility } = page;
|
|
140
|
+
const { waypoint, view, hooks: pageHooks = [], fields, errorVisibility, } = page;
|
|
132
141
|
const waypointPath = `/${waypoint}`;
|
|
133
142
|
let commonWaypointMiddleware = [
|
|
134
143
|
(req, res, next) => {
|
|
@@ -144,23 +153,66 @@ function journeyRouter({ globalHooks, pages, plan, csrfMiddleware, globalErrorVi
|
|
|
144
153
|
...(0, skip_waypoint_js_1.default)({ waypoint }),
|
|
145
154
|
];
|
|
146
155
|
}
|
|
147
|
-
router.get(waypointPath, ...commonMiddleware, ...commonWaypointMiddleware, ...(0, utils_js_1.resolveMiddlewareHooks)(
|
|
156
|
+
router.get(waypointPath, ...commonMiddleware, ...commonWaypointMiddleware, ...(0, utils_js_1.resolveMiddlewareHooks)("journey.presteer", waypointPath, [
|
|
157
|
+
...globalHooks,
|
|
158
|
+
...pageHooks,
|
|
159
|
+
]), ...(0, steer_journey_js_1.default)({ waypoint, plan }), ...(0, utils_js_1.resolveMiddlewareHooks)("journey.poststeer", waypointPath, [
|
|
160
|
+
...globalHooks,
|
|
161
|
+
...pageHooks,
|
|
162
|
+
]), ...(0, utils_js_1.resolveMiddlewareHooks)("journey.prerender", waypointPath, [
|
|
163
|
+
...globalHooks,
|
|
164
|
+
...pageHooks,
|
|
165
|
+
]), renderMiddlewareFactory(view, (req) => {
|
|
148
166
|
var _a;
|
|
149
|
-
const displayErrors = resolveErrorVisibility(req, globalErrorVisibility) ||
|
|
150
|
-
|
|
167
|
+
const displayErrors = resolveErrorVisibility(req, globalErrorVisibility) ||
|
|
168
|
+
resolveErrorVisibility(req, errorVisibility);
|
|
169
|
+
const errors = displayErrors &&
|
|
170
|
+
((_a = req.casa.journeyContext.getValidationErrorsForPageByField(waypoint)) !== null && _a !== void 0 ? _a : Object.create(null));
|
|
151
171
|
const govukErrors = displayErrors && generateGovukErrors(errors, req);
|
|
152
|
-
return
|
|
172
|
+
return {
|
|
153
173
|
formUrl: (0, waypoint_url_js_1.default)({ mountUrl: `${req.baseUrl}/`, waypoint }),
|
|
154
174
|
formData: req.casa.journeyContext.getDataForPage(waypoint),
|
|
155
|
-
formErrors:
|
|
156
|
-
formErrorsGovukArray:
|
|
157
|
-
}
|
|
175
|
+
formErrors: Object.keys(errors).length && displayErrors ? errors : null,
|
|
176
|
+
formErrorsGovukArray: govukErrors.length && displayErrors ? govukErrors : null,
|
|
177
|
+
};
|
|
158
178
|
}));
|
|
159
|
-
router.post(waypointPath, ...commonMiddleware, ...commonWaypointMiddleware, ...(0, utils_js_1.resolveMiddlewareHooks)(
|
|
179
|
+
router.post(waypointPath, ...commonMiddleware, ...commonWaypointMiddleware, ...(0, utils_js_1.resolveMiddlewareHooks)("journey.presteer", waypointPath, [
|
|
180
|
+
...globalHooks,
|
|
181
|
+
...pageHooks,
|
|
182
|
+
]), ...(0, steer_journey_js_1.default)({ waypoint, plan }), ...(0, utils_js_1.resolveMiddlewareHooks)("journey.poststeer", waypointPath, [
|
|
183
|
+
...globalHooks,
|
|
184
|
+
...pageHooks,
|
|
185
|
+
]), ...(0, utils_js_1.resolveMiddlewareHooks)("journey.presanitise", waypointPath, [
|
|
186
|
+
...globalHooks,
|
|
187
|
+
...pageHooks,
|
|
188
|
+
]), ...(0, sanitise_fields_js_1.default)({ waypoint, fields }), ...(0, utils_js_1.resolveMiddlewareHooks)("journey.postsanitise", waypointPath, [
|
|
189
|
+
...globalHooks,
|
|
190
|
+
...pageHooks,
|
|
191
|
+
]), ...(0, utils_js_1.resolveMiddlewareHooks)("journey.pregather", waypointPath, [
|
|
192
|
+
...globalHooks,
|
|
193
|
+
...pageHooks,
|
|
194
|
+
]), ...(0, gather_fields_js_1.default)({ waypoint, fields }), ...(0, utils_js_1.resolveMiddlewareHooks)("journey.postgather", waypointPath, [
|
|
195
|
+
...globalHooks,
|
|
196
|
+
...pageHooks,
|
|
197
|
+
]), ...(0, utils_js_1.resolveMiddlewareHooks)("journey.prevalidate", waypointPath, [
|
|
198
|
+
...globalHooks,
|
|
199
|
+
...pageHooks,
|
|
200
|
+
]), ...(0, validate_fields_js_1.default)({ waypoint, fields, plan }), ...(0, utils_js_1.resolveMiddlewareHooks)("journey.postvalidate", waypointPath, [
|
|
201
|
+
...globalHooks,
|
|
202
|
+
...pageHooks,
|
|
203
|
+
]),
|
|
160
204
|
// If there were validation errors, jump out of this route and into the
|
|
161
205
|
// next, where the errors will be rendered
|
|
162
|
-
(req, res, next) =>
|
|
163
|
-
|
|
206
|
+
(req, res, next) => req.casa.journeyContext.hasValidationErrorsForPage(waypoint)
|
|
207
|
+
? next("route")
|
|
208
|
+
: next(), ...(0, utils_js_1.resolveMiddlewareHooks)("journey.preredirect", waypointPath, [
|
|
209
|
+
...globalHooks,
|
|
210
|
+
...pageHooks,
|
|
211
|
+
]), ...(0, progress_journey_js_1.default)({ waypoint, plan }));
|
|
212
|
+
router.post(waypointPath, ...(0, utils_js_1.resolveMiddlewareHooks)("journey.prerender", waypointPath, [
|
|
213
|
+
...globalHooks,
|
|
214
|
+
...pageHooks,
|
|
215
|
+
]), renderMiddlewareFactory(view, (req) => {
|
|
164
216
|
var _a;
|
|
165
217
|
const errors = (_a = req.casa.journeyContext.getValidationErrorsForPageByField(waypoint)) !== null && _a !== void 0 ? _a : Object.create(null);
|
|
166
218
|
// This is a convenience for the template. The `govukErrorSummary` macro
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"journey.js","sourceRoot":"","sources":["../../src/routes/journey.js"],"names":[],"mappings":";;;;;AAAA,iDAAiD;AACjD,+EAAoD;AACpD,sFAA2E;AAC3E,sFAA2E;AAC3E,0FAA+E;AAC/E,sFAA2E;AAC3E,0FAA+E;AAC/E,4FAAiF;AACjF,6EAAiD;AACjD,iEAAsC;AACtC,8CAAyD;AACzD,sDAAqE;AAErE,MAAM,GAAG,GAAG,IAAA,mBAAM,EAAC,gBAAgB,CAAC,CAAC;AAErC;;;GAGG;AAEH;;;GAGG;AAEH;;;GAGG;AAEH;;;;;;GAMG;AAEH,MAAM,uBAAuB,GAAG,CAAC,IAAI,EAAE,cAAc,EAAE,EAAE,CAAC;IACxD,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE;QACjB,GAAG,CAAC,MAAM,
|
|
1
|
+
{"version":3,"file":"journey.js","sourceRoot":"","sources":["../../src/routes/journey.js"],"names":[],"mappings":"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"}
|
package/dist/routes/static.d.ts
CHANGED
|
@@ -1,22 +1,24 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* @typedef {object} StaticOptions Options to configure static router
|
|
3
|
-
* @property {number} [maxAge=3600000] Cache TTL for all assets (optional,
|
|
3
|
+
* @property {number} [maxAge=3600000] Cache TTL for all assets (optional,
|
|
4
|
+
* default 1 hour). Default is `3600000`
|
|
4
5
|
*/
|
|
5
6
|
/**
|
|
6
7
|
* Create a router for serving CASA's static assets.
|
|
7
8
|
*
|
|
8
|
-
* @access private
|
|
9
9
|
* @param {StaticOptions} options Options
|
|
10
10
|
* @returns {MutableRouter} ExpressJS Router instance
|
|
11
|
+
* @access private
|
|
11
12
|
*/
|
|
12
|
-
export default function staticRouter({ maxAge
|
|
13
|
+
export default function staticRouter({ maxAge }?: StaticOptions): MutableRouter;
|
|
13
14
|
/**
|
|
14
15
|
* Options to configure static router
|
|
15
16
|
*/
|
|
16
17
|
export type StaticOptions = {
|
|
17
18
|
/**
|
|
18
|
-
* Cache TTL for all assets (optional,
|
|
19
|
+
* Cache TTL for all assets (optional,
|
|
20
|
+
* default 1 hour). Default is `3600000`
|
|
19
21
|
*/
|
|
20
22
|
maxAge?: number | undefined;
|
|
21
23
|
};
|
|
22
|
-
import MutableRouter from
|
|
24
|
+
import MutableRouter from "../lib/MutableRouter.js";
|
package/dist/routes/static.js
CHANGED
|
@@ -15,30 +15,31 @@ const { static: ExpressStatic } = express_1.default; // CommonJS
|
|
|
15
15
|
const oneDay = 86400000;
|
|
16
16
|
/**
|
|
17
17
|
* @typedef {object} StaticOptions Options to configure static router
|
|
18
|
-
* @property {number} [maxAge=3600000] Cache TTL for all assets (optional,
|
|
18
|
+
* @property {number} [maxAge=3600000] Cache TTL for all assets (optional,
|
|
19
|
+
* default 1 hour). Default is `3600000`
|
|
19
20
|
*/
|
|
20
21
|
/**
|
|
21
22
|
* Create a router for serving CASA's static assets.
|
|
22
23
|
*
|
|
23
|
-
* @access private
|
|
24
24
|
* @param {StaticOptions} options Options
|
|
25
25
|
* @returns {MutableRouter} ExpressJS Router instance
|
|
26
|
+
* @access private
|
|
26
27
|
*/
|
|
27
|
-
function staticRouter({ maxAge = 3600000
|
|
28
|
+
function staticRouter({ maxAge = 3600000 } = {}) {
|
|
28
29
|
const router = new MutableRouter_js_1.default();
|
|
29
30
|
const notFoundHandler = (req, res, next) => {
|
|
30
31
|
// Fall through to a general purpose error handler
|
|
31
|
-
next(new Error(
|
|
32
|
+
next(new Error("404"));
|
|
32
33
|
};
|
|
33
34
|
const setHeaders = (req, res, next) => {
|
|
34
35
|
var _a;
|
|
35
|
-
res.set(
|
|
36
|
-
res.set(
|
|
37
|
-
res.set(
|
|
38
|
-
const { pathname } = new url_1.URL((_a = req === null || req === void 0 ? void 0 : req.originalUrl) !== null && _a !== void 0 ? _a :
|
|
39
|
-
if (pathname.substr(-4) ===
|
|
36
|
+
res.set("cache-control", "public");
|
|
37
|
+
res.set("pragma", "cache");
|
|
38
|
+
res.set("expires", new Date(Date.now() + oneDay).toUTCString());
|
|
39
|
+
const { pathname } = new url_1.URL((_a = req === null || req === void 0 ? void 0 : req.originalUrl) !== null && _a !== void 0 ? _a : "", "https://placeholder.test/");
|
|
40
|
+
if (pathname.substr(-4) === ".css") {
|
|
40
41
|
// Just needed for our in-memory CSS assets
|
|
41
|
-
res.set(
|
|
42
|
+
res.set("content-type", "text/css");
|
|
42
43
|
}
|
|
43
44
|
next();
|
|
44
45
|
};
|
|
@@ -54,19 +55,18 @@ function staticRouter({ maxAge = 3600000, } = {}) {
|
|
|
54
55
|
// must be replaced with the dynamic `mountUrl` to ensure govuk-frontend
|
|
55
56
|
// assets are served from the correct location.
|
|
56
57
|
/* eslint-disable security/detect-non-literal-fs-filename */
|
|
57
|
-
const casaCss = (0, fs_1.readFileSync)((0, path_1.resolve)(dirname_cjs_1.default,
|
|
58
|
-
const casaCssIe8 = (0, fs_1.readFileSync)((0, path_1.resolve)(dirname_cjs_1.default, '../../dist/assets/css/casa-ie8.css'), { encoding: 'utf8' });
|
|
58
|
+
const casaCss = (0, fs_1.readFileSync)((0, path_1.resolve)(dirname_cjs_1.default, "../../dist/assets/css/casa.css"), { encoding: "utf8" });
|
|
59
59
|
/* eslint-enable security/detect-non-literal-fs-filename */
|
|
60
60
|
// The static middleware will only server GET/HEAD requests, so we can mount
|
|
61
61
|
// the middleware using `use()` rather than resorting to `get()`
|
|
62
|
-
const govukFrontendDirectory = (0, path_1.resolve)((0, module_1.createRequire)(dirname_cjs_1.default).resolve(
|
|
63
|
-
router.use(
|
|
64
|
-
router.use(
|
|
65
|
-
router.use(
|
|
66
|
-
router.use(
|
|
67
|
-
router.get(
|
|
68
|
-
router.
|
|
69
|
-
router.use(
|
|
62
|
+
const govukFrontendDirectory = (0, path_1.resolve)((0, module_1.createRequire)(dirname_cjs_1.default).resolve("govuk-frontend"), "../../");
|
|
63
|
+
router.use("/govuk/govuk-frontend.min.js", ExpressStatic(`${govukFrontendDirectory}/govuk/govuk-frontend.min.js`, staticConfig));
|
|
64
|
+
router.use("/govuk/govuk-frontend.min.js.map", ExpressStatic(`${govukFrontendDirectory}/govuk/govuk-frontend.min.js.map`, staticConfig));
|
|
65
|
+
router.use("/govuk/assets", ExpressStatic(`${govukFrontendDirectory}/govuk/assets`, staticConfig));
|
|
66
|
+
router.use("/govuk/assets", notFoundHandler);
|
|
67
|
+
router.get("/casa/assets/css/casa.css", setHeaders, (req, res) => res.send(casaCss.replace(/~~~CASA_MOUNT_URL~~~/g, (0, utils_js_1.validateUrlPath)(`${req.baseUrl}/`))));
|
|
68
|
+
router.use("/casa/assets/css/casa.css.map", ExpressStatic((0, path_1.resolve)(dirname_cjs_1.default, "../../dist/assets/css/casa.css.map")));
|
|
69
|
+
router.use("/casa/assets", notFoundHandler);
|
|
70
70
|
return router;
|
|
71
71
|
}
|
|
72
72
|
exports.default = staticRouter;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"static.js","sourceRoot":"","sources":["../../src/routes/static.js"],"names":[],"mappings":";;;;;AAAA,sDAAgC;AAChC,2BAAkC;AAClC,6BAA0B;AAC1B,+BAA+B;AAC/B,mCAAuC;AAEvC,gEAAoC;AACpC,+EAAoD;AACpD,8CAAkD;AAElD,MAAM,EAAE,MAAM,EAAE,aAAa,EAAE,GAAG,iBAAS,CAAC,CAAC,WAAW;AAExD,MAAM,MAAM,GAAG,QAAQ,CAAC;AAExB
|
|
1
|
+
{"version":3,"file":"static.js","sourceRoot":"","sources":["../../src/routes/static.js"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@dwp/govuk-casa",
|
|
3
|
-
"version": "
|
|
3
|
+
"version": "9.1.0",
|
|
4
4
|
"description": "A framework for building GOVUK Collect-And-Submit-Applications",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -56,7 +56,7 @@
|
|
|
56
56
|
"deepmerge": "4.3.1",
|
|
57
57
|
"express": "4.18.2",
|
|
58
58
|
"express-session": "1.18.0",
|
|
59
|
-
"govuk-frontend": "
|
|
59
|
+
"govuk-frontend": "5.1.0",
|
|
60
60
|
"helmet": "7.1.0",
|
|
61
61
|
"i18next": "23.8.2",
|
|
62
62
|
"i18next-http-middleware": "3.5.0",
|
|
@@ -68,37 +68,38 @@
|
|
|
68
68
|
"validator": "13.11.0"
|
|
69
69
|
},
|
|
70
70
|
"devDependencies": {
|
|
71
|
-
"@babel/core": "7.23.
|
|
72
|
-
"@babel/eslint-parser": "7.23.
|
|
73
|
-
"@babel/preset-env": "7.23.
|
|
74
|
-
"@ckeditor/jsdoc-plugins": "39.5.
|
|
75
|
-
"@commitlint/config-conventional": "18.
|
|
71
|
+
"@babel/core": "7.23.9",
|
|
72
|
+
"@babel/eslint-parser": "7.23.10",
|
|
73
|
+
"@babel/preset-env": "7.23.9",
|
|
74
|
+
"@ckeditor/jsdoc-plugins": "39.5.1",
|
|
75
|
+
"@commitlint/config-conventional": "18.6.0",
|
|
76
76
|
"@dwp/casa-spiderplan": "3.1.3",
|
|
77
77
|
"@dwp/casa-spiderplan-a11y-plugin": "0.1.14",
|
|
78
78
|
"@dwp/casa-spiderplan-zap-plugin": "0.1.10",
|
|
79
79
|
"@dwp/eslint-config-base": "7.0.0",
|
|
80
80
|
"@types/express": "4.17.21",
|
|
81
|
-
"@types/node": "20.
|
|
81
|
+
"@types/node": "20.11.16",
|
|
82
82
|
"@types/nunjucks": "3.2.6",
|
|
83
|
-
"c8": "
|
|
84
|
-
"chai": "
|
|
83
|
+
"c8": "9.1.0",
|
|
84
|
+
"chai": "5.0.3",
|
|
85
85
|
"cheerio": "1.0.0-rc.12",
|
|
86
|
-
"commitlint": "18.
|
|
86
|
+
"commitlint": "18.6.0",
|
|
87
87
|
"docdash": "2.0.2",
|
|
88
88
|
"eslint": "8.56.0",
|
|
89
89
|
"eslint-plugin-import": "2.29.1",
|
|
90
|
-
"eslint-plugin-jsdoc": "
|
|
90
|
+
"eslint-plugin-jsdoc": "48.0.4",
|
|
91
91
|
"eslint-plugin-no-unsafe-regex": "1.0.0",
|
|
92
92
|
"eslint-plugin-security": "1.7.1",
|
|
93
93
|
"eslint-plugin-sonarjs": "0.23.0",
|
|
94
|
-
"fast-check": "3.15.
|
|
94
|
+
"fast-check": "3.15.1",
|
|
95
95
|
"jsdoc": "4.0.2",
|
|
96
96
|
"jsdoc-tsimport-plugin": "1.0.5",
|
|
97
97
|
"mocha": "10.2.0",
|
|
98
|
-
"
|
|
98
|
+
"prettier": "3.2.4",
|
|
99
|
+
"prettier-plugin-jsdoc": "1.3.0",
|
|
100
|
+
"sass": "1.70.0",
|
|
99
101
|
"sinon": "17.0.1",
|
|
100
|
-
"
|
|
101
|
-
"supertest": "6.3.3",
|
|
102
|
+
"supertest": "6.3.4",
|
|
102
103
|
"typescript": "5.3.3"
|
|
103
104
|
}
|
|
104
105
|
}
|