Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
83 commits
Select commit Hold shift + click to select a range
622f35d
feat(core): Update nx repo to use ts solutions (packages/graph)
ndcunningham Jun 7, 2025
baa79fc
feat(core): Make nx-dev buildable with ts solution
ndcunningham Jun 21, 2025
45cbdd3
feat(core): Refactor build process and add copy-assets executor
ndcunningham Jun 24, 2025
ee765ea
feat(core): enable nx-release to work with ts solution
ndcunningham Jun 24, 2025
794d927
feat(core): enable tesing for ts solution
ndcunningham Jun 26, 2025
3b61dc0
feat(core): remove jest from devDependencies and rely on the root pac…
ndcunningham Jun 26, 2025
000a665
feat(core): update pnpm documentation scripts to work inside ts solut…
ndcunningham Jun 26, 2025
ea9b9b1
feat(core): Add typecheck target and decouple devkit from graph libs
ndcunningham Jun 26, 2025
ae4d751
chore(core): update package.json files to include jest as a devDepend…
ndcunningham Jun 26, 2025
b294acf
fix(core): enabled e2e test in ts solution
ndcunningham Jun 27, 2025
85954ba
feat(core): add-package-json-fields executor to enhance package.json …
ndcunningham Jun 27, 2025
1b1c86c
fix(core): unify tsconfig extensions to use tsconfig.base.json across…
ndcunningham Jun 27, 2025
f8d232d
fix(core): rebase with master
ndcunningham Jun 27, 2025
39ffdf3
fix(core): update documentation based on lint fixes for generators
ndcunningham Jun 28, 2025
a306fd7
chore(core): update conformance rule paths and remove debugging logs
ndcunningham Jun 28, 2025
bcf9df1
fix(core): update package.json to ensure it is private for conformanc…
ndcunningham Jun 28, 2025
5ee620d
chore(core): update scripts to not check node_modules
ndcunningham Jun 28, 2025
f41dbaa
chore(angular): add @nx/cypress dependency and update tsconfig refere…
ndcunningham Jun 28, 2025
c3c511d
fix(core): update tsconfig files to extend base config and include JS…
ndcunningham Jun 28, 2025
f671fc7
fix(core): update import paths to use @nx/e2e-utils
ndcunningham Jun 28, 2025
bed08f2
feat(core): replace copy-assets and add-package-json-fields executor …
ndcunningham Jun 29, 2025
5bee779
fix(node): update the node app generator to append to test target ins…
ndcunningham Jun 30, 2025
8c82520
fix(core): revert generator factories in rollup, rsbuild, rspack, sto…
ndcunningham Jul 1, 2025
0a9f20e
fix(nx-dev): fix nx-dev app router pages and blog ordering in production
ndcunningham Jul 1, 2025
06ed14b
fix(core): streamline package.json dependencies across e2e projects
ndcunningham Jul 3, 2025
7338c9f
fix(core): update jest executor and options in application spec files
ndcunningham Jul 3, 2025
4fc0b0b
fix(core): remove unused package references from tsconfig files
ndcunningham Jul 3, 2025
a85946c
fix: remove duplicate --verbose flag in runCreateWorkspace command
nx-cloud[bot] Jul 3, 2025
d13f77b
chore(core): fix e2e backup path handling for package managers and pr…
ndcunningham Jul 3, 2025
ac63a5b
fix(core): update import paths to use @nx/e2e-utils and include src/*…
ndcunningham Jul 3, 2025
8d0f85f
fix(testing): revert changes back to how master has them
ndcunningham Jul 3, 2025
926c760
fix(core): add cleanup script for pre-release to not include tsconfigs
ndcunningham Jul 3, 2025
519058c
fix(core): enhance plugin resolution logic for pnpm
ndcunningham Jul 5, 2025
8867c0c
fix(core): update package.json files to include missing exports provi…
ndcunningham Jul 5, 2025
a1de469
fix(testing): add nuxt mapping for jest
ndcunningham Jul 5, 2025
334ee53
fix(core): update nx report command not to report workspace packages …
ndcunningham Jul 5, 2025
d56fd8d
fix(core): remove main and types fields from package.json
ndcunningham Jul 7, 2025
53b328f
chore(angular): fix build-ng task and the runtime tsconfig
leosvelperez Jul 7, 2025
9c1897b
fix(core): streamline project.json configurations across multiple pac…
ndcunningham Jul 7, 2025
71bb906
fix(gradle): add nx-release-publish target to project.json
ndcunningham Jul 7, 2025
d290d5b
fix(gradle): add dependsOn for dependencies
ndcunningham Jul 7, 2025
854f79a
chore(core): merge master
ndcunningham Jul 7, 2025
87e4e13
chore(core): update nx-dev configs
ndcunningham Jul 7, 2025
76f51f8
fix(gradle): fix gradle missing package.json in dist
xiongemi Jul 7, 2025
878aac8
chore(js): update project.json config
ndcunningham Jul 7, 2025
1a51a91
fix(core): update legacy-post-build executor to define outputs
ndcunningham Jul 7, 2025
a9a8357
fix(core): cleanup jest left-over task and fix outputs for legacy-pos…
ndcunningham Jul 7, 2025
d2a81d3
fix(core): update build dependencies to include legacy-post-build exe…
ndcunningham Jul 8, 2025
2f66ffd
fix(testing): filter out NODE_PATH to prevent module resolution confl…
ndcunningham Jul 8, 2025
23470b5
chore(core): run sync
ndcunningham Jul 8, 2025
5ab2ddf
Merge branch 'master' into feat/ts-solution
ndcunningham Jul 8, 2025
cac0a33
fix(testing): update NODE_PATH to filter workspaces path so that reso…
ndcunningham Jul 9, 2025
d8e5542
fix(testing): streamline NODE_PATH handling to prevent module resolut…
ndcunningham Jul 9, 2025
583d183
update symbol rename
ndcunningham Jul 9, 2025
2ac7ebe
fix(core): fix nx test to also rename symlinked modules
ndcunningham Jul 9, 2025
8b23204
fix(core): refactor pnpm scanning
ndcunningham Jul 9, 2025
624a6c3
fix(testing): ensure package.json has a trailing newline for migratio…
ndcunningham Jul 9, 2025
051930a
fix(testing): remove pnpm mapping for cnw and use getStrippedEnv
ndcunningham Jul 9, 2025
3ba4a7b
chore(core): clean up .gitignore and nx.json dependencies; update cre…
ndcunningham Jul 9, 2025
8975e40
Merge branch 'master' into feat/ts-solution
ndcunningham Jul 10, 2025
e3cb3e2
fix(core): fix testing and documentation failures
ndcunningham Jul 10, 2025
76dc13a
fix(core): angular should now use the tsc plugin
ndcunningham Jul 10, 2025
3e9c7af
Merge branch 'master' into feat/ts-solution
ndcunningham Jul 10, 2025
06bacd2
fix(nx-dev): add revalidate for app/ pages which breaks when running …
ndcunningham Jul 10, 2025
6993b0b
Merge branch 'master' into feat/ts-solution
ndcunningham Jul 10, 2025
62cac6d
fix(nx-dev): update Subpase types
ndcunningham Jul 10, 2025
462f460
refactor: clean up TypeScript configuration files by removing unneces…
ndcunningham Jul 10, 2025
4867490
Merge branch 'master' into feat/ts-solution
ndcunningham Jul 11, 2025
4ebce77
fix(core): update typings paths and improve add comments for Jest res…
ndcunningham Jul 11, 2025
835d49c
Merge branch 'master' into feat/ts-solution
ndcunningham Jul 11, 2025
1f14924
fix(core): update import statements
ndcunningham Jul 11, 2025
1f5ad2d
fix(testing): update enquirer to handle swc imports
ndcunningham Jul 11, 2025
e9afdb5
chore(core): clean up imports
ndcunningham Jul 11, 2025
4d24dcf
Merge remote-tracking branch 'origin' into feat/ts-solution
ndcunningham Jul 11, 2025
e0cbebe
fix(core): fix jest resolver
ndcunningham Jul 11, 2025
7ec46bc
chore(core): update release so we can publish
ndcunningham Jul 11, 2025
93db444
fix(core): address out of memory issue due to duplicate registration …
ndcunningham Jul 13, 2025
529bb8a
Update publish.yml
ndcunningham Jul 14, 2025
2f39485
Update publish.yml
ndcunningham Jul 14, 2025
08eadfc
Update register.ts
ndcunningham Jul 14, 2025
fec9d30
Update register.ts warnNoTs
ndcunningham Jul 14, 2025
33d0113
Update publish.yml
ndcunningham Jul 14, 2025
7caf1fe
Update register.ts
ndcunningham Jul 14, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion .cargo/config.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[build]
target-dir = 'build/target'
target-dir = 'dist/target'

[target.x86_64-unknown-linux-musl]
rustflags = [
Expand Down
37 changes: 20 additions & 17 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ jobs:
# we should generate an applicable version number within publish-resolve-data.js and use a custom ref of the PR branch name.
resolve-required-data:
name: Resolve Required Data
if: ${{ github.repository_owner == 'nrwl' }}
# if: ${{ github.repository_owner == 'nrwl' }}
runs-on: ubuntu-latest
outputs:
version: ${{ steps.script.outputs.version }}
Expand Down Expand Up @@ -70,8 +70,8 @@ jobs:
check-latest: true

# Ensure that the NPM_TOKEN secret is still valid before wasting any time deriving data or building projects
- name: Check NPM Credentials
run: npm whoami && echo "NPM credentials are valid" || (echo "NPM credentials are invalid or have expired." && exit 1)
# - name: Check NPM Credentials
# run: npm whoami && echo "NPM credentials are valid" || (echo "NPM credentials are invalid or have expired." && exit 1)

- name: Resolve and set checkout and version data to use for release
id: script
Expand All @@ -89,7 +89,7 @@ jobs:
uses: actions/checkout@v4
with:
# Check out the latest master branch to get its copy of nx-release.ts
repository: nrwl/nx
repository: ndcunningham/nx
ref: master
path: latest-master-checkout

Expand All @@ -102,21 +102,21 @@ jobs:
ref: ${{ steps.script.outputs.ref }}
path: pr-branch-checkout

- name: (PR Release Only) Ensure that nx-release.ts has not changed in the PR being released
if: ${{ steps.script.outputs.ref != '' }}
env:
FILE_TO_COMPARE: "scripts/nx-release.ts"
run: |
if ! cmp -s "latest-master-checkout/${{ env.FILE_TO_COMPARE }}" "pr-branch-checkout/${{ env.FILE_TO_COMPARE }}"; then
echo "🛑 Error: The file ${{ env.FILE_TO_COMPARE }} is different on the ${{ steps.script.outputs.ref }} branch on ${{ steps.script.outputs.repo }} vs latest master on nrwl/nx, cancelling workflow. If you did not modify the file, then you likely just need to rebase/merge latest master."
exit 1
else
echo "✅ The file ${{ env.FILE_TO_COMPARE }} is identical between the ${{ steps.script.outputs.ref }} branch on ${{ steps.script.outputs.repo }} and latest master on nrwl/nx."
fi
# - name: (PR Release Only) Ensure that nx-release.ts has not changed in the PR being released
# if: ${{ steps.script.outputs.ref != '' }}
# env:
# FILE_TO_COMPARE: "scripts/nx-release.ts"
# run: |
# if ! cmp -s "latest-master-checkout/${{ env.FILE_TO_COMPARE }}" "pr-branch-checkout/${{ env.FILE_TO_COMPARE }}"; then
# echo "🛑 Error: The file ${{ env.FILE_TO_COMPARE }} is different on the ${{ steps.script.outputs.ref }} branch on ${{ steps.script.outputs.repo }} vs latest master on nrwl/nx, cancelling workflow. If you did not modify the file, then you likely just need to rebase/merge latest master."
# exit 1
# else
# echo "✅ The file ${{ env.FILE_TO_COMPARE }} is identical between the ${{ steps.script.outputs.ref }} branch on ${{ steps.script.outputs.repo }} and latest master on nrwl/nx."
# fi

build:
needs: [ resolve-required-data ]
if: ${{ github.repository_owner == 'nrwl' }}
# if: ${{ github.repository_owner == 'nrwl' }}
strategy:
fail-fast: false
matrix:
Expand Down Expand Up @@ -354,7 +354,7 @@ jobs:

build-freebsd:
needs: [ resolve-required-data ]
if: ${{ github.repository_owner == 'nrwl' }}
# if: ${{ github.repository_owner == 'nrwl' }}
runs-on: ubuntu-latest
name: Build FreeBSD
timeout-minutes: 45
Expand Down Expand Up @@ -398,8 +398,11 @@ jobs:
whoami
env
freebsd-version
echo "Installing dependencies"
pnpm install --frozen-lockfile --ignore-scripts
echo "Building FreeBSD bindings"
pnpm nx run-many --verbose --outputStyle stream --target=build-native -- --target=x86_64-unknown-freebsd
echo "Cleaning up"
pnpm nx reset
rm -rf node_modules
rm -rf dist
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ CHANGELOG.md
.next
out


# Angular Cache
.angular

Expand Down
4 changes: 0 additions & 4 deletions docs/generated/devkit/AggregateCreateNodesError.md
Original file line number Diff line number Diff line change
Expand Up @@ -93,8 +93,6 @@ Error.cause

• `Readonly` **errors**: [file: string, error: Error][]

An array of tuples that represent errors encountered when processing a given file. An example entry might look like ['path/to/project.json', [Error: 'Invalid JSON. Unexpected token 'a' in JSON at position 0]]

---

### message
Expand All @@ -121,8 +119,6 @@ Error.name

• `Readonly` **partialResults**: [`CreateNodesResultV2`](/reference/core-api/devkit/documents/CreateNodesResultV2)

The partial results of the `createNodesV2` function. This should be the results for each file that didn't encounter an issue.

---

### pluginIndex
Expand Down
4 changes: 2 additions & 2 deletions docs/generated/devkit/ProjectGraphProjectNode.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ A node describing a project in a workspace

- [data](/reference/core-api/devkit/documents/ProjectGraphProjectNode#data): ProjectConfiguration & Object
- [name](/reference/core-api/devkit/documents/ProjectGraphProjectNode#name): string
- [type](/reference/core-api/devkit/documents/ProjectGraphProjectNode#type): "lib" | "app" | "e2e"
- [type](/reference/core-api/devkit/documents/ProjectGraphProjectNode#type): "app" | "e2e" | "lib"

## Properties

Expand All @@ -28,4 +28,4 @@ Additional metadata about a project

### type

• **type**: `"lib"` \| `"app"` \| `"e2e"`
• **type**: `"app"` \| `"e2e"` \| `"lib"`
12 changes: 6 additions & 6 deletions docs/generated/devkit/addProjectConfiguration.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@ Adds project configuration to the Nx workspace.

#### Parameters

| Name | Type | Default value | Description |
| :--------------------- | :---------------------------------------------------------------------------------- | :------------ | :---------------------------------------------------------------------- |
| `tree` | [`Tree`](/reference/core-api/devkit/documents/Tree) | `undefined` | the file system tree |
| `projectName` | `string` | `undefined` | unique name. Often directories are part of the name (e.g., mydir-mylib) |
| `projectConfiguration` | [`ProjectConfiguration`](/reference/core-api/devkit/documents/ProjectConfiguration) | `undefined` | project configuration |
| `standalone` | `boolean` | `true` | whether the project is configured in workspace.json or not |
| Name | Type | Description |
| :--------------------- | :---------------------------------------------------------------------------------- | :---------------------------------------------------------------------- |
| `tree` | [`Tree`](/reference/core-api/devkit/documents/Tree) | the file system tree |
| `projectName` | `string` | unique name. Often directories are part of the name (e.g., mydir-mylib) |
| `projectConfiguration` | [`ProjectConfiguration`](/reference/core-api/devkit/documents/ProjectConfiguration) | project configuration |
| `standalone?` | `boolean` | whether the project is configured in workspace.json or not |

#### Returns

Expand Down
2 changes: 1 addition & 1 deletion docs/generated/devkit/createProjectGraphAsync.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ stored in the daemon process. To reset both run: `nx reset`.

| Name | Type |
| :------------------------ | :-------- |
| `opts` | `Object` |
| `opts?` | `Object` |
| `opts.exitOnError` | `boolean` |
| `opts.resetDaemonClient?` | `boolean` |

Expand Down
6 changes: 3 additions & 3 deletions docs/generated/devkit/detectPackageManager.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ Detects which package manager is used in the workspace based on the lock file.

#### Parameters

| Name | Type | Default value |
| :---- | :------- | :------------ |
| `dir` | `string` | `''` |
| Name | Type |
| :----- | :------- |
| `dir?` | `string` |

#### Returns

Expand Down
2 changes: 0 additions & 2 deletions docs/generated/devkit/getOutputsForTargetAndConfiguration.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,6 @@ Pass the target and overrides instead. This will be removed in v20.

▸ **getOutputsForTargetAndConfiguration**(`target`, `overrides`, `node`): `string`[]

Returns the list of outputs that will be cached.

#### Parameters

| Name | Type |
Expand Down
8 changes: 4 additions & 4 deletions docs/generated/devkit/getPackageManagerCommand.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ execSync(`${getPackageManagerCommand().addDev} my-dev-package`);

#### Parameters

| Name | Type | Default value | Description |
| :--------------- | :---------------------------------------------------------------------- | :-------------- | :------------------------------------------------------------------------------------------ |
| `packageManager` | [`PackageManager`](/reference/core-api/devkit/documents/PackageManager) | `undefined` | The package manager to use. If not provided, it will be detected based on the lock file. |
| `root` | `string` | `workspaceRoot` | The directory the commands will be ran inside of. Defaults to the current workspace's root. |
| Name | Type | Description |
| :---------------- | :---------------------------------------------------------------------- | :------------------------------------------------------------------------------------------ |
| `packageManager?` | [`PackageManager`](/reference/core-api/devkit/documents/PackageManager) | The package manager to use. If not provided, it will be detected based on the lock file. |
| `root?` | `string` | The directory the commands will be ran inside of. Defaults to the current workspace's root. |

#### Returns

Expand Down
8 changes: 4 additions & 4 deletions docs/generated/devkit/getPackageManagerVersion.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ but it can also be passed in explicitly.

#### Parameters

| Name | Type |
| :--------------- | :---------------------------------------------------------------------- |
| `packageManager` | [`PackageManager`](/reference/core-api/devkit/documents/PackageManager) |
| `cwd` | `string` |
| Name | Type |
| :---------------- | :---------------------------------------------------------------------- |
| `packageManager?` | [`PackageManager`](/reference/core-api/devkit/documents/PackageManager) |
| `cwd?` | `string` |

#### Returns

Expand Down
8 changes: 4 additions & 4 deletions docs/generated/devkit/isWorkspacesEnabled.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ Returns true if the workspace is using npm workspaces, yarn workspaces, or pnpm

#### Parameters

| Name | Type | Default value | Description |
| :--------------- | :---------------------------------------------------------------------- | :-------------- | :------------------------------------------------------------------------------------------ |
| `packageManager` | [`PackageManager`](/reference/core-api/devkit/documents/PackageManager) | `undefined` | The package manager to use. If not provided, it will be detected based on the lock file. |
| `root` | `string` | `workspaceRoot` | The directory the commands will be ran inside of. Defaults to the current workspace's root. |
| Name | Type | Description |
| :---------------- | :---------------------------------------------------------------------- | :------------------------------------------------------------------------------------------ |
| `packageManager?` | [`PackageManager`](/reference/core-api/devkit/documents/PackageManager) | The package manager to use. If not provided, it will be detected based on the lock file. |
| `root?` | `string` | The directory the commands will be ran inside of. Defaults to the current workspace's root. |

#### Returns

Expand Down
4 changes: 2 additions & 2 deletions docs/generated/devkit/ngcli_adapter/NxScopedHost.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

- [\_delegate](/reference/core-api/devkit/documents/ngcli_adapter/NxScopedHost#_delegate): Host<any>
- [\_root](/reference/core-api/devkit/documents/ngcli_adapter/NxScopedHost#_root): Path
- [root](/reference/core-api/devkit/documents/ngcli_adapter/NxScopedHost#root): string
- [root](/reference/core-api/devkit/documents/ngcli_adapter/NxScopedHost#root): any

### Accessors

Expand Down Expand Up @@ -84,7 +84,7 @@ virtualFs.ScopedHost.\_root

### root

• `Private` **root**: `string`
• `Private` **root**: `any`

## Accessors

Expand Down
11 changes: 11 additions & 0 deletions e2e/angular/package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"name": "@nx/e2e-angular",
"version": "0.0.1",
"private": true,
"dependencies": {
"nx": "workspace:*",
"@nx/devkit": "workspace:*",
"@nx/e2e-utils": "workspace:*",
"@nx/workspace": "workspace:*"
}
}
2 changes: 1 addition & 1 deletion e2e/angular/src/config.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import {
runCLI,
uniq,
updateFile,
} from '@nx/e2e/utils';
} from '@nx/e2e-utils';

describe('angular.json v1 config', () => {
const app1 = uniq('app1');
Expand Down
2 changes: 1 addition & 1 deletion e2e/angular/src/cypress-component-tests.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import {
removeFile,
checkFilesExist,
updateJson,
} from '../../utils';
} from '@nx/e2e-utils';
import { names } from '@nx/devkit';
import { join } from 'path';

Expand Down
3 changes: 1 addition & 2 deletions e2e/angular/src/misc.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,8 @@ import {
runCLI,
uniq,
updateFile,
} from '@nx/e2e/utils';
} from '@nx/e2e-utils';
import { classify } from '@nx/devkit/src/utils/string-utils';
import { join } from 'path';

describe('Move Angular Project', () => {
let proj: string;
Expand Down
2 changes: 1 addition & 1 deletion e2e/angular/src/module-federation.rspack.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import {
uniq,
updateFile,
updateJson,
} from '@nx/e2e/utils';
} from '@nx/e2e-utils';
import { join } from 'path';

describe('Angular Module Federation', () => {
Expand Down
2 changes: 1 addition & 1 deletion e2e/angular/src/module-federation.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import {
uniq,
updateFile,
updateJson,
} from '@nx/e2e/utils';
} from '@nx/e2e-utils';
import { join } from 'path';

describe('Angular Module Federation', () => {
Expand Down
2 changes: 1 addition & 1 deletion e2e/angular/src/ng-add.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import {
runNgNew,
uniq,
updateFile,
} from '@nx/e2e/utils';
} from '@nx/e2e-utils';
import { PackageManager } from 'nx/src/utils/package-manager';

describe('convert Angular CLI workspace to an Nx workspace', () => {
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 @@ -6,7 +6,7 @@ import {
runCLI,
runCLIAsync,
uniq,
} from '@nx/e2e/utils';
} from '@nx/e2e-utils';

describe('Angular Package', () => {
describe('ngrx', () => {
Expand Down
2 changes: 1 addition & 1 deletion e2e/angular/src/plugin.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import {
uniq,
updateFile,
updateJson,
} from '@nx/e2e/utils';
} from '@nx/e2e-utils';
import { angularCliVersion } from '@nx/workspace/src/utils/versions';
import { ensureDirSync } from 'fs-extra';
import { execSync } from 'node:child_process';
Expand Down
2 changes: 1 addition & 1 deletion e2e/angular/src/projects.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import {
uniq,
updateFile,
updateJson,
} from '@nx/e2e/utils';
} from '@nx/e2e-utils';
import { join, normalize } from 'path';

describe('Angular Projects', () => {
Expand Down
2 changes: 1 addition & 1 deletion e2e/angular/src/tailwind.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import {
uniq,
updateFile,
updateJson,
} from '@nx/e2e/utils';
} from '@nx/e2e-utils';
import { join } from 'path';

describe('Tailwind support', () => {
Expand Down
12 changes: 12 additions & 0 deletions e2e/angular/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,18 @@
"include": [],
"files": [],
"references": [
{
"path": "../../packages/workspace"
},
{
"path": "../utils"
},
{
"path": "../../packages/devkit"
},
{
"path": "../../packages/nx"
},
{
"path": "./tsconfig.spec.json"
}
Expand Down
1 change: 0 additions & 1 deletion e2e/angular/tsconfig.spec.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{
"extends": "./tsconfig.json",
"compilerOptions": {
"outDir": "../../dist/out-tsc",
"module": "commonjs",
"types": ["jest", "node"]
},
Expand Down
8 changes: 8 additions & 0 deletions e2e/cypress/package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"name": "@nx/e2e-cypress",
"version": "0.0.1",
"private": true,
"dependencies": {
"@nx/e2e-utils": "workspace:*"
}
}
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 @@ -5,7 +5,7 @@ import {
runCLI,
runE2ETests,
uniq,
} from '@nx/e2e/utils';
} from '@nx/e2e-utils';

const TEN_MINS_MS = 600_000;

Expand Down
Loading
Loading