♻️ Change nunjucks file extension to .njk

* Community standard
* Helps syntax highlighting in editor

CHANGELOG.md

@@ -44,7 +44,7 @@
 
 ## 0.8.3
 
-* Fix missing lang attribute in main.nunj view
+* Fix missing lang attribute in main.njk view
 
 ## 0.8.2
 

src/index.js

@@ -47,7 +47,7 @@ module.exports = function KuchenblechTheme(options) {
   const theme = new Theme(path.join(__dirname, '..', 'views'), config);
 
   // Set error page
-  theme.setErrorView('_error.nunj');
+  theme.setErrorView('_error.njk');
 
   // Add static files
   theme.addStatic(path.join(__dirname, '..' , 'dist'), `/${config.static.mount}`);
@@ -58,31 +58,31 @@ module.exports = function KuchenblechTheme(options) {
   // Index route
   theme.addRoute('/', {
     handle: 'index',
-    view: 'routes/document.nunj',
+    view: 'routes/document.njk',
   });
 
   // Index tenant route
   theme.addRoute('/:tenant', {
     handle: 'tenant',
-    view: 'routes/document.nunj',
+    view: 'routes/document.njk',
   }, resolvers.tenants);
 
   // Component single
   theme.addRoute('/:tenant?/components/:component', {
     handle: 'component',
-    view: 'routes/component.nunj',
+    view: 'routes/component.njk',
   }, resolvers.components);
 
   // Component preview
   theme.addRoute('/:tenant?/components/:component/preview/:preview?', {
     handle: 'preview',
-    view: 'routes/preview.nunj',
+    view: 'routes/preview.njk',
   }, resolvers.previews);
 
   // Document single
   theme.addRoute('/:tenant?/docs/:document+', {
     handle: 'document',
-    view: 'routes/document.nunj',
+    view: 'routes/document.njk',
   }, resolvers.documents);
 
   // Add filters

tests/simple/fractal.config.js

@@ -9,7 +9,7 @@ fractal.web.theme(kuchenblech());
 
 // Components
 fractal.components.engine('@frctl/nunjucks');
-fractal.components.set('ext', '.nunj');
+fractal.components.set('ext', '.njk');
 fractal.components.set('path', 'components');
 fractal.components.set('default.status', 'wip');
 fractal.components.set('default.collated', true);

views/_error.nunj → views/_error.njk

@@ -1,4 +1,4 @@
-{% extends "layouts/main.nunj" %}
+{% extends "layouts/main.njk" %}
 
 {% block content %}
   <h1>{{ ('Not found' if error.status == '404' else error.name) | default('An error has occurred') }}</h1>

views/layouts/main.nunj → views/layouts/main.njk

@@ -20,7 +20,7 @@
         </a>
 
         {% for navPartial in frctl.theme.get('nav') %}
-          {% include 'partials/menu/' + navPartial + '.nunj' %}
+          {% include 'partials/menu/' + navPartial + '.njk' %}
         {% endfor %}
       </nav>
     </header>

views/layouts/two-columns.nunj → views/layouts/two-columns.njk

@@ -1,6 +1,6 @@
-{% extends "layouts/main.nunj" %}
-{% import "macros/navigation.nunj" as navigation %}
-{% import "macros/breadcrumb-item.nunj" as breadcrumb %}
+{% extends "layouts/main.njk" %}
+{% import "macros/navigation.njk" as navigation %}
+{% import "macros/breadcrumb-item.njk" as breadcrumb %}
 
 {% set componentsTenatsViews = ['component', 'tenant-document', 'tenant-index'] %}
 

views/macros/navigation.nunj → views/macros/navigation.njk

@@ -1,4 +1,4 @@
-{% import "macros/status.nunj" as status %}
+{% import "macros/status.njk" as status %}
 
 {% macro leave(component, item, tenants, tenant, request) %}
   {% set isCurrent = true if (component and (component.id == item.id)) else false %}

views/pages/component.nunj → views/pages/component.njk

@@ -1,7 +1,7 @@
-{% extends "layouts/two-columns.nunj" %}
-{% import "macros/navigation.nunj" as navigation %}
-{% import "macros/breadcrumb-item.nunj" as breadcrumb %}
-{% import "macros/status.nunj" as status %}
+{% extends "layouts/two-columns.njk" %}
+{% import "macros/navigation.njk" as navigation %}
+{% import "macros/breadcrumb-item.njk" as breadcrumb %}
+{% import "macros/status.njk" as status %}
 
 {% block breadcrumb %}
   {{ breadcrumb.iterator(component) }}
@@ -50,7 +50,7 @@
     {% asyncAll template in ["preview-code"] %}
       <div class="main__content-item">
         {% set entity = component %}
-        {% include "partials/" + template + ".nunj" %}
+        {% include "partials/" + template + ".njk" %}
       </div>
     {% endall %}
   {% else %}
@@ -72,7 +72,7 @@
 
             {% asyncAll template in ["preview-code"] %}
               {% set entity = variant %}
-              {% include "partials/" + template + ".nunj" %}
+              {% include "partials/" + template + ".njk" %}
             {% endall %}
           </div>
         </div>

views/pages/document.nunj → views/pages/document.njk

@@ -1,6 +1,6 @@
-{% extends "layouts/two-columns.nunj" %}
-{% import "macros/breadcrumb-item.nunj" as breadcrumb %}
-{% import "macros/error.nunj" as error %}
+{% extends "layouts/two-columns.njk" %}
+{% import "macros/breadcrumb-item.njk" as breadcrumb %}
+{% import "macros/error.njk" as error %}
 
 {% block breadcrumb %}
   {% if not document.isIndex %}

views/routes/component.nunj → views/routes/component.njk

@@ -11,15 +11,15 @@
   {% if not tenants.size or tenantHelper.includes(component, request.params.tenant) %}
     {% if component.variants and component.variants().size > 1 and not component.collated %}
       {% set redirectUrl = frctl.theme.urlFromRoute('component', {tenant: tenant.name, component: component.handle + '--' + component.defaultName}) %}
-      {% include "__system/redirect.nunj" %}
+      {% include "__system/redirect.njk" %}
     {% else %}
       {% set view = 'component' %}
-      {% asyncEach template in ["pages/component.nunj"] %}
+      {% asyncEach template in ["pages/component.njk"] %}
         {% include template  %}
       {% endeach %}
     {% endif %}
   {% else %}
-    {% include "pages/404.nunj" %}
+    {% include "pages/404.njk" %}
   {% endif %}
 {% elif collection %}
   {% set component = collection.first() %}
@@ -28,7 +28,7 @@
   {% else %}
     {% set redirectUrl = frctl.theme.urlFromRoute('component', {tenant: tenant.name, component: component.handle}) %}
   {% endif %}
-  {% include "__system/redirect.nunj" %}
+  {% include "__system/redirect.njk" %}
 {% else %}
-  {% include "pages/404.nunj" %}
+  {% include "pages/404.njk" %}
 {% endif %}

views/routes/document.nunj → views/routes/document.njk

@@ -24,9 +24,9 @@
 {% endif %}
 
 {% if document and tenant %}
-  {% asyncEach template in ["pages/document.nunj"] %}
+  {% asyncEach template in ["pages/document.njk"] %}
     {% include template  %}
   {% endeach %}
 {% else %}
-  {% include "pages/404.nunj" %}
+  {% include "pages/404.njk" %}
 {% endif %}

views/routes/preview.nunj → views/routes/preview.njk

@@ -23,7 +23,7 @@
 
   {% if rendered | isError -%}
     {% set error = rendered %}
-    {% include "_error.nunj" %}
+    {% include "_error.njk" %}
   {%- else -%}
     {{ rendered }}
   {%- endif %}

views/routes/test.nunj → views/routes/test.njk

@@ -1,3 +1,3 @@
 {% asyncAll panel in ["1", "2"] %}
-  {% include 'partials/' + panel + '.nunj' %}
+  {% include 'partials/' + panel + '.njk' %}
 {% endall %}