Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion e2e/angular/src/config.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,9 @@ describe('angular.json v1 config', () => {
const app1 = uniq('app1');

beforeAll(() => {
newProject({ packages: ['@nx/angular'] });
newProject({
packages: ['@nx/angular', '@nx/webpack', '@nx/jest', '@nx/playwright'],
});
runCLI(
`generate @nx/angular:app ${app1} --bundler=webpack --unit-test-runner=jest --no-interactive`
);
Expand Down
8 changes: 7 additions & 1 deletion e2e/angular/src/cypress-component-tests-setup.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,13 @@ export function setupCypressComponentTests(
): CypressComponentTestsSetup {
const projectName = newProject({
name: uniq('cy-ng'),
packages: ['@nx/angular'],
packages: [
'@nx/angular',
'@nx/webpack',
'@nx/playwright',
'@nx/vitest',
'@nx/cypress',
],
});

const appName = uniq('cy-angular-app');
Expand Down
14 changes: 12 additions & 2 deletions e2e/angular/src/misc.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,9 @@ describe('Move Angular Project', () => {
let newPath: string;

beforeAll(() => {
proj = newProject({ packages: ['@nx/angular'] });
proj = newProject({
packages: ['@nx/angular', '@nx/jest', '@nx/playwright'],
});
app1 = uniq('app1');
app2 = uniq('app2');
newPath = `subfolder/${app2}`;
Expand Down Expand Up @@ -154,7 +156,15 @@ describe('Convert Angular Webpack Project to Rspack', () => {
let app1: string;

beforeAll(() => {
proj = newProject({ packages: ['@nx/angular'] });
proj = newProject({
packages: [
'@nx/angular',
'@nx/webpack',
'@nx/vitest',
'@nx/playwright',
'@nx/rspack',
],
});
app1 = uniq('app1');
runCLI(
`generate @nx/angular:app ${app1} --bundler=webpack --no-interactive`
Expand Down
10 changes: 9 additions & 1 deletion e2e/angular/src/module-federation-setup.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,15 @@ export interface ModuleFederationTestSetup {
}

export function setupModuleFederationTest(): ModuleFederationTestSetup {
const proj = newProject({ packages: ['@nx/angular'] });
const proj = newProject({
packages: [
'@nx/angular',
'@nx/jest',
'@nx/vitest',
'@nx/playwright',
'@nx/cypress',
],
});
const oldVerboseLoggingValue = process.env.NX_E2E_VERBOSE_LOGGING;
process.env.NX_E2E_VERBOSE_LOGGING = 'true';

Expand Down
4 changes: 3 additions & 1 deletion e2e/angular/src/module-federation.rspack.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,9 @@ describe('Angular Module Federation', () => {
let oldVerboseLoggingValue: string;

beforeAll(() => {
proj = newProject({ packages: ['@nx/angular'] });
proj = newProject({
packages: ['@nx/angular', '@nx/rspack', '@nx/vitest', '@nx/playwright'],
});
oldVerboseLoggingValue = process.env.NX_E2E_VERBOSE_LOGGING;
process.env.NX_E2E_VERBOSE_LOGGING = 'true';
});
Expand Down
2 changes: 1 addition & 1 deletion e2e/angular/src/ngrx.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import {

describe('NgRx', () => {
beforeAll(() => {
newProject({ packages: ['@nx/angular'] });
newProject({ packages: ['@nx/angular', '@nx/playwright'] });
});
afterAll(() => {
cleanupProject();
Expand Down
10 changes: 9 additions & 1 deletion e2e/angular/src/projects-setup.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,15 @@ export interface ProjectsTestSetup {
}

export function setupProjectsTest(): ProjectsTestSetup {
const proj = newProject({ packages: ['@nx/angular'] });
const proj = newProject({
packages: [
'@nx/angular',
'@nx/webpack',
'@nx/vitest',
'@nx/playwright',
'@nx/rspack',
],
});
const app1 = uniq('app1');
const esbuildApp = uniq('esbuild-app');
const lib1 = uniq('lib1');
Expand Down
4 changes: 3 additions & 1 deletion e2e/angular/src/tailwind.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,9 @@ describe('Tailwind support', () => {
};

beforeAll(() => {
project = newProject({ packages: ['@nx/angular'] });
project = newProject({
packages: ['@nx/angular', '@nx/webpack', '@nx/jest', '@nx/playwright'],
});

// Create tailwind config in the workspace root
createWorkspaceTailwindConfigFile();
Expand Down
2 changes: 1 addition & 1 deletion e2e/cypress/src/cypress-legacy.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ const TEN_MINS_MS = 600_000;

describe('Cypress E2E Test runner (legacy)', () => {
beforeAll(() => {
newProject({ packages: ['@nx/angular', '@nx/react'] });
newProject({ packages: ['@nx/angular', '@nx/react', '@nx/cypress'] });
});

afterAll(() => cleanupProject());
Expand Down
10 changes: 9 additions & 1 deletion e2e/cypress/src/cypress.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,15 @@ describe('Cypress E2E Test runner', () => {
const myapp = uniq('myapp');

beforeAll(() => {
newProject({ packages: ['@nx/angular', '@nx/next', '@nx/react'] });
newProject({
packages: [
'@nx/angular',
'@nx/next',
'@nx/react',
'@nx/cypress',
'@nx/eslint',
],
});
});

afterAll(() => cleanupProject());
Expand Down
4 changes: 3 additions & 1 deletion e2e/esbuild/src/esbuild-setup.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
import { cleanupProject, newProject } from '@nx/e2e-utils';

export function setupEsbuildTest(): string {
return newProject({ packages: ['@nx/js'] });
return newProject({
packages: ['@nx/js', '@nx/esbuild', '@nx/eslint', '@nx/jest'],
});
}

export function cleanupEsbuildTest(): void {
Expand Down
17 changes: 15 additions & 2 deletions e2e/eslint/src/linter.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,13 @@ describe('Linter', () => {

beforeAll(() => {
projScope = newProject({
packages: ['@nx/react', '@nx/js', '@nx/eslint'],
packages: [
'@nx/eslint',
'@nx/js',
'@nx/react',
'@nx/vite',
'@nx/vitest',
],
});
runCLI(
`generate @nx/react:app apps/${myapp} --tags=validtag --linter eslint --unitTestRunner vitest`
Expand Down Expand Up @@ -641,7 +647,14 @@ describe('Linter', () => {
describe('Root projects migration', () => {
beforeEach(() =>
newProject({
packages: ['@nx/react', '@nx/js', '@nx/angular', '@nx/node'],
packages: [
'@nx/angular',
'@nx/eslint',
'@nx/jest',
'@nx/js',
'@nx/node',
'@nx/react',
],
})
);
afterEach(() => cleanupProject());
Expand Down
13 changes: 12 additions & 1 deletion e2e/expo/src/expo-legacy.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,18 @@ describe('@nx/expo (legacy)', () => {
let originalEnv: string;

beforeAll(() => {
proj = newProject({ packages: ['@nx/expo'] });
proj = newProject({
packages: [
'@nx/cypress',
'@nx/expo',
'@nx/jest',
'@nx/playwright',
'@nx/react',
'@nx/rollup',
'@nx/storybook',
'@nx/web',
],
});
// we create empty preset above which skips creation of `production` named input

originalEnv = process.env.NX_ADD_PLUGINS;
Expand Down
11 changes: 10 additions & 1 deletion e2e/expo/src/expo.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,16 @@ describe('@nx/expo', () => {
let libName: string;

beforeAll(() => {
newProject({ packages: ['@nx/expo'] });
newProject({
packages: [
'@nx/cypress',
'@nx/expo',
'@nx/jest',
'@nx/react',
'@nx/rollup',
'@nx/storybook',
],
});
appName = uniq('app');
libName = uniq('lib');
runCLI(
Expand Down
5 changes: 4 additions & 1 deletion e2e/jest/src/jest-legacy.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,10 @@ import {

describe('Jest', () => {
beforeAll(() => {
newProject({ name: uniq('proj-jest'), packages: ['@nx/js', '@nx/node'] });
newProject({
name: uniq('proj-jest'),
packages: ['@nx/js', '@nx/node', '@nx/eslint', '@nx/jest'],
});
});

afterAll(() => cleanupProject());
Expand Down
4 changes: 2 additions & 2 deletions e2e/jest/src/jest-root.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ describe('Jest root projects', () => {
describe('angular', () => {
beforeAll(() => {
newProject({
packages: ['@nx/angular'],
packages: ['@nx/angular', '@nx/jest'],
});
runCLI(
`generate @nx/angular:app --name=${myapp} --directory . --rootProject --no-interactive --unitTestRunner=jest --linter=eslint`
Expand All @@ -31,7 +31,7 @@ describe('Jest root projects', () => {
describe('react', () => {
beforeAll(() => {
newProject({
packages: ['@nx/react'],
packages: ['@nx/react', '@nx/vite', '@nx/jest', '@nx/eslint'],
});
runCLI(
`generate @nx/react:app --name=${myapp} --directory . --rootProject --unitTestRunner=jest --linter=eslint`
Expand Down
5 changes: 4 additions & 1 deletion e2e/jest/src/jest.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,10 @@ import {

describe('Jest', () => {
beforeAll(() => {
newProject({ name: uniq('proj-jest'), packages: ['@nx/js', '@nx/node'] });
newProject({
name: uniq('proj-jest'),
packages: ['@nx/js', '@nx/node', '@nx/eslint', '@nx/jest'],
});
});

afterAll(() => cleanupProject());
Expand Down
2 changes: 1 addition & 1 deletion e2e/js/src/js-esm-support.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ describe('JS ESM/CJS Support', () => {
const selectedPm = getSelectedPackageManager();
beforeAll(() => {
newProject({
packages: ['@nx/node', '@nx/js', '@nx/esbuild'],
packages: ['@nx/node', '@nx/js', '@nx/esbuild', '@nx/eslint', '@nx/jest'],
packageManager: selectedPm === 'npm' ? 'pnpm' : selectedPm,
});
});
Expand Down
2 changes: 1 addition & 1 deletion e2e/js/src/js-executor-copy-workspace-modules.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ describe('@nx/js:copy-workspace-modules', () => {

beforeAll(() => {
scope = newProject({
packages: ['@nx/node', '@nx/js'],
packages: ['@nx/node', '@nx/js', '@nx/eslint', '@nx/jest'],
preset: 'ts',
packageManager: 'pnpm',
});
Expand Down
4 changes: 3 additions & 1 deletion e2e/js/src/js-executor-node.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,9 @@ describe('js:node executor', () => {
let scope: string;

beforeAll(() => {
scope = newProject({ packages: ['@nx/js', '@nx/node'] });
scope = newProject({
packages: ['@nx/js', '@nx/node', '@nx/esbuild', '@nx/webpack'],
});
});

afterAll(() => cleanupProject());
Expand Down
2 changes: 1 addition & 1 deletion e2e/js/src/js-executor-prune-lockfile.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ describe('js:prune-lockfile executor', () => {

beforeAll(() => {
scope = newProject({
packages: ['@nx/node', '@nx/js'],
packages: ['@nx/node', '@nx/js', '@nx/eslint', '@nx/jest'],
preset: 'ts',
packageManager,
});
Expand Down
2 changes: 1 addition & 1 deletion e2e/js/src/js-executor-swc.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ describe('js:swc executor', () => {
let scope: string;

beforeAll(() => {
scope = newProject({ packages: ['@nx/js'] });
scope = newProject({ packages: ['@nx/js', '@nx/eslint', '@nx/jest'] });
});

afterAll(() => {
Expand Down
5 changes: 4 additions & 1 deletion e2e/js/src/js-executor-tsc.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,10 @@ import {

describe('js:tsc executor', () => {
let scope;
beforeAll(() => (scope = newProject({ packages: ['@nx/js'] })));
beforeAll(
() =>
(scope = newProject({ packages: ['@nx/js', '@nx/eslint', '@nx/jest'] }))
);
afterAll(() => cleanupProject());

it('should create libs with js executors (--compiler=tsc)', async () => {
Expand Down
2 changes: 1 addition & 1 deletion e2e/js/src/js-packaging.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ describe('packaging libs', () => {
let scope: string;

beforeEach(() => {
scope = newProject({ packages: ['@nx/js'] });
scope = newProject({ packages: ['@nx/js', '@nx/eslint', '@nx/jest'] });
});

afterEach(() => cleanupProject());
Expand Down
3 changes: 3 additions & 0 deletions e2e/js/src/js-strip-types.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,9 @@ describe('native Node.js TypeScript support (NX_PREFER_NODE_STRIP_TYPES)', () =>
'@nx/playwright',
'@nx/cypress',
'@nx/web',
'@nx/vite',
'@nx/eslint',
'@nx/jest',
],
});
});
Expand Down
9 changes: 8 additions & 1 deletion e2e/js/src/js-ts-solution.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,14 @@ import {
describe('JS - TS solution setup', () => {
beforeAll(() => {
newProject({
packages: ['@nx/js'],
packages: [
'@nx/js',
'@nx/esbuild',
'@nx/rollup',
'@nx/vite',
'@nx/eslint',
'@nx/jest',
],
preset: 'ts',
});
});
Expand Down
2 changes: 1 addition & 1 deletion e2e/next/src/next-appdir.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ describe('Next.js App Router', () => {
beforeAll(
() =>
(proj = newProject({
packages: ['@nx/next'],
packages: ['@nx/next', '@nx/js', '@nx/playwright'],
}))
);

Expand Down
2 changes: 1 addition & 1 deletion e2e/next/src/next-component-tests.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ describe('NextJs Component Testing', () => {
beforeAll(() => {
newProject({
name: uniq('next-ct'),
packages: ['@nx/next'],
packages: ['@nx/next', '@nx/cypress'],
});
});

Expand Down
2 changes: 1 addition & 1 deletion e2e/next/src/next-jest-config.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ describe('Next.js Jest Configuration', () => {
let proj: string;

beforeAll(() => {
proj = newProject({ packages: ['@nx/next'] });
proj = newProject({ packages: ['@nx/next', '@nx/jest'] });
});

afterAll(() => cleanupProject());
Expand Down
2 changes: 1 addition & 1 deletion e2e/next/src/next-legacy.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ describe('@nx/next (legacy)', () => {

beforeAll(() => {
proj = newProject({
packages: ['@nx/next'],
packages: ['@nx/next', '@nx/jest', '@nx/eslint'],
});
packageManager = detectPackageManager(tmpProjPath());
originalEnv = process.env.NODE_ENV;
Expand Down
Loading
Loading