nx 16.6.0-beta.4 → 16.6.0-beta.6

package/src/config/workspaces.js

@@ -1,22 +1,19 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.renamePropertyWithStableKeys = exports.readTargetDefaultsForTarget = exports.mergeTargetConfigurations = exports.buildProjectsConfigurationsFromProjectPaths = exports.inferProjectFromNonStandardFile = exports.deduplicateProjectFiles = exports.globForProjectFiles = exports.getGlobPatternsFromPackageManagerWorkspaces = exports.getGlobPatternsFromPluginsAsync = exports.getGlobPatternsFromPlugins = exports.toProjectName = exports.Workspaces = void 0;
+exports.renamePropertyWithStableKeys = exports.readTargetDefaultsForTarget = exports.mergeTargetConfigurations = exports.buildProjectsConfigurationsFromProjectPaths = exports.inferProjectFromNonStandardFile = exports.deduplicateProjectFiles = exports.getGlobPatternsFromPackageManagerWorkspaces = exports.getGlobPatternsFromPluginsAsync = exports.getGlobPatternsFromPlugins = exports.toProjectName = exports.Workspaces = void 0;
 const tslib_1 = require("tslib");
-const fast_glob_1 = require("fast-glob");
 const fs_1 = require("fs");
 const path = require("path");
 const path_1 = require("path");
-const perf_hooks_1 = require("perf_hooks");
 const workspace_root_1 = require("../utils/workspace-root");
 const fileutils_1 = require("../utils/fileutils");
 const logger_1 = require("../utils/logger");
 const nx_plugin_1 = require("../utils/nx-plugin");
+const nx_json_1 = require("./nx-json");
 const output_1 = require("../utils/output");
 const path_2 = require("../utils/path");
 const angular_json_1 = require("../adapter/angular-json");
-const installation_directory_1 = require("../utils/installation-directory");
-const ignore_1 = require("../utils/ignore");
-const find_project_for_path_1 = require("../project-graph/utils/find-project-for-path");
+const retrieve_workspace_files_1 = require("../project-graph/utils/retrieve-workspace-files");
 class Workspaces {
     constructor(root) {
         this.root = root;
@@ -24,31 +21,6 @@ class Workspaces {
     relativeCwd(cwd) {
         return path.relative(this.root, cwd).replace(/\\/g, '/') || null;
     }
-    calculateDefaultProjectName(cwd, { projects }, nxJson) {
-        var _a;
-        const relativeCwd = this.relativeCwd(cwd);
-        if (relativeCwd) {
-            const matchingProject = findMatchingProjectInCwd(projects, relativeCwd);
-            // We have found a project
-            if (matchingProject) {
-                // That is not at the root
-                if (projects[matchingProject].root !== '.' &&
-                    projects[matchingProject].root !== '') {
-                    return matchingProject;
-                    // But its at the root, and NX_DEFAULT_PROJECT is set
-                }
-                else if (process.env.NX_DEFAULT_PROJECT) {
-                    return process.env.NX_DEFAULT_PROJECT;
-                    // Its root, and NX_DEFAULT_PROJECT is not set
-                }
-                else {
-                    return matchingProject;
-                }
-            }
-        }
-        // There was no matching project in cwd.
-        return (_a = process.env.NX_DEFAULT_PROJECT) !== null && _a !== void 0 ? _a : nxJson === null || nxJson === void 0 ? void 0 : nxJson.defaultProject;
-    }
     /**
      * @deprecated
      */
@@ -57,10 +29,9 @@ class Workspaces {
             process.env.NX_CACHE_PROJECTS_CONFIG !== 'false') {
             return this.cachedProjectsConfig;
         }
-        const nxJson = this.readNxJson();
-        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)));
+        const nxJson = (0, nx_json_1.readNxJson)(this.root);
+        const projectPaths = (0, retrieve_workspace_files_1.retrieveProjectConfigurationPaths)(this.root, nxJson);
+        let projectsConfigurations = buildProjectsConfigurationsFromProjectPaths(nxJson, projectPaths, (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 = (0, angular_json_1.mergeAngularJsonAndProjects)(projectsConfigurations, this.root);
         }
@@ -74,7 +45,7 @@ class Workspaces {
      * Deprecated. Use readProjectsConfigurations
      */
     readWorkspaceConfiguration(opts) {
-        const nxJson = this.readNxJson();
+        const nxJson = (0, nx_json_1.readNxJson)(this.root);
         return Object.assign(Object.assign({}, this.readProjectsConfigurations(opts)), nxJson);
     }
     mergeTargetDefaultsIntoProjectDescriptions(projects, nxJson) {
@@ -91,45 +62,8 @@ class Workspaces {
         }
         return projects;
     }
-    hasNxJson() {
-        const nxJson = path.join(this.root, 'nx.json');
-        return (0, fs_1.existsSync)(nxJson);
-    }
-    readNxJson() {
-        const nxJson = path.join(this.root, 'nx.json');
-        if ((0, fs_1.existsSync)(nxJson)) {
-            const nxJsonConfiguration = (0, fileutils_1.readJsonFile)(nxJson);
-            if (nxJsonConfiguration.extends) {
-                const extendedNxJsonPath = require.resolve(nxJsonConfiguration.extends, {
-                    paths: [(0, path_1.dirname)(nxJson)],
-                });
-                const baseNxJson = (0, fileutils_1.readJsonFile)(extendedNxJsonPath);
-                return Object.assign(Object.assign({}, baseNxJson), nxJsonConfiguration);
-            }
-            else {
-                return nxJsonConfiguration;
-            }
-        }
-        else {
-            try {
-                return (0, fileutils_1.readJsonFile)((0, path_1.join)(__dirname, '..', '..', 'presets', 'core.json'));
-            }
-            catch (e) {
-                return {};
-            }
-        }
-    }
 }
 exports.Workspaces = Workspaces;
-function findMatchingProjectInCwd(projects, relativeCwd) {
-    const projectRootMappings = new Map();
-    for (const projectName of Object.keys(projects)) {
-        const { root } = projects[projectName];
-        projectRootMappings.set((0, find_project_for_path_1.normalizeProjectRoot)(root), projectName);
-    }
-    const matchingProject = (0, find_project_for_path_1.findProjectForPath)(relativeCwd, projectRootMappings);
-    return matchingProject;
-}
 /**
  * Pulled from toFileName in names from @nx/devkit.
  * Todo: Should refactor, not duplicate.
@@ -139,8 +73,6 @@ function toProjectName(fileName) {
     return parts[parts.length - 1].toLowerCase();
 }
 exports.toProjectName = toProjectName;
-let projectGlobCache;
-let projectGlobCacheKey;
 /**
  * @deprecated Use getGlobPatternsFromPluginsAsync instead.
  */
@@ -227,72 +159,6 @@ function normalizePatterns(patterns) {
 function removeRelativePath(pattern) {
     return pattern.startsWith('./') ? pattern.substring(2) : pattern;
 }
-function globForProjectFiles(root, pluginsGlobPatterns, nxJson) {
-    // Deal w/ Caching
-    const cacheKey = [root, ...pluginsGlobPatterns].join(',');
-    if (process.env.NX_PROJECT_GLOB_CACHE !== 'false' &&
-        projectGlobCache &&
-        cacheKey === projectGlobCacheKey) {
-        return projectGlobCache;
-    }
-    projectGlobCacheKey = cacheKey;
-    const _globPatternsFromPackageManagerWorkspaces = getGlobPatternsFromPackageManagerWorkspaces(root);
-    const globPatternsFromPackageManagerWorkspaces = _globPatternsFromPackageManagerWorkspaces !== null && _globPatternsFromPackageManagerWorkspaces !== void 0 ? _globPatternsFromPackageManagerWorkspaces : [];
-    const globsToInclude = globPatternsFromPackageManagerWorkspaces.filter((glob) => !glob.startsWith('!'));
-    const globsToExclude = globPatternsFromPackageManagerWorkspaces
-        .filter((glob) => glob.startsWith('!'))
-        .map((glob) => glob.substring(1))
-        .map((glob) => (glob.startsWith('/') ? glob.substring(1) : glob));
-    const projectGlobPatterns = [
-        'project.json',
-        '**/project.json',
-        ...globsToInclude,
-    ];
-    projectGlobPatterns.push(...pluginsGlobPatterns);
-    const combinedProjectGlobPattern = '{' + projectGlobPatterns.join(',') + '}';
-    perf_hooks_1.performance.mark('start-glob-for-projects');
-    /**
-     * This configures the files and directories which we always want to ignore as part of file watching
-     * and which we know the location of statically (meaning irrespective of user configuration files).
-     * This has the advantage of being ignored directly within globSync
-     *
-     * Other ignored entries will need to be determined dynamically by reading and evaluating the user's
-     * .gitignore and .nxignore files below.
-     */
-    const staticIgnores = [
-        'node_modules',
-        '**/node_modules',
-        'dist',
-        '.git',
-        ...globsToExclude,
-        ...(0, ignore_1.getIgnoredGlobs)(root, false),
-    ];
-    /**
-     * TODO: This utility has been implemented multiple times across the Nx codebase,
-     * discuss whether it should be moved to a shared location.
-     */
-    const opts = {
-        ignore: staticIgnores,
-        absolute: false,
-        cwd: root,
-        dot: true,
-        suppressErrors: true,
-    };
-    const globResults = (0, fast_glob_1.sync)(combinedProjectGlobPattern, opts);
-    projectGlobCache = deduplicateProjectFiles(globResults);
-    // TODO @vsavkin remove after Nx 16
-    if (projectGlobCache.length === 0 &&
-        _globPatternsFromPackageManagerWorkspaces === undefined &&
-        (nxJson === null || nxJson === void 0 ? void 0 : nxJson.extends) === 'nx/presets/npm.json') {
-        output_1.output.warn({
-            title: 'Nx could not find any projects. Check if you need to configure workspaces in package.json or pnpm-workspace.yaml',
-        });
-    }
-    perf_hooks_1.performance.mark('finish-glob-for-projects');
-    perf_hooks_1.performance.measure('glob-for-project-files', 'start-glob-for-projects', 'finish-glob-for-projects');
-    return projectGlobCache;
-}
-exports.globForProjectFiles = globForProjectFiles;
 /**
  * @description Loops through files and reduces them to 1 file per project.
  * @param files Array of files that may represent projects

package/src/core/graph/3rdpartylicenses.txt

@@ -590,6 +590,31 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 
 
+regenerator-runtime
+MIT
+MIT License
+
+Copyright (c) 2014-present, Facebook, Inc.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+
 use-isomorphic-layout-effect
 MIT
 MIT License