@nx/workspace 0.0.0-pr-29705-bc2a0dd → 0.0.0-pr-29705-2a402a9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/workspace",
-  "version": "0.0.0-pr-29705-bc2a0dd",
+  "version": "0.0.0-pr-29705-2a402a9",
   "private": false,
   "description": "The Workspace plugin contains executors and generators that are useful for any Nx workspace. It should be present in every Nx workspace and other plugins build on it.",
   "repository": {
@@ -38,12 +38,12 @@
     }
   },
   "dependencies": {
-    "@nx/devkit": "0.0.0-pr-29705-bc2a0dd",
+    "@nx/devkit": "0.0.0-pr-29705-2a402a9",
     "chalk": "^4.1.0",
     "enquirer": "~2.3.6",
     "tslib": "^2.3.0",
     "yargs-parser": "21.1.1",
-    "nx": "0.0.0-pr-29705-bc2a0dd"
+    "nx": "0.0.0-pr-29705-2a402a9"
   },
   "publishConfig": {
     "access": "public"

package/src/generators/move/lib/normalize-schema.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizeSchema = normalizeSchema;
-const devkit_1 = require("@nx/devkit");
 const get_import_path_1 = require("../../../utilities/get-import-path");
 const utils_1 = require("./utils");
 const ts_solution_setup_1 = require("../../../utils/ts-solution-setup");
@@ -37,8 +36,7 @@ function validateName(tree, name, projectConfiguration) {
     const libraryPattern = '(?:^@[a-zA-Z0-9-*~][a-zA-Z0-9-*._~]*\\/[a-zA-Z0-9-~][a-zA-Z0-9-._~]*|^[a-zA-Z][^:]*)$';
     const appPattern = '^[a-zA-Z][^:]*$';
     const projectType = (0, ts_solution_setup_1.getProjectType)(tree, projectConfiguration.root, projectConfiguration.projectType);
-    if (projectType === 'application' ||
-        tree.exists((0, devkit_1.joinPathFragments)(projectConfiguration.root, 'tsconfig.app.json'))) {
+    if (projectType === 'application') {
         const validationRegex = new RegExp(appPattern);
         if (!validationRegex.test(name)) {
             throw new Error(`The new project name should match the pattern "${appPattern}". The provided value "${name}" does not match.`);

package/src/utils/ts-solution-setup.js

@@ -11,8 +11,11 @@ function getProjectType(tree, projectRoot, projectType) {
     if ((0, devkit_1.joinPathFragments)(projectRoot, 'tsconfig.app.json'))
         return 'application';
     // If there are no exports, assume it is an application since both buildable and non-buildable libraries have exports.
-    const packageJson = (0, devkit_1.readJson)(tree, (0, devkit_1.joinPathFragments)(projectRoot, 'package.json'));
-    if (packageJson.exports)
-        return 'library';
-    return 'application';
+    const packageJsonPath = (0, devkit_1.joinPathFragments)(projectRoot, 'package.json');
+    const packageJson = tree.exists(packageJsonPath)
+        ? (0, devkit_1.readJson)(tree, (0, devkit_1.joinPathFragments)(projectRoot, 'package.json'))
+        : null;
+    if (!packageJson?.exports)
+        return 'application';
+    return 'library';
 }