diff --git a/docs/generated/manifests/menus.json b/docs/generated/manifests/menus.json index a7328ba2a0..46dc05fd8f 100644 --- a/docs/generated/manifests/menus.json +++ b/docs/generated/manifests/menus.json @@ -3322,6 +3322,14 @@ ], "isExternal": false, "disableCollapsible": false + }, + { + "id": "migrations", + "path": "/technologies/node/nest/api/migrations", + "name": "migrations", + "children": [], + "isExternal": false, + "disableCollapsible": false } ], "disableCollapsible": false @@ -8896,6 +8904,14 @@ ], "isExternal": false, "disableCollapsible": false + }, + { + "id": "migrations", + "path": "/nx-api/nest/migrations", + "name": "migrations", + "children": [], + "isExternal": false, + "disableCollapsible": false } ], "isExternal": false, @@ -12889,6 +12905,14 @@ ], "isExternal": false, "disableCollapsible": false + }, + { + "id": "migrations", + "path": "/nx-api/nest/migrations", + "name": "migrations", + "children": [], + "isExternal": false, + "disableCollapsible": false } ], "isExternal": false, diff --git a/docs/generated/manifests/new-nx-api.json b/docs/generated/manifests/new-nx-api.json index 48baaf98e1..84114e4d6d 100644 --- a/docs/generated/manifests/new-nx-api.json +++ b/docs/generated/manifests/new-nx-api.json @@ -2723,7 +2723,18 @@ "type": "generator" } }, - "migrations": {}, + "migrations": { + "/technologies/node/nest/api/migrations/21.2.0-beta.2-package-updates": { + "description": "", + "file": "generated/packages/nest/migrations/21.2.0-beta.2-package-updates.json", + "hidden": false, + "name": "21.2.0-beta.2-package-updates", + "version": "21.2.0-beta.2", + "originalFilePath": "/packages/nest", + "path": "/technologies/node/nest/api/migrations/21.2.0-beta.2-package-updates", + "type": "migration" + } + }, "path": "/technologies/nest/nest" }, "next": { diff --git a/docs/generated/manifests/nx-api.json b/docs/generated/manifests/nx-api.json index 61d128688d..9a9f4095e2 100644 --- a/docs/generated/manifests/nx-api.json +++ b/docs/generated/manifests/nx-api.json @@ -2869,7 +2869,18 @@ "type": "generator" } }, - "migrations": {}, + "migrations": { + "/nx-api/nest/migrations/21.2.0-beta.2-package-updates": { + "description": "", + "file": "generated/packages/nest/migrations/21.2.0-beta.2-package-updates.json", + "hidden": false, + "name": "21.2.0-beta.2-package-updates", + "version": "21.2.0-beta.2", + "originalFilePath": "/packages/nest", + "path": "/nx-api/nest/migrations/21.2.0-beta.2-package-updates", + "type": "migration" + } + }, "path": "/nx-api/nest" }, "next": { diff --git a/docs/generated/packages-metadata.json b/docs/generated/packages-metadata.json index e6dac2e14e..49c5b2a29b 100644 --- a/docs/generated/packages-metadata.json +++ b/docs/generated/packages-metadata.json @@ -2849,7 +2849,18 @@ "type": "generator" } ], - "migrations": [], + "migrations": [ + { + "description": "", + "file": "generated/packages/nest/migrations/21.2.0-beta.2-package-updates.json", + "hidden": false, + "name": "21.2.0-beta.2-package-updates", + "version": "21.2.0-beta.2", + "originalFilePath": "/packages/nest", + "path": "nest/migrations/21.2.0-beta.2-package-updates", + "type": "migration" + } + ], "githubRoot": "https://github.com/nrwl/nx/blob/master", "name": "nest", "packageName": "@nx/nest", diff --git a/docs/generated/packages/nest/migrations/21.2.0-beta.2-package-updates.json b/docs/generated/packages/nest/migrations/21.2.0-beta.2-package-updates.json new file mode 100644 index 0000000000..6a997e52f8 --- /dev/null +++ b/docs/generated/packages/nest/migrations/21.2.0-beta.2-package-updates.json @@ -0,0 +1,18 @@ +{ + "name": "21.2.0-beta.2-package-updates", + "version": "21.2.0-beta.2", + "packages": { + "nest": { "version": "^11.0.0", "alwaysAddToPackageJson": false }, + "@nestjs/schematics": { + "version": "^11.0.0", + "alwaysAddToPackageJson": false + } + }, + "aliases": [], + "description": "", + "hidden": false, + "implementation": "", + "path": "/packages/nest", + "schema": null, + "type": "migration" +} diff --git a/docs/shared/reference/sitemap.md b/docs/shared/reference/sitemap.md index ad11d5a024..8ececfe122 100644 --- a/docs/shared/reference/sitemap.md +++ b/docs/shared/reference/sitemap.md @@ -402,6 +402,7 @@ - [resolver](/technologies/node/nest/api/generators/resolver) - [resource](/technologies/node/nest/api/generators/resource) - [service](/technologies/node/nest/api/generators/service) + - [migrations](/technologies/node/nest/api/migrations) - [Java](/technologies/java) - [Introduction](/technologies/java/introduction) - [API](/technologies/java/api) @@ -1074,6 +1075,7 @@ - [resolver](/nx-api/nest/generators/resolver) - [resource](/nx-api/nest/generators/resource) - [service](/nx-api/nest/generators/service) + - [migrations](/nx-api/nest/migrations) - [next](/nx-api/next) - [executors](/nx-api/next/executors) - [build](/nx-api/next/executors/build) @@ -1558,6 +1560,7 @@ - [resolver](/nx-api/nest/generators/resolver) - [resource](/nx-api/nest/generators/resource) - [service](/nx-api/nest/generators/service) + - [migrations](/nx-api/nest/migrations) - [next](/nx-api/next) - [documents](/nx-api/next/documents) - [Overview](/nx-api/next/documents/overview) @@ -2070,6 +2073,7 @@ - [resolver](/nx-api/nest/generators/resolver) - [resource](/nx-api/nest/generators/resource) - [service](/nx-api/nest/generators/service) + - [migrations](/nx-api/nest/migrations) - [next](/nx-api/next) - [documents](/nx-api/next/documents) - [Overview](/nx-api/next/documents/overview) diff --git a/packages/nest/migrations.json b/packages/nest/migrations.json index f9d34cef28..aa11ab83b4 100644 --- a/packages/nest/migrations.json +++ b/packages/nest/migrations.json @@ -1,4 +1,18 @@ { "generators": {}, - "packageJsonUpdates": {} + "packageJsonUpdates": { + "21.2.0-beta.2": { + "version": "21.2.0-beta.2", + "packages": { + "nest": { + "version": "^11.0.0", + "alwaysAddToPackageJson": false + }, + "@nestjs/schematics": { + "version": "^11.0.0", + "alwaysAddToPackageJson": false + } + } + } + } } diff --git a/packages/nest/package.json b/packages/nest/package.json index 66e60d7405..6211dc4adb 100644 --- a/packages/nest/package.json +++ b/packages/nest/package.json @@ -31,7 +31,7 @@ "migrations": "./migrations.json" }, "dependencies": { - "@nestjs/schematics": "^9.1.0", + "@nestjs/schematics": "^11.0.0", "@nx/devkit": "file:../devkit", "@nx/js": "file:../js", "@nx/eslint": "file:../eslint", diff --git a/packages/nest/src/generators/application/application.spec.ts b/packages/nest/src/generators/application/application.spec.ts index 40cbebfe05..947558735b 100644 --- a/packages/nest/src/generators/application/application.spec.ts +++ b/packages/nest/src/generators/application/application.spec.ts @@ -90,17 +90,27 @@ describe('application generator', () => { }); expect(tree.exists(`${appDirectory}/src/main.ts`)).toBeTruthy(); - expect( - tree.exists(`${appDirectory}/src/app/app.controller.spec.ts`) - ).toBeTruthy(); + expect( tree.exists(`${appDirectory}/src/app/app.controller.ts`) ).toBeTruthy(); expect(tree.exists(`${appDirectory}/src/app/app.module.ts`)).toBeTruthy(); + expect(tree.exists(`${appDirectory}/src/app/app.service.ts`)).toBeTruthy(); + }); + + it('should generate spec files when unitTestRunner is jest', async () => { + await applicationGenerator(tree, { + directory: appDirectory, + unitTestRunner: 'jest', + addPlugin: true, + }); + + expect( + tree.exists(`${appDirectory}/src/app/app.controller.spec.ts`) + ).toBeTruthy(); expect( tree.exists(`${appDirectory}/src/app/app.service.spec.ts`) ).toBeTruthy(); - expect(tree.exists(`${appDirectory}/src/app/app.service.ts`)).toBeTruthy(); }); it('should configure tsconfig correctly', async () => { diff --git a/packages/nest/src/generators/application/files/app/app.controller.ts__tmpl__ b/packages/nest/src/generators/application/files/common/app/app.controller.ts__tmpl__ similarity index 100% rename from packages/nest/src/generators/application/files/app/app.controller.ts__tmpl__ rename to packages/nest/src/generators/application/files/common/app/app.controller.ts__tmpl__ diff --git a/packages/nest/src/generators/application/files/app/app.module.ts__tmpl__ b/packages/nest/src/generators/application/files/common/app/app.module.ts__tmpl__ similarity index 100% rename from packages/nest/src/generators/application/files/app/app.module.ts__tmpl__ rename to packages/nest/src/generators/application/files/common/app/app.module.ts__tmpl__ diff --git a/packages/nest/src/generators/application/files/app/app.service.ts__tmpl__ b/packages/nest/src/generators/application/files/common/app/app.service.ts__tmpl__ similarity index 100% rename from packages/nest/src/generators/application/files/app/app.service.ts__tmpl__ rename to packages/nest/src/generators/application/files/common/app/app.service.ts__tmpl__ diff --git a/packages/nest/src/generators/application/files/main.ts__tmpl__ b/packages/nest/src/generators/application/files/common/main.ts__tmpl__ similarity index 100% rename from packages/nest/src/generators/application/files/main.ts__tmpl__ rename to packages/nest/src/generators/application/files/common/main.ts__tmpl__ diff --git a/packages/nest/src/generators/application/files/app/app.controller.spec.ts__tmpl__ b/packages/nest/src/generators/application/files/test/app/app.controller.spec.ts__tmpl__ similarity index 100% rename from packages/nest/src/generators/application/files/app/app.controller.spec.ts__tmpl__ rename to packages/nest/src/generators/application/files/test/app/app.controller.spec.ts__tmpl__ diff --git a/packages/nest/src/generators/application/files/app/app.service.spec.ts__tmpl__ b/packages/nest/src/generators/application/files/test/app/app.service.spec.ts__tmpl__ similarity index 100% rename from packages/nest/src/generators/application/files/app/app.service.spec.ts__tmpl__ rename to packages/nest/src/generators/application/files/test/app/app.service.spec.ts__tmpl__ diff --git a/packages/nest/src/generators/application/lib/create-files.ts b/packages/nest/src/generators/application/lib/create-files.ts index cec49874e5..548ef501f6 100644 --- a/packages/nest/src/generators/application/lib/create-files.ts +++ b/packages/nest/src/generators/application/lib/create-files.ts @@ -5,7 +5,7 @@ import type { NormalizedOptions } from '../schema'; export function createFiles(tree: Tree, options: NormalizedOptions): void { generateFiles( tree, - joinPathFragments(__dirname, '..', 'files'), + joinPathFragments(__dirname, '..', 'files', 'common'), joinPathFragments(options.appProjectRoot, 'src'), { tmpl: '', @@ -13,4 +13,14 @@ export function createFiles(tree: Tree, options: NormalizedOptions): void { root: options.appProjectRoot, } ); + if (options.unitTestRunner === 'jest') { + generateFiles( + tree, + joinPathFragments(__dirname, '..', 'files', 'test'), + joinPathFragments(options.appProjectRoot, 'src'), + { + tmpl: '', + } + ); + } } diff --git a/packages/nest/src/utils/versions.ts b/packages/nest/src/utils/versions.ts index 2becb0663a..a46439c8ec 100644 --- a/packages/nest/src/utils/versions.ts +++ b/packages/nest/src/utils/versions.ts @@ -1,7 +1,7 @@ export const nxVersion = require('../../package.json').version; -export const nestJsVersion = '^10.0.2'; -export const nestJsSchematicsVersion = '^10.0.1'; +export const nestJsVersion = '^11.0.0'; +export const nestJsSchematicsVersion = '^11.0.0'; export const rxjsVersion = '^7.8.0'; export const reflectMetadataVersion = '^0.1.13'; export const tsLibVersion = '^2.3.0';