cdk-nextjs 0.5.15 → 0.6.0
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/.jsii +821 -253
- package/.jsii.tabl.json +1 -1
- package/API.md +787 -18
- package/README.md +3 -3
- package/docs/breaking-changes.md +86 -0
- package/docs/caching-guide.md +6 -0
- package/docs/plans/adapter-runtime-release.md +362 -0
- package/docs/plans/phase-0-image-function-opt-in.md +295 -0
- package/lib/generated-structs/OptionalNextjsDistributionProps.d.ts +13 -0
- package/lib/generated-structs/OptionalNextjsDistributionProps.js +1 -1
- package/lib/image-optimization/handler-utils.d.ts +34 -0
- package/lib/image-optimization/handler-utils.js +83 -0
- package/lib/image-optimization/handler-utils.test.d.ts +1 -0
- package/lib/image-optimization/handler-utils.test.js +178 -0
- package/lib/image-optimization/handler.mjs +56126 -0
- package/lib/index.d.ts +2 -1
- package/lib/index.js +4 -2
- package/lib/nextjs-api.d.ts +44 -0
- package/lib/nextjs-api.js +64 -20
- package/lib/nextjs-api.test.d.ts +1 -0
- package/lib/nextjs-api.test.js +144 -0
- package/lib/nextjs-build/nextjs-build.d.ts +60 -0
- package/lib/nextjs-build/nextjs-build.js +184 -27
- package/lib/nextjs-cache.js +1 -1
- package/lib/nextjs-compute/nextjs-containers.js +1 -1
- package/lib/nextjs-compute/nextjs-functions.js +1 -1
- package/lib/nextjs-compute/nextjs-image-function.d.ts +53 -0
- package/lib/nextjs-compute/nextjs-image-function.js +59 -0
- package/lib/nextjs-distribution.d.ts +33 -0
- package/lib/nextjs-distribution.js +39 -11
- package/lib/nextjs-post-deploy.js +1 -1
- package/lib/nextjs-static-assets.d.ts +18 -0
- package/lib/nextjs-static-assets.js +33 -6
- package/lib/nextjs-static-assets.test.d.ts +1 -0
- package/lib/nextjs-static-assets.test.js +58 -0
- package/lib/root-constructs/nextjs-base-construct.d.ts +62 -2
- package/lib/root-constructs/nextjs-base-construct.js +81 -3
- package/lib/root-constructs/nextjs-global-containers.d.ts +6 -1
- package/lib/root-constructs/nextjs-global-containers.js +11 -5
- package/lib/root-constructs/nextjs-global-functions.d.ts +16 -5
- package/lib/root-constructs/nextjs-global-functions.js +23 -21
- package/lib/root-constructs/nextjs-regional-containers.js +1 -1
- package/lib/root-constructs/nextjs-regional-functions.d.ts +11 -5
- package/lib/root-constructs/nextjs-regional-functions.js +17 -21
- package/lib/utils/base-path.d.ts +40 -0
- package/lib/utils/base-path.js +123 -0
- package/lib/utils/base-path.test.d.ts +1 -0
- package/lib/utils/base-path.test.js +163 -0
- package/lib/utils/experimental-flags.d.ts +24 -0
- package/lib/utils/experimental-flags.js +30 -0
- package/lib/utils/get-architecture.d.ts +10 -0
- package/lib/utils/get-architecture.js +17 -2
- package/package.json +3 -1
|
@@ -0,0 +1,163 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
const node_fs_1 = require("node:fs");
|
|
4
|
+
const node_os_1 = require("node:os");
|
|
5
|
+
const node_path_1 = require("node:path");
|
|
6
|
+
const constants_1 = require("../constants");
|
|
7
|
+
const base_path_1 = require("./base-path");
|
|
8
|
+
const GLOBAL = [constants_1.NextjsType.GLOBAL_FUNCTIONS, constants_1.NextjsType.GLOBAL_CONTAINERS];
|
|
9
|
+
describe("normalizeBasePath", () => {
|
|
10
|
+
it("reduces values addressing the same path to the same segment", () => {
|
|
11
|
+
expect((0, base_path_1.normalizeBasePath)("/base")).toBe("base");
|
|
12
|
+
expect((0, base_path_1.normalizeBasePath)("base")).toBe("base");
|
|
13
|
+
expect((0, base_path_1.normalizeBasePath)("/base/")).toBe("base");
|
|
14
|
+
expect((0, base_path_1.normalizeBasePath)("//base//")).toBe("base");
|
|
15
|
+
});
|
|
16
|
+
it("maps undefined and empty values to an empty string", () => {
|
|
17
|
+
expect((0, base_path_1.normalizeBasePath)(undefined)).toBe("");
|
|
18
|
+
expect((0, base_path_1.normalizeBasePath)("")).toBe("");
|
|
19
|
+
expect((0, base_path_1.normalizeBasePath)("/")).toBe("");
|
|
20
|
+
});
|
|
21
|
+
it("keeps interior slashes of a nested basePath", () => {
|
|
22
|
+
expect((0, base_path_1.normalizeBasePath)("/team/app/")).toBe("team/app");
|
|
23
|
+
});
|
|
24
|
+
});
|
|
25
|
+
describe("joinPath", () => {
|
|
26
|
+
const origin = "https://d111111abcdef8.cloudfront.net";
|
|
27
|
+
it("drops empty parts", () => {
|
|
28
|
+
expect((0, base_path_1.joinPath)(origin)).toBe(origin);
|
|
29
|
+
expect((0, base_path_1.joinPath)(origin, "")).toBe(origin);
|
|
30
|
+
expect((0, base_path_1.joinPath)(origin, undefined)).toBe(origin);
|
|
31
|
+
expect((0, base_path_1.joinPath)(origin, "/")).toBe(origin);
|
|
32
|
+
expect((0, base_path_1.joinPath)("", "base", undefined, "_next/static")).toBe("base/_next/static");
|
|
33
|
+
});
|
|
34
|
+
it("joins with exactly one slash regardless of each part's slashes", () => {
|
|
35
|
+
expect((0, base_path_1.joinPath)(origin, "/base")).toBe(`${origin}/base`);
|
|
36
|
+
expect((0, base_path_1.joinPath)(origin, "base/")).toBe(`${origin}/base`);
|
|
37
|
+
expect((0, base_path_1.joinPath)(origin, "/team/app/")).toBe(`${origin}/team/app`);
|
|
38
|
+
expect((0, base_path_1.joinPath)("/base/", "/_next/static/{key}")).toBe("base/_next/static/{key}");
|
|
39
|
+
});
|
|
40
|
+
it("returns an empty string when every part is empty", () => {
|
|
41
|
+
expect((0, base_path_1.joinPath)()).toBe("");
|
|
42
|
+
expect((0, base_path_1.joinPath)(undefined, "", "/")).toBe("");
|
|
43
|
+
});
|
|
44
|
+
});
|
|
45
|
+
describe("readNextConfigBasePath", () => {
|
|
46
|
+
let dotNextPath;
|
|
47
|
+
let warn;
|
|
48
|
+
beforeEach(() => {
|
|
49
|
+
dotNextPath = (0, node_fs_1.mkdtempSync)((0, node_path_1.join)((0, node_os_1.tmpdir)(), "base-path-"));
|
|
50
|
+
warn = jest.spyOn(console, "warn").mockImplementation(() => { });
|
|
51
|
+
});
|
|
52
|
+
afterEach(() => {
|
|
53
|
+
warn.mockRestore();
|
|
54
|
+
(0, node_fs_1.rmSync)(dotNextPath, { recursive: true, force: true });
|
|
55
|
+
});
|
|
56
|
+
function writeRequiredServerFiles(contents) {
|
|
57
|
+
(0, node_fs_1.writeFileSync)((0, node_path_1.join)(dotNextPath, "required-server-files.json"), contents);
|
|
58
|
+
}
|
|
59
|
+
it("reads the app's basePath and strips the leading slash", () => {
|
|
60
|
+
writeRequiredServerFiles(JSON.stringify({ config: { basePath: "/prod" } }));
|
|
61
|
+
expect((0, base_path_1.readNextConfigBasePath)(dotNextPath)).toBe("prod");
|
|
62
|
+
expect(warn).not.toHaveBeenCalled();
|
|
63
|
+
});
|
|
64
|
+
it("returns an empty string when the app sets no basePath", () => {
|
|
65
|
+
// `next build` writes basePath: "" rather than omitting it.
|
|
66
|
+
writeRequiredServerFiles(JSON.stringify({ config: { basePath: "" } }));
|
|
67
|
+
expect((0, base_path_1.readNextConfigBasePath)(dotNextPath)).toBe("");
|
|
68
|
+
expect(warn).not.toHaveBeenCalled();
|
|
69
|
+
});
|
|
70
|
+
// Degrading to "" is deliberate, but it's indistinguishable from an app that
|
|
71
|
+
// sets no basePath, so it has to be visible: the Global constructs derive
|
|
72
|
+
// their basePath from this value and would otherwise 404 every static asset
|
|
73
|
+
// with nothing but a silent fallback to explain it.
|
|
74
|
+
it("warns when required-server-files.json is missing", () => {
|
|
75
|
+
expect((0, base_path_1.readNextConfigBasePath)(dotNextPath)).toBe("");
|
|
76
|
+
expect(warn).toHaveBeenCalledWith(expect.stringContaining("required-server-files.json"));
|
|
77
|
+
});
|
|
78
|
+
it("warns when the file isn't valid JSON", () => {
|
|
79
|
+
writeRequiredServerFiles("not json");
|
|
80
|
+
expect((0, base_path_1.readNextConfigBasePath)(dotNextPath)).toBe("");
|
|
81
|
+
expect(warn).toHaveBeenCalledWith(expect.stringContaining("Could not read basePath"));
|
|
82
|
+
});
|
|
83
|
+
it("returns an empty string when the file has no config key", () => {
|
|
84
|
+
writeRequiredServerFiles(JSON.stringify({ files: [] }));
|
|
85
|
+
expect((0, base_path_1.readNextConfigBasePath)(dotNextPath)).toBe("");
|
|
86
|
+
});
|
|
87
|
+
});
|
|
88
|
+
describe("resolveBasePath", () => {
|
|
89
|
+
describe.each(Object.values(constants_1.NextjsType))("%s", (nextjsType) => {
|
|
90
|
+
it("resolves to undefined when both are unset", () => {
|
|
91
|
+
expect((0, base_path_1.resolveBasePath)(nextjsType)).toBeUndefined();
|
|
92
|
+
expect((0, base_path_1.resolveBasePath)(nextjsType, "", "")).toBeUndefined();
|
|
93
|
+
// Normalizes to empty, so it's the same as unset rather than a prefix.
|
|
94
|
+
expect((0, base_path_1.resolveBasePath)(nextjsType, "/")).toBeUndefined();
|
|
95
|
+
});
|
|
96
|
+
// One shape out, whatever shape came in: consumers that need a leading
|
|
97
|
+
// slash (only `NextjsDistribution`'s path patterns) add their own, so
|
|
98
|
+
// nothing downstream has to re-normalize.
|
|
99
|
+
it("normalizes the prop when it matches the app", () => {
|
|
100
|
+
expect((0, base_path_1.resolveBasePath)(nextjsType, "/base", "/base")).toBe("base");
|
|
101
|
+
expect((0, base_path_1.resolveBasePath)(nextjsType, "base", "/base")).toBe("base");
|
|
102
|
+
expect((0, base_path_1.resolveBasePath)(nextjsType, "/base/", "/base")).toBe("base");
|
|
103
|
+
expect((0, base_path_1.resolveBasePath)(nextjsType, "base//", "/base")).toBe("base");
|
|
104
|
+
});
|
|
105
|
+
});
|
|
106
|
+
describe.each(GLOBAL)("%s", (nextjsType) => {
|
|
107
|
+
// CloudFront uses the request path verbatim as the S3 object key, so the
|
|
108
|
+
// prop has to be the prefix the app emits — there's exactly one valid value,
|
|
109
|
+
// which makes the app's config the source of truth.
|
|
110
|
+
it("derives the prop from the app's basePath", () => {
|
|
111
|
+
expect((0, base_path_1.resolveBasePath)(nextjsType, undefined, "/base")).toBe("base");
|
|
112
|
+
expect((0, base_path_1.resolveBasePath)(nextjsType, "", "base")).toBe("base");
|
|
113
|
+
expect((0, base_path_1.resolveBasePath)(nextjsType, undefined, "/team/app/")).toBe("team/app");
|
|
114
|
+
});
|
|
115
|
+
it("rejects the prop setting a basePath the app doesn't", () => {
|
|
116
|
+
expect(() => (0, base_path_1.resolveBasePath)(nextjsType, "/base")).toThrow(/CloudFront serves static assets straight from S3/);
|
|
117
|
+
});
|
|
118
|
+
it("rejects two different values", () => {
|
|
119
|
+
expect(() => (0, base_path_1.resolveBasePath)(nextjsType, "/a", "/b")).toThrow('prop is "/a" but your Next.js app\'s config sets `basePath` to "/b"');
|
|
120
|
+
});
|
|
121
|
+
});
|
|
122
|
+
describe(constants_1.NextjsType.REGIONAL_FUNCTIONS, () => {
|
|
123
|
+
// API Gateway strips the stage before matching resources, so an app served
|
|
124
|
+
// at the default `prod` stage sets basePath: "/prod" and leaves the prop
|
|
125
|
+
// unset. Same shape as a custom domain base path mapping. Deriving here
|
|
126
|
+
// would nest every resource under a path the stage already consumed.
|
|
127
|
+
it("does not derive the app's basePath", () => {
|
|
128
|
+
expect((0, base_path_1.resolveBasePath)(constants_1.NextjsType.REGIONAL_FUNCTIONS, undefined, "/prod")).toBeUndefined();
|
|
129
|
+
});
|
|
130
|
+
// The stripped prefix is part of what the app emits but never part of the
|
|
131
|
+
// resource path, so an app at the `prod` stage nested under "/base" sets
|
|
132
|
+
// basePath: "/prod/base" and the prop to "/base".
|
|
133
|
+
it("accepts an app basePath that ends with the prop", () => {
|
|
134
|
+
expect((0, base_path_1.resolveBasePath)(constants_1.NextjsType.REGIONAL_FUNCTIONS, "/base", "/prod/base")).toBe("base");
|
|
135
|
+
});
|
|
136
|
+
it("only accepts the prop as a whole trailing path segment", () => {
|
|
137
|
+
expect(() => (0, base_path_1.resolveBasePath)(constants_1.NextjsType.REGIONAL_FUNCTIONS, "/se", "/prod/base")).toThrow(/nests every API Gateway resource under that path/);
|
|
138
|
+
// Leading, not trailing: API Gateway strips the stage, so the app would
|
|
139
|
+
// emit "/prod/..." while the resources live under "/prod/base/...".
|
|
140
|
+
expect(() => (0, base_path_1.resolveBasePath)(constants_1.NextjsType.REGIONAL_FUNCTIONS, "/prod", "/prod/base")).toThrow(/nests every API Gateway resource under that path/);
|
|
141
|
+
});
|
|
142
|
+
// The reverse is never right: the prop nests every resource, including the
|
|
143
|
+
// catch-all, under a path the app never links to.
|
|
144
|
+
it("rejects the prop setting a basePath the app doesn't", () => {
|
|
145
|
+
expect(() => (0, base_path_1.resolveBasePath)(constants_1.NextjsType.REGIONAL_FUNCTIONS, "/base")).toThrow(/nests every API Gateway resource under that path/);
|
|
146
|
+
});
|
|
147
|
+
it("rejects two different values", () => {
|
|
148
|
+
expect(() => (0, base_path_1.resolveBasePath)(constants_1.NextjsType.REGIONAL_FUNCTIONS, "/a", "/b")).toThrow(/nests every API Gateway resource under that path/);
|
|
149
|
+
});
|
|
150
|
+
});
|
|
151
|
+
describe(constants_1.NextjsType.REGIONAL_CONTAINERS, () => {
|
|
152
|
+
// basePath only namespaces the S3 bucket here: the ALB forwards every path
|
|
153
|
+
// to the container, which serves its own static assets. So any combination
|
|
154
|
+
// is valid, and the app's basePath is never derived into the bucket prefix.
|
|
155
|
+
it("accepts any combination, always keeping the prop", () => {
|
|
156
|
+
const nextjsType = constants_1.NextjsType.REGIONAL_CONTAINERS;
|
|
157
|
+
expect((0, base_path_1.resolveBasePath)(nextjsType, "/a", "/b")).toBe("a");
|
|
158
|
+
expect((0, base_path_1.resolveBasePath)(nextjsType, "/a")).toBe("a");
|
|
159
|
+
expect((0, base_path_1.resolveBasePath)(nextjsType, undefined, "/b")).toBeUndefined();
|
|
160
|
+
});
|
|
161
|
+
});
|
|
162
|
+
});
|
|
163
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"base-path.test.js","sourceRoot":"","sources":["../../src/utils/base-path.test.ts"],"names":[],"mappings":"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","sourcesContent":["import { mkdtempSync, rmSync, writeFileSync } from \"node:fs\";\nimport { tmpdir } from \"node:os\";\nimport { join } from \"node:path\";\nimport { NextjsType } from \"../constants\";\nimport {\n  joinPath,\n  normalizeBasePath,\n  readNextConfigBasePath,\n  resolveBasePath,\n} from \"./base-path\";\n\nconst GLOBAL = [NextjsType.GLOBAL_FUNCTIONS, NextjsType.GLOBAL_CONTAINERS];\n\ndescribe(\"normalizeBasePath\", () => {\n  it(\"reduces values addressing the same path to the same segment\", () => {\n    expect(normalizeBasePath(\"/base\")).toBe(\"base\");\n    expect(normalizeBasePath(\"base\")).toBe(\"base\");\n    expect(normalizeBasePath(\"/base/\")).toBe(\"base\");\n    expect(normalizeBasePath(\"//base//\")).toBe(\"base\");\n  });\n\n  it(\"maps undefined and empty values to an empty string\", () => {\n    expect(normalizeBasePath(undefined)).toBe(\"\");\n    expect(normalizeBasePath(\"\")).toBe(\"\");\n    expect(normalizeBasePath(\"/\")).toBe(\"\");\n  });\n\n  it(\"keeps interior slashes of a nested basePath\", () => {\n    expect(normalizeBasePath(\"/team/app/\")).toBe(\"team/app\");\n  });\n});\n\ndescribe(\"joinPath\", () => {\n  const origin = \"https://d111111abcdef8.cloudfront.net\";\n\n  it(\"drops empty parts\", () => {\n    expect(joinPath(origin)).toBe(origin);\n    expect(joinPath(origin, \"\")).toBe(origin);\n    expect(joinPath(origin, undefined)).toBe(origin);\n    expect(joinPath(origin, \"/\")).toBe(origin);\n    expect(joinPath(\"\", \"base\", undefined, \"_next/static\")).toBe(\n      \"base/_next/static\",\n    );\n  });\n\n  it(\"joins with exactly one slash regardless of each part's slashes\", () => {\n    expect(joinPath(origin, \"/base\")).toBe(`${origin}/base`);\n    expect(joinPath(origin, \"base/\")).toBe(`${origin}/base`);\n    expect(joinPath(origin, \"/team/app/\")).toBe(`${origin}/team/app`);\n    expect(joinPath(\"/base/\", \"/_next/static/{key}\")).toBe(\n      \"base/_next/static/{key}\",\n    );\n  });\n\n  it(\"returns an empty string when every part is empty\", () => {\n    expect(joinPath()).toBe(\"\");\n    expect(joinPath(undefined, \"\", \"/\")).toBe(\"\");\n  });\n});\n\ndescribe(\"readNextConfigBasePath\", () => {\n  let dotNextPath: string;\n  let warn: jest.SpyInstance;\n\n  beforeEach(() => {\n    dotNextPath = mkdtempSync(join(tmpdir(), \"base-path-\"));\n    warn = jest.spyOn(console, \"warn\").mockImplementation(() => {});\n  });\n\n  afterEach(() => {\n    warn.mockRestore();\n    rmSync(dotNextPath, { recursive: true, force: true });\n  });\n\n  function writeRequiredServerFiles(contents: string) {\n    writeFileSync(join(dotNextPath, \"required-server-files.json\"), contents);\n  }\n\n  it(\"reads the app's basePath and strips the leading slash\", () => {\n    writeRequiredServerFiles(JSON.stringify({ config: { basePath: \"/prod\" } }));\n\n    expect(readNextConfigBasePath(dotNextPath)).toBe(\"prod\");\n    expect(warn).not.toHaveBeenCalled();\n  });\n\n  it(\"returns an empty string when the app sets no basePath\", () => {\n    // `next build` writes basePath: \"\" rather than omitting it.\n    writeRequiredServerFiles(JSON.stringify({ config: { basePath: \"\" } }));\n\n    expect(readNextConfigBasePath(dotNextPath)).toBe(\"\");\n    expect(warn).not.toHaveBeenCalled();\n  });\n\n  // Degrading to \"\" is deliberate, but it's indistinguishable from an app that\n  // sets no basePath, so it has to be visible: the Global constructs derive\n  // their basePath from this value and would otherwise 404 every static asset\n  // with nothing but a silent fallback to explain it.\n  it(\"warns when required-server-files.json is missing\", () => {\n    expect(readNextConfigBasePath(dotNextPath)).toBe(\"\");\n    expect(warn).toHaveBeenCalledWith(\n      expect.stringContaining(\"required-server-files.json\"),\n    );\n  });\n\n  it(\"warns when the file isn't valid JSON\", () => {\n    writeRequiredServerFiles(\"not json\");\n\n    expect(readNextConfigBasePath(dotNextPath)).toBe(\"\");\n    expect(warn).toHaveBeenCalledWith(\n      expect.stringContaining(\"Could not read basePath\"),\n    );\n  });\n\n  it(\"returns an empty string when the file has no config key\", () => {\n    writeRequiredServerFiles(JSON.stringify({ files: [] }));\n\n    expect(readNextConfigBasePath(dotNextPath)).toBe(\"\");\n  });\n});\n\ndescribe(\"resolveBasePath\", () => {\n  describe.each(Object.values(NextjsType))(\"%s\", (nextjsType) => {\n    it(\"resolves to undefined when both are unset\", () => {\n      expect(resolveBasePath(nextjsType)).toBeUndefined();\n      expect(resolveBasePath(nextjsType, \"\", \"\")).toBeUndefined();\n      // Normalizes to empty, so it's the same as unset rather than a prefix.\n      expect(resolveBasePath(nextjsType, \"/\")).toBeUndefined();\n    });\n\n    // One shape out, whatever shape came in: consumers that need a leading\n    // slash (only `NextjsDistribution`'s path patterns) add their own, so\n    // nothing downstream has to re-normalize.\n    it(\"normalizes the prop when it matches the app\", () => {\n      expect(resolveBasePath(nextjsType, \"/base\", \"/base\")).toBe(\"base\");\n      expect(resolveBasePath(nextjsType, \"base\", \"/base\")).toBe(\"base\");\n      expect(resolveBasePath(nextjsType, \"/base/\", \"/base\")).toBe(\"base\");\n      expect(resolveBasePath(nextjsType, \"base//\", \"/base\")).toBe(\"base\");\n    });\n  });\n\n  describe.each(GLOBAL)(\"%s\", (nextjsType) => {\n    // CloudFront uses the request path verbatim as the S3 object key, so the\n    // prop has to be the prefix the app emits — there's exactly one valid value,\n    // which makes the app's config the source of truth.\n    it(\"derives the prop from the app's basePath\", () => {\n      expect(resolveBasePath(nextjsType, undefined, \"/base\")).toBe(\"base\");\n      expect(resolveBasePath(nextjsType, \"\", \"base\")).toBe(\"base\");\n      expect(resolveBasePath(nextjsType, undefined, \"/team/app/\")).toBe(\n        \"team/app\",\n      );\n    });\n\n    it(\"rejects the prop setting a basePath the app doesn't\", () => {\n      expect(() => resolveBasePath(nextjsType, \"/base\")).toThrow(\n        /CloudFront serves static assets straight from S3/,\n      );\n    });\n\n    it(\"rejects two different values\", () => {\n      expect(() => resolveBasePath(nextjsType, \"/a\", \"/b\")).toThrow(\n        'prop is \"/a\" but your Next.js app\\'s config sets `basePath` to \"/b\"',\n      );\n    });\n  });\n\n  describe(NextjsType.REGIONAL_FUNCTIONS, () => {\n    // API Gateway strips the stage before matching resources, so an app served\n    // at the default `prod` stage sets basePath: \"/prod\" and leaves the prop\n    // unset. Same shape as a custom domain base path mapping. Deriving here\n    // would nest every resource under a path the stage already consumed.\n    it(\"does not derive the app's basePath\", () => {\n      expect(\n        resolveBasePath(NextjsType.REGIONAL_FUNCTIONS, undefined, \"/prod\"),\n      ).toBeUndefined();\n    });\n\n    // The stripped prefix is part of what the app emits but never part of the\n    // resource path, so an app at the `prod` stage nested under \"/base\" sets\n    // basePath: \"/prod/base\" and the prop to \"/base\".\n    it(\"accepts an app basePath that ends with the prop\", () => {\n      expect(\n        resolveBasePath(NextjsType.REGIONAL_FUNCTIONS, \"/base\", \"/prod/base\"),\n      ).toBe(\"base\");\n    });\n\n    it(\"only accepts the prop as a whole trailing path segment\", () => {\n      expect(() =>\n        resolveBasePath(NextjsType.REGIONAL_FUNCTIONS, \"/se\", \"/prod/base\"),\n      ).toThrow(/nests every API Gateway resource under that path/);\n      // Leading, not trailing: API Gateway strips the stage, so the app would\n      // emit \"/prod/...\" while the resources live under \"/prod/base/...\".\n      expect(() =>\n        resolveBasePath(NextjsType.REGIONAL_FUNCTIONS, \"/prod\", \"/prod/base\"),\n      ).toThrow(/nests every API Gateway resource under that path/);\n    });\n\n    // The reverse is never right: the prop nests every resource, including the\n    // catch-all, under a path the app never links to.\n    it(\"rejects the prop setting a basePath the app doesn't\", () => {\n      expect(() =>\n        resolveBasePath(NextjsType.REGIONAL_FUNCTIONS, \"/base\"),\n      ).toThrow(/nests every API Gateway resource under that path/);\n    });\n\n    it(\"rejects two different values\", () => {\n      expect(() =>\n        resolveBasePath(NextjsType.REGIONAL_FUNCTIONS, \"/a\", \"/b\"),\n      ).toThrow(/nests every API Gateway resource under that path/);\n    });\n  });\n\n  describe(NextjsType.REGIONAL_CONTAINERS, () => {\n    // basePath only namespaces the S3 bucket here: the ALB forwards every path\n    // to the container, which serves its own static assets. So any combination\n    // is valid, and the app's basePath is never derived into the bucket prefix.\n    it(\"accepts any combination, always keeping the prop\", () => {\n      const nextjsType = NextjsType.REGIONAL_CONTAINERS;\n      expect(resolveBasePath(nextjsType, \"/a\", \"/b\")).toBe(\"a\");\n      expect(resolveBasePath(nextjsType, \"/a\")).toBe(\"a\");\n      expect(resolveBasePath(nextjsType, undefined, \"/b\")).toBeUndefined();\n    });\n  });\n});\n"]}
|
|
@@ -0,0 +1,24 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Undocumented, unsupported gates for work in progress.
|
|
3
|
+
*
|
|
4
|
+
* These are deliberately env vars rather than construct props: they select
|
|
5
|
+
* between an existing code path and one that is still being built, so they
|
|
6
|
+
* carry no JSII public surface to document, deprecate, or remove. Each one is
|
|
7
|
+
* deleted in the PR that makes its new path the only path.
|
|
8
|
+
*
|
|
9
|
+
* Not part of this package's public API. Do not reference them from README or
|
|
10
|
+
* `docs/`, and do not use them in a real deployment.
|
|
11
|
+
*/
|
|
12
|
+
/**
|
|
13
|
+
* Serve `_next/image` from a dedicated image optimization Lambda
|
|
14
|
+
* (`NextjsImageFunction`) instead of the Next.js server function, for the two
|
|
15
|
+
* Functions `NextjsType`s.
|
|
16
|
+
*
|
|
17
|
+
* Off by default because the dedicated Lambda is not the Next.js server, so
|
|
18
|
+
* Next.js middleware does not run for image requests — Next's default matcher
|
|
19
|
+
* (`/:path*`) covers `/_next/image`. The adapter runtime release
|
|
20
|
+
* (`docs/plans/adapter-runtime-release.md`) resolves that by dispatching
|
|
21
|
+
* `_next/image` in-process after middleware, at which point the separate
|
|
22
|
+
* Lambda and this flag both go away.
|
|
23
|
+
*/
|
|
24
|
+
export declare function useDedicatedImageFunction(): boolean;
|
|
@@ -0,0 +1,30 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
/**
|
|
3
|
+
* Undocumented, unsupported gates for work in progress.
|
|
4
|
+
*
|
|
5
|
+
* These are deliberately env vars rather than construct props: they select
|
|
6
|
+
* between an existing code path and one that is still being built, so they
|
|
7
|
+
* carry no JSII public surface to document, deprecate, or remove. Each one is
|
|
8
|
+
* deleted in the PR that makes its new path the only path.
|
|
9
|
+
*
|
|
10
|
+
* Not part of this package's public API. Do not reference them from README or
|
|
11
|
+
* `docs/`, and do not use them in a real deployment.
|
|
12
|
+
*/
|
|
13
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
14
|
+
exports.useDedicatedImageFunction = useDedicatedImageFunction;
|
|
15
|
+
/**
|
|
16
|
+
* Serve `_next/image` from a dedicated image optimization Lambda
|
|
17
|
+
* (`NextjsImageFunction`) instead of the Next.js server function, for the two
|
|
18
|
+
* Functions `NextjsType`s.
|
|
19
|
+
*
|
|
20
|
+
* Off by default because the dedicated Lambda is not the Next.js server, so
|
|
21
|
+
* Next.js middleware does not run for image requests — Next's default matcher
|
|
22
|
+
* (`/:path*`) covers `/_next/image`. The adapter runtime release
|
|
23
|
+
* (`docs/plans/adapter-runtime-release.md`) resolves that by dispatching
|
|
24
|
+
* `_next/image` in-process after middleware, at which point the separate
|
|
25
|
+
* Lambda and this flag both go away.
|
|
26
|
+
*/
|
|
27
|
+
function useDedicatedImageFunction() {
|
|
28
|
+
return process.env.CDK_NEXTJS_EXPERIMENTAL_DEDICATED_IMAGE_FUNCTION === "1";
|
|
29
|
+
}
|
|
30
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZXhwZXJpbWVudGFsLWZsYWdzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3V0aWxzL2V4cGVyaW1lbnRhbC1mbGFncy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUE7Ozs7Ozs7Ozs7R0FVRzs7QUFjSCw4REFFQztBQWREOzs7Ozs7Ozs7OztHQVdHO0FBQ0gsU0FBZ0IseUJBQXlCO0lBQ3ZDLE9BQU8sT0FBTyxDQUFDLEdBQUcsQ0FBQyxnREFBZ0QsS0FBSyxHQUFHLENBQUM7QUFDOUUsQ0FBQyIsInNvdXJjZXNDb250ZW50IjpbIi8qKlxuICogVW5kb2N1bWVudGVkLCB1bnN1cHBvcnRlZCBnYXRlcyBmb3Igd29yayBpbiBwcm9ncmVzcy5cbiAqXG4gKiBUaGVzZSBhcmUgZGVsaWJlcmF0ZWx5IGVudiB2YXJzIHJhdGhlciB0aGFuIGNvbnN0cnVjdCBwcm9wczogdGhleSBzZWxlY3RcbiAqIGJldHdlZW4gYW4gZXhpc3RpbmcgY29kZSBwYXRoIGFuZCBvbmUgdGhhdCBpcyBzdGlsbCBiZWluZyBidWlsdCwgc28gdGhleVxuICogY2Fycnkgbm8gSlNJSSBwdWJsaWMgc3VyZmFjZSB0byBkb2N1bWVudCwgZGVwcmVjYXRlLCBvciByZW1vdmUuIEVhY2ggb25lIGlzXG4gKiBkZWxldGVkIGluIHRoZSBQUiB0aGF0IG1ha2VzIGl0cyBuZXcgcGF0aCB0aGUgb25seSBwYXRoLlxuICpcbiAqIE5vdCBwYXJ0IG9mIHRoaXMgcGFja2FnZSdzIHB1YmxpYyBBUEkuIERvIG5vdCByZWZlcmVuY2UgdGhlbSBmcm9tIFJFQURNRSBvclxuICogYGRvY3MvYCwgYW5kIGRvIG5vdCB1c2UgdGhlbSBpbiBhIHJlYWwgZGVwbG95bWVudC5cbiAqL1xuXG4vKipcbiAqIFNlcnZlIGBfbmV4dC9pbWFnZWAgZnJvbSBhIGRlZGljYXRlZCBpbWFnZSBvcHRpbWl6YXRpb24gTGFtYmRhXG4gKiAoYE5leHRqc0ltYWdlRnVuY3Rpb25gKSBpbnN0ZWFkIG9mIHRoZSBOZXh0LmpzIHNlcnZlciBmdW5jdGlvbiwgZm9yIHRoZSB0d29cbiAqIEZ1bmN0aW9ucyBgTmV4dGpzVHlwZWBzLlxuICpcbiAqIE9mZiBieSBkZWZhdWx0IGJlY2F1c2UgdGhlIGRlZGljYXRlZCBMYW1iZGEgaXMgbm90IHRoZSBOZXh0LmpzIHNlcnZlciwgc29cbiAqIE5leHQuanMgbWlkZGxld2FyZSBkb2VzIG5vdCBydW4gZm9yIGltYWdlIHJlcXVlc3RzIOKAlCBOZXh0J3MgZGVmYXVsdCBtYXRjaGVyXG4gKiAoYC86cGF0aCpgKSBjb3ZlcnMgYC9fbmV4dC9pbWFnZWAuIFRoZSBhZGFwdGVyIHJ1bnRpbWUgcmVsZWFzZVxuICogKGBkb2NzL3BsYW5zL2FkYXB0ZXItcnVudGltZS1yZWxlYXNlLm1kYCkgcmVzb2x2ZXMgdGhhdCBieSBkaXNwYXRjaGluZ1xuICogYF9uZXh0L2ltYWdlYCBpbi1wcm9jZXNzIGFmdGVyIG1pZGRsZXdhcmUsIGF0IHdoaWNoIHBvaW50IHRoZSBzZXBhcmF0ZVxuICogTGFtYmRhIGFuZCB0aGlzIGZsYWcgYm90aCBnbyBhd2F5LlxuICovXG5leHBvcnQgZnVuY3Rpb24gdXNlRGVkaWNhdGVkSW1hZ2VGdW5jdGlvbigpOiBib29sZWFuIHtcbiAgcmV0dXJuIHByb2Nlc3MuZW52LkNES19ORVhUSlNfRVhQRVJJTUVOVEFMX0RFRElDQVRFRF9JTUFHRV9GVU5DVElPTiA9PT0gXCIxXCI7XG59XG4iXX0=
|
|
@@ -1,2 +1,12 @@
|
|
|
1
1
|
import { Architecture } from "aws-cdk-lib/aws-lambda";
|
|
2
|
+
/**
|
|
3
|
+
* Host architecture normalized to the two Lambda supports, spelled the way
|
|
4
|
+
* Sharp's `@img/sharp-<platform>-<arch>` packages spell it.
|
|
5
|
+
*
|
|
6
|
+
* The Lambda's architecture and the Sharp binaries bundled into its asset must
|
|
7
|
+
* come from this one value: deriving them separately lets them disagree on a
|
|
8
|
+
* host that is neither x64 nor arm (e.g. s390x), which produces a Lambda that
|
|
9
|
+
* fails to load its own bindings.
|
|
10
|
+
*/
|
|
11
|
+
export declare function getNodeArchitecture(): string;
|
|
2
12
|
export declare function getLambdaArchitecture(): Architecture;
|
|
@@ -1,8 +1,23 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.getNodeArchitecture = getNodeArchitecture;
|
|
3
4
|
exports.getLambdaArchitecture = getLambdaArchitecture;
|
|
4
5
|
const aws_lambda_1 = require("aws-cdk-lib/aws-lambda");
|
|
6
|
+
/**
|
|
7
|
+
* Host architecture normalized to the two Lambda supports, spelled the way
|
|
8
|
+
* Sharp's `@img/sharp-<platform>-<arch>` packages spell it.
|
|
9
|
+
*
|
|
10
|
+
* The Lambda's architecture and the Sharp binaries bundled into its asset must
|
|
11
|
+
* come from this one value: deriving them separately lets them disagree on a
|
|
12
|
+
* host that is neither x64 nor arm (e.g. s390x), which produces a Lambda that
|
|
13
|
+
* fails to load its own bindings.
|
|
14
|
+
*/
|
|
15
|
+
function getNodeArchitecture() {
|
|
16
|
+
return process.arch.startsWith("arm") ? "arm64" : "x64";
|
|
17
|
+
}
|
|
5
18
|
function getLambdaArchitecture() {
|
|
6
|
-
return
|
|
19
|
+
return getNodeArchitecture() === "arm64"
|
|
20
|
+
? aws_lambda_1.Architecture.ARM_64
|
|
21
|
+
: aws_lambda_1.Architecture.X86_64;
|
|
7
22
|
}
|
|
8
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
23
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZ2V0LWFyY2hpdGVjdHVyZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy91dGlscy9nZXQtYXJjaGl0ZWN0dXJlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBV0Esa0RBRUM7QUFFRCxzREFJQztBQW5CRCx1REFBc0Q7QUFFdEQ7Ozs7Ozs7O0dBUUc7QUFDSCxTQUFnQixtQkFBbUI7SUFDakMsT0FBTyxPQUFPLENBQUMsSUFBSSxDQUFDLFVBQVUsQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUMsT0FBTyxDQUFDLENBQUMsQ0FBQyxLQUFLLENBQUM7QUFDMUQsQ0FBQztBQUVELFNBQWdCLHFCQUFxQjtJQUNuQyxPQUFPLG1CQUFtQixFQUFFLEtBQUssT0FBTztRQUN0QyxDQUFDLENBQUMseUJBQVksQ0FBQyxNQUFNO1FBQ3JCLENBQUMsQ0FBQyx5QkFBWSxDQUFDLE1BQU0sQ0FBQztBQUMxQixDQUFDIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgQXJjaGl0ZWN0dXJlIH0gZnJvbSBcImF3cy1jZGstbGliL2F3cy1sYW1iZGFcIjtcblxuLyoqXG4gKiBIb3N0IGFyY2hpdGVjdHVyZSBub3JtYWxpemVkIHRvIHRoZSB0d28gTGFtYmRhIHN1cHBvcnRzLCBzcGVsbGVkIHRoZSB3YXlcbiAqIFNoYXJwJ3MgYEBpbWcvc2hhcnAtPHBsYXRmb3JtPi08YXJjaD5gIHBhY2thZ2VzIHNwZWxsIGl0LlxuICpcbiAqIFRoZSBMYW1iZGEncyBhcmNoaXRlY3R1cmUgYW5kIHRoZSBTaGFycCBiaW5hcmllcyBidW5kbGVkIGludG8gaXRzIGFzc2V0IG11c3RcbiAqIGNvbWUgZnJvbSB0aGlzIG9uZSB2YWx1ZTogZGVyaXZpbmcgdGhlbSBzZXBhcmF0ZWx5IGxldHMgdGhlbSBkaXNhZ3JlZSBvbiBhXG4gKiBob3N0IHRoYXQgaXMgbmVpdGhlciB4NjQgbm9yIGFybSAoZS5nLiBzMzkweCksIHdoaWNoIHByb2R1Y2VzIGEgTGFtYmRhIHRoYXRcbiAqIGZhaWxzIHRvIGxvYWQgaXRzIG93biBiaW5kaW5ncy5cbiAqL1xuZXhwb3J0IGZ1bmN0aW9uIGdldE5vZGVBcmNoaXRlY3R1cmUoKTogc3RyaW5nIHtcbiAgcmV0dXJuIHByb2Nlc3MuYXJjaC5zdGFydHNXaXRoKFwiYXJtXCIpID8gXCJhcm02NFwiIDogXCJ4NjRcIjtcbn1cblxuZXhwb3J0IGZ1bmN0aW9uIGdldExhbWJkYUFyY2hpdGVjdHVyZSgpOiBBcmNoaXRlY3R1cmUge1xuICByZXR1cm4gZ2V0Tm9kZUFyY2hpdGVjdHVyZSgpID09PSBcImFybTY0XCJcbiAgICA/IEFyY2hpdGVjdHVyZS5BUk1fNjRcbiAgICA6IEFyY2hpdGVjdHVyZS5YODZfNjQ7XG59XG4iXX0=
|
package/package.json
CHANGED
|
@@ -81,7 +81,7 @@
|
|
|
81
81
|
"publishConfig": {
|
|
82
82
|
"access": "public"
|
|
83
83
|
},
|
|
84
|
-
"version": "0.
|
|
84
|
+
"version": "0.6.0",
|
|
85
85
|
"jest": {
|
|
86
86
|
"coverageProvider": "v8",
|
|
87
87
|
"testPathIgnorePatterns": [
|
|
@@ -161,6 +161,8 @@
|
|
|
161
161
|
"bundle:adapter/adapter:watch": "pnpm dlx projen bundle:adapter/adapter:watch",
|
|
162
162
|
"bundle:adapter/cache-handler": "pnpm dlx projen bundle:adapter/cache-handler",
|
|
163
163
|
"bundle:adapter/cache-handler:watch": "pnpm dlx projen bundle:adapter/cache-handler:watch",
|
|
164
|
+
"bundle:image-optimization/handler": "pnpm dlx projen bundle:image-optimization/handler",
|
|
165
|
+
"bundle:image-optimization/handler:watch": "pnpm dlx projen bundle:image-optimization/handler:watch",
|
|
164
166
|
"bundle:lambdas/post-deploy/post-deploy.lambda": "pnpm dlx projen bundle:lambdas/post-deploy/post-deploy.lambda",
|
|
165
167
|
"bundle:lambdas/post-deploy/post-deploy.lambda:watch": "pnpm dlx projen bundle:lambdas/post-deploy/post-deploy.lambda:watch",
|
|
166
168
|
"bundle:nextjs-build/patch-fetch": "pnpm dlx projen bundle:nextjs-build/patch-fetch",
|