Consolidates incremental-dom usage in just one module (#246)

* Fixes wrong IncDom calls that do not close components properly * Uses upstream incremental-dom and incremental-dom-string * Consolidates incremental-dom usage in just one module * Updates to use node 7 * Updates incremental-dom-string to 0.0.2 * Adds isServerSide test for server-side rendering
metal · Jun 9, 2017 · 1517926 · 1517926
1 parent a4b3507
commit 1517926
Show file tree

Hide file tree

Showing 12 changed files with 46 additions and 1,527 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -7,7 +7,7 @@ addons:
   jwt:
     secure: R5Ujw12vDWT9RTVZnjqmgoBeG8QgMdwKoShPHOEwnYOXIkxts5Qmg9+eCVoJRSYMZ2YMKk7sXisApKiOIhGv5PsJwIm1qXPlw6eQCWnnLE/OTJtoM0LgeKOcypwO28pJheHuHbd3jtCJ6eEKQiN1YPXSW2HTctYJU4a2ipgo8JY=
 before_install:
-  - nvm install 5
+  - nvm install 7
   - npm install -g [email protected]
   - lerna bootstrap
 install:

diff --git a/gulpfile.js b/gulpfile.js
@@ -13,7 +13,6 @@ var codeGlobs = [
 	'packages/metal*/test/**/*.js',
 	'!packages/metal*/**/*.soy.js',
 	'!packages/metal-incremental-dom/**/incremental-dom.js',
-	'!packages/metal-incremental-dom/**/incremental-dom-string.js',
 	'gulpfile.js',
 	'karma.conf.js',
 	'karma-coverage.conf.js'
@@ -29,7 +28,6 @@ metal.registerTasks({
 		// Since all files will be added, we need to ensure manually that these
 		// will be added first.
 		'packages/metal-incremental-dom/lib/incremental-dom.js',
-		'packages/metal-incremental-dom/lib/incremental-dom-string.js',
 
 		// Test files
 		'env/test/node.js',

diff --git a/packages/metal-incremental-dom/package.json b/packages/metal-incremental-dom/package.json
@@ -22,13 +22,14 @@
     "metal"
   ],
   "dependencies": {
+    "incremental-dom": "^0.5.1",
+    "incremental-dom-string": "0.0.2",
     "metal": "^2.6.4",
     "metal-component": "^2.11.0",
     "metal-dom": "^2.9.0"
   },
   "devDependencies": {
     "babel-cli": "^6.4.5",
-    "babel-preset-es2015": "^6.0.0",
-    "incremental-dom": "mairatma/incremental-dom#dist"
+    "babel-preset-es2015": "^6.0.0"
   }
 }
diff --git a/packages/metal-incremental-dom/src/IncrementalDomRenderer.js b/packages/metal-incremental-dom/src/IncrementalDomRenderer.js
@@ -1,7 +1,6 @@
 'use strict';
 
 import './incremental-dom';
-import './incremental-dom-string';
 import { getChanges, trackChanges } from './changes';
 import { clearData, getData } from './data';
 import { getOwner } from './children/children';

diff --git a/packages/metal-incremental-dom/src/incremental-dom-aop.js b/packages/metal-incremental-dom/src/incremental-dom-aop.js
@@ -1,7 +1,6 @@
 'use strict';
 
 import './incremental-dom';
-import './incremental-dom-string';
 
 /**
  * Gets the original incremental dom functions.

diff --git a/packages/metal-incremental-dom/src/incremental-dom-string.js b/packages/metal-incremental-dom/src/incremental-dom-string.js