From 4383f908cdc0d2d7430b3334c3a3143c20255fcc Mon Sep 17 00:00:00 2001
From: tzupengwang <tzupengwang@google.com>
Date: Thu, 7 Sep 2017 17:57:54 -0700
Subject: [PATCH] [common-tags] Update from v1.2.1 to v1.4.0

---
 types/common-tags/common-tags-tests.ts | 13 +++++++++++++
 types/common-tags/index.d.ts           |  9 +++++++--
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/types/common-tags/common-tags-tests.ts b/types/common-tags/common-tags-tests.ts
index 1dfe25effd..e504624943 100644
--- a/types/common-tags/common-tags-tests.ts
+++ b/types/common-tags/common-tags-tests.ts
@@ -46,6 +46,15 @@ commonTags.source`
   </div>
 `;
 
+let userMessages = ['hi', 'what are you up to?', '<script>alert("something evil")</script>']
+commonTags.html`
+  <div class="chat-list">
+    <ul>
+      ${userMessages.map(message => commonTags.safeHtml`<li>${message}</li>`)}
+    </ul>
+  </div>
+`
+
 commonTags.oneLine`
   foo
   bar
@@ -145,6 +154,10 @@ new commonTags.TemplateTag(commonTags.stripIndentTransformer('initial'));
 new commonTags.TemplateTag(commonTags.stripIndentTransformer('all'));
 
 new commonTags.TemplateTag(commonTags.replaceResultTransformer('foo', 'bar'));
+new commonTags.TemplateTag(commonTags.replaceSubstitutionTransformer(/baz/g, 'bar'));
+
+new commonTags.TemplateTag(commonTags.replaceSubstitutionTransformer('foo', 'bar'));
+new commonTags.TemplateTag(commonTags.replaceSubstitutionTransformer(/baz/g, 'bar'));
 
 new commonTags.TemplateTag(commonTags.inlineArrayTransformer());
 new commonTags.TemplateTag(commonTags.inlineArrayTransformer({}));
diff --git a/types/common-tags/index.d.ts b/types/common-tags/index.d.ts
index a9f8ddeffd..65f0b61673 100644
--- a/types/common-tags/index.d.ts
+++ b/types/common-tags/index.d.ts
@@ -1,6 +1,7 @@
-// Type definitions for common-tags v1.2.1
+// Type definitions for common-tags v1.4.0
 // Project: https://github.com/declandewet/common-tags
 // Definitions by: Viktor Zozuliak <https://github.com/zuzusik>
+//                 Paul Wang <https://github.com/tzupengwang>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 declare module 'common-tags' {
@@ -24,6 +25,8 @@ declare module 'common-tags' {
 
     export var source: TemplateTag;
 
+    export var safeHtml: TemplateTag;
+
     export var oneLine: TemplateTag;
 
     export var oneLineTrim: TemplateTag;
@@ -54,7 +57,9 @@ declare module 'common-tags' {
 
     export var stripIndentTransformer: (type?: 'initial'|'all') => TemplateTransformer;
 
-    export var replaceResultTransformer: (replaceWhat: string, replaceWith: string) => TemplateTransformer;
+    export var replaceResultTransformer: (replaceWhat: string|RegExp, replaceWith: string) => TemplateTransformer;
+
+    export var replaceSubstitutionTransformer: (replaceWhat: string|RegExp, replaceWith: string) => TemplateTransformer;
 
     export var inlineArrayTransformer: (opts?: {separator?: string, conjunction?: string}) => TemplateTransformer;