@vercel/redwood 1.1.14 → 2.0.0

package/dist/index.js

@@ -11,8 +11,8 @@ const routing_utils_1 = require("@vercel/routing-utils");
 // it refers to Vercels builder version
 exports.version = 2;
 const build = async ({ workPath, files, entrypoint, meta = {}, config = {}, }) => {
-    await build_utils_1.download(files, workPath, meta);
-    const prefixedEnvs = build_utils_1.getPrefixedEnvVars({
+    await (0, build_utils_1.download)(files, workPath, meta);
+    const prefixedEnvs = (0, build_utils_1.getPrefixedEnvVars)({
         envPrefix: 'REDWOOD_ENV_',
         envs: process.env,
     });
@@ -20,15 +20,15 @@ const build = async ({ workPath, files, entrypoint, meta = {}, config = {}, }) =
         process.env[key] = value;
     }
     const { installCommand, buildCommand } = config;
-    const mountpoint = path_1.dirname(entrypoint);
-    const entrypointFsDirname = path_1.join(workPath, mountpoint);
-    const nodeVersion = await build_utils_1.getNodeVersion(entrypointFsDirname, undefined, config, meta);
-    const spawnOpts = build_utils_1.getSpawnOptions(meta, nodeVersion);
+    const mountpoint = (0, path_1.dirname)(entrypoint);
+    const entrypointFsDirname = (0, path_1.join)(workPath, mountpoint);
+    const nodeVersion = await (0, build_utils_1.getNodeVersion)(entrypointFsDirname, undefined, config, meta);
+    const spawnOpts = (0, build_utils_1.getSpawnOptions)(meta, nodeVersion);
     if (!spawnOpts.env) {
         spawnOpts.env = {};
     }
-    const { cliType, lockfileVersion } = await build_utils_1.scanParentDirs(entrypointFsDirname);
-    spawnOpts.env = build_utils_1.getEnvForPackageManager({
+    const { cliType, lockfileVersion } = await (0, build_utils_1.scanParentDirs)(entrypointFsDirname);
+    spawnOpts.env = (0, build_utils_1.getEnvForPackageManager)({
         cliType,
         lockfileVersion,
         nodeVersion,
@@ -37,7 +37,7 @@ const build = async ({ workPath, files, entrypoint, meta = {}, config = {}, }) =
     if (typeof installCommand === 'string') {
         if (installCommand.trim()) {
             console.log(`Running "install" command: \`${installCommand}\`...`);
-            await build_utils_1.execCommand(installCommand, {
+            await (0, build_utils_1.execCommand)(installCommand, {
                 ...spawnOpts,
                 cwd: entrypointFsDirname,
             });
@@ -47,37 +47,37 @@ const build = async ({ workPath, files, entrypoint, meta = {}, config = {}, }) =
         }
     }
     else {
-        await build_utils_1.runNpmInstall(entrypointFsDirname, [], spawnOpts, meta, nodeVersion);
+        await (0, build_utils_1.runNpmInstall)(entrypointFsDirname, [], spawnOpts, meta, nodeVersion);
     }
     if (meta.isDev) {
         throw new Error('Detected `@vercel/redwood` dev but this is not supported');
     }
-    const pkg = await build_utils_1.readConfigFile(path_1.join(workPath, 'package.json'));
-    const toml = await build_utils_1.readConfigFile(path_1.join(workPath, 'redwood.toml'));
+    const pkg = await (0, build_utils_1.readConfigFile)((0, path_1.join)(workPath, 'package.json'));
+    const toml = await (0, build_utils_1.readConfigFile)((0, path_1.join)(workPath, 'redwood.toml'));
     if (buildCommand) {
-        build_utils_1.debug(`Executing build command "${buildCommand}"`);
-        await build_utils_1.execCommand(buildCommand, {
+        (0, build_utils_1.debug)(`Executing build command "${buildCommand}"`);
+        await (0, build_utils_1.execCommand)(buildCommand, {
             ...spawnOpts,
             cwd: workPath,
         });
     }
     else if (hasScript('vercel-build', pkg)) {
-        build_utils_1.debug(`Executing "yarn vercel-build"`);
-        await build_utils_1.runPackageJsonScript(workPath, 'vercel-build', spawnOpts);
+        (0, build_utils_1.debug)(`Executing "yarn vercel-build"`);
+        await (0, build_utils_1.runPackageJsonScript)(workPath, 'vercel-build', spawnOpts);
     }
     else if (hasScript('build', pkg)) {
-        build_utils_1.debug(`Executing "yarn build"`);
-        await build_utils_1.runPackageJsonScript(workPath, 'build', spawnOpts);
+        (0, build_utils_1.debug)(`Executing "yarn build"`);
+        await (0, build_utils_1.runPackageJsonScript)(workPath, 'build', spawnOpts);
     }
     else {
         const { devDependencies = {} } = pkg || {};
         const versionRange = devDependencies['@redwoodjs/core'];
         let cmd;
-        if (!versionRange || !semver_1.validRange(versionRange)) {
+        if (!versionRange || !(0, semver_1.validRange)(versionRange)) {
             console.log('WARNING: Unable to detect RedwoodJS version in package.json devDependencies');
             cmd = 'yarn rw deploy vercel'; // Assume 0.25.0 and newer
         }
-        else if (semver_1.intersects(versionRange, '<0.25.0')) {
+        else if ((0, semver_1.intersects)(versionRange, '<0.25.0')) {
             // older than 0.25.0
             cmd =
                 'yarn rw build && yarn rw db up --no-db-client --auto-approve && yarn rw dataMigrate up';
@@ -86,32 +86,32 @@ const build = async ({ workPath, files, entrypoint, meta = {}, config = {}, }) =
             // 0.25.0 and newer
             cmd = 'yarn rw deploy vercel';
         }
-        await build_utils_1.execCommand(cmd, {
+        await (0, build_utils_1.execCommand)(cmd, {
             ...spawnOpts,
             cwd: workPath,
         });
     }
     const apiDir = toml?.web?.apiProxyPath?.replace(/^\//, '') ?? 'api';
-    const apiDistPath = path_1.join(workPath, 'api', 'dist', 'functions');
-    const webDistPath = path_1.join(workPath, 'web', 'dist');
+    const apiDistPath = (0, path_1.join)(workPath, 'api', 'dist', 'functions');
+    const webDistPath = (0, path_1.join)(workPath, 'web', 'dist');
     const lambdaOutputs = {};
     // Strip out the .html extensions
     // And populate staticOutputs map with updated paths and contentType
-    const webDistFiles = await build_utils_1.glob('**', webDistPath);
+    const webDistFiles = await (0, build_utils_1.glob)('**', webDistPath);
     const staticOutputs = {};
     for (const [fileName, fileFsRef] of Object.entries(webDistFiles)) {
-        const parsedPath = path_1.parse(fileFsRef.fsPath);
+        const parsedPath = (0, 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);
+            const fileNameWithoutExtension = (0, path_1.basename)(fileName, '.html');
+            const pathWithoutHtmlExtension = (0, 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)] =
+            staticOutputs[(0, path_1.relative)(webDistPath, pathWithoutHtmlExtension)] =
                 fileFsRef;
         }
     }
@@ -122,25 +122,25 @@ const build = async ({ workPath, files, entrypoint, meta = {}, config = {}, }) =
     // │   │   ├── bazinga.js
     // │   ├── graphql.js
     const functionFiles = {
-        ...(await build_utils_1.glob('*.js', apiDistPath)),
-        ...(await build_utils_1.glob('*/*.js', apiDistPath)), // one-level deep
+        ...(await (0, build_utils_1.glob)('*.js', apiDistPath)),
+        ...(await (0, 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)) {
-        const outputName = path_1.join(apiDir, path_1.parse(funcName).name); // remove `.js` extension
+        const outputName = (0, path_1.join)(apiDir, (0, path_1.parse)(funcName).name); // remove `.js` extension
         const absEntrypoint = fileFsRef.fsPath;
-        const relativeEntrypoint = path_1.relative(workPath, absEntrypoint);
+        const relativeEntrypoint = (0, path_1.relative)(workPath, absEntrypoint);
         const awsLambdaHandler = getAWSLambdaHandler(relativeEntrypoint, 'handler');
         const sourceFile = relativeEntrypoint.replace('/dist/', '/src/');
-        const { fileList, esmFileList, warnings } = await nft_1.nodeFileTrace([absEntrypoint], {
+        const { fileList, esmFileList, warnings } = await (0, nft_1.nodeFileTrace)([absEntrypoint], {
             base: workPath,
             processCwd: workPath,
             ts: true,
             mixedModules: true,
             ignore: config.excludeFiles,
             async readFile(fsPath) {
-                const relPath = path_1.relative(workPath, fsPath);
+                const relPath = (0, path_1.relative)(workPath, fsPath);
                 const cached = sourceCache.get(relPath);
                 if (cached)
                     return cached.toString();
@@ -148,10 +148,10 @@ const build = async ({ workPath, files, entrypoint, meta = {}, config = {}, }) =
                 if (cached === null)
                     return null;
                 try {
-                    const source = fs_1.readFileSync(fsPath);
-                    const { mode } = fs_1.lstatSync(fsPath);
+                    const source = (0, fs_1.readFileSync)(fsPath);
+                    const { mode } = (0, fs_1.lstatSync)(fsPath);
                     let entry;
-                    if (build_utils_1.isSymbolicLink(mode)) {
+                    if ((0, build_utils_1.isSymbolicLink)(mode)) {
                         entry = new build_utils_1.FileFsRef({ fsPath, mode });
                     }
                     else {
@@ -171,17 +171,17 @@ const build = async ({ workPath, files, entrypoint, meta = {}, config = {}, }) =
             },
         });
         for (const warning of warnings) {
-            build_utils_1.debug(`Warning from trace: ${warning.message}`);
+            (0, build_utils_1.debug)(`Warning from trace: ${warning.message}`);
         }
         const lambdaFiles = {};
         const allFiles = [...fileList, ...esmFileList];
         for (const filePath of allFiles) {
             lambdaFiles[filePath] = await build_utils_1.FileFsRef.fromFsPath({
-                fsPath: path_1.join(workPath, filePath),
+                fsPath: (0, path_1.join)(workPath, filePath),
             });
         }
-        lambdaFiles[path_1.relative(workPath, fileFsRef.fsPath)] = fileFsRef;
-        const lambdaOptions = await build_utils_1.getLambdaOptionsFromFunction({
+        lambdaFiles[(0, path_1.relative)(workPath, fileFsRef.fsPath)] = fileFsRef;
+        const lambdaOptions = await (0, build_utils_1.getLambdaOptionsFromFunction)({
             sourceFile,
             config,
         });
@@ -199,10 +199,10 @@ const build = async ({ workPath, files, entrypoint, meta = {}, config = {}, }) =
     // 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'))
+    const fallbackHtmlPage = (0, fs_1.existsSync)((0, path_1.join)(webDistPath, '200.html'))
         ? '/200'
         : '/index';
-    const defaultRoutesConfig = routing_utils_1.getTransformedRoutes({
+    const defaultRoutesConfig = (0, routing_utils_1.getTransformedRoutes)({
         // this makes sure we send back 200.html for unprerendered pages
         rewrites: [{ source: '/(.*)', destination: fallbackHtmlPage }],
         cleanUrls: true,
@@ -218,7 +218,7 @@ const build = async ({ workPath, files, entrypoint, meta = {}, config = {}, }) =
 };
 exports.build = build;
 function getAWSLambdaHandler(filePath, handlerName) {
-    const { dir, name } = path_1.parse(filePath);
+    const { dir, name } = (0, path_1.parse)(filePath);
     return `${dir}${dir ? path_1.sep : ''}${name}.${handlerName}`;
 }
 function hasScript(scriptName, pkg) {
@@ -226,6 +226,6 @@ function hasScript(scriptName, pkg) {
     return typeof scripts[scriptName] === 'string';
 }
 const prepareCache = ({ repoRootPath, workPath }) => {
-    return build_utils_1.glob('**/node_modules/**', repoRootPath || workPath);
+    return (0, build_utils_1.glob)('**/node_modules/**', repoRootPath || workPath);
 };
 exports.prepareCache = prepareCache;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/redwood",
-  "version": "1.1.14",
+  "version": "2.0.0",
   "main": "./dist/index.js",
   "license": "Apache-2.0",
   "homepage": "https://vercel.com/docs",
@@ -12,25 +12,24 @@
     "url": "https://github.com/vercel/vercel.git",
     "directory": "packages/redwood"
   },
-  "scripts": {
-    "build": "node build.js",
-    "test-e2e": "pnpm test test/test.js",
-    "test": "jest --env node --verbose --bail --runInBand",
-    "test-unit": "pnpm test test/prepare-cache.test.js"
-  },
   "dependencies": {
     "@vercel/nft": "0.22.5",
-    "@vercel/routing-utils": "2.2.0",
+    "@vercel/routing-utils": "3.0.0",
     "semver": "6.1.1"
   },
   "devDependencies": {
     "@types/aws-lambda": "8.10.19",
     "@types/node": "14.18.33",
     "@types/semver": "6.0.0",
-    "@vercel/build-utils": "6.7.1",
+    "@vercel/build-utils": "7.0.0",
     "execa": "3.2.0",
     "fs-extra": "11.1.0",
-    "typescript": "4.3.4"
+    "jest-junit": "16.0.0"
   },
-  "gitHead": "925c8ba18ceec80174d9440cd2cad0e725ed4f56"
-}
+  "scripts": {
+    "build": "node build.js",
+    "test-e2e": "pnpm test test/test.js",
+    "test": "jest --reporters=default --reporters=jest-junit --env node --verbose --bail --runInBand",
+    "test-unit": "pnpm test test/prepare-cache.test.js"
+  }
+}