test

Author: lindsaylevine

.github/workflows/test.yml

@@ -27,4 +27,7 @@ jobs:
         with:
           node-version: ${{ matrix.node-version }}
       - run: npm ci
+      - name: Linting
+        run: npm run format:ci
+        if: "${{ matrix.node-version == '15.x' }}"
       - run: npm test

src/index.js

@@ -63,7 +63,7 @@ const watch = (functionsPath, publishPath) => {
 //   publishDir: string to path
 //   watch: { directory: string to path }
 // }
-// 
+//
 
 const nextOnNetlify = async (options = {}) => {
   const functionsPath = normalize(options.functionsDir || NETLIFY_FUNCTIONS_PATH)

src/lib/helpers/addDefaultLocaleRedirect.js

@@ -11,7 +11,7 @@ const addDefaultLocaleRedirect = async (redirects, route, target, additionalPara
   if (!defaultLocale) return
 
   const routePieces = route.split('/')
-  const routeLocale = routePieces[1]
+  const [, routeLocale] = routePieces
   if (routeLocale === defaultLocale) {
     const nakedRoute = route === `/${routeLocale}` ? '/' : route.replace(`/${routeLocale}`, '')
     redirects.push({

src/lib/helpers/copyDynamicImportChunks.js

@@ -3,8 +3,7 @@ const { join } = require('path')
 const { copySync, readdirSync } = require('fs-extra')
 
 const getNextDistDir = require('./getNextDistDir')
-const { logTitle } = require("./logger")
-
+const { logTitle } = require('./logger')
 
 // Check if there are dynamic import chunks and copy to the necessary function dir
 const copyDynamicImportChunks = async (functionPath) => {

src/lib/helpers/getPrerenderManifest.js

@@ -16,7 +16,7 @@ const transformManifestForI18n = async (manifest) => {
     if (isDynamicRoute) {
       newRoutes[route] = routes[route]
     } else {
-      const locale = route.split('/')[1]
+      const [, locale] = route.split('/')
       const routeWithoutLocale = `/${route.split('/').slice(2, route.split('/').length).join('/')}`
       newRoutes[route] = {
         dataRoute: await getDataRouteForRoute(routeWithoutLocale, locale),

src/lib/helpers/handleFileTracking.js

@@ -6,6 +6,7 @@ const { existsSync, readdirSync, readFileSync, rmdirSync, removeSync, writeFileS
 const { NETLIFY_PUBLISH_PATH, NETLIFY_FUNCTIONS_PATH } = require('../config')
 
 const TRACKING_FILE_SEPARATOR = '---'
+const getDifference = (before, after) => after.filter((filePath) => !before.includes(filePath))
 
 // Clean configured publish and functions folders and track next-on-netlify files
 // for future cleans
@@ -49,7 +50,6 @@ const handleFileTracking = ({ functionsPath, publishPath }) => {
       isConfiguredFunctionsDir && existsSync(functionsPath) ? readdirSync(functionsPath) : functionsBeforeRun
     const publishAfterRun =
       isConfiguredPublishDir && existsSync(publishPath) ? readdirSync(publishPath) : publishBeforeRun
-    const getDifference = (before, after) => after.filter((filePath) => !before.includes(filePath))
     const newFunctionsFiles = getDifference(functionsBeforeRun, functionsAfterRun)
     const newPublishFiles = getDifference(publishBeforeRun, publishAfterRun)
 

src/lib/helpers/isRouteInPrerenderManifest.js

@@ -4,7 +4,7 @@ const getPrerenderManifest = require('./getPrerenderManifest')
 // Return true if the route is defined in the prerender manifest
 const isRouteInPrerenderManifest = async (route) => {
   const i18n = await getI18n()
-  const { defaultLocale, locales } = i18n
+  const { defaultLocale } = i18n
   const { routes, dynamicRoutes } = await getPrerenderManifest()
 
   const isRouteInManifestWithI18n = () => {
@@ -16,7 +16,7 @@ const isRouteInPrerenderManifest = async (route) => {
     return isStaticRoute || route in dynamicRoutes
   }
 
-  if (i18n.defaultLocale) return isRouteInManifestWithI18n(route)
+  if (defaultLocale) return isRouteInManifestWithI18n(route)
   return route in routes || route in dynamicRoutes
 }
 

src/lib/helpers/setupStaticFileForPage.js

@@ -6,13 +6,10 @@ const getNextDistDir = require('./getNextDistDir')
 
 // Copy the static asset from pages/inputPath to out_publish/outputPath
 const setupStaticFileForPage = async ({ inputPath, outputPath = null, publishPath }) => {
-  // If no outputPath is set, default to the same as inputPath
-  outputPath = outputPath || inputPath
-
   const nextDistDir = await getNextDistDir()
 
   // Perform copy operation
-  copySync(join(nextDistDir, 'serverless', 'pages', inputPath), join(publishPath, outputPath), {
+  copySync(join(nextDistDir, 'serverless', 'pages', inputPath), join(publishPath, outputPath || inputPath), {
     overwrite: false,
     errorOnExist: true,
   })

src/lib/pages/getServerSideProps/redirects.js

@@ -6,12 +6,12 @@ const getNetlifyFunctionName = require('../../helpers/getNetlifyFunctionName')
 const getPages = require('./pages')
 
 // getServerSideProps pages
-// 
+//
 // Page params {
 //     route -> '/ssr', '/ssr/[id]'
 //     filePath -> 'pages/ssr.js', 'pages/ssr/[id].js'
 // }
-// 
+//
 
 const getRedirects = async () => {
   const redirects = []

src/lib/pages/getStaticProps/redirects.js

@@ -8,20 +8,20 @@ const getNetlifyFunctionName = require('../../helpers/getNetlifyFunctionName')
 const getPages = require('./pages')
 
 // getStaticProps pages
-// 
+//
 // Page params {
 //     route -> '/getStaticProps', '/getStaticProps/3'
 //     dataRoute -> '/_next/data/{BUILD_ID}/getStaticProps.json', '_next/data/{BUILD_ID}/getStaticProps/3.json'
 //     srcRoute -> null, /getStaticProps/[id]
 // }
-// 
+//
 // Page params with i18n {
 //     route -> '/getStaticProps', '/en/getStaticProps/3'
 //     dataRoute -> '/_next/data/{BUILD_ID}/getStaticProps.json', '_next/data/{BUILD_ID}/en/getStaticProps/3.json'
 //     srcRoute -> null, /getStaticProps/[id]
 // }
-// 
-// 
+//
+//
 
 // Pages with getStaticProps (without fallback or revalidation) only need
 // redirects for i18n and handling preview mode

src/lib/pages/getStaticPropsWithRevalidate/redirects.js

@@ -8,19 +8,19 @@ const getNetlifyFunctionName = require('../../helpers/getNetlifyFunctionName')
 const getPages = require('./pages')
 
 // getStaticProps with revalidate pages
-// 
+//
 // Page params: {
 //     route -> '/getStaticProps', '/getStaticProps/3'
 //     dataRoute -> '/_next/data/{BUILD_ID}/getStaticProps.json', '_next/data/{BUILD_ID}/getStaticProps/3.json'
 //     srcRoute -> null, /getStaticProps/[id]
 // }
-// 
+//
 // Page params in i18n {
 //     route -> '/getStaticProps', '/en/getStaticProps/3'
 //     dataRoute -> '/_next/data/{BUILD_ID}/getStaticProps.json', '_next/data/{BUILD_ID}/en/getStaticProps/3.json'
 //     srcRoute -> null, /getStaticProps/[id]
 // }
-// 
+//
 
 const getRedirects = async () => {
   const redirects = []

src/lib/pages/withoutProps/redirects.js

@@ -5,17 +5,17 @@ const isDynamicRoute = require('../../helpers/isDynamicRoute')
 const getPages = require('./pages')
 
 // withoutProps pages
-// 
+//
 // Page params {
 //     route -> '/about', '/initial/[id]'
 //     filePath -> 'pages/about.html', 'pages/initial[id].html'
 // }
-// 
+//
 // Page params in i18n {
 //     route -> '/en/about', '/fr/initial/[id]'
 //     filePath -> 'pages/en/about.html', 'pages/fr/initial[id].html'
 // }
-// 
+//
 
 const getRedirects = async () => {
   const redirects = []

src/lib/steps/setupHeaders.js

@@ -5,6 +5,8 @@ const { existsSync, readFileSync, writeFileSync } = require('fs-extra')
 const { CUSTOM_HEADERS_PATH } = require('../config')
 const { logTitle, logItem } = require('../helpers/logger')
 
+const indentNewLine = (s) => `\n  ${s}`
+
 // Setup _headers file to override specific header rules for next assets
 const setupHeaders = (publishPath) => {
   logTitle('🔀 Setting up headers')
@@ -20,7 +22,6 @@ const setupHeaders = (publishPath) => {
   headers.push('# Next-on-Netlify Headers')
 
   // Add rule to override cache control for static chunks
-  const indentNewLine = (s) => `\n  ${s}`
   const staticChunkRule = [
     `/_next/static/chunks/*`,
     indentNewLine(`cache-control: public`),

src/lib/steps/setupRedirects.js

@@ -60,7 +60,7 @@ const setupRedirects = async (publishPath) => {
   ;[...sortedStaticRedirects, ...sortedDynamicRedirects].forEach((nextRedirect) => {
     // One route may map to multiple Netlify routes: e.g., catch-all pages
     // require two Netlify routes in the _redirects file
-    getNetlifyRoutes(nextRedirect.route).map((netlifyRoute) => {
+    getNetlifyRoutes(nextRedirect.route).forEach((netlifyRoute) => {
       const { conditions = [], force = false, statusCode = '200', target } = nextRedirect
       const redirectPieces = [netlifyRoute, target, `${statusCode}${force ? '!' : ''}`, conditions.join('  ')]
       const redirect = redirectPieces.join('  ').trim()