Skip to content

Commit d6d1f2f

Browse files
committed
rebase
1 parent c01624d commit d6d1f2f

2 files changed

Lines changed: 8 additions & 19 deletions

File tree

packages/astro/src/manifest/serialized.ts

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ export const SERIALIZED_MANIFEST_RESOLVED_ID = '\0' + SERIALIZED_MANIFEST_ID;
2929
export function serializedManifestPlugin({
3030
settings,
3131
command,
32-
sync
32+
sync,
3333
}: {
3434
settings: AstroSettings;
3535
command: 'dev' | 'build';
@@ -102,18 +102,18 @@ async function createSerializedManifest(settings: AstroSettings): Promise<Serial
102102
};
103103
}
104104

105-
if (shouldTrackCspHashes(settings.config.experimental.csp)) {
105+
if (shouldTrackCspHashes(settings.config.security.csp)) {
106106
csp = {
107107
cspDestination: settings.adapter?.adapterFeatures?.experimentalStaticHeaders
108108
? 'adapter'
109109
: undefined,
110-
scriptHashes: getScriptHashes(settings.config.experimental.csp),
111-
scriptResources: getScriptResources(settings.config.experimental.csp),
112-
styleHashes: getStyleHashes(settings.config.experimental.csp),
113-
styleResources: getStyleResources(settings.config.experimental.csp),
114-
algorithm: getAlgorithm(settings.config.experimental.csp),
110+
scriptHashes: getScriptHashes(settings.config.security.csp),
111+
scriptResources: getScriptResources(settings.config.security.csp),
112+
styleHashes: getStyleHashes(settings.config.security.csp),
113+
styleResources: getStyleResources(settings.config.security.csp),
114+
algorithm: getAlgorithm(settings.config.security.csp),
115115
directives: getDirectives(settings),
116-
isStrictDynamic: getStrictDynamic(settings.config.experimental.csp),
116+
isStrictDynamic: getStrictDynamic(settings.config.security.csp),
117117
};
118118
}
119119

pnpm-lock.yaml

Lines changed: 0 additions & 11 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)