Skip to content

Commit 019f94d

Browse files
Chau TranChau Tran
authored andcommitted
feat: upgrade nx
1 parent 075e9fe commit 019f94d

File tree

18 files changed

+4145
-4296
lines changed

18 files changed

+4145
-4296
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,12 +23,12 @@
2323
},
2424
{
2525
"files": ["*.ts", "*.tsx"],
26-
"extends": ["plugin:@nrwl/nx/typescript"],
26+
"extends": ["plugin:@nx/typescript"],
2727
"rules": {}
2828
},
2929
{
3030
"files": ["*.js", "*.jsx"],
31-
"extends": ["plugin:@nrwl/nx/javascript"],
31+
"extends": ["plugin:@nx/javascript"],
3232
"rules": {}
3333
},
3434
{

apps/example/src/app/app.config.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
import { ApplicationConfig } from '@angular/core';
2+
export const appConfig: ApplicationConfig = {
3+
providers: [],
4+
};

apps/example/src/main.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,8 @@ import { bootstrapApplication } from '@angular/platform-browser';
22
import { extend } from 'angular-three';
33
import * as THREE from 'three';
44
import { AppComponent } from './app/app.component';
5+
import { appConfig } from './app/app.config';
56

67
extend(THREE);
78

8-
bootstrapApplication(AppComponent, {
9-
providers: [],
10-
}).catch((err) => console.error(err));
9+
bootstrapApplication(AppComponent, appConfig).catch((err) => console.error(err));

jest.config.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { getJestProjects } from '@nrwl/jest';
1+
import { getJestProjects } from '@nx/jest';
22

33
export default {
44
projects: getJestProjects(),

jest.preset.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
const nxPreset = require('@nrwl/jest/preset').default;
1+
const nxPreset = require('@nx/jest/preset').default;
22

33
module.exports = {
44
...nxPreset,

libs/angular-three-postprocessing/.eslintrc.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@
1919
"@typescript-eslint/member-ordering": "off",
2020
"@typescript-eslint/no-non-null-assertion": "off"
2121
},
22-
"extends": ["plugin:@nrwl/nx/angular", "plugin:@angular-eslint/template/process-inline-templates"]
22+
"extends": ["plugin:@nx/angular", "plugin:@angular-eslint/template/process-inline-templates"]
2323
},
2424
{
2525
"files": ["*.html"],
26-
"extends": ["plugin:@nrwl/nx/angular-template"],
26+
"extends": ["plugin:@nx/angular-template"],
2727
"rules": {}
2828
}
2929
]

libs/angular-three-postprocessing/ng-package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@
44
"lib": {
55
"entryFile": "src/index.ts"
66
},
7-
"allowedNonPeerDependencies": ["@nrwl/devkit"]
7+
"allowedNonPeerDependencies": ["@nx/devkit"]
88
}

libs/angular-three-postprocessing/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@
2929
"three": "^0.148.0 || ^0.149.0 || ^0.150.0 || ^0.151.0"
3030
},
3131
"dependencies": {
32-
"@nrwl/devkit": "^15.0.0",
33-
"tslib": "^2.3.0"
32+
"tslib": "^2.3.0",
33+
"@nx/devkit": "^15.0.0"
3434
},
3535
"sideEffects": false,
3636
"generators": "./plugin/generators.json",

libs/angular-three-postprocessing/project.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"prefix": "ngtp",
77
"targets": {
88
"build": {
9-
"executor": "@nrwl/angular:package",
9+
"executor": "@nx/angular:package",
1010
"outputs": ["{workspaceRoot}/dist/{projectRoot}"],
1111
"options": {
1212
"project": "libs/angular-three-postprocessing/ng-package.json"
@@ -32,7 +32,7 @@
3232
}
3333
},
3434
"test": {
35-
"executor": "@nrwl/jest:jest",
35+
"executor": "@nx/jest:jest",
3636
"outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
3737
"options": {
3838
"jestConfig": "libs/angular-three-postprocessing/jest.config.ts",
@@ -46,7 +46,7 @@
4646
}
4747
},
4848
"lint": {
49-
"executor": "@nrwl/linter:eslint",
49+
"executor": "@nx/linter:eslint",
5050
"outputs": ["{options.outputFile}"],
5151
"options": {
5252
"lintFilePatterns": [

libs/plugin/.eslintrc.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"files": ["./package.json", "./generators.json", "./executors.json"],
1919
"parser": "jsonc-eslint-parser",
2020
"rules": {
21-
"@nrwl/nx/nx-plugin-checks": "error"
21+
"@nx/nx-plugin-checks": "error"
2222
}
2323
}
2424
]

0 commit comments

Comments
 (0)