@tenjuu99/blog 0.2.25 → 0.2.27

package/index.js

@@ -1,4 +1,5 @@
 import { allData } from './lib/indexer.js'
 import config from './lib/config.js'
+import * as dir from './lib/dir.js'
 
-export { allData, config }
+export { allData, config, dir }

package/lib/dir.js

@@ -36,10 +36,16 @@ const cache = () => {
     const packages = config.packages.split(',')
     packages.forEach(dir => {
       if (fs.existsSync(`${packageDirCore}/${dir}`)) {
+        const helper = config.helper.split(',')
+        helper.push(`${dir}.js`)
+        config.helper = helper.join(',')
         console.log(styleText('blue', `[cache] enable core package: ${dir}`))
         fs.cpSync(`${packageDirCore}/${dir}`, cacheDir, { recursive: true })
       }
       if (fs.existsSync(`${packageDir}/${dir}`)) {
+        const helper = config.helper.split(',')
+        helper.push(`${dir}.js`)
+        config.helper = helper.join(',')
         console.log(styleText('blue', `[cache] enable package: ${dir}`))
         fs.cpSync(`${packageDir}/${dir}`, cacheDir, { recursive: true })
       }

package/lib/helper.js

@@ -1,4 +1,5 @@
 import config from './config.js'
+import { existsSync } from 'node:fs'
 import { helperDir } from './dir.js'
 
 let helper = {}
@@ -6,8 +7,10 @@ let helper = {}
 if (config.helper) {
   const files = config.helper.split(',')
   files.forEach(async file => {
-    const helperAdditional = await import(`${helperDir}/${file}`)
-    helper = Object.assign(helper, helperAdditional)
+    if (existsSync(`${helperDir}/${file}`)) {
+      const helperAdditional = await import(`${helperDir}/${file}`)
+      helper = Object.assign(helper, helperAdditional)
+    }
   })
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tenjuu99/blog",
-  "version": "0.2.25",
+  "version": "0.2.27",
   "description": "blog template",
   "main": "index.js",
   "scripts": {

package/packages/turbolink/helper/turbolink.js

@@ -0,0 +1,7 @@
+import fs from 'node:fs'
+import { dir } from '@tenjuu99/blog'
+
+export function turbolink() {
+  const turbolinkScript = fs.readFileSync(dir.templateDir + '/turbolink.js', 'utf8')
+  return `<script>${turbolinkScript}</script>`
+}

package/packages/turbolink/template/turbolink.js

@@ -31,7 +31,17 @@ const transition = async (href) => {
   document.body = doc.getElementsByTagName('body')[0]
   // set header
   document.title = doc.getElementsByTagName('title')[0].textContent
-  const canonical = document.head.querySelector('link[rel=canonical]').href = doc.querySelector('link[rel=canonical]').href
+  const canonical = document.head.querySelector('link[rel=canonical]')
+  const newCanonical = doc.querySelector('link[rel=canonical]')
+  if (canonical) {
+    if (newCanonical) {
+      canonical.href = newCanonical.href
+    } else {
+      canonical.remove()
+    }
+  } else if (newCanonical) {
+    document.head.appendChild(newCanonical)
+  }
 
   const metas = [...document.head.querySelectorAll('meta')]
   metas.forEach(meta => {
@@ -51,15 +61,38 @@ const transition = async (href) => {
       document.head.appendChild(meta)
     }
   })
+  const scripts = [...document.scripts].forEach(script => {
+    if (script.dataset.turbolink === 'reapply') {
+      const newScript = document.createElement('script')
+      newScript.dataset.turbolink = 'reapply'
+      const newScriptHtml = `(() => {
+        ${script.innerHTML}
+      })()`
+      newScript.innerHTML = newScriptHtml
+      script.parentNode.append(newScript)
+      script.remove()
+    }
+  })
 }
 
+const urlFromHref = (href) => {
+  try {
+    return new URL(encodeURI(href))
+  } catch (e) {
+    console.log(`${href} is invalid`)
+    throw e
+  }
+}
 const turbolinks = () => {
   const links = document.querySelectorAll('a')
-  const current = new URL(document.location.href)
+  const current = urlFromHref(document.location.href)
   const currentDom = document.body
   links.forEach(link => {
     const href = link.href
-    const url = new URL(href)
+    if (!href.trim() || href.startsWith('javascript:') || link.dataset['turbolink'] === 'disable') {
+      return
+    }
+    const url = urlFromHref(href)
     if (url.host === current.host) {
       link.onclick = async (e) => {
         e.preventDefault()

package/src-sample/template/default.html

@@ -47,12 +47,6 @@
 
     {include('template/prevNext.html')}
   </main>
-    {if isEditorEnabled() }
-    <div class="container">
-      <a href="/editor?md={{name}}.{{__filetype}}" class="editor_link">編集する</a>
-    </div>
-    {/if}
-
   {include('template/footer.html')}
   {if add_script}
   <script src="{{ADD_SCRIPT}}" async></script>

package/src-sample/template/footer.html

@@ -1,13 +1,20 @@
-  <footer>
-    <ul class="container">
-      <li><a href="{{RELATIVE_PATH}}/about">about</a></li>
-      <li><a href="{{RELATIVE_PATH}}/privacy_policy">プライバシーポリシー</a></li>
-      <li><a href="{{RELATIVE_PATH}}/rss.xml">RSS</a></li>
-    </ul>
-  </footer>
+{if isEditorEnabled() }
+<div class="container">
+  <a href="/editor?md={{name}}.{{__filetype}}" class="editor_link" data-turbolink="disable">編集する</a>
+</div>
+{/if}
+
+<footer>
+  <ul class="container">
+    <li><a href="{{RELATIVE_PATH}}/about">about</a></li>
+    <li><a href="{{RELATIVE_PATH}}/privacy_policy">プライバシーポリシー</a></li>
+    <li><a href="{{RELATIVE_PATH}}/rss.xml" data-turbolink="disable">RSS</a></li>
+  </ul>
+</footer>
 
-{if turbolink}
-<script>
-  {include('template/turbolink.js')}
+<script data-turbolink="reapply">
+  const title = document.title
+  console.log(title)
 </script>
-{/if}
+
+{{ turbolink() }}