From dab168d3e55b9f673801012b547cc83affac71dc Mon Sep 17 00:00:00 2001
From: Krzysztof Kotowicz <koto@google.com>
Date: Sun, 24 May 2020 20:09:21 +0300
Subject: [PATCH 1/2] fix(grunt-utils): insert the core CSS styles without
 using innerHTML

Create style elements and modify their text content instead of using
innerHTML to create the whole `<style>` element with its content.
That way style insertion done at bootstrap time doesn't interfere with
Trusted Types restrictions in Chrome (https://bit.ly/trusted-types).

Remove the type attribute - `text/css` is default:
https://html.spec.whatwg.org/#update-a-style-block.
---
 lib/grunt/utils.js            | 2 +-
 test/e2e/tests/sample.spec.js | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/lib/grunt/utils.js b/lib/grunt/utils.js
index 84a76eb7deff..be2e70eebeeb 100644
--- a/lib/grunt/utils.js
+++ b/lib/grunt/utils.js
@@ -111,7 +111,7 @@ module.exports = {
         .replace(/\\/g, '\\\\')
         .replace(/'/g, '\\\'')
         .replace(/\r?\n/g, '\\n');
-      js = '!window.angular.$$csp().noInlineStyle && window.angular.element(document.head).prepend(\'<style type="text/css">' + css + '</style>\');';
+      js = '!window.angular.$$csp().noInlineStyle && window.angular.element(document.head).prepend(window.angular.element("<style>").text(\'' + css + '\'));';
       state.js.push(js);
 
       return state;
diff --git a/test/e2e/tests/sample.spec.js b/test/e2e/tests/sample.spec.js
index fa283fa33a6b..7f857b5d364b 100644
--- a/test/e2e/tests/sample.spec.js
+++ b/test/e2e/tests/sample.spec.js
@@ -9,4 +9,12 @@ describe('Sample', function() {
   it('should have the interpolated text', function() {
     expect(element(by.binding('text')).getText()).toBe('Hello, world!');
   });
+
+  it('should insert the ng-cloak styles', function() {
+    browser.executeScript(`
+    var span = document.createElement('span');
+    span.className = 'ng-cloak foo';
+    document.body.appendChild(span);`);
+    expect(element(by.className('foo')).isDisplayed()).toBe(false);
+  });
 });

From 5e2276712b8b381f9caa957170257dd15238e97b Mon Sep 17 00:00:00 2001
From: George Kalpakas <kalpakas.g@gmail.com>
Date: Sun, 24 May 2020 20:09:21 +0300
Subject: [PATCH 2/2] fixup! fix(grunt-utils): insert the core CSS styles
 without using innerHTML

---
 lib/grunt/utils.js            | 2 +-
 test/e2e/tests/sample.spec.js | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/lib/grunt/utils.js b/lib/grunt/utils.js
index be2e70eebeeb..f94661c2ffa3 100644
--- a/lib/grunt/utils.js
+++ b/lib/grunt/utils.js
@@ -111,7 +111,7 @@ module.exports = {
         .replace(/\\/g, '\\\\')
         .replace(/'/g, '\\\'')
         .replace(/\r?\n/g, '\\n');
-      js = '!window.angular.$$csp().noInlineStyle && window.angular.element(document.head).prepend(window.angular.element("<style>").text(\'' + css + '\'));';
+      js = '!window.angular.$$csp().noInlineStyle && window.angular.element(document.head).prepend(window.angular.element(\'<style>\').text(\'' + css + '\'));';
       state.js.push(js);
 
       return state;
diff --git a/test/e2e/tests/sample.spec.js b/test/e2e/tests/sample.spec.js
index 7f857b5d364b..2a2369ec2528 100644
--- a/test/e2e/tests/sample.spec.js
+++ b/test/e2e/tests/sample.spec.js
@@ -12,9 +12,10 @@ describe('Sample', function() {
 
   it('should insert the ng-cloak styles', function() {
     browser.executeScript(`
-    var span = document.createElement('span');
-    span.className = 'ng-cloak foo';
-    document.body.appendChild(span);`);
+      var span = document.createElement('span');
+      span.className = 'ng-cloak foo';
+      document.body.appendChild(span);
+    `);
     expect(element(by.className('foo')).isDisplayed()).toBe(false);
   });
 });