@nx/nest 0.0.0-pr-3-e51e28c → 0.0.0-pr-30418-4e2b721

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/nest",
-  "version": "0.0.0-pr-3-e51e28c",
+  "version": "0.0.0-pr-30418-4e2b721",
   "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": {
@@ -32,10 +32,10 @@
   },
   "dependencies": {
     "@nestjs/schematics": "^9.1.0",
-    "@nx/devkit": "0.0.0-pr-3-e51e28c",
-    "@nx/js": "0.0.0-pr-3-e51e28c",
-    "@nx/eslint": "0.0.0-pr-3-e51e28c",
-    "@nx/node": "0.0.0-pr-3-e51e28c",
+    "@nx/devkit": "0.0.0-pr-30418-4e2b721",
+    "@nx/js": "0.0.0-pr-30418-4e2b721",
+    "@nx/eslint": "0.0.0-pr-30418-4e2b721",
+    "@nx/node": "0.0.0-pr-30418-4e2b721",
     "tslib": "^2.3.0"
   },
   "publishConfig": {

package/src/generators/application/application.js

@@ -10,6 +10,7 @@ const ensure_dependencies_1 = require("../../utils/ensure-dependencies");
 async function applicationGenerator(tree, rawOptions) {
     return await applicationGeneratorInternal(tree, {
         addPlugin: false,
+        useProjectJson: true,
         ...rawOptions,
     });
 }

package/src/generators/application/lib/normalize-options.js

@@ -5,8 +5,9 @@ exports.toNodeApplicationGeneratorOptions = toNodeApplicationGeneratorOptions;
 const devkit_1 = require("@nx/devkit");
 const project_name_and_root_utils_1 = require("@nx/devkit/src/generators/project-name-and-root-utils");
 const eslint_1 = require("@nx/eslint");
+const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
 async function normalizeOptions(tree, options) {
-    await (0, project_name_and_root_utils_1.ensureProjectName)(tree, options, 'application');
+    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)(tree, {
         name: options.name,
         projectType: 'application',
@@ -26,6 +27,7 @@ async function normalizeOptions(tree, options) {
         linter: options.linter ?? eslint_1.Linter.EsLint,
         unitTestRunner: options.unitTestRunner ?? 'jest',
         e2eTestRunner: options.e2eTestRunner ?? 'jest',
+        useProjectJson: options.useProjectJson ?? !(0, ts_solution_setup_1.isUsingTsSolutionSetup)(tree),
     };
 }
 function toNodeApplicationGeneratorOptions(options) {
@@ -45,5 +47,6 @@ function toNodeApplicationGeneratorOptions(options) {
         bundler: 'webpack', // Some features require webpack plugins such as TS transformers
         isNest: true,
         addPlugin: options.addPlugin,
+        useProjectJson: options.useProjectJson,
     };
 }

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

@@ -16,6 +16,7 @@ export interface ApplicationGeneratorOptions {
   strict?: boolean;
   addPlugin?: boolean;
   useTsSolution?: boolean;
+  useProjectJson?: boolean;
 }
 
 interface NormalizedOptions extends ApplicationGeneratorOptions {

package/src/generators/application/schema.json

@@ -78,6 +78,10 @@
       "type": "boolean",
       "description": "Adds strictNullChecks, noImplicitAny, strictBindCallApply, forceConsistentCasingInFileNames and noFallthroughCasesInSwitch to tsconfig.",
       "default": false
+    },
+    "useProjectJson": {
+      "type": "boolean",
+      "description": "Use a `project.json` configuration file instead of inlining the Nx configuration in the `package.json` file."
     }
   },
   "additionalProperties": false,

package/src/generators/library/lib/add-project.js

@@ -7,6 +7,7 @@ function addProject(tree, options) {
         return;
     }
     const project = (0, devkit_1.readProjectConfiguration)(tree, options.projectName);
+    project.targets ??= {};
     project.targets.build = {
         executor: '@nx/js:tsc',
         outputs: ['{options.outputPath}'],

package/src/generators/library/lib/create-files.js

@@ -4,8 +4,8 @@ exports.createFiles = createFiles;
 const devkit_1 = require("@nx/devkit");
 function createFiles(tree, options) {
     const substitutions = {
-        ...options,
         ...(0, devkit_1.names)(options.projectName),
+        ...options,
         tmpl: '',
         offsetFromRoot: (0, devkit_1.offsetFromRoot)(options.projectRoot),
         fileName: options.fileName,

package/src/generators/library/lib/normalize-options.js

@@ -7,9 +7,8 @@ const project_name_and_root_utils_1 = require("@nx/devkit/src/generators/project
 const get_npm_scope_1 = require("@nx/js/src/utils/package-json/get-npm-scope");
 const eslint_1 = require("@nx/eslint");
 const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
-const get_import_path_1 = require("@nx/js/src/utils/get-import-path");
 async function normalizeOptions(tree, options) {
-    await (0, project_name_and_root_utils_1.ensureProjectName)(tree, options, 'library');
+    await (0, project_name_and_root_utils_1.ensureRootProjectName)(options, 'library');
     const { projectName, names: projectNames, projectRoot, importPath, } = await (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(tree, {
         name: options.name,
         projectType: 'library',
@@ -36,9 +35,7 @@ async function normalizeOptions(tree, options) {
         linter: options.linter ?? eslint_1.Linter.EsLint,
         parsedTags,
         prefix: (0, get_npm_scope_1.getNpmScope)(tree), // we could also allow customizing this
-        projectName: isUsingTsSolutionsConfig
-            ? (0, get_import_path_1.getImportPath)(tree, projectName)
-            : projectName,
+        projectName: isUsingTsSolutionsConfig && !options.name ? importPath : projectName,
         projectRoot,
         importPath,
         service: options.service ?? false,
@@ -46,6 +43,7 @@ async function normalizeOptions(tree, options) {
         testEnvironment: options.testEnvironment ?? 'node',
         unitTestRunner: options.unitTestRunner ?? 'jest',
         isUsingTsSolutionsConfig,
+        useProjectJson: options.useProjectJson ?? !isUsingTsSolutionsConfig,
     };
     return normalized;
 }
@@ -66,6 +64,6 @@ function toJsLibraryGeneratorOptions(options) {
         unitTestRunner: options.unitTestRunner,
         setParserOptionsProject: options.setParserOptionsProject,
         addPlugin: options.addPlugin,
-        useProjectJson: !options.isUsingTsSolutionsConfig,
+        useProjectJson: options.useProjectJson,
     };
 }

package/src/generators/library/library.js

@@ -3,20 +3,22 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.libraryGenerator = libraryGenerator;
 exports.libraryGeneratorInternal = libraryGeneratorInternal;
 const devkit_1 = require("@nx/devkit");
-const js_1 = require("@nx/js");
-const lib_1 = require("./lib");
-const init_1 = require("../init/init");
 const log_show_project_command_1 = require("@nx/devkit/src/utils/log-show-project-command");
+const js_1 = require("@nx/js");
 const ensure_dependencies_1 = require("../../utils/ensure-dependencies");
+const init_1 = require("../init/init");
+const lib_1 = require("./lib");
 async function libraryGenerator(tree, rawOptions) {
     return await libraryGeneratorInternal(tree, {
         addPlugin: false,
+        useProjectJson: true,
         ...rawOptions,
     });
 }
 async function libraryGeneratorInternal(tree, rawOptions) {
     const options = await (0, lib_1.normalizeOptions)(tree, rawOptions);
     const jsLibraryTask = await (0, js_1.libraryGenerator)(tree, (0, lib_1.toJsLibraryGeneratorOptions)(options));
+    updatePackageJson(tree, options);
     const initTask = await (0, init_1.default)(tree, rawOptions);
     const depsTask = (0, ensure_dependencies_1.ensureDependencies)(tree);
     (0, lib_1.deleteFiles)(tree, options);
@@ -37,3 +39,16 @@ async function libraryGeneratorInternal(tree, rawOptions) {
     ]);
 }
 exports.default = libraryGenerator;
+function updatePackageJson(tree, options) {
+    const packageJsonPath = (0, devkit_1.joinPathFragments)(options.projectRoot, 'package.json');
+    if (!tree.exists(packageJsonPath)) {
+        return;
+    }
+    const packageJson = (0, devkit_1.readJson)(tree, packageJsonPath);
+    if (packageJson.type === 'module') {
+        // The @nx/js:lib generator can set the type to 'module' which would
+        // potentially break consumers of the library.
+        delete packageJson.type;
+    }
+    (0, devkit_1.writeJson)(tree, packageJsonPath, packageJson);
+}

package/src/generators/library/schema.d.ts

@@ -33,6 +33,7 @@ export interface LibraryGeneratorOptions {
   simpleName?: boolean;
   addPlugin?: boolean;
   isUsingTsSolutionsConfig?: boolean;
+  useProjectJson?: boolean;
 }
 
 export interface NormalizedOptions extends LibraryGeneratorOptions {

package/src/generators/library/schema.json

@@ -133,6 +133,10 @@
       "description": "Don't include the directory in the name of the module of the library.",
       "type": "boolean",
       "default": false
+    },
+    "useProjectJson": {
+      "type": "boolean",
+      "description": "Use a `project.json` configuration file instead of inlining the Nx configuration in the `package.json` file."
     }
   },
   "additionalProperties": false,