nx 19.6.0-beta.0 → 19.6.0-beta.1

package/src/project-graph/plugins/isolation/plugin-pool.js

@@ -29,8 +29,8 @@ async function loadRemoteNxPlugin(plugin, root) {
     const exitHandler = createWorkerExitHandler(worker, pendingPromises);
     const cleanupFunction = () => {
         worker.off('exit', exitHandler);
+        shutdownPluginWorker(socket);
         socket.destroy();
-        shutdownPluginWorker(worker);
         nxPluginWorkerCache.delete(cacheKey);
     };
     cleanupFunctions.add(cleanupFunction);
@@ -55,11 +55,8 @@ async function loadRemoteNxPlugin(plugin, root) {
     nxPluginWorkerCache.set(cacheKey, pluginPromise);
     return [pluginPromise, cleanupFunction];
 }
-function shutdownPluginWorker(worker) {
-    // Clears the plugin cache so no refs to the workers are held
-    internal_api_1.nxPluginCache.clear();
-    // logger.verbose(`[plugin-pool] starting worker shutdown`);
-    worker.kill('SIGINT');
+function shutdownPluginWorker(socket) {
+    (0, messaging_1.sendMessageOverSocket)(socket, { type: 'shutdown', payload: {} });
 }
 /**
  * Creates a message handler for the given worker.
@@ -200,6 +197,7 @@ function createWorkerExitHandler(worker, pendingPromises) {
 }
 let cleanedUp = false;
 const exitHandler = () => {
+    internal_api_1.nxPluginCache.clear();
     for (const fn of cleanupFunctions) {
         fn();
     }

package/src/project-graph/plugins/isolation/plugin-worker.js

@@ -49,6 +49,21 @@ const server = (0, net_1.createServer)((socket) => {
                     };
                 }
             },
+            shutdown: async () => {
+                // Stops accepting new connections, but existing connections are
+                // not closed immediately.
+                server.close(() => {
+                    try {
+                        (0, fs_1.unlinkSync)(socketPath);
+                    }
+                    catch (e) { }
+                    process.exit(0);
+                });
+                // Closes existing connection.
+                socket.end();
+                // Destroys the socket once it's fully closed.
+                socket.destroySoon();
+            },
             createNodes: async ({ configFiles, context, tx }) => {
                 try {
                     const result = await plugin.createNodes[1](configFiles, context);

package/src/project-graph/utils/project-configuration-utils.js

@@ -446,7 +446,7 @@ function normalizeTargets(project, sourceMaps, nxJsonConfiguration) {
         project.targets[targetName] = normalizeTarget(project.targets[targetName], project);
         const projectSourceMaps = sourceMaps[project.root];
         const targetConfig = project.targets[targetName];
-        const targetDefaults = readTargetDefaultsForTarget(targetName, nxJsonConfiguration.targetDefaults, targetConfig.executor);
+        const targetDefaults = deepClone(readTargetDefaultsForTarget(targetName, nxJsonConfiguration.targetDefaults, targetConfig.executor));
         // We only apply defaults if they exist
         if (targetDefaults && isCompatibleTarget(targetConfig, targetDefaults)) {
             project.targets[targetName] = mergeTargetDefaultWithTargetDefinition(targetName, project, normalizeTarget(targetDefaults, project), projectSourceMaps);
@@ -499,9 +499,12 @@ function targetDefaultShouldBeApplied(key, sourceMap) {
     const [, plugin] = sourceInfo;
     return !plugin?.startsWith('nx/');
 }
+function deepClone(obj) {
+    return JSON.parse(JSON.stringify(obj));
+}
 function mergeTargetDefaultWithTargetDefinition(targetName, project, targetDefault, sourceMap) {
     const targetDefinition = project.targets[targetName] ?? {};
-    const result = JSON.parse(JSON.stringify(targetDefinition));
+    const result = deepClone(targetDefinition);
     for (const key in targetDefault) {
         switch (key) {
             case 'options': {

package/src/utils/package-manager.js

@@ -176,6 +176,7 @@ function getPackageManagerVersion(packageManager = detectPackageManager(), cwd =
         version = (0, child_process_1.execSync)(`${packageManager} --version`, {
             cwd,
             encoding: 'utf-8',
+            windowsHide: true,
         }).trim();
     }
     catch {
@@ -349,7 +350,10 @@ async function resolvePackageVersionUsingInstallation(packageName, version) {
     const { dir, cleanup } = createTempNpmDirectory();
     try {
         const pmc = getPackageManagerCommand();
-        await execAsync(`${pmc.add} ${packageName}@${version}`, { cwd: dir });
+        await execAsync(`${pmc.add} ${packageName}@${version}`, {
+            cwd: dir,
+            windowsHide: true,
+        });
         const { packageJson } = (0, package_json_1.readModulePackageJson)(packageName, [dir]);
         return packageJson.version;
     }
@@ -372,7 +376,9 @@ async function packageRegistryView(pkg, version, args) {
          */
         pm = 'npm';
     }
-    const { stdout } = await execAsync(`${pm} view ${pkg}@${version} ${args}`);
+    const { stdout } = await execAsync(`${pm} view ${pkg}@${version} ${args}`, {
+        windowsHide: true,
+    });
     return stdout.toString().trim();
 }
 async function packageRegistryPack(cwd, pkg, version) {
@@ -389,7 +395,10 @@ async function packageRegistryPack(cwd, pkg, version) {
          */
         pm = 'npm';
     }
-    const { stdout } = await execAsync(`${pm} pack ${pkg}@${version}`, { cwd });
+    const { stdout } = await execAsync(`${pm} pack ${pkg}@${version}`, {
+        cwd,
+        windowsHide: true,
+    });
     const tarballPath = stdout.trim();
     return { tarballPath };
 }