feat: added route data and cleanup

Author: taty2010

src/helpers/blobs/cacheFormat.ts

@@ -5,47 +5,83 @@ import path from 'path'
 
 import pkg from 'fs-extra'
 
-import { BUILD_DIR, SERVER_DIR } from '../constants.js'
-
+import { NEXT_DIR, SERVER_DIR } from '../constants.js'
 // readfile not available in esm version of fs-extra
 const { readFile } = pkg
 
-
 export const removeFileDir = (file: string, num: number) => {
  return file.split('/').slice(num).join('/')
  } 
 
-
-export const formatPageData = async (pathname: string, key: string, file: string) => {
+export const formatBlobContent = async (pathname: string, key: string, file: string) => {
  const isPage = pathname.startsWith('pages')
  const isApp = pathname.startsWith('app')
- const removedDir = removeFileDir(pathname, 1).replace(path.extname(file), '')
- // console.log({pathname, key, file, isPage, isApp, removedDir} )
+ const isFetchCache = file.startsWith('cache/fetch-cache')
+ const isRoute = file.endsWith('body')
+
  let data: any = {}
- if( isApp || isPage ){
- console.log("WIHTIN APP + PAGE CHECK")
- const getDataFile = async (files: string, appDir: boolean, ext: string) => 
- await readFile(
- join(SERVER_DIR, (appDir ? 'app' : 'pages'), `${files}.${ext}`), 
- 'utf8')
- 
- const pageData = isPage ? JSON.parse(await getDataFile(removedDir, false,'json')) : await getDataFile(removedDir, true, 'rsc')
- let meta: { status?: number, headers?: OutgoingHttpHeaders } = {}
- 
- try{
- meta = JSON.parse((await getDataFile(key, true, 'meta')))
- }catch{}
- 
- data = {
+
+ if( !isRoute && (isApp || isPage) ){
+ data = await formatPage(isPage, file, pathname)
+ }
+
+ if( isFetchCache ){
+ data = await formatFetchCache(file)
+ }
+
+ if(isRoute){
+ data = await formatRoute(file, key, pathname)
+ }
+ return data
+}
+
+const readFileData = async (files: string, appDir: boolean, ext: string) => 
+ await readFile(
+ join(SERVER_DIR, (appDir ? 'app' : 'pages'), `${files}.${ext}`), 
+ 'utf8')
+
+const formatPage = async (page: boolean, file: string, pathname: string) => {
+ const removedDir = removeFileDir(pathname, 1).replace(path.extname(file), '')
+ const pageData = page ? JSON.parse(await readFileData(removedDir, false,'json')) : await readFileData(removedDir, true, 'rsc')
+ let meta: { status?: number, headers?: OutgoingHttpHeaders } = {}
+
+ try{
+ meta = JSON.parse((await readFileData(removedDir, true, 'meta')))
+ }catch{}
+
+ return {
  lastModified: Date.now(),
  value: {
-  kind: 'PAGE',
-  html: await readFile(join(BUILD_DIR, file), 'utf8'),
-  pageData,
-  headers: meta.headers,
-  status: meta.status,
+ kind: 'PAGE',
+ html: await readFile(join(NEXT_DIR, file), 'utf8'),
+ pageData,
+ headers: meta.headers,
+ status: meta.status,
  }
- }
  }
- return data
+}
+
+const formatFetchCache = async (file: string) => {
+ const parsedData = JSON.parse(await readFile(join(NEXT_DIR, file), 'utf8'))
+ return {
+ lastModified: Date.now(), 
+ value: parsedData,
+ }
+}
+
+const formatRoute = async (file: string, key: string, pathname: string) => {
+ const removedDir = removeFileDir(pathname, 1).replace(path.extname(file), '')
+ try{
+ // const data = await readFileData(removedDir, true, 'body')
+ const meta = JSON.parse(await readFileData(removedDir, true, 'meta'))
+ return{
+ lastModified: Date.now(),
+ value: {
+ kind: 'ROUTE',
+ // body: data,
+ headers: meta.headers,
+ status: meta.status, 
+ }
+ }
+ }catch{}
 }

src/helpers/constants.ts

@@ -7,9 +7,10 @@ export const WORKING_DIR = process.cwd()
 
 export const BUILD_DIR = `${WORKING_DIR}/.netlify`
 export const RUN_DIR = WORKING_DIR
-export const SERVER_DIR = `${BUILD_DIR}/server`
-export const STANDALONE_BUILD_DIR = `${BUILD_DIR}/standalone`
-export const FETCH_CACHE_DIR = `${BUILD_DIR}/cache/fetch-cache`
+export const NEXT_DIR = `${BUILD_DIR}/.next`
+export const SERVER_DIR = `${NEXT_DIR}/server`
+export const STANDALONE_BUILD_DIR = `${NEXT_DIR}/standalone`
+export const FETCH_CACHE_DIR = `${NEXT_DIR}/cache/fetch-cache`
 
 export const SERVER_FUNCTIONS_DIR = `${WORKING_DIR}/.netlify/functions-internal`
 export const SERVER_HANDLER_NAME = '___netlify-server-handler'

src/helpers/files.ts

@@ -9,14 +9,14 @@ import { outdent } from 'outdent'
 import pLimit from 'p-limit'
 
 import { getNormalizedBlobKey, netliBlob } from './blobs/blobs.cjs'
-import { removeFileDir, formatPageData } from './blobs/cacheFormat.js'
-import { BUILD_DIR, STANDALONE_BUILD_DIR } from './constants.js'
+import { removeFileDir, formatBlobContent } from './blobs/cacheFormat.js'
+import { NEXT_DIR, STANDALONE_BUILD_DIR } from './constants.js'
 
 /**
  * Move the Next.js build output from the publish dir to a temp dir
  */
 export const stashBuildOutput = async ({ PUBLISH_DIR }: NetlifyPluginConstants) => {
- await move(PUBLISH_DIR, `${BUILD_DIR}/.next`, { overwrite: true })
+ await move(PUBLISH_DIR, `${NEXT_DIR}`, { overwrite: true })
 
  // remove prerendered content from the standalone build (it's also in the main build dir)
  const prerenderedContent = await getPrerenderedContent(STANDALONE_BUILD_DIR)
@@ -42,7 +42,8 @@ const getPrerenderedContent = async (cwd: string): Promise<string[]> => {
  */
 export const storePrerenderedContent = async ({ NETLIFY_API_TOKEN, SITE_ID }:
  { 
- NETLIFY_API_TOKEN: string, SITE_ID: string
+ NETLIFY_API_TOKEN: string, 
+ SITE_ID: string
  }) => {
  const deployID = `${process.env.DEPLOY_ID}`
  const blob = netliBlob(NETLIFY_API_TOKEN, deployID, SITE_ID)
@@ -55,8 +56,7 @@ export const storePrerenderedContent = async ({ NETLIFY_API_TOKEN, SITE_ID }:
 
  const uploadFilesToBlob = async (pathName: string, file: string) => {
  const key = path.basename(pathName, path.extname(pathName))
- const content = await formatPageData(pathName, key, file)
- console.log(content)
+ const content = await formatBlobContent(pathName, key, file)
  try{
  await blob.setJSON(getNormalizedBlobKey(key), content)
  }catch(error){
@@ -65,29 +65,35 @@ export const storePrerenderedContent = async ({ NETLIFY_API_TOKEN, SITE_ID }:
  }
 
  // todo: test it on demo with pages dir
- const prerenderedContent = await getPrerenderedContent(BUILD_DIR)
-
- prerenderedContent.map((rawPath) => {
+ // eslint-disable-next-line unicorn/no-await-expression-member
+ (await getPrerenderedContent(NEXT_DIR)).map((rawPath: string) => {
  const cacheFile = rawPath.startsWith('cache')
- const hasHtml = Boolean(rawPath.endsWith('.html'))
-
- // Removing app, page, and cache/fetch-cache from file path
  const pathKey = removeFileDir(rawPath, (cacheFile ? 2 : 1))
- const errorPages = pathKey.includes('404') || pathKey.includes('500')
- 
- // Checking for blob access before uploading
- if( hasHtml && !errorPages ){
+ const files = findCacheFiles(pathKey, rawPath)
+
+ if(files){
  return limit(uploadFilesToBlob, pathKey, rawPath)
  }
  })
 } 
 
+const findCacheFiles = (pathKey: string, rawPath: string) => {
+ const errorPages = pathKey.includes('404') || pathKey.includes('500')
+ const isFetchCache = rawPath.startsWith('cache/fetch-cache')
+ const isRoute = rawPath.endsWith('.body')
+ const hasHtml = rawPath.endsWith('.html')
+
+ if (hasHtml && !errorPages || isFetchCache || isRoute){
+ return true
+ }
+}
+
 /**
  * Move static assets to the publish dir so they are uploaded to the CDN
  */
 export const publishStaticAssets = ({ PUBLISH_DIR }: NetlifyPluginConstants) => {
  return Promise.all([
  copy('public', PUBLISH_DIR),
- copy(`${BUILD_DIR}/.next/static/`, `${PUBLISH_DIR}/_next/static`),
+ copy(`${NEXT_DIR}/static/`, `${PUBLISH_DIR}/_next/static`),
  ])
 }