Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Revert "fix(core): local plugins should resolve in package-manager wo… #9955

Merged
merged 1 commit into from Apr 22, 2022
Merged

Revert "fix(core): local plugins should resolve in package-manager wo… #9955

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
79 changes: 39 additions & 40 deletions packages/nx/src/utils/nx-plugin.ts
View file
Open in desktop
Expand Up @@ -47,34 +47,30 @@ export function loadNxPlugins(
? nxPluginCache ||
(nxPluginCache = plugins.map((moduleName) => {
let pluginPath: string;
let pluginName: string;
if (['.js', '.ts'].includes(path.extname(moduleName))) {
if (
path.extname(moduleName) === '.ts' &&
!tsNodeAndPathsRegistered
) {
registerTSTranspiler();
}
pluginPath = require.resolve(moduleName, { paths });
pluginName = path.basename(moduleName);
} else {
const localPlugin = resolveLocalNxPlugin(moduleName);
pluginName = moduleName;
if (localPlugin) {
try {
pluginPath = require.resolve(moduleName, {
paths,
});
} catch (e) {
if (e.code === 'MODULE_NOT_FOUND') {
const plugin = resolveLocalNxPlugin(moduleName);
const main = readPluginMainFromProjectConfiguration(
localPlugin.projectConfig
plugin.projectConfig
);
pluginPath = main
? path.join(workspaceRoot, main)
: localPlugin.path;
pluginPath = main ? path.join(workspaceRoot, main) : plugin.path;
} else {
pluginPath = require.resolve(moduleName, {
paths,
});
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
existsSync(packageJsonPath) // plugin has a package.json
? readJsonFile(packageJsonPath) // read name from package.json
: { name: path.basename(pluginPath) }; // use the name of the file we point to
const plugin = require(pluginPath) as NxPlugin;
plugin.name = pluginName;
plugin.name = name;

return plugin;
}))
: [];
Expand Down Expand Up @@ -111,23 +107,27 @@ export function readPluginPackageJson(
path: string;
json: PackageJson;
} {
// Check for matching local plugin
const localPluginPath = resolveLocalNxPlugin(pluginName);
if (localPluginPath) {
const localPluginPackageJson = path.join(
localPluginPath.path,
'package.json'
);
return {
path: localPluginPackageJson,
json: readJsonFile(localPluginPackageJson),
};
let packageJsonPath: string;
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: readJsonFile(localPluginPackageJson),
};
}
}
throw e;
}

// Fallback to installed plugins
const packageJsonPath = require.resolve(`${pluginName}/package.json`, {
paths,
});
return { json: readJsonFile(packageJsonPath), path: packageJsonPath };
}

Expand Down Expand Up @@ -223,8 +223,7 @@ function readTsConfigPaths(root: string = workspaceRoot) {
.map((x) => path.join(root, x))
.filter((x) => existsSync(x))[0];
if (!tsconfigPath) {
tsconfigPaths = {};
return {};
throw new Error('unable to find tsconfig.base.json or tsconfig.json');
}
const { compilerOptions } = readJsonFile(tsconfigPath);
tsconfigPaths = compilerOptions?.paths;
Expand Down