Replace template file extension from nun to njk

iissnan · iissnan · commit 1e4f6e9355e7 · 2017-03-10T01:18:29.000+08:00
diff --git a/README.md b/README.md
@@ -62,4 +62,4 @@ To make WebStorm to recognize Nunjucks templates, follow the following steps:
 
     ![Add File Type](install-twig-register.png "Add File Type")
     
-    In this repo, `.nun` extension is used for Nunjucks Template, so add it to the `Registered Pattern`.
+    In this repo, `.njk` extension is used for Nunjucks Template, so add it to the `Registered Pattern`.
diff --git a/app/advanced-settings.njk b/app/advanced-settings.njk
@@ -1,4 +1,4 @@
-{% extends './templates/layout/doc.nun' %}
+{% extends './templates/layout/doc.njk' %}
 
 {# S: 页面元数据 #}
 {% block documentTitle %}进阶设定 - NexT 使用文档{% endblock %}
diff --git a/app/faqs.njk b/app/faqs.njk
@@ -1,4 +1,4 @@
-{% extends './templates/layout/doc.nun' %}
+{% extends './templates/layout/doc.njk' %}
 
 {# S: 页面元数据 #}
 {% block documentTitle %}常见问题 - NexT 使用文档{% endblock %}
diff --git a/app/getting-started.njk b/app/getting-started.njk
@@ -1,4 +1,4 @@
-{% extends './templates/layout/doc.nun' %}
+{% extends './templates/layout/doc.njk' %}
 
 {# S: 页面元数据 #}
 {% block documentTitle %}开始使用 - NexT 使用文档{% endblock %}
diff --git a/app/index.njk b/app/index.njk
@@ -1,4 +1,4 @@
-{% extends './templates/layout/base.nun' %}
+{% extends './templates/layout/base.njk' %}
 
 {% block documentTitle %}NexT 使用文档{% endblock %}
 {% block pageName %}home{% endblock %}
@@ -183,7 +183,7 @@
     </div>
   </section>
 
-  {% include "./templates/partials/githu-buttons.nun" %}
+  {% include "./templates/partials/githu-buttons.njk" %}
 
 {% endblock %}
 
diff --git a/app/platforms.njk b/app/platforms.njk
@@ -1,4 +1,4 @@
-{% extends './templates/layout/doc.nun' %}
+{% extends './templates/layout/doc.njk' %}
 
 {# S: 页面元数据 #}
 {% block documentTitle %}其他平台 - NexT 使用文档{% endblock %}
diff --git a/app/tag-plugins.njk b/app/tag-plugins.njk
@@ -1,4 +1,4 @@
-{% extends './templates/layout/doc.nun' %}
+{% extends './templates/layout/doc.njk' %}
 
 {# S: 页面元数据 #}
 {% block documentTitle %}内置标签 - NexT 使用文档{% endblock %}
diff --git a/app/templates/layout/base.njk b/app/templates/layout/base.njk
@@ -10,11 +10,11 @@
 </head>
 
 <body class="{% block pageName %}{% endblock %}">
-  {% include '../partials/browser-upgrade.nun' %}
+  {% include '../partials/browser-upgrade.njk' %}
 
   <header>
     {% block header %}
-      {% include '../partials/menu.nun' %}
+      {% include '../partials/menu.njk' %}
     {% endblock %}
   </header>
 
@@ -23,7 +23,7 @@
   </main>
 
   {% block footer %}
-    {% include '../partials/footer.nun' %}
+    {% include '../partials/footer.njk' %}
   {% endblock %}
 
   {% block scripts %}
diff --git a/app/templates/layout/doc.njk b/app/templates/layout/doc.njk
@@ -1,4 +1,4 @@
-{% extends './base.nun' %}
+{% extends './base.njk' %}
 
 {% block header %}
   {{ super() }}
diff --git a/app/templates/partials/browser-upgrade.njk b/app/templates/partials/browser-upgrade.njk
diff --git a/app/templates/partials/footer.njk b/app/templates/partials/footer.njk
diff --git a/app/templates/partials/githu-buttons.njk b/app/templates/partials/githu-buttons.njk
diff --git a/app/templates/partials/menu.njk b/app/templates/partials/menu.njk
diff --git a/app/theme-settings-example.njk b/app/theme-settings-example.njk
@@ -1,4 +1,4 @@
-{% extends './templates/layout/doc.nun' %}
+{% extends './templates/layout/doc.njk' %}
 
 {# S: 页面元数据 #}
 {% block documentTitle %}主题配置参考与说明 - NexT 使用文档{% endblock %}
diff --git a/app/theme-settings.njk b/app/theme-settings.njk
@@ -1,4 +1,4 @@
-{% extends './templates/layout/doc.nun' %}
+{% extends './templates/layout/doc.njk' %}
 
 {# S: 页面元数据 #}
 {% block documentTitle %}主题配置 - NexT 使用文档{% endblock %}
diff --git a/app/third-party-services.njk b/app/third-party-services.njk
@@ -1,4 +1,4 @@
-{% extends './templates/layout/doc.nun' %}
+{% extends './templates/layout/doc.njk' %}
 
 {# S: 页面元数据 #}
 {% block documentTitle %}第三方服务集成 - NexT 使用文档{% endblock %}
diff --git a/gulp/tasks/develop.js b/gulp/tasks/develop.js
@@ -13,5 +13,5 @@ module.exports = () => {
     }
   });
 
-  gulp.watch(['app/**/*.nun'], bs.reload);
+  gulp.watch(['app/**/*.njk'], bs.reload);
 };
diff --git a/gulp/tasks/dist.js b/gulp/tasks/dist.js
@@ -8,7 +8,7 @@ const APP_DIR = 'app/';
 const SOURCE = {
   img: APP_DIR + 'assets/img/**/*',
   html: {
-    zh: APP_DIR + '*.nun'
+    zh: APP_DIR + '*.njk'
   },
   uploads: APP_DIR + 'uploads/**/*',
   CNAME: APP_DIR + 'CNAME'
@@ -33,7 +33,7 @@ module.exports = () => {
   gulp.src(SOURCE.html.zh)
     .pipe(tap(function (file) {
       file.contents = new Buffer(renderer.render(file.path));
-      file.path = file.path.replace('nun', 'html');
+      file.path = file.path.replace('njk', 'html');
     }))
     .pipe(gulp.dest(DIST.dist));
 };
diff --git a/lib/renderer.js b/lib/renderer.js
@@ -1,5 +1,5 @@
 /**
- * @overview Render `.nun` files with Nunjucks.
+ * @overview Render `.njk` files with Nunjucks.
  */
 
 const nunjucks = require('nunjucks');
diff --git a/lib/utils.js b/lib/utils.js
@@ -13,7 +13,7 @@ module.exports = {
       return;
     }
 
-    pathname = pathname.replace(/html$/, 'nun');
+    pathname = pathname.replace(/html$/, 'njk');
 
     return path.join(source, pathname);
   }

Original file line number	Diff line number	Diff line change
`@@ -62,4 +62,4 @@ To make WebStorm to recognize Nunjucks templates, follow the following steps:`
`62`	`62`
`63`	`63`	`![Add File Type](install-twig-register.png "Add File Type")`
`64`	`64`
`65`		- In this repo, `.nun` extension is used for Nunjucks Template, so add it to the `Registered Pattern`.
	`65`	+ In this repo, `.njk` extension is used for Nunjucks Template, so add it to the `Registered Pattern`.
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-{% extends './templates/layout/doc.nun' %}`
	`1`	`+{% extends './templates/layout/doc.njk' %}`
`2`	`2`
`3`	`3`	`{# S: 页面元数据 #}`
`4`	`4`	`{% block documentTitle %}进阶设定 - NexT 使用文档{% endblock %}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-{% extends './base.nun' %}`
	`1`	`+{% extends './base.njk' %}`
`2`	`2`
`3`	`3`	`{% block header %}`
`4`	`4`	`{{ super() }}`
Original file line number	Diff line number	Diff line change
`@@ -13,5 +13,5 @@ module.exports = () => {`
`13`	`13`	`}`
`14`	`14`	`});`
`15`	`15`
`16`		`- gulp.watch(['app/*/.nun'], bs.reload);`
	`16`	`+ gulp.watch(['app/*/.njk'], bs.reload);`
`17`	`17`	`};`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ module.exports = {`
`13`	`13`	`return;`
`14`	`14`	`}`
`15`	`15`
`16`		`- pathname = pathname.replace(/html$/, 'nun');`
	`16`	`+ pathname = pathname.replace(/html$/, 'njk');`
`17`	`17`
`18`	`18`	`return path.join(source, pathname);`
`19`	`19`	`}`