revojs 0.2.31 → 0.2.33

package/dist/module/index.d.ts

@@ -27,7 +27,7 @@ export type InferVariables<T extends Record<string, Variable>> = {
 export type UnionToIntersection<TUnion> = (TUnion extends unknown ? (arg: TUnion) => void : never) extends (arg: infer TIntersection) => void ? TIntersection : never;
 export type InferModuleConfig<TModule> = TModule extends Module<infer TName extends string, infer TConfig, infer TDependencies extends ReadonlyArray<Module>> ? Record<TName, TConfig> & InferModuleConfigs<TDependencies> : never;
 export type InferModuleConfigs<TModules extends ReadonlyArray<Module>> = Partial<UnionToIntersection<InferModuleConfig<TModules[number]>>>;
-export type ModuleInput<TModules extends ReadonlyArray<Module>> = Mergeable<Config> & InferModuleConfigs<TModules> & {
+export type ModuleInput<TModules extends ReadonlyArray<Module>> = Mergeable<Config> & Mergeable<InferModuleConfigs<TModules>> & {
     modules?: TModules;
 };
 export type ModuleSetupResult<TName extends string, TConfig, TDependencies extends ReadonlyArray<Module> = []> = void | (Mergeable<Config> & Mergeable<Record<TName, TConfig>> & Mergeable<InferModuleConfigs<TDependencies>>);
@@ -73,6 +73,13 @@ export interface EnumVariable {
     default?: string;
     optional?: boolean;
 }
+export interface PackageManifest {
+    name?: string;
+    dependencies?: Record<string, string>;
+    devDependencies?: Record<string, string>;
+    peerDependencies?: Record<string, string>;
+    optionalDependencies?: Record<string, string>;
+}
 export interface Config {
     copy: Array<string>;
     modules: Array<Module>;
@@ -103,6 +110,7 @@ export declare function posixPath(path: string): string;
 export declare function resolvePattern(pattern: string, cwd?: string): string[];
 export declare function resolvePaths(patterns: string | ArrayLike<string>, cwd?: string): string[];
 export declare function matchesConsumer(path: string, consumer: Consumer): boolean;
+export declare function resolveFrameworkPackages(root: string): string[];
 export declare function resolveSource(source: Source): Map<string, Map<string, string>>;
 export declare function useModule(source: string | URL): {
     fromModule: (...paths: Array<string>) => string;

package/dist/module/index.js

@@ -58,6 +58,42 @@ function matchesConsumer(path, consumer) {
 	const marker = /\.(client|server)\.[^./]+$/.exec(path)?.[1];
 	return marker === void 0 || marker === consumer;
 }
+function resolveFrameworkPackages(root) {
+	const packages = /* @__PURE__ */ new Set();
+	const checked = /* @__PURE__ */ new Set();
+	const manifests = [resolve(root, "package.json")];
+	for (const [index, path] of manifests.entries()) {
+		let manifest;
+		try {
+			manifest = JSON.parse(readFileSync(path, "utf8"));
+		} catch {
+			continue;
+		}
+		const groups = [
+			manifest.dependencies,
+			manifest.peerDependencies,
+			manifest.optionalDependencies
+		];
+		if (index === 0) groups.push(manifest.devDependencies);
+		for (const dependencies of groups) for (const name in dependencies) {
+			if (checked.has(name)) continue;
+			checked.add(name);
+			let dependencyPath;
+			try {
+				dependencyPath = findPackageJSON(name, pathToFileURL(path).href);
+			} catch {
+				continue;
+			}
+			if (dependencyPath === void 0) continue;
+			const dependency = JSON.parse(readFileSync(dependencyPath, "utf8"));
+			if (name === package_default.name || dependency.dependencies?.[package_default.name] !== void 0 || dependency.peerDependencies?.[package_default.name] !== void 0) {
+				packages.add(name);
+				manifests.push(dependencyPath);
+			}
+		}
+	}
+	return [...packages];
+}
 function resolveSource(source) {
 	const scopes = /* @__PURE__ */ new Map();
 	for (const directory of source.from) {
@@ -303,11 +339,13 @@ async function module(inputConfig) {
 }
 async function revojs(inputConfig) {
 	const config = await createConfig(inputConfig);
+	const frameworkPackages = resolveFrameworkPackages(".");
 	return [await core(config), {
 		name: package_default.name,
 		config() {
 			return mergeObjects({
 				appType: config.modules.length === 0 ? "spa" : "custom",
+				resolve: { dedupe: frameworkPackages },
 				builder: {
 					sharedConfigBuild: true,
 					async buildApp(builder) {
@@ -317,6 +355,16 @@ async function revojs(inputConfig) {
 				}
 			}, config.vite);
 		},
+		configEnvironment(name, options) {
+			if ((options.consumer ?? (name === "client" ? "client" : "server")) === "server") return {
+				resolve: { noExternal: frameworkPackages },
+				optimizeDeps: { exclude: frameworkPackages }
+			};
+		},
+		transform(_code, id) {
+			const path = id.split("?", 1)[0];
+			if (this.environment.config.consumer === "client" && !path.includes("/node_modules/") && !matchesConsumer(path, "client")) throw new Error(`Server-only module "${path}" must not be imported by client code.`);
+		},
 		configResolved(viteConfig) {
 			addVirtual(config, "assets", () => {
 				const assets = new Array();
@@ -342,4 +390,4 @@ async function revojs(inputConfig) {
 }
 var PACKAGE_CACHE = /* @__PURE__ */ new Map();
 //#endregion
-export { addTemplate, addTypes, addVirtual, core, createConfig, defineCommand, defineModule, matchesConsumer, module, posixPath, resolvePaths, resolvePattern, resolveSource, revojs, useModule };
+export { addTemplate, addTypes, addVirtual, core, createConfig, defineCommand, defineModule, matchesConsumer, module, posixPath, resolveFrameworkPackages, resolvePaths, resolvePattern, resolveSource, revojs, useModule };

package/dist/package.js

@@ -1,6 +1,6 @@
 //#region package.json
 var name = "revojs";
-var version = "0.2.31";
+var version = "0.2.33";
 var repository = {
 	"type": "git",
 	"url": "git+https://github.com/tellua/revojs.git"

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "revojs",
-    "version": "0.2.31",
+    "version": "0.2.33",
     "license": "MIT",
     "repository": {
         "type": "git",