@nx/nest 20.5.0-rc.3 → 20.5.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/nest",
-  "version": "20.5.0-rc.3",
+  "version": "20.5.0",
   "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": "20.5.0-rc.3",
-    "@nx/js": "20.5.0-rc.3",
-    "@nx/eslint": "20.5.0-rc.3",
-    "@nx/node": "20.5.0-rc.3",
+    "@nx/devkit": "20.5.0",
+    "@nx/js": "20.5.0",
+    "@nx/eslint": "20.5.0",
+    "@nx/node": "20.5.0",
     "tslib": "^2.3.0"
   },
   "publishConfig": {

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

@@ -6,7 +6,7 @@ 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");
 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',

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,

package/src/generators/library/library.js

@@ -3,11 +3,11 @@ 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,
@@ -17,6 +17,7 @@ async function libraryGenerator(tree, 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 +38,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);
+}