@holo-js/adapter-next 0.3.11 → 0.3.14
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/{chunk-VBBQ4VXY.mjs → chunk-PLFHK46L.mjs} +1 -1
- package/dist/client.mjs +1 -1
- package/dist/config.mjs +51 -4
- package/dist/realtime-definition-loader.mjs +1 -1
- package/dist/realtime.mjs +1 -1
- package/dist/validation-loader.d.ts +6 -0
- package/dist/validation-loader.mjs +9 -0
- package/package.json +7 -7
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
import {
|
|
3
3
|
normalizeHoloHttpError,
|
|
4
4
|
renderClientHttpErrorPage
|
|
5
|
-
} from "@holo-js/adapter-shared";
|
|
5
|
+
} from "@holo-js/adapter-shared/client";
|
|
6
6
|
var nextHttpAccessFallbackStatuses = /* @__PURE__ */ new Set([401, 403, 404]);
|
|
7
7
|
function normalizeNextClientHttpError(error) {
|
|
8
8
|
return normalizeHoloHttpError(error);
|
package/dist/client.mjs
CHANGED
package/dist/config.mjs
CHANGED
|
@@ -51,6 +51,35 @@ var PACKAGE_DEPENDENCY_FIELDS = [
|
|
|
51
51
|
"optionalDependencies",
|
|
52
52
|
"peerDependencies"
|
|
53
53
|
];
|
|
54
|
+
var PANEL_ID = /^[a-z][a-z0-9]*(?:[._-][a-z0-9]+)*$/u;
|
|
55
|
+
var PANEL_ROUTE = /^\/(?:[a-z0-9._~-]+|:[a-z][a-z0-9_]*)(?:\/(?:[a-z0-9._~-]+|:[a-z][a-z0-9_]*))*$/u;
|
|
56
|
+
var PANEL_DOMAIN = /^(?:[a-z0-9-]+|\{tenant(?::[a-z][a-z0-9_]*)?\})(?:\.(?:[a-z0-9-]+|\{tenant(?::[a-z][a-z0-9_]*)?\}))+$/u;
|
|
57
|
+
function panelDomainPattern(domain) {
|
|
58
|
+
return domain.split(".").map((segment) => segment.startsWith("{tenant") ? "(?<tenant>[^.]+)" : segment.replaceAll("-", "\\-")).join("\\.");
|
|
59
|
+
}
|
|
60
|
+
function holoPanelsRewrites() {
|
|
61
|
+
let value;
|
|
62
|
+
try {
|
|
63
|
+
value = JSON.parse(readFileSync(join(process.cwd(), ".holo-js/generated/panels/panel-routes.json"), "utf8"));
|
|
64
|
+
} catch {
|
|
65
|
+
return [];
|
|
66
|
+
}
|
|
67
|
+
if (!value || typeof value !== "object" || Reflect.get(value, "version") !== 1 || !Array.isArray(Reflect.get(value, "routes"))) return [];
|
|
68
|
+
const manifest = value;
|
|
69
|
+
if (manifest.routes.length > 1e3) throw new Error("[Holo] Holo Panels route manifests may contain at most 1000 routes.");
|
|
70
|
+
const rewrites = /* @__PURE__ */ new Map();
|
|
71
|
+
for (const route of manifest.routes) {
|
|
72
|
+
if (!PANEL_ID.test(route.panelId) || !PANEL_ROUTE.test(route.source)) throw new Error("[Holo] Holo Panels generated an unsafe route manifest.");
|
|
73
|
+
if (route.domain !== null && !PANEL_DOMAIN.test(route.domain)) throw new Error("[Holo] Holo Panels generated an unsafe tenant domain.");
|
|
74
|
+
const rewrite = {
|
|
75
|
+
destination: `/holo/panels/${route.panelId}/custom-route?panelRoute=${route.source}`,
|
|
76
|
+
...route.domain ? { has: [{ type: "host", value: panelDomainPattern(route.domain) }] } : {},
|
|
77
|
+
source: route.source
|
|
78
|
+
};
|
|
79
|
+
rewrites.set(`${route.domain ?? ""}:${route.source}`, rewrite);
|
|
80
|
+
}
|
|
81
|
+
return Object.freeze([...rewrites.values()]);
|
|
82
|
+
}
|
|
54
83
|
function isPackageDependencyMap(value) {
|
|
55
84
|
return value !== null && typeof value === "object" && Object.values(value).every((dependency) => typeof dependency === "string");
|
|
56
85
|
}
|
|
@@ -122,11 +151,16 @@ function withHolo(nextConfig = {}) {
|
|
|
122
151
|
const existingTurbopack = nextConfig.turbopack ?? {};
|
|
123
152
|
const existingIgnoreIssue = existingTurbopack.ignoreIssue ?? [];
|
|
124
153
|
const hasRealtime = isOptionalServerExternalPackageInstalled("@holo-js/realtime", packageManifest);
|
|
154
|
+
const validationLoader = fileURLToPath(new URL("./validation-loader.mjs", import.meta.url));
|
|
125
155
|
const realtimeDefinitionLoader = fileURLToPath(new URL("./realtime-definition-loader.mjs", import.meta.url));
|
|
126
156
|
const mergedTurbopack = {
|
|
127
157
|
...existingTurbopack,
|
|
128
158
|
rules: {
|
|
129
159
|
...existingTurbopack.rules ?? {},
|
|
160
|
+
"*": [
|
|
161
|
+
...existingTurbopack.rules?.["*"] ? [existingTurbopack.rules["*"]].flat() : [],
|
|
162
|
+
{ condition: { all: ["browser", { not: "foreign" }, { path: /\.[cm]?[jt]sx?$/ }] }, loaders: [validationLoader] }
|
|
163
|
+
],
|
|
130
164
|
...hasRealtime ? {
|
|
131
165
|
"*.{ts,tsx,js,jsx,mts,mjs,cts,cjs}": [
|
|
132
166
|
createRealtimeDefinitionTurbopackRule(realtimeDefinitionLoader, "browser"),
|
|
@@ -160,20 +194,33 @@ function withHolo(nextConfig = {}) {
|
|
|
160
194
|
turbopack: mergedTurbopack,
|
|
161
195
|
webpack(config, context) {
|
|
162
196
|
const nextWebpackConfig = userWebpack?.(config, context) ?? config;
|
|
163
|
-
if (!hasRealtime) {
|
|
164
|
-
return nextWebpackConfig;
|
|
165
|
-
}
|
|
166
197
|
nextWebpackConfig.module = nextWebpackConfig.module ?? {};
|
|
167
198
|
nextWebpackConfig.module.rules = [
|
|
168
199
|
...nextWebpackConfig.module.rules ?? [],
|
|
169
|
-
createRealtimeDefinitionWebpackRule(realtimeDefinitionLoader, context.isServer)
|
|
200
|
+
...hasRealtime ? [createRealtimeDefinitionWebpackRule(realtimeDefinitionLoader, context.isServer)] : [],
|
|
201
|
+
...!context.isServer ? [{ test: /\.[cm]?[jt]sx?$/, exclude: /node_modules/, use: [{ loader: validationLoader }] }] : []
|
|
170
202
|
];
|
|
171
203
|
return nextWebpackConfig;
|
|
172
204
|
},
|
|
173
205
|
async rewrites() {
|
|
174
206
|
const userResult = await userRewrites?.call(this);
|
|
207
|
+
const panelRewrites = holoPanelsRewrites();
|
|
175
208
|
const raw = process.env.STORAGE_ROUTE_PREFIX?.trim() ?? "/storage";
|
|
176
209
|
const needsRewrite = raw && raw !== "/" && raw !== "/storage";
|
|
210
|
+
if (panelRewrites.length > 0) {
|
|
211
|
+
const storageRewrites = needsRewrite ? [{ source: `/${raw.replace(/^\/+|\/+$/g, "")}/:path*`, destination: "/storage/:path*" }] : [];
|
|
212
|
+
if (Array.isArray(userResult)) {
|
|
213
|
+
return { beforeFiles: [...panelRewrites, ...storageRewrites], afterFiles: userResult };
|
|
214
|
+
}
|
|
215
|
+
if (userResult && typeof userResult === "object") {
|
|
216
|
+
const shaped = userResult;
|
|
217
|
+
return {
|
|
218
|
+
...shaped,
|
|
219
|
+
beforeFiles: [...panelRewrites, ...storageRewrites, ...Array.isArray(shaped.beforeFiles) ? shaped.beforeFiles : []]
|
|
220
|
+
};
|
|
221
|
+
}
|
|
222
|
+
return { beforeFiles: [...panelRewrites, ...storageRewrites] };
|
|
223
|
+
}
|
|
177
224
|
if (!needsRewrite) {
|
|
178
225
|
return userResult ?? [];
|
|
179
226
|
}
|
|
@@ -3,7 +3,7 @@ import {
|
|
|
3
3
|
createRealtimeClientDefinitionModule as createSharedRealtimeClientDefinitionModule,
|
|
4
4
|
createRealtimeClientDefinitionTransform as createSharedRealtimeClientDefinitionTransform,
|
|
5
5
|
stripRealtimeServerHandlers
|
|
6
|
-
} from "@holo-js/adapter-shared";
|
|
6
|
+
} from "@holo-js/adapter-shared/build";
|
|
7
7
|
function createRealtimeClientDefinitionTransform(source, options = {}) {
|
|
8
8
|
return createSharedRealtimeClientDefinitionTransform(source, "@holo-js/adapter-next/realtime", options);
|
|
9
9
|
}
|
package/dist/realtime.mjs
CHANGED
|
@@ -3,7 +3,7 @@ import {
|
|
|
3
3
|
createNextRenderableError,
|
|
4
4
|
normalizeNextClientHttpError,
|
|
5
5
|
renderNextClientHttpErrorPage
|
|
6
|
-
} from "./chunk-
|
|
6
|
+
} from "./chunk-PLFHK46L.mjs";
|
|
7
7
|
|
|
8
8
|
// src/realtime.ts
|
|
9
9
|
import { cache, createElement, use, useEffect, useMemo, useSyncExternalStore } from "react";
|
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
// src/validation-loader.ts
|
|
2
|
+
import { compileBrowserValidation } from "@holo-js/adapter-shared/build";
|
|
3
|
+
function validationLoader(source) {
|
|
4
|
+
this.cacheable?.();
|
|
5
|
+
return compileBrowserValidation(source, this.resourcePath) ?? source;
|
|
6
|
+
}
|
|
7
|
+
export {
|
|
8
|
+
validationLoader as default
|
|
9
|
+
};
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@holo-js/adapter-next",
|
|
3
|
-
"version": "0.3.
|
|
3
|
+
"version": "0.3.14",
|
|
4
4
|
"description": "Holo-JS Framework - Next.js adapter",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"license": "MIT",
|
|
@@ -43,13 +43,13 @@
|
|
|
43
43
|
"test": "vitest --run"
|
|
44
44
|
},
|
|
45
45
|
"dependencies": {
|
|
46
|
-
"@holo-js/adapter-shared": "^0.3.
|
|
47
|
-
"@holo-js/config": "^0.3.
|
|
48
|
-
"@holo-js/core": "^0.3.
|
|
46
|
+
"@holo-js/adapter-shared": "^0.3.14",
|
|
47
|
+
"@holo-js/config": "^0.3.14",
|
|
48
|
+
"@holo-js/core": "^0.3.14"
|
|
49
49
|
},
|
|
50
50
|
"peerDependencies": {
|
|
51
|
-
"@holo-js/forms": "^0.3.
|
|
52
|
-
"@holo-js/realtime": "^0.3.
|
|
51
|
+
"@holo-js/forms": "^0.3.14",
|
|
52
|
+
"@holo-js/realtime": "^0.3.14",
|
|
53
53
|
"next": "^16.2.4",
|
|
54
54
|
"react": "^19.2.6"
|
|
55
55
|
},
|
|
@@ -62,7 +62,7 @@
|
|
|
62
62
|
}
|
|
63
63
|
},
|
|
64
64
|
"devDependencies": {
|
|
65
|
-
"@holo-js/realtime": "^0.3.
|
|
65
|
+
"@holo-js/realtime": "^0.3.14",
|
|
66
66
|
"@types/node": "^22.10.2",
|
|
67
67
|
"next": "^16.2.4",
|
|
68
68
|
"tsup": "^8.3.5",
|