@nx/express 23.0.0-pr.35465.2bc2643 → 23.0.0-rc.1

package/{index.d.ts → dist/index.d.ts}

@@ -1,2 +1 @@
 export { applicationGenerator } from './src/generators/application/application';
-//# sourceMappingURL=index.d.ts.map

package/{src → dist/src}/generators/application/application.d.ts

@@ -3,4 +3,3 @@ import type { Schema } from './schema';
 export declare function applicationGenerator(tree: Tree, schema: Schema): Promise<GeneratorCallback>;
 export declare function applicationGeneratorInternal(tree: Tree, schema: Schema): Promise<GeneratorCallback>;
 export default applicationGenerator;
-//# sourceMappingURL=application.d.ts.map

package/{src → dist/src}/generators/application/application.js

@@ -2,13 +2,14 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.applicationGenerator = applicationGenerator;
 exports.applicationGeneratorInternal = applicationGeneratorInternal;
+const internal_1 = require("@nx/devkit/internal");
 const devkit_1 = require("@nx/devkit");
-const project_name_and_root_utils_1 = require("@nx/devkit/src/generators/project-name-and-root-utils");
-const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
+const internal_2 = require("@nx/js/internal");
 const node_1 = require("@nx/node");
-const versions_1 = require("@nx/node/src/utils/versions");
+const internal_3 = require("@nx/node/internal");
 const path_1 = require("path");
-const versions_2 = require("../../utils/versions");
+const assert_supported_express_version_1 = require("../../utils/assert-supported-express-version");
+const versions_1 = require("../../utils/versions");
 const init_1 = require("../init/init");
 function addTypes(tree, options) {
     (0, devkit_1.updateJson)(tree, (0, path_1.join)(options.appProjectRoot, 'tsconfig.app.json'), (json) => {
@@ -51,6 +52,7 @@ async function applicationGenerator(tree, schema) {
     });
 }
 async function applicationGeneratorInternal(tree, schema) {
+    (0, assert_supported_express_version_1.assertSupportedExpressVersion)(tree);
     const options = await normalizeOptions(tree, schema);
     const tasks = [];
     const initTask = await (0, init_1.initGenerator)(tree, { ...options, skipFormat: true });
@@ -65,7 +67,7 @@ async function applicationGeneratorInternal(tree, schema) {
     addMainFile(tree, options);
     addTypes(tree, options);
     if (!options.skipPackageJson) {
-        tasks.push(ensureDependencies(tree));
+        tasks.push(ensureDependencies(tree, options));
     }
     if (!options.skipFormat) {
         await (0, devkit_1.formatFiles)(tree);
@@ -74,8 +76,8 @@ async function applicationGeneratorInternal(tree, schema) {
 }
 exports.default = applicationGenerator;
 async function normalizeOptions(host, options) {
-    await (0, project_name_and_root_utils_1.ensureRootProjectName)(options, 'application');
-    const { projectName: appProjectName, projectRoot: appProjectRoot } = await (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(host, {
+    await (0, internal_1.ensureRootProjectName)(options, 'application');
+    const { projectName: appProjectName, projectRoot: appProjectRoot } = await (0, internal_1.determineProjectNameAndRootOptions)(host, {
         name: options.name,
         projectType: 'application',
         directory: options.directory,
@@ -84,7 +86,7 @@ async function normalizeOptions(host, options) {
     const addPlugin = process.env.NX_ADD_PLUGINS !== 'false' &&
         nxJson.useInferencePlugins !== false;
     options.addPlugin ??= addPlugin;
-    const useProjectJson = options.useProjectJson ?? !(0, ts_solution_setup_1.isUsingTsSolutionSetup)(host);
+    const useProjectJson = options.useProjectJson ?? !(0, internal_2.isUsingTsSolutionSetup)(host);
     return {
         ...options,
         appProjectName,
@@ -92,6 +94,6 @@ async function normalizeOptions(host, options) {
         useProjectJson,
     };
 }
-function ensureDependencies(tree) {
-    return (0, devkit_1.addDependenciesToPackageJson)(tree, { tslib: versions_1.tslibVersion }, { '@nx/express': versions_2.nxVersion });
+function ensureDependencies(tree, options) {
+    return (0, devkit_1.addDependenciesToPackageJson)(tree, { tslib: internal_3.tslibVersion }, { '@nx/express': versions_1.nxVersion }, undefined, options.keepExistingVersions ?? true);
 }

package/{src → dist/src}/generators/application/schema.d.ts

@@ -14,8 +14,8 @@ export interface Schema {
   /** @deprecated use `swcJest` instead */
   babelJest?: boolean;
   js: boolean;
-  standaloneConfig?: boolean;
   setParserOptionsProject?: boolean;
   addPlugin?: boolean;
   useProjectJson?: boolean;
+  keepExistingVersions?: boolean;
 }

package/{src → dist/src}/generators/application/schema.json

@@ -77,6 +77,12 @@
     "useProjectJson": {
       "type": "boolean",
       "description": "Use a `project.json` configuration file instead of inlining the Nx configuration in the `package.json` file."
+    },
+    "keepExistingVersions": {
+      "type": "boolean",
+      "x-priority": "internal",
+      "description": "Keep existing dependencies versions",
+      "default": true
     }
   },
   "required": ["directory"]

package/{src → dist/src}/generators/init/init.d.ts

@@ -2,4 +2,3 @@ import { GeneratorCallback, Tree } from '@nx/devkit';
 import type { Schema } from './schema';
 export declare function initGenerator(tree: Tree, schema: Schema): Promise<GeneratorCallback>;
 export default initGenerator;
-//# sourceMappingURL=init.d.ts.map

package/{src → dist/src}/generators/init/init.js

@@ -2,14 +2,20 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.initGenerator = initGenerator;
 const devkit_1 = require("@nx/devkit");
+const assert_supported_express_version_1 = require("../../utils/assert-supported-express-version");
 const versions_1 = require("../../utils/versions");
 function updateDependencies(tree, schema) {
     const tasks = [];
     tasks.push((0, devkit_1.removeDependenciesFromPackageJson)(tree, ['@nx/express'], []));
-    tasks.push((0, devkit_1.addDependenciesToPackageJson)(tree, { express: versions_1.expressVersion }, { '@nx/express': versions_1.nxVersion }, undefined, schema.keepExistingVersions));
+    const pkgVersions = (0, versions_1.versions)(tree);
+    tasks.push((0, devkit_1.addDependenciesToPackageJson)(tree, { express: pkgVersions.expressVersion }, {
+        '@nx/express': versions_1.nxVersion,
+        '@types/express': pkgVersions.expressTypingsVersion,
+    }, undefined, schema.keepExistingVersions ?? true));
     return (0, devkit_1.runTasksInSerial)(...tasks);
 }
 async function initGenerator(tree, schema) {
+    (0, assert_supported_express_version_1.assertSupportedExpressVersion)(tree);
     let installTask = () => { };
     if (!schema.skipPackageJson) {
         installTask = updateDependencies(tree, schema);

package/{src → dist/src}/generators/init/schema.json

@@ -20,7 +20,7 @@
       "type": "boolean",
       "x-priority": "internal",
       "description": "Keep existing dependencies versions",
-      "default": false
+      "default": true
     }
   },
   "required": []

package/dist/src/utils/assert-supported-express-version.d.ts

@@ -0,0 +1,2 @@
+import { type Tree } from '@nx/devkit';
+export declare function assertSupportedExpressVersion(tree: Tree): void;

package/dist/src/utils/assert-supported-express-version.js

@@ -0,0 +1,8 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.assertSupportedExpressVersion = assertSupportedExpressVersion;
+const internal_1 = require("@nx/devkit/internal");
+const versions_1 = require("./versions");
+function assertSupportedExpressVersion(tree) {
+    (0, internal_1.assertSupportedPackageVersion)(tree, 'express', versions_1.minSupportedExpressVersion);
+}

package/dist/src/utils/versions.d.ts

@@ -0,0 +1,12 @@
+import { type Tree } from '@nx/devkit';
+export declare const nxVersion: any;
+export declare const minSupportedExpressVersion = "4.0.0";
+export declare const expressVersion = "^5.1.0";
+export declare const expressTypingsVersion = "^5.0.0";
+type ExpressVersions = {
+    expressVersion: string;
+    expressTypingsVersion: string;
+};
+export declare function versions(tree: Tree): ExpressVersions;
+export declare function getInstalledExpressVersion(tree?: Tree): string | null;
+export {};

package/dist/src/utils/versions.js

@@ -0,0 +1,37 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.expressTypingsVersion = exports.expressVersion = exports.minSupportedExpressVersion = exports.nxVersion = void 0;
+exports.versions = versions;
+exports.getInstalledExpressVersion = getInstalledExpressVersion;
+const internal_1 = require("@nx/devkit/internal");
+const semver_1 = require("semver");
+const path_1 = require("path");
+exports.nxVersion = require((0, path_1.join)('@nx/express', 'package.json')).version;
+exports.minSupportedExpressVersion = '4.0.0';
+// Fresh-install constants (latest supported major).
+exports.expressVersion = '^5.1.0';
+exports.expressTypingsVersion = '^5.0.0';
+const latestVersions = {
+    expressVersion: exports.expressVersion,
+    expressTypingsVersion: exports.expressTypingsVersion,
+};
+const versionMap = {
+    4: {
+        expressVersion: '^4.21.2',
+        expressTypingsVersion: '^4.17.21',
+    },
+};
+function versions(tree) {
+    const installedExpressVersion = getInstalledExpressVersion(tree);
+    if (!installedExpressVersion) {
+        return latestVersions;
+    }
+    const expressMajorVersion = (0, semver_1.major)(installedExpressVersion);
+    return versionMap[expressMajorVersion] ?? latestVersions;
+}
+function getInstalledExpressVersion(tree) {
+    if (!tree) {
+        return (0, internal_1.getInstalledPackageVersion)('express');
+    }
+    return (0, internal_1.getDeclaredPackageVersion)(tree, 'express');
+}

package/generators.json

@@ -4,15 +4,15 @@
   "extends": ["@nx/workspace"],
   "generators": {
     "init": {
-      "factory": "./src/generators/init/init#initGenerator",
-      "schema": "./src/generators/init/schema.json",
+      "factory": "./dist/src/generators/init/init#initGenerator",
+      "schema": "./dist/src/generators/init/schema.json",
       "description": "Initialize the `@nx/express` plugin.",
       "aliases": ["ng-add"],
       "hidden": true
     },
     "application": {
-      "factory": "./src/generators/application/application#applicationGeneratorInternal",
-      "schema": "./src/generators/application/schema.json",
+      "factory": "./dist/src/generators/application/application#applicationGeneratorInternal",
+      "schema": "./dist/src/generators/application/schema.json",
       "aliases": ["app"],
       "x-type": "application",
       "description": "Create an Express application."

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/express",
-  "version": "23.0.0-pr.35465.2bc2643",
+  "version": "23.0.0-rc.1",
   "private": false,
   "description": "The Nx Plugin for Express contains executors and generators for allowing your workspace to create powerful Express Node applications and APIs.",
   "repository": {
@@ -17,9 +17,15 @@
     "CLI",
     "Backend"
   ],
-  "main": "./index.js",
+  "main": "./dist/index.js",
   "type": "commonjs",
-  "types": "./index.d.ts",
+  "types": "./dist/index.d.ts",
+  "files": [
+    "dist",
+    "!dist/tsconfig.tsbuildinfo",
+    "migrations.json",
+    "generators.json"
+  ],
   "author": "Victor Savkin",
   "license": "MIT",
   "bugs": {
@@ -29,16 +35,18 @@
   "generators": "./generators.json",
   "ng-update": {
     "requirements": {},
-    "migrations": "./migrations.json"
+    "migrations": "./migrations.json",
+    "supportsOptionalMigrations": true
   },
   "dependencies": {
-    "@nx/devkit": "23.0.0-pr.35465.2bc2643",
-    "@nx/js": "23.0.0-pr.35465.2bc2643",
-    "@nx/node": "23.0.0-pr.35465.2bc2643",
-    "tslib": "^2.3.0"
+    "semver": "^7.6.3",
+    "tslib": "^2.3.0",
+    "@nx/devkit": "23.0.0-rc.1",
+    "@nx/js": "23.0.0-rc.1",
+    "@nx/node": "23.0.0-rc.1"
   },
   "peerDependencies": {
-    "express": "^4.21.2"
+    "express": ">=4.0.0 <6.0.0"
   },
   "peerDependenciesMeta": {
     "express": {
@@ -47,5 +55,18 @@
   },
   "publishConfig": {
     "access": "public"
+  },
+  "exports": {
+    ".": {
+      "@nx/nx-source": "./index.ts",
+      "types": "./dist/index.d.ts",
+      "default": "./dist/index.js"
+    },
+    "./package.json": "./package.json",
+    "./migrations.json": "./migrations.json",
+    "./generators.json": "./generators.json"
+  },
+  "typesVersions": {
+    "*": {}
   }
 }

package/index.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../packages/express/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,0CAA0C,CAAC"}

package/src/generators/application/application.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"application.d.ts","sourceRoot":"","sources":["../../../../../../packages/express/src/generators/application/application.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;AAmB1D,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAkDvC,wBAAsB,oBAAoB,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,8BAMpE;AAED,wBAAsB,4BAA4B,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,8BAyB5E;AAED,eAAe,oBAAoB,CAAC"}

package/src/generators/init/init.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"init.d.ts","sourceRoot":"","sources":["../../../../../../packages/express/src/generators/init/init.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,iBAAiB,EAGjB,IAAI,EACL,MAAM,YAAY,CAAC;AAEpB,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAoBvC,wBAAsB,aAAa,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,8BAW7D;AAED,eAAe,aAAa,CAAC"}

package/src/utils/versions.d.ts

@@ -1,4 +0,0 @@
-export declare const nxVersion: any;
-export declare const expressVersion = "^4.21.2";
-export declare const expressTypingsVersion = "^4.17.21";
-//# sourceMappingURL=versions.d.ts.map

package/src/utils/versions.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"versions.d.ts","sourceRoot":"","sources":["../../../../../packages/express/src/utils/versions.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,SAAS,KAAwC,CAAC;AAE/D,eAAO,MAAM,cAAc,YAAY,CAAC;AACxC,eAAO,MAAM,qBAAqB,aAAa,CAAC"}

package/src/utils/versions.js

@@ -1,6 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.expressTypingsVersion = exports.expressVersion = exports.nxVersion = void 0;
-exports.nxVersion = require('../../package.json').version;
-exports.expressVersion = '^4.21.2';
-exports.expressTypingsVersion = '^4.17.21';