@shiftapi/next 0.0.19 → 0.0.21

package/dist/index.js

@@ -1,6 +1,6 @@
 // src/index.ts
 import { resolve } from "path";
-import { watch } from "fs";
+import { readFileSync, watch } from "fs";
 import { createRequire } from "module";
 import {
   loadConfig,
@@ -42,73 +42,47 @@ function applyShiftAPI(nextConfig, opts) {
     return nextConfig;
   }
   const isDev = process.env.NODE_ENV !== "production";
-  const shiftapiClientPath = resolve(configDir, ".shiftapi", "client.js");
   const require2 = createRequire(import.meta.url);
-  const openapiPkgDir = resolve(require2.resolve("openapi-fetch/package.json"), "..");
-  const openapiPath = resolve(openapiPkgDir, "dist", "index.js");
-  const initPromise = initializeAsync(projectRoot, configDir, isDev, opts);
+  const openapiDistDir = resolve(require2.resolve("openapi-fetch/package.json"), "..", "dist");
+  const openapiSource = readFileSync(resolve(openapiDistDir, "index.js"), "utf-8");
+  const openapiDts = readFileSync(resolve(openapiDistDir, "index.d.ts"), "utf-8");
+  const initPromise = initializeAsync(projectRoot, configDir, isDev, openapiSource, openapiDts, opts);
   const patched = { ...nextConfig };
-  const existingWebpack = nextConfig.webpack;
-  patched.webpack = (config, context) => {
-    const cfg = existingWebpack ? existingWebpack(config, context) : config;
-    cfg.resolve = cfg.resolve || {};
-    cfg.resolve.alias = cfg.resolve.alias || {};
-    cfg.resolve.alias["@shiftapi/client"] = shiftapiClientPath;
-    cfg.resolve.alias["openapi-fetch"] = openapiPath;
-    cfg.plugins = cfg.plugins || [];
-    cfg.plugins.push({
-      // eslint-disable-next-line @typescript-eslint/no-explicit-any
-      apply(compiler) {
-        compiler.hooks.beforeCompile.tapPromise("ShiftAPI", async () => {
-          await initPromise;
-        });
-      }
-    });
-    return cfg;
-  };
-  const existingTurbopack = nextConfig.turbopack ?? {};
-  const existingResolveAlias = existingTurbopack.resolveAlias ?? {};
-  patched.turbopack = {
-    ...existingTurbopack,
-    resolveAlias: {
-      ...existingResolveAlias,
-      "@shiftapi/client": shiftapiClientPath,
-      "openapi-fetch": openapiPath
+  const existingRewrites = nextConfig.rewrites;
+  patched.rewrites = async () => {
+    const { port } = await initPromise;
+    if (!isDev) {
+      if (!existingRewrites) return [];
+      return existingRewrites();
     }
-  };
-  if (isDev) {
-    const existingRewrites = nextConfig.rewrites;
-    patched.rewrites = async () => {
-      const { port } = await initPromise;
-      const shiftapiRewrite = {
-        source: `${DEV_API_PREFIX}/:path*`,
-        destination: `http://localhost:${port}/:path*`
+    const shiftapiRewrite = {
+      source: `${DEV_API_PREFIX}/:path*`,
+      destination: `http://localhost:${port}/:path*`
+    };
+    if (!existingRewrites) {
+      return {
+        beforeFiles: [shiftapiRewrite],
+        afterFiles: [],
+        fallback: []
       };
-      if (!existingRewrites) {
-        return {
-          beforeFiles: [shiftapiRewrite],
-          afterFiles: [],
-          fallback: []
-        };
-      }
-      const existing = await existingRewrites();
-      if (Array.isArray(existing)) {
-        return {
-          beforeFiles: [shiftapiRewrite],
-          afterFiles: existing,
-          fallback: []
-        };
-      }
+    }
+    const existing = await existingRewrites();
+    if (Array.isArray(existing)) {
       return {
-        beforeFiles: [shiftapiRewrite, ...existing.beforeFiles ?? []],
-        afterFiles: existing.afterFiles ?? [],
-        fallback: existing.fallback ?? []
+        beforeFiles: [shiftapiRewrite],
+        afterFiles: existing,
+        fallback: []
       };
+    }
+    return {
+      beforeFiles: [shiftapiRewrite, ...existing.beforeFiles ?? []],
+      afterFiles: existing.afterFiles ?? [],
+      fallback: existing.fallback ?? []
     };
-  }
+  };
   return patched;
 }
-async function initializeAsync(projectRoot, configDir, isDev, opts) {
+async function initializeAsync(projectRoot, configDir, isDev, openapiSource, openapiDts, opts) {
   const { config } = await loadConfig(projectRoot, opts?.configPath);
   const serverEntry = config.server;
   const baseUrl = config.baseUrl ?? "/";
@@ -123,12 +97,14 @@ async function initializeAsync(projectRoot, configDir, isDev, opts) {
       baseUrl,
       goRoot,
       parsedUrl,
-      basePort
+      basePort,
+      openapiSource,
+      openapiDts
     );
   }
-  return initializeBuild(projectRoot, configDir, serverEntry, baseUrl, goRoot, basePort);
+  return initializeBuild(projectRoot, configDir, serverEntry, baseUrl, goRoot, basePort, openapiSource, openapiDts);
 }
-async function initializeDev(projectRoot, configDir, serverEntry, baseUrl, goRoot, parsedUrl, basePort) {
+async function initializeDev(projectRoot, configDir, serverEntry, baseUrl, goRoot, parsedUrl, basePort, openapiSource, openapiDts) {
   const goPort = await findFreePort(basePort);
   if (goPort !== basePort) {
     console.log(`[shiftapi] Port ${basePort} is in use, using ${goPort}`);
@@ -147,7 +123,7 @@ async function initializeDev(projectRoot, configDir, serverEntry, baseUrl, goRoo
     const result = await _regenerateTypes(serverEntry, goRoot, baseUrl, true, "");
     generatedDts = result.types;
     const clientJs = nextClientJsTemplate(goPort, baseUrl, DEV_API_PREFIX);
-    writeGeneratedFiles(configDir, generatedDts, baseUrl, { clientJsContent: clientJs });
+    writeGeneratedFiles(configDir, generatedDts, baseUrl, { clientJsContent: clientJs, openapiSource, openapiDts });
     patchTsConfigPaths(projectRoot, configDir);
     console.log("[shiftapi] Types generated.");
   } catch (err) {
@@ -175,7 +151,9 @@ async function initializeDev(projectRoot, configDir, serverEntry, baseUrl, goRoo
             generatedDts = result.types;
             const clientJs = nextClientJsTemplate(goPort, baseUrl, DEV_API_PREFIX);
             writeGeneratedFiles(configDir, generatedDts, baseUrl, {
-              clientJsContent: clientJs
+              clientJsContent: clientJs,
+              openapiSource,
+              openapiDts
             });
             console.log("[shiftapi] Types regenerated.");
           }
@@ -207,11 +185,11 @@ async function initializeDev(projectRoot, configDir, serverEntry, baseUrl, goRoo
   });
   return { port: goPort };
 }
-async function initializeBuild(projectRoot, configDir, serverEntry, baseUrl, goRoot, basePort) {
+async function initializeBuild(projectRoot, configDir, serverEntry, baseUrl, goRoot, basePort, openapiSource, openapiDts) {
   try {
     const result = await _regenerateTypes(serverEntry, goRoot, baseUrl, false, "");
     const clientJs = nextClientJsTemplate(basePort, baseUrl);
-    writeGeneratedFiles(configDir, result.types, baseUrl, { clientJsContent: clientJs });
+    writeGeneratedFiles(configDir, result.types, baseUrl, { clientJsContent: clientJs, openapiSource, openapiDts });
     patchTsConfigPaths(projectRoot, configDir);
     console.log("[shiftapi] Types generated for build.");
   } catch (err) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shiftapi/next",
-  "version": "0.0.19",
+  "version": "0.0.21",
   "description": "Next.js integration for fully-typed TypeScript clients from shiftapi Go servers",
   "author": "Frank Chiarulli Jr. <frank@frankchiarulli.com>",
   "license": "MIT",
@@ -30,7 +30,7 @@
   },
   "dependencies": {
     "openapi-fetch": "^0.13.0",
-    "shiftapi": "0.0.19"
+    "shiftapi": "0.0.21"
   },
   "devDependencies": {
     "@types/node": "^25.2.3",