fix(mixins): Remove +head and +scripts in favor of +norska_head and +…

…norska_scripts
pixelastic · Sep 11, 2020 · 27aae34 · 27aae34
1 parent 6f538a8
commit 27aae34
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 15 deletions.
diff --git a/modules/norska-html/lib/pug/mixins/__tests__/head.js b/modules/norska-html/lib/pug/mixins/__tests__/head.js
@@ -16,7 +16,7 @@ describe('norska-html > pug > mixins > head', () => {
       jest.spyOn(helper, 'isProduction').mockReturnValue(true);
       const source = dedent`
         block content
-          +head()
+          +norska_head()
             meta(name="custom", content="my value")
       `;
       const options = {

diff --git a/modules/norska-html/lib/pug/mixins/__tests__/scripts.js b/modules/norska-html/lib/pug/mixins/__tests__/scripts.js
@@ -13,22 +13,22 @@ describe('norska-html > pug > mixins > scripts', () => {
     [
       'Nominal case',
       ['script.js', 'vendors.js'],
-      '+scripts()',
+      '+norska_scripts()',
       'index.html',
       '<script src="./script.js"></script><script src="./vendors.js"></script>',
     ],
     [
       'In subfolder',
       ['script.js', 'vendors.js'],
-      '+scripts()',
+      '+norska_scripts()',
       'blog/index.html',
       '<script src="../script.js"></script><script src="../vendors.js"></script>',
     ],
-    ['With no scripts', [], '+scripts()', 'index.html', ''],
+    ['With no scripts', [], '+norska_scripts()', 'index.html', ''],
     [
       'With custom content',
       [],
-      '+scripts()\n    script(src="custom.js")', // Double indentation on purpose
+      '+norska_scripts()\n    script(src="custom.js")', // Double indentation on purpose
       'index.html',
       '<script src="custom.js"></script>',
     ],

diff --git a/modules/norska-html/lib/pug/mixins/head.pug b/modules/norska-html/lib/pug/mixins/head.pug
@@ -1,4 +1,4 @@
-mixin head() 
+mixin norska_head() 
   - 
     let {
       title,
@@ -30,7 +30,3 @@ mixin head()
     link(type="text/css", rel="stylesheet", href=revv(`${url.pathToRoot}style.css`))
     //- Custom content
     block
-
-//- Backward compatibility
-mixin norska_head()
-  +head()
diff --git a/modules/norska-html/lib/pug/mixins/scripts.pug b/modules/norska-html/lib/pug/mixins/scripts.pug
@@ -1,8 +1,4 @@
-mixin scripts() 
+mixin norska_scripts() 
   each jsFile in runtime.jsFiles
     script(src=`${url.pathToRoot}${jsFile}`)
   block
-
-//- Backward compatibility
-mixin norska_scripts()
-  +scripts()