@netlify/plugin-nextjs 4.2.5 → 4.2.6

package/lib/helpers/files.js

@@ -63,7 +63,7 @@ const getMiddleware = async (publish) => {
 };
 exports.getMiddleware = getMiddleware;
 // eslint-disable-next-line max-lines-per-function
-const moveStaticPages = async ({ netlifyConfig, target, i18n, }) => {
+const moveStaticPages = async ({ netlifyConfig, target, i18n, basePath, }) => {
     console.log('Moving static page files to serve from CDN...');
     const outputDir = (0, pathe_1.join)(netlifyConfig.build.publish, target === 'server' ? 'server' : 'serverless');
     const root = (0, pathe_1.join)(outputDir, 'pages');
@@ -94,9 +94,10 @@ const moveStaticPages = async ({ netlifyConfig, target, i18n, }) => {
         const isData = file.endsWith('.json');
         const source = (0, pathe_1.join)(root, file);
         const targetFile = isData ? (0, pathe_1.join)(dataDir, file) : file;
+        const targetPath = basePath ? (0, pathe_1.join)(basePath, targetFile) : targetFile;
         files.push(file);
-        filesManifest[file] = targetFile;
-        const dest = (0, pathe_1.join)(netlifyConfig.build.publish, targetFile);
+        filesManifest[file] = targetPath;
+        const dest = (0, pathe_1.join)(netlifyConfig.build.publish, targetPath);
         try {
             await (0, fs_extra_1.move)(source, dest);
         }
@@ -190,19 +191,23 @@ const moveStaticPages = async ({ netlifyConfig, target, i18n, }) => {
     // Write the manifest for use in the serverless functions
     await (0, fs_extra_1.writeJson)((0, pathe_1.join)(netlifyConfig.build.publish, 'static-manifest.json'), Object.entries(filesManifest));
     if (i18n === null || i18n === void 0 ? void 0 : i18n.defaultLocale) {
+        const rootPath = basePath ? (0, pathe_1.join)(netlifyConfig.build.publish, basePath) : netlifyConfig.build.publish;
         // Copy the default locale into the root
-        const defaultLocaleDir = (0, pathe_1.join)(netlifyConfig.build.publish, i18n.defaultLocale);
+        const defaultLocaleDir = (0, pathe_1.join)(rootPath, i18n.defaultLocale);
         if ((0, fs_extra_1.existsSync)(defaultLocaleDir)) {
-            await (0, fs_extra_1.copy)(defaultLocaleDir, `${netlifyConfig.build.publish}/`);
+            await (0, fs_extra_1.copy)(defaultLocaleDir, `${rootPath}/`);
         }
-        const defaultLocaleIndex = (0, pathe_1.join)(netlifyConfig.build.publish, `${i18n.defaultLocale}.html`);
-        const indexHtml = (0, pathe_1.join)(netlifyConfig.build.publish, 'index.html');
+        const defaultLocaleIndex = (0, pathe_1.join)(rootPath, `${i18n.defaultLocale}.html`);
+        const indexHtml = (0, pathe_1.join)(rootPath, 'index.html');
         if ((0, fs_extra_1.existsSync)(defaultLocaleIndex) && !(0, fs_extra_1.existsSync)(indexHtml)) {
-            try {
-                await (0, fs_extra_1.copy)(defaultLocaleIndex, indexHtml, { overwrite: false });
-                await (0, fs_extra_1.copy)((0, pathe_1.join)(netlifyConfig.build.publish, `${i18n.defaultLocale}.json`), (0, pathe_1.join)(netlifyConfig.build.publish, 'index.json'), { overwrite: false });
-            }
-            catch { }
+            await (0, fs_extra_1.copy)(defaultLocaleIndex, indexHtml, { overwrite: false }).catch(() => {
+                /* ignore */
+            });
+            await (0, fs_extra_1.copy)((0, pathe_1.join)(rootPath, `${i18n.defaultLocale}.json`), (0, pathe_1.join)(rootPath, 'index.json'), {
+                overwrite: false,
+            }).catch(() => {
+                /* ignore */
+            });
         }
     }
     if (shortRevalidateRoutes.length !== 0) {

package/lib/index.js

@@ -49,7 +49,7 @@ const plugin = {
             console.log("The flag 'EXPERIMENTAL_MOVE_STATIC_PAGES' is no longer required, as it is now the default. To disable this behavior, set the env var 'SERVE_STATIC_FILES_FROM_ORIGIN' to 'true'");
         }
         if (!process.env.SERVE_STATIC_FILES_FROM_ORIGIN) {
-            await (0, files_1.moveStaticPages)({ target, netlifyConfig, i18n });
+            await (0, files_1.moveStaticPages)({ target, netlifyConfig, i18n, basePath });
         }
         await (0, redirects_1.generateStaticRedirects)({
             netlifyConfig,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netlify/plugin-nextjs",
-  "version": "4.2.5",
+  "version": "4.2.6",
   "description": "Run Next.js seamlessly on Netlify",
   "main": "lib/index.js",
   "files": [
@@ -75,7 +75,7 @@
     "@babel/core": "^7.15.8",
     "@babel/preset-env": "^7.15.8",
     "@babel/preset-typescript": "^7.16.0",
-    "@netlify/build": "^26.2.3",
+    "@netlify/build": "^26.3.1",
     "@netlify/eslint-config-node": "^5.1.4",
     "@reach/dialog": "^0.16.2",
     "@reach/visually-hidden": "^0.16.0",