@vercel/redwood 0.6.0 → 0.6.1-canary.0

package/dist/index.js

@@ -6,6 +6,9 @@ const fs_1 = require("fs");
 const semver_1 = require("semver");
 const build_utils_1 = require("@vercel/build-utils");
 const nft_1 = require("@vercel/nft");
+const routing_utils_1 = require("@vercel/routing-utils");
+// Do not change this version for RW specific config,
+// it refers to Vercels builder version
 exports.version = 2;
 const build = async ({ workPath, files, entrypoint, meta = {}, config = {}, }) => {
     var _a, _b, _c;
@@ -102,9 +105,36 @@ const build = async ({ workPath, files, entrypoint, meta = {}, config = {}, }) =
     const apiDistPath = path_1.join(workPath, 'api', 'dist', 'functions');
     const webDistPath = path_1.join(workPath, 'web', 'dist');
     const lambdaOutputs = {};
-    const staticOutputs = await build_utils_1.glob('**', webDistPath);
+    // Strip out the .html extensions
+    // And populate staticOutputs map with updated paths and contentType
+    const webDistFiles = await build_utils_1.glob('**', webDistPath);
+    const staticOutputs = {};
+    for (const [fileName, fileFsRef] of Object.entries(webDistFiles)) {
+        const parsedPath = path_1.parse(fileFsRef.fsPath);
+        if (parsedPath.ext !== '.html') {
+            // No need to transform non-html files
+            staticOutputs[fileName] = fileFsRef;
+        }
+        else {
+            const fileNameWithoutExtension = path_1.basename(fileName, '.html');
+            const pathWithoutHtmlExtension = path_1.join(parsedPath.dir, fileNameWithoutExtension);
+            fileFsRef.contentType = 'text/html; charset=utf-8';
+            // @NOTE: Filename is relative to webDistPath
+            // e.g. {'./200': fsRef}
+            staticOutputs[path_1.relative(webDistPath, pathWithoutHtmlExtension)] =
+                fileFsRef;
+        }
+    }
     // Each file in the `functions` dir will become a lambda
-    const functionFiles = await build_utils_1.glob('*.js', apiDistPath);
+    // Also supports nested functions like:
+    // ├── functions
+    // │   ├── bazinga
+    // │   │   ├── bazinga.js
+    // │   ├── graphql.js
+    const functionFiles = {
+        ...(await build_utils_1.glob('*.js', apiDistPath)),
+        ...(await build_utils_1.glob('*/*.js', apiDistPath)), // one-level deep
+    };
     const sourceCache = new Map();
     const fsCache = new Map();
     for (const [funcName, fileFsRef] of Object.entries(functionFiles)) {
@@ -179,9 +209,26 @@ const build = async ({ workPath, files, entrypoint, meta = {}, config = {}, }) =
         });
         lambdaOutputs[outputName] = lambda;
     }
+    // Older versions of redwood did not create 200.html automatically
+    // From v0.50.0+ 200.html is always generated as part of web build
+    // Note that in builder post-processing, we remove the .html extension
+    const fallbackHtmlPage = fs_1.existsSync(path_1.join(webDistPath, '200.html'))
+        ? '/200'
+        : '/index';
+    const defaultRoutesConfig = routing_utils_1.getTransformedRoutes({
+        nowConfig: {
+            // this makes sure we send back 200.html for unprerendered pages
+            rewrites: [{ source: '/(.*)', destination: fallbackHtmlPage }],
+            cleanUrls: true,
+            trailingSlash: false,
+        },
+    });
+    if (defaultRoutesConfig.error) {
+        throw new Error(defaultRoutesConfig.error.message);
+    }
     return {
         output: { ...staticOutputs, ...lambdaOutputs },
-        routes: [{ handle: 'filesystem' }, { src: '/.*', dest: '/index.html' }],
+        routes: defaultRoutesConfig.routes,
     };
 };
 exports.build = build;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/redwood",
-  "version": "0.6.0",
+  "version": "0.6.1-canary.0",
   "main": "./dist/index.js",
   "license": "MIT",
   "homepage": "https://vercel.com/docs",
@@ -14,18 +14,19 @@
   },
   "scripts": {
     "build": "node build.js",
-    "test-integration-once": "jest --env node --verbose --runInBand --bail",
+    "test-integration-once": "jest --env node --verbose --runInBand --bail test/test.js",
     "prepublishOnly": "node build.js"
   },
   "dependencies": {
     "@vercel/nft": "0.17.5",
+    "@vercel/routing-utils": "1.13.1-canary.0",
     "semver": "6.1.1"
   },
   "devDependencies": {
     "@types/aws-lambda": "8.10.19",
     "@types/node": "*",
     "@types/semver": "6.0.0",
-    "@vercel/build-utils": "2.15.0"
+    "@vercel/build-utils": "2.15.1-canary.0"
   },
-  "gitHead": "c76781fac978fee923d8180706103bad13ca33a0"
+  "gitHead": "c76dfbe8c9e1055113fe7ced8850bca4a64ad232"
 }