chore: copy default locale

Author: ascorbic

demos/base-path/netlify.toml

@@ -17,5 +17,5 @@ package = "./local-plugin"
 [[plugins]]
 package = "@netlify/plugin-local-install-core"
 
-[[context.deploy-preview.plugins]]
-package = "netlify-plugin-cypress"
+# [[context.deploy-preview.plugins]]
+# package = "netlify-plugin-cypress"

demos/static-root/netlify.toml

@@ -17,5 +17,5 @@ package = "./local-plugin"
 [[plugins]]
 package = "@netlify/plugin-local-install-core"
 
-# [[context.deploy-preview.plugins]]
-# package = "netlify-plugin-cypress"
+[[context.deploy-preview.plugins]]
+package = "netlify-plugin-cypress"

src/helpers/files.ts

@@ -241,22 +241,23 @@ export const moveStaticPages = async ({
   await writeJson(join(netlifyConfig.build.publish, 'static-manifest.json'), Object.entries(filesManifest))
 
   if (i18n?.defaultLocale) {
+    const rootPath = basePath ? join(netlifyConfig.build.publish, basePath) : netlifyConfig.build.publish
     // Copy the default locale into the root
-    const defaultLocaleDir = join(netlifyConfig.build.publish, i18n.defaultLocale)
+    const defaultLocaleDir = join(rootPath, i18n.defaultLocale)
     if (existsSync(defaultLocaleDir)) {
-      await copy(defaultLocaleDir, `${netlifyConfig.build.publish}/`)
+      await copy(defaultLocaleDir, `${rootPath}/`)
     }
-    const defaultLocaleIndex = join(netlifyConfig.build.publish, `${i18n.defaultLocale}.html`)
-    const indexHtml = join(netlifyConfig.build.publish, 'index.html')
+    const defaultLocaleIndex = join(rootPath, `${i18n.defaultLocale}.html`)
+    const indexHtml = join(rootPath, 'index.html')
     if (existsSync(defaultLocaleIndex) && !existsSync(indexHtml)) {
-      try {
-        await copy(defaultLocaleIndex, indexHtml, { overwrite: false })
-        await copy(
-          join(netlifyConfig.build.publish, `${i18n.defaultLocale}.json`),
-          join(netlifyConfig.build.publish, 'index.json'),
-          { overwrite: false },
-        )
-      } catch {}
+      await copy(defaultLocaleIndex, indexHtml, { overwrite: false }).catch(() => {
+        /* ignore */
+      })
+      await copy(join(rootPath, `${i18n.defaultLocale}.json`), join(rootPath, 'index.json'), {
+        overwrite: false,
+      }).catch(() => {
+        /* ignore */
+      })
     }
   }
 

src/templates/getHandler.ts

@@ -85,8 +85,6 @@ const makeHandler = (conf: NextConfig, app, pageRoot, staticManifest: Array<[str
   }
 
   return async function handler(event: HandlerEvent, context: HandlerContext) {
-    console.log(event)
-
     let requestMode = mode
     // Ensure that paths are encoded - but don't double-encode them
     event.path = new URL(event.rawUrl).pathname