nx 16.4.0-beta.6 → 16.4.0-beta.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nx",
-  "version": "16.4.0-beta.6",
+  "version": "16.4.0-beta.7",
   "private": false,
   "description": "The core Nx plugin contains the core functionality of Nx like the project graph, nx commands and task orchestration.",
   "repository": {
@@ -32,7 +32,7 @@
   },
   "homepage": "https://nx.dev",
   "dependencies": {
-    "@nrwl/tao": "16.4.0-beta.6",
+    "@nrwl/tao": "16.4.0-beta.7",
     "@parcel/watcher": "2.0.4",
     "@yarnpkg/lockfile": "^1.1.0",
     "@yarnpkg/parsers": "^3.0.0-rc.18",
@@ -80,16 +80,16 @@
     }
   },
   "optionalDependencies": {
-    "@nx/nx-darwin-arm64": "16.4.0-beta.6",
-    "@nx/nx-darwin-x64": "16.4.0-beta.6",
-    "@nx/nx-freebsd-x64": "16.4.0-beta.6",
-    "@nx/nx-linux-arm-gnueabihf": "16.4.0-beta.6",
-    "@nx/nx-linux-arm64-gnu": "16.4.0-beta.6",
-    "@nx/nx-linux-arm64-musl": "16.4.0-beta.6",
-    "@nx/nx-linux-x64-gnu": "16.4.0-beta.6",
-    "@nx/nx-linux-x64-musl": "16.4.0-beta.6",
-    "@nx/nx-win32-arm64-msvc": "16.4.0-beta.6",
-    "@nx/nx-win32-x64-msvc": "16.4.0-beta.6"
+    "@nx/nx-darwin-arm64": "16.4.0-beta.7",
+    "@nx/nx-darwin-x64": "16.4.0-beta.7",
+    "@nx/nx-freebsd-x64": "16.4.0-beta.7",
+    "@nx/nx-linux-arm-gnueabihf": "16.4.0-beta.7",
+    "@nx/nx-linux-arm64-gnu": "16.4.0-beta.7",
+    "@nx/nx-linux-arm64-musl": "16.4.0-beta.7",
+    "@nx/nx-linux-x64-gnu": "16.4.0-beta.7",
+    "@nx/nx-linux-x64-musl": "16.4.0-beta.7",
+    "@nx/nx-win32-arm64-msvc": "16.4.0-beta.7",
+    "@nx/nx-win32-x64-msvc": "16.4.0-beta.7"
   },
   "nx-migrations": {
     "migrations": "./migrations.json",
@@ -175,5 +175,5 @@
   },
   "main": "./bin/nx.js",
   "types": "./bin/nx.d.ts",
-  "gitHead": "6eda3ff725a1e5ee973e71cb711b065dcc3f2a16"
+  "gitHead": "847d3a45b61cd2c267acb66c4165a5bb875aff4f"
 }

package/src/adapter/angular-json.d.ts

@@ -1,7 +1,7 @@
 import { ProjectConfiguration, ProjectsConfigurations } from '../config/workspace-json-project-json';
 export declare function shouldMergeAngularProjects(root: string, includeProjectsFromAngularJson: boolean): boolean;
 export declare function isAngularPluginInstalled(): boolean;
-export declare function mergeAngularJsonAndGlobProjects(globProjects: {
+export declare function mergeAngularJsonAndProjects(projects: {
     [name: string]: ProjectConfiguration;
 }, angularCliWorkspaceRoot: string): {
     [name: string]: ProjectConfiguration;

package/src/adapter/angular-json.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.toOldFormat = exports.toNewFormat = exports.mergeAngularJsonAndGlobProjects = exports.isAngularPluginInstalled = exports.shouldMergeAngularProjects = void 0;
+exports.toOldFormat = exports.toNewFormat = exports.mergeAngularJsonAndProjects = exports.isAngularPluginInstalled = exports.shouldMergeAngularProjects = void 0;
 const fs_1 = require("fs");
 const path = require("path");
 const fileutils_1 = require("../utils/fileutils");
@@ -38,20 +38,20 @@ exports.isAngularPluginInstalled = isAngularPluginInstalled;
 function readAngularJson(angularCliWorkspaceRoot) {
     return toNewFormat((0, fileutils_1.readJsonFile)(path.join(angularCliWorkspaceRoot, 'angular.json'))).projects;
 }
-function mergeAngularJsonAndGlobProjects(globProjects, angularCliWorkspaceRoot) {
+function mergeAngularJsonAndProjects(projects, angularCliWorkspaceRoot) {
     const res = readAngularJson(angularCliWorkspaceRoot);
     const folders = new Set();
     for (let k of Object.keys(res)) {
         folders.add(res[k].root);
     }
-    for (let k of Object.keys(globProjects)) {
-        if (!folders.has(globProjects[k].root)) {
-            res[k] = globProjects[k];
+    for (let k of Object.keys(projects)) {
+        if (!folders.has(projects[k].root)) {
+            res[k] = projects[k];
         }
     }
     return res;
 }
-exports.mergeAngularJsonAndGlobProjects = mergeAngularJsonAndGlobProjects;
+exports.mergeAngularJsonAndProjects = mergeAngularJsonAndProjects;
 function toNewFormat(w) {
     Object.values(w.projects || {}).forEach((projectConfig) => {
         if (projectConfig.architect) {

package/src/command-line/init/implementation/react/rename-js-to-jsx.js

@@ -3,15 +3,18 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.renameJsToJsx = void 0;
 const fs_extra_1 = require("fs-extra");
 const glob_1 = require("glob");
+const fileutils_1 = require("../../../../utils/fileutils");
 // Vite cannot process JSX like <div> or <Header> unless the file is named .jsx or .tsx
 function renameJsToJsx(appName, isStandalone) {
     const files = (0, glob_1.sync)(isStandalone ? 'src/**/*.js' : `apps/${appName}/src/**/*.js`);
     files.forEach((file) => {
-        const content = (0, fs_extra_1.readFileSync)(file).toString();
-        // Try to detect JSX before renaming to .jsx
-        // Files like setupTests.js from CRA should not be renamed
-        if (/<[a-zA-Z0-9]+/.test(content)) {
-            (0, fs_extra_1.renameSync)(file, `${file}x`);
+        if ((0, fileutils_1.fileExists)(file)) {
+            const content = (0, fs_extra_1.readFileSync)(file).toString();
+            // Try to detect JSX before renaming to .jsx
+            // Files like setupTests.js from CRA should not be renamed
+            if (/<[a-zA-Z0-9]+/.test(content)) {
+                (0, fs_extra_1.renameSync)(file, `${file}x`);
+            }
         }
     });
 }

package/src/command-line/list/list.js

@@ -34,7 +34,7 @@ function listHandler(args) {
                 title: 'Community Plugins',
                 bodyLines: [
                     'Looking for a technology / framework not listed above?',
-                    'There are many excellent plugins matintained by the Nx community.',
+                    'There are many excellent plugins maintained by the Nx community.',
                     'Search for the one you need here: https://nx.dev/plugins/registry.',
                 ],
             });

package/src/config/workspaces.d.ts

@@ -72,7 +72,7 @@ export declare function deduplicateProjectFiles(files: string[]): string[];
 export declare function inferProjectFromNonStandardFile(file: string): ProjectConfiguration & {
     name: string;
 };
-export declare function buildProjectsConfigurationsFromGlobs(nxJson: NxJsonConfiguration, projectFiles: string[], // making this parameter allows devkit to pick up newly created projects
+export declare function buildProjectsConfigurationsFromProjectPaths(nxJson: NxJsonConfiguration, projectFiles: string[], // making this parameter allows devkit to pick up newly created projects
 readJson?: <T extends Object>(string: any) => T): ProjectsConfigurations;
 export declare function mergeTargetConfigurations(projectConfiguration: ProjectConfiguration, target: string, targetDefaults: TargetDefaults[string]): TargetConfiguration;
 export declare function readTargetDefaultsForTarget(targetName: string, targetDefaults: TargetDefaults, executor?: string): TargetDefaults[string];

package/src/config/workspaces.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.renamePropertyWithStableKeys = exports.readTargetDefaultsForTarget = exports.mergeTargetConfigurations = exports.buildProjectsConfigurationsFromGlobs = exports.inferProjectFromNonStandardFile = exports.deduplicateProjectFiles = exports.globForProjectFiles = exports.getGlobPatternsFromPackageManagerWorkspaces = exports.getGlobPatternsFromPluginsAsync = exports.getGlobPatternsFromPlugins = exports.toProjectName = exports.normalizeExecutorSchema = exports.Workspaces = void 0;
+exports.renamePropertyWithStableKeys = exports.readTargetDefaultsForTarget = exports.mergeTargetConfigurations = exports.buildProjectsConfigurationsFromProjectPaths = exports.inferProjectFromNonStandardFile = exports.deduplicateProjectFiles = exports.globForProjectFiles = exports.getGlobPatternsFromPackageManagerWorkspaces = exports.getGlobPatternsFromPluginsAsync = exports.getGlobPatternsFromPlugins = exports.toProjectName = exports.normalizeExecutorSchema = exports.Workspaces = void 0;
 const tslib_1 = require("tslib");
 const fast_glob_1 = require("fast-glob");
 const fs_1 = require("fs");
@@ -58,11 +58,11 @@ class Workspaces {
             return this.cachedProjectsConfig;
         }
         const nxJson = this.readNxJson();
-        const projectsConfigurations = buildProjectsConfigurationsFromGlobs(nxJson, globForProjectFiles(this.root, (opts === null || opts === void 0 ? void 0 : opts._ignorePluginInference)
+        const projectsConfigurations = buildProjectsConfigurationsFromProjectPaths(nxJson, globForProjectFiles(this.root, (opts === null || opts === void 0 ? void 0 : opts._ignorePluginInference)
             ? []
             : getGlobPatternsFromPlugins(nxJson, (0, installation_directory_1.getNxRequirePaths)(this.root), this.root), nxJson), (path) => (0, fileutils_1.readJsonFile)((0, path_1.join)(this.root, path)));
         if ((0, angular_json_1.shouldMergeAngularProjects)(this.root, opts === null || opts === void 0 ? void 0 : opts._includeProjectsFromAngularJson)) {
-            projectsConfigurations.projects = (0, angular_json_1.mergeAngularJsonAndGlobProjects)(projectsConfigurations.projects, this.root);
+            projectsConfigurations.projects = (0, angular_json_1.mergeAngularJsonAndProjects)(projectsConfigurations.projects, this.root);
         }
         this.cachedProjectsConfig = this.mergeTargetDefaultsIntoProjectDescriptions(projectsConfigurations, nxJson);
         return this.cachedProjectsConfig;
@@ -384,7 +384,9 @@ function getGlobPatternsFromPackageManagerWorkspaces(root) {
         // Include the root project
         return packageJson.nx ? patterns.concat('package.json') : patterns;
     }
-    catch (_c) { }
+    catch (_c) {
+        return [];
+    }
 }
 exports.getGlobPatternsFromPackageManagerWorkspaces = getGlobPatternsFromPackageManagerWorkspaces;
 function normalizePatterns(patterns) {
@@ -511,7 +513,7 @@ function inferProjectFromNonStandardFile(file) {
     };
 }
 exports.inferProjectFromNonStandardFile = inferProjectFromNonStandardFile;
-function buildProjectsConfigurationsFromGlobs(nxJson, projectFiles, // making this parameter allows devkit to pick up newly created projects
+function buildProjectsConfigurationsFromProjectPaths(nxJson, projectFiles, // making this parameter allows devkit to pick up newly created projects
 readJson = (string) => (0, fileutils_1.readJsonFile)(string) // making this an arg allows us to reuse in devkit
 ) {
     const projects = {};
@@ -558,8 +560,7 @@ readJson = (string) => (0, fileutils_1.readJsonFile)(string) // making this an a
                     projects[name] = config;
                 }
                 else {
-                    logger_1.logger.error(`Skipping project inferred from ${file} since project ${name} already exists.`);
-                    throw new Error();
+                    logger_1.logger.warn(`Skipping project inferred from ${file} since project ${name} already exists.`);
                 }
             }
         }
@@ -569,7 +570,7 @@ readJson = (string) => (0, fileutils_1.readJsonFile)(string) // making this an a
         projects: projects,
     };
 }
-exports.buildProjectsConfigurationsFromGlobs = buildProjectsConfigurationsFromGlobs;
+exports.buildProjectsConfigurationsFromProjectPaths = buildProjectsConfigurationsFromProjectPaths;
 function mergeTargetConfigurations(projectConfiguration, target, targetDefaults) {
     var _a, _b;
     const targetConfiguration = (_a = projectConfiguration.targets) === null || _a === void 0 ? void 0 : _a[target];