@qwik.dev/router 2.0.0-beta.2 → 2.0.0-beta.23
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/adapters/static/vite.d.ts +1 -1
- package/lib/adapters/azure-swa/vite/index.d.ts +2 -2
- package/lib/adapters/azure-swa/vite/index.mjs +9 -9
- package/lib/adapters/bun-server/vite/index.d.ts +2 -2
- package/lib/adapters/bun-server/vite/index.mjs +9 -7
- package/lib/adapters/cloud-run/vite/index.d.ts +2 -2
- package/lib/adapters/cloud-run/vite/index.mjs +9 -7
- package/lib/adapters/cloudflare-pages/vite/index.d.ts +2 -2
- package/lib/adapters/cloudflare-pages/vite/index.mjs +9 -24
- package/lib/adapters/deno-server/vite/index.d.ts +2 -2
- package/lib/adapters/deno-server/vite/index.mjs +9 -7
- package/lib/adapters/netlify-edge/vite/index.d.ts +2 -2
- package/lib/adapters/netlify-edge/vite/index.mjs +10 -14
- package/lib/adapters/node-server/vite/index.d.ts +2 -2
- package/lib/adapters/node-server/vite/index.mjs +9 -7
- package/lib/adapters/shared/vite/index.d.ts +13 -19
- package/lib/adapters/shared/vite/index.mjs +107 -139
- package/lib/adapters/ssg/vite/index.d.ts +13 -0
- package/lib/adapters/ssg/vite/index.mjs +18 -0
- package/lib/adapters/vercel-edge/vite/index.d.ts +3 -3
- package/lib/adapters/vercel-edge/vite/index.mjs +9 -11
- package/lib/chunks/error-handler.mjs +57 -0
- package/lib/chunks/format-error.mjs +137 -0
- package/lib/chunks/fs.mjs +254 -0
- package/lib/{static/node.mjs → chunks/index.mjs} +362 -564
- package/lib/chunks/mime-types.mjs +52 -0
- package/lib/chunks/routing.qwik.mjs +429 -0
- package/lib/chunks/types.qwik.mjs +22 -0
- package/lib/index.d.ts +240 -60
- package/lib/index.qwik.mjs +701 -983
- package/lib/middleware/aws-lambda/index.d.ts +3 -2
- package/lib/middleware/aws-lambda/index.mjs +8 -12
- package/lib/middleware/azure-swa/index.mjs +10 -216
- package/lib/middleware/bun/index.d.ts +11 -0
- package/lib/middleware/bun/index.mjs +24 -83
- package/lib/middleware/cloudflare-pages/index.mjs +10 -22
- package/lib/middleware/deno/index.d.ts +11 -0
- package/lib/middleware/deno/index.mjs +24 -83
- package/lib/middleware/firebase/index.mjs +7 -11
- package/lib/middleware/netlify-edge/index.mjs +10 -23
- package/lib/middleware/node/index.mjs +22 -87
- package/lib/middleware/request-handler/index.d.ts +89 -70
- package/lib/middleware/request-handler/index.mjs +589 -664
- package/lib/middleware/vercel-edge/index.mjs +15 -27
- package/lib/modules.d.ts +4 -12
- package/lib/service-worker/index.mjs +4 -0
- package/lib/{static → ssg}/index.d.ts +17 -17
- package/lib/ssg/index.mjs +14 -0
- package/lib/vite/index.d.ts +32 -10
- package/lib/vite/index.mjs +1524 -26934
- package/modules.d.ts +4 -12
- package/package.json +62 -68
- package/ssg.d.ts +2 -0
- package/static.d.ts +1 -1
- package/lib/adapters/azure-swa/vite/index.cjs +0 -96
- package/lib/adapters/bun-server/vite/index.cjs +0 -50
- package/lib/adapters/cloud-run/vite/index.cjs +0 -47
- package/lib/adapters/cloudflare-pages/vite/index.cjs +0 -115
- package/lib/adapters/deno-server/vite/index.cjs +0 -62
- package/lib/adapters/netlify-edge/vite/index.cjs +0 -129
- package/lib/adapters/node-server/vite/index.cjs +0 -50
- package/lib/adapters/shared/vite/index.cjs +0 -378
- package/lib/adapters/static/vite/index.cjs +0 -368
- package/lib/adapters/static/vite/index.d.ts +0 -10
- package/lib/adapters/static/vite/index.mjs +0 -331
- package/lib/adapters/vercel-edge/vite/index.cjs +0 -118
- package/lib/index.qwik.cjs +0 -1947
- package/lib/middleware/node/index.cjs +0 -314
- package/lib/middleware/request-handler/index.cjs +0 -1614
- package/lib/service-worker.cjs +0 -17
- package/lib/service-worker.mjs +0 -15
- package/lib/static/deno.mjs +0 -8
- package/lib/static/index.cjs +0 -67
- package/lib/static/index.mjs +0 -48
- package/lib/static/node.cjs +0 -1124
- package/lib/vite/index.cjs +0 -27445
- package/middleware/request-handler/generated/not-found-paths.ts +0 -7
- package/middleware/request-handler/generated/static-paths.ts +0 -35
|
@@ -1,314 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
var __defProp = Object.defineProperty;
|
|
3
|
-
var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
|
|
4
|
-
var __getOwnPropNames = Object.getOwnPropertyNames;
|
|
5
|
-
var __hasOwnProp = Object.prototype.hasOwnProperty;
|
|
6
|
-
var __export = (target, all) => {
|
|
7
|
-
for (var name in all)
|
|
8
|
-
__defProp(target, name, { get: all[name], enumerable: true });
|
|
9
|
-
};
|
|
10
|
-
var __copyProps = (to, from, except, desc) => {
|
|
11
|
-
if (from && typeof from === "object" || typeof from === "function") {
|
|
12
|
-
for (let key of __getOwnPropNames(from))
|
|
13
|
-
if (!__hasOwnProp.call(to, key) && key !== except)
|
|
14
|
-
__defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
|
|
15
|
-
}
|
|
16
|
-
return to;
|
|
17
|
-
};
|
|
18
|
-
var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
|
|
19
|
-
|
|
20
|
-
// packages/qwik-router/src/middleware/node/index.ts
|
|
21
|
-
var index_exports = {};
|
|
22
|
-
__export(index_exports, {
|
|
23
|
-
createQwikCity: () => createQwikCity,
|
|
24
|
-
createQwikRouter: () => createQwikRouter
|
|
25
|
-
});
|
|
26
|
-
module.exports = __toCommonJS(index_exports);
|
|
27
|
-
var import_qwik_router_not_found_paths = require("@qwik-router-not-found-paths");
|
|
28
|
-
var import_qwik_router_static_paths = require("@qwik-router-static-paths");
|
|
29
|
-
var import_internal = require("@qwik.dev/core/internal");
|
|
30
|
-
var import_server = require("@qwik.dev/core/server");
|
|
31
|
-
var import_request_handler = require("../request-handler/index.cjs");
|
|
32
|
-
var import_node_fs = require("node:fs");
|
|
33
|
-
var import_node_path = require("node:path");
|
|
34
|
-
var import_node_url = require("node:url");
|
|
35
|
-
|
|
36
|
-
// packages/qwik-router/src/middleware/request-handler/mime-types.ts
|
|
37
|
-
var MIME_TYPES = {
|
|
38
|
-
"3gp": "video/3gpp",
|
|
39
|
-
"3gpp": "video/3gpp",
|
|
40
|
-
asf: "video/x-ms-asf",
|
|
41
|
-
asx: "video/x-ms-asf",
|
|
42
|
-
avi: "video/x-msvideo",
|
|
43
|
-
avif: "image/avif",
|
|
44
|
-
bmp: "image/x-ms-bmp",
|
|
45
|
-
css: "text/css",
|
|
46
|
-
flv: "video/x-flv",
|
|
47
|
-
gif: "image/gif",
|
|
48
|
-
htm: "text/html",
|
|
49
|
-
html: "text/html",
|
|
50
|
-
ico: "image/x-icon",
|
|
51
|
-
jng: "image/x-jng",
|
|
52
|
-
jpeg: "image/jpeg",
|
|
53
|
-
jpg: "image/jpeg",
|
|
54
|
-
js: "application/javascript",
|
|
55
|
-
json: "application/json",
|
|
56
|
-
kar: "audio/midi",
|
|
57
|
-
m4a: "audio/x-m4a",
|
|
58
|
-
m4v: "video/x-m4v",
|
|
59
|
-
mid: "audio/midi",
|
|
60
|
-
midi: "audio/midi",
|
|
61
|
-
mng: "video/x-mng",
|
|
62
|
-
mov: "video/quicktime",
|
|
63
|
-
mp3: "audio/mpeg",
|
|
64
|
-
mp4: "video/mp4",
|
|
65
|
-
mpeg: "video/mpeg",
|
|
66
|
-
mpg: "video/mpeg",
|
|
67
|
-
ogg: "audio/ogg",
|
|
68
|
-
pdf: "application/pdf",
|
|
69
|
-
png: "image/png",
|
|
70
|
-
rar: "application/x-rar-compressed",
|
|
71
|
-
shtml: "text/html",
|
|
72
|
-
svg: "image/svg+xml",
|
|
73
|
-
svgz: "image/svg+xml",
|
|
74
|
-
tif: "image/tiff",
|
|
75
|
-
tiff: "image/tiff",
|
|
76
|
-
ts: "video/mp2t",
|
|
77
|
-
txt: "text/plain",
|
|
78
|
-
wbmp: "image/vnd.wap.wbmp",
|
|
79
|
-
webm: "video/webm",
|
|
80
|
-
webp: "image/webp",
|
|
81
|
-
wmv: "video/x-ms-wmv",
|
|
82
|
-
woff: "font/woff",
|
|
83
|
-
woff2: "font/woff2",
|
|
84
|
-
xml: "text/xml",
|
|
85
|
-
zip: "application/zip"
|
|
86
|
-
};
|
|
87
|
-
|
|
88
|
-
// packages/qwik-router/src/middleware/node/http.ts
|
|
89
|
-
var import_node_http2 = require("node:http2");
|
|
90
|
-
function computeOrigin(req, opts) {
|
|
91
|
-
var _a;
|
|
92
|
-
return ((_a = opts == null ? void 0 : opts.getOrigin) == null ? void 0 : _a.call(opts, req)) ?? (opts == null ? void 0 : opts.origin) ?? process.env.ORIGIN ?? fallbackOrigin(req);
|
|
93
|
-
}
|
|
94
|
-
function fallbackOrigin(req) {
|
|
95
|
-
const { PROTOCOL_HEADER, HOST_HEADER } = process.env;
|
|
96
|
-
const headers = req.headers;
|
|
97
|
-
const protocol = PROTOCOL_HEADER && headers[PROTOCOL_HEADER] || (req.socket.encrypted || req.connection.encrypted ? "https" : "http");
|
|
98
|
-
const hostHeader = HOST_HEADER ?? (req instanceof import_node_http2.Http2ServerRequest ? ":authority" : "host");
|
|
99
|
-
const host = headers[hostHeader];
|
|
100
|
-
return `${protocol}://${host}`;
|
|
101
|
-
}
|
|
102
|
-
function getUrl(req, origin) {
|
|
103
|
-
return normalizeUrl(req.originalUrl || req.url || "/", origin);
|
|
104
|
-
}
|
|
105
|
-
function isIgnoredError(message = "") {
|
|
106
|
-
const ignoredErrors = ["The stream has been destroyed", "write after end"];
|
|
107
|
-
return ignoredErrors.some((ignored) => message.includes(ignored));
|
|
108
|
-
}
|
|
109
|
-
var invalidHeadersPattern = /^:(method|scheme|authority|path)$/i;
|
|
110
|
-
function normalizeUrl(url, base) {
|
|
111
|
-
const DOUBLE_SLASH_REG = /\/\/|\\\\/g;
|
|
112
|
-
return new URL(url.replace(DOUBLE_SLASH_REG, "/"), base);
|
|
113
|
-
}
|
|
114
|
-
async function fromNodeHttp(url, req, res, mode, getClientConn) {
|
|
115
|
-
const requestHeaders = new Headers();
|
|
116
|
-
const nodeRequestHeaders = req.headers;
|
|
117
|
-
try {
|
|
118
|
-
for (const [key, value] of Object.entries(nodeRequestHeaders)) {
|
|
119
|
-
if (invalidHeadersPattern.test(key)) {
|
|
120
|
-
continue;
|
|
121
|
-
}
|
|
122
|
-
if (typeof value === "string") {
|
|
123
|
-
requestHeaders.set(key, value);
|
|
124
|
-
} else if (Array.isArray(value)) {
|
|
125
|
-
for (const v of value) {
|
|
126
|
-
requestHeaders.append(key, v);
|
|
127
|
-
}
|
|
128
|
-
}
|
|
129
|
-
}
|
|
130
|
-
} catch (err) {
|
|
131
|
-
console.error(err);
|
|
132
|
-
}
|
|
133
|
-
const getRequestBody = async function* () {
|
|
134
|
-
for await (const chunk of req) {
|
|
135
|
-
yield chunk;
|
|
136
|
-
}
|
|
137
|
-
};
|
|
138
|
-
const body = req.method === "HEAD" || req.method === "GET" ? void 0 : getRequestBody();
|
|
139
|
-
const controller = new AbortController();
|
|
140
|
-
const options = {
|
|
141
|
-
method: req.method,
|
|
142
|
-
headers: requestHeaders,
|
|
143
|
-
body,
|
|
144
|
-
signal: controller.signal,
|
|
145
|
-
duplex: "half"
|
|
146
|
-
};
|
|
147
|
-
res.on("close", () => {
|
|
148
|
-
controller.abort();
|
|
149
|
-
});
|
|
150
|
-
const serverRequestEv = {
|
|
151
|
-
mode,
|
|
152
|
-
url,
|
|
153
|
-
request: new Request(url.href, options),
|
|
154
|
-
env: {
|
|
155
|
-
get(key) {
|
|
156
|
-
return process.env[key];
|
|
157
|
-
}
|
|
158
|
-
},
|
|
159
|
-
getWritableStream: (status, headers, cookies) => {
|
|
160
|
-
res.statusCode = status;
|
|
161
|
-
try {
|
|
162
|
-
for (const [key, value] of headers) {
|
|
163
|
-
if (invalidHeadersPattern.test(key)) {
|
|
164
|
-
continue;
|
|
165
|
-
}
|
|
166
|
-
res.setHeader(key, value);
|
|
167
|
-
}
|
|
168
|
-
const cookieHeaders = cookies.headers();
|
|
169
|
-
if (cookieHeaders.length > 0) {
|
|
170
|
-
res.setHeader("Set-Cookie", cookieHeaders);
|
|
171
|
-
}
|
|
172
|
-
} catch (err) {
|
|
173
|
-
console.error(err);
|
|
174
|
-
}
|
|
175
|
-
return new WritableStream({
|
|
176
|
-
write(chunk) {
|
|
177
|
-
if (res.closed || res.destroyed) {
|
|
178
|
-
return;
|
|
179
|
-
}
|
|
180
|
-
res.write(chunk, (error) => {
|
|
181
|
-
if (error && !isIgnoredError(error.message)) {
|
|
182
|
-
console.error(error);
|
|
183
|
-
}
|
|
184
|
-
});
|
|
185
|
-
},
|
|
186
|
-
close() {
|
|
187
|
-
res.end();
|
|
188
|
-
}
|
|
189
|
-
});
|
|
190
|
-
},
|
|
191
|
-
getClientConn: () => {
|
|
192
|
-
return getClientConn ? getClientConn(req) : {
|
|
193
|
-
ip: req.socket.remoteAddress
|
|
194
|
-
};
|
|
195
|
-
},
|
|
196
|
-
platform: {
|
|
197
|
-
ssr: true,
|
|
198
|
-
incomingMessage: req,
|
|
199
|
-
node: process.versions.node
|
|
200
|
-
// Weirdly needed to make typecheck of insights happy
|
|
201
|
-
},
|
|
202
|
-
locale: void 0
|
|
203
|
-
};
|
|
204
|
-
return serverRequestEv;
|
|
205
|
-
}
|
|
206
|
-
|
|
207
|
-
// packages/qwik-router/src/middleware/node/index.ts
|
|
208
|
-
var import_meta = {};
|
|
209
|
-
function createQwikRouter(opts) {
|
|
210
|
-
var _a;
|
|
211
|
-
if (opts.qwikCityPlan && !opts.qwikRouterConfig) {
|
|
212
|
-
console.warn("qwikCityPlan is deprecated. Use qwikRouterConfig instead.");
|
|
213
|
-
opts.qwikRouterConfig = opts.qwikCityPlan;
|
|
214
|
-
} else if (!opts.qwikRouterConfig) {
|
|
215
|
-
throw new Error("qwikRouterConfig is required.");
|
|
216
|
-
}
|
|
217
|
-
const qwikSerializer = {
|
|
218
|
-
_deserialize: import_internal._deserialize,
|
|
219
|
-
_serialize: import_internal._serialize,
|
|
220
|
-
_verifySerializable: import_internal._verifySerializable
|
|
221
|
-
};
|
|
222
|
-
if (opts.manifest) {
|
|
223
|
-
(0, import_server.setServerPlatform)(opts.manifest);
|
|
224
|
-
}
|
|
225
|
-
const staticFolder = ((_a = opts.static) == null ? void 0 : _a.root) ?? (0, import_node_path.join)((0, import_node_url.fileURLToPath)(import_meta.url), "..", "..", "dist");
|
|
226
|
-
const router = async (req, res, next) => {
|
|
227
|
-
try {
|
|
228
|
-
const origin = computeOrigin(req, opts);
|
|
229
|
-
const serverRequestEv = await fromNodeHttp(
|
|
230
|
-
getUrl(req, origin),
|
|
231
|
-
req,
|
|
232
|
-
res,
|
|
233
|
-
"server",
|
|
234
|
-
opts.getClientConn
|
|
235
|
-
);
|
|
236
|
-
const handled = await (0, import_request_handler.requestHandler)(serverRequestEv, opts, qwikSerializer);
|
|
237
|
-
if (handled) {
|
|
238
|
-
const err = await handled.completion;
|
|
239
|
-
if (err) {
|
|
240
|
-
throw err;
|
|
241
|
-
}
|
|
242
|
-
if (handled.requestEv.headersSent) {
|
|
243
|
-
return;
|
|
244
|
-
}
|
|
245
|
-
}
|
|
246
|
-
next();
|
|
247
|
-
} catch (e) {
|
|
248
|
-
console.error(e);
|
|
249
|
-
next(e);
|
|
250
|
-
}
|
|
251
|
-
};
|
|
252
|
-
const notFound = async (req, res, next) => {
|
|
253
|
-
try {
|
|
254
|
-
if (!res.headersSent) {
|
|
255
|
-
const origin = computeOrigin(req, opts);
|
|
256
|
-
const url = getUrl(req, origin);
|
|
257
|
-
const notFoundHtml = (0, import_qwik_router_static_paths.isStaticPath)(req.method || "GET", url) ? "Not Found" : (0, import_qwik_router_not_found_paths.getNotFound)(url.pathname);
|
|
258
|
-
res.writeHead(404, {
|
|
259
|
-
"Content-Type": "text/html; charset=utf-8",
|
|
260
|
-
"X-Not-Found": url.pathname
|
|
261
|
-
});
|
|
262
|
-
res.end(notFoundHtml);
|
|
263
|
-
}
|
|
264
|
-
} catch (e) {
|
|
265
|
-
console.error(e);
|
|
266
|
-
next(e);
|
|
267
|
-
}
|
|
268
|
-
};
|
|
269
|
-
const staticFile = async (req, res, next) => {
|
|
270
|
-
var _a2;
|
|
271
|
-
try {
|
|
272
|
-
const origin = computeOrigin(req, opts);
|
|
273
|
-
const url = getUrl(req, origin);
|
|
274
|
-
if ((0, import_qwik_router_static_paths.isStaticPath)(req.method || "GET", url)) {
|
|
275
|
-
const pathname = url.pathname;
|
|
276
|
-
let filePath;
|
|
277
|
-
if ((0, import_node_path.basename)(pathname).includes(".")) {
|
|
278
|
-
filePath = (0, import_node_path.join)(staticFolder, pathname);
|
|
279
|
-
} else if (opts.qwikRouterConfig.trailingSlash) {
|
|
280
|
-
filePath = (0, import_node_path.join)(staticFolder, pathname + "index.html");
|
|
281
|
-
} else {
|
|
282
|
-
filePath = (0, import_node_path.join)(staticFolder, pathname, "index.html");
|
|
283
|
-
}
|
|
284
|
-
const ext = (0, import_node_path.extname)(filePath).replace(/^\./, "");
|
|
285
|
-
const stream = (0, import_node_fs.createReadStream)(filePath);
|
|
286
|
-
stream.on("error", next);
|
|
287
|
-
const contentType = MIME_TYPES[ext];
|
|
288
|
-
if (contentType) {
|
|
289
|
-
res.setHeader("Content-Type", contentType);
|
|
290
|
-
}
|
|
291
|
-
if ((_a2 = opts.static) == null ? void 0 : _a2.cacheControl) {
|
|
292
|
-
res.setHeader("Cache-Control", opts.static.cacheControl);
|
|
293
|
-
}
|
|
294
|
-
stream.pipe(res);
|
|
295
|
-
return;
|
|
296
|
-
}
|
|
297
|
-
return next();
|
|
298
|
-
} catch (e) {
|
|
299
|
-
console.error(e);
|
|
300
|
-
next(e);
|
|
301
|
-
}
|
|
302
|
-
};
|
|
303
|
-
return {
|
|
304
|
-
router,
|
|
305
|
-
notFound,
|
|
306
|
-
staticFile
|
|
307
|
-
};
|
|
308
|
-
}
|
|
309
|
-
var createQwikCity = createQwikRouter;
|
|
310
|
-
// Annotate the CommonJS export names for ESM import in node:
|
|
311
|
-
0 && (module.exports = {
|
|
312
|
-
createQwikCity,
|
|
313
|
-
createQwikRouter
|
|
314
|
-
});
|