From bab8e8c4e5409c7e85e2a102b2765f16a8545d20 Mon Sep 17 00:00:00 2001 From: BRIAN MUENZENMEYER Date: Wed, 24 Sep 2014 06:06:55 -0500 Subject: [PATCH 1/5] incorporated torbs PR from master --- public/listeners/synclisteners.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/listeners/synclisteners.js b/public/listeners/synclisteners.js index a76ee4921..e0eca083c 100644 --- a/public/listeners/synclisteners.js +++ b/public/listeners/synclisteners.js @@ -18,7 +18,7 @@ var wsnConnected = false; var wsc; var wscConnected = false; var dataPrevious = 0; -var host = (window.location.host != "") ? window.location.host : "127.0.0.1"; +var host = (window.location.host !== '') ? window.location.hostname : '127.0.0.1'; // handle page updates from one browser to another function connectNavSync() { From 6782592c396ce0eb5c6d29e712088bf97b823875 Mon Sep 17 00:00:00 2001 From: Marcin Modestowicz Date: Thu, 2 Oct 2014 11:56:08 +0200 Subject: [PATCH 2/5] Update grunt-contrib-watch package version --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 57f9cf18e..238cfe95d 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,7 @@ "version": "0.1.4", "devDependencies": { "grunt": "~0.4.0", - "grunt-contrib-watch": "~0.2.0", + "grunt-contrib-watch": "~0.6.1", "grunt-contrib-sass": "~0.2.2", "grunt-contrib-copy": "~0.4.0", "grunt-contrib-jshint": "~0.4.0", From ebc056bed8beda698b3832b17744ad6fe7e29736 Mon Sep 17 00:00:00 2001 From: Marcin Modestowicz Date: Thu, 2 Oct 2014 11:57:27 +0200 Subject: [PATCH 3/5] Add livereload to grunt serve task --- Gruntfile.js | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/Gruntfile.js b/Gruntfile.js index 0a9791dd4..93730ab67 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -51,6 +51,9 @@ module.exports = function(grunt) { // tasks: ['default'] // }, all: { + options: { + livereload: true + }, files: [ 'source/_patterns/**/*.mustache', 'source/_patterns/**/*.json', @@ -81,7 +84,8 @@ module.exports = function(grunt) { port: 9001, base: './public', hostname: 'localhost', - keepalive: true + open: true, + livereload: 35729 } } } @@ -99,9 +103,6 @@ module.exports = function(grunt) { //travis CI task grunt.registerTask('travis', ['clean', 'concat', 'patternlab', /*'sass',*/ 'copy', 'nodeunit']); - grunt.registerTask('serve', ['clean', 'concat', 'patternlab', /*'sass',*/ 'copy', 'connect:app']); - //need to get livereload working - //http://www.thecrumb.com/2014/03/16/using-grunt-for-live-reload-revisited/ - //http://rhumaric.com/2013/07/renewing-the-grunt-livereload-magic/ + grunt.registerTask('serve', ['clean', 'concat', 'patternlab', /*'sass',*/ 'copy', 'connect', 'watch']); }; \ No newline at end of file From 7c3b59ef157b9455085c474092037cb0482ede0f Mon Sep 17 00:00:00 2001 From: Marcin Modestowicz Date: Thu, 2 Oct 2014 12:07:01 +0200 Subject: [PATCH 4/5] Update documentation --- README.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/README.md b/README.md index a738715e7..920b92371 100644 --- a/README.md +++ b/README.md @@ -76,9 +76,7 @@ Pattern states should be lowercase and use hyphens where spaces are present. ``` ##### Server -Running `grunt serve` will compile the patternlab front end and host it on http://localhost:9001 by default. This can be changed in the `Gruntfile.js` - -**Next steps: Livereload and watches** +Running `grunt serve` will compile the patternlab front end and host it on http://localhost:9001 by default. Page will reload on any saved source code change. ### Under Active Development From 0da26a1059483ad0fe0a9cb726f021197151cd22 Mon Sep 17 00:00:00 2001 From: BRIAN MUENZENMEYER Date: Thu, 2 Oct 2014 23:54:26 -0500 Subject: [PATCH 5/5] bumping version number --- CHANGELOG | 4 ++++ builder/object_factory.js | 2 +- builder/patternlab.js | 2 +- package.json | 2 +- 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 8737c945a..7bda5d022 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,5 +1,9 @@ THIS CHANGELOG IS AN ATTEMPT TO DOCUMENT CHANGES TO THIS PROJECT. +PL-node-v0.1.5 + - ADD: Live reload support for grunt serve task + - THX: thanks @marcinmodestowicz for the configuration fix. VERY useful :) + PL-node-v0.1.4 - FIX: Resolved issue with nested pattern rendering - FIX: Supporting flat pattern name regex's in unix-systems diff --git a/builder/object_factory.js b/builder/object_factory.js index ab95fafc5..519f44869 100644 --- a/builder/object_factory.js +++ b/builder/object_factory.js @@ -1,5 +1,5 @@ /* - * patternlab-node - v0.1.4 - 2014 + * patternlab-node - v0.1.5 - 2014 * * Brian Muenzenmeyer, and the web community. * Licensed under the MIT license. diff --git a/builder/patternlab.js b/builder/patternlab.js index bee0e2faa..dc7061457 100644 --- a/builder/patternlab.js +++ b/builder/patternlab.js @@ -1,5 +1,5 @@ /* - * patternlab-node - v0.1.4 - 2014 + * patternlab-node - v0.1.5 - 2014 * * Brian Muenzenmeyer, and the web community. * Licensed under the MIT license. diff --git a/package.json b/package.json index 238cfe95d..278f787eb 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "patternlab-node", "description": "Pattern Lab is a collection of tools to help you create atomic design systems. This is the node command line interface (CLI).", - "version": "0.1.4", + "version": "0.1.5", "devDependencies": { "grunt": "~0.4.0", "grunt-contrib-watch": "~0.6.1",