nx 13.9.3 → 13.10.0-beta.1

package/src/shared/nx-plugin.js

@@ -1,31 +1,43 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.mergePluginTargetsWithNxTargets = exports.loadNxPlugins = void 0;
+exports.resolveLocalNxPlugin = exports.readPluginPackageJson = exports.mergePluginTargetsWithNxTargets = exports.loadNxPlugins = void 0;
 const fast_glob_1 = require("fast-glob");
 const fs_1 = require("fs");
-const path_1 = require("path");
+const path = require("path");
 const app_root_1 = require("../utils/app-root");
 const fileutils_1 = require("../utils/fileutils");
-function findPluginPackageJson(path, plugin) {
-    while (true) {
-        if (!path.startsWith(app_root_1.appRootPath)) {
-            throw new Error("Couldn't find a package.json for Nx plugin:" + plugin);
-        }
-        if ((0, fs_1.existsSync)((0, path_1.join)(path, 'package.json'))) {
-            return (0, path_1.join)(path, 'package.json');
-        }
-        path = (0, path_1.dirname)(path);
-    }
-}
+const register_1 = require("../utils/register");
+const workspace_1 = require("./workspace");
+// Short lived cache (cleared between cmd runs)
+// holding resolved nx plugin objects.
+// Allows loadNxPlugins to be called multiple times w/o
+// executing resolution mulitple times.
 let nxPluginCache = null;
-function loadNxPlugins(plugins) {
+function loadNxPlugins(plugins, paths = [app_root_1.appRootPath]) {
     return (plugins === null || plugins === void 0 ? void 0 : plugins.length)
         ? nxPluginCache ||
-            (nxPluginCache = plugins.map((path) => {
-                const pluginPath = require.resolve(path, {
-                    paths: [app_root_1.appRootPath],
-                });
-                const { name } = (0, fileutils_1.readJsonFile)(findPluginPackageJson(pluginPath, path));
+            (nxPluginCache = plugins.map((moduleName) => {
+                let pluginPath;
+                try {
+                    pluginPath = require.resolve(moduleName, {
+                        paths,
+                    });
+                }
+                catch (e) {
+                    if (e.code === 'MODULE_NOT_FOUND') {
+                        const plugin = resolveLocalNxPlugin(moduleName);
+                        const main = readPluginMainFromProjectConfiguration(plugin.projectConfig);
+                        pluginPath = main ? path.join(app_root_1.appRootPath, main) : plugin.path;
+                    }
+                    else {
+                        throw e;
+                    }
+                }
+                const packageJsonPath = path.join(pluginPath, 'package.json');
+                const { name } = !['.ts', '.js'].some((x) => x === path.extname(pluginPath)) && // Not trying to point to a ts or js file
+                    (0, fs_1.existsSync)(packageJsonPath) // plugin has a package.json
+                    ? (0, fileutils_1.readJsonFile)(packageJsonPath) // read name from package.json
+                    : { name: path.basename(pluginPath) }; // use the name of the file we point to
                 const plugin = require(pluginPath);
                 plugin.name = name;
                 return plugin;
@@ -41,13 +53,110 @@ function mergePluginTargetsWithNxTargets(projectRoot, targets, plugins) {
             continue;
         }
         const projectFiles = (0, fast_glob_1.sync)(`+(${plugin.projectFilePatterns.join('|')})`, {
-            cwd: (0, path_1.join)(app_root_1.appRootPath, projectRoot),
+            cwd: path.join(app_root_1.appRootPath, projectRoot),
         });
         for (const projectFile of projectFiles) {
-            newTargets = Object.assign(Object.assign({}, newTargets), plugin.registerProjectTargets((0, path_1.join)(projectRoot, projectFile)));
+            newTargets = Object.assign(Object.assign({}, newTargets), plugin.registerProjectTargets(path.join(projectRoot, projectFile)));
         }
     }
     return Object.assign(Object.assign({}, newTargets), targets);
 }
 exports.mergePluginTargetsWithNxTargets = mergePluginTargetsWithNxTargets;
+function readPluginPackageJson(pluginName, paths = [app_root_1.appRootPath]) {
+    let packageJsonPath;
+    try {
+        packageJsonPath = require.resolve(`${pluginName}/package.json`, {
+            paths,
+        });
+    }
+    catch (e) {
+        if (e.code === 'MODULE_NOT_FOUND') {
+            const localPluginPath = resolveLocalNxPlugin(pluginName);
+            if (localPluginPath) {
+                const localPluginPackageJson = path.join(localPluginPath.path, 'package.json');
+                return {
+                    path: localPluginPackageJson,
+                    json: (0, fileutils_1.readJsonFile)(localPluginPackageJson),
+                };
+            }
+        }
+        throw e;
+    }
+    return { json: (0, fileutils_1.readJsonFile)(packageJsonPath), path: packageJsonPath };
+}
+exports.readPluginPackageJson = readPluginPackageJson;
+/**
+ * Builds a plugin package and returns the path to output
+ * @param importPath What is the import path that refers to a potential plugin?
+ * @returns The path to the built plugin, or null if it doesn't exist
+ */
+const localPluginCache = {};
+function resolveLocalNxPlugin(importPath, root = app_root_1.appRootPath) {
+    var _a;
+    (_a = localPluginCache[importPath]) !== null && _a !== void 0 ? _a : (localPluginCache[importPath] = lookupLocalPlugin(importPath, root));
+    return localPluginCache[importPath];
+}
+exports.resolveLocalNxPlugin = resolveLocalNxPlugin;
+let tsNodeAndPathsRegistered = false;
+function registerTSTranspiler() {
+    if (!tsNodeAndPathsRegistered) {
+        (0, register_1.registerTsProject)(app_root_1.appRootPath, 'tsconfig.base.json');
+    }
+    tsNodeAndPathsRegistered = true;
+}
+function lookupLocalPlugin(importPath, root = app_root_1.appRootPath) {
+    const workspace = new workspace_1.Workspaces(root).readWorkspaceConfiguration({
+        _ignorePluginInference: true,
+    });
+    const plugin = findNxProjectForImportPath(importPath, workspace, root);
+    if (!plugin) {
+        return null;
+    }
+    if (!tsNodeAndPathsRegistered) {
+        registerTSTranspiler();
+    }
+    const projectConfig = workspace.projects[plugin];
+    return { path: path.join(root, projectConfig.root), projectConfig };
+}
+function findNxProjectForImportPath(importPath, workspace, root = app_root_1.appRootPath) {
+    var _a;
+    const tsConfigPaths = readTsConfigPaths(root);
+    const possiblePaths = (_a = tsConfigPaths[importPath]) === null || _a === void 0 ? void 0 : _a.map((p) => path.resolve(root, p));
+    if (tsConfigPaths[importPath]) {
+        const projectRootMappings = Object.entries(workspace.projects).reduce((m, [project, config]) => {
+            m[path.resolve(root, config.root)] = project;
+            return m;
+        }, {});
+        for (const root of Object.keys(projectRootMappings)) {
+            if (possiblePaths.some((p) => p.startsWith(root))) {
+                return projectRootMappings[root];
+            }
+        }
+        if (process.env.NX_VERBOSE_LOGGING) {
+            console.log('Unable to find local plugin', possiblePaths, projectRootMappings);
+        }
+        throw new Error('Unable to resolve local plugin with import path ' + importPath);
+    }
+}
+let tsconfigPaths;
+function readTsConfigPaths(root = app_root_1.appRootPath) {
+    if (!tsconfigPaths) {
+        const tsconfigPath = ['tsconfig.base.json', 'tsconfig.json']
+            .map((x) => path.join(root, x))
+            .filter((x) => (0, fs_1.existsSync)(x))[0];
+        if (!tsconfigPath) {
+            throw new Error('unable to find tsconfig.base.json or tsconfig.json');
+        }
+        const { compilerOptions } = (0, fileutils_1.readJsonFile)(tsconfigPath);
+        tsconfigPaths = compilerOptions === null || compilerOptions === void 0 ? void 0 : compilerOptions.paths;
+    }
+    return tsconfigPaths;
+}
+function readPluginMainFromProjectConfiguration(plugin) {
+    var _a, _b, _c;
+    const { main } = ((_a = Object.values(plugin.targets).find((x) => ['@nrwl/js:tsc', '@nrwl/js:swc', '@nrwl/node:package'].includes(x.executor))) === null || _a === void 0 ? void 0 : _a.options) ||
+        ((_c = (_b = plugin.targets) === null || _b === void 0 ? void 0 : _b.build) === null || _c === void 0 ? void 0 : _c.options) ||
+        {};
+    return main;
+}
 //# sourceMappingURL=nx-plugin.js.map

package/src/shared/nx-plugin.js.map

@@ -1 +1 @@
-{"version":3,"file":"nx-plugin.js","sourceRoot":"","sources":["../../../../../packages/nx/src/shared/nx-plugin.ts"],"names":[],"mappings":";;;AAAA,yCAAiC;AACjC,2BAAgC;AAChC,+BAAqC;AACrC,gDAAgD;AAChD,kDAAkD;AAuBlD,SAAS,qBAAqB,CAAC,IAAY,EAAE,MAAc;IACzD,OAAO,IAAI,EAAE;QACX,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,sBAAW,CAAC,EAAE;YACjC,MAAM,IAAI,KAAK,CAAC,6CAA6C,GAAG,MAAM,CAAC,CAAC;SACzE;QACD,IAAI,IAAA,eAAU,EAAC,IAAA,WAAI,EAAC,IAAI,EAAE,cAAc,CAAC,CAAC,EAAE;YAC1C,OAAO,IAAA,WAAI,EAAC,IAAI,EAAE,cAAc,CAAC,CAAC;SACnC;QACD,IAAI,GAAG,IAAA,cAAO,EAAC,IAAI,CAAC,CAAC;KACtB;AACH,CAAC;AAED,IAAI,aAAa,GAAe,IAAI,CAAC;AACrC,SAAgB,aAAa,CAAC,OAAkB;IAC9C,OAAO,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,MAAM;QACpB,CAAC,CAAC,aAAa;YACX,CAAC,aAAa,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;gBACpC,MAAM,UAAU,GAAG,OAAO,CAAC,OAAO,CAAC,IAAI,EAAE;oBACvC,KAAK,EAAE,CAAC,sBAAW,CAAC;iBACrB,CAAC,CAAC;gBAEH,MAAM,EAAE,IAAI,EAAE,GAAG,IAAA,wBAAY,EAC3B,qBAAqB,CAAC,UAAU,EAAE,IAAI,CAAC,CACxC,CAAC;gBACF,MAAM,MAAM,GAAG,OAAO,CAAC,UAAU,CAAa,CAAC;gBAC/C,MAAM,CAAC,IAAI,GAAG,IAAI,CAAC;gBAEnB,OAAO,MAAM,CAAC;YAChB,CAAC,CAAC,CAAC;QACP,CAAC,CAAC,EAAE,CAAC;AACT,CAAC;AAjBD,sCAiBC;AAED,SAAgB,+BAA+B,CAC7C,WAAmB,EACnB,OAA4C,EAC5C,OAAmB;;IAEnB,IAAI,UAAU,GAAwC,EAAE,CAAC;IACzD,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE;QAC5B,IAAI,CAAC,CAAA,MAAA,MAAM,CAAC,mBAAmB,0CAAE,MAAM,CAAA,IAAI,CAAC,MAAM,CAAC,sBAAsB,EAAE;YACzE,SAAS;SACV;QAED,MAAM,YAAY,GAAG,IAAA,gBAAI,EAAC,KAAK,MAAM,CAAC,mBAAmB,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE;YACtE,GAAG,EAAE,IAAA,WAAI,EAAC,sBAAW,EAAE,WAAW,CAAC;SACpC,CAAC,CAAC;QACH,KAAK,MAAM,WAAW,IAAI,YAAY,EAAE;YACtC,UAAU,mCACL,UAAU,GACV,MAAM,CAAC,sBAAsB,CAAC,IAAA,WAAI,EAAC,WAAW,EAAE,WAAW,CAAC,CAAC,CACjE,CAAC;SACH;KACF;IACD,uCAAY,UAAU,GAAK,OAAO,EAAG;AACvC,CAAC;AAtBD,0EAsBC"}
+{"version":3,"file":"nx-plugin.js","sourceRoot":"","sources":["../../../../../packages/nx/src/shared/nx-plugin.ts"],"names":[],"mappings":"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"}

package/src/shared/package-json.d.ts

@@ -20,7 +20,7 @@ export declare function buildTargetFromScript(script: string, nx: NxProjectPacka
     executor: string;
     options: any;
     outputs?: string[];
-    dependsOn?: import("./workspace").TargetDependencyConfig[];
+    dependsOn?: import("./workspace.model").TargetDependencyConfig[];
     configurations?: {
         [config: string]: any;
     };

package/src/shared/params.js

@@ -4,7 +4,7 @@ exports.lookupUnmatched = exports.convertSmartDefaultsIntoNamedParams = exports.
 const tslib_1 = require("tslib");
 const logger_1 = require("./logger");
 function handleErrors(isVerbose, fn) {
-    return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
         try {
             return yield fn();
         }
@@ -364,7 +364,7 @@ function combineOptionsForExecutor(commandLineOpts, config, target, schema, defa
 }
 exports.combineOptionsForExecutor = combineOptionsForExecutor;
 function combineOptionsForGenerator(commandLineOpts, collectionName, generatorName, wc, schema, isInteractive, defaultProjectName, relativeCwd, isVerbose = false) {
-    return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
         const generatorDefaults = wc
             ? getGeneratorDefaults(defaultProjectName, wc, collectionName, generatorName)
             : {};
@@ -441,7 +441,7 @@ function getGeneratorDefaults(projectName, wc, collectionName, generatorName) {
     return defaults;
 }
 function promptForValues(opts, schema) {
-    return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
         const prompts = [];
         Object.entries(schema.properties).forEach(([k, v]) => {
             if (v['x-prompt'] && opts[k] === undefined) {

package/src/shared/workspace.d.ts

@@ -1,227 +1,17 @@
-import type { NxJsonConfiguration } from './nx';
-import { TaskGraph } from './tasks';
 import { Ignore } from 'ignore';
-export interface Workspace extends WorkspaceJsonConfiguration, NxJsonConfiguration {
-    projects: Record<string, ProjectConfiguration>;
-}
-/**
- * Workspace configuration
- */
-export interface WorkspaceJsonConfiguration {
-    /**
-     * Version of the configuration format
-     */
-    version: number;
-    /**
-     * Projects' projects
-     */
-    projects: {
-        [projectName: string]: ProjectConfiguration;
-    };
-}
-export interface RawWorkspaceJsonConfiguration extends Omit<WorkspaceJsonConfiguration, 'projects'> {
-    projects: {
-        [projectName: string]: ProjectConfiguration | string;
-    };
-}
-/**
- * Type of project supported
- */
-export declare type ProjectType = 'library' | 'application';
-/**
- * Project configuration
- */
-export interface ProjectConfiguration {
-    /**
-     * Project's name. Optional if specified in workspace.json
-     */
-    name?: string;
-    /**
-     * Project's targets
-     */
-    targets?: {
-        [targetName: string]: TargetConfiguration;
-    };
-    /**
-     * Project's location relative to the root of the workspace
-     */
-    root: string;
-    /**
-     * The location of project's sources relative to the root of the workspace
-     */
-    sourceRoot?: string;
-    /**
-     * Project type
-     */
-    projectType?: ProjectType;
-    /**
-     * List of default values used by generators.
-     *
-     * These defaults are project specific.
-     *
-     * Example:
-     *
-     * ```
-     * {
-     *   "@nrwl/react": {
-     *     "library": {
-     *       "style": "scss"
-     *     }
-     *   }
-     * }
-     * ```
-     */
-    generators?: {
-        [collectionName: string]: {
-            [generatorName: string]: any;
-        };
-    };
-    /**
-     * List of projects which are added as a dependency
-     */
-    implicitDependencies?: string[];
-    /**
-     * List of tags used by nx-enforce-module-boundaries / project graph
-     */
-    tags?: string[];
-}
-export interface TargetDependencyConfig {
-    /**
-     * This the projects that the targets belong to
-     *
-     * 'self': This target depends on another target of the same project
-     * 'deps': This target depends on targets of the projects of it's deps.
-     */
-    projects: 'self' | 'dependencies';
-    /**
-     * The name of the target
-     */
-    target: string;
-}
-/**
- * Target's configuration
- */
-export interface TargetConfiguration {
-    /**
-     * The executor/builder used to implement the target.
-     *
-     * Example: '@nrwl/web:rollup'
-     */
-    executor: string;
-    /**
-     * List of the target's outputs. The outputs will be cached by the Nx computation
-     * caching engine.
-     */
-    outputs?: string[];
-    /**
-     * This describes other targets that a target depends on.
-     */
-    dependsOn?: TargetDependencyConfig[];
-    /**
-     * Target's options. They are passed in to the executor.
-     */
-    options?: any;
-    /**
-     * Sets of options
-     */
-    configurations?: {
-        [config: string]: any;
-    };
-    /**
-     * A default named configuration to use when a target configuration is not provided.
-     */
-    defaultConfiguration?: string;
-}
+import { ExecutorConfig, Generator, ProjectConfiguration, WorkspaceJsonConfiguration } from './workspace.model';
+import type { NxJsonConfiguration } from './nx';
+export * from './workspace.model';
 export declare function workspaceConfigName(root: string): "angular.json" | "workspace.json";
-/**
- * A callback function that is executed after changes are made to the file system
- */
-export declare type GeneratorCallback = () => void | Promise<void>;
-/**
- * A function that schedules updates to the filesystem to be done atomically
- */
-export declare type Generator<T = unknown> = (tree: any, schema: T) => void | GeneratorCallback | Promise<void | GeneratorCallback>;
-export interface ExecutorConfig {
-    schema: any;
-    hasherFactory?: () => any;
-    implementationFactory: () => Executor;
-    batchImplementationFactory?: () => TaskGraphExecutor;
-}
-/**
- * Implementation of a target of a project
- */
-export declare type Executor<T = any> = (
-/**
- * Options that users configure or pass via the command line
- */
-options: T, context: ExecutorContext) => Promise<{
-    success: boolean;
-}> | AsyncIterableIterator<{
-    success: boolean;
-}>;
-/**
- * Implementation of a target of a project that handles multiple projects to be batched
- */
-export declare type TaskGraphExecutor<T = any> = (
-/**
- * Graph of Tasks to be executed
- */
-taskGraph: TaskGraph, 
-/**
- * Map of Task IDs to options for the task
- */
-options: Record<string, T>, 
-/**
- * Set of overrides for the overall execution
- */
-overrides: T, context: ExecutorContext) => Promise<Record<string, {
-    success: boolean;
-    terminalOutput: string;
-}>>;
-/**
- * Context that is passed into an executor
- */
-export interface ExecutorContext {
-    /**
-     * The root of the workspace
-     */
-    root: string;
-    /**
-     * The name of the project being executed on
-     */
-    projectName?: string;
-    /**
-     * The name of the target being executed
-     */
-    targetName?: string;
-    /**
-     * The name of the configuration being executed
-     */
-    configurationName?: string;
-    /**
-     * The configuration of the target being executed
-     */
-    target?: TargetConfiguration;
-    /**
-     * The full workspace configuration
-     */
-    workspace: WorkspaceJsonConfiguration & NxJsonConfiguration;
-    /**
-     * The current working directory
-     */
-    cwd: string;
-    /**
-     * Enable verbose logging
-     */
-    isVerbose: boolean;
-}
 export declare class Workspaces {
     private root;
     private cachedWorkspaceConfig;
     constructor(root: string);
     relativeCwd(cwd: string): string;
     calculateDefaultProjectName(cwd: string, wc: WorkspaceJsonConfiguration & NxJsonConfiguration): string;
-    readWorkspaceConfiguration(): WorkspaceJsonConfiguration & NxJsonConfiguration;
+    readWorkspaceConfiguration(opts?: {
+        _ignorePluginInference?: boolean;
+    }): WorkspaceJsonConfiguration & NxJsonConfiguration;
     isNxExecutor(nodeModule: string, executor: string): boolean;
     isNxGenerator(collectionName: string, generatorName: string): boolean;
     readExecutor(nodeModule: string, executor: string): ExecutorConfig;
@@ -247,11 +37,11 @@ export declare function resolveNewFormatWithInlineProjects(w: any, root?: string
  * Todo: Should refactor, not duplicate.
  */
 export declare function toProjectName(fileName: string, nxJson: NxJsonConfiguration): string;
-export declare function globForProjectFiles(root: string, nxJson?: NxJsonConfiguration): string[];
+export declare function globForProjectFiles(root: any, nxJson?: NxJsonConfiguration, ignorePluginInference?: boolean): string[];
 export declare function deduplicateProjectFiles(files: string[], ig?: Ignore): string[];
 export declare function inferProjectFromNonStandardFile(file: string, nxJson: NxJsonConfiguration): ProjectConfiguration & {
     name: string;
 };
-export declare function buildWorkspaceConfigurationFromGlobs(nxJson: NxJsonConfiguration, projectFiles?: string[], // making this parameter allows devkit to pick up newly created projects
+export declare function buildWorkspaceConfigurationFromGlobs(nxJson: NxJsonConfiguration, projectFiles: string[], // making this parameter allows devkit to pick up newly created projects
 readJson?: (string: any) => any): WorkspaceJsonConfiguration;
 export declare function renamePropertyWithStableKeys(obj: any, from: string, to: string): void;

package/src/shared/workspace.js

@@ -2,16 +2,17 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.renamePropertyWithStableKeys = exports.buildWorkspaceConfigurationFromGlobs = exports.inferProjectFromNonStandardFile = exports.deduplicateProjectFiles = exports.globForProjectFiles = exports.toProjectName = exports.resolveNewFormatWithInlineProjects = exports.resolveOldFormatWithInlineProjects = exports.toOldFormatOrNull = exports.toNewFormatOrNull = exports.toNewFormat = exports.reformattedWorkspaceJsonOrNull = exports.Workspaces = exports.workspaceConfigName = void 0;
 const tslib_1 = require("tslib");
+const fast_glob_1 = require("fast-glob");
 const fs_1 = require("fs");
+const ignore_1 = require("ignore");
 const path = require("path");
+const perf_hooks_1 = require("perf_hooks");
 const app_root_1 = require("../utils/app-root");
 const fileutils_1 = require("../utils/fileutils");
 const logger_1 = require("./logger");
-const fast_glob_1 = require("fast-glob");
-const ignore_1 = require("ignore");
-const path_1 = require("path");
-const perf_hooks_1 = require("perf_hooks");
 const nx_plugin_1 = require("./nx-plugin");
+const path_1 = require("path");
+tslib_1.__exportStar(require("./workspace.model"), exports);
 function workspaceConfigName(root) {
     if ((0, fs_1.existsSync)(path.join(root, 'angular.json'))) {
         return 'angular.json';
@@ -44,7 +45,7 @@ class Workspaces {
         }
         return wc.defaultProject;
     }
-    readWorkspaceConfiguration() {
+    readWorkspaceConfiguration(opts) {
         if (this.cachedWorkspaceConfig)
             return this.cachedWorkspaceConfig;
         const nxJsonPath = path.join(this.root, 'nx.json');
@@ -55,7 +56,7 @@ class Workspaces {
             : null;
         const workspace = workspacePath && (0, fs_1.existsSync)(workspacePath)
             ? this.readFromWorkspaceJson()
-            : buildWorkspaceConfigurationFromGlobs(nxJson, globForProjectFiles(this.root, nxJson), (path) => (0, fileutils_1.readJsonFile)((0, path_1.join)(this.root, path)));
+            : buildWorkspaceConfigurationFromGlobs(nxJson, globForProjectFiles(this.root, nxJson, opts === null || opts === void 0 ? void 0 : opts._ignorePluginInference), (path) => (0, fileutils_1.readJsonFile)((0, path_1.join)(this.root, path)));
         assertValidWorkspaceConfiguration(nxJson);
         this.cachedWorkspaceConfig = Object.assign(Object.assign({}, workspace), nxJson);
         return this.cachedWorkspaceConfig;
@@ -125,10 +126,7 @@ class Workspaces {
     }
     readExecutorsJson(nodeModule, executor) {
         var _a, _b, _c;
-        const packageJsonPath = require.resolve(`${nodeModule}/package.json`, {
-            paths: this.resolvePaths(),
-        });
-        const packageJson = (0, fileutils_1.readJsonFile)(packageJsonPath);
+        const { json: packageJson, path: packageJsonPath } = (0, nx_plugin_1.readPluginPackageJson)(nodeModule, this.resolvePaths());
         const executorsFile = (_a = packageJson.executors) !== null && _a !== void 0 ? _a : packageJson.builders;
         if (!executorsFile) {
             throw new Error(`The "${nodeModule}" package does not support Nx executors.`);
@@ -150,10 +148,7 @@ class Workspaces {
             });
         }
         else {
-            const packageJsonPath = require.resolve(`${collectionName}/package.json`, {
-                paths: this.resolvePaths(),
-            });
-            const packageJson = (0, fileutils_1.readJsonFile)(packageJsonPath);
+            const { json: packageJson, path: packageJsonPath } = (0, nx_plugin_1.readPluginPackageJson)(collectionName, this.resolvePaths());
             const generatorsFile = (_a = packageJson.generators) !== null && _a !== void 0 ? _a : packageJson.schematics;
             if (!generatorsFile) {
                 throw new Error(`The "${collectionName}" package does not support Nx generators.`);
@@ -356,7 +351,7 @@ function getGlobPatternsFromPackageManagerWorkspaces(root) {
         return ['**/package.json'];
     }
 }
-function globForProjectFiles(root, nxJson) {
+function globForProjectFiles(root, nxJson, ignorePluginInference = false) {
     // Deal w/ Caching
     const cacheKey = [root, ...((nxJson === null || nxJson === void 0 ? void 0 : nxJson.plugins) || [])].join(',');
     if (projectGlobCache && cacheKey === projectGlobCacheKey)
@@ -365,8 +360,10 @@ function globForProjectFiles(root, nxJson) {
     const projectGlobPatterns = [
         '**/project.json',
         ...getGlobPatternsFromPackageManagerWorkspaces(root),
-        ...getGlobPatternsFromPlugins(nxJson),
     ];
+    if (!ignorePluginInference) {
+        projectGlobPatterns.push(...getGlobPatternsFromPlugins(nxJson));
+    }
     const combinedProjectGlobPattern = '{' + projectGlobPatterns.join(',') + '}';
     perf_hooks_1.performance.mark('start-glob-for-projects');
     /**
@@ -424,7 +421,7 @@ function deduplicateProjectFiles(files, ig) {
 }
 exports.deduplicateProjectFiles = deduplicateProjectFiles;
 function buildProjectConfigurationFromPackageJson(path, packageJson, nxJson) {
-    var _a;
+    var _a, _b, _c, _d;
     const directory = (0, path_1.dirname)(path).split('\\').join('/');
     const npmPrefix = `@${nxJson.npmScope}/`;
     let name = (_a = packageJson.name) !== null && _a !== void 0 ? _a : toProjectName(directory, nxJson);
@@ -435,6 +432,11 @@ function buildProjectConfigurationFromPackageJson(path, packageJson, nxJson) {
         root: directory,
         sourceRoot: directory,
         name,
+        projectType: ((_b = nxJson.workspaceLayout) === null || _b === void 0 ? void 0 : _b.appsDir) != ((_c = nxJson.workspaceLayout) === null || _c === void 0 ? void 0 : _c.libsDir) &&
+            ((_d = nxJson.workspaceLayout) === null || _d === void 0 ? void 0 : _d.appsDir) &&
+            directory.startsWith(nxJson.workspaceLayout.appsDir)
+            ? 'application'
+            : 'library',
     };
 }
 function inferProjectFromNonStandardFile(file, nxJson) {
@@ -445,7 +447,7 @@ function inferProjectFromNonStandardFile(file, nxJson) {
     };
 }
 exports.inferProjectFromNonStandardFile = inferProjectFromNonStandardFile;
-function buildWorkspaceConfigurationFromGlobs(nxJson, projectFiles = globForProjectFiles(app_root_1.appRootPath, nxJson), // making this parameter allows devkit to pick up newly created projects
+function buildWorkspaceConfigurationFromGlobs(nxJson, projectFiles, // making this parameter allows devkit to pick up newly created projects
 readJson = fileutils_1.readJsonFile // making this an arg allows us to reuse in devkit
 ) {
     const projects = {};
@@ -474,7 +476,7 @@ readJson = fileutils_1.readJsonFile // making this an arg allows us to reuse in
             // this results in targets being inferred by Nx from package scripts,
             // and the root / sourceRoot both being the directory.
             if (fileName === 'package.json') {
-                const _a = buildProjectConfigurationFromPackageJson(file, readJson(file), nxJson), { name } = _a, config = (0, tslib_1.__rest)(_a, ["name"]);
+                const _a = buildProjectConfigurationFromPackageJson(file, readJson(file), nxJson), { name } = _a, config = tslib_1.__rest(_a, ["name"]);
                 if (!projects[name]) {
                     projects[name] = config;
                 }
@@ -485,7 +487,7 @@ readJson = fileutils_1.readJsonFile // making this an arg allows us to reuse in
             else {
                 // This project was created from an nx plugin.
                 // The only thing we know about the file is its location
-                const _b = inferProjectFromNonStandardFile(file, nxJson), { name } = _b, config = (0, tslib_1.__rest)(_b, ["name"]);
+                const _b = inferProjectFromNonStandardFile(file, nxJson), { name } = _b, config = tslib_1.__rest(_b, ["name"]);
                 if (!projects[name]) {
                     projects[name] = config;
                 }