Merge pull request #481 from zenn-dev/canary

release v0.1.150

lerna.json

@@ -2,6 +2,6 @@
   "packages": [
     "packages/*"
   ],
-  "version": "0.1.149",
+  "version": "0.1.150-alpha.0",
   "npmClient": "pnpm"
 }

packages/zenn-cli/articles/embed-examples.md

@@ -77,10 +77,31 @@ https://gist.github.com/hofmannsven/9164408?file=my.cnf
 
 ## Twitter
 
+### `@[tweet]` 記法（`twitter.com`）
+
 @[tweet](https://twitter.com/jack/status/20)
 
 @[tweet](https://twitter.com/steelydylan/status/1253567029010825216)
 
+### `@[tweet]` 記法（`x.com`）
+
+@[tweet](https://x.com/jack/status/20)
+
+@[tweet](https://x.com/steelydylan/status/1253567029010825216)
+
+### URL埋め込み（`twitter.com`）
+
+https://twitter.com/jack/status/20
+
+https://twitter.com/steelydylan/status/1253567029010825216
+
+### URL埋め込み（`x.com`）
+
+https://x.com/jack/status/20
+
+https://x.com/steelydylan/status/1253567029010825216
+
+
 ## 👇html tag cannot be embedded.
 
 <iframe width="560" height="315" src="https://www.youtube.com/embed/ToLJE4YEQRI" frameborder="0" allow="accelerometer; autoplay; encrypted-media; gyroscope; picture-in-picture" allow="fullscreen"></iframe>

packages/zenn-cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zenn-cli",
-  "version": "0.1.149",
+  "version": "0.1.150-alpha.0",
   "description": "Preview Zenn content locally.",
   "repository": {
     "type": "git",

packages/zenn-content-css/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zenn-content-css",
-  "version": "0.1.149",
+  "version": "0.1.150-alpha.0",
   "license": "MIT",
   "description": "Zenn flavor content style.",
   "repository": {

packages/zenn-embed-elements/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zenn-embed-elements",
-  "version": "0.1.149",
+  "version": "0.1.150-alpha.0",
   "license": "MIT",
   "description": "Web components for embedded contents.",
   "repository": {

packages/zenn-markdown-html/__tests__/link.test.ts

@@ -215,32 +215,64 @@ describe('Linkifyのテスト', () => {
     });
 
     describe('Tweet埋め込みのテスト', () => {
-      test('ツイートリンクを<iframe />に変換する', () => {
-        const url = 'https://twitter.com/jack/status/20';
-        const html = renderLink(`${url}`);
-        const iframe = parse(html).querySelector('span.zenn-embedded iframe');
-        const pattern = new RegExp(`${options.embedOrigin}/tweet#.+`);
-
-        expect(iframe?.attributes).toEqual(
-          expect.objectContaining({
-            src: expect.stringMatching(pattern),
-            'data-content': encodeURIComponent(url),
-          })
-        );
+      describe('twitter.com', () => {
+        test('ツイートリンクを<iframe />に変換する', () => {
+          const url = 'https://twitter.com/jack/status/20';
+          const html = renderLink(`${url}`);
+          const iframe = parse(html).querySelector('span.zenn-embedded iframe');
+          const pattern = new RegExp(`${options.embedOrigin}/tweet#.+`);
+
+          expect(iframe?.attributes).toEqual(
+            expect.objectContaining({
+              src: expect.stringMatching(pattern),
+              'data-content': encodeURIComponent(url),
+            })
+          );
+        });
+
+        test('クエリ文字列を含むツイートリンクを埋め込み<iframe />に変換する', () => {
+          const url = `https://twitter.com/jack/status/20?foo=123456&t=ab-cd_ef`;
+          const html = renderLink(url);
+          const iframe = parse(html).querySelector('span.zenn-embedded iframe');
+          const pattern = new RegExp(`${options.embedOrigin}/tweet#.+`);
+
+          expect(iframe?.attributes).toEqual(
+            expect.objectContaining({
+              src: expect.stringMatching(pattern),
+              'data-content': encodeURIComponent(url),
+            })
+          );
+        });
       });
 
-      test('クエリ文字列を含むツイートリンクを埋め込み<iframe />に変換する', () => {
-        const url = `https://twitter.com/jack/status/20?foo=123456&t=ab-cd_ef`;
-        const html = renderLink(url);
-        const iframe = parse(html).querySelector('span.zenn-embedded iframe');
-        const pattern = new RegExp(`${options.embedOrigin}/tweet#.+`);
-
-        expect(iframe?.attributes).toEqual(
-          expect.objectContaining({
-            src: expect.stringMatching(pattern),
-            'data-content': encodeURIComponent(url),
-          })
-        );
+      describe('x.com', () => {
+        test('ツイートリンクを<iframe />に変換する', () => {
+          const url = 'https://x.com/jack/status/20';
+          const html = renderLink(`${url}`);
+          const iframe = parse(html).querySelector('span.zenn-embedded iframe');
+          const pattern = new RegExp(`${options.embedOrigin}/tweet#.+`);
+
+          expect(iframe?.attributes).toEqual(
+            expect.objectContaining({
+              src: expect.stringMatching(pattern),
+              'data-content': encodeURIComponent(url),
+            })
+          );
+        });
+
+        test('クエリ文字列を含むツイートリンクを埋め込み<iframe />に変換する', () => {
+          const url = `https://x.com/jack/status/20?foo=123456&t=ab-cd_ef`;
+          const html = renderLink(url);
+          const iframe = parse(html).querySelector('span.zenn-embedded iframe');
+          const pattern = new RegExp(`${options.embedOrigin}/tweet#.+`);
+
+          expect(iframe?.attributes).toEqual(
+            expect.objectContaining({
+              src: expect.stringMatching(pattern),
+              'data-content': encodeURIComponent(url),
+            })
+          );
+        });
       });
     });
 

packages/zenn-markdown-html/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zenn-markdown-html",
-  "version": "0.1.149",
+  "version": "0.1.150-alpha.0",
   "license": "MIT",
   "description": "Convert markdown to zenn flavor html.",
   "main": "lib/index.js",

packages/zenn-markdown-html/src/utils/url-matcher.ts

@@ -22,7 +22,7 @@ export function isGistUrl(url: string): boolean {
 }
 
 export function isTweetUrl(url: string): boolean {
-  return /^https:\/\/twitter\.com\/[a-zA-Z0-9_-]+\/status\/[a-zA-Z0-9?=&\-_]+$/.test(
+  return /^https:\/\/(twitter|x)\.com\/[a-zA-Z0-9_-]+\/status\/[a-zA-Z0-9?=&\-_]+$/.test(
     url
   );
 }

packages/zenn-model/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zenn-model",
-  "version": "0.1.149",
+  "version": "0.1.150-alpha.0",
   "license": "MIT",
   "description": "Model utils for Zenn contents",
   "main": "lib/index.js",