@makeswift/runtime 0.25.2-canary.1 → 0.25.2-canary.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/cjs/api-handler/handlers/manifest.js +1 -1
- package/dist/cjs/next/api-handler/config/app-router.js +6 -2
- package/dist/cjs/next/api-handler/config/app-router.js.map +1 -1
- package/dist/esm/api-handler/handlers/manifest.js +1 -1
- package/dist/esm/next/api-handler/config/app-router.js +6 -2
- package/dist/esm/next/api-handler/config/app-router.js.map +1 -1
- package/dist/types/next/api-handler/config/app-router.d.ts +3 -3
- package/dist/types/next/api-handler/config/app-router.d.ts.map +1 -1
- package/package.json +3 -3
|
@@ -28,7 +28,7 @@ async function manifestHandler(req, { apiKey, manifest }) {
|
|
|
28
28
|
return import_request_response.ApiResponse.json({ message: "Unauthorized" }, { status: 401 });
|
|
29
29
|
}
|
|
30
30
|
return import_request_response.ApiResponse.json({
|
|
31
|
-
version: "0.25.2-canary.
|
|
31
|
+
version: "0.25.2-canary.2",
|
|
32
32
|
interactionMode: true,
|
|
33
33
|
clientSideNavigation: false,
|
|
34
34
|
elementFromPoint: false,
|
|
@@ -29,7 +29,10 @@ var import_cache2 = require("../../cache");
|
|
|
29
29
|
var import_app_router_redirect_preview = require("../handlers/app-router-redirect-preview");
|
|
30
30
|
var import_preview = require("../preview");
|
|
31
31
|
var import_base = require("./base");
|
|
32
|
-
const argsPattern = [
|
|
32
|
+
const argsPattern = [
|
|
33
|
+
import_ts_pattern.P.union(import_ts_pattern.P.instanceOf(Request), import_ts_pattern.P.instanceOf(import_server.NextRequest)),
|
|
34
|
+
import_ts_pattern.P.any
|
|
35
|
+
];
|
|
33
36
|
async function config({
|
|
34
37
|
req,
|
|
35
38
|
context,
|
|
@@ -49,7 +52,8 @@ async function config({
|
|
|
49
52
|
},
|
|
50
53
|
customRoutes: async (route) => {
|
|
51
54
|
if (route === "/redirect-preview") {
|
|
52
|
-
|
|
55
|
+
const request = req instanceof import_server.NextRequest ? req : new import_server.NextRequest(req, req);
|
|
56
|
+
return { res: await (0, import_app_router_redirect_preview.appRouterRedirectPreviewHandler)(request, context, client) };
|
|
53
57
|
}
|
|
54
58
|
return null;
|
|
55
59
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../../../src/next/api-handler/config/app-router.ts"],"sourcesContent":["import { P } from 'ts-pattern'\nimport { revalidatePath, revalidateTag } from 'next/cache'\nimport { NextRequest } from 'next/server'\n\nimport { MAKESWIFT_CACHE_TAG } from '../../cache'\nimport { type ApiResponse } from '../../../api-handler/request-response'\n\nimport { appRouterRedirectPreviewHandler } from '../handlers/app-router-redirect-preview'\nimport { MAKESWIFT_SITE_VERSION_COOKIE, PRERENDER_BYPASS_COOKIE } from '../preview'\n\nimport { validateApiRoute, type ApiHandlerConfig } from './base'\nimport { MakeswiftClient } from '../../../client'\n\ntype Params = { [key: string]: string | string[] }\ntype Context = { params: Promise<Params> }\n\nexport type ApiHandlerArgs = [NextRequest, Context]\nexport const argsPattern = [P.instanceOf(
|
|
1
|
+
{"version":3,"sources":["../../../../../src/next/api-handler/config/app-router.ts"],"sourcesContent":["import { P } from 'ts-pattern'\nimport { revalidatePath, revalidateTag } from 'next/cache'\nimport { NextRequest } from 'next/server'\n\nimport { MAKESWIFT_CACHE_TAG } from '../../cache'\nimport { type ApiResponse } from '../../../api-handler/request-response'\n\nimport { appRouterRedirectPreviewHandler } from '../handlers/app-router-redirect-preview'\nimport { MAKESWIFT_SITE_VERSION_COOKIE, PRERENDER_BYPASS_COOKIE } from '../preview'\n\nimport { validateApiRoute, type ApiHandlerConfig } from './base'\nimport { MakeswiftClient } from '../../../client'\n\ntype Params = { [key: string]: string | string[] }\ntype Context = { params: Promise<Params> }\n\n// In older versions of Next (prior to 15.5.0), the inbound request is typed as\n// a `NextRequest`, but requests received at runtime fail the `instanceof\n// NextRequest` check. In newer versions of Next, requests are correctly typed\n// as `NextRequest`. To maintain compatibility across all Next.js versions, we\n// match against both.\nexport type ApiHandlerArgs = [NextRequest | Request, Context]\nexport const argsPattern = [\n P.union(P.instanceOf(Request), P.instanceOf(NextRequest)),\n P.any,\n] as const\n\nexport async function config({\n req,\n context,\n client,\n}: {\n req: NextRequest | Request\n context: Context\n client: MakeswiftClient\n}): Promise<ApiHandlerConfig> {\n return {\n req,\n route: validateApiRoute(await context.params),\n previewCookieNames: [PRERENDER_BYPASS_COOKIE, MAKESWIFT_SITE_VERSION_COOKIE],\n sendResponse: async (res: ApiResponse): Promise<Response | void> => res,\n revalidationHandler: async (path?: string): Promise<void> => {\n if (path != null) {\n revalidatePath(path)\n } else {\n revalidateTag(MAKESWIFT_CACHE_TAG)\n }\n },\n customRoutes: async (route: string) => {\n if (route === '/redirect-preview') {\n // Convert any Request to NextRequest, if necessary. Due to an issue in\n // how NextRequests are instantiated, we have to pass the original\n // request to the constructor twice. See\n // https://github.com/vercel/next.js/issues/52967\n const request = req instanceof NextRequest ? req : new NextRequest(req, req)\n return { res: await appRouterRedirectPreviewHandler(request, context, client) }\n }\n\n return null\n },\n }\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,wBAAkB;AAClB,mBAA8C;AAC9C,oBAA4B;AAE5B,IAAAA,gBAAoC;AAGpC,yCAAgD;AAChD,qBAAuE;AAEvE,kBAAwD;AAYjD,MAAM,cAAc;AAAA,EACzB,oBAAE,MAAM,oBAAE,WAAW,OAAO,GAAG,oBAAE,WAAW,yBAAW,CAAC;AAAA,EACxD,oBAAE;AACJ;AAEA,eAAsB,OAAO;AAAA,EAC3B;AAAA,EACA;AAAA,EACA;AACF,GAI8B;AAC5B,SAAO;AAAA,IACL;AAAA,IACA,WAAO,8BAAiB,MAAM,QAAQ,MAAM;AAAA,IAC5C,oBAAoB,CAAC,wCAAyB,4CAA6B;AAAA,IAC3E,cAAc,OAAO,QAA+C;AAAA,IACpE,qBAAqB,OAAO,SAAiC;AAC3D,UAAI,QAAQ,MAAM;AAChB,yCAAe,IAAI;AAAA,MACrB,OAAO;AACL,wCAAc,iCAAmB;AAAA,MACnC;AAAA,IACF;AAAA,IACA,cAAc,OAAO,UAAkB;AACrC,UAAI,UAAU,qBAAqB;AAKjC,cAAM,UAAU,eAAe,4BAAc,MAAM,IAAI,0BAAY,KAAK,GAAG;AAC3E,eAAO,EAAE,KAAK,UAAM,oEAAgC,SAAS,SAAS,MAAM,EAAE;AAAA,MAChF;AAEA,aAAO;AAAA,IACT;AAAA,EACF;AACF;","names":["import_cache"]}
|
|
@@ -8,7 +8,7 @@ async function manifestHandler(req, { apiKey, manifest }) {
|
|
|
8
8
|
return ApiResponse.json({ message: "Unauthorized" }, { status: 401 });
|
|
9
9
|
}
|
|
10
10
|
return ApiResponse.json({
|
|
11
|
-
version: "0.25.2-canary.
|
|
11
|
+
version: "0.25.2-canary.2",
|
|
12
12
|
interactionMode: true,
|
|
13
13
|
clientSideNavigation: false,
|
|
14
14
|
elementFromPoint: false,
|
|
@@ -5,7 +5,10 @@ import { MAKESWIFT_CACHE_TAG } from "../../cache";
|
|
|
5
5
|
import { appRouterRedirectPreviewHandler } from "../handlers/app-router-redirect-preview";
|
|
6
6
|
import { MAKESWIFT_SITE_VERSION_COOKIE, PRERENDER_BYPASS_COOKIE } from "../preview";
|
|
7
7
|
import { validateApiRoute } from "./base";
|
|
8
|
-
const argsPattern = [
|
|
8
|
+
const argsPattern = [
|
|
9
|
+
P.union(P.instanceOf(Request), P.instanceOf(NextRequest)),
|
|
10
|
+
P.any
|
|
11
|
+
];
|
|
9
12
|
async function config({
|
|
10
13
|
req,
|
|
11
14
|
context,
|
|
@@ -25,7 +28,8 @@ async function config({
|
|
|
25
28
|
},
|
|
26
29
|
customRoutes: async (route) => {
|
|
27
30
|
if (route === "/redirect-preview") {
|
|
28
|
-
|
|
31
|
+
const request = req instanceof NextRequest ? req : new NextRequest(req, req);
|
|
32
|
+
return { res: await appRouterRedirectPreviewHandler(request, context, client) };
|
|
29
33
|
}
|
|
30
34
|
return null;
|
|
31
35
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../../../src/next/api-handler/config/app-router.ts"],"sourcesContent":["import { P } from 'ts-pattern'\nimport { revalidatePath, revalidateTag } from 'next/cache'\nimport { NextRequest } from 'next/server'\n\nimport { MAKESWIFT_CACHE_TAG } from '../../cache'\nimport { type ApiResponse } from '../../../api-handler/request-response'\n\nimport { appRouterRedirectPreviewHandler } from '../handlers/app-router-redirect-preview'\nimport { MAKESWIFT_SITE_VERSION_COOKIE, PRERENDER_BYPASS_COOKIE } from '../preview'\n\nimport { validateApiRoute, type ApiHandlerConfig } from './base'\nimport { MakeswiftClient } from '../../../client'\n\ntype Params = { [key: string]: string | string[] }\ntype Context = { params: Promise<Params> }\n\nexport type ApiHandlerArgs = [NextRequest, Context]\nexport const argsPattern = [P.instanceOf(
|
|
1
|
+
{"version":3,"sources":["../../../../../src/next/api-handler/config/app-router.ts"],"sourcesContent":["import { P } from 'ts-pattern'\nimport { revalidatePath, revalidateTag } from 'next/cache'\nimport { NextRequest } from 'next/server'\n\nimport { MAKESWIFT_CACHE_TAG } from '../../cache'\nimport { type ApiResponse } from '../../../api-handler/request-response'\n\nimport { appRouterRedirectPreviewHandler } from '../handlers/app-router-redirect-preview'\nimport { MAKESWIFT_SITE_VERSION_COOKIE, PRERENDER_BYPASS_COOKIE } from '../preview'\n\nimport { validateApiRoute, type ApiHandlerConfig } from './base'\nimport { MakeswiftClient } from '../../../client'\n\ntype Params = { [key: string]: string | string[] }\ntype Context = { params: Promise<Params> }\n\n// In older versions of Next (prior to 15.5.0), the inbound request is typed as\n// a `NextRequest`, but requests received at runtime fail the `instanceof\n// NextRequest` check. In newer versions of Next, requests are correctly typed\n// as `NextRequest`. To maintain compatibility across all Next.js versions, we\n// match against both.\nexport type ApiHandlerArgs = [NextRequest | Request, Context]\nexport const argsPattern = [\n P.union(P.instanceOf(Request), P.instanceOf(NextRequest)),\n P.any,\n] as const\n\nexport async function config({\n req,\n context,\n client,\n}: {\n req: NextRequest | Request\n context: Context\n client: MakeswiftClient\n}): Promise<ApiHandlerConfig> {\n return {\n req,\n route: validateApiRoute(await context.params),\n previewCookieNames: [PRERENDER_BYPASS_COOKIE, MAKESWIFT_SITE_VERSION_COOKIE],\n sendResponse: async (res: ApiResponse): Promise<Response | void> => res,\n revalidationHandler: async (path?: string): Promise<void> => {\n if (path != null) {\n revalidatePath(path)\n } else {\n revalidateTag(MAKESWIFT_CACHE_TAG)\n }\n },\n customRoutes: async (route: string) => {\n if (route === '/redirect-preview') {\n // Convert any Request to NextRequest, if necessary. Due to an issue in\n // how NextRequests are instantiated, we have to pass the original\n // request to the constructor twice. See\n // https://github.com/vercel/next.js/issues/52967\n const request = req instanceof NextRequest ? req : new NextRequest(req, req)\n return { res: await appRouterRedirectPreviewHandler(request, context, client) }\n }\n\n return null\n },\n }\n}\n"],"mappings":"AAAA,SAAS,SAAS;AAClB,SAAS,gBAAgB,qBAAqB;AAC9C,SAAS,mBAAmB;AAE5B,SAAS,2BAA2B;AAGpC,SAAS,uCAAuC;AAChD,SAAS,+BAA+B,+BAA+B;AAEvE,SAAS,wBAA+C;AAYjD,MAAM,cAAc;AAAA,EACzB,EAAE,MAAM,EAAE,WAAW,OAAO,GAAG,EAAE,WAAW,WAAW,CAAC;AAAA,EACxD,EAAE;AACJ;AAEA,eAAsB,OAAO;AAAA,EAC3B;AAAA,EACA;AAAA,EACA;AACF,GAI8B;AAC5B,SAAO;AAAA,IACL;AAAA,IACA,OAAO,iBAAiB,MAAM,QAAQ,MAAM;AAAA,IAC5C,oBAAoB,CAAC,yBAAyB,6BAA6B;AAAA,IAC3E,cAAc,OAAO,QAA+C;AAAA,IACpE,qBAAqB,OAAO,SAAiC;AAC3D,UAAI,QAAQ,MAAM;AAChB,uBAAe,IAAI;AAAA,MACrB,OAAO;AACL,sBAAc,mBAAmB;AAAA,MACnC;AAAA,IACF;AAAA,IACA,cAAc,OAAO,UAAkB;AACrC,UAAI,UAAU,qBAAqB;AAKjC,cAAM,UAAU,eAAe,cAAc,MAAM,IAAI,YAAY,KAAK,GAAG;AAC3E,eAAO,EAAE,KAAK,MAAM,gCAAgC,SAAS,SAAS,MAAM,EAAE;AAAA,MAChF;AAEA,aAAO;AAAA,IACT;AAAA,EACF;AACF;","names":[]}
|
|
@@ -7,10 +7,10 @@ type Params = {
|
|
|
7
7
|
type Context = {
|
|
8
8
|
params: Promise<Params>;
|
|
9
9
|
};
|
|
10
|
-
export type ApiHandlerArgs = [NextRequest, Context];
|
|
11
|
-
export declare const argsPattern: readonly [import("ts-pattern/dist/types/Pattern").Chainable<import("ts-pattern/dist/types/Pattern").GuardP<unknown, NextRequest>>, import("ts-pattern/dist/types/Pattern").AnyPattern];
|
|
10
|
+
export type ApiHandlerArgs = [NextRequest | Request, Context];
|
|
11
|
+
export declare const argsPattern: readonly [import("ts-pattern/dist/types/Pattern").Chainable<import("ts-pattern/dist/types/Pattern").OrP<unknown, readonly [import("ts-pattern/dist/types/Pattern").Chainable<import("ts-pattern/dist/types/Pattern").GuardP<unknown, Request>>, import("ts-pattern/dist/types/Pattern").Chainable<import("ts-pattern/dist/types/Pattern").GuardP<unknown, NextRequest>>]>>, import("ts-pattern/dist/types/Pattern").AnyPattern];
|
|
12
12
|
export declare function config({ req, context, client, }: {
|
|
13
|
-
req: NextRequest;
|
|
13
|
+
req: NextRequest | Request;
|
|
14
14
|
context: Context;
|
|
15
15
|
client: MakeswiftClient;
|
|
16
16
|
}): Promise<ApiHandlerConfig>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"app-router.d.ts","sourceRoot":"","sources":["../../../../../src/next/api-handler/config/app-router.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAA;AAQzC,OAAO,EAAoB,KAAK,gBAAgB,EAAE,MAAM,QAAQ,CAAA;AAChE,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAA;AAEjD,KAAK,MAAM,GAAG;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,EAAE,CAAA;CAAE,CAAA;AAClD,KAAK,OAAO,GAAG;IAAE,MAAM,EAAE,OAAO,CAAC,MAAM,CAAC,CAAA;CAAE,CAAA;
|
|
1
|
+
{"version":3,"file":"app-router.d.ts","sourceRoot":"","sources":["../../../../../src/next/api-handler/config/app-router.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAA;AAQzC,OAAO,EAAoB,KAAK,gBAAgB,EAAE,MAAM,QAAQ,CAAA;AAChE,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAA;AAEjD,KAAK,MAAM,GAAG;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,EAAE,CAAA;CAAE,CAAA;AAClD,KAAK,OAAO,GAAG;IAAE,MAAM,EAAE,OAAO,CAAC,MAAM,CAAC,CAAA;CAAE,CAAA;AAO1C,MAAM,MAAM,cAAc,GAAG,CAAC,WAAW,GAAG,OAAO,EAAE,OAAO,CAAC,CAAA;AAC7D,eAAO,MAAM,WAAW,iaAGd,CAAA;AAEV,wBAAsB,MAAM,CAAC,EAC3B,GAAG,EACH,OAAO,EACP,MAAM,GACP,EAAE;IACD,GAAG,EAAE,WAAW,GAAG,OAAO,CAAA;IAC1B,OAAO,EAAE,OAAO,CAAA;IAChB,MAAM,EAAE,eAAe,CAAA;CACxB,GAAG,OAAO,CAAC,gBAAgB,CAAC,CA0B5B"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@makeswift/runtime",
|
|
3
|
-
"version": "0.25.2-canary.
|
|
3
|
+
"version": "0.25.2-canary.2",
|
|
4
4
|
"license": "MIT",
|
|
5
5
|
"files": [
|
|
6
6
|
"dist",
|
|
@@ -179,8 +179,8 @@
|
|
|
179
179
|
"uuid": "^9.0.0",
|
|
180
180
|
"zod": "^3.21.4",
|
|
181
181
|
"@makeswift/controls": "0.1.12",
|
|
182
|
-
"@makeswift/
|
|
183
|
-
"@makeswift/
|
|
182
|
+
"@makeswift/prop-controllers": "0.4.6",
|
|
183
|
+
"@makeswift/next-plugin": "0.5.0"
|
|
184
184
|
},
|
|
185
185
|
"devDependencies": {
|
|
186
186
|
"@emotion/jest": "^11.11.0",
|