feat(platform-server): update domino to v2.1.0 (#25564)

PR Close #25564
angular · Sep 19, 2018 · 3fb0da2 · 3fb0da2
1 parent 8f0fcc3
commit 3fb0da2
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 7 deletions.
diff --git a/package.json b/package.json
@@ -80,7 +80,7 @@
     "cors": "2.8.4",
     "dependency-graph": "^0.7.2",
     "diff": "^3.5.0",
-    "domino": "2.0.1",
+    "domino": "2.1.0",
     "entities": "1.1.1",
     "firefox-profile": "1.0.3",
     "fs-extra": "4.0.2",

diff --git a/packages/core/test/render3/compiler_canonical/elements_spec.ts b/packages/core/test/render3/compiler_canonical/elements_spec.ts
@@ -309,7 +309,11 @@ describe('elements', () => {
       }
 
       const comp = renderComponent(MyComponent);
-      expect(toHtml(comp)).toEqual('<div></div>');
+
+      // This is a fix for a change in how Domino renders this on the server in v2.1.0
+      const source = toHtml(comp);
+      const matches = source === '<div></div>' || source === '<div class=""></div>';
+      expect(matches).toBeTruthy();
 
       comp.someFlag = true;
       $r3$.ɵdetectChanges(comp);

diff --git a/packages/platform-server/package.json b/packages/platform-server/package.json
@@ -21,7 +21,7 @@
     "@angular/platform-browser-dynamic": "0.0.0-PLACEHOLDER"
   },
   "dependencies": {
-    "domino": "^2.0.1",
+    "domino": "^2.1.0",
     "tslib": "^1.9.0",
     "xhr2": "^0.1.4"
   },

diff --git a/packages/platform-server/test/integration_spec.ts b/packages/platform-server/test/integration_spec.ts
@@ -588,7 +588,7 @@ class HiddenModule {
              expect(output).toContain('Works!');
              expect(output).toContain('ng-trigger-myAnimation');
              expect(output).toContain('opacity:1;');
-             expect(output).toContain('transform:translate3d(0, 0, 0);');
+             expect(output).toContain('transform:translate3d(0 , 0 , 0);');
              expect(output).toContain('font-weight:bold;');
              called = true;
            });

diff --git a/yarn.lock b/yarn.lock
@@ -1894,9 +1894,9 @@ domain-browser@^1.1.1:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/domain-browser/-/domain-browser-1.2.0.tgz#3d31f50191a6749dd1375a7f522e823d42e54eda"
 
-domino@2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/domino/-/domino-2.0.1.tgz#9e1d63215d0fe8dcb8202bff07effa1a216db504"
+domino@2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/domino/-/domino-2.1.0.tgz#653ba7d331441113b42e40ba05f24253ec86e02e"
 
 dot-prop@^3.0.0:
   version "3.0.0"