fix(rspack): ensure generated app is picked up by crystal (#29048)
<!-- Please make sure you have read the submission guidelines before posting an PR --> <!-- https://github.com/nrwl/nx/blob/master/CONTRIBUTING.md#-submitting-a-pr --> <!-- Please make sure that your commit message follows our format --> <!-- Example: `fix(nx): must begin with lowercase` --> <!-- If this is a particularly complex change or feature addition, you can request a dedicated Nx release for this pull request branch. Mention someone from the Nx team or the `@nrwl/nx-pipelines-reviewers` and they will confirm if the PR warrants its own release for testing purposes, and generate it for you if appropriate. --> ## Current Behavior <!-- This is the behavior we have today --> Current projects are added to excludes of rspack plugin. Init is also not detecting rspack workspaces ## Expected Behavior <!-- This is the behavior we should expect with the changes in this PR --> Ensure excludes is not being set up when generating new apps as they are resilient to project graph creation now. Init should detect projects correctly ## Related Issue(s) <!-- Please link the issue being fixed so it gets closed when this is merged. --> Fixes #
This commit is contained in:
parent
840d935d2e
commit
007c0c85a9
@ -166,6 +166,7 @@ const npmPackageToPluginMap: Record<string, `@nx/${string}`> = {
|
|||||||
vite: '@nx/vite',
|
vite: '@nx/vite',
|
||||||
vitest: '@nx/vite',
|
vitest: '@nx/vite',
|
||||||
webpack: '@nx/webpack',
|
webpack: '@nx/webpack',
|
||||||
|
'@rspack/core': '@nx/rspack',
|
||||||
rollup: '@nx/rollup',
|
rollup: '@nx/rollup',
|
||||||
// Testing tools
|
// Testing tools
|
||||||
jest: '@nx/jest',
|
jest: '@nx/jest',
|
||||||
|
|||||||
@ -47,7 +47,6 @@ import { logShowProjectCommand } from '@nx/devkit/src/utils/log-show-project-com
|
|||||||
import { setupTailwindGenerator } from '../setup-tailwind/setup-tailwind';
|
import { setupTailwindGenerator } from '../setup-tailwind/setup-tailwind';
|
||||||
import { useFlatConfig } from '@nx/eslint/src/utils/flat-config';
|
import { useFlatConfig } from '@nx/eslint/src/utils/flat-config';
|
||||||
import { assertNotUsingTsSolutionSetup } from '@nx/js/src/utils/typescript/ts-solution-setup';
|
import { assertNotUsingTsSolutionSetup } from '@nx/js/src/utils/typescript/ts-solution-setup';
|
||||||
import { addProjectRootToRspackPluginExcludesIfExists } from './lib/add-project-root-to-rspack-plugin-excludes';
|
|
||||||
|
|
||||||
async function addLinting(host: Tree, options: NormalizedSchema) {
|
async function addLinting(host: Tree, options: NormalizedSchema) {
|
||||||
const tasks: GeneratorCallback[] = [];
|
const tasks: GeneratorCallback[] = [];
|
||||||
@ -237,8 +236,6 @@ export async function applicationGeneratorInternal(
|
|||||||
},
|
},
|
||||||
false
|
false
|
||||||
);
|
);
|
||||||
} else if (options.bundler === 'rspack') {
|
|
||||||
addProjectRootToRspackPluginExcludesIfExists(host, options.appProjectRoot);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (options.bundler !== 'vite' && options.unitTestRunner === 'vitest') {
|
if (options.bundler !== 'vite' && options.unitTestRunner === 'vitest') {
|
||||||
|
|||||||
@ -11,6 +11,7 @@ import { webStaticServeGenerator } from '@nx/web';
|
|||||||
import { nxVersion } from '../../../utils/versions';
|
import { nxVersion } from '../../../utils/versions';
|
||||||
import { hasWebpackPlugin } from '../../../utils/has-webpack-plugin';
|
import { hasWebpackPlugin } from '../../../utils/has-webpack-plugin';
|
||||||
import { hasVitePlugin } from '../../../utils/has-vite-plugin';
|
import { hasVitePlugin } from '../../../utils/has-vite-plugin';
|
||||||
|
import { hasRspackPlugin } from '../../../utils/has-rspack-plugin';
|
||||||
import { NormalizedSchema } from '../schema';
|
import { NormalizedSchema } from '../schema';
|
||||||
import { findPluginForConfigFile } from '@nx/devkit/src/utils/find-plugin-for-config-file';
|
import { findPluginForConfigFile } from '@nx/devkit/src/utils/find-plugin-for-config-file';
|
||||||
import { addE2eCiTargetDefaults } from '@nx/devkit/src/generators/target-defaults-utils';
|
import { addE2eCiTargetDefaults } from '@nx/devkit/src/generators/target-defaults-utils';
|
||||||
@ -22,6 +23,7 @@ export async function addE2e(
|
|||||||
): Promise<GeneratorCallback> {
|
): Promise<GeneratorCallback> {
|
||||||
const hasNxBuildPlugin =
|
const hasNxBuildPlugin =
|
||||||
(options.bundler === 'webpack' && hasWebpackPlugin(tree)) ||
|
(options.bundler === 'webpack' && hasWebpackPlugin(tree)) ||
|
||||||
|
(options.bundler === 'rspack' && hasRspackPlugin(tree)) ||
|
||||||
(options.bundler === 'vite' && hasVitePlugin(tree));
|
(options.bundler === 'vite' && hasVitePlugin(tree));
|
||||||
|
|
||||||
let e2eWebServerInfo: E2EWebServerDetails = {
|
let e2eWebServerInfo: E2EWebServerDetails = {
|
||||||
|
|||||||
@ -1,32 +0,0 @@
|
|||||||
import { joinPathFragments, Tree, updateNxJson } from '@nx/devkit';
|
|
||||||
import { readNxJson } from '@nx/devkit';
|
|
||||||
|
|
||||||
export function addProjectRootToRspackPluginExcludesIfExists(
|
|
||||||
tree: Tree,
|
|
||||||
projectRoot: string
|
|
||||||
) {
|
|
||||||
const excludeProjectGlob = joinPathFragments(projectRoot, '/**');
|
|
||||||
const nxJson = readNxJson(tree);
|
|
||||||
if (!nxJson.plugins?.length) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
for (let i = 0; i < nxJson.plugins.length; i++) {
|
|
||||||
let plugin = nxJson.plugins[i];
|
|
||||||
const isRspackPlugin =
|
|
||||||
typeof plugin === 'string'
|
|
||||||
? plugin === '@nx/rspack/plugin'
|
|
||||||
: plugin.plugin === '@nx/rspack/plugin';
|
|
||||||
if (isRspackPlugin) {
|
|
||||||
if (typeof plugin === 'string') {
|
|
||||||
plugin = {
|
|
||||||
plugin: plugin,
|
|
||||||
exclude: [excludeProjectGlob],
|
|
||||||
};
|
|
||||||
} else {
|
|
||||||
plugin.exclude = [...(plugin.exclude ?? []), excludeProjectGlob];
|
|
||||||
}
|
|
||||||
nxJson.plugins[i] = plugin;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
updateNxJson(tree, nxJson);
|
|
||||||
}
|
|
||||||
Loading…
x
Reference in New Issue
Block a user