rebase a ronis

ProjectEvergreen · Jun 23, 2024 · 2e9ace0 · 2e9ace0
1 parent dedc65c
commit 2e9ace0
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 4 deletions.
diff --git a/packages/cli/src/config/rollup.config.js b/packages/cli/src/config/rollup.config.js
@@ -181,7 +181,7 @@ function greenwoodSyncApiRoutesOutputPath(compilation) {
         if (bundle[key].exports?.find(exp => exp === 'handler')) {
           const ext = bundle[key].facadeModuleId.split('.').pop();
           const relativeFacade = new URL(`file://${bundle[key].facadeModuleId}`).pathname.replace(apisDir.pathname, `${basePath}/`).replace(`.${ext}`, '');
-          const route = `/api${relativeFacade}`; // ew URL(`file://${bundle[key].facadeModuleId}`).pathname.replace(apisDir.pathname, `${basePath}/`).replace(`.${ext}`, '');
+          const route = `/api${relativeFacade}`;
 
           if (compilation.manifest.apis.has(route)) {
             const api = compilation.manifest.apis.get(route);
@@ -457,14 +457,14 @@ const getRollupConfigForScriptResources = async (compilation) => {
 };
 
 const getRollupConfigForApis = async (compilation) => {
-  const { outputDir, pagesDir } = compilation.context;
+  const { outputDir, pagesDir, apisDir } = compilation.context;
 
   return [...compilation.manifest.apis.values()]
     .map(api => normalizePathnameForWindows(new URL(`.${api.path}`, pagesDir)))
     .map((filepath) => {
       // account for windows pathname shenanigans by "casting" filepath to a URL first
       const ext = filepath.split('.').pop();
-      const entryName = new URL(`file://${filepath}`).pathname.replace(pagesDir.pathname, '').replace('/', '-').replace(`.${ext}`, '');
+      const entryName = new URL(`file://${filepath}`).pathname.replace(apisDir.pathname, '').replace(/\//g, '-').replace(`.${ext}`, '');
 
       return {
         input: filepath,

diff --git a/...lugins.adapter/src/api/nested/endpoint.js → ....adapter/src/pages/api/nested/endpoint.js b/...lugins.adapter/src/api/nested/endpoint.js → ....adapter/src/pages/api/nested/endpoint.js
diff --git a/.../build.default/src/api/nested/endpoint.js → ....default/src/pages/api/nested/endpoint.js b/.../build.default/src/api/nested/endpoint.js → ....default/src/pages/api/nested/endpoint.js
diff --git a/packages/plugin-adapter-vercel/src/index.js b/packages/plugin-adapter-vercel/src/index.js
@@ -115,7 +115,7 @@ async function vercelAdapter(compilation) {
     const api = apiRoutes.get(key);
     const { outputPath } = api;
     const id = key.replace(`${basePath}/api/`, '').replace(/\//g, '-');
-    const outputRoot = new URL(`./${basePath}/api/${id}.func/`, adapterOutputUrl);
+    const outputRoot = new URL(`.${basePath}/api/${id}.func/`, adapterOutputUrl);
     const { assets = [] } = value;
 
     await setupFunctionBuildFolder(id, outputType, outputRoot);

diff --git a/.../build.default/src/api/nested/endpoint.js → ....default/src/pages/api/nested/endpoint.js b/.../build.default/src/api/nested/endpoint.js → ....default/src/pages/api/nested/endpoint.js