workers-start 0.2.1 → 0.4.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/CHANGELOG.md +13 -0
- package/README.md +18 -14
- package/dist/accept.d.ts.map +1 -1
- package/dist/accept.js +6 -2
- package/dist/accept.js.map +1 -1
- package/dist/check-bundle-cli.d.ts +1 -1
- package/dist/check-bundle-cli.js +23 -6
- package/dist/check-bundle-cli.js.map +1 -1
- package/dist/check-bundle.d.ts +7 -4
- package/dist/check-bundle.d.ts.map +1 -1
- package/dist/check-bundle.js +32 -11
- package/dist/check-bundle.js.map +1 -1
- package/dist/entry.d.ts +8 -2
- package/dist/entry.d.ts.map +1 -1
- package/dist/entry.js +33 -12
- package/dist/entry.js.map +1 -1
- package/dist/head.d.ts +57 -6
- package/dist/head.d.ts.map +1 -1
- package/dist/head.js +80 -10
- package/dist/head.js.map +1 -1
- package/dist/index.d.ts +4 -4
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +2 -2
- package/dist/index.js.map +1 -1
- package/dist/scripts.d.ts.map +1 -1
- package/dist/scripts.js +6 -2
- package/dist/scripts.js.map +1 -1
- package/dist/workers.d.ts.map +1 -1
- package/dist/workers.js +2 -1
- package/dist/workers.js.map +1 -1
- package/package.json +1 -3
- package/src/accept.ts +10 -2
- package/src/check-bundle-cli.ts +38 -9
- package/src/check-bundle.ts +59 -16
- package/src/entry.ts +79 -27
- package/src/head.ts +162 -27
- package/src/index.ts +24 -4
- package/src/scripts.ts +6 -2
- package/src/workers.ts +18 -4
- package/biome.preset.json +0 -47
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,18 @@
|
|
|
1
1
|
# Changelog
|
|
2
2
|
|
|
3
|
+
## 0.4.0 (2026-11-17)
|
|
4
|
+
|
|
5
|
+
- Removed the `workers-start/biome` preset. A Workers helper library is the wrong place for a lint opinion, and once it shrank to Biome's defaults there was little left to share. Apps that extended it put the few lines they need in their own `biome.jsonc`: `vcs.useIgnoreFile`, `formatter.indentStyle: "space"`, `css.parser.tailwindDirectives` if they use Tailwind, and the rules they want on top of `recommended`.
|
|
6
|
+
|
|
7
|
+
## 0.3.0 (2026-11-17)
|
|
8
|
+
|
|
9
|
+
Additions only. Output for existing options is unchanged.
|
|
10
|
+
|
|
11
|
+
- Secret check: `--env-dir <dir>` (repeatable) reads env files from several directories, such as a package and its monorepo root. `checkBundle` and `localEnvPairs` take a directory or an array of them.
|
|
12
|
+
- Head: site-wide `robots`, `keywords`, `authors` and `meta` defaults that a page can override, and `defaultImage` as an object with size, alt and type.
|
|
13
|
+
- Head: `alternates` (hreflang or feed links), `links`, `section` (`article:section`) and `jsonLd`, which returns a `scripts` entry. `jsonLdScript` is exported for the root route.
|
|
14
|
+
- Entry: the Markdown renderer gets `page.html()`, the page rendered through the handler as HTML, for renderers that convert the page.
|
|
15
|
+
|
|
3
16
|
## 0.2.1 (2026-11-17)
|
|
4
17
|
|
|
5
18
|
- Secret check: `--public-prefix <PREFIX>` marks a family of keys as public, such as `NEXT_PUBLIC_` in an app that kept its Next.js names.
|
package/README.md
CHANGED
|
@@ -31,7 +31,9 @@ import handler, { createServerEntry } from "@tanstack/react-start/server-entry";
|
|
|
31
31
|
import { createEntry } from "workers-start/entry";
|
|
32
32
|
import { renderMarkdown } from "./markdown";
|
|
33
33
|
|
|
34
|
-
export default createServerEntry(
|
|
34
|
+
export default createServerEntry(
|
|
35
|
+
createEntry({ handler, markdown: renderMarkdown }),
|
|
36
|
+
);
|
|
35
37
|
```
|
|
36
38
|
|
|
37
39
|
Point `main` in `wrangler.jsonc` at this file (`"main": "./src/server.ts"`). Pointing it at `@tanstack/react-start/server-entry` skips your entry without an error.
|
|
@@ -53,6 +55,7 @@ Details that matter when you compare against production:
|
|
|
53
55
|
- Paths are decoded, repeated slashes collapsed and trailing slashes dropped before any test, and prefixes match whole segments ignoring case. `/API/x`, `/%61pi/x` and `//api//x` all count as `/api`; `/apiary` does not. `markdown()` receives that normalized path, so `/learn/caf%C3%A9/` arrives as `/learn/café`.
|
|
54
56
|
- A page is any path whose last segment has no file extension like `.js`, `.xml` or `.txt`. A dotted slug such as `/blog/node.js-tips` is still a page.
|
|
55
57
|
- `readOnlyPrefixes` (default `["/api"]`, `[]` to turn off) and `isPage` change those rules. An API that accepts writes, or that needs CORS headers on preflight, should pass `readOnlyPrefixes: []` and answer those methods itself.
|
|
58
|
+
- `markdown(path, request, page)` gets a third argument: `await page.html()` renders the same request through the handler as HTML (extra fetch arguments passed through), for a renderer that converts the page rather than building Markdown from data.
|
|
56
59
|
- Static assets are served before the Worker runs. On a prerendered site, or a static site on Pages, none of this applies to the prerendered pages unless `assets.run_worker_first` sends them through the Worker.
|
|
57
60
|
|
|
58
61
|
## Head tags
|
|
@@ -72,12 +75,17 @@ export const { pageHead } = createPageHead({
|
|
|
72
75
|
|
|
73
76
|
// src/routes/about.tsx
|
|
74
77
|
export const Route = createFileRoute("/about")({
|
|
75
|
-
head: () =>
|
|
78
|
+
head: () =>
|
|
79
|
+
pageHead({ title: "About", description: "Who we are.", path: "/about" }),
|
|
76
80
|
component: About,
|
|
77
81
|
});
|
|
78
82
|
```
|
|
79
83
|
|
|
80
|
-
It returns the title, description, canonical link, Open Graph tags and Twitter tags. Optional fields add the rest: `image` as a path or `{ url, width, height, alt, type }`; `type: "article"` with `published`, `modified`, `authors` and `tags`; `keywords`; `robots` (or `noindex: true`); `canonical` to override it or `false` to drop it;
|
|
84
|
+
It returns the title, description, canonical link, Open Graph tags and Twitter tags. Optional fields add the rest: `image` as a path or `{ url, width, height, alt, type }`; `type: "article"` with `published`, `modified`, `authors` and `tags`; `keywords`; `robots` (or `noindex: true`); `canonical` to override it or `false` to drop it; `meta` for anything else; `alternates` for `rel="alternate"` links (`{ href, hreflang }` for a language version, `{ href, type, title }` for a feed); `links` for any other link; `section` for `article:section`; and `jsonLd` for schema.org data.
|
|
85
|
+
|
|
86
|
+
The site config takes `twitterSite` and `twitterCreator`, a `defaultImage` as a path or an object, and defaults every page can override: `robots`, `keywords`, `authors` (`[{ name, url }]`, written as `author` meta and `rel="author"` links) and `meta` (a page tag with the same name or property replaces the site's).
|
|
87
|
+
|
|
88
|
+
`jsonLd` takes one schema.org object or an array, which becomes an `@graph`, and adds `@context` when it is missing. It comes back as `scripts`, which TanStack Router's `head()` renders. The same serializer is exported as `jsonLdScript(data)` for the root route's `scripts`. Both escape `<`, `>` and `&`, so no value can close the script tag.
|
|
81
89
|
|
|
82
90
|
Call `pageHead` from leaf routes only. The router keeps one meta per name with the deepest route winning, so a tag a leaf leaves out falls back to its parent's, and it concatenates links, so a canonical from a layout and a leaf would appear twice.
|
|
83
91
|
|
|
@@ -88,7 +96,12 @@ Two tags with the same name, like the light and dark `theme-color`, can't go thr
|
|
|
88
96
|
`workers-start/workers` reaches `cloudflare:workers` lazily, so the same module works in the Worker, in vitest and in the client bundle.
|
|
89
97
|
|
|
90
98
|
```ts
|
|
91
|
-
import {
|
|
99
|
+
import {
|
|
100
|
+
afterResponse,
|
|
101
|
+
getBinding,
|
|
102
|
+
getEnvString,
|
|
103
|
+
isKvNamespace,
|
|
104
|
+
} from "workers-start/workers";
|
|
92
105
|
|
|
93
106
|
const kv = await getBinding("CACHE_KV", isKvNamespace); // null outside workerd
|
|
94
107
|
const key = await getEnvString("API_KEY"); // Worker env, then process.env
|
|
@@ -116,16 +129,7 @@ Run it between the build and the deploy:
|
|
|
116
129
|
|
|
117
130
|
It reads every value in your local `.env*` and `.dev.vars*` files (not `.example` or `.tpl` templates, and not `op://` references) and fails if any of them appears in a built file. It parses dotenv the way dotenv does, and searches for each value raw, URL-encoded, JSON-escaped and base64-encoded, inside `.gz` and `.br` files too. Symlinks are skipped. `VITE_*` keys are public by design and ignored.
|
|
118
131
|
|
|
119
|
-
It skips `server/.dev.vars` inside the build directory, which wrangler never uploads. Flags: `--dist <dir>` (repeatable; default `dist`, `out` for a static site), `--root <dir
|
|
120
|
-
|
|
121
|
-
## Biome preset
|
|
122
|
-
|
|
123
|
-
```jsonc
|
|
124
|
-
// biome.jsonc
|
|
125
|
-
{ "extends": ["workers-start/biome"] }
|
|
126
|
-
```
|
|
127
|
-
|
|
128
|
-
Biome's recommended rules plus `useTopLevelRegex`, Tailwind directives in CSS, and sorted imports and JSX attributes. It turns `noDangerouslySetInnerHtml` off everywhere, because the inline scripts above need it. Biome 2.6 or later.
|
|
132
|
+
It skips `server/.dev.vars` inside the build directory, which wrangler never uploads. Flags: `--dist <dir>` (repeatable; default `dist`, `out` for a static site), `--root <dir>` (the base the other paths resolve against), `--env-dir <dir>` (repeatable; where the env files are, default `--root`; in a monorepo package, `--env-dir . --env-dir ../..` reads the package's and the root's), `--skip <path inside the build>`, `--allow <KEY>` for another public value, `--public-prefix <PREFIX>` for a whole family of them (for example `NEXT_PUBLIC_` in an app that kept its Next.js variable names).
|
|
129
133
|
|
|
130
134
|
## License
|
|
131
135
|
|
package/dist/accept.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"accept.d.ts","sourceRoot":"","sources":["../src/accept.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,MAAM,WAAW,UAAU;IACzB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,CAAC,EAAE,MAAM,CAAC;CACX;AAED,+FAA+F;AAC/F,wBAAgB,WAAW,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,GAAG,UAAU,EAAE,CAsB3E;AAED;;;GAGG;AACH,wBAAgB,OAAO,CACrB,MAAM,EAAE,SAAS,UAAU,EAAE,EAC7B,SAAS,EAAE,MAAM,EACjB,OAAO,GAAE;IAAE,SAAS,CAAC,EAAE,OAAO,CAAA;CAAO,GACpC,MAAM,
|
|
1
|
+
{"version":3,"file":"accept.d.ts","sourceRoot":"","sources":["../src/accept.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,MAAM,WAAW,UAAU;IACzB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,CAAC,EAAE,MAAM,CAAC;CACX;AAED,+FAA+F;AAC/F,wBAAgB,WAAW,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,GAAG,UAAU,EAAE,CAsB3E;AAED;;;GAGG;AACH,wBAAgB,OAAO,CACrB,MAAM,EAAE,SAAS,UAAU,EAAE,EAC7B,SAAS,EAAE,MAAM,EACjB,OAAO,GAAE;IAAE,SAAS,CAAC,EAAE,OAAO,CAAA;CAAO,GACpC,MAAM,CA2BR"}
|
package/dist/accept.js
CHANGED
|
@@ -38,10 +38,14 @@ export function quality(ranges, mediaType, options = {}) {
|
|
|
38
38
|
if (range.type === type && range.subtype === subtype) {
|
|
39
39
|
specificity = 2;
|
|
40
40
|
}
|
|
41
|
-
else if (!options.exactOnly &&
|
|
41
|
+
else if (!options.exactOnly &&
|
|
42
|
+
range.type === type &&
|
|
43
|
+
range.subtype === "*") {
|
|
42
44
|
specificity = 1;
|
|
43
45
|
}
|
|
44
|
-
else if (!options.exactOnly &&
|
|
46
|
+
else if (!options.exactOnly &&
|
|
47
|
+
range.type === "*" &&
|
|
48
|
+
range.subtype === "*") {
|
|
45
49
|
specificity = 0;
|
|
46
50
|
}
|
|
47
51
|
if (specificity > best) {
|
package/dist/accept.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"accept.js","sourceRoot":"","sources":["../src/accept.ts"],"names":[],"mappings":"AAAA;;GAEG;AAQH,+FAA+F;AAC/F,MAAM,UAAU,WAAW,CAAC,MAAiC;IAC3D,IAAI,CAAC,MAAM,EAAE,IAAI,EAAE,EAAE,CAAC;QACpB,OAAO,CAAC,EAAE,IAAI,EAAE,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;IAC7C,CAAC;IACD,MAAM,MAAM,GAAiB,EAAE,CAAC;IAChC,KAAK,MAAM,IAAI,IAAI,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC;QACrC,MAAM,CAAC,KAAK,GAAG,EAAE,EAAE,GAAG,MAAM,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;QACrE,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,GAAG,KAAK,CAAC,WAAW,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACvD,IAAI,CAAC,CAAC,IAAI,IAAI,OAAO,CAAC,EAAE,CAAC;YACvB,SAAS;QACX,CAAC;QACD,IAAI,CAAC,GAAG,CAAC,CAAC;QACV,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;YAC3B,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,GAAG,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;YAC3D,IAAI,GAAG,EAAE,WAAW,EAAE,KAAK,GAAG,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;gBACtD,MAAM,MAAM,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC;gBAC7B,CAAC,GAAG,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YACrE,CAAC;QACH,CAAC;QACD,MAAM,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,EAAE,CAAC,CAAC;IACpC,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,OAAO,CACrB,MAA6B,EAC7B,SAAiB,EACjB,OAAO,GAA4B,EAAE;IAErC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,GAAG,SAAS,CAAC,WAAW,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAC3D,IAAI,IAAI,GAAG,CAAC,CAAC,CAAC;IACd,IAAI,CAAC,GAAG,CAAC,CAAC;IACV,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;QAC3B,IAAI,WAAW,GAAG,CAAC,CAAC,CAAC;QACrB,IAAI,KAAK,CAAC,IAAI,KAAK,IAAI,IAAI,KAAK,CAAC,OAAO,KAAK,OAAO,EAAE,CAAC;YACrD,WAAW,GAAG,CAAC,CAAC;QAClB,CAAC;aAAM,
|
|
1
|
+
{"version":3,"file":"accept.js","sourceRoot":"","sources":["../src/accept.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
#!/usr/bin/env node
|
|
2
2
|
/**
|
|
3
|
-
* workers-start-check-bundle [--dist dir ...] [--root dir] [--skip path ...] [--allow KEY ...] [--public-prefix PREFIX ...]
|
|
3
|
+
* workers-start-check-bundle [--dist dir ...] [--root dir] [--env-dir dir ...] [--skip path ...] [--allow KEY ...] [--public-prefix PREFIX ...]
|
|
4
4
|
*
|
|
5
5
|
* Exits 1 if any local env value appears in a built file. Run it between the
|
|
6
6
|
* build and the deploy.
|
package/dist/check-bundle-cli.js
CHANGED
|
@@ -1,16 +1,19 @@
|
|
|
1
1
|
#!/usr/bin/env node
|
|
2
2
|
/**
|
|
3
|
-
* workers-start-check-bundle [--dist dir ...] [--root dir] [--skip path ...] [--allow KEY ...] [--public-prefix PREFIX ...]
|
|
3
|
+
* workers-start-check-bundle [--dist dir ...] [--root dir] [--env-dir dir ...] [--skip path ...] [--allow KEY ...] [--public-prefix PREFIX ...]
|
|
4
4
|
*
|
|
5
5
|
* Exits 1 if any local env value appears in a built file. Run it between the
|
|
6
6
|
* build and the deploy.
|
|
7
7
|
*/
|
|
8
8
|
import { relative, resolve } from "node:path";
|
|
9
|
-
import { checkBundle, DEFAULT_PUBLIC_PREFIXES, DEFAULT_SKIP } from "./check-bundle.js";
|
|
9
|
+
import { checkBundle, DEFAULT_PUBLIC_PREFIXES, DEFAULT_SKIP, } from "./check-bundle.js";
|
|
10
10
|
const USAGE = `Usage: workers-start-check-bundle [options]
|
|
11
11
|
|
|
12
12
|
--dist <dir> Build directory to scan, relative to --root. Repeatable. Default: dist
|
|
13
|
-
--root <dir>
|
|
13
|
+
--root <dir> Base for the other paths. Default: .
|
|
14
|
+
--env-dir <dir>
|
|
15
|
+
Directory holding .env and .dev.vars files, relative to --root.
|
|
16
|
+
Repeatable, for a package and its monorepo root. Default: --root
|
|
14
17
|
--skip <path> Path inside a build directory that never ships. Repeatable.
|
|
15
18
|
Always skipped: ${DEFAULT_SKIP.join(", ")}
|
|
16
19
|
--allow <KEY> Env key whose value is public. Repeatable.
|
|
@@ -20,6 +23,7 @@ const USAGE = `Usage: workers-start-check-bundle [options]
|
|
|
20
23
|
function parseArgs(argv) {
|
|
21
24
|
const args = {
|
|
22
25
|
dists: [],
|
|
26
|
+
envDirs: [],
|
|
23
27
|
root: ".",
|
|
24
28
|
skip: [...DEFAULT_SKIP],
|
|
25
29
|
allow: [],
|
|
@@ -32,7 +36,12 @@ function parseArgs(argv) {
|
|
|
32
36
|
process.exit(0);
|
|
33
37
|
}
|
|
34
38
|
const value = argv[i + 1];
|
|
35
|
-
if (!(flag === "--dist" ||
|
|
39
|
+
if (!(flag === "--dist" ||
|
|
40
|
+
flag === "--root" ||
|
|
41
|
+
flag === "--env-dir" ||
|
|
42
|
+
flag === "--skip" ||
|
|
43
|
+
flag === "--allow" ||
|
|
44
|
+
flag === "--public-prefix")) {
|
|
36
45
|
throw new Error(`Unknown argument: ${flag}\n\n${USAGE}`);
|
|
37
46
|
}
|
|
38
47
|
if (value === undefined || value.startsWith("--")) {
|
|
@@ -43,6 +52,8 @@ function parseArgs(argv) {
|
|
|
43
52
|
args.dists.push(value);
|
|
44
53
|
else if (flag === "--root")
|
|
45
54
|
args.root = value;
|
|
55
|
+
else if (flag === "--env-dir")
|
|
56
|
+
args.envDirs.push(value);
|
|
46
57
|
else if (flag === "--skip")
|
|
47
58
|
args.skip.push(value.replace(/^\.?\//, ""));
|
|
48
59
|
else if (flag === "--allow")
|
|
@@ -53,13 +64,17 @@ function parseArgs(argv) {
|
|
|
53
64
|
if (args.dists.length === 0) {
|
|
54
65
|
args.dists.push("dist");
|
|
55
66
|
}
|
|
67
|
+
if (args.envDirs.length === 0) {
|
|
68
|
+
args.envDirs.push(".");
|
|
69
|
+
}
|
|
56
70
|
return args;
|
|
57
71
|
}
|
|
58
72
|
function main() {
|
|
59
73
|
const args = parseArgs(process.argv.slice(2));
|
|
60
74
|
const root = resolve(args.root);
|
|
61
75
|
const dists = args.dists.map((dist) => resolve(root, dist));
|
|
62
|
-
const
|
|
76
|
+
const envDirs = args.envDirs.map((dir) => resolve(root, dir));
|
|
77
|
+
const result = checkBundle(envDirs, dists, {
|
|
63
78
|
skip: args.skip,
|
|
64
79
|
allow: args.allow,
|
|
65
80
|
publicPrefixes: args.publicPrefixes,
|
|
@@ -72,7 +87,9 @@ function main() {
|
|
|
72
87
|
for (const key of result.leaked) {
|
|
73
88
|
console.error(` ${key}`);
|
|
74
89
|
}
|
|
75
|
-
const where = dists
|
|
90
|
+
const where = dists
|
|
91
|
+
.map((dist) => `${relative(process.cwd(), dist) || "."}/`)
|
|
92
|
+
.join(", ");
|
|
76
93
|
console.error(`\n Find where it is read at build time (import.meta.env, define, a module-scope\n process.env read) under ${where} and fix that. If the value is meant to be\n public, pass --allow <KEY> or --public-prefix <PREFIX>.\n`);
|
|
77
94
|
process.exit(1);
|
|
78
95
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"check-bundle-cli.js","sourceRoot":"","sources":["../src/check-bundle-cli.ts"],"names":[],"mappings":";AACA;;;;;GAKG;AAEH,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAC9C,OAAO,
|
|
1
|
+
{"version":3,"file":"check-bundle-cli.js","sourceRoot":"","sources":["../src/check-bundle-cli.ts"],"names":[],"mappings":"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"}
|
package/dist/check-bundle.d.ts
CHANGED
|
@@ -31,8 +31,8 @@ export interface LeakOptions {
|
|
|
31
31
|
}
|
|
32
32
|
/** The env keys whose values appear, in any encoding, in any of the given file contents. */
|
|
33
33
|
export declare function leakedKeys(pairs: [string, string][], contents: string[], options?: LeakOptions): string[];
|
|
34
|
-
/** Every KEY=value pair in the local env files of
|
|
35
|
-
export declare function localEnvPairs(
|
|
34
|
+
/** Every KEY=value pair in the local env files of one or more directories. */
|
|
35
|
+
export declare function localEnvPairs(dirs: string | readonly string[]): [string, string][];
|
|
36
36
|
/**
|
|
37
37
|
* Every regular file under `dir`, recursively. Symlinks are skipped, so the
|
|
38
38
|
* walk never loops or leaves the directory. `skip` holds paths relative to
|
|
@@ -49,6 +49,9 @@ export interface CheckResult {
|
|
|
49
49
|
export interface CheckOptions extends LeakOptions {
|
|
50
50
|
skip?: readonly string[];
|
|
51
51
|
}
|
|
52
|
-
/**
|
|
53
|
-
|
|
52
|
+
/**
|
|
53
|
+
* Scan one or more build directories against the local env files in one or
|
|
54
|
+
* more directories, such as a package and its monorepo root.
|
|
55
|
+
*/
|
|
56
|
+
export declare function checkBundle(envDirs: string | readonly string[], dists: string | readonly string[], options?: CheckOptions): CheckResult;
|
|
54
57
|
//# sourceMappingURL=check-bundle.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"check-bundle.d.ts","sourceRoot":"","sources":["../src/check-bundle.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAMH,uEAAuE;AACvE,eAAO,MAAM,iBAAiB,KAAK,CAAC;AAEpC;;;GAGG;AACH,eAAO,MAAM,YAAY,UAAuB,CAAC;AAEjD,6DAA6D;AAC7D,eAAO,MAAM,uBAAuB,UAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"check-bundle.d.ts","sourceRoot":"","sources":["../src/check-bundle.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAMH,uEAAuE;AACvE,eAAO,MAAM,iBAAiB,KAAK,CAAC;AAEpC;;;GAGG;AACH,eAAO,MAAM,YAAY,UAAuB,CAAC;AAEjD,6DAA6D;AAC7D,eAAO,MAAM,uBAAuB,UAAY,CAAC;AAcjD;;;;GAIG;AACH,wBAAgB,YAAY,CAAC,MAAM,EAAE,MAAM,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,CA+B/D;AAiBD,kEAAkE;AAClE,wBAAgB,SAAS,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,EAAE,CASjD;AAED,MAAM,WAAW,WAAW;IAC1B,qDAAqD;IACrD,KAAK,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;IAC1B,iEAAiE;IACjE,cAAc,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;CACpC;AAED,4FAA4F;AAC5F,wBAAgB,UAAU,CACxB,KAAK,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,EACzB,QAAQ,EAAE,MAAM,EAAE,EAClB,OAAO,GAAE,WAAgB,GACxB,MAAM,EAAE,CAmBV;AAED,8EAA8E;AAC9E,wBAAgB,aAAa,CAC3B,IAAI,EAAE,MAAM,GAAG,SAAS,MAAM,EAAE,GAC/B,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,CAMpB;AAED;;;;GAIG;AACH,wBAAgB,SAAS,CACvB,GAAG,EAAE,MAAM,EACX,IAAI,GAAE,SAAS,MAAM,EAAiB,GACrC,MAAM,EAAE,CAqBV;AAED,kEAAkE;AAClE,wBAAgB,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAU9C;AAED,MAAM,WAAW,WAAW;IAC1B,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,EAAE,CAAC;CAClB;AAED,MAAM,WAAW,YAAa,SAAQ,WAAW;IAC/C,IAAI,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;CAC1B;AAED;;;GAGG;AACH,wBAAgB,WAAW,CACzB,OAAO,EAAE,MAAM,GAAG,SAAS,MAAM,EAAE,EACnC,KAAK,EAAE,MAAM,GAAG,SAAS,MAAM,EAAE,EACjC,OAAO,GAAE,YAAiB,GACzB,WAAW,CAkBb"}
|
package/dist/check-bundle.js
CHANGED
|
@@ -22,7 +22,13 @@ const ENV_FILE = /^(\.env(\..+)?|\.dev\.vars(\..+)?)$/;
|
|
|
22
22
|
const NOT_SECRETS = /\.(example|sample|template|tpl)$/;
|
|
23
23
|
const KEY = /^\s*(?:export\s+)?([A-Za-z_][A-Za-z0-9_.-]*)\s*=\s*(.*)$/;
|
|
24
24
|
const INLINE_COMMENT = /\s+#.*$/;
|
|
25
|
-
const ESCAPES = {
|
|
25
|
+
const ESCAPES = {
|
|
26
|
+
n: "\n",
|
|
27
|
+
r: "\r",
|
|
28
|
+
t: "\t",
|
|
29
|
+
'"': '"',
|
|
30
|
+
"\\": "\\",
|
|
31
|
+
};
|
|
26
32
|
/**
|
|
27
33
|
* KEY=value pairs from a dotenv file, parsed the way dotenv does: `#`
|
|
28
34
|
* comments, inline ` #` comments on unquoted values, single quotes taken
|
|
@@ -48,7 +54,12 @@ export function parseEnvFile(source) {
|
|
|
48
54
|
}
|
|
49
55
|
const end = closingQuoteIndex(body, quote);
|
|
50
56
|
raw = end === -1 ? body : body.slice(0, end);
|
|
51
|
-
pairs.push([
|
|
57
|
+
pairs.push([
|
|
58
|
+
key,
|
|
59
|
+
quote === '"'
|
|
60
|
+
? raw.replace(/\\(.)/g, (m, c) => ESCAPES[c] ?? m)
|
|
61
|
+
: raw,
|
|
62
|
+
]);
|
|
52
63
|
}
|
|
53
64
|
else {
|
|
54
65
|
pairs.push([key, raw.replace(INLINE_COMMENT, "").trim()]);
|
|
@@ -89,7 +100,8 @@ export function leakedKeys(pairs, contents, options = {}) {
|
|
|
89
100
|
if (value.length < MIN_SECRET_LENGTH || value.startsWith("op://")) {
|
|
90
101
|
continue;
|
|
91
102
|
}
|
|
92
|
-
if (options.allow?.includes(key) ||
|
|
103
|
+
if (options.allow?.includes(key) ||
|
|
104
|
+
publicPrefixes.some((prefix) => key.startsWith(prefix))) {
|
|
93
105
|
continue;
|
|
94
106
|
}
|
|
95
107
|
const forms = encodings(value);
|
|
@@ -99,11 +111,11 @@ export function leakedKeys(pairs, contents, options = {}) {
|
|
|
99
111
|
}
|
|
100
112
|
return [...leaked].sort();
|
|
101
113
|
}
|
|
102
|
-
/** Every KEY=value pair in the local env files of
|
|
103
|
-
export function localEnvPairs(
|
|
104
|
-
return readdirSync(dir)
|
|
114
|
+
/** Every KEY=value pair in the local env files of one or more directories. */
|
|
115
|
+
export function localEnvPairs(dirs) {
|
|
116
|
+
return (typeof dirs === "string" ? [dirs] : dirs).flatMap((dir) => readdirSync(dir)
|
|
105
117
|
.filter((name) => ENV_FILE.test(name) && !NOT_SECRETS.test(name))
|
|
106
|
-
.flatMap((name) => parseEnvFile(readFileSync(join(dir, name), "utf8")));
|
|
118
|
+
.flatMap((name) => parseEnvFile(readFileSync(join(dir, name), "utf8"))));
|
|
107
119
|
}
|
|
108
120
|
/**
|
|
109
121
|
* Every regular file under `dir`, recursively. Symlinks are skipped, so the
|
|
@@ -122,7 +134,8 @@ export function listFiles(dir, skip = DEFAULT_SKIP) {
|
|
|
122
134
|
if (stat.isDirectory()) {
|
|
123
135
|
walk(path);
|
|
124
136
|
}
|
|
125
|
-
else if (stat.isFile() &&
|
|
137
|
+
else if (stat.isFile() &&
|
|
138
|
+
!skip.includes(relative(dir, path).split(sep).join("/"))) {
|
|
126
139
|
files.push(path);
|
|
127
140
|
}
|
|
128
141
|
}
|
|
@@ -144,15 +157,23 @@ export function readBuilt(path) {
|
|
|
144
157
|
}
|
|
145
158
|
return bytes.toString("latin1");
|
|
146
159
|
}
|
|
147
|
-
/**
|
|
148
|
-
|
|
160
|
+
/**
|
|
161
|
+
* Scan one or more build directories against the local env files in one or
|
|
162
|
+
* more directories, such as a package and its monorepo root.
|
|
163
|
+
*/
|
|
164
|
+
export function checkBundle(envDirs, dists, options = {}) {
|
|
149
165
|
const dirs = typeof dists === "string" ? [dists] : dists;
|
|
150
166
|
for (const dir of dirs) {
|
|
151
167
|
if (!existsSync(dir)) {
|
|
152
168
|
throw new Error(`${dir} does not exist. Build first.`);
|
|
153
169
|
}
|
|
154
170
|
}
|
|
155
|
-
const
|
|
171
|
+
for (const dir of typeof envDirs === "string" ? [envDirs] : envDirs) {
|
|
172
|
+
if (!existsSync(dir)) {
|
|
173
|
+
throw new Error(`Env directory ${dir} does not exist.`);
|
|
174
|
+
}
|
|
175
|
+
}
|
|
176
|
+
const pairs = localEnvPairs(envDirs);
|
|
156
177
|
const files = dirs.flatMap((dir) => listFiles(dir, options.skip ?? DEFAULT_SKIP));
|
|
157
178
|
const leaked = leakedKeys(pairs, files.map(readBuilt), options);
|
|
158
179
|
return { envValues: pairs.length, files: files.length, leaked };
|
package/dist/check-bundle.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"check-bundle.js","sourceRoot":"","sources":["../src/check-bundle.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAC3E,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,GAAG,EAAE,MAAM,WAAW,CAAC;AAChD,OAAO,EAAE,oBAAoB,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AAE7D,uEAAuE;AACvE,MAAM,CAAC,MAAM,iBAAiB,GAAG,EAAE,CAAC;AAEpC;;;GAGG;AACH,MAAM,CAAC,MAAM,YAAY,GAAG,CAAC,kBAAkB,CAAC,CAAC;AAEjD,6DAA6D;AAC7D,MAAM,CAAC,MAAM,uBAAuB,GAAG,CAAC,OAAO,CAAC,CAAC;AAEjD,MAAM,QAAQ,GAAG,qCAAqC,CAAC;AACvD,MAAM,WAAW,GAAG,kCAAkC,CAAC;AACvD,MAAM,GAAG,GAAG,0DAA0D,CAAC;AACvE,MAAM,cAAc,GAAG,SAAS,CAAC;AACjC,MAAM,OAAO,GAA2B,
|
|
1
|
+
{"version":3,"file":"check-bundle.js","sourceRoot":"","sources":["../src/check-bundle.ts"],"names":[],"mappings":"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"}
|
package/dist/entry.d.ts
CHANGED
|
@@ -17,6 +17,11 @@ export type MarkdownResult = string | {
|
|
|
17
17
|
body: string;
|
|
18
18
|
status?: number;
|
|
19
19
|
} | null | undefined;
|
|
20
|
+
/** What the Markdown renderer can reach besides the path and request. */
|
|
21
|
+
export interface MarkdownPage {
|
|
22
|
+
/** The page rendered by the handler with `Accept: text/html`, the extra fetch arguments passed through. */
|
|
23
|
+
html(): Promise<Response>;
|
|
24
|
+
}
|
|
20
25
|
export interface FetchHandler {
|
|
21
26
|
fetch(request: Request, ...rest: any[]): MaybePromise<Response>;
|
|
22
27
|
}
|
|
@@ -27,9 +32,10 @@ export interface EntryOptions {
|
|
|
27
32
|
* Markdown rendering of a page. Called for GET and HEAD page requests that
|
|
28
33
|
* prefer text/markdown, with the decoded path, no trailing slash. Return
|
|
29
34
|
* null to serve HTML instead. If it throws, the error is logged and HTML is
|
|
30
|
-
* served.
|
|
35
|
+
* served. `page.html()` renders the same request through the handler as
|
|
36
|
+
* HTML, for a renderer that converts the page instead of building it.
|
|
31
37
|
*/
|
|
32
|
-
markdown?: (path: string, request: Request) => MaybePromise<MarkdownResult>;
|
|
38
|
+
markdown?: (path: string, request: Request, page: MarkdownPage) => MaybePromise<MarkdownResult>;
|
|
33
39
|
/**
|
|
34
40
|
* Path prefixes that only accept GET, HEAD and OPTIONS. Matched by segment,
|
|
35
41
|
* case-insensitively, after decoding: `/api` covers `/api`, `/api/x` and
|
package/dist/entry.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"entry.d.ts","sourceRoot":"","sources":["../src/entry.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAIH,KAAK,YAAY,CAAC,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;AAEtC,6FAA6F;AAC7F,MAAM,MAAM,cAAc,
|
|
1
|
+
{"version":3,"file":"entry.d.ts","sourceRoot":"","sources":["../src/entry.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAIH,KAAK,YAAY,CAAC,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;AAEtC,6FAA6F;AAC7F,MAAM,MAAM,cAAc,GACtB,MAAM,GACN;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,MAAM,CAAC,EAAE,MAAM,CAAA;CAAE,GACjC,IAAI,GACJ,SAAS,CAAC;AAEd,yEAAyE;AACzE,MAAM,WAAW,YAAY;IAC3B,2GAA2G;IAC3G,IAAI,IAAI,OAAO,CAAC,QAAQ,CAAC,CAAC;CAC3B;AAED,MAAM,WAAW,YAAY;IAE3B,KAAK,CAAC,OAAO,EAAE,OAAO,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE,GAAG,YAAY,CAAC,QAAQ,CAAC,CAAC;CACjE;AAED,MAAM,WAAW,YAAY;IAC3B,iGAAiG;IACjG,OAAO,EAAE,YAAY,CAAC;IACtB;;;;;;OAMG;IACH,QAAQ,CAAC,EAAE,CACT,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,OAAO,EAChB,IAAI,EAAE,YAAY,KACf,YAAY,CAAC,cAAc,CAAC,CAAC;IAClC;;;;OAIG;IACH,gBAAgB,CAAC,EAAE,MAAM,EAAE,CAAC;IAC5B,8FAA8F;IAC9F,MAAM,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC;CACpC;AAeD,eAAO,MAAM,gBAAgB,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAO7D,CAAC;AAEF;;;GAGG;AACH,wBAAgB,aAAa,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAIvD;AAED,wBAAgB,WAAW,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAErD;AAED;;;;GAIG;AACH,wBAAgB,aAAa,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAStD;AAED,+EAA+E;AAC/E,wBAAgB,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAIjE;AAED;;;;;GAKG;AACH,wBAAgB,aAAa,CAC3B,IAAI,EAAE,MAAM,EACZ,gBAAgB,GAAE,SAAS,MAAM,EAAa,GAC7C,OAAO,CAWT;AAED,6FAA6F;AAC7F,wBAAgB,SAAS,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,CASxE;AAqCD,wBAAgB,WAAW,CAAC,OAAO,EAAE,YAAY,GAAG;IAClD,KAAK,CAAC,OAAO,EAAE,OAAO,EAAE,GAAG,IAAI,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;CAChE,CAuDA"}
|
package/dist/entry.js
CHANGED
|
@@ -14,7 +14,13 @@
|
|
|
14
14
|
import { parseAccept, quality } from "./accept.js";
|
|
15
15
|
/** Last-segment extensions that mark a file rather than a page. */
|
|
16
16
|
const FILE_EXTENSION = /\.(?:js|mjs|cjs|css|map|json|xml|txt|md|csv|ico|png|jpe?g|gif|svg|webp|avif|bmp|woff2?|ttf|otf|eot|pdf|mp[34]|webm|wav|ogg|zip|gz|br|wasm|webmanifest|html?|rss|atom)$/i;
|
|
17
|
-
const DEV_INTERNALS = [
|
|
17
|
+
const DEV_INTERNALS = [
|
|
18
|
+
"/@vite/",
|
|
19
|
+
"/@fs/",
|
|
20
|
+
"/@id/",
|
|
21
|
+
"/@react-refresh",
|
|
22
|
+
"/node_modules/",
|
|
23
|
+
];
|
|
18
24
|
const DUPLICATE_SLASHES = /\/{2,}/g;
|
|
19
25
|
const TRAILING_SLASHES = /\/+$/;
|
|
20
26
|
export const MARKDOWN_HEADERS = Object.freeze({
|
|
@@ -67,7 +73,8 @@ export function defaultIsPage(path, readOnlyPrefixes = ["/api"]) {
|
|
|
67
73
|
if (readOnlyPrefixes.some((prefix) => underPrefix(path, prefix))) {
|
|
68
74
|
return false;
|
|
69
75
|
}
|
|
70
|
-
if (path.startsWith("/_") ||
|
|
76
|
+
if (path.startsWith("/_") ||
|
|
77
|
+
DEV_INTERNALS.some((prefix) => path.startsWith(prefix))) {
|
|
71
78
|
return false;
|
|
72
79
|
}
|
|
73
80
|
return !FILE_EXTENSION.test(path);
|
|
@@ -87,7 +94,15 @@ const NULL_BODY_STATUS = new Set([101, 204, 205, 304]);
|
|
|
87
94
|
function markdownResponse(result, head) {
|
|
88
95
|
const { body, status = 200 } = typeof result === "string" ? { body: result } : result;
|
|
89
96
|
const noBody = head || NULL_BODY_STATUS.has(status);
|
|
90
|
-
return new Response(noBody ? null : body, {
|
|
97
|
+
return new Response(noBody ? null : body, {
|
|
98
|
+
status,
|
|
99
|
+
headers: MARKDOWN_HEADERS,
|
|
100
|
+
});
|
|
101
|
+
}
|
|
102
|
+
function withAcceptHtml(request) {
|
|
103
|
+
const headers = new Headers(request.headers);
|
|
104
|
+
headers.set("accept", "text/html");
|
|
105
|
+
return new Request(request, { headers });
|
|
91
106
|
}
|
|
92
107
|
function withVaryAccept(response) {
|
|
93
108
|
const vary = mergeVary(response.headers.get("vary"), "Accept");
|
|
@@ -96,7 +111,11 @@ function withVaryAccept(response) {
|
|
|
96
111
|
}
|
|
97
112
|
const headers = new Headers(response.headers);
|
|
98
113
|
headers.set("vary", vary);
|
|
99
|
-
return new Response(response.body, {
|
|
114
|
+
return new Response(response.body, {
|
|
115
|
+
status: response.status,
|
|
116
|
+
statusText: response.statusText,
|
|
117
|
+
headers,
|
|
118
|
+
});
|
|
100
119
|
}
|
|
101
120
|
export function createEntry(options) {
|
|
102
121
|
const readOnlyPrefixes = options.readOnlyPrefixes ?? ["/api"];
|
|
@@ -108,7 +127,10 @@ export function createEntry(options) {
|
|
|
108
127
|
const isRead = method === "GET" || method === "HEAD";
|
|
109
128
|
if (readOnlyPrefixes.some((prefix) => underPrefix(path, prefix))) {
|
|
110
129
|
if (method === "OPTIONS") {
|
|
111
|
-
return new Response(null, {
|
|
130
|
+
return new Response(null, {
|
|
131
|
+
status: 204,
|
|
132
|
+
headers: { allow: "GET, HEAD, OPTIONS" },
|
|
133
|
+
});
|
|
112
134
|
}
|
|
113
135
|
if (!isRead) {
|
|
114
136
|
return Response.json({ error: "Method not allowed" }, { status: 405, headers: { allow: "GET, HEAD, OPTIONS" } });
|
|
@@ -120,7 +142,9 @@ export function createEntry(options) {
|
|
|
120
142
|
}
|
|
121
143
|
if (options.markdown && wantsMarkdown(request)) {
|
|
122
144
|
try {
|
|
123
|
-
const result = await options.markdown(path, request
|
|
145
|
+
const result = await options.markdown(path, request, {
|
|
146
|
+
html: async () => options.handler.fetch(withAcceptHtml(request), ...rest),
|
|
147
|
+
});
|
|
124
148
|
if (result !== null && result !== undefined) {
|
|
125
149
|
return markdownResponse(result, method === "HEAD");
|
|
126
150
|
}
|
|
@@ -129,12 +153,9 @@ export function createEntry(options) {
|
|
|
129
153
|
console.error("workers-start: markdown renderer failed, serving HTML", error);
|
|
130
154
|
}
|
|
131
155
|
}
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
headers.set("accept", "text/html");
|
|
136
|
-
pageRequest = new Request(request, { headers });
|
|
137
|
-
}
|
|
156
|
+
const pageRequest = acceptsHtml(request)
|
|
157
|
+
? request
|
|
158
|
+
: withAcceptHtml(request);
|
|
138
159
|
const response = await options.handler.fetch(pageRequest, ...rest);
|
|
139
160
|
return options.markdown ? withVaryAccept(response) : response;
|
|
140
161
|
},
|
package/dist/entry.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"entry.js","sourceRoot":"","sources":["../src/entry.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAEH,OAAO,EAAE,WAAW,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"entry.js","sourceRoot":"","sources":["../src/entry.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAEH,OAAO,EAAE,WAAW,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AA+CnD,mEAAmE;AACnE,MAAM,cAAc,GAClB,yKAAyK,CAAC;AAC5K,MAAM,aAAa,GAAG;IACpB,SAAS;IACT,OAAO;IACP,OAAO;IACP,iBAAiB;IACjB,gBAAgB;CACjB,CAAC;AACF,MAAM,iBAAiB,GAAG,SAAS,CAAC;AACpC,MAAM,gBAAgB,GAAG,MAAM,CAAC;AAEhC,MAAM,CAAC,MAAM,gBAAgB,GAAqC,MAAM,CAAC,MAAM,CAC7E;IACE,cAAc,EAAE,8BAA8B;IAC9C,IAAI,EAAE,QAAQ;IACd,+EAA+E;IAC/E,cAAc,EAAE,SAAS;CAC1B,CACF,CAAC;AAEF;;;GAGG;AACH,MAAM,UAAU,aAAa,CAAC,OAAgB;IAC5C,MAAM,MAAM,GAAG,WAAW,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC;IAC1D,MAAM,QAAQ,GAAG,OAAO,CAAC,MAAM,EAAE,eAAe,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IACvE,OAAO,QAAQ,GAAG,CAAC,IAAI,QAAQ,IAAI,OAAO,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;AAClE,CAAC;AAED,MAAM,UAAU,WAAW,CAAC,OAAgB;IAC1C,OAAO,OAAO,CAAC,WAAW,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,EAAE,WAAW,CAAC,GAAG,CAAC,CAAC;AAC9E,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,aAAa,CAAC,QAAgB;IAC5C,IAAI,IAAI,GAAG,QAAQ,CAAC;IACpB,IAAI,CAAC;QACH,IAAI,GAAG,kBAAkB,CAAC,QAAQ,CAAC,CAAC;IACtC,CAAC;IAAC,MAAM,CAAC;QACP,4CAA4C;IAC9C,CAAC;IACD,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,iBAAiB,EAAE,GAAG,CAAC,CAAC;IAC5C,OAAO,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,gBAAgB,EAAE,EAAE,CAAC,IAAI,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC;AAC5E,CAAC;AAED,+EAA+E;AAC/E,MAAM,UAAU,WAAW,CAAC,IAAY,EAAE,MAAc;IACtD,MAAM,CAAC,GAAG,IAAI,CAAC,WAAW,EAAE,CAAC;IAC7B,MAAM,IAAI,GAAG,MAAM,CAAC,WAAW,EAAE,CAAC,OAAO,CAAC,gBAAgB,EAAE,EAAE,CAAC,CAAC;IAChE,OAAO,IAAI,KAAK,EAAE,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC,CAAC,UAAU,CAAC,GAAG,IAAI,GAAG,CAAC,CAAC;AAC/D,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,aAAa,CAC3B,IAAY,EACZ,gBAAgB,GAAsB,CAAC,MAAM,CAAC;IAE9C,IAAI,gBAAgB,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,WAAW,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,EAAE,CAAC;QACjE,OAAO,KAAK,CAAC;IACf,CAAC;IACD,IACE,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC;QACrB,aAAa,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,EACvD,CAAC;QACD,OAAO,KAAK,CAAC;IACf,CAAC;IACD,OAAO,CAAC,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AACpC,CAAC;AAED,6FAA6F;AAC7F,MAAM,UAAU,SAAS,CAAC,QAAuB,EAAE,KAAa;IAC9D,IAAI,CAAC,QAAQ,EAAE,IAAI,EAAE,EAAE,CAAC;QACtB,OAAO,KAAK,CAAC;IACf,CAAC;IACD,MAAM,MAAM,GAAG,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC,CAAC;IACtE,IAAI,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,WAAW,EAAE,CAAC,EAAE,CAAC;QACjE,OAAO,QAAQ,CAAC;IAClB,CAAC;IACD,OAAO,GAAG,QAAQ,KAAK,KAAK,EAAE,CAAC;AACjC,CAAC;AAED,MAAM,gBAAgB,GAAG,IAAI,GAAG,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC;AAEvD,SAAS,gBAAgB,CACvB,MAAiD,EACjD,IAAa;IAEb,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,GAAG,EAAE,GAC1B,OAAO,MAAM,KAAK,QAAQ,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC;IACzD,MAAM,MAAM,GAAG,IAAI,IAAI,gBAAgB,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;IACpD,OAAO,IAAI,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,EAAE;QACxC,MAAM;QACN,OAAO,EAAE,gBAAgB;KAC1B,CAAC,CAAC;AACL,CAAC;AAED,SAAS,cAAc,CAAC,OAAgB;IACtC,MAAM,OAAO,GAAG,IAAI,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IAC7C,OAAO,CAAC,GAAG,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAC;IACnC,OAAO,IAAI,OAAO,CAAC,OAAO,EAAE,EAAE,OAAO,EAAE,CAAC,CAAC;AAC3C,CAAC;AAED,SAAS,cAAc,CAAC,QAAkB;IACxC,MAAM,IAAI,GAAG,SAAS,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,QAAQ,CAAC,CAAC;IAC/D,IAAI,IAAI,KAAK,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC;QAC1C,OAAO,QAAQ,CAAC;IAClB,CAAC;IACD,MAAM,OAAO,GAAG,IAAI,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;IAC9C,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;IAC1B,OAAO,IAAI,QAAQ,CAAC,QAAQ,CAAC,IAAI,EAAE;QACjC,MAAM,EAAE,QAAQ,CAAC,MAAM;QACvB,UAAU,EAAE,QAAQ,CAAC,UAAU;QAC/B,OAAO;KACR,CAAC,CAAC;AACL,CAAC;AAED,MAAM,UAAU,WAAW,CAAC,OAAqB;IAG/C,MAAM,gBAAgB,GAAG,OAAO,CAAC,gBAAgB,IAAI,CAAC,MAAM,CAAC,CAAC;IAC9D,MAAM,MAAM,GACV,OAAO,CAAC,MAAM,IAAI,CAAC,CAAC,IAAY,EAAE,EAAE,CAAC,aAAa,CAAC,IAAI,EAAE,gBAAgB,CAAC,CAAC,CAAC;IAE9E,OAAO;QACL,KAAK,CAAC,KAAK,CAAC,OAAO,EAAE,GAAG,IAAI;YAC1B,MAAM,IAAI,GAAG,aAAa,CAAC,IAAI,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,QAAQ,CAAC,CAAC;YAC1D,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,WAAW,EAAE,CAAC;YAC5C,MAAM,MAAM,GAAG,MAAM,KAAK,KAAK,IAAI,MAAM,KAAK,MAAM,CAAC;YAErD,IAAI,gBAAgB,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,WAAW,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,EAAE,CAAC;gBACjE,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;oBACzB,OAAO,IAAI,QAAQ,CAAC,IAAI,EAAE;wBACxB,MAAM,EAAE,GAAG;wBACX,OAAO,EAAE,EAAE,KAAK,EAAE,oBAAoB,EAAE;qBACzC,CAAC,CAAC;gBACL,CAAC;gBACD,IAAI,CAAC,MAAM,EAAE,CAAC;oBACZ,OAAO,QAAQ,CAAC,IAAI,CAClB,EAAE,KAAK,EAAE,oBAAoB,EAAE,EAC/B,EAAE,MAAM,EAAE,GAAG,EAAE,OAAO,EAAE,EAAE,KAAK,EAAE,oBAAoB,EAAE,EAAE,CAC1D,CAAC;gBACJ,CAAC;gBACD,OAAO,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,EAAE,GAAG,IAAI,CAAC,CAAC;YACjD,CAAC;YAED,IAAI,CAAC,CAAC,MAAM,IAAI,MAAM,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC;gBAC9B,OAAO,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,EAAE,GAAG,IAAI,CAAC,CAAC;YACjD,CAAC;YAED,IAAI,OAAO,CAAC,QAAQ,IAAI,aAAa,CAAC,OAAO,CAAC,EAAE,CAAC;gBAC/C,IAAI,CAAC;oBACH,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,QAAQ,CAAC,IAAI,EAAE,OAAO,EAAE;wBACnD,IAAI,EAAE,KAAK,IAAI,EAAE,CACf,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,cAAc,CAAC,OAAO,CAAC,EAAE,GAAG,IAAI,CAAC;qBAC1D,CAAC,CAAC;oBACH,IAAI,MAAM,KAAK,IAAI,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;wBAC5C,OAAO,gBAAgB,CAAC,MAAM,EAAE,MAAM,KAAK,MAAM,CAAC,CAAC;oBACrD,CAAC;gBACH,CAAC;gBAAC,OAAO,KAAK,EAAE,CAAC;oBACf,OAAO,CAAC,KAAK,CACX,uDAAuD,EACvD,KAAK,CACN,CAAC;gBACJ,CAAC;YACH,CAAC;YAED,MAAM,WAAW,GAAG,WAAW,CAAC,OAAO,CAAC;gBACtC,CAAC,CAAC,OAAO;gBACT,CAAC,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;YAC5B,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,WAAW,EAAE,GAAG,IAAI,CAAC,CAAC;YACnE,OAAO,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC;QAChE,CAAC;KACF,CAAC;AACJ,CAAC"}
|