@salesforce/webapp-template-cli-experimental 1.109.4 → 1.109.5

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.
@@ -9,22 +9,10 @@ export declare class PackageJsonMergeError extends Error {
9
9
  */
10
10
  export declare function buildPackageSpecs(dependencies: Record<string, string>): string[];
11
11
  /**
12
- * Build npm install command for package specs
13
- * @param packageSpecs - Array of package specs
14
- * @param isDev - Whether these are dev dependencies
15
- * @returns npm install command string
16
- */
17
- export declare function buildInstallCommand(packageSpecs: string[], isDev: boolean): string;
18
- /**
19
- * Execute npm install command (extracted for testability)
20
- * @param command - npm install command to execute
21
- * @param cwd - Working directory
22
- */
23
- export declare function executeNpmInstall(command: string, cwd: string): void;
24
- /**
25
- * Install dependencies using npm
12
+ * Merge patch dependencies into package.json without running npm install.
13
+ * The build-dist-app executor handles the actual npm install.
26
14
  * @param targetDir - Base directory containing webapplications/<app-name>, or direct path to web app directory if webAppDirPath is provided
27
- * @param patchDependencies - Dependencies to install from feature patches
15
+ * @param patchDependencies - Dependencies to merge from feature patches
28
16
  * @param webAppDirPath - Optional direct path to the web application directory
29
17
  */
30
18
  export declare function mergePackageJson(targetDir: string, patchDependencies: PackageJsonDependencies, webAppDirPath?: string): Promise<string[]>;
@@ -1 +1 @@
1
- {"version":3,"file":"package-json-merger.d.ts","sourceRoot":"","sources":["../../src/core/package-json-merger.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,UAAU,CAAC;AAIxD,qBAAa,qBAAsB,SAAQ,KAAK;gBACnC,OAAO,EAAE,MAAM;CAI3B;AAED;;;;GAIG;AACH,wBAAgB,iBAAiB,CAAC,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,MAAM,EAAE,CAOhF;AAED;;;;;GAKG;AACH,wBAAgB,mBAAmB,CAAC,YAAY,EAAE,MAAM,EAAE,EAAE,KAAK,EAAE,OAAO,GAAG,MAAM,CAIlF;AAED;;;;GAIG;AACH,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,IAAI,CASpE;AAmCD;;;;;GAKG;AACH,wBAAsB,gBAAgB,CACrC,SAAS,EAAE,MAAM,EACjB,iBAAiB,EAAE,uBAAuB,EAC1C,aAAa,CAAC,EAAE,MAAM,GACpB,OAAO,CAAC,MAAM,EAAE,CAAC,CAgFnB"}
1
+ {"version":3,"file":"package-json-merger.d.ts","sourceRoot":"","sources":["../../src/core/package-json-merger.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,UAAU,CAAC;AAIxD,qBAAa,qBAAsB,SAAQ,KAAK;gBACnC,OAAO,EAAE,MAAM;CAI3B;AAED;;;;GAIG;AACH,wBAAgB,iBAAiB,CAAC,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,MAAM,EAAE,CAOhF;AAmCD;;;;;;GAMG;AACH,wBAAsB,gBAAgB,CACrC,SAAS,EAAE,MAAM,EACjB,iBAAiB,EAAE,uBAAuB,EAC1C,aAAa,CAAC,EAAE,MAAM,GACpB,OAAO,CAAC,MAAM,EAAE,CAAC,CAkDnB"}
@@ -3,8 +3,7 @@
3
3
  * All rights reserved.
4
4
  * For full license text, see the LICENSE.txt file
5
5
  */
6
- import { execSync } from "child_process";
7
- import { existsSync, readFileSync, rmSync, writeFileSync } from "fs";
6
+ import { existsSync, readFileSync, writeFileSync } from "fs";
8
7
  import { join } from "path";
9
8
  import * as logger from "../utils/logger";
10
9
  import { getWebApplicationPath } from "../utils/validation";
@@ -27,32 +26,6 @@ export function buildPackageSpecs(dependencies) {
27
26
  })
28
27
  .map(([name, version]) => `${name}@${version}`);
29
28
  }
30
- /**
31
- * Build npm install command for package specs
32
- * @param packageSpecs - Array of package specs
33
- * @param isDev - Whether these are dev dependencies
34
- * @returns npm install command string
35
- */
36
- export function buildInstallCommand(packageSpecs, isDev) {
37
- const devFlag = isDev ? "--save-dev" : "--save";
38
- // Use --no-workspaces to avoid workspace protocol issues when installing in dist directories
39
- return `npm install ${devFlag} ${packageSpecs.join(" ")} --prefer-dedupe --no-workspaces`;
40
- }
41
- /**
42
- * Execute npm install command (extracted for testability)
43
- * @param command - npm install command to execute
44
- * @param cwd - Working directory
45
- */
46
- export function executeNpmInstall(command, cwd) {
47
- execSync(command, {
48
- cwd,
49
- stdio: "inherit",
50
- env: {
51
- ...process.env,
52
- ESBUILD_BINARY_PATH: "", // Force esbuild to use the version from package-lock.json
53
- },
54
- });
55
- }
56
29
  /**
57
30
  * Replace workspace:* dependencies with * to avoid npm workspace protocol errors
58
31
  * npm doesn't support workspace: protocol, so we replace it with * which we filter out
@@ -83,74 +56,49 @@ function replaceWorkspaceDependencies(packageJsonPath) {
83
56
  }
84
57
  }
85
58
  /**
86
- * Install dependencies using npm
59
+ * Merge patch dependencies into package.json without running npm install.
60
+ * The build-dist-app executor handles the actual npm install.
87
61
  * @param targetDir - Base directory containing webapplications/<app-name>, or direct path to web app directory if webAppDirPath is provided
88
- * @param patchDependencies - Dependencies to install from feature patches
62
+ * @param patchDependencies - Dependencies to merge from feature patches
89
63
  * @param webAppDirPath - Optional direct path to the web application directory
90
64
  */
91
65
  export async function mergePackageJson(targetDir, patchDependencies, webAppDirPath) {
92
- // Get the web application directory where package.json is located
93
66
  const webAppDir = webAppDirPath || getWebApplicationPath(targetDir);
94
67
  const packageJsonPath = join(webAppDir, "package.json");
95
68
  if (!existsSync(packageJsonPath)) {
96
69
  throw new PackageJsonMergeError(`package.json not found at '${packageJsonPath}'. Expected in web application directory.`);
97
70
  }
98
- // Replace workspace:* dependencies before installing to avoid npm errors
99
71
  replaceWorkspaceDependencies(packageJsonPath);
100
- // Remove node_modules before install to avoid ENOTEMPTY (directory not empty) errors
101
- // that can occur when npm renames packages during incremental installs
102
- const nodeModulesPath = join(webAppDir, "node_modules");
103
- if (existsSync(nodeModulesPath)) {
104
- logger.info("Removing existing node_modules for clean install...");
105
- rmSync(nodeModulesPath, { recursive: true });
106
- }
107
- try {
108
- const changes = [];
109
- // Install dependencies
110
- if (patchDependencies.dependencies) {
111
- const packageSpecs = buildPackageSpecs(patchDependencies.dependencies);
112
- if (packageSpecs.length > 0) {
113
- logger.info(`Installing ${packageSpecs.length} dependency/dependencies...`);
114
- packageSpecs.forEach((spec) => logger.info(` ${spec}`));
115
- try {
116
- const command = buildInstallCommand(packageSpecs, false);
117
- executeNpmInstall(command, webAppDir);
118
- changes.push(...packageSpecs);
119
- }
120
- catch (err) {
121
- throw new PackageJsonMergeError(`Failed to install dependencies: ${err instanceof Error ? err.message : String(err)}`);
122
- }
123
- }
124
- }
125
- // Install devDependencies
126
- if (patchDependencies.devDependencies) {
127
- const packageSpecs = buildPackageSpecs(patchDependencies.devDependencies);
128
- if (packageSpecs.length > 0) {
129
- logger.info(`Installing ${packageSpecs.length} dev dependency/dependencies...`);
130
- packageSpecs.forEach((spec) => logger.info(` ${spec}`));
131
- try {
132
- const command = buildInstallCommand(packageSpecs, true);
133
- executeNpmInstall(command, webAppDir);
134
- changes.push(...packageSpecs.map((spec) => `${spec} (dev)`));
135
- }
136
- catch (err) {
137
- throw new PackageJsonMergeError(`Failed to install dev dependencies: ${err instanceof Error ? err.message : String(err)}`);
138
- }
139
- }
140
- }
141
- if (changes.length > 0) {
142
- logger.success(`Installed ${changes.length} dependency change(s)`);
143
- }
144
- else {
145
- logger.info("No new dependencies to install");
72
+ const packageJson = JSON.parse(readFileSync(packageJsonPath, "utf-8"));
73
+ const changes = [];
74
+ if (patchDependencies.dependencies) {
75
+ const packageSpecs = buildPackageSpecs(patchDependencies.dependencies);
76
+ if (packageSpecs.length > 0) {
77
+ logger.info(`Merging ${packageSpecs.length} dependency/dependencies into package.json...`);
78
+ packageSpecs.forEach((spec) => logger.info(` ${spec}`));
79
+ packageJson.dependencies = { ...packageJson.dependencies, ...patchDependencies.dependencies };
80
+ changes.push(...packageSpecs);
146
81
  }
147
- return changes;
148
82
  }
149
- catch (err) {
150
- if (err instanceof PackageJsonMergeError) {
151
- throw err;
83
+ if (patchDependencies.devDependencies) {
84
+ const packageSpecs = buildPackageSpecs(patchDependencies.devDependencies);
85
+ if (packageSpecs.length > 0) {
86
+ logger.info(`Merging ${packageSpecs.length} dev dependency/dependencies into package.json...`);
87
+ packageSpecs.forEach((spec) => logger.info(` ${spec}`));
88
+ packageJson.devDependencies = {
89
+ ...packageJson.devDependencies,
90
+ ...patchDependencies.devDependencies,
91
+ };
92
+ changes.push(...packageSpecs.map((spec) => `${spec} (dev)`));
152
93
  }
153
- throw new PackageJsonMergeError(`Failed to install dependencies: ${err instanceof Error ? err.message : String(err)}`);
154
94
  }
95
+ if (changes.length > 0) {
96
+ writeFileSync(packageJsonPath, JSON.stringify(packageJson, null, 2) + "\n");
97
+ logger.success(`Merged ${changes.length} dependency change(s) into package.json`);
98
+ }
99
+ else {
100
+ logger.info("No new dependencies to merge");
101
+ }
102
+ return changes;
155
103
  }
156
104
  //# sourceMappingURL=package-json-merger.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"package-json-merger.js","sourceRoot":"","sources":["../../src/core/package-json-merger.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"package-json-merger.js","sourceRoot":"","sources":["../../src/core/package-json-merger.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"executor.d.ts","sourceRoot":"","sources":["../../../../src/nx-plugin/executors/apply-patches/executor.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,KAAK,eAAe,EAAU,MAAM,YAAY,CAAC;AAC1D,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,UAAU,CAAC;AAG5D;;GAEG;AACH,MAAM,WAAW,0BAA0B;IAC1C,OAAO,EAAE,OAAO,CAAC;CACjB;AAED;;;;;;;;;GASG;AACH,wBAA8B,WAAW,CACxC,OAAO,EAAE,2BAA2B,EACpC,OAAO,EAAE,eAAe,GACtB,OAAO,CAAC,0BAA0B,CAAC,CAmErC"}
1
+ {"version":3,"file":"executor.d.ts","sourceRoot":"","sources":["../../../../src/nx-plugin/executors/apply-patches/executor.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,KAAK,eAAe,EAAU,MAAM,YAAY,CAAC;AAC1D,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,UAAU,CAAC;AAG5D;;GAEG;AACH,MAAM,WAAW,0BAA0B;IAC1C,OAAO,EAAE,OAAO,CAAC;CACjB;AAED;;;;;;;;;GASG;AACH,wBAA8B,WAAW,CACxC,OAAO,EAAE,2BAA2B,EACpC,OAAO,EAAE,eAAe,GACtB,OAAO,CAAC,0BAA0B,CAAC,CAgDrC"}
@@ -4,7 +4,6 @@
4
4
  * For full license text, see the LICENSE.txt file
5
5
  */
6
6
  import { execSync } from "child_process";
7
- import { join } from "path";
8
7
  import { logger } from "@nx/devkit";
9
8
  import { createProjectPaths } from "../utils";
10
9
  /**
@@ -50,21 +49,6 @@ export default async function runExecutor(options, context) {
50
49
  stdio: "inherit",
51
50
  env: process.env,
52
51
  });
53
- // Type-check the generated dist app
54
- const webAppAbsPath = join(workspaceRoot, projectPaths.webApp);
55
- const execOptions = { cwd: webAppAbsPath, stdio: "inherit", env: process.env };
56
- // Install deps for type check (CLI only runs npm install when patches add deps; metadata-only features need it too)
57
- logger.info("Installing dependencies for type check...");
58
- execSync("npm install --package-lock=false", execOptions);
59
- logger.info("Running type check on generated dist app...");
60
- execSync("npx tsc --noEmit", execOptions);
61
- // Clean up node_modules to prevent it from being cached
62
- const nodeModulesPath = join(projectPaths.webApp, "node_modules");
63
- logger.info(`\n\nRemoving ${nodeModulesPath} to exclude from Nx cache...`);
64
- execSync(`rm -rf "${nodeModulesPath}"`, {
65
- cwd: workspaceRoot,
66
- stdio: "inherit",
67
- });
68
52
  return { success: true };
69
53
  }
70
54
  catch (error) {
@@ -1 +1 @@
1
- {"version":3,"file":"executor.js","sourceRoot":"","sources":["../../../../src/nx-plugin/executors/apply-patches/executor.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"executor.js","sourceRoot":"","sources":["../../../../src/nx-plugin/executors/apply-patches/executor.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AACzC,OAAO,EAAwB,MAAM,EAAE,MAAM,YAAY,CAAC;AAE1D,OAAO,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAC;AAS9C;;;;;;;;;GASG;AACH,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,WAAW,CACxC,OAAoC,EACpC,OAAwB;IAExB,IAAI,CAAC;QACJ,MAAM,YAAY,GAAG,kBAAkB,CAAC,OAAO,CAAC,CAAC;QACjD,IAAI,CAAC,YAAY,EAAE,CAAC;YACnB,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC;QAC3B,CAAC;QAED,qCAAqC;QACrC,MAAM,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC;QAEnC,8BAA8B;QAC9B,MAAM,WAAW,GAAG,YAAY,CAAC,IAAI,CAAC;QACtC,MAAM,WAAW,GAAG,OAAO,CAAC,WAAW,IAAI,2CAA2C,CAAC;QACvF,MAAM,UAAU,GAAG,YAAY,CAAC,IAAI,CAAC;QAErC,MAAM,CAAC,IAAI,CAAC,wBAAwB,OAAO,CAAC,WAAW,KAAK,CAAC,CAAC;QAC9D,MAAM,CAAC,IAAI,CAAC,mBAAmB,WAAW,EAAE,CAAC,CAAC;QAC9C,MAAM,CAAC,IAAI,CAAC,eAAe,WAAW,EAAE,CAAC,CAAC;QAC1C,MAAM,CAAC,IAAI,CAAC,aAAa,UAAU,EAAE,CAAC,CAAC;QAEvC,0FAA0F;QAC1F,MAAM,OAAO,GAAG,4CAA4C,CAAC;QAE7D,+BAA+B;QAC/B,IAAI,OAAO,GAAG,WAAW,OAAO,kBAAkB,WAAW,IAAI,WAAW,IAAI,UAAU,EAAE,CAAC;QAE7F,YAAY;QACZ,IAAI,OAAO,CAAC,KAAK,KAAK,KAAK,EAAE,CAAC;YAC7B,OAAO,IAAI,UAAU,CAAC;QACvB,CAAC;QACD,IAAI,OAAO,CAAC,qBAAqB,EAAE,CAAC;YACnC,OAAO,IAAI,4BAA4B,CAAC;QACzC,CAAC;QAED,MAAM,CAAC,IAAI,CAAC,gBAAgB,OAAO,EAAE,CAAC,CAAC;QAEvC,QAAQ,CAAC,OAAO,EAAE;YACjB,GAAG,EAAE,aAAa;YAClB,KAAK,EAAE,SAAS;YAChB,GAAG,EAAE,OAAO,CAAC,GAAG;SAChB,CAAC,CAAC;QAEH,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;IAC1B,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QAChB,MAAM,YAAY,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QAC5E,MAAM,CAAC,KAAK,CAAC,4BAA4B,YAAY,EAAE,CAAC,CAAC;QACzD,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC;IAC3B,CAAC;AACF,CAAC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@salesforce/webapp-template-cli-experimental",
3
- "version": "1.109.4",
3
+ "version": "1.109.5",
4
4
  "description": "CLI tool for applying feature patches to base apps",
5
5
  "license": "SEE LICENSE IN LICENSE.txt",
6
6
  "type": "module",