marko - npm Package Compare versions

Comparing version 2.7.0 to 2.7.1

package.json

 {
-  "name": "marko",
-  "description": "Marko is an extensible, streaming, asynchronous, high performance, HTML-based templating language that can be used in Node.js or in the browser.",
-  "keywords": [
-    "templating",
-    "template",
-    "async",
-    "streaming"
-  ],
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/raptorjs/marko.git"
-  },
-  "scripts": {
-    "test": "node_modules/.bin/mocha --ui bdd --reporter spec ./test && node_modules/.bin/jshint compiler/ runtime/ taglibs/",
-    "test-fast": "node_modules/.bin/mocha --ui bdd --reporter spec ./test/render-test",
-    "test-async": "node_modules/.bin/mocha --ui bdd --reporter spec ./test/render-async-test",
-    "test-taglib-loader": "node_modules/.bin/mocha --ui bdd --reporter spec ./test/taglib-loader-test",
-    "jshint": "node_modules/.bin/jshint compiler/ runtime/ taglibs/"
-  },
-  "author": "Patrick Steele-Idem <[e-mail]>",
-  "maintainers": [
-    "Patrick Steele-Idem <[e-mail]>"
-  ],
-  "dependencies": {
-    "app-module-path": "^1.0.0",
-    "async-writer": "^1.4.0",
-    "browser-refresh-client": "^1.0.0",
-    "char-props": "~0.1.5",
-    "events": "^1.0.2",
-    "htmlparser2": "^3.7.2",
-    "jsonminify": "^0.2.3",
-    "marko-async": "^2.0.0",
-    "marko-layout": "^2.0.0",
-    "minimatch": "^0.2.14",
-    "property-handlers": "^1.0.0",
-    "raptor-args": "^1.0.0",
-    "raptor-json": "^1.0.1",
-    "raptor-logging": "^1.0.1",
-    "raptor-modules": "^1.0.5",
-    "raptor-polyfill": "^1.0.0",
-    "raptor-promises": "^1.0.1",
-    "raptor-regexp": "^1.0.0",
-    "raptor-strings": "^1.0.0",
-    "raptor-util": "^1.0.0",
-    "resolve-from": "^1.0.0",
-    "sax": "^0.6.0"
-  },
-  "devDependencies": {
-    "chai": "~1.8.1",
-    "dustjs-linkedin": "^2.3.4",
-    "jshint": "^2.5.0",
-    "mocha": "~1.15.1",
-    "raptor-cache": "^1.1.1",
-    "raptor-data-providers": "^1.0.1-beta",
-    "through": "^2.3.4"
-  },
-  "license": "Apache-2.0",
-  "bin": {
-    "markoc": "bin/markoc"
-  },
-  "main": "runtime/marko-runtime.js",
-  "publishConfig": {
-    "registry": "https://registry.npmjs.org/"
-  },
-  "version": "2.7.0"
-}
+    "name": "marko",
+    "description": "Marko is an extensible, streaming, asynchronous, high performance, HTML-based templating language that can be used in Node.js or in the browser.",
+    "keywords": [
+        "templating",
+        "template",
+        "async",
+        "streaming"
+    ],
+    "repository": {
+        "type": "git",
+        "url": "https://github.com/raptorjs/marko.git"
+    },
+    "scripts": {
+        "test": "node_modules/.bin/mocha --ui bdd --reporter spec ./test && node_modules/.bin/jshint compiler/ runtime/ taglibs/",
+        "test-fast": "node_modules/.bin/mocha --ui bdd --reporter spec ./test/render-test",
+        "test-async": "node_modules/.bin/mocha --ui bdd --reporter spec ./test/render-async-test",
+        "test-taglib-loader": "node_modules/.bin/mocha --ui bdd --reporter spec ./test/taglib-loader-test",
+        "jshint": "node_modules/.bin/jshint compiler/ runtime/ taglibs/"
+    },
+    "author": "Patrick Steele-Idem <[e-mail]>",
+    "maintainers": [
+        "Patrick Steele-Idem <[e-mail]>"
+    ],
+    "dependencies": {
+        "app-module-path": "^1.0.0",
+        "async-writer": "^1.4.0",
+        "browser-refresh-client": "^1.0.0",
+        "char-props": "~0.1.5",
+        "events": "^1.0.2",
+        "htmlparser2": "^3.7.2",
+        "jsonminify": "^0.2.3",
+        "marko-async": "^2.0.0",
+        "marko-layout": "^2.0.0",
+        "minimatch": "^0.2.14",
+        "property-handlers": "^1.0.0",
+        "raptor-args": "^1.0.0",
+        "raptor-json": "^1.0.1",
+        "raptor-logging": "^1.0.1",
+        "raptor-modules": "^1.0.5",
+        "raptor-polyfill": "^1.0.0",
+        "raptor-promises": "^1.0.1",
+        "raptor-regexp": "^1.0.0",
+        "raptor-strings": "^1.0.0",
+        "raptor-util": "^1.0.0",
+        "resolve-from": "^1.0.0",
+        "sax": "^0.6.0"
+    },
+    "devDependencies": {
+        "chai": "~1.8.1",
+        "dustjs-linkedin": "^2.3.4",
+        "jshint": "^2.5.0",
+        "mocha": "~1.15.1",
+        "raptor-cache": "^1.1.1",
+        "raptor-data-providers": "^1.0.1-beta",
+        "through": "^2.3.4"
+    },
+    "license": "Apache-2.0",
+    "bin": {
+        "markoc": "bin/markoc"
+    },
+    "main": "runtime/marko-runtime.js",
+    "publishConfig": {
+        "registry": "https://registry.npmjs.org/"
+    },
+    "version": "2.7.1"
+}

runtime/marko-runtime.js

@@ -188,3 +188,3 @@ /*
         if (globalData) {
-            extend(out.global, globalData);
+            extend(finalOut.global, globalData);
         }
@@ -191,0 +191,0 @@

test/api-tests.js

@@ -297,2 +297,44 @@ 'use strict';
 
+    it('should allow global data with callback-style render', function(done) {
+        var template = marko.load(nodePath.join(__dirname, 'fixtures/templates/api-tests/global-data.marko'));
+        template.render({
+                $global: {
+                    foo: 'bar'
+                }
+            },
+            function(err, output) {
+                if (err) {
+                    return done(err);
+                }
+
+                expect(output).to.equal('bar');
+                done();
+            });
+    });
+
+    it('should allow global data with render to writable stream', function(done) {
+        var output = '';
+
+        var stream = through(function write(data) {
+            output += data;
+        });
+
+        stream.on('end', function() {
+                expect(output).to.equal('bar');
+                done();
+            })
+            .on('error', function(e) {
+                done(e);
+            });
+
+        var template = marko.load(nodePath.join(__dirname, 'fixtures/templates/api-tests/global-data.marko'));
+        template.render(
+            {
+                $global: {
+                    foo: 'bar'
+                }
+            },
+            stream);
+    });
+
 });

No alert changes

Improved metrics

Total package byte prevSize

525249

increased by0.29%

Number of package files

552

increased by0.73%

Lines of code

10242

increased by0.4%

No dependency changes