@nx/js 0.0.0-pr-28595-c849fba → 0.0.0-pr-28667-e5533b1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/js",
-  "version": "0.0.0-pr-28595-c849fba",
+  "version": "0.0.0-pr-28667-e5533b1",
   "private": false,
   "description": "The JS plugin for Nx contains executors and generators that provide the best experience for developing JavaScript and TypeScript projects. ",
   "repository": {
@@ -39,8 +39,8 @@
     "@babel/preset-env": "^7.23.2",
     "@babel/preset-typescript": "^7.22.5",
     "@babel/runtime": "^7.22.6",
-    "@nx/devkit": "0.0.0-pr-28595-c849fba",
-    "@nx/workspace": "0.0.0-pr-28595-c849fba",
+    "@nx/devkit": "0.0.0-pr-28667-e5533b1",
+    "@nx/workspace": "0.0.0-pr-28667-e5533b1",
     "@zkochan/js-yaml": "0.0.7",
     "babel-plugin-const-enum": "^1.0.1",
     "babel-plugin-macros": "^2.8.0",

package/src/executors/verdaccio/schema.d.ts

@@ -2,7 +2,7 @@ export interface VerdaccioExecutorSchema {
   location: 'global' | 'user' | 'project' | 'none';
   storage?: string;
   port?: number;
-  listenAddress?: string;
+  listenAddress: string; // default is 'localhost'
   config?: string;
   clear?: boolean;
   scopes?: string[];

package/src/executors/verdaccio/schema.json

@@ -22,7 +22,8 @@
     },
     "listenAddress": {
       "type": "string",
-      "description": "Listen address that Verdaccio should listen to"
+      "description": "Listen address that Verdaccio should listen to",
+      "default": "localhost"
     },
     "config": {
       "type": "string",

package/src/executors/verdaccio/verdaccio.impl.js

@@ -129,12 +129,12 @@ function setupNpm(options) {
                     ?.trim()
                     ?.replace('\u001b[2K\u001b[1G', '') // strip out ansi codes
                 );
-                (0, child_process_1.execSync)(`npm config set ${registryName} http://localhost:${options.port}/ --location ${options.location}`, { env, windowsHide: false });
-                (0, child_process_1.execSync)(`npm config set //localhost:${options.port}/:_authToken="secretVerdaccioToken" --location ${options.location}`, { env, windowsHide: false });
-                devkit_1.logger.info(`Set npm ${registryName} to http://localhost:${options.port}/`);
+                (0, child_process_1.execSync)(`npm config set ${registryName} http://${options.listenAddress}:${options.port}/ --location ${options.location}`, { env, windowsHide: false });
+                (0, child_process_1.execSync)(`npm config set //${options.listenAddress}:${options.port}/:_authToken="secretVerdaccioToken" --location ${options.location}`, { env, windowsHide: false });
+                devkit_1.logger.info(`Set npm ${registryName} to http://${options.listenAddress}:${options.port}/`);
             }
             catch (e) {
-                throw new Error(`Failed to set npm ${registryName} to http://localhost:${options.port}/: ${e.message}`);
+                throw new Error(`Failed to set npm ${registryName} to http://${options.listenAddress}:${options.port}/: ${e.message}`);
             }
         });
         return () => {
@@ -146,7 +146,7 @@ function setupNpm(options) {
                 scopes.forEach((scope, index) => {
                     const registryName = scope ? `${scope}:registry` : 'registry';
                     if (npmRegistryPaths[index] &&
-                        currentNpmRegistryPath.includes('localhost')) {
+                        currentNpmRegistryPath.includes(options.listenAddress)) {
                         (0, child_process_1.execSync)(`npm config set ${registryName} ${npmRegistryPaths[index]} --location ${options.location}`, { env, windowsHide: false });
                         devkit_1.logger.info(`Reset npm ${registryName} to ${npmRegistryPaths[index]}`);
                     }
@@ -158,7 +158,7 @@ function setupNpm(options) {
                         devkit_1.logger.info('Cleared custom npm registry');
                     }
                 });
-                (0, child_process_1.execSync)(`npm config delete //localhost:${options.port}/:_authToken  --location ${options.location}`, { env, windowsHide: false });
+                (0, child_process_1.execSync)(`npm config delete //${options.listenAddress}:${options.port}/:_authToken  --location ${options.location}`, { env, windowsHide: false });
             }
             catch (e) {
                 throw new Error(`Failed to reset npm registry: ${e.message}`);
@@ -166,7 +166,7 @@ function setupNpm(options) {
         };
     }
     catch (e) {
-        throw new Error(`Failed to set npm registry to http://localhost:${options.port}/: ${e.message}`);
+        throw new Error(`Failed to set npm registry to http://${options.listenAddress}:${options.port}/: ${e.message}`);
     }
 }
 function getYarnUnsafeHttpWhitelist(isYarnV1) {
@@ -212,17 +212,17 @@ function setupYarn(options) {
                 ?.trim()
                 ?.replace('\u001b[2K\u001b[1G', '') // strip out ansi codes
             );
-            (0, child_process_1.execSync)(`yarn config set ${scopeName}${registryConfigName} http://localhost:${options.port}/` +
+            (0, child_process_1.execSync)(`yarn config set ${scopeName}${registryConfigName} http://${options.listenAddress}:${options.port}/` +
                 (options.location === 'user' ? ' --home' : ''), { env, windowsHide: false });
-            devkit_1.logger.info(`Set yarn ${scopeName}registry to http://localhost:${options.port}/`);
+            devkit_1.logger.info(`Set yarn ${scopeName}registry to http://${options.listenAddress}:${options.port}/`);
         });
         const currentWhitelist = getYarnUnsafeHttpWhitelist(isYarnV1);
         let whitelistedLocalhost = false;
-        if (!isYarnV1 && !currentWhitelist.has('localhost')) {
+        if (!isYarnV1 && !currentWhitelist.has(options.listenAddress)) {
             whitelistedLocalhost = true;
-            currentWhitelist.add('localhost');
+            currentWhitelist.add(options.listenAddress);
             setYarnUnsafeHttpWhitelist(currentWhitelist, options);
-            devkit_1.logger.info(`Whitelisted http://localhost:${options.port}/ as an unsafe http server`);
+            devkit_1.logger.info(`Whitelisted http://${options.listenAddress}:${options.port}/ as an unsafe http server`);
         }
         return () => {
             try {
@@ -235,7 +235,7 @@ function setupYarn(options) {
                         ? `${scope}:${registryConfigName}`
                         : registryConfigName;
                     if (yarnRegistryPaths[index] &&
-                        currentYarnRegistryPath.includes('localhost')) {
+                        currentYarnRegistryPath.includes(options.listenAddress)) {
                         (0, child_process_1.execSync)(`yarn config set ${registryName} ${yarnRegistryPaths[index]}` +
                             (options.location === 'user' ? ' --home' : ''), {
                             env,
@@ -251,10 +251,10 @@ function setupYarn(options) {
                 });
                 if (whitelistedLocalhost) {
                     const currentWhitelist = getYarnUnsafeHttpWhitelist(isYarnV1);
-                    if (currentWhitelist.has('localhost')) {
-                        currentWhitelist.delete('localhost');
+                    if (currentWhitelist.has(options.listenAddress)) {
+                        currentWhitelist.delete(options.listenAddress);
                         setYarnUnsafeHttpWhitelist(currentWhitelist, options);
-                        devkit_1.logger.info(`Removed http://localhost:${options.port}/ as an unsafe http server`);
+                        devkit_1.logger.info(`Removed http://${options.listenAddress}:${options.port}/ as an unsafe http server`);
                     }
                 }
             }
@@ -264,7 +264,7 @@ function setupYarn(options) {
         };
     }
     catch (e) {
-        throw new Error(`Failed to set yarn registry to http://localhost:${options.port}/: ${e.message}`);
+        throw new Error(`Failed to set yarn registry to http://${options.listenAddress}:${options.port}/: ${e.message}`);
     }
 }
 exports.default = verdaccioExecutor;