@nx/nest 16.10.0-beta.2 → 17.0.0-beta.1

package/generators.json

@@ -10,12 +10,6 @@
       "x-type": "application",
       "description": "Create a NestJS application."
     },
-    "convert-tslint-to-eslint": {
-      "factory": "./src/generators/convert-tslint-to-eslint/convert-tslint-to-eslint#conversionSchematic",
-      "schema": "./src/generators/convert-tslint-to-eslint/schema.json",
-      "description": "Convert a project from TSLint to ESLint.",
-      "x-deprecated": "This generator is deprecated and will be removed in a future version of Nx. Migrate to ESLint."
-    },
     "init": {
       "factory": "./src/generators/init/init#initSchematic",
       "schema": "./src/generators/init/schema.json",
@@ -114,12 +108,6 @@
       "x-type": "application",
       "description": "Create a NestJS application."
     },
-    "convert-tslint-to-eslint": {
-      "factory": "./src/generators/convert-tslint-to-eslint/convert-tslint-to-eslint#conversionGenerator",
-      "schema": "./src/generators/convert-tslint-to-eslint/schema.json",
-      "description": "Convert a project from TSLint to ESLint.",
-      "x-deprecated": "This generator is deprecated and will be removed in a future version of Nx. Migrate to ESLint."
-    },
     "init": {
       "factory": "./src/generators/init/init",
       "schema": "./src/generators/init/schema.json",

package/index.d.ts

@@ -1,8 +1,6 @@
 export { applicationGenerator } from './src/generators/application/application';
 export { classGenerator } from './src/generators/class/class';
 export { controllerGenerator } from './src/generators/controller/controller';
-/** @deprecated This generator will be removed in v17 */
-export { conversionGenerator } from './src/generators/convert-tslint-to-eslint/convert-tslint-to-eslint';
 export { decoratorGenerator } from './src/generators/decorator/decorator';
 export { filterGenerator } from './src/generators/filter/filter';
 export { gatewayGenerator } from './src/generators/gateway/gateway';

package/index.js

@@ -1,15 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.serviceGenerator = exports.resourceGenerator = exports.resolverGenerator = exports.providerGenerator = exports.pipeGenerator = exports.moduleGenerator = exports.middlewareGenerator = exports.libraryGenerator = exports.interfaceGenerator = exports.interceptorGenerator = exports.initGenerator = exports.guardGenerator = exports.gatewayGenerator = exports.filterGenerator = exports.decoratorGenerator = exports.conversionGenerator = exports.controllerGenerator = exports.classGenerator = exports.applicationGenerator = void 0;
+exports.serviceGenerator = exports.resourceGenerator = exports.resolverGenerator = exports.providerGenerator = exports.pipeGenerator = exports.moduleGenerator = exports.middlewareGenerator = exports.libraryGenerator = exports.interfaceGenerator = exports.interceptorGenerator = exports.initGenerator = exports.guardGenerator = exports.gatewayGenerator = exports.filterGenerator = exports.decoratorGenerator = exports.controllerGenerator = exports.classGenerator = exports.applicationGenerator = void 0;
 var application_1 = require("./src/generators/application/application");
 Object.defineProperty(exports, "applicationGenerator", { enumerable: true, get: function () { return application_1.applicationGenerator; } });
 var class_1 = require("./src/generators/class/class");
 Object.defineProperty(exports, "classGenerator", { enumerable: true, get: function () { return class_1.classGenerator; } });
 var controller_1 = require("./src/generators/controller/controller");
 Object.defineProperty(exports, "controllerGenerator", { enumerable: true, get: function () { return controller_1.controllerGenerator; } });
-/** @deprecated This generator will be removed in v17 */
-var convert_tslint_to_eslint_1 = require("./src/generators/convert-tslint-to-eslint/convert-tslint-to-eslint");
-Object.defineProperty(exports, "conversionGenerator", { enumerable: true, get: function () { return convert_tslint_to_eslint_1.conversionGenerator; } });
 var decorator_1 = require("./src/generators/decorator/decorator");
 Object.defineProperty(exports, "decoratorGenerator", { enumerable: true, get: function () { return decorator_1.decoratorGenerator; } });
 var filter_1 = require("./src/generators/filter/filter");

package/migrations.json

@@ -1,11 +1,5 @@
 {
   "generators": {
-    "update-to-nest-8": {
-      "cli": "nx",
-      "version": "13.2.0-beta.0",
-      "description": "Update Nest.js libraries",
-      "factory": "./src/migrations/update-13-2-0/update-to-nest-8"
-    },
     "update-16-0-0-add-nx-packages": {
       "cli": "nx",
       "version": "16.0.0-beta.1",
@@ -20,35 +14,6 @@
     }
   },
   "packageJsonUpdates": {
-    "14.5.0": {
-      "version": "14.5.0-beta.1",
-      "packages": {
-        "@nestjs/common": {
-          "version": "^9.0.0",
-          "alwaysAddToPackageJson": false
-        },
-        "@nestjs/core": {
-          "version": "^9.0.0",
-          "alwaysAddToPackageJson": false
-        },
-        "@nestjs/platform-express": {
-          "version": "^9.0.0",
-          "alwaysAddToPackageJson": false
-        },
-        "@nestjs/schematics": {
-          "version": "^9.0.0",
-          "alwaysAddToPackageJson": false
-        },
-        "@nestjs/swagger": {
-          "version": "^6.0.0",
-          "alwaysAddToPackageJson": false
-        },
-        "@nestjs/testing": {
-          "version": "^9.0.0",
-          "alwaysAddToPackageJson": false
-        }
-      }
-    },
     "16.1.0": {
       "version": "16.1.0-beta.0",
       "packages": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/nest",
-  "version": "16.10.0-beta.2",
+  "version": "17.0.0-beta.1",
   "private": false,
   "description": "The Nx Plugin for Nest contains executors and generators for allowing your workspace to create powerful Nest best in class APIs.",
   "repository": {
@@ -31,15 +31,13 @@
   },
   "dependencies": {
     "@nestjs/schematics": "^9.1.0",
-    "enquirer": "~2.3.6",
-    "@nx/devkit": "16.10.0-beta.2",
-    "@nx/js": "16.10.0-beta.2",
-    "@nx/linter": "16.10.0-beta.2",
-    "@nx/node": "16.10.0-beta.2",
+    "@nx/devkit": "17.0.0-beta.1",
+    "@nx/js": "17.0.0-beta.1",
+    "@nx/linter": "17.0.0-beta.1",
+    "@nx/node": "17.0.0-beta.1",
     "@phenomnomnominal/tsquery": "~5.0.1",
-    "semver": "7.5.3",
     "tslib": "^2.3.0",
-    "@nrwl/nest": "16.10.0-beta.2"
+    "@nrwl/nest": "17.0.0-beta.1"
   },
   "publishConfig": {
     "access": "public"

package/src/generators/convert-tslint-to-eslint/convert-tslint-to-eslint.d.ts

@@ -1,7 +0,0 @@
-import { Tree } from '@nx/devkit';
-import { ConvertTSLintToESLintSchema } from '@nx/linter';
-/**
- * @deprecated This generator will be removed in v17
- */
-export declare function conversionGenerator(host: Tree, options: ConvertTSLintToESLintSchema): Promise<() => Promise<void>>;
-export declare const conversionSchematic: (generatorOptions: ConvertTSLintToESLintSchema) => (tree: any, context: any) => Promise<any>;

package/src/generators/convert-tslint-to-eslint/convert-tslint-to-eslint.js

@@ -1,123 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.conversionSchematic = exports.conversionGenerator = void 0;
-const devkit_1 = require("@nx/devkit");
-const linter_1 = require("@nx/linter");
-const application_1 = require("@nx/node/src/generators/application/application");
-const library_1 = require("@nx/js/src/generators/library/library");
-/**
- * @deprecated This generator will be removed in v17
- */
-async function conversionGenerator(host, options) {
-    /**
-     * The ProjectConverter instance encapsulates all the standard operations we need
-     * to perform in order to convert a project from TSLint to ESLint, as well as some
-     * extensibility points for adjusting the behavior on a per package basis.
-     *
-     * E.g. @nx/angular projects might need to make different changes to the final
-     * ESLint config when compared with @nx/nest projects.
-     *
-     * See the ProjectConverter implementation for a full breakdown of what it does.
-     */
-    const projectConverter = new linter_1.ProjectConverter({
-        host,
-        projectName: options.project,
-        ignoreExistingTslintConfig: options.ignoreExistingTslintConfig,
-        eslintInitializer: async ({ projectName, projectConfig }) => {
-            /**
-             * Using .js is not an option with NestJS, so we always set it to false when
-             * delegating to the external (more generic) generators below.
-             */
-            const js = false;
-            /**
-             * We set the parserOptions.project config just in case the converted config uses
-             * rules which require type-checking. Later in the conversion we check if it actually
-             * does and remove the config again if it doesn't, so that it is most efficient.
-             */
-            const setParserOptionsProject = true;
-            if (projectConfig.projectType === 'application') {
-                await (0, application_1.addLintingToApplication)(host, {
-                    linter: 'eslint',
-                    name: projectName,
-                    appProjectRoot: projectConfig.root,
-                    js,
-                    setParserOptionsProject,
-                    parsedTags: [],
-                    skipFormat: options.skipFormat,
-                });
-            }
-            if (projectConfig.projectType === 'library') {
-                await (0, library_1.addLint)(host, {
-                    linter: 'eslint',
-                    name: projectName,
-                    projectRoot: projectConfig.root,
-                    js,
-                    setParserOptionsProject,
-                });
-            }
-        },
-    });
-    /**
-     * If root eslint configuration already exists it will not be recreated
-     * but we also don't want to re-run the tslint config conversion
-     * as it was likely already done
-     */
-    const rootEslintConfigExists = host.exists('.eslintrc.json');
-    /**
-     * Create the standard (which is applicable to the current package) ESLint setup
-     * for converting the project.
-     */
-    const eslintInitInstallTask = await projectConverter.initESLint();
-    /**
-     * Convert the root tslint.json and apply the converted rules to the root .eslintrc.json.
-     */
-    const rootConfigInstallTask = await projectConverter.convertRootTSLintConfig((json) => removeCodelyzerRelatedRules(json), rootEslintConfigExists);
-    /**
-     * Convert the project's tslint.json to an equivalent ESLint config.
-     */
-    const projectConfigInstallTask = await projectConverter.convertProjectConfig((json) => json);
-    /**
-     * Clean up the original TSLint configuration for the project.
-     */
-    projectConverter.removeProjectTSLintFile();
-    // Only project shouldn't be added as a default
-    const { project, ...defaults } = options;
-    /**
-     * Store user preferences for the collection
-     */
-    projectConverter.setDefaults('@nx/nest', defaults);
-    /**
-     * Based on user preference and remaining usage, remove TSLint from the workspace entirely.
-     */
-    let uninstallTSLintTask = () => Promise.resolve(undefined);
-    if (options.removeTSLintIfNoMoreTSLintTargets &&
-        !projectConverter.isTSLintUsedInWorkspace()) {
-        uninstallTSLintTask = projectConverter.removeTSLintFromWorkspace();
-    }
-    if (!options.skipFormat) {
-        await (0, devkit_1.formatFiles)(host);
-    }
-    return async () => {
-        await eslintInitInstallTask();
-        await rootConfigInstallTask();
-        await projectConfigInstallTask();
-        await uninstallTSLintTask();
-    };
-}
-exports.conversionGenerator = conversionGenerator;
-exports.conversionSchematic = (0, devkit_1.convertNxGenerator)(conversionGenerator);
-/**
- * Remove any @angular-eslint rules that were applied as a result of converting prior codelyzer
- * rules, because they are only relevant for Angular projects.
- */
-function removeCodelyzerRelatedRules(json) {
-    for (const ruleName of Object.keys(json.rules)) {
-        if (ruleName.startsWith('@angular-eslint')) {
-            delete json.rules[ruleName];
-        }
-    }
-    if (json.plugins) {
-        json.plugins = json.plugins.filter((plugin) => !plugin.startsWith('@angular-eslint'));
-    }
-    return json;
-}

package/src/generators/convert-tslint-to-eslint/schema.json

@@ -1,45 +0,0 @@
-{
-  "$schema": "http://json-schema.org/schema",
-  "$id": "nest-convert-tslint-to-eslint",
-  "cli": "nx",
-  "title": "Convert a NestJS project from TSLint to ESLint",
-  "x-deprecated": "This generator is deprecated and will be removed in a future version of Nx. Migrate to ESLint.",
-  "description": "Convert a NestJS project from TSLint to ESLint. \n_NOTE: Does not work in `--dry-run` mode_.",
-  "examples": [
-    {
-      "command": "nx g convert-tslint-to-eslint myapp",
-      "description": "Convert the NestJS project `myapp` from TSLint to ESLint"
-    }
-  ],
-  "type": "object",
-  "properties": {
-    "project": {
-      "description": "The name of the NestJS project to convert.",
-      "type": "string",
-      "$default": {
-        "$source": "argv",
-        "index": 0
-      },
-      "x-prompt": "Which NestJS project would you like to convert from TSLint to ESLint?"
-    },
-    "ignoreExistingTslintConfig": {
-      "description": "If true we will not use existing TSLint config as a reference, we will just reset the project with the latest recommended ESLint config.",
-      "type": "boolean",
-      "default": false,
-      "x-prompt": "Would you like to ignore the existing TSLint config? Recommended if the TSLint config has not been altered much as it makes the new ESLint config cleaner."
-    },
-    "removeTSLintIfNoMoreTSLintTargets": {
-      "description": "If this conversion leaves no more TSLint usage in the workspace, it will remove TSLint and related dependencies and configuration.",
-      "type": "boolean",
-      "default": true,
-      "x-prompt": "Would you like to remove TSLint and its related config if there are no TSLint projects remaining after this conversion?"
-    },
-    "skipFormat": {
-      "type": "boolean",
-      "description": "Skip formatting files.",
-      "default": false,
-      "x-priority": "internal"
-    }
-  },
-  "required": ["project"]
-}

package/src/migrations/update-13-2-0/update-to-nest-8.d.ts

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

package/src/migrations/update-13-2-0/update-to-nest-8.js

@@ -1,70 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const devkit_1 = require("@nx/devkit");
-const semver_1 = require("@nx/devkit/src/utils/semver");
-const semver_2 = require("semver");
-const object_sort_1 = require("nx/src/utils/object-sort");
-const nestJsSchematicsVersion = '^9.0.0';
-const nestJsVersion8 = '^8.0.0';
-const rxjsVersion7 = '^7.0.0';
-async function update(tree) {
-    const shouldUpdate = await isUpdatable(tree);
-    if (!shouldUpdate) {
-        return;
-    }
-    updateVersion(tree);
-    await (0, devkit_1.formatFiles)(tree);
-    return () => {
-        devkit_1.logger.info('Please make sure to run npm install or yarn install to get the latest packages added by this migration');
-    };
-}
-exports.default = update;
-async function isUpdatable(tree) {
-    const json = (0, devkit_1.readJson)(tree, 'package.json');
-    if (json.dependencies['@angular/core']) {
-        const rxjs = (0, semver_1.checkAndCleanWithSemver)('rxjs', json.dependencies['rxjs']);
-        if ((0, semver_2.satisfies)(rxjs, rxjsVersion7)) {
-            return true;
-        }
-        const { Confirm } = require('enquirer');
-        const prompt = new Confirm({
-            name: 'question',
-            message: 'Do you want to update to RxJS 7 + Nest 8?',
-            initial: true,
-        });
-        return await prompt.run();
-    }
-    return true;
-}
-function updateVersion(tree) {
-    (0, devkit_1.updateJson)(tree, 'package.json', (json) => {
-        json.dependencies = json.dependencies || {};
-        json.devDependencies = json.devDependencies || {};
-        const rxjs = (0, semver_1.checkAndCleanWithSemver)('rxjs', json.dependencies['rxjs']);
-        json.dependencies = {
-            ...json.dependencies,
-            '@nestjs/common': nestJsVersion8,
-            '@nestjs/core': nestJsVersion8,
-            rxjs: (0, semver_2.satisfies)(rxjs, rxjsVersion7)
-                ? json.dependencies['rxjs']
-                : rxjsVersion7,
-        };
-        if (json.dependencies['@nestjs/platform-express']) {
-            json.dependencies['@nestjs/platform-express'] = nestJsVersion8;
-        }
-        if (json.dependencies['@nestjs/platform-fastify']) {
-            json.dependencies['@nestjs/platform-fastify'] = nestJsVersion8;
-        }
-        json.devDependencies = {
-            ...json.devDependencies,
-            '@nestjs/schematics': nestJsSchematicsVersion,
-            '@nestjs/testing': nestJsVersion8,
-        };
-        if (json.devDependencies['jasmine-marbles']) {
-            json.devDependencies['jasmine-marbles'] = '~0.9.1';
-        }
-        json.dependencies = (0, object_sort_1.sortObjectByKeys)(json.dependencies);
-        json.devDependencies = (0, object_sort_1.sortObjectByKeys)(json.devDependencies);
-        return json;
-    });
-}