Merge pull request #4 from hariadi/develop

v0.2.2
hariadi · Mar 23, 2014 · a483684 · a483684
2 parents 48e2ed4 + 215d283
commit a483684
Show file tree

Hide file tree

Showing 9 changed files with 18 additions and 6 deletions.
diff --git a/README.md b/README.md
@@ -33,12 +33,12 @@ The following directory structure is generated after running `yo metalsmith`:
 
     .
     ├── .gitignore
-    ├── .yo-rc.json
     ├── Makefile
     ├── metalsmith.json
     ├── package.json
     ├── README.md
     ├── _layouts
+    │   ├── defaul.html
     │   └── post.html
     ├── _posts
     │   ├── 2012-08-20-first-post.md

diff --git a/app/templates/_layouts/default.html b/app/templates/_layouts/default.html
@@ -1,5 +1,7 @@
+<!doctype html>
 <html>
 <head>
+  <meta charset="utf-8">
   <title><%= _.capitalize(msTitle) %> - {{ title }}</title>
 </head>
 <body>

diff --git a/app/templates/_layouts/handlebars-default.html b/app/templates/_layouts/handlebars-default.html
@@ -1,8 +1,11 @@
+<!doctype html>
 <html>
 <head>
+  <meta charset="utf-8">
   <title><%= _.capitalize(msTitle) %> - {{ title }}</title>
 </head>
 <body>
+
   <h2>Blog Posts</h2>
 
   {{#if articles }}

diff --git a/app/templates/_layouts/handlebars-post.html b/app/templates/_layouts/handlebars-post.html
@@ -1,8 +1,11 @@
+<!doctype html>
 <html>
 <head>
+  <meta charset="utf-8">
   <title><%= _.capitalize(msTitle) %> - {{ title }}</title>
 </head>
 <body>
+
   <h1>{{ title }}</h1>
 
   <time>{{ date }}</time>

diff --git a/app/templates/_layouts/post.html b/app/templates/_layouts/post.html
@@ -1,8 +1,11 @@
+<!doctype html>
 <html>
 <head>
+  <meta charset="utf-8">
   <title><%= _.capitalize(msTitle) %> - {{ title }}</title>
 </head>
 <body>
+
   <h1>{{ title }}</h1>
 
   <time>{{ date | date('Y-m-d') }}</time>

diff --git a/app/templates/_package.json b/app/templates/_package.json
@@ -14,10 +14,10 @@
     "metalsmith-ignore": "^0.1.2",<% } %><% if(drafts){ %>
     "metalsmith-drafts": "0.0.1",<% } %><% if(templates){ %>
     "metalsmith-templates": "^0.3.0",
-    "<%= templateEngine %>": "*",<% } %><% if(markdown){ %>
+    "<%= templateEngine %>": "<%= metalsmith.engine[templateEngine] %>",<% } %><% if(markdown){ %>
     "metalsmith-markdown": "^0.2.1",<% } %><% if(permalinks){ %>
-    "metalsmith-permalinks": "^0.2.0",<% } %><% if(collections){ %>
+    "metalsmith-permalinks": "^0.2.2",<% } %><% if(collections){ %>
     "metalsmith-collections": "^0.1.0",<% } %>
-    "metalsmith": "^0.3.0"
+    "metalsmith": "^0.5.0"
   }
 }
diff --git a/app/templates/gitignore b/app/templates/gitignore
@@ -1 +1,2 @@
 node_modules
+_site
diff --git a/metalsmith.json b/metalsmith.json
@@ -6,7 +6,7 @@
     "metalsmith-drafts": "^0.0.1",
     "metalsmith-templates": "^0.3.0",
     "metalsmith-markdown": "^0.2.1",
-    "metalsmith-permalinks": "^0.2.0",
+    "metalsmith-permalinks": "^0.2.2",
     "metalsmith-collections": "^0.1.0"
   },
   "engine": {

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "generator-metalsmith",
-  "version": "0.2.1",
+  "version": "0.2.2",
   "homepage": "https://github.com/hariadi/generator-metalsmith",
   "description": "Yeoman generator for Metalsmith",
   "author": {