vite-plus 0.1.23 → 0.2.0

package/dist/pack-bin.js

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { i as resolveViteConfig } from "./resolve-vite-config-TTvhycU1.js";
+import { a as resolveViteConfig } from "./resolve-vite-config-CmdsfQzS.js";
 import module from "node:module";
 import { buildWithConfigs, enableDebug, globalLogger, resolveUserConfig } from "@voidzero-dev/vite-plus-core/pack";
 //#region ../../node_modules/.pnpm/cac@7.0.0/node_modules/cac/dist/index.js
@@ -621,26 +621,55 @@ var CAC = class extends EventTarget {
 const cac = (name = "") => new CAC(name);
 //#endregion
 //#region src/pack-bin.ts
+const RE_DTS = /\.d\.[cm]?ts$/;
+const EXTERNAL_DTS_PKG_RE = /^(?:postcss|lightningcss|vitest|@vitest\/[^/]+|vite-plus)(?:\/|$)/;
 /**
-* Rolldown plugin that transforms value imports/exports to type-only in external
-* packages' .d.ts files. Some packages (e.g. postcss, lightningcss) use
-* `import { X }` and `export { X } from` instead of their type-only equivalents,
-* which causes MISSING_EXPORT warnings from the DTS bundler.
+* Rolldown plugin that keeps `postcss` / `lightningcss` / `vitest` / `@vitest/*`
+* / `vite-plus` external to the DTS bundle.
 *
-* Since .d.ts files contain only type information, all imports/exports are
-* inherently type-only, so this transformation is always safe.
+* The DTS bundler resolves these packages and tries to inline their `.d.ts`
+* files. postcss ships its public types as a CJS `export = postcss` over a
+* `declare namespace postcss { export { AtRule, ... } }` (see
+* postcss/lib/postcss.d.ts), and its ESM types entry (postcss.d.mts) re-exports
+* those names with `export { AtRule, ... } from './postcss.js'`. The bundler
+* cannot map named imports onto an `export =`'d namespace's members, so every
+* consumer `import type { AtRule } from 'postcss'` becomes a MISSING_EXPORT
+* error.
+*
+* vitest fails for a different reason: `vitest@4.1.9`'s `dist/index.d.ts`
+* re-exports `ExpectPollOptions` from `@vitest/expect`, but `@vitest/expect`
+* does not actually export that name. `tsc` tolerates the dangling re-export
+* because it only resolves re-exports lazily on use, but the DTS bundler
+* eagerly resolves every re-export while inlining and so hits the missing
+* export. `@vitest/browser/matchers.d.ts` then re-imports the same name from
+* `vitest`, propagating the failure. Established vite-plus projects reach
+* these files through the `vite-plus/test*` shims, which re-export `vitest` /
+* `@vitest/*` from declaration files.
+*
+* `vite-plus` itself (root and `vite-plus/test*` shims) is kept external so the
+* PUBLIC specifier survives in the emitted declarations. If the shim were
+* inlined instead, its private `vitest` / `@vitest/*` re-exports would be the
+* ones externalized above and the published `.d.ts` would carry bare `vitest`
+* specifiers — unresolvable for consumers under strict pnpm / Yarn PnP layouts,
+* where `vitest` is a dependency of `vite-plus` and not of the packed package.
+*
+* Marking these packages external for `.d.ts` importers leaves the import
+* untouched in the emitted declarations (`import type { AtRule } from 'postcss'`),
+* which is how third-party packages should be treated in a DTS bundle anyway.
+* They are only externalized when imported *from a declaration file*, so runtime
+* bundling is unaffected.
 */
-const EXTERNAL_DTS_INTERNAL_RE = /node_modules\/(postcss|lightningcss)\/.*\.d\.(ts|mts|cts)$/;
-const EXTERNAL_DTS_FIX_RE = new RegExp(`${EXTERNAL_DTS_INTERNAL_RE.source}|${/(?:vite-plus-core|packages\/core)\/.*lightningcssOptions\.d\.ts$|(?:vite-plus-core|packages\/core)\/dist\/.*\.d\.ts$/.source}`);
 function externalDtsTypeOnlyPlugin() {
 	return {
 		name: "vite-plus:external-dts-type-only",
-		transform: {
-			filter: { id: { include: [EXTERNAL_DTS_FIX_RE] } },
-			handler(code, rawId) {
-				const id = rawId.replaceAll("\\", "/");
-				if (EXTERNAL_DTS_INTERNAL_RE.test(id)) return code.replace(/^(import\s+)(?!type\s)/gm, "import type ");
-				return code.replace(/^(import\s+)(?!type\s)(.+from\s+['"](?:postcss|lightningcss)['"])/gm, "import type $2");
+		resolveId: {
+			order: "pre",
+			handler(id, importer) {
+				const normalizedImporter = importer?.replaceAll("\\", "/");
+				if (normalizedImporter && RE_DTS.test(normalizedImporter) && EXTERNAL_DTS_PKG_RE.test(id)) return {
+					id,
+					external: true
+				};
 			}
 		}
 	};

package/dist/{package-PmBUZ-ve.js → package-BHirM1_v.js}

@@ -1,144 +1,9 @@
-import "./constants-DCBWlNrn.js";
-import { r as parse } from "./main-DpJl3LoU.js";
+import "./constants-CrfJQIUX.js";
+import { r as readJsonFile } from "./json-Dn87fvjk.js";
 import { createRequire } from "node:module";
 import path from "node:path";
 import fs from "node:fs";
 import os from "node:os";
-//#region ../../node_modules/.pnpm/detect-indent@7.0.2/node_modules/detect-indent/index.js
-const INDENT_REGEX = /^(?:( )+|\t+)/;
-const INDENT_TYPE_SPACE = "space";
-const INDENT_TYPE_TAB = "tab";
-function shouldIgnoreSingleSpace(ignoreSingleSpaces, indentType, value) {
-	return ignoreSingleSpaces && indentType === INDENT_TYPE_SPACE && value === 1;
-}
-/**
-Make a Map that counts how many indents/unindents have occurred for a given size and how many lines follow a given indentation.
-
-The key is a concatenation of the indentation type (s = space and t = tab) and the size of the indents/unindents.
-
-```
-indents = {
-t3: [1, 0],
-t4: [1, 5],
-s5: [1, 0],
-s12: [1, 0],
-}
-```
-*/
-function makeIndentsMap(string, ignoreSingleSpaces) {
-	const indents = /* @__PURE__ */ new Map();
-	let previousSize = 0;
-	let previousIndentType;
-	let key;
-	for (const line of string.split(/\n/g)) {
-		if (!line) continue;
-		const matches = line.match(INDENT_REGEX);
-		if (matches === null) {
-			previousSize = 0;
-			previousIndentType = "";
-		} else {
-			const indent = matches[0].length;
-			const indentType = matches[1] ? INDENT_TYPE_SPACE : INDENT_TYPE_TAB;
-			if (shouldIgnoreSingleSpace(ignoreSingleSpaces, indentType, indent)) continue;
-			if (indentType !== previousIndentType) previousSize = 0;
-			previousIndentType = indentType;
-			let use = 1;
-			let weight = 0;
-			const indentDifference = indent - previousSize;
-			previousSize = indent;
-			if (indentDifference === 0) {
-				use = 0;
-				weight = 1;
-			} else {
-				const absoluteIndentDifference = Math.abs(indentDifference);
-				if (shouldIgnoreSingleSpace(ignoreSingleSpaces, indentType, absoluteIndentDifference)) continue;
-				key = encodeIndentsKey(indentType, absoluteIndentDifference);
-			}
-			const entry = indents.get(key);
-			indents.set(key, entry === void 0 ? [1, 0] : [entry[0] + use, entry[1] + weight]);
-		}
-	}
-	return indents;
-}
-function encodeIndentsKey(indentType, indentAmount) {
-	return (indentType === INDENT_TYPE_SPACE ? "s" : "t") + String(indentAmount);
-}
-function decodeIndentsKey(indentsKey) {
-	return {
-		type: indentsKey[0] === "s" ? INDENT_TYPE_SPACE : INDENT_TYPE_TAB,
-		amount: Number(indentsKey.slice(1))
-	};
-}
-function getMostUsedKey(indents) {
-	let result;
-	let maxUsed = 0;
-	let maxWeight = 0;
-	for (const [key, [usedCount, weight]] of indents) if (usedCount > maxUsed || usedCount === maxUsed && weight > maxWeight) {
-		maxUsed = usedCount;
-		maxWeight = weight;
-		result = key;
-	}
-	return result;
-}
-function makeIndentString(type, amount) {
-	return (type === INDENT_TYPE_SPACE ? " " : "	").repeat(amount);
-}
-function detectIndent(string) {
-	if (typeof string !== "string") throw new TypeError("Expected a string");
-	let indents = makeIndentsMap(string, true);
-	if (indents.size === 0) indents = makeIndentsMap(string, false);
-	const keyOfMostUsedIndent = getMostUsedKey(indents);
-	let type;
-	let amount = 0;
-	let indent = "";
-	if (keyOfMostUsedIndent !== void 0) {
-		({type, amount} = decodeIndentsKey(keyOfMostUsedIndent));
-		indent = makeIndentString(type, amount);
-	}
-	return {
-		amount,
-		type,
-		indent
-	};
-}
-//#endregion
-//#region ../../node_modules/.pnpm/detect-newline@4.0.1/node_modules/detect-newline/index.js
-function detectNewline(string) {
-	if (typeof string !== "string") throw new TypeError("Expected a string");
-	const newlines = string.match(/(?:\r?\n)/g) || [];
-	if (newlines.length === 0) return;
-	const crlf = newlines.filter((newline) => newline === "\r\n").length;
-	return crlf > newlines.length - crlf ? "\r\n" : "\n";
-}
-//#endregion
-//#region src/utils/json.ts
-function readJsonFile(file, allowComments) {
-	const content = fs.readFileSync(file, "utf-8");
-	return (allowComments ? parse : JSON.parse)(content);
-}
-function writeJsonFile(file, data) {
-	let newline = "\n";
-	let indent = "  ";
-	if (fs.existsSync(file)) {
-		const content = fs.readFileSync(file, "utf-8");
-		indent = detectIndent(content).indent;
-		newline = detectNewline(content) ?? "";
-	}
-	fs.writeFileSync(file, JSON.stringify(data, null, indent) + newline, "utf-8");
-}
-function editJsonFile(file, callback) {
-	const newJson = callback(readJsonFile(file));
-	if (newJson) writeJsonFile(file, newJson);
-}
-function isJsonFile(file) {
-	try {
-		readJsonFile(file);
-		return true;
-	} catch {
-		return false;
-	}
-}
-//#endregion
 //#region src/utils/npm-config.ts
 function expandNpmrcValue(raw) {
 	let value = raw.trim();
@@ -321,4 +186,4 @@ async function checkNpmPackageExists(packageName) {
 	}
 }
 //#endregion
-export { readNearestPackageJson as a, editJsonFile as c, writeJsonFile as d, hasVitePlusDependency as i, isJsonFile as l, detectPackageMetadata as n, fetchNpmResource as o, getScopeFromPackageName as r, getNpmRegistry as s, checkNpmPackageExists as t, readJsonFile as u };
+export { readNearestPackageJson as a, hasVitePlusDependency as i, detectPackageMetadata as n, fetchNpmResource as o, getScopeFromPackageName as r, getNpmRegistry as s, checkNpmPackageExists as t };

package/dist/{report-DgSBQUdz.js → report-BHSkWqRR.js}

@@ -7,6 +7,7 @@ function createMigrationReport() {
 		inlinedLintStagedConfigCount: 0,
 		removedConfigCount: 0,
 		tsdownImportCount: 0,
+		wrappedPluginConfigCount: 0,
 		rewrittenImportFileCount: 0,
 		rewrittenImportErrors: [],
 		eslintMigrated: false,
@@ -14,6 +15,7 @@ function createMigrationReport() {
 		nodeVersionFileMigrated: false,
 		gitHooksConfigured: false,
 		frameworkShimAdded: false,
+		packageManagerBootstrapConfigured: false,
 		warnings: [],
 		manualSteps: []
 	};

package/dist/{resolve-vite-config-TTvhycU1.js → resolve-vite-config-CmdsfQzS.js}

@@ -2,11 +2,11 @@ import path from "node:path";
 import fs from "node:fs";
 //#region src/resolve-vite-config.ts
 const VITE_CONFIG_FILES = [
-	"vite.config.ts",
 	"vite.config.js",
 	"vite.config.mjs",
-	"vite.config.mts",
+	"vite.config.ts",
 	"vite.config.cjs",
+	"vite.config.mts",
 	"vite.config.cts"
 ];
 /**
@@ -26,8 +26,17 @@ function findViteConfigUp(startDir, stopDir) {
 		dir = parent;
 	}
 }
+/**
+* Find a vite config file directly in `dir` (no walking up). Returns the
+* absolute path of the first config file found, or undefined. Covers every
+* supported extension (`.ts/.js/.mjs/.mts/.cjs/.cts`).
+*/
+function findViteConfig(dir) {
+	const filename = VITE_CONFIG_FILES.find((f) => fs.existsSync(path.join(dir, f)));
+	return filename ? path.join(dir, filename) : void 0;
+}
 function hasViteConfig(dir) {
-	return VITE_CONFIG_FILES.some((f) => fs.existsSync(path.join(dir, f)));
+	return findViteConfig(dir) !== void 0;
 }
 /**
 * Find the workspace root by walking up from `startDir` looking for
@@ -81,4 +90,4 @@ async function resolveUniversalViteConfig(err, viteConfigCwd) {
 	}
 }
 //#endregion
-export { resolveViteConfig as i, hasViteConfig as n, resolveUniversalViteConfig as r, findWorkspaceRoot as t };
+export { resolveViteConfig as a, resolveUniversalViteConfig as i, findWorkspaceRoot as n, hasViteConfig as r, findViteConfig as t };