@vivliostyle/cli 9.0.0-next.1 → 9.0.0-next.3
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/browser.d.ts +0 -14
- package/dist/browser.d.ts.map +1 -1
- package/dist/browser.js +3 -3
- package/dist/browser.js.map +1 -1
- package/dist/commands/build.js +1 -1
- package/dist/commands/build.js.map +1 -1
- package/dist/commands/build.parser.d.ts.map +1 -1
- package/dist/commands/build.parser.js +3 -1
- package/dist/commands/build.parser.js.map +1 -1
- package/dist/commands/preview.parser.d.ts.map +1 -1
- package/dist/commands/preview.parser.js +2 -0
- package/dist/commands/preview.parser.js.map +1 -1
- package/dist/config/load.d.ts +2 -5
- package/dist/config/load.d.ts.map +1 -1
- package/dist/config/load.js +12 -9
- package/dist/config/load.js.map +1 -1
- package/dist/config/merge.d.ts.map +1 -1
- package/dist/config/merge.js +8 -27
- package/dist/config/merge.js.map +1 -1
- package/dist/config/resolve.d.ts +8 -6
- package/dist/config/resolve.d.ts.map +1 -1
- package/dist/config/resolve.js +63 -20
- package/dist/config/resolve.js.map +1 -1
- package/dist/config/schema.d.ts +5437 -1512
- package/dist/config/schema.d.ts.map +1 -1
- package/dist/config/schema.js +29 -2
- package/dist/config/schema.js.map +1 -1
- package/dist/config/vite.d.ts +3 -50
- package/dist/config/vite.d.ts.map +1 -1
- package/dist/config/vite.js +40 -10
- package/dist/config/vite.js.map +1 -1
- package/dist/core/build.d.ts.map +1 -1
- package/dist/core/build.js +18 -18
- package/dist/core/build.js.map +1 -1
- package/dist/core/init.d.ts.map +1 -1
- package/dist/core/init.js +3 -1
- package/dist/core/init.js.map +1 -1
- package/dist/core/preview.d.ts +2 -1
- package/dist/core/preview.d.ts.map +1 -1
- package/dist/core/preview.js +33 -12
- package/dist/core/preview.js.map +1 -1
- package/dist/index.d.ts +1 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/logger.d.ts +7 -0
- package/dist/logger.d.ts.map +1 -1
- package/dist/logger.js +20 -9
- package/dist/logger.js.map +1 -1
- package/dist/output/webbook.d.ts +3 -3
- package/dist/output/webbook.d.ts.map +1 -1
- package/dist/output/webbook.js +17 -9
- package/dist/output/webbook.js.map +1 -1
- package/dist/processor/compile.d.ts +2 -3
- package/dist/processor/compile.d.ts.map +1 -1
- package/dist/processor/compile.js +21 -30
- package/dist/processor/compile.js.map +1 -1
- package/dist/processor/theme.d.ts +0 -2
- package/dist/processor/theme.d.ts.map +1 -1
- package/dist/processor/theme.js +0 -15
- package/dist/processor/theme.js.map +1 -1
- package/dist/server.d.ts +6 -4
- package/dist/server.d.ts.map +1 -1
- package/dist/server.js +27 -16
- package/dist/server.js.map +1 -1
- package/dist/util.d.ts +1 -1
- package/dist/util.d.ts.map +1 -1
- package/dist/util.js +20 -12
- package/dist/util.js.map +1 -1
- package/dist/vite/plugin-util.d.ts +2 -2
- package/dist/vite/plugin-util.d.ts.map +1 -1
- package/dist/vite/plugin-util.js +4 -6
- package/dist/vite/plugin-util.js.map +1 -1
- package/dist/vite/vite-plugin-browser.d.ts +3 -3
- package/dist/vite/vite-plugin-browser.d.ts.map +1 -1
- package/dist/vite/vite-plugin-browser.js +3 -6
- package/dist/vite/vite-plugin-browser.js.map +1 -1
- package/dist/vite/vite-plugin-dev-server.d.ts +3 -3
- package/dist/vite/vite-plugin-dev-server.d.ts.map +1 -1
- package/dist/vite/vite-plugin-dev-server.js +9 -6
- package/dist/vite/vite-plugin-dev-server.js.map +1 -1
- package/dist/vite/vite-plugin-static-serve.d.ts +3 -3
- package/dist/vite/vite-plugin-static-serve.d.ts.map +1 -1
- package/dist/vite/vite-plugin-static-serve.js +10 -3
- package/dist/vite/vite-plugin-static-serve.js.map +1 -1
- package/dist/vite/vite-plugin-viewer.d.ts +2 -2
- package/dist/vite/vite-plugin-viewer.d.ts.map +1 -1
- package/dist/vite-adapter.d.ts.map +1 -1
- package/dist/vite-adapter.js +28 -12
- package/dist/vite-adapter.js.map +1 -1
- package/package.json +5 -3
package/dist/browser.d.ts
CHANGED
|
@@ -1,20 +1,6 @@
|
|
|
1
1
|
import * as playwright from 'playwright-core';
|
|
2
2
|
import { ResolvedTaskConfig } from './config/resolve.js';
|
|
3
3
|
import type { BrowserType } from './config/schema.js';
|
|
4
|
-
export declare function launchBrowser({ browserType, proxy, executablePath, headless, noSandbox, disableWebSecurity, disableDevShmUsage, }: {
|
|
5
|
-
browserType: BrowserType;
|
|
6
|
-
proxy: {
|
|
7
|
-
server: string;
|
|
8
|
-
bypass: string | undefined;
|
|
9
|
-
username: string | undefined;
|
|
10
|
-
password: string | undefined;
|
|
11
|
-
} | undefined;
|
|
12
|
-
executablePath: string;
|
|
13
|
-
headless: boolean;
|
|
14
|
-
noSandbox?: boolean;
|
|
15
|
-
disableWebSecurity?: boolean;
|
|
16
|
-
disableDevShmUsage?: boolean;
|
|
17
|
-
}): Promise<playwright.Browser>;
|
|
18
4
|
export declare function getExecutableBrowserPath(browserType: BrowserType): string;
|
|
19
5
|
export declare function getFullBrowserName(browserType: BrowserType): string;
|
|
20
6
|
export declare function checkBrowserAvailability(path: string): boolean;
|
package/dist/browser.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"browser.d.ts","sourceRoot":"","sources":["../src/browser.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,UAAU,MAAM,iBAAiB,CAAC;AAE9C,OAAO,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AACzD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"browser.d.ts","sourceRoot":"","sources":["../src/browser.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,UAAU,MAAM,iBAAiB,CAAC;AAE9C,OAAO,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AACzD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AA0DtD,wBAAgB,wBAAwB,CAAC,WAAW,EAAE,WAAW,GAAG,MAAM,CAEzE;AAED,wBAAgB,kBAAkB,CAAC,WAAW,EAAE,WAAW,GAAG,MAAM,CAMnE;AAED,wBAAgB,wBAAwB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAE9D;AAED,wBAAgB,sBAAsB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAI5D;AAED,wBAAsB,eAAe,CACnC,WAAW,EAAE,WAAW,GACvB,OAAO,CAAC,MAAM,CAAC,CASjB;AAED,wBAAsB,aAAa,CAAC,EAClC,IAAI,EACJ,GAAG,EACH,aAAa,EACb,UAAU,EACV,MAAM,EAAE,EAAE,WAAW,EAAE,KAAK,EAAE,iBAAiB,EAAE,OAAO,EAAE,iBAAiB,EAAE,GAC9E,EAAE;IACD,IAAI,EAAE,SAAS,GAAG,OAAO,CAAC;IAC1B,GAAG,EAAE,MAAM,CAAC;IACZ,aAAa,CAAC,EAAE,CAAC,OAAO,EAAE,UAAU,CAAC,OAAO,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACtE,UAAU,CAAC,EAAE,CAAC,IAAI,EAAE,UAAU,CAAC,IAAI,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC7D,MAAM,EAAE,IAAI,CACV,kBAAkB,EAChB,aAAa,GACb,OAAO,GACP,mBAAmB,GACnB,SAAS,GACT,mBAAmB,CACtB,CAAC;CACH;;;GA4CA"}
|
package/dist/browser.js
CHANGED
|
@@ -49,8 +49,8 @@ import fs from 'node:fs';
|
|
|
49
49
|
import * as playwright from 'playwright-core';
|
|
50
50
|
import { registry } from 'playwright-core/lib/server';
|
|
51
51
|
import { Logger } from './logger.js';
|
|
52
|
-
import {
|
|
53
|
-
|
|
52
|
+
import { isInContainer, pathEquals, registerExitHandler } from './util.js';
|
|
53
|
+
async function launchBrowser({ browserType, proxy, executablePath, headless, noSandbox, disableWebSecurity, disableDevShmUsage, }) {
|
|
54
54
|
const options = browserType === 'chromium'
|
|
55
55
|
? {
|
|
56
56
|
executablePath,
|
|
@@ -74,7 +74,7 @@ export async function launchBrowser({ browserType, proxy, executablePath, headle
|
|
|
74
74
|
: // TODO: Investigate appropriate settings on Firefox & Webkit
|
|
75
75
|
{ executablePath, headless };
|
|
76
76
|
const browser = await playwright[browserType].launch(options);
|
|
77
|
-
|
|
77
|
+
registerExitHandler('Closing browser', () => {
|
|
78
78
|
browser.close();
|
|
79
79
|
});
|
|
80
80
|
return browser;
|
package/dist/browser.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"browser.js","sourceRoot":"","sources":["../src/browser.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,KAAK,UAAU,MAAM,iBAAiB,CAAC;AAC9C,OAAO,EAAE,QAAQ,EAAE,MAAM,4BAA4B,CAAC;AAGtD,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AACrC,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"browser.js","sourceRoot":"","sources":["../src/browser.ts"],"names":[],"mappings":"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"}
|
package/dist/commands/build.js
CHANGED
|
@@ -8,7 +8,7 @@ try {
|
|
|
8
8
|
let inlineConfig = parseFlagsToInlineConfig(process.argv, setupBuildParserProgram);
|
|
9
9
|
if (isInContainer()) {
|
|
10
10
|
inlineConfig = JSON.parse(process.env.VS_CLI_BUILD_PDF_OPTIONS);
|
|
11
|
-
Logger.debug('bypassedPdfBuilderOption',
|
|
11
|
+
Logger.debug('bypassedPdfBuilderOption %O', inlineConfig);
|
|
12
12
|
}
|
|
13
13
|
await build(inlineConfig);
|
|
14
14
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"build.js","sourceRoot":"","sources":["../../src/commands/build.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,MAAM,cAAc,CAAC;AACnC,OAAO,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AACzC,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AACtC,OAAO,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAC1D,OAAO,EAAE,uBAAuB,EAAE,MAAM,mBAAmB,CAAC;AAC5D,OAAO,EAAE,wBAAwB,EAAE,MAAM,gBAAgB,CAAC;AAE1D,IAAI,CAAC;IACH,IAAI,YAAY,GAAG,wBAAwB,CACzC,OAAO,CAAC,IAAI,EACZ,uBAAuB,CACxB,CAAC;IACF,IAAI,aAAa,EAAE,EAAE,CAAC;QACpB,YAAY,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,wBAAyB,CAAC,CAAC;QACjE,MAAM,CAAC,KAAK,
|
|
1
|
+
{"version":3,"file":"build.js","sourceRoot":"","sources":["../../src/commands/build.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,MAAM,cAAc,CAAC;AACnC,OAAO,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AACzC,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AACtC,OAAO,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAC1D,OAAO,EAAE,uBAAuB,EAAE,MAAM,mBAAmB,CAAC;AAC5D,OAAO,EAAE,wBAAwB,EAAE,MAAM,gBAAgB,CAAC;AAE1D,IAAI,CAAC;IACH,IAAI,YAAY,GAAG,wBAAwB,CACzC,OAAO,CAAC,IAAI,EACZ,uBAAuB,CACxB,CAAC;IACF,IAAI,aAAa,EAAE,EAAE,CAAC;QACpB,YAAY,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,wBAAyB,CAAC,CAAC;QACjE,MAAM,CAAC,KAAK,CAAC,6BAA6B,EAAE,YAAY,CAAC,CAAC;IAC5D,CAAC;IACD,MAAM,KAAK,CAAC,YAAY,CAAC,CAAC;AAC5B,CAAC;AAAC,OAAO,GAAG,EAAE,CAAC;IACb,IAAI,GAAG,YAAY,KAAK,EAAE,CAAC;QACzB,aAAa,CAAC,GAAG,CAAC,CAAC;IACrB,CAAC;AACH,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"build.parser.d.ts","sourceRoot":"","sources":["../../src/commands/build.parser.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAU,MAAM,WAAW,CAAC;AAE5C,wBAAgB,uBAAuB,IAAI,OAAO,
|
|
1
|
+
{"version":3,"file":"build.parser.d.ts","sourceRoot":"","sources":["../../src/commands/build.parser.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAU,MAAM,WAAW,CAAC;AAE5C,wBAAgB,uBAAuB,IAAI,OAAO,CAsMjD"}
|
|
@@ -7,7 +7,7 @@ export function setupBuildParserProgram() {
|
|
|
7
7
|
// → [{path: "bar", format: "foo"}, {path: "baz", format: "piyo"}]
|
|
8
8
|
const targets = [];
|
|
9
9
|
const outputOptionProcessor = (value, previous) => {
|
|
10
|
-
if (targets.length === 0 || '
|
|
10
|
+
if (targets.length === 0 || 'path' in targets[targets.length - 1]) {
|
|
11
11
|
targets.push({ path: value });
|
|
12
12
|
}
|
|
13
13
|
else {
|
|
@@ -81,6 +81,8 @@ It is useful that using own viewer that has staging features. (ex: https://vivli
|
|
|
81
81
|
.choices(['silent', 'info', 'verbose', 'debug'])
|
|
82
82
|
.default('info'))
|
|
83
83
|
.addOption(new Option('--ignore-https-errors', `true to ignore HTTPS errors when Playwright browser opens a new page`))
|
|
84
|
+
.option('--host <host>', 'IP address the server should listen on')
|
|
85
|
+
.option('--port <port>', 'port the server should listen on', parseInt)
|
|
84
86
|
.option('--no-enable-static-serve', 'disable static file serving')
|
|
85
87
|
// TODO: Remove it in the next major version up
|
|
86
88
|
.addOption(new Option('--executable-chromium <path>').hideHelp())
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"build.parser.js","sourceRoot":"","sources":["../../src/commands/build.parser.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AAE5C,MAAM,UAAU,uBAAuB;IACrC,4CAA4C;IAC5C,6BAA6B;IAC7B,oDAAoD;IACpD,qCAAqC;IACrC,qEAAqE;IACrE,MAAM,OAAO,GAGP,EAAE,CAAC;IACT,MAAM,qBAAqB,GAAG,CAC5B,KAAa,EACb,QAAmB,EACT,EAAE;QACZ,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,IAAI,
|
|
1
|
+
{"version":3,"file":"build.parser.js","sourceRoot":"","sources":["../../src/commands/build.parser.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"preview.parser.d.ts","sourceRoot":"","sources":["../../src/commands/preview.parser.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAU,MAAM,WAAW,CAAC;AAE5C,wBAAgB,yBAAyB,IAAI,OAAO,
|
|
1
|
+
{"version":3,"file":"preview.parser.d.ts","sourceRoot":"","sources":["../../src/commands/preview.parser.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAU,MAAM,WAAW,CAAC;AAE5C,wBAAgB,yBAAyB,IAAI,OAAO,CAgHnD"}
|
|
@@ -38,6 +38,8 @@ Currently, Firefox and Webkit support preview command only!`).choices(['chromium
|
|
|
38
38
|
.choices(['silent', 'info', 'verbose', 'debug'])
|
|
39
39
|
.default('info'))
|
|
40
40
|
.addOption(new Option('--ignore-https-errors', `true to ignore HTTPS errors when Playwright browser opens a new page`))
|
|
41
|
+
.option('--host <host>', 'IP address the server should listen on')
|
|
42
|
+
.option('--port <port>', 'port the server should listen on', parseInt)
|
|
41
43
|
.option('--no-open-viewer', 'do not open viewer')
|
|
42
44
|
.option('--no-enable-static-serve', 'disable static file serving')
|
|
43
45
|
.option('--no-enable-viewer-start-page', 'disable viewer start page')
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"preview.parser.js","sourceRoot":"","sources":["../../src/commands/preview.parser.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"preview.parser.js","sourceRoot":"","sources":["../../src/commands/preview.parser.ts"],"names":[],"mappings":"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"}
|
package/dist/config/load.d.ts
CHANGED
|
@@ -1,7 +1,4 @@
|
|
|
1
|
-
import { ParsedVivliostyleConfigSchema } from './schema.js';
|
|
2
|
-
export declare function loadVivliostyleConfig({
|
|
3
|
-
configPath?: string;
|
|
4
|
-
cwd?: string;
|
|
5
|
-
}): Promise<ParsedVivliostyleConfigSchema | undefined>;
|
|
1
|
+
import { InlineOptions, ParsedVivliostyleConfigSchema } from './schema.js';
|
|
2
|
+
export declare function loadVivliostyleConfig({ config, configData, cwd, }: Pick<InlineOptions, 'config' | 'configData' | 'cwd'>): Promise<ParsedVivliostyleConfigSchema | undefined>;
|
|
6
3
|
export declare function warnDeprecatedConfig(config: ParsedVivliostyleConfigSchema): void;
|
|
7
4
|
//# sourceMappingURL=load.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"load.d.ts","sourceRoot":"","sources":["../../src/config/load.ts"],"names":[],"mappings":"AAYA,OAAO,EACL,6BAA6B,EAE9B,MAAM,aAAa,CAAC;AAUrB,wBAAsB,qBAAqB,CAAC,EAC1C,UAAU,EACV,GAAG,GACJ,EAAE
|
|
1
|
+
{"version":3,"file":"load.d.ts","sourceRoot":"","sources":["../../src/config/load.ts"],"names":[],"mappings":"AAYA,OAAO,EACL,aAAa,EACb,6BAA6B,EAE9B,MAAM,aAAa,CAAC;AAUrB,wBAAsB,qBAAqB,CAAC,EAC1C,MAAM,EACN,UAAU,EACV,GAAG,GACJ,EAAE,IAAI,CAAC,aAAa,EAAE,QAAQ,GAAG,YAAY,GAAG,KAAK,CAAC,GAAG,OAAO,CAC/D,6BAA6B,GAAG,SAAS,CAC1C,CAsDA;AAED,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,6BAA6B,QAkBzE"}
|
package/dist/config/load.js
CHANGED
|
@@ -12,19 +12,22 @@ function locateVivliostyleConfig(cwd) {
|
|
|
12
12
|
.map((ext) => upath.join(cwd, `vivliostyle.config${ext}`))
|
|
13
13
|
.find((p) => fs.existsSync(p));
|
|
14
14
|
}
|
|
15
|
-
export async function loadVivliostyleConfig({
|
|
16
|
-
|
|
17
|
-
|
|
15
|
+
export async function loadVivliostyleConfig({ config, configData, cwd, }) {
|
|
16
|
+
if (configData) {
|
|
17
|
+
return v.parse(VivliostyleConfigSchema, configData);
|
|
18
|
+
}
|
|
19
|
+
const absPath = config
|
|
20
|
+
? upath.resolve(cwd ?? defaultRoot, config)
|
|
18
21
|
: locateVivliostyleConfig(cwd ?? defaultRoot);
|
|
19
22
|
if (!absPath) {
|
|
20
23
|
return;
|
|
21
24
|
}
|
|
22
|
-
let
|
|
25
|
+
let parsedConfig;
|
|
23
26
|
let jsonRaw;
|
|
24
27
|
try {
|
|
25
28
|
if (upath.extname(absPath) === '.json') {
|
|
26
29
|
jsonRaw = fs.readFileSync(absPath, 'utf8');
|
|
27
|
-
|
|
30
|
+
parsedConfig = parseJsonc(jsonRaw);
|
|
28
31
|
}
|
|
29
32
|
else {
|
|
30
33
|
// Clear require cache to reload CJS config files
|
|
@@ -33,15 +36,15 @@ export async function loadVivliostyleConfig({ configPath, cwd, }) {
|
|
|
33
36
|
// Invalidate cache for ESM config files
|
|
34
37
|
// https://github.com/nodejs/node/issues/49442
|
|
35
38
|
url.search = `version=${Date.now()}`;
|
|
36
|
-
|
|
37
|
-
jsonRaw = JSON.stringify(
|
|
39
|
+
parsedConfig = (await import(/* @vite-ignore */ url.href)).default;
|
|
40
|
+
jsonRaw = JSON.stringify(parsedConfig, null, 2);
|
|
38
41
|
}
|
|
39
42
|
}
|
|
40
43
|
catch (error) {
|
|
41
44
|
const thrownError = error;
|
|
42
45
|
throw new DetailError(`An error occurred on loading a config file: ${absPath}`, thrownError.stack ?? thrownError.message);
|
|
43
46
|
}
|
|
44
|
-
const result = v.safeParse(VivliostyleConfigSchema,
|
|
47
|
+
const result = v.safeParse(VivliostyleConfigSchema, parsedConfig);
|
|
45
48
|
if (result.success) {
|
|
46
49
|
const { tasks, inlineOptions } = result.output;
|
|
47
50
|
return {
|
|
@@ -55,7 +58,7 @@ export async function loadVivliostyleConfig({ configPath, cwd, }) {
|
|
|
55
58
|
}
|
|
56
59
|
else {
|
|
57
60
|
const errorString = prettifySchemaError(jsonRaw, result.issues);
|
|
58
|
-
throw new DetailError(`Validation of vivliostyle config failed. Please check the schema: ${
|
|
61
|
+
throw new DetailError(`Validation of vivliostyle config failed. Please check the schema: ${config}`, errorString);
|
|
59
62
|
}
|
|
60
63
|
}
|
|
61
64
|
export function warnDeprecatedConfig(config) {
|
package/dist/config/load.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"load.js","sourceRoot":"","sources":["../../src/config/load.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC5C,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AACzC,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,KAAK,CAAC,MAAM,SAAS,CAAC;AAC7B,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AACtC,OAAO,EACL,GAAG,IAAI,WAAW,EAClB,WAAW,EACX,UAAU,EACV,mBAAmB,GACpB,MAAM,YAAY,CAAC;AACpB,OAAO,
|
|
1
|
+
{"version":3,"file":"load.js","sourceRoot":"","sources":["../../src/config/load.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"merge.d.ts","sourceRoot":"","sources":["../../src/config/merge.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,eAAe,EACf,6BAA6B,EAC7B,6BAA6B,EAC9B,MAAM,aAAa,CAAC;AAYrB,wBAAgB,WAAW,CACzB,IAAI,EAAE,6BAA6B,EACnC,QAAQ,EAAE,OAAO,CAAC,eAAe,CAAC,GACjC,6BAA6B,CAQ/B;
|
|
1
|
+
{"version":3,"file":"merge.d.ts","sourceRoot":"","sources":["../../src/config/merge.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,eAAe,EACf,6BAA6B,EAC7B,6BAA6B,EAC9B,MAAM,aAAa,CAAC;AAYrB,wBAAgB,WAAW,CACzB,IAAI,EAAE,6BAA6B,EACnC,QAAQ,EAAE,OAAO,CAAC,eAAe,CAAC,GACjC,6BAA6B,CAQ/B;AAKD,wBAAgB,iBAAiB,CAC/B,EAAE,KAAK,EAAE,aAAa,EAAE,EAAE,6BAA6B,EACvD,YAAY,EAAE,6BAA6B,GAC1C,6BAA6B,CAkE/B"}
|
package/dist/config/merge.js
CHANGED
|
@@ -17,9 +17,7 @@ export function mergeConfig(base, override) {
|
|
|
17
17
|
};
|
|
18
18
|
}
|
|
19
19
|
export function mergeInlineConfig({ tasks, inlineOptions }, inlineConfig) {
|
|
20
|
-
const { theme, size, pressReady, title, author, language, readingProgression, timeout, image, viewer, viewerParam, browser, output, renderMode, preflight, preflightOption,
|
|
21
|
-
// InlineOptions
|
|
22
|
-
cwd, config, input, cropMarks, bleed, cropOffset, css, style, userStyle, singleDoc, quick, sandbox, executableBrowser, proxyServer, proxyBypass, proxyUser, proxyPass, logLevel, ignoreHttpsErrors, openViewer, enableStaticServe, enableViewerStartPage, } = inlineConfig;
|
|
20
|
+
const { theme, size, pressReady, title, author, language, readingProgression, timeout, image, viewer, viewerParam, browser, output, renderMode, preflight, preflightOption, vite, viteConfigFile, host, port, ...overrideInlineOptions } = inlineConfig;
|
|
23
21
|
return {
|
|
24
22
|
tasks: tasks.map((task) => ({
|
|
25
23
|
...pruneObject(task),
|
|
@@ -36,6 +34,8 @@ export function mergeInlineConfig({ tasks, inlineOptions }, inlineConfig) {
|
|
|
36
34
|
viewer,
|
|
37
35
|
viewerParam,
|
|
38
36
|
browser,
|
|
37
|
+
vite,
|
|
38
|
+
viteConfigFile,
|
|
39
39
|
}),
|
|
40
40
|
output: (output?.length ? output : task.output)?.map((o) => ({
|
|
41
41
|
...pruneObject(o),
|
|
@@ -45,33 +45,14 @@ export function mergeInlineConfig({ tasks, inlineOptions }, inlineConfig) {
|
|
|
45
45
|
preflightOption,
|
|
46
46
|
}),
|
|
47
47
|
})),
|
|
48
|
+
server: {
|
|
49
|
+
...pruneObject(task.server ?? {}),
|
|
50
|
+
...pruneObject({ host, port }),
|
|
51
|
+
},
|
|
48
52
|
})),
|
|
49
53
|
inlineOptions: {
|
|
50
54
|
...pruneObject(inlineOptions),
|
|
51
|
-
...pruneObject(
|
|
52
|
-
cwd,
|
|
53
|
-
config,
|
|
54
|
-
input,
|
|
55
|
-
cropMarks,
|
|
56
|
-
bleed,
|
|
57
|
-
cropOffset,
|
|
58
|
-
css,
|
|
59
|
-
style,
|
|
60
|
-
userStyle,
|
|
61
|
-
singleDoc,
|
|
62
|
-
quick,
|
|
63
|
-
sandbox,
|
|
64
|
-
executableBrowser,
|
|
65
|
-
proxyServer,
|
|
66
|
-
proxyBypass,
|
|
67
|
-
proxyUser,
|
|
68
|
-
proxyPass,
|
|
69
|
-
logLevel,
|
|
70
|
-
ignoreHttpsErrors,
|
|
71
|
-
openViewer,
|
|
72
|
-
enableStaticServe,
|
|
73
|
-
enableViewerStartPage,
|
|
74
|
-
}),
|
|
55
|
+
...pruneObject(overrideInlineOptions),
|
|
75
56
|
},
|
|
76
57
|
};
|
|
77
58
|
}
|
package/dist/config/merge.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"merge.js","sourceRoot":"","sources":["../../src/config/merge.ts"],"names":[],"mappings":"AAOA,MAAM,WAAW,GAAG,CAAoC,GAAM,EAAE,EAAE;IAChE,MAAM,GAAG,GAAG,EAAE,GAAG,GAAG,EAAE,CAAC;IACvB,KAAK,MAAM,GAAG,IAAI,GAAG,EAAE,CAAC;QACtB,IAAI,GAAG,CAAC,GAAG,CAAC,KAAK,SAAS,IAAI,GAAG,CAAC,GAAG,CAAC,KAAK,IAAI,EAAE,CAAC;YAChD,OAAO,GAAG,CAAC,GAAG,CAAC,CAAC;QAClB,CAAC;IACH,CAAC;IACD,OAAO,GAA4C,CAAC;AACtD,CAAC,CAAC;AAEF,MAAM,UAAU,WAAW,CACzB,IAAmC,EACnC,QAAkC;IAElC,OAAO;QACL,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC;YAClC,GAAG,WAAW,CAAC,IAAI,CAAC;YACpB,GAAG,WAAW,CAAC,QAAQ,CAAC;SACzB,CAAC,CAAC;QACH,aAAa,EAAE,IAAI,CAAC,aAAa;KAClC,CAAC;AACJ,CAAC;
|
|
1
|
+
{"version":3,"file":"merge.js","sourceRoot":"","sources":["../../src/config/merge.ts"],"names":[],"mappings":"AAOA,MAAM,WAAW,GAAG,CAAoC,GAAM,EAAE,EAAE;IAChE,MAAM,GAAG,GAAG,EAAE,GAAG,GAAG,EAAE,CAAC;IACvB,KAAK,MAAM,GAAG,IAAI,GAAG,EAAE,CAAC;QACtB,IAAI,GAAG,CAAC,GAAG,CAAC,KAAK,SAAS,IAAI,GAAG,CAAC,GAAG,CAAC,KAAK,IAAI,EAAE,CAAC;YAChD,OAAO,GAAG,CAAC,GAAG,CAAC,CAAC;QAClB,CAAC;IACH,CAAC;IACD,OAAO,GAA4C,CAAC;AACtD,CAAC,CAAC;AAEF,MAAM,UAAU,WAAW,CACzB,IAAmC,EACnC,QAAkC;IAElC,OAAO;QACL,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC;YAClC,GAAG,WAAW,CAAC,IAAI,CAAC;YACpB,GAAG,WAAW,CAAC,QAAQ,CAAC;SACzB,CAAC,CAAC;QACH,aAAa,EAAE,IAAI,CAAC,aAAa;KAClC,CAAC;AACJ,CAAC;AAKD,MAAM,UAAU,iBAAiB,CAC/B,EAAE,KAAK,EAAE,aAAa,EAAiC,EACvD,YAA2C;IAE3C,MAAM,EACJ,KAAK,EACL,IAAI,EACJ,UAAU,EACV,KAAK,EACL,MAAM,EACN,QAAQ,EACR,kBAAkB,EAClB,OAAO,EACP,KAAK,EACL,MAAM,EACN,WAAW,EACX,OAAO,EACP,MAAM,EACN,UAAU,EACV,SAAS,EACT,eAAe,EACf,IAAI,EACJ,cAAc,EACd,IAAI,EACJ,IAAI,EACJ,GAAG,qBAAqB,EACzB,GAAG,YAAY,CAAC;IAEjB,OAAO;QACL,KAAK,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;YAC1B,GAAG,WAAW,CAAC,IAAI,CAAC;YACpB,GAAG,WAAW,CAAC;gBACb,KAAK;gBACL,IAAI;gBACJ,UAAU;gBACV,KAAK;gBACL,MAAM;gBACN,QAAQ;gBACR,kBAAkB;gBAClB,OAAO;gBACP,KAAK;gBACL,MAAM;gBACN,WAAW;gBACX,OAAO;gBACP,IAAI;gBACJ,cAAc;aACf,CAAC;YACF,MAAM,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;gBAC3D,GAAG,WAAW,CAAC,CAAC,CAAC;gBACjB,GAAG,WAAW,CAAC;oBACb,UAAU;oBACV,SAAS;oBACT,eAAe;iBAChB,CAAC;aACH,CAAC,CAAC;YACH,MAAM,EAAE;gBACN,GAAG,WAAW,CAAC,IAAI,CAAC,MAAM,IAAI,EAAE,CAAC;gBACjC,GAAG,WAAW,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;aAC/B;SACF,CAAC,CAAC;QACH,aAAa,EAAE;YACb,GAAG,WAAW,CAAC,aAAa,CAAC;YAC7B,GAAG,WAAW,CACZ,qBAEC,CACF;SACF;KACF,CAAC;AACJ,CAAC"}
|
package/dist/config/resolve.d.ts
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { Metadata, StringifyMarkdownOptions } from '@vivliostyle/vfm';
|
|
2
|
+
import npa from 'npm-package-arg';
|
|
2
3
|
import { Processor } from 'unified';
|
|
3
|
-
import {
|
|
4
|
+
import { ResolvedConfig as ResolvedViteConfig, UserConfig } from 'vite';
|
|
4
5
|
import { BrowserType, InputFormat, StructuredDocument, StructuredDocumentSection, ThemeConfig } from '../config/schema.js';
|
|
5
6
|
import { InlineOptions, ParsedBuildTask } from './schema.js';
|
|
6
7
|
export type ParsedTheme = UriTheme | FileTheme | PackageTheme;
|
|
@@ -93,6 +94,7 @@ export interface EpubOpfEntryConfig {
|
|
|
93
94
|
export interface WebBookEntryConfig {
|
|
94
95
|
type: 'webbook';
|
|
95
96
|
webbookEntryUrl: string;
|
|
97
|
+
webbookPath: string | undefined;
|
|
96
98
|
}
|
|
97
99
|
export type ViewerInputConfig = WebPublicationManifestConfig | EpubEntryConfig | EpubOpfEntryConfig | WebBookEntryConfig;
|
|
98
100
|
export interface PdfOutput {
|
|
@@ -180,11 +182,7 @@ export type ResolvedTaskConfig = {
|
|
|
180
182
|
logLevel: 'silent' | 'info' | 'verbose' | 'debug';
|
|
181
183
|
ignoreHttpsErrors: boolean;
|
|
182
184
|
base: string;
|
|
183
|
-
server:
|
|
184
|
-
host: string | boolean;
|
|
185
|
-
port: number;
|
|
186
|
-
proxy: Record<string, string | ProxyOptions>;
|
|
187
|
-
};
|
|
185
|
+
server: Required<Pick<ResolvedViteConfig['server'], 'host' | 'port' | 'proxy'>>;
|
|
188
186
|
static: Record<string, string[]>;
|
|
189
187
|
rootUrl: string;
|
|
190
188
|
viteConfig: UserConfig | undefined;
|
|
@@ -193,6 +191,10 @@ export type ResolvedTaskConfig = {
|
|
|
193
191
|
export declare function isWebPubConfig(config: ResolvedTaskConfig): config is ResolvedTaskConfig & {
|
|
194
192
|
viewerInput: WebPublicationManifestConfig;
|
|
195
193
|
};
|
|
194
|
+
export declare function isWebbookConfig(config: ResolvedTaskConfig): config is ResolvedTaskConfig & {
|
|
195
|
+
viewerInput: WebBookEntryConfig;
|
|
196
|
+
};
|
|
197
|
+
export declare function parsePackageName(specifier: string, cwd: string): npa.Result | null;
|
|
196
198
|
export declare function parseTheme({ theme, context, workspaceDir, themesDir, }: {
|
|
197
199
|
theme: string | ThemeConfig;
|
|
198
200
|
context: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resolve.d.ts","sourceRoot":"","sources":["../../src/config/resolve.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,wBAAwB,EAAO,MAAM,kBAAkB,CAAC;AAI3E,OAAO,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;AAEpC,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"resolve.d.ts","sourceRoot":"","sources":["../../src/config/resolve.ts"],"names":[],"mappings":"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"}
|
package/dist/config/resolve.js
CHANGED
|
@@ -2,14 +2,14 @@ import { VFM } from '@vivliostyle/vfm';
|
|
|
2
2
|
import { lookup as mime } from 'mime-types';
|
|
3
3
|
import fs from 'node:fs';
|
|
4
4
|
import { pathToFileURL } from 'node:url';
|
|
5
|
+
import npa from 'npm-package-arg';
|
|
5
6
|
import upath from 'upath';
|
|
6
7
|
import { getExecutableBrowserPath } from '../browser.js';
|
|
7
8
|
import { COVER_HTML_FILENAME, COVER_HTML_IMAGE_ALT, EPUB_OUTPUT_VERSION, MANIFEST_FILENAME, TOC_FILENAME, TOC_TITLE, } from '../const.js';
|
|
8
9
|
import { CONTAINER_IMAGE, CONTAINER_LOCAL_HOSTNAME } from '../container.js';
|
|
9
10
|
import { Logger } from '../logger.js';
|
|
10
11
|
import { readMarkdownMetadata } from '../processor/markdown.js';
|
|
11
|
-
import {
|
|
12
|
-
import { cwd as defaultCwd, getEpubRootDir, isInContainer, isValidUri, pathEquals, readJSON, statFileSync, touchTmpFile, } from '../util.js';
|
|
12
|
+
import { cwd as defaultCwd, getEpubRootDir, isInContainer, isValidUri, pathContains, pathEquals, readJSON, statFileSync, touchTmpFile, } from '../util.js';
|
|
13
13
|
export const manuscriptMediaTypes = [
|
|
14
14
|
'text/markdown',
|
|
15
15
|
'text/html',
|
|
@@ -34,6 +34,23 @@ function isManuscriptMediaType(mediaType) {
|
|
|
34
34
|
export function isWebPubConfig(config) {
|
|
35
35
|
return config.viewerInput.type === 'webpub';
|
|
36
36
|
}
|
|
37
|
+
export function isWebbookConfig(config) {
|
|
38
|
+
return config.viewerInput.type === 'webbook';
|
|
39
|
+
}
|
|
40
|
+
export function parsePackageName(specifier, cwd) {
|
|
41
|
+
try {
|
|
42
|
+
let result = npa(specifier, cwd);
|
|
43
|
+
// #373: Relative path specifiers may be assumed as shorthand of hosted git
|
|
44
|
+
// (ex: foo/bar -> github:foo/bar)
|
|
45
|
+
if (result.type === 'git' && result.saveSpec?.startsWith('github:')) {
|
|
46
|
+
result = npa(`file:${specifier}`, cwd);
|
|
47
|
+
}
|
|
48
|
+
return result;
|
|
49
|
+
}
|
|
50
|
+
catch (error) {
|
|
51
|
+
return null;
|
|
52
|
+
}
|
|
53
|
+
}
|
|
37
54
|
// parse theme locator
|
|
38
55
|
export function parseTheme({ theme, context, workspaceDir, themesDir, }) {
|
|
39
56
|
const { specifier, import: importPath } = typeof theme === 'string' ? { specifier: theme, import: undefined } : theme;
|
|
@@ -131,9 +148,7 @@ function parseFileMetadata({ contentType, sourcePath, workspaceDir, themesDir, }
|
|
|
131
148
|
}
|
|
132
149
|
export function resolveTaskConfig(config, options) {
|
|
133
150
|
const context = options.cwd ?? defaultCwd;
|
|
134
|
-
Logger.debug('context
|
|
135
|
-
Logger.debug('inlineOptions', options);
|
|
136
|
-
Logger.debug('vivliostyle.config.js', config);
|
|
151
|
+
Logger.debug('resolveTaskConfig > context %s', context);
|
|
137
152
|
const entryContextDir = config.entryContext
|
|
138
153
|
? upath.resolve(context, config.entryContext)
|
|
139
154
|
: context;
|
|
@@ -274,6 +289,7 @@ export function resolveTaskConfig(config, options) {
|
|
|
274
289
|
context,
|
|
275
290
|
temporaryFilePrefix,
|
|
276
291
|
themeIndexes,
|
|
292
|
+
base,
|
|
277
293
|
})
|
|
278
294
|
: resolveComposedProjectConfig({
|
|
279
295
|
config,
|
|
@@ -285,6 +301,27 @@ export function resolveTaskConfig(config, options) {
|
|
|
285
301
|
rootUrl,
|
|
286
302
|
cover,
|
|
287
303
|
});
|
|
304
|
+
// Check overwrites
|
|
305
|
+
for (const output of outputs) {
|
|
306
|
+
const relPath = upath.relative(context, output.path);
|
|
307
|
+
if (pathContains(output.path, entryContextDir) ||
|
|
308
|
+
pathEquals(output.path, entryContextDir)) {
|
|
309
|
+
throw new Error(`The output path is set to "${relPath}", but this will overwrite the original manuscript file. Please specify a different path.`);
|
|
310
|
+
}
|
|
311
|
+
if (pathContains(output.path, projectConfig.workspaceDir) ||
|
|
312
|
+
pathEquals(output.path, projectConfig.workspaceDir)) {
|
|
313
|
+
throw new Error(`The output path is set to "${relPath}", but this will overwrite the working directory of Vivliostyle. Please specify a different path.`);
|
|
314
|
+
}
|
|
315
|
+
}
|
|
316
|
+
const { entries, workspaceDir } = projectConfig;
|
|
317
|
+
const duplicatedTarget = entries.find((v1, i) => entries.findLastIndex((v2) => v1.target === v2.target) !== i)?.target;
|
|
318
|
+
if (duplicatedTarget) {
|
|
319
|
+
const sourceFile = entries.find((entry) => entry.target === duplicatedTarget && entry.source?.type === 'file')?.source;
|
|
320
|
+
throw new Error(`The output path "${upath.relative(workspaceDir, duplicatedTarget)}" will overwrite existing content.` +
|
|
321
|
+
(sourceFile
|
|
322
|
+
? ` Please choose a different name for the source file: ${sourceFile.pathname}`
|
|
323
|
+
: ''));
|
|
324
|
+
}
|
|
288
325
|
const resolvedConfig = {
|
|
289
326
|
...projectConfig,
|
|
290
327
|
context,
|
|
@@ -324,10 +361,9 @@ export function resolveTaskConfig(config, options) {
|
|
|
324
361
|
viteConfig,
|
|
325
362
|
viteConfigFile,
|
|
326
363
|
};
|
|
327
|
-
Logger.debug('resolvedConfig', JSON.stringify(resolvedConfig, null, 2));
|
|
328
364
|
return resolvedConfig;
|
|
329
365
|
}
|
|
330
|
-
function resolveSingleInputConfig({ config, input, context, temporaryFilePrefix, themeIndexes, }) {
|
|
366
|
+
function resolveSingleInputConfig({ config, input, context, temporaryFilePrefix, themeIndexes, base, }) {
|
|
331
367
|
Logger.debug('entering single entry config mode');
|
|
332
368
|
let sourcePath;
|
|
333
369
|
let workspaceDir;
|
|
@@ -346,8 +382,6 @@ function resolveSingleInputConfig({ config, input, context, temporaryFilePrefix,
|
|
|
346
382
|
statFileSync(sourcePath);
|
|
347
383
|
switch (input.format) {
|
|
348
384
|
case 'webbook':
|
|
349
|
-
workspaceDir = context;
|
|
350
|
-
break;
|
|
351
385
|
case 'markdown':
|
|
352
386
|
case 'pub-manifest':
|
|
353
387
|
case 'epub':
|
|
@@ -374,9 +408,8 @@ function resolveSingleInputConfig({ config, input, context, temporaryFilePrefix,
|
|
|
374
408
|
sourcePath,
|
|
375
409
|
workspaceDir,
|
|
376
410
|
});
|
|
377
|
-
const relDir = upath.relative(context, upath.dirname(sourcePath));
|
|
378
411
|
const target = upath
|
|
379
|
-
.resolve(workspaceDir,
|
|
412
|
+
.resolve(workspaceDir, `${temporaryFilePrefix}${upath.basename(sourcePath)}`)
|
|
380
413
|
.replace(/\.md$/, '.html');
|
|
381
414
|
touchTmpFile(target);
|
|
382
415
|
const themes = metadata.themes ??
|
|
@@ -425,16 +458,25 @@ function resolveSingleInputConfig({ config, input, context, temporaryFilePrefix,
|
|
|
425
458
|
};
|
|
426
459
|
}
|
|
427
460
|
else if (inputFormat === 'webbook') {
|
|
428
|
-
|
|
429
|
-
|
|
430
|
-
|
|
431
|
-
|
|
432
|
-
|
|
433
|
-
|
|
434
|
-
|
|
435
|
-
|
|
461
|
+
let webbookEntryUrl;
|
|
462
|
+
let webbookPath;
|
|
463
|
+
if (isValidUri(sourcePath)) {
|
|
464
|
+
const url = new URL(sourcePath);
|
|
465
|
+
// Ensures trailing slash or explicit HTML extensions
|
|
466
|
+
if (/^https?:/i.test(url.protocol) &&
|
|
467
|
+
!url.pathname.endsWith('/') &&
|
|
468
|
+
!/\.html?$/.test(url.pathname)) {
|
|
469
|
+
url.pathname = `${url.pathname}/`;
|
|
470
|
+
}
|
|
471
|
+
webbookEntryUrl = url.href;
|
|
472
|
+
}
|
|
473
|
+
else {
|
|
474
|
+
const rootFileUrl = pathToFileURL(workspaceDir).href;
|
|
475
|
+
const urlPath = pathToFileURL(sourcePath).href.slice(rootFileUrl.length);
|
|
476
|
+
webbookEntryUrl = `${base}${urlPath}`;
|
|
477
|
+
webbookPath = sourcePath;
|
|
436
478
|
}
|
|
437
|
-
viewerInput = { type: 'webbook', webbookEntryUrl
|
|
479
|
+
viewerInput = { type: 'webbook', webbookEntryUrl, webbookPath };
|
|
438
480
|
}
|
|
439
481
|
else if (inputFormat === 'pub-manifest') {
|
|
440
482
|
viewerInput = {
|
|
@@ -488,6 +530,7 @@ function resolveComposedProjectConfig({ config, context, entryContextDir, output
|
|
|
488
530
|
workspaceDir,
|
|
489
531
|
themesDir,
|
|
490
532
|
})) ?? [];
|
|
533
|
+
rootThemes.forEach((t) => themeIndexes.add(t));
|
|
491
534
|
const tocConfig = {
|
|
492
535
|
tocTitle: config.toc?.title ?? config?.tocTitle ?? TOC_TITLE,
|
|
493
536
|
target: upath.resolve(workspaceDir, config.toc?.htmlPath ?? TOC_FILENAME),
|