nx 16.5.0-beta.3 → 16.6.0-beta.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nx",
-  "version": "16.5.0-beta.3",
+  "version": "16.6.0-beta.0",
   "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.5.0-beta.3",
+    "@nrwl/tao": "16.6.0-beta.0",
     "@parcel/watcher": "2.0.4",
     "@yarnpkg/lockfile": "^1.1.0",
     "@yarnpkg/parsers": "3.0.0-rc.46",
@@ -80,16 +80,16 @@
     }
   },
   "optionalDependencies": {
-    "@nx/nx-darwin-arm64": "16.5.0-beta.3",
-    "@nx/nx-darwin-x64": "16.5.0-beta.3",
-    "@nx/nx-freebsd-x64": "16.5.0-beta.3",
-    "@nx/nx-linux-arm-gnueabihf": "16.5.0-beta.3",
-    "@nx/nx-linux-arm64-gnu": "16.5.0-beta.3",
-    "@nx/nx-linux-arm64-musl": "16.5.0-beta.3",
-    "@nx/nx-linux-x64-gnu": "16.5.0-beta.3",
-    "@nx/nx-linux-x64-musl": "16.5.0-beta.3",
-    "@nx/nx-win32-arm64-msvc": "16.5.0-beta.3",
-    "@nx/nx-win32-x64-msvc": "16.5.0-beta.3"
+    "@nx/nx-darwin-arm64": "16.6.0-beta.0",
+    "@nx/nx-darwin-x64": "16.6.0-beta.0",
+    "@nx/nx-freebsd-x64": "16.6.0-beta.0",
+    "@nx/nx-linux-arm-gnueabihf": "16.6.0-beta.0",
+    "@nx/nx-linux-arm64-gnu": "16.6.0-beta.0",
+    "@nx/nx-linux-arm64-musl": "16.6.0-beta.0",
+    "@nx/nx-linux-x64-gnu": "16.6.0-beta.0",
+    "@nx/nx-linux-x64-musl": "16.6.0-beta.0",
+    "@nx/nx-win32-arm64-msvc": "16.6.0-beta.0",
+    "@nx/nx-win32-x64-msvc": "16.6.0-beta.0"
   },
   "nx-migrations": {
     "migrations": "./migrations.json",
@@ -175,5 +175,5 @@
   },
   "main": "./bin/nx.js",
   "types": "./bin/nx.d.ts",
-  "gitHead": "b9d30fa0f44051be102f67e8555efc05e3de87e5"
+  "gitHead": "5a7ffb93c9e84bffbf52f6ae9c6c1e3b8edb9d35"
 }

package/src/config/workspaces.d.ts

@@ -73,7 +73,7 @@ export declare function inferProjectFromNonStandardFile(file: string): ProjectCo
     name: string;
 };
 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;
+readJson?: <T extends Object>(string: any) => T): Record<string, ProjectConfiguration>;
 export declare function mergeTargetConfigurations(projectConfiguration: ProjectConfiguration, target: string, targetDefaults: TargetDefaults[string]): TargetConfiguration;
 export declare function readTargetDefaultsForTarget(targetName: string, targetDefaults: TargetDefaults, executor?: string): TargetDefaults[string];
 export declare function renamePropertyWithStableKeys(obj: any, from: string, to: string): void;

package/src/config/workspaces.js

@@ -58,13 +58,16 @@ class Workspaces {
             return this.cachedProjectsConfig;
         }
         const nxJson = this.readNxJson();
-        const projectsConfigurations = buildProjectsConfigurationsFromProjectPaths(nxJson, globForProjectFiles(this.root, (opts === null || opts === void 0 ? void 0 : opts._ignorePluginInference)
+        let 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.mergeAngularJsonAndProjects)(projectsConfigurations.projects, this.root);
+            projectsConfigurations = (0, angular_json_1.mergeAngularJsonAndProjects)(projectsConfigurations, this.root);
         }
-        this.cachedProjectsConfig = this.mergeTargetDefaultsIntoProjectDescriptions(projectsConfigurations, nxJson);
+        this.cachedProjectsConfig = {
+            version: 2,
+            projects: this.mergeTargetDefaultsIntoProjectDescriptions(projectsConfigurations, nxJson),
+        };
         return this.cachedProjectsConfig;
     }
     /**
@@ -74,8 +77,8 @@ class Workspaces {
         const nxJson = this.readNxJson();
         return Object.assign(Object.assign({}, this.readProjectsConfigurations(opts)), nxJson);
     }
-    mergeTargetDefaultsIntoProjectDescriptions(config, nxJson) {
-        for (const proj of Object.values(config.projects)) {
+    mergeTargetDefaultsIntoProjectDescriptions(projects, nxJson) {
+        for (const proj of Object.values(projects)) {
             if (proj.targets) {
                 for (const targetName of Object.keys(proj.targets)) {
                     const projectTargetDefinition = proj.targets[targetName];
@@ -86,7 +89,7 @@ class Workspaces {
                 }
             }
         }
-        return config;
+        return projects;
     }
     isNxExecutor(nodeModule, executor) {
         return !this.readExecutor(nodeModule, executor).isNgCompat;
@@ -322,7 +325,7 @@ function getGlobPatternsFromPlugins(nxJson, paths, root = workspace_root_1.works
             continue;
         }
         for (const filePattern of plugin.projectFilePatterns) {
-            patterns.push('**/' + filePattern);
+            patterns.push('*/**/' + filePattern);
         }
     }
     return patterns;
@@ -337,7 +340,7 @@ function getGlobPatternsFromPluginsAsync(nxJson, paths, root = workspace_root_1.
                 continue;
             }
             for (const filePattern of plugin.projectFilePatterns) {
-                patterns.push('**/' + filePattern);
+                patterns.push('*/**/' + filePattern);
             }
         }
         return patterns;
@@ -565,10 +568,7 @@ readJson = (string) => (0, fileutils_1.readJsonFile)(string) // making this an a
             }
         }
     }
-    return {
-        version: 2,
-        projects: projects,
-    };
+    return projects;
 }
 exports.buildProjectsConfigurationsFromProjectPaths = buildProjectsConfigurationsFromProjectPaths;
 function mergeTargetConfigurations(projectConfiguration, target, targetDefaults) {