@devvit/ui-renderer 0.10.15-next-2024-02-14-907fed6d4.0 → 0.10.15-next-2024-02-15-f7c48ffbb.0

package/blocks/templates/renderImageBlock.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"renderImageBlock.d.ts","sourceRoot":"","sources":["../../../library/src/blocks/templates/renderImageBlock.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAC;AASvC,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,EAAyD,YAAY,EAAE,MAAM,WAAW,CAAC;AAKhG,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,KAAK,EAAE,GAAG,EAAE,aAAa,GAAG,YAAY,CA0D/E"}
+{"version":3,"file":"renderImageBlock.d.ts","sourceRoot":"","sources":["../../../library/src/blocks/templates/renderImageBlock.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAC;AASvC,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,EAA6B,YAAY,EAAE,MAAM,WAAW,CAAC;AASpE,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,KAAK,EAAE,GAAG,EAAE,aAAa,GAAG,YAAY,CA0D/E"}

package/blocks/templates/renderImageBlock.js

@@ -1,8 +1,8 @@
 import { nothing } from 'lit';
 import { getTemplateRenderingStrategy } from '@reddit/faceplate-ui/faceplateUIConfig.js';
 import { defaultClasses, defaultStyles, imageClasses, imageStyle, onClickAction, } from '../attributes.js';
-import { classMap, isDataUrl, isValidImageURL, sanitizeDataUrl } from './util.js';
-import { VerifiedPublicImageHosts } from './constants.js';
+import { classMap, sanitizeDataUrl } from './util.js';
+import { VerifiedPublicImageHosts, isDataUrl, isValidImageURL, } from '@devvit/shared-types/imageUtil.js';
 const FALLBACK_IMG_URL = 'https://i.redd.it/p1vmc5ulmpib1.png';
 export function renderImageBlock(block, ctx) {
     const { html, styleMap, ifDefined } = getTemplateRenderingStrategy();

package/blocks/templates/util.d.ts

@@ -16,19 +16,10 @@ export declare function resolveIcon(name: string): TemplateResult;
  * @param styleInfo
  */
 export declare function sanitizeStyleInfo(styleInfo: StyleInfo): StyleInfo;
-export declare function isDataUrl(input: string): boolean;
-export declare function parseDataUrl(dataUrl: string): {
-    mimeType: string | undefined;
-    charset: string | undefined;
-    isBase64: boolean;
-    data: string;
-} | null;
 /**
  * Only supports SVG elements!
  */
 export declare function sanitizeDataUrl(dataUrl: string): string | undefined;
-export declare function isAcceptableDataUrl(maybeDataUrl: string): boolean;
-export declare function isValidImageURL(imageUrl: string): boolean;
 /**
  * Returns a BlockSizes object either directly from the block or constructs
  * one from the legacy `size` field

package/blocks/templates/util.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../../../library/src/blocks/templates/util.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,cAAc,EAAE,MAAM,KAAK,CAAC;AAC9C,OAAO,KAAK,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AACxE,OAAO,EAAE,SAAS,EAAE,QAAQ,IAAI,cAAc,EAAE,MAAM,6BAA6B,CAAC;AACpF,OAAO,EAAE,GAAG,IAAI,SAAS,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AACxE,OAAO,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAC;AAGxD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,gCAAgC,CAAC;AAKnE,OAAO,EACL,KAAK,EACL,UAAU,EACV,UAAU,EACV,0BAA0B,EAC1B,aAAa,EACd,MAAM,gBAAgB,CAAC;AAGxB,MAAM,MAAM,YAAY,GAAG,cAAc,GAAG,OAAO,OAAO,CAAC;AAE3D,wBAAgB,QAAQ,CACtB,SAAS,EAAE,SAAS,EACpB,WAAW,CAAC,EAAE,OAAO,GACpB,MAAM,GAAG,UAAU,CAAC,OAAO,cAAc,CAAC,CAiB5C;AAED,wBAAgB,UAAU,CAAC,KAAK,EAAE,MAAM,GAAG,eAAe,CAAC,cAAc,CAAC,GAAG,YAAY,CAMxF;AAED,wBAAgB,GAAG,CAAC,GAAG,EAAE,aAAa,GAAG,UAAU,CAAC,OAAO,SAAS,CAAC,GAAG,MAAM,CAM7E;AAED,wBAAgB,aAAa,CAAC,EAAE,EAAE,WAAW,GAAG,OAAO,GAAG,SAAS,GAAG,EAAE,IAAI,WAAW,CAEtF;AAED,wBAAgB,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,cAAc,CAiBxD;AAED;;;GAGG;AACH,wBAAgB,iBAAiB,CAAC,SAAS,EAAE,SAAS,GAAG,SAAS,CASjE;AAcD,wBAAgB,SAAS,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAEhD;AAED,wBAAgB,YAAY,CAAC,OAAO,EAAE,MAAM,GAAG;IAC7C,QAAQ,EAAE,MAAM,GAAG,SAAS,CAAC;IAC7B,OAAO,EAAE,MAAM,GAAG,SAAS,CAAC;IAC5B,QAAQ,EAAE,OAAO,CAAC;IAClB,IAAI,EAAE,MAAM,CAAC;CACd,GAAG,IAAI,CAWP;AAED;;GAEG;AACH,wBAAgB,eAAe,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAmDnE;AASD,wBAAgB,mBAAmB,CAAC,YAAY,EAAE,MAAM,GAAG,OAAO,CAMjE;AAED,wBAAgB,eAAe,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAazD;AAED;;;;GAIG;AACH,wBAAgB,QAAQ,CAAC,KAAK,EAAE,KAAK,GAAG,UAAU,GAAG,SAAS,CA2B7D;AAED,wBAAgB,cAAc,CAC5B,KAAK,EAAE,0BAA0B,GAAG,SAAS,EAC7C,QAAQ,GAAE,aAAa,GAAG,SAAqB,GAC9C,MAAM,GAAG,SAAS,CAKpB;AAED,wBAAgB,YAAY,CAAC,IAAI,EAAE,aAAa,GAAG,SAAS,GAAG,MAAM,CAUpE;AAED;;;;;;;;;GASG;AACH,wBAAgB,aAAa,CAC3B,MAAM,EAAE,UAAU,GAAG,SAAS,EAC9B,WAAW,CAAC,EAAE,MAAM,GAAG,SAAS,GAC/B,CAAC,KAAK,CAAC,EAAE,MAAM,GAAG,SAAS,EAAE,IAAI,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC,CAIzD"}
+{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../../../library/src/blocks/templates/util.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,cAAc,EAAE,MAAM,KAAK,CAAC;AAC9C,OAAO,KAAK,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AACxE,OAAO,EAAE,SAAS,EAAE,QAAQ,IAAI,cAAc,EAAE,MAAM,6BAA6B,CAAC;AACpF,OAAO,EAAE,GAAG,IAAI,SAAS,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AACxE,OAAO,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAC;AAGxD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,gCAAgC,CAAC;AAInE,OAAO,EACL,KAAK,EACL,UAAU,EACV,UAAU,EACV,0BAA0B,EAC1B,aAAa,EACd,MAAM,gBAAgB,CAAC;AAIxB,MAAM,MAAM,YAAY,GAAG,cAAc,GAAG,OAAO,OAAO,CAAC;AAE3D,wBAAgB,QAAQ,CACtB,SAAS,EAAE,SAAS,EACpB,WAAW,CAAC,EAAE,OAAO,GACpB,MAAM,GAAG,UAAU,CAAC,OAAO,cAAc,CAAC,CAiB5C;AAED,wBAAgB,UAAU,CAAC,KAAK,EAAE,MAAM,GAAG,eAAe,CAAC,cAAc,CAAC,GAAG,YAAY,CAMxF;AAED,wBAAgB,GAAG,CAAC,GAAG,EAAE,aAAa,GAAG,UAAU,CAAC,OAAO,SAAS,CAAC,GAAG,MAAM,CAM7E;AAED,wBAAgB,aAAa,CAAC,EAAE,EAAE,WAAW,GAAG,OAAO,GAAG,SAAS,GAAG,EAAE,IAAI,WAAW,CAEtF;AAED,wBAAgB,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,cAAc,CAiBxD;AAED;;;GAGG;AACH,wBAAgB,iBAAiB,CAAC,SAAS,EAAE,SAAS,GAAG,SAAS,CASjE;AAED;;GAEG;AACH,wBAAgB,eAAe,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAmDnE;AAED;;;;GAIG;AACH,wBAAgB,QAAQ,CAAC,KAAK,EAAE,KAAK,GAAG,UAAU,GAAG,SAAS,CA2B7D;AAED,wBAAgB,cAAc,CAC5B,KAAK,EAAE,0BAA0B,GAAG,SAAS,EAC7C,QAAQ,GAAE,aAAa,GAAG,SAAqB,GAC9C,MAAM,GAAG,SAAS,CAKpB;AAED,wBAAgB,YAAY,CAAC,IAAI,EAAE,aAAa,GAAG,SAAS,GAAG,MAAM,CAUpE;AAED;;;;;;;;;GASG;AACH,wBAAgB,aAAa,CAC3B,MAAM,EAAE,UAAU,GAAG,SAAS,EAC9B,WAAW,CAAC,EAAE,MAAM,GAAG,SAAS,GAC/B,CAAC,KAAK,CAAC,EAAE,MAAM,GAAG,SAAS,EAAE,IAAI,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC,CAIzD"}

package/blocks/templates/util.js

@@ -4,9 +4,9 @@ import { unsafeHTML as clientUnsafeHTML } from 'lit/directives/unsafe-html.js';
 import { unsafeHTML as serverUnsafeHTML } from '@reddit/baseplate/html/html.js';
 import { getTemplateRenderingStrategy } from '@reddit/faceplate-ui/faceplateUIConfig.js';
 import faceplateIcons from '@reddit/faceplate-ui/svgs/svg-manifest.js';
-import { REDD_IT, VerifiedImageHosts } from './constants.js';
 import { BlockSizeUnit, } from '@devvit/protos';
 import { sanitizeSvg } from '@devvit/shared-types/sanitizeSvg.js';
+import { parseDataUrl, isAcceptableDataUrlMimeType } from '@devvit/shared-types/imageUtil.js';
 export function classMap(classInfo, forceString) {
     const { getType } = getTemplateRenderingStrategy();
     if (getType() === 'client' && forceString !== true) {
@@ -73,30 +73,6 @@ export function sanitizeStyleInfo(styleInfo) {
     }
     return styleInfo;
 }
-const DATA_URL_REGEX = 
-// eslint-disable-next-line security/detect-unsafe-regex
-/^data:([a-zA-Z]+\/[a-zA-Z0-9.+_-]+)?(;charset=[a-zA-Z0-9._+-]+)?(;base64)?,(.*)/;
-function preprocessDataUrl(input) {
-    /**
-     * This can be submitted to us as multi-line and that will break the parser
-     * so we remove all newlines here
-     */
-    return input.trim().replace(/[\r\n]+/g, '');
-}
-export function isDataUrl(input) {
-    return !!preprocessDataUrl(input).match(DATA_URL_REGEX);
-}
-export function parseDataUrl(dataUrl) {
-    const matches = DATA_URL_REGEX.exec(preprocessDataUrl(dataUrl));
-    if (!matches)
-        return null;
-    return {
-        mimeType: matches[1],
-        charset: matches[2]?.split('=')[1], // Extract charset without ';charset='
-        isBase64: !!matches[3],
-        data: matches[4].trim(),
-    };
-}
 /**
  * Only supports SVG elements!
  */
@@ -148,31 +124,6 @@ export function sanitizeDataUrl(dataUrl) {
         return undefined;
     }
 }
-function isAcceptableDataUrlMimeType(mimeType) {
-    // https://developer.mozilla.org/en-US/docs/Web/HTTP/Basics_of_HTTP/MIME_types#image_types
-    const ACCEPTABLE_MIME_TYPES = ['image/svg+xml'];
-    return ACCEPTABLE_MIME_TYPES.includes(mimeType);
-}
-export function isAcceptableDataUrl(maybeDataUrl) {
-    const parsedDataUrl = parseDataUrl(maybeDataUrl);
-    if (!parsedDataUrl?.mimeType)
-        return false;
-    return isAcceptableDataUrlMimeType(parsedDataUrl.mimeType);
-}
-export function isValidImageURL(imageUrl) {
-    try {
-        if (isAcceptableDataUrl(imageUrl))
-            return true;
-        // The second "base" param helps to handle relative paths to local files
-        // https://developer.mozilla.org/en-US/docs/Web/API/URL/URL#parameters
-        const hostName = new URL(imageUrl, `https://i.${REDD_IT}`)?.hostname;
-        const tld = hostName.split('.').slice(-2).join('.');
-        return Boolean(tld) && VerifiedImageHosts.includes(tld);
-    }
-    catch (_) {
-        return false;
-    }
-}
 /**
  * Returns a BlockSizes object either directly from the block or constructs
  * one from the legacy `size` field

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@devvit/ui-renderer",
-  "version": "0.10.15-next-2024-02-14-907fed6d4.0",
+  "version": "0.10.15-next-2024-02-15-f7c48ffbb.0",
   "license": "BSD-3-Clause",
   "repository": {
     "type": "git",
@@ -54,10 +54,10 @@
   },
   "types": "./index.d.ts",
   "dependencies": {
-    "@devvit/protos": "0.10.15-next-2024-02-14-907fed6d4.0",
-    "@devvit/runtime-lite": "0.10.15-next-2024-02-14-907fed6d4.0",
-    "@devvit/runtimes": "0.10.15-next-2024-02-14-907fed6d4.0",
-    "@devvit/shared-types": "0.10.15-next-2024-02-14-907fed6d4.0",
+    "@devvit/protos": "0.10.15-next-2024-02-15-f7c48ffbb.0",
+    "@devvit/runtime-lite": "0.10.15-next-2024-02-15-f7c48ffbb.0",
+    "@devvit/runtimes": "0.10.15-next-2024-02-15-f7c48ffbb.0",
+    "@devvit/shared-types": "0.10.15-next-2024-02-15-f7c48ffbb.0",
     "@dotlottie/player-component": "2.7.2",
     "p-queue": "7.3.4",
     "rxjs": "7.5.7"
@@ -84,7 +84,7 @@
   "devDependencies": {
     "@devvit/eslint-config": "0.10.14",
     "@devvit/repo-tools": "0.10.14",
-    "@devvit/tsconfig": "0.10.15-next-2024-02-14-907fed6d4.0",
+    "@devvit/tsconfig": "0.10.15-next-2024-02-15-f7c48ffbb.0",
     "@lit-labs/ssr": "^2.2.3",
     "@lit/localize": "0.11.4",
     "@open-wc/testing-helpers": "2.3.0",
@@ -116,5 +116,5 @@
     "directory": "dist"
   },
   "source": "./src/index.ts",
-  "gitHead": "285cceeb37015a6859c3770be4e4e02be3f34570"
+  "gitHead": "3f84c335d9c69b040e20a5b29c74a3533fe31164"
 }

package/blocks/templates/constants.d.ts

@@ -1,7 +0,0 @@
-export declare const REDD_IT = "redd.it";
-export declare const REDDIT_STATIC = "redditstatic.com";
-export declare const REDDIT_MEDIA = "redditmedia.com";
-export declare const SNOO_DEV = "snoo.dev";
-export declare const VerifiedPublicImageHosts: string[];
-export declare const VerifiedImageHosts: string[];
-//# sourceMappingURL=constants.d.ts.map

package/blocks/templates/constants.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../../library/src/blocks/templates/constants.ts"],"names":[],"mappings":"AACA,eAAO,MAAM,OAAO,YAAY,CAAC;AACjC,eAAO,MAAM,aAAa,qBAAqB,CAAC;AAChD,eAAO,MAAM,YAAY,oBAAoB,CAAC;AAC9C,eAAO,MAAM,QAAQ,aAAa,CAAC;AAEnC,eAAO,MAAM,wBAAwB,UAAyC,CAAC;AAC/E,eAAO,MAAM,kBAAkB,UAAmD,CAAC"}

package/blocks/templates/constants.js

@@ -1,7 +0,0 @@
-// Only the following domains are approved: redd.it, redditstatic.com, redditmedia.com, or snoo.dev
-export const REDD_IT = 'redd.it';
-export const REDDIT_STATIC = 'redditstatic.com';
-export const REDDIT_MEDIA = 'redditmedia.com';
-export const SNOO_DEV = 'snoo.dev';
-export const VerifiedPublicImageHosts = [REDD_IT, REDDIT_STATIC, REDDIT_MEDIA];
-export const VerifiedImageHosts = [SNOO_DEV, REDD_IT, REDDIT_STATIC, REDDIT_MEDIA];