acrylblends 1.0.10 → 1.1.0

package/dist/index.d.ts

@@ -142,8 +142,22 @@ export declare function assertTargetFree(target: string): void;
  */
 export declare function copyTemplate(source: string, target: string, name: string): string[];
 export declare function readTemplatePlugins(templateDir: string): string[];
-/** Add run-time dependencies to an app's package.json, keeping what is there and sorting the keys. Returns the names added. */
+/**
+ * Add run-time dependencies to an app's package.json, keeping what is there and sorting the keys. Returns the names added. A package the app lists as a development
+ * dependency too is taken out of that list: npm lets the development entry win, so `npm install --omit=dev` would leave a run-time dependency out.
+ */
 export declare function mergeDependencies(appDir: string, dependencies: Readonly<Record<string, string>>): string[];
+/**
+ * Add a plugin's development dependencies and scripts to an app's package.json: nothing the app already has is replaced, and a package the app already needs at run time
+ * (`dependencies`) is not listed again as a development one. Returns the names of the development dependencies and scripts added.
+ */
+export declare function mergeTooling(appDir: string, tooling: {
+  devDependencies?: Readonly<Record<string, string>> | undefined;
+  scripts?: Readonly<Record<string, string>> | undefined;
+}): {
+  devDependencies: string[];
+  scripts: string[];
+};
 //#endregion
 //#region src/upgrade.d.ts
 interface UpgradeOptions {

package/dist/index.js

@@ -409,7 +409,10 @@ function readTemplatePlugins(templateDir) {
 	const { plugins } = JSON.parse(readFileSync(file, "utf8"));
 	return plugins ?? [];
 }
-/** Add run-time dependencies to an app's package.json, keeping what is there and sorting the keys. Returns the names added. */
+/**
+* Add run-time dependencies to an app's package.json, keeping what is there and sorting the keys. Returns the names added. A package the app lists as a development
+* dependency too is taken out of that list: npm lets the development entry win, so `npm install --omit=dev` would leave a run-time dependency out.
+*/
 function mergeDependencies(appDir, dependencies) {
 	const file = join(appDir, "package.json");
 	const manifest = JSON.parse(readFileSync(file, "utf8"));
@@ -420,6 +423,7 @@ function mergeDependencies(appDir, dependencies) {
 		...current
 	};
 	manifest.dependencies = Object.fromEntries(Object.entries(merged).sort(([a], [b]) => a.localeCompare(b)));
+	if (manifest.devDependencies !== void 0) manifest.devDependencies = Object.fromEntries(Object.entries(manifest.devDependencies).filter(([name]) => !(name in merged)));
 	writeFileSync(file, `${JSON.stringify(manifest, null, 2)}\n`);
 	return added;
 }
@@ -450,20 +454,22 @@ function mergeOpener(appDir, opener) {
 	writeFileSync(file, `${JSON.stringify(manifest, null, 2)}\n`);
 }
 /**
-* Add a plugin's development dependencies and scripts to an app's package.json: nothing the app already has is replaced. Returns the names of the development dependencies
-* and scripts added.
+* Add a plugin's development dependencies and scripts to an app's package.json: nothing the app already has is replaced, and a package the app already needs at run time
+* (`dependencies`) is not listed again as a development one. Returns the names of the development dependencies and scripts added.
 */
 function mergeTooling(appDir, tooling) {
 	const file = join(appDir, "package.json");
 	const manifest = JSON.parse(readFileSync(file, "utf8"));
 	const dev = manifest.devDependencies ?? {};
+	const runtime = manifest.dependencies ?? {};
 	const scripts = manifest.scripts ?? {};
-	const addedDev = Object.keys(tooling.devDependencies ?? {}).filter((name) => !(name in dev));
+	const wanted = Object.entries(tooling.devDependencies ?? {}).filter(([name]) => !(name in runtime));
+	const addedDev = wanted.map(([name]) => name).filter((name) => !(name in dev));
 	const addedScripts = Object.keys(tooling.scripts ?? {}).filter((name) => !(name in scripts));
 	manifest.devDependencies = Object.fromEntries(Object.entries({
-		...tooling.devDependencies,
+		...Object.fromEntries(wanted),
 		...dev
-	}).sort(([a], [b]) => a.localeCompare(b)));
+	}).filter(([name]) => !(name in runtime)).sort(([a], [b]) => a.localeCompare(b)));
 	manifest.scripts = {
 		...tooling.scripts,
 		...scripts
@@ -1895,6 +1901,6 @@ function parseKv(args) {
 	return parseKvOptions(args);
 }
 //#endregion
-export { HELP, TEMPLATES, TEMPLATE_ALIASES, TEMPLATE_SUMMARY, TargetNotEmptyError, UsageError, VERSION, add, assertTargetFree, closure, copyPlugin, copyTemplate, init, isOmitted, isTemplate, isValidName, libraryRoot, listPlugins, mergeDependencies, nameFrom, parseAddOptions, parseInitOptions, parseUpgradeOptions, readLibrary, readTemplatePlugins, resolveTemplate, runCli, templateDir, templatesRoot, upgrade };
+export { HELP, TEMPLATES, TEMPLATE_ALIASES, TEMPLATE_SUMMARY, TargetNotEmptyError, UsageError, VERSION, add, assertTargetFree, closure, copyPlugin, copyTemplate, init, isOmitted, isTemplate, isValidName, libraryRoot, listPlugins, mergeDependencies, mergeTooling, nameFrom, parseAddOptions, parseInitOptions, parseUpgradeOptions, readLibrary, readTemplatePlugins, resolveTemplate, runCli, templateDir, templatesRoot, upgrade };
 
 //# sourceMappingURL=index.js.map