@nx/node 0.0.0-pr-31222-862e973 → 0.0.0-pr-31313-387cdca

package/src/generators/library/schema.json

@@ -12,43 +12,42 @@
     }
   ],
   "properties": {
-    "name": {
+    "directory": {
       "type": "string",
-      "description": "Library name",
+      "description": "A directory where the lib is placed",
+      "alias": "dir",
       "$default": {
         "$source": "argv",
         "index": 0
       },
-      "x-prompt": "What name would you like to use for the library?",
-      "pattern": "(?:^@[a-zA-Z0-9-*~][a-zA-Z0-9-*._~]*\\/[a-zA-Z0-9-~][a-zA-Z0-9-._~]*|^[a-zA-Z][^:]*)$"
+      "x-prompt": "Which directory do you want to create the library in?"
     },
-    "directory": {
+    "name": {
       "type": "string",
-      "description": "A directory where the lib is placed",
-      "alias": "dir",
+      "description": "Library name",
+      "pattern": "(?:^@[a-zA-Z0-9-*~][a-zA-Z0-9-*._~]*\\/[a-zA-Z0-9-~][a-zA-Z0-9-._~]*|^[a-zA-Z][^:]*)$",
       "x-priority": "important"
     },
-    "projectNameAndRootFormat": {
-      "description": "Whether to generate the project name and root directory as provided (`as-provided`) or generate them composing their values and taking the configured layout into account (`derived`).",
-      "type": "string",
-      "enum": ["as-provided", "derived"]
-    },
     "simpleModuleName": {
-      "description": "Keep the module name simple (when using `--directory`).",
+      "description": "Keep the module name simple.",
       "type": "boolean",
       "default": false
     },
     "linter": {
       "description": "The tool to use for running lint checks.",
       "type": "string",
-      "enum": ["eslint"],
-      "default": "eslint"
+      "enum": ["eslint", "none"],
+      "default": "none",
+      "x-prompt": "Which linter would you like to use?",
+      "x-priority": "important"
     },
     "unitTestRunner": {
       "type": "string",
       "enum": ["jest", "none"],
       "description": "Test runner to use for unit tests.",
-      "default": "jest"
+      "default": "none",
+      "x-prompt": "Which unit test runner would you like to use?",
+      "x-priority": "important"
     },
     "tags": {
       "type": "string",
@@ -74,7 +73,7 @@
     },
     "buildable": {
       "type": "boolean",
-      "default": false,
+      "default": true,
       "description": "Generate a buildable library.",
       "x-priority": "important"
     },
@@ -104,12 +103,6 @@
       "description": "Use `babel` instead of `ts-jest`.",
       "default": false
     },
-    "pascalCaseFiles": {
-      "type": "boolean",
-      "description": "Use pascal case file names.",
-      "alias": "P",
-      "default": false
-    },
     "js": {
       "type": "boolean",
       "description": "Generate JavaScript files rather than TypeScript files.",
@@ -130,7 +123,11 @@
       "type": "boolean",
       "description": "Whether or not to configure the ESLint `parserOptions.project`. We do not do this by default for lint performance reasons.",
       "default": false
+    },
+    "useProjectJson": {
+      "type": "boolean",
+      "description": "Use a `project.json` configuration file instead of inlining the Nx configuration in the `package.json` file."
     }
   },
-  "required": ["name"]
+  "required": ["directory"]
 }

package/src/utils/kill-port.d.ts

@@ -0,0 +1,7 @@
+export declare const kill: any;
+/**
+ * Kills the process on the given port
+ * @param port
+ * @param killPortDelay
+ */
+export declare function killPort(port: number, killPortDelay?: number): Promise<boolean>;

package/src/utils/kill-port.js

@@ -0,0 +1,36 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.kill = void 0;
+exports.killPort = killPort;
+const devkit_1 = require("@nx/devkit");
+const tcp_port_used_1 = require("tcp-port-used");
+exports.kill = require('kill-port');
+/**
+ * Kills the process on the given port
+ * @param port
+ * @param killPortDelay
+ */
+async function killPort(port, killPortDelay = 2500) {
+    if (await (0, tcp_port_used_1.check)(port)) {
+        let killPortResult;
+        try {
+            devkit_1.logger.info(`Attempting to close port ${port}`);
+            killPortResult = await (0, exports.kill)(port);
+            await new Promise((resolve) => setTimeout(() => resolve(), killPortDelay));
+            if (await (0, tcp_port_used_1.check)(port)) {
+                devkit_1.logger.error(`Port ${port} still open ${JSON.stringify(killPortResult)}`);
+            }
+            else {
+                devkit_1.logger.info(`Port ${port} successfully closed`);
+                return true;
+            }
+        }
+        catch {
+            devkit_1.logger.error(`Port ${port} closing failed`);
+        }
+        return false;
+    }
+    else {
+        return true;
+    }
+}

package/src/utils/versions.d.ts

@@ -1,12 +1,12 @@
 export declare const nxVersion: any;
 export declare const tslibVersion = "^2.3.0";
 export declare const typesNodeVersion = "~18.16.9";
-export declare const expressVersion = "~4.18.1";
-export declare const expressTypingsVersion = "~4.17.13";
+export declare const expressVersion = "^4.21.2";
+export declare const expressTypingsVersion = "^4.17.21";
 export declare const koaVersion = "~2.14.1";
 export declare const koaTypingsVersion = "~2.13.5";
-export declare const fastifyVersion = "~4.13.0";
-export declare const fastifyAutoloadVersion = "~5.7.1";
-export declare const fastifySensibleVersion = "~5.2.0";
-export declare const fastifyPluginVersion = "~4.5.0";
+export declare const fastifyVersion = "~5.2.1";
+export declare const fastifyAutoloadVersion = "~6.0.3";
+export declare const fastifySensibleVersion = "~6.0.2";
+export declare const fastifyPluginVersion = "~5.0.1";
 export declare const axiosVersion = "^1.6.0";

package/src/utils/versions.js

@@ -4,12 +4,12 @@ exports.axiosVersion = exports.fastifyPluginVersion = exports.fastifySensibleVer
 exports.nxVersion = require('../../package.json').version;
 exports.tslibVersion = '^2.3.0';
 exports.typesNodeVersion = '~18.16.9';
-exports.expressVersion = '~4.18.1';
-exports.expressTypingsVersion = '~4.17.13';
+exports.expressVersion = '^4.21.2';
+exports.expressTypingsVersion = '^4.17.21';
 exports.koaVersion = '~2.14.1';
 exports.koaTypingsVersion = '~2.13.5';
-exports.fastifyVersion = '~4.13.0';
-exports.fastifyAutoloadVersion = '~5.7.1';
-exports.fastifySensibleVersion = '~5.2.0';
-exports.fastifyPluginVersion = '~4.5.0';
+exports.fastifyVersion = '~5.2.1';
+exports.fastifyAutoloadVersion = '~6.0.3';
+exports.fastifySensibleVersion = '~6.0.2';
+exports.fastifyPluginVersion = '~5.0.1';
 exports.axiosVersion = '^1.6.0';

package/src/utils/wait-for-port-open.d.ts

@@ -0,0 +1,24 @@
+interface WaitForPortOpenOptions {
+    /**
+     * The host to connect to
+     * @default 'localhost'
+     */
+    host?: string;
+    /**
+     * The number of retries to attempt
+     * @default 120
+     */
+    retries?: number;
+    /**
+     * The delay between retries
+     * @default 1000
+     */
+    retryDelay?: number;
+}
+/**
+ * Waits for the given port to be open
+ * @param port
+ * @param options
+ */
+export declare function waitForPortOpen(port: number, options?: WaitForPortOpenOptions): Promise<void>;
+export {};

package/src/utils/wait-for-port-open.js

@@ -0,0 +1,47 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.waitForPortOpen = waitForPortOpen;
+const net = require("net");
+const devkit_1 = require("@nx/devkit");
+/**
+ * Waits for the given port to be open
+ * @param port
+ * @param options
+ */
+function waitForPortOpen(port, options = {}) {
+    const host = options.host ?? 'localhost';
+    const allowedErrorCodes = ['ECONNREFUSED', 'ECONNRESET', 'ETIMEDOUT'];
+    return new Promise((resolve, reject) => {
+        const checkPort = (retries = options.retries ?? 120) => {
+            const client = new net.Socket();
+            const cleanupClient = () => {
+                client.removeAllListeners('connect');
+                client.removeAllListeners('error');
+                client.end();
+                client.destroy();
+                client.unref();
+            };
+            client.once('connect', () => {
+                cleanupClient();
+                resolve();
+            });
+            client.once('error', (err) => {
+                if (retries === 0 || !allowedErrorCodes.includes(err['code'])) {
+                    if (process.env['NX_VERBOSE_LOGGING'] === 'true') {
+                        devkit_1.logger.info(`Error connecting on ${host}:${port}: ${err['code'] || err}`);
+                    }
+                    cleanupClient();
+                    reject(err);
+                }
+                else {
+                    setTimeout(() => checkPort(retries - 1), options.retryDelay ?? 1000);
+                }
+            });
+            if (process.env['NX_VERBOSE_LOGGING'] === 'true') {
+                devkit_1.logger.info(`Connecting on ${host}:${port}`);
+            }
+            client.connect({ port, host });
+        };
+        checkPort();
+    });
+}

package/utils.d.ts

@@ -0,0 +1,2 @@
+export { waitForPortOpen } from './src/utils/wait-for-port-open';
+export { killPort } from './src/utils/kill-port';

package/utils.js

@@ -0,0 +1,7 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.killPort = exports.waitForPortOpen = void 0;
+var wait_for_port_open_1 = require("./src/utils/wait-for-port-open");
+Object.defineProperty(exports, "waitForPortOpen", { enumerable: true, get: function () { return wait_for_port_open_1.waitForPortOpen; } });
+var kill_port_1 = require("./src/utils/kill-port");
+Object.defineProperty(exports, "killPort", { enumerable: true, get: function () { return kill_port_1.killPort; } });

package/src/generators/e2e-project/files/cli/tsconfig.spec.json__tmpl__

@@ -1,12 +0,0 @@
-{
-  "extends": "./tsconfig.json",
-  "compilerOptions": {
-    "outDir": "<%= offsetFromRoot %>/dist/out-tsc",
-    "module": "commonjs",
-    "types": ["jest", "node"]
-  },
-  "include": [
-    "jest.config.ts",
-    "src/**/*.ts"
-  ]
-}

package/src/generators/e2e-project/files/server/common/tsconfig.json__tmpl__

@@ -1,13 +0,0 @@
-{
-  "extends": "<%= offsetFromRoot %><% if (rootProject) { %>tsconfig.json<% } else { %>tsconfig.base.json<% } %>",
-  "files": [],
-  "include": [],
-  "references": [
-    {
-      "path": "./tsconfig.spec.json"
-    }
-  ],
-  "compilerOptions": {
-    "esModuleInterop": true
-  }
-}

package/src/generators/library/files/lib/package.json__tmpl__

@@ -1,4 +0,0 @@
-{
-  "name": "<%= importPath %>",
-  "version": "0.0.1"
-}

package/src/migrations/update-16-0-0/update-webpack-executor.d.ts

@@ -1,2 +0,0 @@
-import { Tree } from '@nx/devkit';
-export default function update(tree: Tree): Promise<void>;

package/src/migrations/update-16-0-0/update-webpack-executor.js

@@ -1,17 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = update;
-const devkit_1 = require("@nx/devkit");
-const executor_options_utils_1 = require("@nx/devkit/src/generators/executor-options-utils");
-async function update(tree) {
-    const migrateProject = (options, projectName, targetName) => {
-        const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, projectName);
-        projectConfig.targets[targetName].executor = '@nx/webpack:webpack';
-        projectConfig.targets[targetName].options.compiler = 'tsc';
-        projectConfig.targets[targetName].options.target = 'node';
-        (0, devkit_1.updateProjectConfiguration)(tree, projectName, projectConfig);
-    };
-    (0, executor_options_utils_1.forEachExecutorOptions)(tree, '@nx/node:webpack', migrateProject);
-    (0, executor_options_utils_1.forEachExecutorOptions)(tree, '@nrwl/node:webpack', migrateProject);
-    await (0, devkit_1.formatFiles)(tree);
-}

package/src/migrations/update-16-0-0-add-nx-packages/update-16-0-0-add-nx-packages.d.ts

@@ -1,2 +0,0 @@
-import { Tree } from '@nx/devkit';
-export default function replacePackage(tree: Tree): Promise<void>;

package/src/migrations/update-16-0-0-add-nx-packages/update-16-0-0-add-nx-packages.js

@@ -1,9 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = replacePackage;
-const devkit_1 = require("@nx/devkit");
-const replace_package_1 = require("@nx/devkit/src/utils/replace-package");
-async function replacePackage(tree) {
-    await (0, replace_package_1.replaceNrwlPackageWithNxPackage)(tree, '@nrwl/node', '@nx/node');
-    await (0, devkit_1.formatFiles)(tree);
-}

package/src/migrations/update-16-3-1/update-webpack-executor.d.ts

@@ -1,2 +0,0 @@
-import { Tree } from '@nx/devkit';
-export default function update(tree: Tree): Promise<void>;

package/src/migrations/update-16-3-1/update-webpack-executor.js

@@ -1,17 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = update;
-const devkit_1 = require("@nx/devkit");
-const executor_options_utils_1 = require("@nx/devkit/src/generators/executor-options-utils");
-async function update(tree) {
-    const migrateProject = (options, projectName, targetName) => {
-        const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, projectName);
-        projectConfig.targets[targetName].executor = '@nx/webpack:webpack';
-        projectConfig.targets[targetName].options.compiler = 'tsc';
-        projectConfig.targets[targetName].options.target = 'node';
-        (0, devkit_1.updateProjectConfiguration)(tree, projectName, projectConfig);
-    };
-    (0, executor_options_utils_1.forEachExecutorOptions)(tree, '@nx/node:webpack', migrateProject);
-    (0, executor_options_utils_1.forEachExecutorOptions)(tree, '@nrwl/node:webpack', migrateProject);
-    await (0, devkit_1.formatFiles)(tree);
-}

package/src/migrations/update-16-4-0/replace-node-executor.d.ts

@@ -1,2 +0,0 @@
-import { Tree } from '@nx/devkit';
-export default function update(tree: Tree): Promise<void>;

package/src/migrations/update-16-4-0/replace-node-executor.js

@@ -1,14 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = update;
-const devkit_1 = require("@nx/devkit");
-const executor_options_utils_1 = require("@nx/devkit/src/generators/executor-options-utils");
-async function update(tree) {
-    const migrateProject = (_options, projectName, targetName) => {
-        const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, projectName);
-        projectConfig.targets[targetName].executor = '@nx/js:node';
-        (0, devkit_1.updateProjectConfiguration)(tree, projectName, projectConfig);
-    };
-    (0, executor_options_utils_1.forEachExecutorOptions)(tree, '@nx/node:node', migrateProject);
-    await (0, devkit_1.formatFiles)(tree);
-}