Updated dependencies, adjustments for Handlebars v3

sebastian-lenz · sebastian-lenz · commit d432d6356842 · 2015-03-21T19:52:41.000+01:00
diff --git a/bin/typedoc.js b/bin/typedoc.js
@@ -6296,7 +6296,9 @@ var td;
                             return null;
                         }
                     }
-                    this.templates[fileName] = td.Handlebars.compile(Renderer.readFile(path));
+                    this.templates[fileName] = td.Handlebars.compile(Renderer.readFile(path), {
+                        preventIndent: true
+                    });
                 }
                 return this.templates[fileName];
             };
@@ -7536,7 +7538,7 @@ var td;
                         }
                         if (lineState == 0 /* Default */) {
                             lineDepth = Math.min(lineDepth, stack.length);
-                            line = line.replace(/^\s+/, '');
+                            line = line.replace(/^\s+/, '').replace(/\s+$/, '');
                             if (lineDepth > minLineDepth) {
                                 line = Array(lineDepth - minLineDepth + 1).join('\t') + line;
                             }
diff --git a/package.json b/package.json
@@ -30,12 +30,12 @@
   "dependencies": {
     "typescript": "1.4.x",
     "typedoc-default-themes": "^0.2.5",
-    "fs-extra": "^0.16.4",
-    "minimatch": "^2.0.1",
-    "handlebars": "2.0.0-alpha.4",
+    "fs-extra": "^0.16.5",
+    "minimatch": "^2.0.4",
+    "handlebars": "3.0.0",
     "marked": "^0.3.3",
     "highlight.js": "^8.4.0",
-    "shelljs": "^0.3.0",
+    "shelljs": "^0.4.0",
     "progress": "^1.1.8"
   },
   "devDependencies": {
diff --git a/src/td/output/Renderer.ts b/src/td/output/Renderer.ts
@@ -142,7 +142,9 @@ module td.output
                     }
                 }
 
-                this.templates[fileName] = Handlebars.compile(Renderer.readFile(path));
+                this.templates[fileName] = Handlebars.compile(Renderer.readFile(path), {
+                    preventIndent: true
+                });
             }
 
             return this.templates[fileName];
diff --git a/src/td/output/plugins/PrettyPrintPlugin.ts b/src/td/output/plugins/PrettyPrintPlugin.ts
@@ -142,7 +142,7 @@ module td.output
 
                     if (lineState == PrettyPrintState.Default) {
                         lineDepth = Math.min(lineDepth, stack.length);
-                        line = line.replace(/^\s+/, '');
+                        line = line.replace(/^\s+/, '').replace(/\s+$/, '');
                         if (lineDepth > minLineDepth) {
                             line = Array(lineDepth - minLineDepth + 1).join('\t') + line;
                         }

Original file line number	Diff line number	Diff line change
`@@ -6296,7 +6296,9 @@ var td;`
`6296`	`6296`	`return null;`
`6297`	`6297`	`}`
`6298`	`6298`	`}`
`6299`		`- this.templates[fileName] = td.Handlebars.compile(Renderer.readFile(path));`
	`6299`	`+ this.templates[fileName] = td.Handlebars.compile(Renderer.readFile(path), {`
	`6300`	`+ preventIndent: true`
	`6301`	`+ });`
`6300`	`6302`	`}`
`6301`	`6303`	`return this.templates[fileName];`
`6302`	`6304`	`};`
`@@ -7536,7 +7538,7 @@ var td;`
`7536`	`7538`	`}`
`7537`	`7539`	`if (lineState == 0 /* Default */) {`
`7538`	`7540`	`lineDepth = Math.min(lineDepth, stack.length);`
`7539`		`- line = line.replace(/^\s+/, '');`
	`7541`	`+ line = line.replace(/^\s+/, '').replace(/\s+$/, '');`
`7540`	`7542`	`if (lineDepth > minLineDepth) {`
`7541`	`7543`	`line = Array(lineDepth - minLineDepth + 1).join('\t') + line;`
`7542`	`7544`	`}`
Original file line number	Diff line number	Diff line change
`@@ -142,7 +142,9 @@ module td.output`
`142`	`142`	`}`
`143`	`143`	`}`
`144`	`144`
`145`		`- this.templates[fileName] = Handlebars.compile(Renderer.readFile(path));`
	`145`	`+ this.templates[fileName] = Handlebars.compile(Renderer.readFile(path), {`
	`146`	`+ preventIndent: true`
	`147`	`+ });`
`146`	`148`	`}`
`147`	`149`
`148`	`150`	`return this.templates[fileName];`
Original file line number	Diff line number	Diff line change
`@@ -142,7 +142,7 @@ module td.output`
`142`	`142`
`143`	`143`	`if (lineState == PrettyPrintState.Default) {`
`144`	`144`	`lineDepth = Math.min(lineDepth, stack.length);`
`145`		`- line = line.replace(/^\s+/, '');`
	`145`	`+ line = line.replace(/^\s+/, '').replace(/\s+$/, '');`
`146`	`146`	`if (lineDepth > minLineDepth) {`
`147`	`147`	`line = Array(lineDepth - minLineDepth + 1).join('\t') + line;`
`148`	`148`	`}`