@slidev/cli 52.15.1 → 52.16.0

package/dist/{build-yk6Ejluk.mjs → build-BtXN8hyb.mjs}

@@ -1,5 +1,4 @@
-import "./resolver-XedCEhxI.mjs";
-import { t as resolveViteConfigs } from "./shared-ClfjhvJo.mjs";
+import { n as resolveViteConfigs } from "./serve-bnzg299W.mjs";
 import { join, resolve } from "node:path";
 import { build as build$1 } from "vite";
 import { existsSync } from "node:fs";
@@ -7,7 +6,6 @@ import fs$1 from "node:fs/promises";
 import http from "node:http";
 import connect from "connect";
 import sirv from "sirv";
-
 //#region node/commands/build.ts
 async function build(options, viteConfig = {}, args) {
 	const indexHtmlId = resolve(options.userRoot, "index.html");
@@ -53,7 +51,7 @@ async function build(options, viteConfig = {}, args) {
 				dev: true
 			}));
 			server.listen(port);
-			const { exportSlides } = await import("./export-DA_9kPXd.mjs");
+			const { exportSlides } = await import("./export-BHxAO7pf.mjs");
 			const tempDir = resolve(outDir, "temp");
 			await fs$1.mkdir(tempDir, { recursive: true });
 			await exportSlides({
@@ -94,7 +92,7 @@ async function build(options, viteConfig = {}, args) {
 		"true",
 		"auto"
 	].includes(options.data.config.download)) {
-		const { exportSlides, getExportOptions } = await import("./export-DA_9kPXd.mjs");
+		const { exportSlides, getExportOptions } = await import("./export-BHxAO7pf.mjs");
 		const port = 12445;
 		const app = connect();
 		const server = http.createServer(app);
@@ -113,6 +111,5 @@ async function build(options, viteConfig = {}, args) {
 		server.close();
 	}
 }
-
 //#endregion
-export { build };
+export { build };

package/dist/cli.mjs

@@ -1,10 +1,8 @@
-import { i as resolveEntry, n as getRoots, r as isInstalledGlobally } from "./resolver-XedCEhxI.mjs";
-import { a as parser, c as resolveAddons, d as updateFrontmatterPatch, i as resolveOptions, l as version, o as getThemeMeta, s as resolveTheme, u as loadSetups } from "./shared-ClfjhvJo.mjs";
-import { t as createServer } from "./serve-CYSWeFFN.mjs";
+import { i as resolveEntry, r as isInstalledGlobally } from "./resolver-CZx9LFrt.mjs";
+import { a as resolveOptions, c as resolveTheme, d as updateFrontmatterPatch, l as version, o as parser, s as getThemeMeta, t as createServer, u as loadSetups } from "./serve-bnzg299W.mjs";
 import path from "node:path";
 import process from "node:process";
 import fs from "node:fs/promises";
-import { uniq } from "@antfu/utils";
 import { blue, bold, cyan, cyanBright, dim, gray, green, underline, yellow } from "ansis";
 import { injectPreparserExtensionLoader } from "@slidev/parser/fs";
 import equal from "fast-deep-equal";
@@ -15,20 +13,16 @@ import { verifyConfig } from "@slidev/parser";
 import { getPort } from "get-port-please";
 import openBrowser from "open";
 import yargs from "yargs";
-
 //#region node/setups/preparser.ts
 function setupPreparser() {
-	injectPreparserExtensionLoader(async (headmatter, filepath, mode) => {
-		const addons = Array.isArray(headmatter?.addons) ? headmatter.addons : [];
-		const { userRoot } = await getRoots();
-		return (await loadSetups(uniq([...await resolveAddons(addons), userRoot]), "preparser.ts", [{
+	injectPreparserExtensionLoader(async (roots, headmatter, filepath, mode) => {
+		return (await loadSetups(roots, "preparser.ts", [{
 			filepath,
 			headmatter,
 			mode
 		}])).flat();
 	});
 }
-
 //#endregion
 //#region node/cli.ts
 const RE_NODE_MODULES_OR_GIT = /node_modules|\.git/;
@@ -131,7 +125,6 @@ cli.command("* [entry]", "Start a local server for Slidev", (args) => commonOpti
 			server: {
 				port,
 				strictPort: true,
-				open,
 				host,
 				force
 			},
@@ -139,8 +132,8 @@ cli.command("* [entry]", "Start a local server for Slidev", (args) => commonOpti
 			logLevel: log,
 			base
 		}, { async loadData(loadedSource) {
-			const { data: oldData, entry: entry$1 } = options;
-			const loaded = await parser.load(options.userRoot, entry$1, loadedSource, "dev");
+			const { data: oldData, entry } = options;
+			const loaded = await parser.load(options, entry, loadedSource, "dev");
 			const themeRaw = theme || loaded.headmatter.theme || "default";
 			if (options.themeRaw !== themeRaw) {
 				console.log(yellow("\n  restarting on theme change\n"));
@@ -151,7 +144,7 @@ cli.command("* [entry]", "Start a local server for Slidev", (args) => commonOpti
 			const newData = {
 				...loaded,
 				themeMeta,
-				config: parser.resolveConfig(loaded.headmatter, themeMeta, entry$1)
+				config: parser.resolveConfig(loaded.headmatter, themeMeta, entry)
 			};
 			if (CONFIG_RESTART_FIELDS.some((i) => !equal(newData.config[i], oldData.config[i]))) {
 				console.log(yellow("\n  restarting on config change\n"));
@@ -172,12 +165,21 @@ cli.command("* [entry]", "Start a local server for Slidev", (args) => commonOpti
 		let publicIp;
 		if (remote) publicIp = await import("public-ip").then((r) => r.publicIpv4());
 		lastRemoteUrl = printInfo(options, port, base, remote, tunnelUrl, publicIp);
+		if (open) await openSlidevInBrowser();
 		return options;
 	}
-	async function openTunnel(port$1) {
+	async function openSlidevInBrowser() {
+		const url = `http://localhost:${port}${base}`;
+		try {
+			await openBrowser(url);
+		} catch {
+			console.log(yellow(`\n  Could not open the browser automatically. Please open ${url} in your browser.\n`));
+		}
+	}
+	async function openTunnel(port) {
 		const { startTunnel } = await import("untun");
 		return await (await startTunnel({
-			port: port$1,
+			port,
 			acceptCloudflareNotice: true
 		}))?.getURL() ?? "";
 	}
@@ -193,7 +195,7 @@ cli.command("* [entry]", "Start a local server for Slidev", (args) => commonOpti
 			name: "o",
 			fullname: "open",
 			action() {
-				openBrowser(`http://localhost:${port}${base}`);
+				openSlidevInBrowser();
 			}
 		},
 		{
@@ -223,7 +225,7 @@ cli.command("* [entry]", "Start a local server for Slidev", (args) => commonOpti
 					const code = r.renderUnicodeCompact(lastRemoteUrl);
 					console.log(`\n${dim("  QR Code for remote control: ")}\n  ${blue(lastRemoteUrl)}\n`);
 					console.log(code.split("\n").map((i) => `  ${i}`).join("\n"));
-					const publicIp = await import("public-ip").then((r$1) => r$1.publicIpv4());
+					const publicIp = await import("public-ip").then((r) => r.publicIpv4());
 					if (publicIp) console.log(`\n${dim(" Public IP: ")}  ${blue(publicIp)}\n`);
 				});
 			}
@@ -294,7 +296,7 @@ cli.command("build [entry..]", "Build hostable SPA", (args) => exportOptions(com
 	describe: "enable the inspect plugin for debugging"
 }).strict().help(), async (args) => {
 	const { entry, theme, base, download, out, inspect, "without-notes": withoutNotes, "router-mode": routerMode } = args;
-	const { build } = await import("./build-yk6Ejluk.mjs");
+	const { build } = await import("./build-BtXN8hyb.mjs");
 	for (const entryFile of entry) {
 		const options = await resolveOptions({
 			entry: entryFile,
@@ -328,8 +330,8 @@ cli.command("theme [subcommand]", "Theme related operations", (command) => {
 		default: "theme"
 	}), async ({ entry: entryRaw, dir, theme: themeInput }) => {
 		const entry = await resolveEntry(entryRaw);
-		const roots = await getRoots(entry);
-		const data = await parser.load(roots.userRoot, entry);
+		const options = await resolveOptions({ entry }, "dev");
+		const data = await parser.load(options, entry);
 		let themeRaw = themeInput || data.headmatter.theme;
 		themeRaw = themeRaw === null ? "none" : themeRaw || "default";
 		if (themeRaw === "none") {
@@ -359,7 +361,7 @@ cli.command("theme [subcommand]", "Theme related operations", (command) => {
 });
 cli.command("export [entry..]", "Export slides to PDF", (args) => exportOptions(commonOptions(args)).strict().help(), async (args) => {
 	const { entry, theme } = args;
-	const { exportSlides, getExportOptions } = await import("./export-DA_9kPXd.mjs");
+	const { exportSlides, getExportOptions } = await import("./export-BHxAO7pf.mjs");
 	const candidatePort = await getPort(12445);
 	let warned = false;
 	for (const entryFile of entry) {
@@ -411,7 +413,7 @@ cli.command("export-notes [entry..]", "Export slide notes to PDF", (args) => arg
 	type: "number",
 	describe: "wait for the specified ms before exporting"
 }).strict().help(), async ({ entry, output, timeout, wait }) => {
-	const { exportNotes } = await import("./export-DA_9kPXd.mjs");
+	const { exportNotes } = await import("./export-BHxAO7pf.mjs");
 	const candidatePort = await getPort(12445);
 	for (const entryFile of entry) {
 		const options = await resolveOptions({ entry: entryFile }, "export");
@@ -558,6 +560,5 @@ function printInfo(options, port, base, remote, tunnelUrl, publicIp) {
 		return lastRemoteUrl;
 	}
 }
-
 //#endregion
-export {  };
+export {};

package/dist/{export-DA_9kPXd.mjs → export-BHxAO7pf.mjs}

@@ -1,4 +1,4 @@
-import { n as getRoots } from "./resolver-XedCEhxI.mjs";
+import { n as getRoots } from "./resolver-CZx9LFrt.mjs";
 import path, { dirname, relative } from "node:path";
 import process from "node:process";
 import fs from "node:fs/promises";
@@ -11,7 +11,6 @@ import { parseRangeString } from "@slidev/parser/core";
 import { Presets, SingleBar } from "cli-progress";
 import * as pdfLib from "pdf-lib";
 import { PDFDocument } from "pdf-lib";
-
 //#region node/commands/export.ts
 const RE_CLICKS_PARAM = /clicks=([1-9]\d*)/;
 function addToTree(tree, info, slideIndexes, level = 1) {
@@ -28,8 +27,8 @@ function addToTree(tree, info, slideIndexes, level = 1) {
 	});
 }
 function makeOutline(tree) {
-	return tree.map(({ title, path: path$1, level, children }) => {
-		const rootOutline = title ? `${path$1}|${"-".repeat(level - 1)}|${title}` : null;
+	return tree.map(({ title, path, level, children }) => {
+		const rootOutline = title ? `${path}|${"-".repeat(level - 1)}|${title}` : null;
 		const childrenOutline = makeOutline(children);
 		return childrenOutline.length > 0 ? `${rootOutline}\n${childrenOutline}` : rootOutline;
 	}).filter((outline) => !!outline).join("\n");
@@ -101,8 +100,8 @@ async function exportNotes({ port = 18724, base = "/", output = "notes", timeout
 	browser.close();
 	return output;
 }
-async function exportSlides({ port = 18724, total = 0, range: range$1, format = "pdf", output = "slides", slides, base = "/", timeout = 3e4, wait = 0, dark = false, routerMode = "history", width = 1920, height = 1080, withClicks = false, executablePath = void 0, withToc = false, perSlide = false, scale = 1, waitUntil, omitBackground = false }) {
-	const pages = parseRangeString(total, range$1);
+async function exportSlides({ port = 18724, total = 0, range, format = "pdf", output = "slides", slides, base = "/", timeout = 3e4, wait = 0, dark = false, routerMode = "history", width = 1920, height = 1080, withClicks = false, executablePath = void 0, withToc = false, perSlide = false, scale = 1, waitUntil, omitBackground = false }) {
+	const pages = parseRangeString(total, range);
 	const { chromium } = await importPlaywright();
 	const browser = await chromium.launch({ executablePath });
 	const page = await (await browser.newContext({
@@ -127,7 +126,7 @@ async function exportSlides({ port = 18724, total = 0, range: range$1, format =
 		const query = new URLSearchParams();
 		if (withClicks) query.set("print", "clicks");
 		else query.set("print", "true");
-		if (range$1) query.set("range", range$1);
+		if (range) query.set("range", range);
 		if (clicks) query.set("clicks", clicks);
 		const url = routerMode === "hash" ? `http://localhost:${port}${base}?${query}#${no}` : `http://localhost:${port}${base}${no}?${query}`;
 		await page.goto(url, {
@@ -182,15 +181,15 @@ async function exportSlides({ port = 18724, total = 0, range: range$1, format =
 	}
 	async function getSlidesIndex() {
 		const clicksBySlide = {};
-		const slides$1 = page.locator(".print-slide-container");
-		const count = await slides$1.count();
+		const slides = page.locator(".print-slide-container");
+		const count = await slides.count();
 		for (let i = 0; i < count; i++) {
-			const id = await slides$1.nth(i).getAttribute("id") || "";
-			const path$1 = Number(id.split("-")[0]);
-			clicksBySlide[path$1] = (clicksBySlide[path$1] || 0) + 1;
+			const id = await slides.nth(i).getAttribute("id") || "";
+			const path = Number(id.split("-")[0]);
+			clicksBySlide[path] = (clicksBySlide[path] || 0) + 1;
 		}
-		return Object.fromEntries(Object.entries(clicksBySlide).reduce((acc, [path$1, clicks], i) => {
-			acc.push([path$1, clicks + (acc[i - 1]?.[1] ?? 0)]);
+		return Object.fromEntries(Object.entries(clicksBySlide).reduce((acc, [path, clicks], i) => {
+			acc.push([path, clicks + (acc[i - 1]?.[1] ?? 0)]);
 			return acc;
 		}, []));
 	}
@@ -232,8 +231,8 @@ async function exportSlides({ port = 18724, total = 0, range: range$1, format =
 		let mergedPdf = await PDFDocument.create({});
 		for (const pdfBytes of buffers) {
 			const pdf = await PDFDocument.load(pdfBytes);
-			(await mergedPdf.copyPages(pdf, pdf.getPageIndices())).forEach((page$1) => {
-				mergedPdf.addPage(page$1);
+			(await mergedPdf.copyPages(pdf, pdf.getPageIndices())).forEach((page) => {
+				mergedPdf.addPage(page);
 			});
 		}
 		addPdfMetadata(mergedPdf);
@@ -304,9 +303,9 @@ async function exportSlides({ port = 18724, total = 0, range: range$1, format =
 		if (!output.endsWith(".pdf")) output = `${output}.pdf`;
 		return perSlide ? genPagePdfPerSlide() : genPagePdfOnePiece();
 	}
-	async function genPagePng(writeToDisk) {
+	async function genPagePng(writeToDisk, cleanOutput = true) {
 		if (writeToDisk) {
-			await fs.rm(writeToDisk, {
+			if (cleanOutput) await fs.rm(writeToDisk, {
 				force: true,
 				recursive: true
 			});
@@ -315,7 +314,7 @@ async function exportSlides({ port = 18724, total = 0, range: range$1, format =
 		return perSlide ? genPagePngPerSlide(writeToDisk) : genPagePngOnePiece(writeToDisk);
 	}
 	async function genPageMd() {
-		const pngs = await genPagePng(dirname(output));
+		const pngs = await genPagePng(dirname(output), false);
 		const content = slides.filter(({ index }) => pages.includes(index + 1)).map(({ title, index, note }) => pngs.filter(({ slideIndex }) => slideIndex === index).map(({ filename }) => `![${title || index + 1}](./${filename})\n\n`).join("") + (note ? `${note.trim()}\n\n` : "")).join("---\n\n");
 		await fs.writeFile(ensureSuffix(".md", output), content);
 	}
@@ -334,9 +333,9 @@ async function exportSlides({ port = 18724, total = 0, range: range$1, format =
 		pptx.company = "Created using Slidev";
 		if (titleSlide?.title) pptx.title = titleSlide?.title;
 		if (titleSlide?.frontmatter?.info) pptx.subject = titleSlide?.frontmatter?.info;
-		pngs.forEach(({ slideIndex, buffer: buffer$1 }) => {
+		pngs.forEach(({ slideIndex, buffer }) => {
 			const slide = pptx.addSlide();
-			slide.background = { data: `data:image/png;base64,${buffer$1.toString("base64")}` };
+			slide.background = { data: `data:image/png;base64,${buffer.toString("base64")}` };
 			const note = slides[slideIndex].note;
 			if (note) slide.addNotes(note);
 		});
@@ -365,7 +364,7 @@ async function exportSlides({ port = 18724, total = 0, range: range$1, format =
 	}
 }
 function getExportOptions(args, options, outFilename) {
-	const { entry, output, format, timeout, wait, waitUntil, range: range$1, dark, withClicks, executablePath, withToc, perSlide, scale, omitBackground } = {
+	const { entry, output, format, timeout, wait, waitUntil, range, dark, withClicks, executablePath, withToc, perSlide, scale, omitBackground } = {
 		...options.data.config.export,
 		...args,
 		...clearUndefined({
@@ -382,7 +381,7 @@ function getExportOptions(args, options, outFilename) {
 		output: outFilename,
 		slides: options.data.slides,
 		total: options.data.slides.length,
-		range: range$1,
+		range,
 		format: format || "pdf",
 		timeout: timeout ?? 3e4,
 		wait: wait ?? 0,
@@ -417,6 +416,5 @@ async function importPlaywright() {
 	} catch {}
 	throw new Error("The exporting for Slidev is powered by Playwright, please install it via `npm i -D playwright-chromium`");
 }
-
 //#endregion
-export { exportNotes, exportSlides, getExportOptions };
+export { exportNotes, exportSlides, getExportOptions };

package/dist/index.d.mts

@@ -1,10 +1,9 @@
-import * as vite0 from "vite";
 import { InlineConfig, PluginOption } from "vite";
 import * as parser from "@slidev/parser/fs";
 import { ResolvedSlidevOptions, ResolvedSlidevUtils, SlidevEntryOptions, SlidevPluginOptions, SlidevServerOptions } from "@slidev/types";
 
 //#region node/commands/serve.d.ts
-declare function createServer(options: ResolvedSlidevOptions, viteConfig?: InlineConfig, serverOptions?: SlidevServerOptions): Promise<vite0.ViteDevServer>;
+declare function createServer(options: ResolvedSlidevOptions, viteConfig?: InlineConfig, serverOptions?: SlidevServerOptions): Promise<import("vite").ViteDevServer>;
 //#endregion
 //#region node/options.d.ts
 declare function resolveOptions(entryOptions: SlidevEntryOptions, mode: ResolvedSlidevOptions['mode']): Promise<ResolvedSlidevOptions>;

package/dist/index.mjs

@@ -1,5 +1,2 @@
-import "./resolver-XedCEhxI.mjs";
-import { a as parser, i as resolveOptions, n as ViteSlidevPlugin, r as createDataUtils } from "./shared-ClfjhvJo.mjs";
-import { t as createServer } from "./serve-CYSWeFFN.mjs";
-
-export { ViteSlidevPlugin, createDataUtils, createServer, parser, resolveOptions };
+import { a as resolveOptions, i as createDataUtils, o as parser, r as ViteSlidevPlugin, t as createServer } from "./serve-bnzg299W.mjs";
+export { ViteSlidevPlugin, createDataUtils, createServer, parser, resolveOptions };

package/dist/{resolver-XedCEhxI.mjs → resolver-CZx9LFrt.mjs}

@@ -1,8 +1,8 @@
-import { dirname, join, relative, resolve } from "node:path";
+import { dirname, join, relative, resolve, sep } from "node:path";
 import process from "node:process";
-import { existsSync } from "node:fs";
+import { existsSync, lstatSync, readdirSync, readlinkSync } from "node:fs";
 import { copyFile, readFile } from "node:fs/promises";
-import { fileURLToPath } from "node:url";
+import { fileURLToPath, pathToFileURL } from "node:url";
 import { parseNi, run } from "@antfu/ni";
 import { ensurePrefix, slash } from "@antfu/utils";
 import { underline, yellow } from "ansis";
@@ -11,10 +11,90 @@ import { resolvePath } from "mlly";
 import prompts from "prompts";
 import { resolveGlobal } from "resolve-global";
 import { findClosestPkgJsonPath, findDepPkgJsonPath } from "vitefu";
-
 //#region node/resolver.ts
 const RE_PATH_SEPARATOR = /[/\\]/;
+const RE_SAFE_PKG_NAME = /^(?:@[a-z0-9-~][a-z0-9-._~]*\/)?[a-z0-9-~][a-z0-9-._~]*$/;
 const cliRoot = fileURLToPath(new URL("..", import.meta.url));
+/**
+* Detect the `node_modules/` directory the running slidev binary was
+* dispatched from. The simple `findDepPkgJsonPath(name, cliRoot)` walk fails
+* in pnpm v11+ global installs because `cliRoot` is the realpath inside the
+* content-addressable store, with no path back to the install directory. The
+* invocation path (`process.argv[1]`), however, is one of:
+*
+* - `{PNPM_HOME}/v11/{hash}/node_modules/@slidev/cli/bin/slidev.mjs` — pnpm
+*   v11 globals dispatch through a shell shim in `{PNPM_HOME}/bin/` that exec's
+*   `node` with this argv[1].
+* - `{globals}/node_modules/@slidev/cli/bin/slidev.mjs` — npm/yarn globals,
+*   where the bin is a fs symlink and the resolved script path keeps the
+*   `node_modules` segment.
+* - `./node_modules/.bin/slidev` — local project, where Node resolves the
+*   `.bin` symlink before populating argv[1].
+*
+* Returns the trailing `node_modules` directory of that path, or `undefined`
+* if `argv1` doesn't pass through one.
+*
+* Exported for tests.
+*/
+function findInvocationNodeModulesPath(argv1) {
+	if (!argv1) return void 0;
+	const direct = resolve(argv1);
+	const segment = `${sep}node_modules${sep}`;
+	const directIdx = direct.lastIndexOf(segment);
+	if (directIdx >= 0) return direct.slice(0, directIdx + 1 + 12);
+	let current = direct;
+	for (let i = 0; i < 16; i++) {
+		let stat;
+		try {
+			stat = lstatSync(current);
+		} catch {
+			return;
+		}
+		if (!stat.isSymbolicLink()) return void 0;
+		const target = readlinkSync(current);
+		current = resolve(dirname(current), target);
+		const idx = current.lastIndexOf(segment);
+		if (idx >= 0) return current.slice(0, idx + 1 + 12);
+	}
+}
+/**
+* Candidate `node_modules` directories to search when slidev is installed
+* globally. Always includes the invocation's own `node_modules` (the install
+* group `@slidev/cli` lives in), plus every sibling install group's
+* `node_modules` so cross-group lookups can succeed.
+*
+* pnpm v11 lays globals out as `{root}/v11/{hash}/node_modules/...`; each
+* `pnpm add -g <pkg>` invocation creates its own `{hash}` directory even
+* when multiple packages are listed in one call. Walking the parent of the
+* cli's install group lets us discover packages that landed in sibling
+* groups (e.g. a theme installed alongside `@slidev/cli`).
+*
+* Exported for tests.
+*/
+function computeInvocationSearchPaths(ownNodeModules) {
+	if (!ownNodeModules) return [];
+	const paths = [ownNodeModules];
+	const installDir = dirname(ownNodeModules);
+	const globalRoot = dirname(installDir);
+	if (!globalRoot || globalRoot === installDir) return paths;
+	let siblings;
+	try {
+		siblings = readdirSync(globalRoot);
+	} catch {
+		return paths;
+	}
+	for (const sib of siblings) {
+		const sibInstall = join(globalRoot, sib);
+		if (sibInstall === installDir) continue;
+		const sibNm = join(sibInstall, "node_modules");
+		try {
+			if (lstatSync(sibNm).isDirectory()) paths.push(sibNm);
+		} catch {}
+	}
+	return paths;
+}
+const invocationNodeModules = findInvocationNodeModulesPath(process.argv[1]);
+const invocationSearchPaths = computeInvocationSearchPaths(invocationNodeModules);
 const isInstalledGlobally = {};
 /**
 * Resolve path for import url on Vite client side
@@ -22,27 +102,38 @@ const isInstalledGlobally = {};
 async function resolveImportUrl(id) {
 	return toAtFS(await resolveImportPath(id, true));
 }
-function toAtFS(path$1) {
-	return `/@fs${ensurePrefix("/", slash(path$1))}`;
+function toAtFS(path) {
+	return `/@fs${ensurePrefix("/", slash(path))}`;
 }
 async function resolveImportPath(importName, ensure = false) {
 	try {
 		return await resolvePath(importName, { url: import.meta.url });
 	} catch {}
-	if (isInstalledGlobally.value) try {
-		return resolveGlobal(importName);
-	} catch {}
+	if (isInstalledGlobally.value) {
+		for (const nm of invocationSearchPaths) try {
+			return await resolvePath(importName, { url: pathToFileURL(`${nm}${sep}`) });
+		} catch {}
+		try {
+			return resolveGlobal(importName);
+		} catch {}
+	}
 	if (ensure) throw new Error(`Failed to resolve package "${importName}"`);
 }
 async function findPkgRoot(dep, parent, ensure = false) {
 	const pkgJsonPath = await findDepPkgJsonPath(dep, parent);
-	const path$1 = pkgJsonPath ? dirname(pkgJsonPath) : isInstalledGlobally.value ? await findGlobalPkgRoot(dep, false) : void 0;
-	if (ensure && !path$1) throw new Error(`Failed to resolve package "${dep}"`);
-	return path$1;
+	const path = pkgJsonPath ? dirname(pkgJsonPath) : isInstalledGlobally.value ? await findGlobalPkgRoot(dep, false) : void 0;
+	if (ensure && !path) throw new Error(`Failed to resolve package "${dep}"`);
+	return path;
 }
 async function findGlobalPkgRoot(name, ensure = false) {
 	const localPath = await findDepPkgJsonPath(name, cliRoot);
 	if (localPath) return dirname(localPath);
+	for (const nm of invocationSearchPaths) {
+		const direct = join(nm, ...name.split("/"), "package.json");
+		if (existsSync(direct)) return dirname(direct);
+		const walked = await findDepPkgJsonPath(name, nm);
+		if (walked) return dirname(walked);
+	}
 	const yarnPath = join(globalDirs.yarn.packages, name);
 	if (existsSync(`${yarnPath}/package.json`)) return yarnPath;
 	const npmPath = join(globalDirs.npm.packages, name);
@@ -93,12 +184,13 @@ function createResolver(type, officials) {
 		if (name[0] === "/") return [name, name];
 		if (name.startsWith("@/")) return [name, resolve(userRoot, name.slice(2))];
 		if (name[0] === "." || name[0] !== "@" && name.includes("/")) return [name, resolve(dirname(importer), name)];
+		if (!RE_SAFE_PKG_NAME.test(name)) throw new Error(`Invalid ${type} name "${name}". Only valid npm package names are allowed.`);
 		{
 			const possiblePkgNames = [name];
 			if (!name.includes("/") && !name.startsWith("@")) possiblePkgNames.unshift(`@slidev/${type}-${name}`, `slidev-${type}-${name}`);
-			for (const pkgName$1 of possiblePkgNames) {
-				const pkgRoot = await findPkgRoot(pkgName$1, importer);
-				if (pkgRoot) return [pkgName$1, pkgRoot];
+			for (const pkgName of possiblePkgNames) {
+				const pkgRoot = await findPkgRoot(pkgName, importer);
+				if (pkgRoot) return [pkgName, pkgRoot];
 			}
 		}
 		const pkgName = officials[name] ?? (name[0] === "@" ? name : `slidev-${type}-${name}`);
@@ -107,14 +199,14 @@ function createResolver(type, officials) {
 	};
 }
 async function getUserPkgJson(userRoot) {
-	const path$1 = resolve(userRoot, "package.json");
-	if (existsSync(path$1)) return JSON.parse(await readFile(path$1, "utf-8"));
+	const path = resolve(userRoot, "package.json");
+	if (existsSync(path)) return JSON.parse(await readFile(path, "utf-8"));
 	return {};
 }
 async function hasWorkspacePackageJSON(root) {
-	const path$1 = join(root, "package.json");
-	if (!existsSync(path$1)) return false;
-	return !!(JSON.parse(await readFile(path$1, "utf-8")) || {}).workspaces;
+	const path = join(root, "package.json");
+	if (!existsSync(path)) return false;
+	return !!(JSON.parse(await readFile(path, "utf-8")) || {}).workspaces;
 }
 function hasRootFile(root) {
 	return ["pnpm-workspace.yaml"].some((file) => existsSync(join(root, file)));
@@ -134,7 +226,7 @@ async function getRoots(entry) {
 	if (rootsInfo) return rootsInfo;
 	if (!entry) throw new Error("[slidev] Cannot find roots without entry");
 	const userRoot = dirname(entry);
-	isInstalledGlobally.value = slash(relative(userRoot, process.argv[1])).includes("/.pnpm/") || (await import("is-installed-globally")).default;
+	isInstalledGlobally.value = slash(relative(userRoot, process.argv[1])).includes("/.pnpm/") || invocationNodeModules != null && slash(relative(userRoot, invocationNodeModules)).startsWith("..") || (await import("is-installed-globally")).default;
 	const clientRoot = await findPkgRoot("@slidev/client", cliRoot, true);
 	const closestPkgRoot = dirname(await findClosestPkgJsonPath(userRoot) || userRoot);
 	rootsInfo = {
@@ -162,6 +254,5 @@ function resolveSourceFiles(roots, subpath, extensions = [
 	}
 	return results;
 }
-
 //#endregion
-export { resolveImportPath as a, toAtFS as c, resolveEntry as i, getRoots as n, resolveImportUrl as o, isInstalledGlobally as r, resolveSourceFiles as s, createResolver as t };
+export { resolveImportPath as a, toAtFS as c, resolveEntry as i, getRoots as n, resolveImportUrl as o, isInstalledGlobally as r, resolveSourceFiles as s, createResolver as t };