Skip to content

Commit 4451e8a

Browse files
authored
feat(core): migrate to v16 and nx plugin API v2 (#763)
1 parent 6398a06 commit 4451e8a

File tree

182 files changed

+5002
-3300
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

182 files changed

+5002
-3300
lines changed

.eslintrc.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
{
22
"root": true,
33
"ignorePatterns": ["**/*"],
4-
"plugins": ["@nrwl/nx"],
4+
"plugins": ["@nx"],
55
"overrides": [
66
{
77
"files": ["*.ts", "*.tsx", "*.js", "*.jsx"],
88
"rules": {
9-
"@nrwl/nx/enforce-module-boundaries": [
9+
"@nx/enforce-module-boundaries": [
1010
"error",
1111
{
1212
"enforceBuildableLibDependency": true,
@@ -23,14 +23,14 @@
2323
},
2424
{
2525
"files": ["*.ts", "*.tsx"],
26-
"extends": ["plugin:@nrwl/nx/typescript"],
26+
"extends": ["plugin:@nx/typescript"],
2727
"rules": {
2828
"eqeqeq": ["error", "smart"]
2929
}
3030
},
3131
{
3232
"files": ["*.js", "*.jsx"],
33-
"extends": ["plugin:@nrwl/nx/javascript"],
33+
"extends": ["plugin:@nx/javascript"],
3434
"rules": {}
3535
},
3636
{

.github/workflows/main.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,9 @@ jobs:
1919
npx nx-cloud record npx nx workspace-lint
2020
npx nx-cloud record npx nx format:check
2121
npx nx-cloud record yarn documentation:check --verbose
22+
yarn nx affected --target build --exclude='*,!demo/**/*'
2223
parallel-commands-on-agents: |
23-
yarn nx affected -- --target=lint --parallel 3
24-
yarn nx affected -- --target=build --parallel 3
25-
yarn nx affected -- --target=test --parallel 3
24+
yarn nx affected --target lint build test --exclude='demo/**/*'
2625
final-commands: |
2726
yarn e2e
2827

.github/workflows/pr.yml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,11 @@ concurrency:
66
group: ${{ github.workflow }}-${{ github.event.number || github.ref }}
77
cancel-in-progress: true
88

9+
# TODO: Figure out why DTE is not handling demo app well.
10+
# It appears that the task graph on the DTE side doesn't
11+
# contain the relationship between the demo webapi and the
12+
# demo models library. This causes the C# build to fail.
13+
914
jobs:
1015
main:
1116
name: Nx Cloud - Main Job
@@ -17,8 +22,9 @@ jobs:
1722
npx nx-cloud record yarn nx format:check
1823
npx nx-cloud record yarn documentation:check --verbose
1924
npx nx-cloud record yarn commitlint --from ${{ github.event.pull_request.base.sha }} --to HEAD --verbose
25+
yarn nx affected --target build --exclude='*,!demo/**/*'
2026
parallel-commands-on-agents: |
21-
yarn nx affected --target lint build test --parallel 3
27+
yarn nx affected --target lint build test --exclude 'demo/**/*'
2228
final-commands: |
2329
yarn e2e
2430

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
## Prerequisites
2020

2121
- You have an existing nx workspace (empty, or otherwise)
22-
- You have the [@nrwl/js](https://www.npmjs.com/package/@nrwl/js) plugin added to the workspace
22+
- You have the [@nx/js](https://www.npmjs.com/package/@nx/js) plugin added to the workspace
2323

2424
## Adding .NET capabilities to your workspace
2525

@@ -53,7 +53,7 @@ Run `nx serve my-app` for a dev server. The app will automatically reload if you
5353
<!--
5454
## Code scaffolding
5555
56-
Run `nx g @nrwl/react:component my-component --project=my-app` to generate a new component.
56+
Run `nx g @nx/react:component my-component --project=my-app` to generate a new component.
5757
-->
5858

5959
## Build

apps/docs-site/project.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
2-
"$schema": "../../node_modules/nx/schemas/project-schema.json",
32
"name": "docs-site",
3+
"$schema": "../../node_modules/nx/schemas/project-schema.json",
44
"projectType": "application",
55
"sourceRoot": "apps/docs-site/src",
66
"targets": {

assets/black.avif

3 KB
Binary file not shown.

assets/color.avif

3.14 KB
Binary file not shown.

assets/white.avif

3.34 KB
Binary file not shown.

demo/apps/web-frontend/.babelrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"presets": [
33
[
4-
"@nrwl/react/babel",
4+
"@nx/react/babel",
55
{
66
"runtime": "automatic"
77
}

demo/apps/web-frontend/.eslintrc.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"extends": ["plugin:@nrwl/nx/react", "../../../.eslintrc.json"],
2+
"extends": ["plugin:@nx/react", "../../../.eslintrc.json"],
33
"ignorePatterns": ["!**/*"],
44
"overrides": [
55
{

0 commit comments

Comments
 (0)