@mouryaamit/nx-polystack 1.2.2 → 1.2.5
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/src/cli/commands/csp.d.ts +8 -0
- package/dist/src/cli/commands/csp.js +74 -3
- package/dist/src/cli/commands/csp.js.map +1 -1
- package/dist/src/cli/help.js +3 -0
- package/dist/src/cli/help.js.map +1 -1
- package/dist/src/cli/launcher.js +1 -1
- package/dist/src/cli/launcher.js.map +1 -1
- package/dist/src/executors/build/executor.js +36 -5
- package/dist/src/executors/build/executor.js.map +1 -1
- package/dist/src/executors/build/schema.d.ts +7 -0
- package/dist/src/executors/build/schema.json +41 -1
- package/dist/src/executors/flutter-build/executor.js +21 -0
- package/dist/src/executors/flutter-build/executor.js.map +1 -1
- package/dist/src/executors/flutter-build/schema.d.ts +2 -0
- package/dist/src/executors/flutter-build/schema.json +5 -0
- package/dist/src/generators/app/files/angular/server/README.md__template__ +3 -1
- package/dist/src/lib/csp/allowlist.d.ts +17 -0
- package/dist/src/lib/csp/allowlist.js +117 -3
- package/dist/src/lib/csp/allowlist.js.map +1 -1
- package/dist/src/lib/csp/import.js +21 -3
- package/dist/src/lib/csp/import.js.map +1 -1
- package/dist/src/lib/csp/render.d.ts +10 -5
- package/dist/src/lib/csp/render.js +72 -22
- package/dist/src/lib/csp/render.js.map +1 -1
- package/dist/src/lib/hardening/strip.d.ts +1 -0
- package/dist/src/lib/hardening/strip.js +3 -3
- package/dist/src/lib/hardening/strip.js.map +1 -1
- package/dist/src/lib/helpers/inject-nonce.d.ts +36 -5
- package/dist/src/lib/helpers/inject-nonce.js +155 -41
- package/dist/src/lib/helpers/inject-nonce.js.map +1 -1
- package/dist/src/lib/helpers/inject-sri.d.ts +8 -0
- package/dist/src/lib/helpers/inject-sri.js +72 -56
- package/dist/src/lib/helpers/inject-sri.js.map +1 -1
- package/dist/src/lib/helpers/strip-exif.d.ts +20 -2
- package/dist/src/lib/helpers/strip-exif.js +25 -5
- package/dist/src/lib/helpers/strip-exif.js.map +1 -1
- package/dist/src/lib/html/tags.d.ts +42 -0
- package/dist/src/lib/html/tags.js +173 -0
- package/dist/src/lib/html/tags.js.map +1 -0
- package/package.json +1 -1
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { Tree } from '@nx/devkit';
|
|
1
2
|
import { ImportResult } from '../../lib/csp/import';
|
|
2
3
|
import { CommandContext } from '../types';
|
|
3
4
|
/**
|
|
@@ -15,5 +16,12 @@ export declare function readImportSource(value: string, cwd: string): {
|
|
|
15
16
|
};
|
|
16
17
|
/** Report lines for an import. */
|
|
17
18
|
export declare function importReport(label: string, format: string, r: ImportResult, readNotes?: string[]): string[];
|
|
19
|
+
/**
|
|
20
|
+
* The release target(s) must write the placeholder the server config fills, in the target
|
|
21
|
+
* options and in every configuration that sets its own `nonce` (Nx replaces the whole object).
|
|
22
|
+
* A placeholder pstack wrote for env:NAME is reset when the source goes back to mod_unique_id;
|
|
23
|
+
* any other hand-set placeholder is only reported.
|
|
24
|
+
*/
|
|
25
|
+
export declare function syncNoncePlaceholder(tree: Tree, root: string, wanted: string, dryRun?: boolean): string[];
|
|
18
26
|
/** pstack csp --app=<project>: edit csp-allowlist.json and render .htaccess / nginx.conf from it. */
|
|
19
27
|
export declare function runCsp(ctx: CommandContext): Promise<number>;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.runCsp = exports.importReport = exports.readImportSource = exports.inlinesCriticalCss = void 0;
|
|
3
|
+
exports.runCsp = exports.syncNoncePlaceholder = exports.importReport = exports.readImportSource = exports.inlinesCriticalCss = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const fs = tslib_1.__importStar(require("fs"));
|
|
6
6
|
const path = tslib_1.__importStar(require("path"));
|
|
@@ -117,9 +117,64 @@ function importReport(label, format, r, readNotes = []) {
|
|
|
117
117
|
return lines;
|
|
118
118
|
}
|
|
119
119
|
exports.importReport = importReport;
|
|
120
|
+
/** A placeholder pstack csp writes for nonce-source env:NAME. */
|
|
121
|
+
const ENV_PLACEHOLDER = /^<!--#echo var='[A-Za-z_][A-Za-z0-9_]*' -->$/;
|
|
122
|
+
/**
|
|
123
|
+
* The release target(s) must write the placeholder the server config fills, in the target
|
|
124
|
+
* options and in every configuration that sets its own `nonce` (Nx replaces the whole object).
|
|
125
|
+
* A placeholder pstack wrote for env:NAME is reset when the source goes back to mod_unique_id;
|
|
126
|
+
* any other hand-set placeholder is only reported.
|
|
127
|
+
*/
|
|
128
|
+
function syncNoncePlaceholder(tree, root, wanted, dryRun = false) {
|
|
129
|
+
const file = `${root}/project.json`;
|
|
130
|
+
const raw = tree.read(file, 'utf-8');
|
|
131
|
+
if (raw === null)
|
|
132
|
+
return [];
|
|
133
|
+
const json = JSON.parse(raw);
|
|
134
|
+
const lines = [];
|
|
135
|
+
let changed = false;
|
|
136
|
+
const verb = (v) => (dryRun ? `would be ${v}` : v);
|
|
137
|
+
const sync = (where, holder, always) => {
|
|
138
|
+
if (!always && holder['nonce'] === undefined)
|
|
139
|
+
return;
|
|
140
|
+
const nonce = { ...(holder['nonce'] ?? {}) };
|
|
141
|
+
const current = nonce['placeholder'] ?? render_1.CSP_NONCE_SSI;
|
|
142
|
+
if (current === wanted)
|
|
143
|
+
return;
|
|
144
|
+
if (wanted === render_1.CSP_NONCE_SSI && !ENV_PLACEHOLDER.test(current)) {
|
|
145
|
+
lines.push(`Note: ${where} writes nonce.placeholder ${current}; this config fills ${render_1.CSP_NONCE_SSI}.`);
|
|
146
|
+
return;
|
|
147
|
+
}
|
|
148
|
+
if (wanted === render_1.CSP_NONCE_SSI)
|
|
149
|
+
delete nonce['placeholder'];
|
|
150
|
+
else
|
|
151
|
+
nonce['placeholder'] = wanted;
|
|
152
|
+
if (Object.keys(nonce).length === 0)
|
|
153
|
+
delete holder['nonce'];
|
|
154
|
+
else
|
|
155
|
+
holder['nonce'] = nonce;
|
|
156
|
+
changed = true;
|
|
157
|
+
lines.push(` ${file}: ${where} nonce.placeholder ${verb(wanted === render_1.CSP_NONCE_SSI ? 'reset to the default' : `set to ${wanted}`)}`);
|
|
158
|
+
};
|
|
159
|
+
for (const [name, target] of Object.entries(json.targets ?? {})) {
|
|
160
|
+
if (target.executor !== angular_project_1.POLYSTACK_BUILD_EXECUTOR)
|
|
161
|
+
continue;
|
|
162
|
+
const options = target.options ?? {};
|
|
163
|
+
sync(name, options, wanted !== render_1.CSP_NONCE_SSI);
|
|
164
|
+
if (Object.keys(options).length > 0)
|
|
165
|
+
target.options = options;
|
|
166
|
+
for (const [cfg, opts] of Object.entries(target.configurations ?? {})) {
|
|
167
|
+
sync(`${name}:${cfg}`, opts, false);
|
|
168
|
+
}
|
|
169
|
+
}
|
|
170
|
+
if (changed)
|
|
171
|
+
tree.write(file, JSON.stringify(json, null, 2) + '\n');
|
|
172
|
+
return lines;
|
|
173
|
+
}
|
|
174
|
+
exports.syncNoncePlaceholder = syncNoncePlaceholder;
|
|
120
175
|
/** pstack csp --app=<project>: edit csp-allowlist.json and render .htaccess / nginx.conf from it. */
|
|
121
176
|
async function runCsp(ctx) {
|
|
122
|
-
for (const f of ['app', 'add', 'remove', 'import']) {
|
|
177
|
+
for (const f of ['app', 'add', 'remove', 'import', 'nonceSource']) {
|
|
123
178
|
if (ctx.flags[f] === true)
|
|
124
179
|
throw new types_1.CliError(`--${f} needs a value.`);
|
|
125
180
|
}
|
|
@@ -129,6 +184,7 @@ async function runCsp(ctx) {
|
|
|
129
184
|
const adds = parseEdits('add', (0, args_1.flagString)(ctx.flags, 'add'));
|
|
130
185
|
const removes = parseEdits('remove', (0, args_1.flagString)(ctx.flags, 'remove'));
|
|
131
186
|
const force = ctx.flags['force'] !== undefined && (0, args_1.flagBoolean)(ctx.flags, 'force');
|
|
187
|
+
const nonceSourceFlag = (0, args_1.flagString)(ctx.flags, 'nonceSource');
|
|
132
188
|
const importFlag = (0, args_1.flagString)(ctx.flags, 'import');
|
|
133
189
|
const imported = importFlag === undefined ? undefined : readImportSource(importFlag, ctx.cwd);
|
|
134
190
|
let parsedImport;
|
|
@@ -188,6 +244,8 @@ async function runCsp(ctx) {
|
|
|
188
244
|
}
|
|
189
245
|
edited.sources[directive] = before.filter((s) => s !== source);
|
|
190
246
|
}
|
|
247
|
+
if (nonceSourceFlag !== undefined)
|
|
248
|
+
edited.nonceSource = nonceSourceFlag;
|
|
191
249
|
let checked;
|
|
192
250
|
try {
|
|
193
251
|
checked = (0, allowlist_1.parseAllowlist)(JSON.parse((0, allowlist_1.serializeAllowlist)(edited)));
|
|
@@ -196,7 +254,9 @@ async function runCsp(ctx) {
|
|
|
196
254
|
throw new types_1.CliError(err.message);
|
|
197
255
|
}
|
|
198
256
|
// An import that adds nothing leaves csp-allowlist.json as it is (also its formatting).
|
|
199
|
-
const
|
|
257
|
+
const nonceSourceChanged = nonceSourceFlag !== undefined &&
|
|
258
|
+
(checked.nonceSource ?? 'mod_unique_id') !== (allowlist.nonceSource ?? 'mod_unique_id');
|
|
259
|
+
const edits = adds.length + removes.length + (importAdded ? 1 : 0) + (nonceSourceChanged ? 1 : 0);
|
|
200
260
|
if (edits > 0) {
|
|
201
261
|
const text = (0, allowlist_1.serializeAllowlist)(checked);
|
|
202
262
|
if (tree.read(listFile, 'utf-8') !== text)
|
|
@@ -206,11 +266,14 @@ async function runCsp(ctx) {
|
|
|
206
266
|
out.unshift(`CSP of ${app} (${listFile}):`, ...Object.entries(checked.sources)
|
|
207
267
|
.filter(([, v]) => v.length > 0)
|
|
208
268
|
.map(([k, v]) => ` ${k.padEnd(16)}${v.join(' ')}`), ` policy ${(0, allowlist_1.buildPolicy)(checked).replace(/\{N\}/g, '<nonce>')}`);
|
|
269
|
+
let htaccessKept = false;
|
|
209
270
|
for (const [file, text] of [
|
|
210
271
|
[`${project.root}/src/.htaccess`, (0, render_1.renderHtaccess)(app, checked)],
|
|
211
272
|
[`${project.root}/server/nginx.conf`, (0, render_1.renderNginx)(app, checked)],
|
|
212
273
|
]) {
|
|
213
274
|
const state = fileState(tree, file, text);
|
|
275
|
+
if (state === 'hand-written' && !force && file.endsWith('.htaccess'))
|
|
276
|
+
htaccessKept = true;
|
|
214
277
|
if (state === 'hand-written' && !force) {
|
|
215
278
|
out.push(` ${file}: hand-written, kept (--force replaces it)` +
|
|
216
279
|
(edits > 0 ? ' — it does not have this change' : ''));
|
|
@@ -224,6 +287,14 @@ async function runCsp(ctx) {
|
|
|
224
287
|
out.push(` ${file}: ${ctx.dryRun ? `would be ${done}` : done}`);
|
|
225
288
|
}
|
|
226
289
|
}
|
|
290
|
+
// The build must write what the Apache config fills; a kept hand-written .htaccess may
|
|
291
|
+
// expect something else, so the target is left alone then.
|
|
292
|
+
if (htaccessKept) {
|
|
293
|
+
out.push(' release nonce.placeholder not synced: src/.htaccess is hand-written (--force replaces it)');
|
|
294
|
+
}
|
|
295
|
+
else {
|
|
296
|
+
out.push(...syncNoncePlaceholder(tree, project.root, (0, render_1.noncePlaceholder)(checked), !!ctx.dryRun));
|
|
297
|
+
}
|
|
227
298
|
const inlining = inlinesCriticalCss(project.json);
|
|
228
299
|
if (inlining.length > 0) {
|
|
229
300
|
out.push(`Warning: the ${inlining.join(', ')} build(s) inline critical CSS; its onload handler is ` +
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"csp.js","sourceRoot":"","sources":["../../../../src/cli/commands/csp.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"csp.js","sourceRoot":"","sources":["../../../../src/cli/commands/csp.ts"],"names":[],"mappings":"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"}
|
package/dist/src/cli/help.js
CHANGED
|
@@ -220,6 +220,9 @@ OPTIONS — csp (--app required; writes the server files that are missing or wer
|
|
|
220
220
|
.htaccess / nginx.conf, or JSON (directive → sources); refused
|
|
221
221
|
sources ('unsafe-inline', 'unsafe-eval', http:, …) are listed, not
|
|
222
222
|
imported; paths covered by a host entry are dropped
|
|
223
|
+
--nonce-source=<src> mod_unique_id (default) or env:<VAR>: a variable the server sets per
|
|
224
|
+
request (e.g. env:UNIQUE_ID from mod_lua), used as is; also sets the
|
|
225
|
+
release target's nonce.placeholder
|
|
223
226
|
--force Also replace hand-written .htaccess / nginx.conf
|
|
224
227
|
--dry-run Show what would change
|
|
225
228
|
|
package/dist/src/cli/help.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"help.js","sourceRoot":"","sources":["../../../src/cli/help.ts"],"names":[],"mappings":";;;AAAA,qDAAiD;AACjD,yCAAkD;AAElD,SAAgB,QAAQ,CAAC,OAAe;IACtC,OAAO;yCACgC,OAAO
|
|
1
|
+
{"version":3,"file":"help.js","sourceRoot":"","sources":["../../../src/cli/help.ts"],"names":[],"mappings":";;;AAAA,qDAAiD;AACjD,yCAAkD;AAElD,SAAgB,QAAQ,CAAC,OAAe;IACtC,OAAO;yCACgC,OAAO;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;SAsP5C,IAAA,8BAAa,GAAE,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,mDAAmD,CAAC,CAAC,CAAC,EAC5F;IACE,IAAA,+BAAoB,EAAC,OAAO,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA+ChC,CAAC,SAAS,EAAE,CAAC;AACd,CAAC;AA1SD,4BA0SC"}
|
package/dist/src/cli/launcher.js
CHANGED
|
@@ -48,7 +48,7 @@ exports.MIN_LOCAL_FLAG_VERSION = {
|
|
|
48
48
|
},
|
|
49
49
|
env: { app: '0.34.0', all: '0.34.0', from: '0.34.0', baseHref: '0.34.0', domains: '0.34.0' },
|
|
50
50
|
lib: { dir: '0.19.0' },
|
|
51
|
-
csp: { import: '0.38.0' },
|
|
51
|
+
csp: { import: '0.38.0', nonceSource: '1.2.5' },
|
|
52
52
|
infra: { lintStaged: '0.36.0' },
|
|
53
53
|
migrate: {
|
|
54
54
|
rollback: '0.13.0',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"launcher.js","sourceRoot":"","sources":["../../../src/cli/launcher.ts"],"names":[],"mappings":";;;;AAAA,iDAA0C;AAC1C,+CAAyB;AACzB,mDAA6B;AAI7B,mCAAmC;AACnC,yCAA6C;AAE7C,kDAAkD;AACrC,QAAA,cAAc,GAAG,IAAI,GAAG,CAAC,CAAC,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,UAAU,CAAC,CAAC,CAAC;AAEjF,uFAAuF;AAC1E,QAAA,kBAAkB,GAAG,IAAI,GAAG,CAAC;IACxC,KAAK;IACL,KAAK;IACL,KAAK;IACL,KAAK;IACL,SAAS;IACT,OAAO;IACP,YAAY;IACZ,WAAW;IACX,OAAO;IACP,SAAS;IACT,KAAK;IACL,QAAQ;CACT,CAAC,CAAC;AAEH,4FAA4F;AAC/E,QAAA,iBAAiB,GAAqC;IACjE,GAAG,EAAE,OAAO;IACZ,GAAG,EAAE,OAAO;IACZ,OAAO,EAAE,QAAQ;IACjB,KAAK,EAAE,OAAO;IACd,UAAU,EAAE,QAAQ;IACpB,SAAS,EAAE,QAAQ;IACnB,KAAK,EAAE,QAAQ;IACf,OAAO,EAAE,QAAQ;IACjB,GAAG,EAAE,QAAQ;IACb,MAAM,EAAE,QAAQ;CACjB,CAAC;AAEF,kGAAkG;AACrF,QAAA,sBAAsB,GAA+D;IAChG,GAAG,EAAE;QACH,GAAG,EAAE,QAAQ;QACb,QAAQ,EAAE,QAAQ;QAClB,IAAI,EAAE,QAAQ;QACd,SAAS,EAAE,QAAQ;QACnB,IAAI,EAAE,OAAO;KACd;IACD,GAAG,EAAE,EAAE,GAAG,EAAE,QAAQ,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,QAAQ,EAAE,OAAO,EAAE,QAAQ,EAAE;IAC5F,GAAG,EAAE,EAAE,GAAG,EAAE,QAAQ,EAAE;IACtB,GAAG,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE;
|
|
1
|
+
{"version":3,"file":"launcher.js","sourceRoot":"","sources":["../../../src/cli/launcher.ts"],"names":[],"mappings":"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"}
|
|
@@ -24,7 +24,7 @@ const defaultRunner = (cmd, opts) => {
|
|
|
24
24
|
(0, child_process_1.execSync)(cmd, opts);
|
|
25
25
|
};
|
|
26
26
|
async function buildExecutor(options, context, runner = defaultRunner, seams = {}) {
|
|
27
|
-
const { type, outputPath, envProject, env, buildTarget, buildConfiguration, secure = false, sri = false, baseHref, keySplit, domains, includeWww, onMismatch, } = options;
|
|
27
|
+
const { type, outputPath, envProject, env, buildTarget, buildConfiguration, secure = false, nonce, stripHtmlComments = false, sri = false, baseHref, keySplit, domains, includeWww, onMismatch, } = options;
|
|
28
28
|
if (!env) {
|
|
29
29
|
throw new Error('build executor: "env" is required — set it via Nx configurations (e.g. dev / uat / prod)');
|
|
30
30
|
}
|
|
@@ -40,6 +40,13 @@ async function buildExecutor(options, context, runner = defaultRunner, seams = {
|
|
|
40
40
|
}
|
|
41
41
|
// Invalid hardening options fail before the env files are touched or anything is built.
|
|
42
42
|
const hardening = (0, options_1.resolveHardening)(options, env);
|
|
43
|
+
let nonceSettings;
|
|
44
|
+
try {
|
|
45
|
+
nonceSettings = (0, inject_nonce_1.resolveNonceSettings)(nonce);
|
|
46
|
+
}
|
|
47
|
+
catch (err) {
|
|
48
|
+
throw new Error(`build executor: ${err.message}`);
|
|
49
|
+
}
|
|
43
50
|
hardening.warnings.forEach((w) => console.warn(`⚠ ${w}`));
|
|
44
51
|
const ciCtx = (0, ci_resolve_1.resolveCiContext)();
|
|
45
52
|
// SRI for every chunk: Angular hashes them (the webpack runtime holds the lazy ones), the hashes
|
|
@@ -124,8 +131,16 @@ async function buildExecutor(options, context, runner = defaultRunner, seams = {
|
|
|
124
131
|
fs.mkdirSync(path.join(servedDir, 'assets'), { recursive: true });
|
|
125
132
|
fs.writeFileSync(path.join(servedDir, 'assets', asset.name), asset.bytes);
|
|
126
133
|
}
|
|
127
|
-
|
|
128
|
-
|
|
134
|
+
// Every env: only images that carry EXIF are rewritten, the rest stay byte-identical.
|
|
135
|
+
if (fs.existsSync(distDir)) {
|
|
136
|
+
const exif = await (0, strip_exif_1.stripExif)({
|
|
137
|
+
rootDir: distDir,
|
|
138
|
+
log: (m) => {
|
|
139
|
+
if (m.startsWith('skipped'))
|
|
140
|
+
console.warn(`⚠ strip-exif ${m}`);
|
|
141
|
+
},
|
|
142
|
+
});
|
|
143
|
+
console.log(`ℹ ${(0, strip_exif_1.stripExifSummary)(exif)}`);
|
|
129
144
|
}
|
|
130
145
|
if (fs.existsSync(metaHtml)) {
|
|
131
146
|
(0, inject_meta_1.injectBuildMeta)({
|
|
@@ -141,11 +156,27 @@ async function buildExecutor(options, context, runner = defaultRunner, seams = {
|
|
|
141
156
|
}
|
|
142
157
|
// The served index.html: <outputPath>, or <outputPath>/browser for the application builder.
|
|
143
158
|
if (fs.existsSync(path.join(checkRoot, 'index.html'))) {
|
|
159
|
+
if (stripHtmlComments) {
|
|
160
|
+
for (const rel of nonceSettings.files) {
|
|
161
|
+
const file = path.join(checkRoot, rel);
|
|
162
|
+
if (!fs.existsSync(file))
|
|
163
|
+
continue;
|
|
164
|
+
const html = fs.readFileSync(file, 'utf8');
|
|
165
|
+
const out = (0, strip_1.stripHtmlComments)(html);
|
|
166
|
+
if (out !== html)
|
|
167
|
+
fs.writeFileSync(file, out);
|
|
168
|
+
}
|
|
169
|
+
}
|
|
144
170
|
if (secure) {
|
|
145
|
-
(0, inject_nonce_1.injectCspNonce)({ distDir });
|
|
171
|
+
(0, inject_nonce_1.injectCspNonce)({ distDir, ...nonceSettings, stripComments: false });
|
|
146
172
|
}
|
|
147
173
|
if (sri || builtWithIntegrity) {
|
|
148
|
-
(0, inject_sri_1.injectSri)({
|
|
174
|
+
(0, inject_sri_1.injectSri)({
|
|
175
|
+
distDir,
|
|
176
|
+
cdnAllowlist: readSriAllowlist(repoRoot),
|
|
177
|
+
refresh: true,
|
|
178
|
+
files: nonceSettings.files,
|
|
179
|
+
});
|
|
149
180
|
}
|
|
150
181
|
if (chunkSri && prepared.keyParts) {
|
|
151
182
|
noteExternalScripts(path.join(checkRoot, 'index.html'));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../../../src/executors/build/executor.ts"],"names":[],"mappings":";;;;AAAA,iDAA0D;AAC1D,+CAAyB;AACzB,mDAA6B;AAI7B,8DAAkE;AAClE,qDAA+E;AAC/E,6DAA+F;AAC/F,+DAA4D;AAC5D,mDAA6D;AAC7D,6DAA4E;AAC5E,yDAA+D;AAC/D,iEAAkE;AAClE,
|
|
1
|
+
{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../../../src/executors/build/executor.ts"],"names":[],"mappings":";;;;AAAA,iDAA0D;AAC1D,+CAAyB;AACzB,mDAA6B;AAI7B,8DAAkE;AAClE,qDAA+E;AAC/E,6DAA+F;AAC/F,+DAA4D;AAC5D,mDAA6D;AAC7D,6DAA4E;AAC5E,yDAA+D;AAC/D,iEAAkE;AAClE,qDAAoG;AACpG,+DAAgE;AAChE,iEAAsF;AACtF,6DAAyD;AACzD,6DAA2E;AAC3E,2DAA8D;AAW9D,MAAM,aAAa,GAAW,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE;IAC1C,OAAO,CAAC,GAAG,CAAC,KAAK,GAAG,EAAE,CAAC,CAAC;IACxB,IAAA,wBAAQ,EAAC,GAAG,EAAE,IAAI,CAAC,CAAC;AACtB,CAAC,CAAC;AAEa,KAAK,UAAU,aAAa,CACzC,OAA4B,EAC5B,OAAwB,EACxB,SAAiB,aAAa,EAC9B,QAAoB,EAAE;IAEtB,MAAM,EACJ,IAAI,EACJ,UAAU,EACV,UAAU,EACV,GAAG,EACH,WAAW,EACX,kBAAkB,EAClB,MAAM,GAAG,KAAK,EACd,KAAK,EACL,iBAAiB,GAAG,KAAK,EACzB,GAAG,GAAG,KAAK,EACX,QAAQ,EACR,QAAQ,EACR,OAAO,EACP,UAAU,EACV,UAAU,GACX,GAAG,OAAO,CAAC;IAEZ,IAAI,CAAC,GAAG,EAAE;QACR,MAAM,IAAI,KAAK,CACb,0FAA0F,CAC3F,CAAC;KACH;IAED,MAAM,WAAW,GAAG,OAAO,CAAC,WAAY,CAAC;IACzC,MAAM,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;IAE9B,MAAM,MAAM,GAAG,WAAW,IAAI,GAAG,WAAW,QAAQ,CAAC;IACrD,IAAI,CAAC,mBAAmB,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE;QACrC,MAAM,IAAI,KAAK,CACb,gCAAgC,MAAM,yCAAyC,CAChF,CAAC;KACH;IACD,IAAI,OAAO,CAAC,UAAU,IAAI,MAAM,KAAK,GAAG,WAAW,IAAI,OAAO,CAAC,UAAU,EAAE,EAAE;QAC3E,MAAM,IAAI,KAAK,CACb,gCAAgC,MAAM,2BAA2B;YAC/D,wGAAwG,CAC3G,CAAC;KACH;IAED,wFAAwF;IACxF,MAAM,SAAS,GAAG,IAAA,0BAAgB,EAAC,OAAO,EAAE,GAAG,CAAC,CAAC;IACjD,IAAI,aAAsD,CAAC;IAC3D,IAAI;QACF,aAAa,GAAG,IAAA,mCAAoB,EAAC,KAAK,CAAC,CAAC;KAC7C;IAAC,OAAO,GAAG,EAAE;QACZ,MAAM,IAAI,KAAK,CAAC,mBAAoB,GAAa,CAAC,OAAO,EAAE,CAAC,CAAC;KAC9D;IACD,SAAS,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC;IAE1D,MAAM,KAAK,GAAG,IAAA,6BAAgB,GAAE,CAAC;IACjC,iGAAiG;IACjG,sFAAsF;IACtF,MAAM,QAAQ,GAAG,GAAG,IAAI,GAAG,KAAK,KAAK,CAAC;IAEtC,MAAM,WAAW,GAAG,UAAU,CAAC,QAAQ,EAAE,UAAU,EAAE,GAAG,CAAC,CAAC;IAC1D,oFAAoF;IACpF,MAAM,GAAG,GAAG,IAAI,IAAI,EAAE,CAAC;IACvB,MAAM,QAAQ,GAAG,IAAA,wBAAc,EAAC;QAC9B,QAAQ;QACR,UAAU;QACV,GAAG;QACH,OAAO,EAAE,WAAW;QACpB,MAAM,EAAE,KAAK,CAAC,MAAM;QACpB,MAAM,EAAE,KAAK,CAAC,MAAM;QACpB,GAAG;QACH,QAAQ;QACR,OAAO;QACP,UAAU;QACV,UAAU;QACV,gBAAgB,EAAE,QAAQ;KAC3B,CAAC,CAAC;IACH,IAAI,QAAQ,IAAI,CAAC,QAAQ,CAAC,QAAQ,EAAE;QAClC,OAAO,CAAC,GAAG,CACT,uFAAuF,CACxF,CAAC;KACH;IACD,IAAI;QACF,MAAM,aAAa,GACjB,kBAAkB,IAAI,CAAC,GAAG,KAAK,MAAM,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,GAAG,KAAK,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC;QAChG,MAAM,SAAS,GAAG,gBAAgB,UAAU,EAAE,CAAC;QAC/C,MAAM,WAAW,GAAG,QAAQ,CAAC,CAAC,CAAC,cAAc,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAC7D,4FAA4F;QAC5F,MAAM,QAAQ,GAAG,GAAG,KAAK,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,iBAAiB,CAAC;QACxD,MAAM,MAAM,GAAG,QAAQ,CAAC,CAAC,CAAC,wBAAwB,CAAC,CAAC,CAAC,EAAE,CAAC;QACxD,MAAM,GAAG,GACP,cAAc,MAAM,IAAI,aAAa,IAAI,SAAS,IAAI,WAAW,IAAI,MAAM,IAAI,QAAQ,EAAE;aACtF,OAAO,CAAC,MAAM,EAAE,GAAG,CAAC;aACpB,IAAI,EAAE,CAAC;QAEZ,MAAM,CAAC,GAAG,EAAE,EAAE,KAAK,EAAE,SAAS,EAAE,GAAG,EAAE,QAAQ,EAAE,CAAC,CAAC;KAClD;IAAC,OAAO,GAAG,EAAE;QACZ,IAAI;YACF,QAAQ,CAAC,OAAO,EAAE,CAAC;SACpB;QAAC,OAAO,UAAU,EAAE;YACnB,4EAA4E;YAC5E,OAAO,CAAC,KAAK,CAAC,4BAA6B,UAAoB,CAAC,OAAO,EAAE,CAAC,CAAC;SAC5E;QACD,MAAM,GAAG,CAAC;KACX;IACD,QAAQ,CAAC,OAAO,EAAE,CAAC;IAEnB,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAC;IAEnD,2FAA2F;IAC3F,4BAA4B;IAC5B,MAAM,SAAS,GAAG,IAAA,kBAAU,EAAC,OAAO,CAAC,CAAC;IACtC,YAAY,CAAC;QACX,IAAA,uBAAU,EAAC,SAAS,EAAE,QAAQ,CAAC,OAAO,EAAE,SAAS,CAAC,SAAS,CAAC;QAC5D,IAAA,6BAAe,EAAC,SAAS,EAAE,SAAS,CAAC,UAAU,CAAC;KACjD,CAAC,CAAC;IACH,iGAAiG;IACjG,qEAAqE;IACrE,MAAM,kBAAkB,GACtB,GAAG,KAAK,KAAK,IAAI,CAAC,QAAQ,IAAI,YAAY,CAAC,SAAS,CAAC,IAAI,IAAA,gCAAoB,EAAC,SAAS,CAAC,CAAC,CAAC;IAC5F,MAAM,cAAc,GAAG,kBAAkB,CAAC,CAAC,CAAC,IAAA,wBAAY,EAAC,SAAS,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;IAChF,MAAM,QAAQ,GAAG,MAAM,IAAA,mBAAW,EAAC,SAAS,EAAE,EAAE,GAAG,SAAS,EAAE,QAAQ,EAAE,CAAC,CAAC;IAC1E,QAAQ,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC;IACrD,MAAM,UAAU,GAAG,MAAM,IAAA,2BAAe,EAAC,SAAS,EAAE;QAClD,QAAQ;QACR,IAAI,EAAE,SAAS,CAAC,SAAS;QACzB,SAAS,EAAE,SAAS,CAAC,gBAAgB;QACrC,UAAU,EAAE,KAAK,CAAC,UAAU;KAC7B,CAAC,CAAC;IACH,IAAI,UAAU,CAAC,KAAK,GAAG,CAAC,EAAE;QACxB,OAAO,CAAC,GAAG,CACT,iBAAiB,UAAU,CAAC,KAAK,aAAa,EAAE,CAAC,UAAU,CAAC,WAAW,CAAC,MAAM,EAAE,CAC9E,UAAU,CAAC,UAAU,CACtB,EAAE,CACJ,CAAC;KACH;IACD,IAAI,cAAc,EAAE;QAClB,IAAA,sBAAU,EAAC,SAAS,EAAE,cAAc,CAAC,CAAC;QACtC,uBAAuB,CAAC,SAAS,CAAC,CAAC;KACpC;IAED,+FAA+F;IAC/F,6FAA6F;IAC7F,MAAM,SAAS,GAAG,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC,aAAa,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC;IACnF,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,YAAY,CAAC,CAAC;IACpD,MAAM,KAAK,GAAG,QAAQ,CAAC,QAAQ,EAAE,KAAK,CAAC;IACvC,IAAI,KAAK,EAAE;QACT,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,QAAQ,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QAClE,EAAE,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,QAAQ,EAAE,KAAK,CAAC,IAAI,CAAC,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC;KAC3E;IAED,sFAAsF;IACtF,IAAI,EAAE,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE;QAC1B,MAAM,IAAI,GAAG,MAAM,IAAA,sBAAS,EAAC;YAC3B,OAAO,EAAE,OAAO;YAChB,GAAG,EAAE,CAAC,CAAC,EAAE,EAAE;gBACT,IAAI,CAAC,CAAC,UAAU,CAAC,SAAS,CAAC;oBAAE,OAAO,CAAC,IAAI,CAAC,gBAAgB,CAAC,EAAE,CAAC,CAAC;YACjE,CAAC;SACF,CAAC,CAAC;QACH,OAAO,CAAC,GAAG,CAAC,KAAK,IAAA,6BAAgB,EAAC,IAAI,CAAC,EAAE,CAAC,CAAC;KAC5C;IAED,IAAI,EAAE,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE;QAC3B,IAAA,6BAAe,EAAC;YACd,aAAa,EAAE,QAAQ;YACvB,GAAG;YACH,MAAM,EAAE,KAAK,CAAC,MAAM;YACpB,MAAM,EAAE,KAAK,CAAC,MAAM;YACpB,WAAW,EAAE,KAAK,CAAC,WAAW;YAC9B,QAAQ,EAAE,QAAQ,CAAC,MAAM,CAAC,QAAQ;YAClC,GAAG;YACH,KAAK,EAAE,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,QAAQ,CAAC,QAAQ,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,SAAS;SACtE,CAAC,CAAC;KACJ;IAED,4FAA4F;IAC5F,IAAI,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,YAAY,CAAC,CAAC,EAAE;QACrD,IAAI,iBAAiB,EAAE;YACrB,KAAK,MAAM,GAAG,IAAI,aAAa,CAAC,KAAK,EAAE;gBACrC,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,GAAG,CAAC,CAAC;gBACvC,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC;oBAAE,SAAS;gBACnC,MAAM,IAAI,GAAG,EAAE,CAAC,YAAY,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;gBAC3C,MAAM,GAAG,GAAG,IAAA,yBAAqB,EAAC,IAAI,CAAC,CAAC;gBACxC,IAAI,GAAG,KAAK,IAAI;oBAAE,EAAE,CAAC,aAAa,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;aAC/C;SACF;QACD,IAAI,MAAM,EAAE;YACV,IAAA,6BAAc,EAAC,EAAE,OAAO,EAAE,GAAG,aAAa,EAAE,aAAa,EAAE,KAAK,EAAE,CAAC,CAAC;SACrE;QAED,IAAI,GAAG,IAAI,kBAAkB,EAAE;YAC7B,IAAA,sBAAS,EAAC;gBACR,OAAO;gBACP,YAAY,EAAE,gBAAgB,CAAC,QAAQ,CAAC;gBACxC,OAAO,EAAE,IAAI;gBACb,KAAK,EAAE,aAAa,CAAC,KAAK;aAC3B,CAAC,CAAC;SACJ;QACD,IAAI,QAAQ,IAAI,QAAQ,CAAC,QAAQ,EAAE;YACjC,mBAAmB,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,YAAY,CAAC,CAAC,CAAC;SACzD;KACF;IAED,2FAA2F;IAC3F,yBAAyB;IACzB,MAAM,WAAW,GAAG,IAAA,wBAAiB,EAAC,SAAS,CAAC,CAAC;IACjD,IAAI,WAAW,GAAG,CAAC;QAAE,OAAO,CAAC,GAAG,CAAC,gBAAgB,WAAW,mBAAmB,CAAC,CAAC;IAEjF,OAAO,CAAC,GAAG,CAAC,2BAA2B,IAAI,SAAS,GAAG,YAAY,UAAU,EAAE,CAAC,CAAC;IACjF,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;AAC3B,CAAC;AAnND,gCAmNC;AAED;;;GAGG;AACH,SAAS,mBAAmB,CAAC,SAAiB;IAC5C,MAAM,IAAI,GAAG,EAAE,CAAC,YAAY,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;IAChD,MAAM,KAAK,GAAG,IAAI,GAAG,EAAU,CAAC;IAChC,KAAK,MAAM,GAAG,IAAI,IAAI,CAAC,KAAK,CAAC,mBAAmB,CAAC,IAAI,EAAE,EAAE;QACvD,IAAI,kBAAkB,CAAC,IAAI,CAAC,GAAG,CAAC;YAAE,SAAS;QAC3C,MAAM,GAAG,GAAG,+CAA+C,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;QAC3E,IAAI,CAAC,GAAG;YAAE,SAAS;QACnB,IAAI;YACF,KAAK,CAAC,GAAG,CAAC,IAAI,GAAG,CAAC,GAAG,EAAE,mBAAmB,CAAC,CAAC,IAAI,CAAC,CAAC;SACnD;QAAC,MAAM;YACN,6BAA6B;SAC9B;KACF;IACD,IAAI,KAAK,CAAC,IAAI,GAAG,CAAC,EAAE;QAClB,OAAO,CAAC,GAAG,CACT,iDAAiD,CAAC,GAAG,KAAK,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,oBAAoB;YACxF,iDAAiD,CACpD,CAAC;KACH;AACH,CAAC;AAED,0EAA0E;AAC1E,SAAS,YAAY,CAAC,IAAY;IAChC,MAAM,KAAK,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,YAAY,CAAC,CAAC;IAC5C,OAAO,EAAE,CAAC,UAAU,CAAC,KAAK,CAAC,IAAI,kBAAkB,CAAC,IAAI,CAAC,EAAE,CAAC,YAAY,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC;AACzF,CAAC;AAED,MAAM,EAAE,GAAG,CAAC,KAAa,EAAE,EAAE,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC;AAE/D;;;GAGG;AACH,SAAS,uBAAuB,CAAC,IAAY;IAC3C,IAAI,IAAA,gCAAoB,EAAC,IAAI,CAAC;QAAE,OAAO;IACvC,MAAM,IAAI,GAAG,IAAA,iBAAS,EAAC,IAAI,EAAE,CAAC,IAAI,EAAE,KAAK,CAAC,EAAE,EAAE,QAAQ,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAC/E,yBAAyB,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CACjD,CAAC;IACF,IAAI,IAAI,EAAE;QACR,OAAO,CAAC,IAAI,CACV,wFAAwF;YACtF,mDAAmD,CACtD,CAAC;KACH;AACH,CAAC;AAED,+EAA+E;AAC/E,SAAS,YAAY,CAAC,OAAsB;IAC1C,MAAM,QAAQ,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC;IACpD,MAAM,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;IAChD,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC;IAChD,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE;QACrB,MAAM,IAAI,KAAK,CAAC,2BAA2B,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;KACxF;AACH,CAAC;AAED,oGAAoG;AACpG,SAAS,aAAa,CAAC,OAAe,EAAE,UAAkB;IACxD,MAAM,GAAG,GAAG,IAAA,kBAAU,EAAC,OAAO,CAAC,CAAC;IAChC,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,YAAY,CAAC,CAAC,EAAE;QAChD,MAAM,IAAI,KAAK,CACb,6CAA6C,UAAU,sCAAsC,CAC9F,CAAC;KACH;IACD,OAAO,GAAG,CAAC;AACb,CAAC;AAED;;;GAGG;AACH,SAAgB,UAAU,CAAC,QAAgB,EAAE,UAAkB,EAAE,GAAW;IAC1E,MAAM,GAAG,GAAG,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,cAAc,EAAE,UAAU,CAAC,CAAC;IAC5D,IAAI,GAAG,KAAK,KAAK;QAAE,OAAO,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,eAAe,GAAG,CAAC,WAAW,EAAE,KAAK,CAAC,CAAC;IAChF,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,gBAAgB,CAAC,CAAC;IAC9C,MAAM,MAAM,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,oBAAoB,CAAC,CAAC;IACpD,OAAO,CAAC,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC;AACvE,CAAC;AAND,gCAMC;AAED,SAAS,gBAAgB,CAAC,QAAgB;IACxC,MAAM,aAAa,GAAG,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,OAAO,EAAE,QAAQ,EAAE,wBAAwB,CAAC,CAAC;IACvF,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,aAAa,CAAC;QAAE,OAAO,EAAE,CAAC;IAC7C,IAAI;QACF,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,YAAY,CAAC,aAAa,EAAE,MAAM,CAAC,CAAC,CAAC;QAC/D,IAAI,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC;YAAE,OAAO,GAAG,CAAC,KAAiB,CAAC;KAC5D;IAAC,MAAM;QACN,0BAA0B;KAC3B;IACD,OAAO,EAAE,CAAC;AACZ,CAAC"}
|
|
@@ -1,3 +1,5 @@
|
|
|
1
|
+
import { NonceSettings } from '../../lib/helpers/inject-nonce';
|
|
2
|
+
|
|
1
3
|
export interface BuildExecutorSchema {
|
|
2
4
|
type: 'angular' | 'ionic';
|
|
3
5
|
outputPath: string;
|
|
@@ -8,7 +10,12 @@ export interface BuildExecutorSchema {
|
|
|
8
10
|
buildTarget?: string;
|
|
9
11
|
/** Configuration of buildTarget. Default: PROD → production, UAT → uat, otherwise development. */
|
|
10
12
|
buildConfiguration?: string;
|
|
13
|
+
/** Write the CSP nonce placeholder into the served index.html (and the other nonce.files). */
|
|
11
14
|
secure?: boolean;
|
|
15
|
+
/** secure: how the nonce placeholder is written (defaults: the standard markup). */
|
|
16
|
+
nonce?: NonceSettings;
|
|
17
|
+
/** Every env: remove HTML comments (not SSI or IE conditionals) from the nonce.files pages. */
|
|
18
|
+
stripHtmlComments?: boolean;
|
|
12
19
|
/**
|
|
13
20
|
* Integrity for every chunk: passed to the Angular build as --subresource-integrity, hashes
|
|
14
21
|
* refreshed after strip/obfuscate. With cipher aes-gcm the runtime refuses to decrypt when a
|
|
@@ -33,7 +33,47 @@
|
|
|
33
33
|
"secure": {
|
|
34
34
|
"type": "boolean",
|
|
35
35
|
"default": false,
|
|
36
|
-
"description": "
|
|
36
|
+
"description": "Write the CSP nonce placeholder into the served index.html (and the other nonce.files); nothing under assets/ is touched."
|
|
37
|
+
},
|
|
38
|
+
"nonce": {
|
|
39
|
+
"type": "object",
|
|
40
|
+
"description": "secure: how the nonce placeholder is written. Defaults keep the standard markup; set them to match an existing server setup.",
|
|
41
|
+
"additionalProperties": false,
|
|
42
|
+
"properties": {
|
|
43
|
+
"placeholder": {
|
|
44
|
+
"type": "string",
|
|
45
|
+
"description": "What the server replaces per request. Default: <!--#echo var=\"CSP_NONCE\" --> (what pstack csp configures)."
|
|
46
|
+
},
|
|
47
|
+
"tags": {
|
|
48
|
+
"type": "string",
|
|
49
|
+
"enum": ["all", "legacy"],
|
|
50
|
+
"description": "all (default): every script, style and stylesheet link. legacy: inline scripts (no src), every link and every style."
|
|
51
|
+
},
|
|
52
|
+
"position": {
|
|
53
|
+
"type": "string",
|
|
54
|
+
"enum": ["end", "after-tag-name"],
|
|
55
|
+
"description": "Where the nonce attribute goes in a tag (default end)."
|
|
56
|
+
},
|
|
57
|
+
"replaceTokens": {
|
|
58
|
+
"type": "array",
|
|
59
|
+
"items": { "type": "string" },
|
|
60
|
+
"description": "Text replaced by the placeholder anywhere in the page, e.g. [\"random-csp-nonce\"]. The build fails when a token sits in quotes the placeholder also uses."
|
|
61
|
+
},
|
|
62
|
+
"addMeta": {
|
|
63
|
+
"type": "boolean",
|
|
64
|
+
"description": "Add <meta property=\"csp-nonce\"> to <head> (default true)."
|
|
65
|
+
},
|
|
66
|
+
"files": {
|
|
67
|
+
"type": "array",
|
|
68
|
+
"items": { "type": "string" },
|
|
69
|
+
"description": "Pages to rewrite, relative to the served root (default [\"index.html\"]); never under assets/."
|
|
70
|
+
}
|
|
71
|
+
}
|
|
72
|
+
},
|
|
73
|
+
"stripHtmlComments": {
|
|
74
|
+
"type": "boolean",
|
|
75
|
+
"default": false,
|
|
76
|
+
"description": "Every env: remove HTML comments from the served index.html (and the other nonce.files). SSI directives and IE conditional comments stay."
|
|
37
77
|
},
|
|
38
78
|
"sri": {
|
|
39
79
|
"type": "boolean",
|
|
@@ -4,6 +4,7 @@ const tslib_1 = require("tslib");
|
|
|
4
4
|
const child_process_1 = require("child_process");
|
|
5
5
|
const fs = tslib_1.__importStar(require("fs"));
|
|
6
6
|
const path = tslib_1.__importStar(require("path"));
|
|
7
|
+
const strip_exif_1 = require("../../lib/helpers/strip-exif");
|
|
7
8
|
const defaultRunner = (cmd, opts) => {
|
|
8
9
|
console.log(`▶ ${cmd}`);
|
|
9
10
|
(0, child_process_1.execSync)(cmd, opts);
|
|
@@ -63,6 +64,26 @@ async function flutterBuildExecutor(options, context, runner = defaultRunner) {
|
|
|
63
64
|
throw new Error(`flutter-build: unknown target "${target}"`);
|
|
64
65
|
}
|
|
65
66
|
runner(cmd.replace(/\s+/g, ' ').trim(), execOpts);
|
|
67
|
+
const outDir = path.join(repoRoot, dist);
|
|
68
|
+
if (options.stripExif === false) {
|
|
69
|
+
if (target === 'web')
|
|
70
|
+
console.log('ℹ strip-exif: off (stripExif: false)');
|
|
71
|
+
}
|
|
72
|
+
else if (target !== 'web') {
|
|
73
|
+
if (options.stripExif === true) {
|
|
74
|
+
console.log(`ℹ stripExif ignored for ${target}: the images are packed into the app bundle.`);
|
|
75
|
+
}
|
|
76
|
+
}
|
|
77
|
+
else if (fs.existsSync(outDir)) {
|
|
78
|
+
const exif = await (0, strip_exif_1.stripExif)({
|
|
79
|
+
rootDir: outDir,
|
|
80
|
+
log: (m) => {
|
|
81
|
+
if (m.startsWith('skipped'))
|
|
82
|
+
console.warn(`⚠ strip-exif ${m}`);
|
|
83
|
+
},
|
|
84
|
+
});
|
|
85
|
+
console.log(`ℹ ${(0, strip_exif_1.stripExifSummary)(exif)}`);
|
|
86
|
+
}
|
|
66
87
|
console.log('✅ Flutter build complete');
|
|
67
88
|
return { success: true };
|
|
68
89
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../../../src/executors/flutter-build/executor.ts"],"names":[],"mappings":";;;AAAA,iDAA0D;AAC1D,+CAAyB;AACzB,mDAA6B;
|
|
1
|
+
{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../../../src/executors/flutter-build/executor.ts"],"names":[],"mappings":"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"}
|
|
@@ -38,6 +38,11 @@
|
|
|
38
38
|
"type": "boolean",
|
|
39
39
|
"default": false,
|
|
40
40
|
"description": "Enable Dart obfuscation for APK / iOS builds (ignored for web)."
|
|
41
|
+
},
|
|
42
|
+
"stripExif": {
|
|
43
|
+
"type": "boolean",
|
|
44
|
+
"default": true,
|
|
45
|
+
"description": "Web builds: remove EXIF from the images in dist (only images that have EXIF are rewritten). Set false to leave the output as Flutter wrote it. Ignored for apk / ios."
|
|
41
46
|
}
|
|
42
47
|
},
|
|
43
48
|
"required": []
|
|
@@ -20,7 +20,9 @@ Deploy the `.htaccess` file alongside the Angular build output. It needs the
|
|
|
20
20
|
`mod_rewrite`, `mod_headers`, `mod_include`, `mod_unique_id` and `mod_setenvif` Apache
|
|
21
21
|
modules (the last three give each request its own CSP nonce when the release build runs with
|
|
22
22
|
`secure: true`), and `AllowOverride FileInfo Options=IncludesNOEXEC` (or `All`) for the
|
|
23
|
-
folder.
|
|
23
|
+
folder. When the server sets its own nonce variable (e.g. `UNIQUE_ID` from mod_lua), run
|
|
24
|
+
`pstack csp --app=<%= name %> --nonce-source=env:UNIQUE_ID`: mod_unique_id and mod_setenvif are
|
|
25
|
+
then not needed.
|
|
24
26
|
|
|
25
27
|
## CSP overrides
|
|
26
28
|
|
|
@@ -47,10 +47,27 @@ export declare const CSP_DIRECTIVES: {
|
|
|
47
47
|
};
|
|
48
48
|
export type CspDirective = keyof typeof CSP_DIRECTIVES;
|
|
49
49
|
export declare const DEFAULT_PERMISSIONS_POLICY = "camera=(), microphone=(), geolocation=()";
|
|
50
|
+
export declare const DEFAULT_REFERRER_POLICY = "strict-origin-when-cross-origin";
|
|
51
|
+
export declare const REFERRER_POLICIES: string[];
|
|
52
|
+
export declare const DEFAULT_NONCE_SOURCE = "mod_unique_id";
|
|
53
|
+
/** SSI scope in .htaccess: index = IncludesNOEXEC on index.html only; html = Includes on every .html. */
|
|
54
|
+
export type SsiScope = 'index' | 'html';
|
|
50
55
|
export interface CspAllowlist {
|
|
51
56
|
sources: Partial<Record<CspDirective, string[]>>;
|
|
52
57
|
permissionsPolicy: string;
|
|
58
|
+
/** "mod_unique_id" (UNIQUE_ID with "@" replaced, via SetEnvIfExpr) or "env:NAME" (used as is). */
|
|
59
|
+
nonceSource?: string;
|
|
60
|
+
/** Headers removed before the policy is set (Apache), so an upstream one cannot stack with it. */
|
|
61
|
+
unsetHeaders?: string[];
|
|
62
|
+
referrerPolicy?: string;
|
|
63
|
+
/** Apache `Header always set <name> "<value>"` lines, written as given. */
|
|
64
|
+
extraHeaders?: [string, string][];
|
|
65
|
+
ssi?: SsiScope;
|
|
53
66
|
}
|
|
67
|
+
/** The env variable the nonce comes from with nonce-source "env:NAME", else undefined. */
|
|
68
|
+
export declare const nonceEnvVar: (a: CspAllowlist) => string | undefined;
|
|
69
|
+
/** Whether source is a well-formed CSP hash source (base64 or base64url of a full digest). */
|
|
70
|
+
export declare function isHashSource(source: string): boolean;
|
|
54
71
|
/** Why a source cannot be used in a directive, or undefined when it can. */
|
|
55
72
|
export declare function sourceProblem(directive: CspDirective, source: string): string | undefined;
|
|
56
73
|
/**
|