From 4dfff986d465e95dee8d10c580ed4ffbc55a63a2 Mon Sep 17 00:00:00 2001
From: Pacharapol Withayasakpunt <patarapolw@gmail.com>
Date: Wed, 25 Dec 2019 13:30:54 +0700
Subject: [PATCH] netlify is more reliable

---
 .gitignore                             |  3 ++-
 packages/web/assets/util.ts            |  3 +++
 packages/web/components/PostFull.vue   |  6 +++---
 packages/web/components/PostQuery.vue  |  7 +++----
 packages/web/components/PostTeaser.vue |  4 ++--
 packages/web/layouts/default.vue       |  5 ++---
 packages/web/now.json                  | 11 ----------
 packages/web/nuxt.config.ts            | 16 +++++++++++++++
 packages/web/package.json              |  5 ++++-
 packages/web/pages/post/_name.vue      | 11 +++-------
 packages/web/pages/reveal.vue          |  7 +++----
 packages/web/store/.gitkeep            |  0
 packages/web/store/global.ts           | 26 ------------------------
 packages/web/store/index.ts            | 28 --------------------------
 packages/web/tsconfig.json             |  1 +
 packages/web/utils/store-accessor.ts   | 14 -------------
 16 files changed, 42 insertions(+), 105 deletions(-)
 delete mode 100644 packages/web/now.json
 create mode 100644 packages/web/store/.gitkeep
 delete mode 100644 packages/web/store/global.ts
 delete mode 100644 packages/web/store/index.ts
 delete mode 100644 packages/web/utils/store-accessor.ts

diff --git a/.gitignore b/.gitignore
index 76add87..63dd18b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 node_modules
-dist
\ No newline at end of file
+dist
+.netlify
\ No newline at end of file
diff --git a/packages/web/assets/util.ts b/packages/web/assets/util.ts
index 2c4bc71..9b7721b 100644
--- a/packages/web/assets/util.ts
+++ b/packages/web/assets/util.ts
@@ -1,5 +1,8 @@
 import QParser from 'q2filter'
 
+export const TAGS = JSON.parse(process.env.tags!)
+export const HASH = JSON.parse(process.env.hash!)
+
 export function escapeRegExp (s: string) {
   return s.replace(/[.*+?^${}()|[\]\\]/g, '\\$&') // $& means the whole matched string
 }
diff --git a/packages/web/components/PostFull.vue b/packages/web/components/PostFull.vue
index 1ffaf49..f037a25 100644
--- a/packages/web/components/PostFull.vue
+++ b/packages/web/components/PostFull.vue
@@ -23,7 +23,7 @@ import PostHeader from './PostHeader.vue'
 import Empty from './Empty.vue'
 import { Vue, Component, Prop, Watch } from 'nuxt-property-decorator'
 import { makeHtml } from '../assets/make-html'
-import { globalStore } from '../store'
+import { HASH } from '../assets/util'
 
 @Component({
   components: {
@@ -44,9 +44,9 @@ export default class PostFull extends Vue {
   @Watch('header.path')
   async updatePost () {
     if (!this.markdown) {
-      this.markdown = await fetch(`/build/teaser/${this.header.path}?h=${globalStore.hash.posts[this.header.path]}`).then((r) => r.text())
+      this.markdown = await fetch(`/build/teaser/${this.header.path}?h=${HASH.posts[this.header.path]}`).then((r) => r.text())
     }
-    this.markdown = await fetch(`/build/full/${this.header.path}?h=${globalStore.hash.posts[this.header.path]}`).then((r) => r.text())
+    this.markdown = await fetch(`/build/full/${this.header.path}?h=${HASH.posts[this.header.path]}`).then((r) => r.text())
   }
 
   get html () {
diff --git a/packages/web/components/PostQuery.vue b/packages/web/components/PostQuery.vue
index 142e98a..e2540fc 100644
--- a/packages/web/components/PostQuery.vue
+++ b/packages/web/components/PostQuery.vue
@@ -17,9 +17,8 @@ section
 import PostTeaser from './PostTeaser.vue'
 import Empty from './Empty.vue'
 import QParser from 'q2filter'
-import { normalizeArray, searchPosts } from '@/assets/util'
+import { normalizeArray, searchPosts, HASH } from '@/assets/util'
 import { Vue, Component, Prop, Watch } from 'nuxt-property-decorator'
-import { globalStore } from '../store'
 
 @Component({
   components: {
@@ -70,10 +69,10 @@ export default class PostQuery extends Vue {
         tag: this.tag,
       } : this.q,
       current: true,
-      posts: await fetch(`/build/header/posts.json?h=${globalStore.hash.posts._header}`).then((r) => r.json()),
+      posts: await fetch(`/build/header/posts.json?h=${HASH.posts._header}`).then((r) => r.json()),
     }).map(async (h) => {
       if (!h.teaser) {
-        h.teaser = await fetch(`/build/teaser/${h.path}?h=${globalStore.hash.posts[h.path]}`).then((r) => r.text())
+        h.teaser = await fetch(`/build/teaser/${h.path}?h=${HASH.posts[h.path]}`).then((r) => r.text())
       }
       return h
     }))
diff --git a/packages/web/components/PostTeaser.vue b/packages/web/components/PostTeaser.vue
index fcc25e3..0b4a4d0 100644
--- a/packages/web/components/PostTeaser.vue
+++ b/packages/web/components/PostTeaser.vue
@@ -15,7 +15,7 @@
 import PostHeader from './PostHeader.vue'
 import { Vue, Component, Prop } from 'nuxt-property-decorator'
 import { makeHtml } from '../assets/make-html'
-import { globalStore } from '../store'
+import { HASH } from '../assets/util'
 
 @Component({
   components: {
@@ -29,7 +29,7 @@ export default class PostTeaser extends Vue {
 
   async mounted () {
     if (!this.teaser) {
-      this.teaser = await fetch(`/build/teaser/${this.header.path}.html?h=${globalStore.hash.posts[this.header.path]}`)
+      this.teaser = await fetch(`/build/teaser/${this.header.path}.html?h=${HASH.posts[this.header.path]}`)
         .then((r) => r.text())
     }
   }
diff --git a/packages/web/layouts/default.vue b/packages/web/layouts/default.vue
index 8e2079d..c99a235 100644
--- a/packages/web/layouts/default.vue
+++ b/packages/web/layouts/default.vue
@@ -33,8 +33,7 @@ section
 <script lang="ts">
 import PageSocial from '@/components/PageSocial.vue'
 import { Vue, Component } from 'nuxt-property-decorator'
-import { normalizeArray } from '@/assets/util'
-import { globalStore } from '~/store'
+import { normalizeArray, TAGS } from '@/assets/util'
 
 @Component
 export default class Default extends Vue {
@@ -53,7 +52,7 @@ export default class Default extends Vue {
   q = ''
 
   get tags () {
-    const tagList = globalStore.tag
+    const tagList = TAGS
 
     return Object.keys(tagList).sort((a, b) => {
       return tagList[b] - tagList[a]
diff --git a/packages/web/now.json b/packages/web/now.json
deleted file mode 100644
index 1ea5e21..0000000
--- a/packages/web/now.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "name": "zhdiary",
-  "version": 2,
-  "builds": [
-    {
-      "src": "nuxt.config.ts",
-      "use": "@nuxtjs/now-builder",
-      "config": {}
-    }
-  ]
-}
\ No newline at end of file
diff --git a/packages/web/nuxt.config.ts b/packages/web/nuxt.config.ts
index e54d689..792664b 100644
--- a/packages/web/nuxt.config.ts
+++ b/packages/web/nuxt.config.ts
@@ -1,4 +1,6 @@
 import { Configuration } from '@nuxt/types'
+import tag from './static/build/tag/posts.json'
+import posts from './static/build/header/posts.json'
 
 const config: Configuration = {
   mode: 'universal',
@@ -90,8 +92,22 @@ const config: Configuration = {
       })
     },
   },
+  generate: {
+    routes: [
+      ...Object.keys(tag).map((el) => `/tag/${el}`),
+      ...Object.values(posts).map((el) => {
+        return el.y && el.mo ? `/post/${el.y}/${el.mo}/${el.name}` : `/post/${el.name}`
+      }),
+    ],
+    fallback: true,
+  },
   env: {
     title: '中文 Diary',
+    tags: JSON.stringify(tag),
+    hash: JSON.stringify({
+      posts: require('./static/build/hash/posts.json'),
+      slides: require('./static/build/hash/slides.json'),
+    }),
   },
 }
 
diff --git a/packages/web/package.json b/packages/web/package.json
index 36e01cb..11d5680 100644
--- a/packages/web/package.json
+++ b/packages/web/package.json
@@ -9,7 +9,10 @@
     "build": "nuxt-ts build",
     "generate": "nuxt-ts generate",
     "start": "nuxt-ts start",
-    "prebuild": "ts-node -O '{\"module\": \"commonjs\"}' utils/build-api.ts"
+    "build-api": "ts-node -O '{\"module\": \"commonjs\"}' utils/build-api.ts",
+    "prebuild": "yarn build-api",
+    "pregenerate": "yarn build-api",
+    "deploy": "yarn generate && netlify deploy --dir dist"
   },
   "dependencies": {
     "@fortawesome/fontawesome-svg-core": "^1.2.26",
diff --git a/packages/web/pages/post/_name.vue b/packages/web/pages/post/_name.vue
index 087de6b..9310c80 100644
--- a/packages/web/pages/post/_name.vue
+++ b/packages/web/pages/post/_name.vue
@@ -6,9 +6,8 @@ post-full(:header="header")
 import { Vue, Component } from 'nuxt-property-decorator'
 import PostFull from '@/components/PostFull.vue'
 import htmlToText from 'html-to-text'
-import { apiHash } from '@/assets/util'
+import { apiHash, HASH } from '@/assets/util'
 import MakeHtml from '@/assets/make-html'
-import { globalStore } from '../../store'
 
 @Component({
   components: {
@@ -19,11 +18,7 @@ export default class PostPage extends Vue {
   header: any = {}
 
   async asyncData ({ params, error, redirect }: any) {
-    // if(process.static && process.client && $payloadURL) {
-    //   return await $axios.$get($payloadURL(route))
-    // }
-
-    const ps: any[] = JSON.parse(await apiHash('/build/header/posts.json', globalStore.hash.posts._header))
+    const ps: any[] = JSON.parse(await apiHash('/build/header/posts.json', HASH.posts._header))
     const header = ps.filter((p) => p.name === params.name)[0]
 
     if (!header) {
@@ -34,7 +29,7 @@ export default class PostPage extends Vue {
       return redirect(encodeURI(`/post/${header.y}/${header.mo}/${params.name}`))
     }
 
-    header.teaser = await apiHash(`/build/teaser/${header.path}`, globalStore.hash.posts[header.path])
+    header.teaser = await apiHash(`/build/teaser/${header.path}`, HASH.posts[header.path])
 
     return {
       header,
diff --git a/packages/web/pages/reveal.vue b/packages/web/pages/reveal.vue
index aa67f16..2e0ffa1 100644
--- a/packages/web/pages/reveal.vue
+++ b/packages/web/pages/reveal.vue
@@ -9,7 +9,7 @@ div(style="width: 100vw; height: 100vh")
 import { Vue, Component } from 'nuxt-property-decorator'
 import MakeHtml from '@/assets/make-html'
 import matter from 'gray-matter'
-import { apiHash } from '@/assets/util'
+import { apiHash, HASH } from '@/assets/util'
 // @ts-ignore
 import shortHash from 'short-hash'
 import $ from 'cheerio'
@@ -18,7 +18,6 @@ import scopeCss from 'scope-css'
 import h from 'hyperscript'
 import qs from 'querystring'
 import stringify from 'fast-json-stable-stringify'
-import { globalStore } from '../store'
 
 declare global {
   interface Window {
@@ -61,7 +60,7 @@ export default class RevealMd extends Vue {
 
     if (path) {
       try {
-        const raw = await apiHash(`/build/slides/${path}`, globalStore.hash.slides[path as string])
+        const raw = await apiHash(`/build/slides/${path}`, HASH.slides[path as string])
         const { data, content } = matter(raw)
 
         return {
@@ -106,7 +105,7 @@ export default class RevealMd extends Vue {
       const { path } = this.$route.query
       if (!this.defaults.markdown && path) {
         try {
-          const raw = await apiHash(`/build/slides/${path}`, globalStore.hash.slides[path as string])
+          const raw = await apiHash(`/build/slides/${path}`, HASH.slides[path as string])
           const { data, content } = matter(raw)
 
           this.defaults.markdown = content
diff --git a/packages/web/store/.gitkeep b/packages/web/store/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/packages/web/store/global.ts b/packages/web/store/global.ts
deleted file mode 100644
index dd044fe..0000000
--- a/packages/web/store/global.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-import { Module, VuexModule, Mutation } from 'vuex-module-decorators'
-import { DataType } from '../utils/build-api'
-
-@Module({
-  name: 'global',
-  stateFactory: true,
-  namespaced: true,
-})
-export default class GlobalModule extends VuexModule {
-  hash: Record<DataType, Record<string, string>> = {
-    posts: {},
-    slides: {},
-  }
-
-  tag: Record<string, number> = {}
-
-  @Mutation
-  setHash (h: any) {
-    this.hash = h
-  }
-
-  @Mutation
-  setTag (tag: any) {
-    this.tag = tag
-  }
-}
diff --git a/packages/web/store/index.ts b/packages/web/store/index.ts
deleted file mode 100644
index 16b0694..0000000
--- a/packages/web/store/index.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-import { Store, ActionTree } from 'vuex'
-import { initialiseStores } from '~/utils/store-accessor'
-import { apiHash } from '~/assets/util'
-
-const initializer = (store: Store<any>) => initialiseStores(store)
-
-export const actions: ActionTree<any, any> = {
-  async nuxtServerInit ({ commit }) {
-    const [
-      hPosts,
-      hSlides,
-      tPosts,
-    ] = await Promise.all([
-      apiHash('/build/hash/posts.json', Math.random().toString().substr(-5)),
-      apiHash('/build/hash/slides.json', Math.random().toString().substr(-5)),
-      apiHash('/build/tag/posts.json', Math.random().toString().substr(-5)),
-    ])
-
-    commit('global/setHash', {
-      posts: JSON.parse(hPosts),
-      slides: JSON.parse(hSlides),
-    })
-    commit('global/setTag', JSON.parse(tPosts))
-  },
-}
-
-export const plugins = [initializer]
-export * from '~/utils/store-accessor'
diff --git a/packages/web/tsconfig.json b/packages/web/tsconfig.json
index 3fa352c..58e4ee0 100644
--- a/packages/web/tsconfig.json
+++ b/packages/web/tsconfig.json
@@ -15,6 +15,7 @@
     "noEmit": true,
     "experimentalDecorators": true,
     "skipLibCheck": true,
+    "resolveJsonModule": true,
     "baseUrl": ".",
     "paths": {
       "~/*": [
diff --git a/packages/web/utils/store-accessor.ts b/packages/web/utils/store-accessor.ts
deleted file mode 100644
index 528445f..0000000
--- a/packages/web/utils/store-accessor.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-import { Store } from 'vuex'
-import { getModule } from 'vuex-module-decorators'
-import GlobalModule from '../store/global'
-
-let globalStore: GlobalModule
-
-function initialiseStores (store: Store<any>): void {
-  globalStore = getModule(GlobalModule, store)
-}
-
-export {
-  initialiseStores,
-  globalStore,
-}