Merge pull request #107 from lukebayes/lbj-update

Updated nodejs, npm and module dependencies

Author: lukebayes

Makefile

@@ -9,7 +9,7 @@ PROJECT_ROOT=$(shell git rev-parse --show-toplevel)
 
 # Nodejs
 # https://nodejs.org/dist/v10.9.0/node-v10.9.0-linux-x64.tar.xz
-NODE_VERSION=12.4.0
+NODE_VERSION=12.16.2
 NODE=lib/nodejs/bin/node
 NPM=lib/nodejs/bin/npm
 
@@ -56,16 +56,16 @@ dist/nomplate.min.gz: dist/nomplate.min.js
 
 dist/express.js:
 	$(WEBPACK) --mode development --config $(WEBPACK_SERVER_CONFIG) express.js --output dist/express.js
-	
+
 lint:
 	$(ESLINT) --config $(PROJECT_ROOT)/.eslintrc.json .
 
-module-install: 
+module-install:
 	$(NPM) install
 
 integrate: clean lint test build
 
-clean: 
+clean:
 	rm -rf dist
 	rm -rf tmp
 	rm -f .tmp-view.html

README.md

@@ -1,7 +1,7 @@
 # Nomplate
 (pronounced, Gnome-plate)
 
-Nomplate is a microscopic (< 5kb), insanely fast (<30ms to interaction) client and server side template engine and component system that makes it dead simple to create, compose, _test_ and deploy visual components using Plain Old JavaScript wherever it runs.
+Nomplate is a microscopic (< 6kb), insanely fast (<30ms to interaction) client and server side template engine and component system that makes it dead simple to create, compose, _test_ and deploy visual components using Plain Old JavaScript wherever it runs.
 
 ![Gnome Plate](https://raw.githubusercontent.com/lukebayes/nomplate/master/Gnomplate.jpg "Gnome Plate")
 

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "nomplate",
-  "version": "1.2.25",
+  "version": "1.3.1",
   "description": "Nomplate: Node template engine",
   "main": "index.js",
   "engines": {
@@ -52,18 +52,18 @@
   ],
   "license": "MIT",
   "devDependencies": {
-    "chai": "^3.5.0",
-    "eslint": "^5.16.0",
-    "eslint-plugin-mocha": "^6.1.1",
+    "chai": "^4.2.0",
+    "eslint": "^6.8.0",
+    "eslint-plugin-mocha": "^6.3.0",
     "express": "^4.17.1",
-    "js-beautify": "^1.10.2",
-    "jsdom": ">=9.8.3",
-    "jsdom-simulant": ">=1.1.2",
-    "json-loader": "^0.5.4",
-    "mocha": "^5.2.0",
-    "sinon": "^1.17.6",
-    "terser-webpack-plugin": "^1.4.1",
-    "webpack": "^4.40.2",
-    "webpack-cli": "^3.3.9"
+    "js-beautify": "^1.11.0",
+    "jsdom": "^16.2.2",
+    "jsdom-simulant": "^1.1.2",
+    "json-loader": "^0.5.7",
+    "mocha": "^7.1.1",
+    "sinon": "^9.0.2",
+    "terser-webpack-plugin": "^2.3.5",
+    "webpack": "^4.42.1",
+    "webpack-cli": "^3.3.11"
   }
 }

package.json

@@ -225,19 +225,19 @@ describe('renderElement', () => {
 
       const nomElement = dom.div((update) => {
         updater = update;
-        dom.input({type: 'checkbox', value: value});
+        dom.input({type: 'checkbox', checked: value});
       });
 
       const domElement = renderElement(nomElement, doc);
-      assert.equal(domElement.firstChild.outerHTML, '<input type="checkbox" value="true">');
-      assert(domElement.firstChild.value, 'Expected checkbox property to be applied');
+      assert.equal(domElement.firstChild.outerHTML, '<input type="checkbox" checked="true">');
+      assert(domElement.firstChild.checked, 'Expected checkbox property to be applied');
 
       value = false;
       updater();
       builder.forceUpdate();
 
       assert.equal(domElement.outerHTML, '<div><input type="checkbox"></div>');
-      assert(!domElement.firstChild.value, 'Expected checkbox property to be updated');
+      assert(!domElement.firstChild.checked, 'Expected checkbox property to be updated');
     });
 
     it('never writes classname or key attributes', () => {

test/render_element_test.js

@@ -16,7 +16,7 @@ describe('Test Helper', () => {
     });
 
     it('append setUrl to window', () => {
-      win.setUrl('/some_path?abcd=1234#efgh');
+      win.setUrl('some_path?abcd=1234#efgh');
       const loc = win.location;
       assert.equal(loc.href, 'http://example.com/some_path?abcd=1234#efgh');
       assert.equal(loc.protocol, 'http:');
@@ -25,7 +25,7 @@ describe('Test Helper', () => {
       assert.equal(loc.origin, 'http://example.com');
       assert.equal(loc.port, '');
       assert.equal(loc.pathname, '/some_path');
-      assert.equal(loc.search, '?abcd=1234#efgh');
+      assert.equal(loc.search, '?abcd=1234');
       assert.equal(loc.hash, '#efgh');
     });
 
@@ -37,7 +37,7 @@ describe('Test Helper', () => {
     });
 
     it('does not double leading slashes', () => {
-      win.setUrl('/some_path');
+      win.setUrl('some_path');
       const loc = win.location;
       assert.equal(loc.href, 'http://example.com/some_path');
     });

test/test_helper_test.js

@@ -1,6 +1,6 @@
 /* eslint-disable import/no-extraneous-dependencies */
 const FakeStorage = require('./test/fake_storage');
-const jsdom = require('jsdom').jsdom;
+const JSDOM = require('jsdom').JSDOM;
 const simulant = require('jsdom-simulant');
 const _renderElement = require('./src/render_element');
 const _renderString = require('./src/render_string');
@@ -9,7 +9,8 @@ const _renderString = require('./src/render_string');
  * Create a JSDOM window object for test cases.
  */
 function createWindow(optOptions) {
-  let doc = jsdom('<html><body></body></html>', optOptions);
+  let jsdom = new JSDOM('<html><body></body></html>', optOptions);
+  let doc = jsdom.window.document;
   /* eslint-disable no-param-reassign */
   doc.defaultView.localStorage = new FakeStorage();
   /* eslint-enable no-param-reassign */
@@ -19,37 +20,14 @@ function createWindow(optOptions) {
     console.error(error);
   };
   const win = doc.defaultView;
+
   /**
    * Set the current URL on the provided window.location object.
-   *
-   * NOTE(lbayes): Partial implementation by okovpashko, found on Github issue here:
-   * https://github.com/facebook/jest/issues/890#issuecomment-298594389
-   * Original implementation did not handle search or hash values properly.
    */
   win.setUrl = (urlOrPart) => {
-    const url = urlOrPart.indexOf('http') === 0 ? urlOrPart : ['http://example.com', urlOrPart.replace(/^\//, '')].join('/');
-    const parser = win.document.createElement('a');
-    parser.href = url;
-    ['href', 'protocol', 'host', 'hostname', 'origin', 'port', 'pathname'].forEach(prop => {
-      Object.defineProperty(win.location, prop, {
-        value: parser[prop],
-        writable: true,
-      });
-    });
-
-    const parts = url.split('?');
-    const search = parts.length > 1 ? `?${parts[1]}` : '';
-
-    Object.defineProperty(win.location, 'search', {
-      value: search,
-      writable: true,
-    });
-
-    const hash = url.split('#');
-    Object.defineProperty(win.location, 'hash', {
-      value: hash.length > 1 ? `#${hash[1]}` : '',
-      writable: true,
-    });
+    const url = urlOrPart.indexOf("http") === 0 ?
+      urlOrPart : `http://example.com/${urlOrPart}`;
+    jsdom.reconfigure({ url });
   };
 
   return win;