Added unique suffix for static assets during publishing.

Author: azaslonov

src/media/mediaPermalinkResolver.publish.ts

@@ -1,7 +1,7 @@
 import * as MediaUtils from "./mediaUtils";
 import { IMediaService } from "./IMediaService";
 import { IPermalinkResolver, HyperlinkModel } from "../permalinks";
-import { MediaContract } from ".";
+import { MediaContract } from "./mediaContract";
 import { ContentItemContract } from "../contentModel";
 import { HyperlinkContract } from "../editing";
 
@@ -56,7 +56,6 @@ export class MediaPermalinkResolver implements IPermalinkResolver {
         return hyperlinkModel;
     }
 
-
     public async getHyperlinkByTargetKey(targetKey: string): Promise<HyperlinkModel> {
         if (!targetKey) {
             throw new Error("Target key cannot be null or empty.");

src/publishing/htmlPagePublisher.ts

@@ -11,6 +11,7 @@ import { SourceLink } from "./sourceLink";
 
 export class HtmlPagePublisher {
     private subresourceIntegrityEnabled: boolean;
+    private staticAssetSuffix: string;
 
     constructor(
         private readonly htmlDocumentProvider: HtmlDocumentProvider,
@@ -23,6 +24,7 @@ export class HtmlPagePublisher {
 
     private async loadSettings(): Promise<void> {
         this.subresourceIntegrityEnabled = !!await this.settingsProvider.getSetting<boolean>("features/subresourceIntegrity");
+        this.staticAssetSuffix = await this.settingsProvider.getSetting("staticAssetSuffix");
     }
 
     private scaffoldPageDocument(document: Document): void {
@@ -31,8 +33,8 @@ export class HtmlPagePublisher {
         document.head.appendChild(charsetMetaElement);
 
         this.appendMetaTag(document, "viewport", "width=device-width,minimum-scale=1,initial-scale=1");
-        this.appendStyleLink(document, { src: "/styles/theme.css" });
-        this.appendScriptLink(document, { src: "/scripts/theme.js" });
+        this.appendStyleLink(document, { src: `/styles/theme.${this.staticAssetSuffix}.css` });
+        this.appendScriptLink(document, { src: `/scripts/theme.${this.staticAssetSuffix}.js` });
     }
 
     private appendMetaTag(document: Document, name: string, content: string): void {

src/utils.ts

@@ -14,11 +14,11 @@ export function guid(): string {
         s4() + "-" + s4() + s4() + s4();
 }
 
-export function identifier(): string {
+export function identifier(length: number = 5): string {
     let result = "";
-    const possible = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789";
+    const possible = "abcdefghijklmnopqrstuvwxyz0123456789";
 
-    for (let i = 0; i < 5; i++) {
+    for (let i = 0; i < length; i++) {
         result += possible.charAt(Math.floor(Math.random() * possible.length));
     }
 
@@ -396,4 +396,11 @@ export function truncate(value: string, length: number = 100): string {
 export function debounce(func: () => Promise<void>): () => Promise<void> {
     let promise: Promise<void>;
     return () => promise ? promise : promise = func();
+}
+
+export function appendSuffixToFileName(fileName: string, suffix: string): string {
+    const extensionPosition = fileName.lastIndexOf(".");
+    const suffixedFileName = [fileName.slice(0, extensionPosition), `.${suffix}`, fileName.slice(extensionPosition)].join("");
+
+    return suffixedFileName
 }