zenn-markdown-html 0.1.109-alpha.3 → 0.1.109

package/lib/utils/helper.d.ts

@@ -1,6 +1,4 @@
 export declare function isGithubUrl(url: string): boolean;
-export declare function generateTweetHtml(url: string): string;
-export declare function generateCardHtml(url: string): string;
 export declare function generateYoutubeHtmlFromUrl(url: string): string;
 export declare function generateYoutubeHtmlFromVideoId(videoId: string): string;
 export declare function isValidHttpUrl(str: string): boolean;

package/lib/utils/helper.js

@@ -1,20 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.generateEmbedIframe = exports.isValidHttpUrl = exports.generateYoutubeHtmlFromVideoId = exports.generateYoutubeHtmlFromUrl = exports.generateCardHtml = exports.generateTweetHtml = exports.isGithubUrl = void 0;
+exports.generateEmbedIframe = exports.isValidHttpUrl = exports.generateYoutubeHtmlFromVideoId = exports.generateYoutubeHtmlFromUrl = exports.isGithubUrl = void 0;
 var utils_1 = require("markdown-it/lib/common/utils");
 var url_matcher_1 = require("./url-matcher");
 function isGithubUrl(url) {
-    return /^https:\/\/github\.com\/([a-zA-Z0-9](-?[a-zA-Z0-9]){0,38})\/([a-zA-Z0-9](-?[a-zA-Z0-9]){0,38})\/blob\/[^~\s:?[*^/\\]{2,}\/[\w!\-_~.*%()'"/]+(?:#L\d+(?:-L\d+)?)?$/.test(url);
+    return /^https:\/\/github\.com\/([a-zA-Z0-9](-?[a-zA-Z0-9]){0,38})\/([a-zA-Z0-9](-?[a-zA-Z0-9.]){0,38})\/blob\/[^~\s:?[*^/\\]{2,}\/[\w!\-_~.*%()'"/]+(?:#L\d+(?:-L\d+)?)?$/.test(url);
 }
 exports.isGithubUrl = isGithubUrl;
-function generateTweetHtml(url) {
-    return "<div class=\"embed-tweet\"><embed-tweet src=\"".concat(url, "\"></embed-tweet></div>");
-}
-exports.generateTweetHtml = generateTweetHtml;
-function generateCardHtml(url) {
-    return "<div class=\"embed-zenn-link\"><iframe src=\"https://card.zenn.dev/?url=".concat(encodeURIComponent(url), "\" frameborder=\"0\" scrolling=\"no\" loading=\"lazy\"></iframe></div>");
-}
-exports.generateCardHtml = generateCardHtml;
 function generateYoutubeHtml(videoId, start) {
     var escapedVideoId = (0, utils_1.escapeHtml)(videoId);
     // 48時間以内
@@ -25,7 +17,7 @@ function generateYoutubeHtml(videoId, start) {
 function generateYoutubeHtmlFromUrl(url) {
     var params = (0, url_matcher_1.extractYoutubeVideoParameters)(url);
     if (!params) {
-        return generateCardHtml(url);
+        return generateEmbedIframe('link-card', url);
     }
     else {
         return generateYoutubeHtml(params.videoId, params.start);
@@ -47,9 +39,11 @@ function isValidHttpUrl(str) {
 }
 exports.isValidHttpUrl = isValidHttpUrl;
 function generateEmbedIframe(type, src) {
+    // ユーザーからの入力値が引数として渡されたときのために念のためencodeする
+    var encodedType = encodeURIComponent(type);
+    var encodedSrc = encodeURIComponent(src);
     var id = "zenn-embedded__".concat(Math.random().toString(16).slice(2));
-    var iframeSrc = "https://embed.zenn.studio/".concat(type, "#").concat(id);
-    var content = encodeURIComponent(src);
-    return "<div class=\"zenn-embedded ".concat(type, "\"><iframe id=\"").concat(id, "\" src=\"").concat(iframeSrc, "\" data-content=\"").concat(content, "\" frameborder=\"0\" scrolling=\"no\" loading=\"lazy\"></iframe></div>");
+    var iframeSrc = "https://embed.zenn.studio/".concat(encodedType, "#").concat(id);
+    return "<div class=\"zenn-embedded zenn-embedded-".concat(encodedType, "\"><iframe id=\"").concat(id, "\" src=\"").concat(iframeSrc, "\" data-content=\"").concat(encodedSrc, "\" frameborder=\"0\" scrolling=\"no\" loading=\"lazy\"></iframe></div>");
 }
 exports.generateEmbedIframe = generateEmbedIframe;

package/lib/utils/md-custom-block.js

@@ -62,7 +62,6 @@ var blockOptions = {
         return (0, helper_1.generateEmbedIframe)('tweet', str);
     },
     card: function (str) {
-        // generateCardHtml内でURLはエンコードされるためここでのバリデーションは軽めでOK
         if (!(0, helper_1.isValidHttpUrl)(str))
             return 'URLが不正です';
         return (0, helper_1.generateEmbedIframe)('link-card', str);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zenn-markdown-html",
-  "version": "0.1.109-alpha.3",
+  "version": "0.1.109",
   "license": "MIT",
   "description": "Convert markdown to zenn flavor html.",
   "main": "lib/index.js",
@@ -46,7 +46,7 @@
     "markdown-it-task-lists": "^2.1.1",
     "prismjs": "^1.27.0"
   },
-  "gitHead": "1caaadccffa0dd22ebed420b4db44f8d30591655",
+  "gitHead": "952f4a91fc71dd6aae992b60345639be3f2bab45",
   "publishConfig": {
     "access": "public"
   }