@netlify/plugin-nextjs 4.0.0-beta.5 → 4.0.0-beta.6

package/lib/helpers/config.js

@@ -114,7 +114,7 @@ exports.configureHandlerFunctions = ({ netlifyConfig, publish, ignore = [] }) =>
         (_a = netlifyConfig.functions)[functionName] || (_a[functionName] = { included_files: [], external_node_modules: [] });
         netlifyConfig.functions[functionName].node_bundler = 'nft';
         (_b = netlifyConfig.functions[functionName]).included_files || (_b.included_files = []);
-        netlifyConfig.functions[functionName].included_files.push(`${publish}/server/**`, `${publish}/serverless/**`, `${publish}/*.json`, `${publish}/BUILD_ID`, `${publish}/static/chunks/webpack-middleware*.js`, ...ignore.map((path) => `!${slash(path)}`));
+        netlifyConfig.functions[functionName].included_files.push(`${publish}/server/**`, `${publish}/serverless/**`, `${publish}/*.json`, `${publish}/BUILD_ID`, `${publish}/static/chunks/webpack-middleware*.js`, `!${publish}/server/**/*.js.nft.json`, ...ignore.map((path) => `!${slash(path)}`));
         const nextRoot = resolveModuleRoot('next');
         if (nextRoot) {
             netlifyConfig.functions[functionName].included_files.push(`!${nextRoot}/dist/server/lib/squoosh/**/*.wasm`, `!${nextRoot}/dist/next-server/server/lib/squoosh/**/*.wasm`, `!${nextRoot}/dist/compiled/webpack/bundle4.js`, `!${nextRoot}/dist/compiled/webpack/bundle5.js`, `!${nextRoot}/dist/compiled/terser/bundle.min.js`);

package/lib/helpers/files.js

@@ -1,43 +1,46 @@
 //  @ts-check
+const { cpus } = require('os');
 const { existsSync, readJson, move, cpSync, copy, writeJson } = require('fs-extra');
+const globby = require('globby');
 const pLimit = require('p-limit');
 const { join } = require('pathe');
-const TEST_ROUTE = /\/\[[^/]+?](?=\/|$)/;
+const slash = require('slash');
+const TEST_ROUTE = /(|\/)\[[^/]+?](\/|\.html|$)/;
 const isDynamicRoute = (route) => TEST_ROUTE.test(route);
 exports.moveStaticPages = async ({ netlifyConfig, target, i18n, failBuild }) => {
-    const root = join(netlifyConfig.build.publish, target === 'server' ? 'server' : 'serverless');
-    const pagesManifestPath = join(root, 'pages-manifest.json');
-    if (!existsSync(pagesManifestPath)) {
-        failBuild(`Could not find pages manifest at ${pagesManifestPath}`);
-    }
+    console.log('Moving static page files to serve from CDN...');
+    const root = join(netlifyConfig.build.publish, target === 'server' ? 'server' : 'serverless', 'pages');
     const files = [];
     const moveFile = async (file) => {
         const source = join(root, file);
-        // Trim the initial "pages"
-        const filePath = file.slice(6);
-        files.push(filePath);
-        const dest = join(netlifyConfig.build.publish, filePath);
+        files.push(file);
+        const dest = join(netlifyConfig.build.publish, file);
         await move(source, dest);
     };
-    const pagesManifest = await readJson(pagesManifestPath);
-    // Arbitrary limit of 10 concurrent file moves
-    const limit = pLimit(10);
-    const promises = Object.entries(pagesManifest).map(async ([route, filePath]) => {
-        if (isDynamicRoute(route) ||
-            !(filePath.endsWith('.html') || filePath.endsWith('.json')) ||
-            filePath.endsWith('/404.html') ||
-            filePath.endsWith('/500.html')) {
+    // Move all static files, except error documents and nft manifests
+    const pages = await globby(['**/*.{html,json}', '!**/(500|404|*.js.nft).{html,json}'], {
+        cwd: root,
+        dot: true,
+    });
+    // Limit concurrent file moves to number of cpus or 2 if there is only 1
+    const limit = pLimit(Math.max(2, cpus().length));
+    const promises = pages.map(async (rawPath) => {
+        const filePath = slash(rawPath);
+        if (isDynamicRoute(filePath)) {
             return;
         }
         return limit(moveFile, filePath);
     });
     await Promise.all(promises);
-    console.log(`Moved ${files.length} page files`);
+    console.log(`Moved ${files.length} files`);
     // Write the manifest for use in the serverless functions
     await writeJson(join(netlifyConfig.build.publish, 'static-manifest.json'), files);
     if (i18n === null || i18n === void 0 ? void 0 : i18n.defaultLocale) {
         // Copy the default locale into the root
-        await copy(join(netlifyConfig.build.publish, i18n.defaultLocale), `${netlifyConfig.build.publish}/`);
+        const defaultLocaleDir = join(netlifyConfig.build.publish, i18n.defaultLocale);
+        if (existsSync(defaultLocaleDir)) {
+            await copy(defaultLocaleDir, `${netlifyConfig.build.publish}/`);
+        }
     }
 };
 exports.movePublicFiles = async ({ appDir, publish }) => {

package/lib/index.js

@@ -1,6 +1,5 @@
 // @ts-check
 const { join, relative } = require('path');
-const { copy, existsSync } = require('fs-extra');
 const { ODB_FUNCTION_NAME } = require('./constants');
 const { restoreCache, saveCache } = require('./helpers/cache');
 const { getNextConfig, configureHandlerFunctions, generateRedirects } = require('./helpers/config');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netlify/plugin-nextjs",
-  "version": "4.0.0-beta.5",
+  "version": "4.0.0-beta.6",
   "description": "Run Next.js seamlessly on Netlify",
   "main": "lib/index.js",
   "files": [
@@ -10,7 +10,7 @@
   "scripts": {
     "build:demo": "next build demo",
     "cy:open": "cypress open --config-file cypress/config/all.json",
-    "cy:run": "cypress run --config-file cypress/config/all.json",
+    "cy:run": "cypress run --config-file ../cypress/config/ci.json",
     "dev:demo": "next dev demo",
     "format": "run-s format:check-fix:*",
     "format:ci": "run-s format:check:*",
@@ -57,6 +57,7 @@
     "@vercel/node": "^1.11.2-canary.4",
     "chalk": "^4.1.2",
     "fs-extra": "^10.0.0",
+    "globby": "^11.0.4",
     "moize": "^6.1.0",
     "node-fetch": "^2.6.6",
     "node-stream-zip": "^1.15.0",