Skip to content

Commit

Permalink
chore: nx migrate 16.7.0
Browse files Browse the repository at this point in the history
  • Loading branch information
trungvose committed Mar 23, 2024
1 parent 68b9b9f commit eb0fe49
Show file tree
Hide file tree
Showing 163 changed files with 4,611 additions and 3,411 deletions.
8 changes: 4 additions & 4 deletions .eslintrc.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{
"root": true,
"ignorePatterns": ["**/*"],
"plugins": ["@nrwl/nx"],
"plugins": ["@nx"],
"overrides": [
{
"files": ["*.ts", "*.tsx", "*.js", "*.jsx"],
"rules": {
"@nrwl/nx/enforce-module-boundaries": [
"@nx/enforce-module-boundaries": [
"error",
{
"enforceBuildableLibDependency": true,
Expand Down Expand Up @@ -63,12 +63,12 @@
},
{
"files": ["*.ts", "*.tsx"],
"extends": ["plugin:@nrwl/nx/typescript"],
"extends": ["plugin:@nx/typescript"],
"rules": {}
},
{
"files": ["*.js", "*.jsx"],
"extends": ["plugin:@nrwl/nx/javascript"],
"extends": ["plugin:@nx/javascript"],
"rules": {}
}
]
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -41,3 +41,4 @@ Thumbs.db
.eslintcache

.angular
.nx
7 changes: 2 additions & 5 deletions apps/angular-spotify/.eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,7 @@
"overrides": [
{
"files": ["*.ts"],
"extends": [
"plugin:@nrwl/nx/angular",
"plugin:@angular-eslint/template/process-inline-templates"
],
"extends": ["plugin:@nx/angular", "plugin:@angular-eslint/template/process-inline-templates"],
"rules": {
"@angular-eslint/directive-selector": [
"error",
Expand All @@ -29,7 +26,7 @@
},
{
"files": ["*.html"],
"extends": ["plugin:@nrwl/nx/angular-template"],
"extends": ["plugin:@nx/angular-template"],
"rules": {}
}
]
Expand Down
12 changes: 6 additions & 6 deletions apps/angular-spotify/project.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"name": "angular-spotify",
"$schema": "../../node_modules/nx/schemas/project-schema.json",
"projectType": "application",
"root": "apps/angular-spotify",
"sourceRoot": "apps/angular-spotify/src",
"prefix": "angular-spotify",
"targets": {
Expand Down Expand Up @@ -97,7 +98,7 @@
}
},
"lint": {
"executor": "@nrwl/linter:eslint",
"executor": "@nx/linter:eslint",
"options": {
"lintFilePatterns": [
"apps/angular-spotify/src/**/*.ts",
Expand All @@ -106,14 +107,13 @@
}
},
"test": {
"executor": "@nrwl/jest:jest",
"outputs": ["coverage/apps/angular-spotify"],
"executor": "@nx/jest:jest",
"outputs": ["{workspaceRoot}/coverage/apps/angular-spotify"],
"options": {
"jestConfig": "apps/angular-spotify/jest.config.js",
"passWithNoTests": true
}
}
},
"tags": ["type:app", "scope:angular-spotify"],
"name": "angular-spotify"
"tags": ["type:app", "scope:angular-spotify"]
}
4 changes: 2 additions & 2 deletions decorate-angular-cli.js
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,10 @@ const cp = require('child_process');
const isWindows = os.platform() === 'win32';
let output;
try {
output = require('@nrwl/workspace').output;
output = require('@nx/workspace').output;
} catch (e) {
console.warn(
'Angular CLI could not be decorated to enable computation caching. Please ensure @nrwl/workspace is installed.'
'Angular CLI could not be decorated to enable computation caching. Please ensure @nx/workspace is installed.'
);
process.exit(0);
}
Expand Down
2 changes: 1 addition & 1 deletion jest.config.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const { getJestProjects } = require('@nrwl/jest');
const { getJestProjects } = require('@nx/jest');

export default {
projects: [
Expand Down
2 changes: 1 addition & 1 deletion jest.preset.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const nxPreset = require('@nrwl/jest/preset').default;
const nxPreset = require('@nx/jest/preset').default;

module.exports = {
...nxPreset,
Expand Down
9 changes: 8 additions & 1 deletion libs/web/album/data-access/.babelrc
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
{
"presets": [["@nrwl/web/babel", { "useBuiltIns": "usage" }]]
"presets": [
[
"@nx/js/babel",
{
"useBuiltIns": "usage"
}
]
]
}
12 changes: 6 additions & 6 deletions libs/web/album/data-access/project.json
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
{
"root": "libs/web/album/data-access",
"name": "web-album-data-access",
"$schema": "../../../../node_modules/nx/schemas/project-schema.json",
"sourceRoot": "libs/web/album/data-access/src",
"projectType": "library",
"targets": {
"lint": {
"executor": "@nrwl/linter:eslint",
"executor": "@nx/linter:eslint",
"options": {
"lintFilePatterns": ["libs/web/album/data-access/**/*.ts"]
}
},
"test": {
"executor": "@nrwl/jest:jest",
"outputs": ["coverage/libs/web/album/data-access"],
"executor": "@nx/jest:jest",
"outputs": ["{workspaceRoot}/coverage/libs/web/album/data-access"],
"options": {
"jestConfig": "libs/web/album/data-access/jest.config.js",
"passWithNoTests": true
}
}
},
"tags": ["type:data-access", "scope:web"],
"name": "web-album-data-access"
"tags": ["type:data-access", "scope:web"]
}
7 changes: 2 additions & 5 deletions libs/web/album/feature/detail/.eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,7 @@
"overrides": [
{
"files": ["*.ts"],
"extends": [
"plugin:@nrwl/nx/angular",
"plugin:@angular-eslint/template/process-inline-templates"
],
"extends": ["plugin:@nx/angular", "plugin:@angular-eslint/template/process-inline-templates"],
"rules": {
"@angular-eslint/directive-selector": [
"error",
Expand All @@ -29,7 +26,7 @@
},
{
"files": ["*.html"],
"extends": ["plugin:@nrwl/nx/angular-template"],
"extends": ["plugin:@nx/angular-template"],
"rules": {}
}
]
Expand Down
12 changes: 6 additions & 6 deletions libs/web/album/feature/detail/project.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
{
"name": "web-album-feature-detail",
"$schema": "../../../../../node_modules/nx/schemas/project-schema.json",
"projectType": "library",
"root": "libs/web/album/feature/detail",
"sourceRoot": "libs/web/album/feature/detail/src",
"prefix": "as",
"targets": {
"lint": {
"executor": "@nrwl/linter:eslint",
"executor": "@nx/linter:eslint",
"options": {
"lintFilePatterns": [
"libs/web/album/feature/detail/src/**/*.ts",
Expand All @@ -14,14 +15,13 @@
}
},
"test": {
"executor": "@nrwl/jest:jest",
"outputs": ["coverage/libs/web/album/feature/detail"],
"executor": "@nx/jest:jest",
"outputs": ["{workspaceRoot}/coverage/libs/web/album/feature/detail"],
"options": {
"jestConfig": "libs/web/album/feature/detail/jest.config.js",
"passWithNoTests": true
}
}
},
"tags": ["type:feature", "scope:web"],
"name": "web-album-feature-detail"
"tags": ["type:feature", "scope:web"]
}
7 changes: 2 additions & 5 deletions libs/web/album/feature/list/.eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,7 @@
"overrides": [
{
"files": ["*.ts"],
"extends": [
"plugin:@nrwl/nx/angular",
"plugin:@angular-eslint/template/process-inline-templates"
],
"extends": ["plugin:@nx/angular", "plugin:@angular-eslint/template/process-inline-templates"],
"rules": {
"@angular-eslint/directive-selector": [
"error",
Expand All @@ -29,7 +26,7 @@
},
{
"files": ["*.html"],
"extends": ["plugin:@nrwl/nx/angular-template"],
"extends": ["plugin:@nx/angular-template"],
"rules": {}
}
]
Expand Down
12 changes: 6 additions & 6 deletions libs/web/album/feature/list/project.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
{
"name": "web-album-feature-list",
"$schema": "../../../../../node_modules/nx/schemas/project-schema.json",
"projectType": "library",
"root": "libs/web/album/feature/list",
"sourceRoot": "libs/web/album/feature/list/src",
"prefix": "as",
"targets": {
"lint": {
"executor": "@nrwl/linter:eslint",
"executor": "@nx/linter:eslint",
"options": {
"lintFilePatterns": [
"libs/web/album/feature/list/src/**/*.ts",
Expand All @@ -14,14 +15,13 @@
}
},
"test": {
"executor": "@nrwl/jest:jest",
"outputs": ["coverage/libs/web/album/feature/list"],
"executor": "@nx/jest:jest",
"outputs": ["{workspaceRoot}/coverage/libs/web/album/feature/list"],
"options": {
"jestConfig": "libs/web/album/feature/list/jest.config.js",
"passWithNoTests": true
}
}
},
"tags": ["type:feature", "scope:web"],
"name": "web-album-feature-list"
"tags": ["type:feature", "scope:web"]
}
7 changes: 2 additions & 5 deletions libs/web/album/feature/shell/.eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,7 @@
"overrides": [
{
"files": ["*.ts"],
"extends": [
"plugin:@nrwl/nx/angular",
"plugin:@angular-eslint/template/process-inline-templates"
],
"extends": ["plugin:@nx/angular", "plugin:@angular-eslint/template/process-inline-templates"],
"rules": {
"@angular-eslint/directive-selector": [
"error",
Expand All @@ -29,7 +26,7 @@
},
{
"files": ["*.html"],
"extends": ["plugin:@nrwl/nx/angular-template"],
"extends": ["plugin:@nx/angular-template"],
"rules": {}
}
]
Expand Down
12 changes: 6 additions & 6 deletions libs/web/album/feature/shell/project.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
{
"name": "web-album-feature-shell",
"$schema": "../../../../../node_modules/nx/schemas/project-schema.json",
"projectType": "library",
"root": "libs/web/album/feature/shell",
"sourceRoot": "libs/web/album/feature/shell/src",
"prefix": "as",
"targets": {
"lint": {
"executor": "@nrwl/linter:eslint",
"executor": "@nx/linter:eslint",
"options": {
"lintFilePatterns": [
"libs/web/album/feature/shell/src/**/*.ts",
Expand All @@ -14,14 +15,13 @@
}
},
"test": {
"executor": "@nrwl/jest:jest",
"outputs": ["coverage/libs/web/album/feature/shell"],
"executor": "@nx/jest:jest",
"outputs": ["{workspaceRoot}/coverage/libs/web/album/feature/shell"],
"options": {
"jestConfig": "libs/web/album/feature/shell/jest.config.js",
"passWithNoTests": true
}
}
},
"tags": ["type:feature", "scope:web"],
"name": "web-album-feature-shell"
"tags": ["type:feature", "scope:web"]
}
7 changes: 2 additions & 5 deletions libs/web/album/ui/album-track/.eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,7 @@
"overrides": [
{
"files": ["*.ts"],
"extends": [
"plugin:@nrwl/nx/angular",
"plugin:@angular-eslint/template/process-inline-templates"
],
"extends": ["plugin:@nx/angular", "plugin:@angular-eslint/template/process-inline-templates"],
"rules": {
"@angular-eslint/directive-selector": [
"error",
Expand All @@ -29,7 +26,7 @@
},
{
"files": ["*.html"],
"extends": ["plugin:@nrwl/nx/angular-template"],
"extends": ["plugin:@nx/angular-template"],
"rules": {}
}
]
Expand Down
12 changes: 6 additions & 6 deletions libs/web/album/ui/album-track/project.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
{
"name": "web-album-ui-album-track",
"$schema": "../../../../../node_modules/nx/schemas/project-schema.json",
"projectType": "library",
"root": "libs/web/album/ui/album-track",
"sourceRoot": "libs/web/album/ui/album-track/src",
"prefix": "as",
"targets": {
"lint": {
"executor": "@nrwl/linter:eslint",
"executor": "@nx/linter:eslint",
"options": {
"lintFilePatterns": [
"libs/web/album/ui/album-track/src/**/*.ts",
Expand All @@ -14,14 +15,13 @@
}
},
"test": {
"executor": "@nrwl/jest:jest",
"outputs": ["coverage/libs/web/album/ui/album-track"],
"executor": "@nx/jest:jest",
"outputs": ["{workspaceRoot}/coverage/libs/web/album/ui/album-track"],
"options": {
"jestConfig": "libs/web/album/ui/album-track/jest.config.js",
"passWithNoTests": true
}
}
},
"tags": ["type:ui", "scope:web"],
"name": "web-album-ui-album-track"
"tags": ["type:ui", "scope:web"]
}
4 changes: 2 additions & 2 deletions libs/web/album/ui/album-track/src/lib/album-track.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { MediaTableModule } from '@angular-spotify/web/shared/ui/media-table';
import { MediaOrderModule } from '@angular-spotify/web/shared/ui/media-order';
import { TrackMainInfoModule } from '@angular-spotify/web/shared/ui/track-main-info';
import { DurationPipeModule } from '@angular-spotify/web/shared/pipes/duration-pipe';
import { LetModule, PushModule } from '@ngrx/component';
import { LetDirective, PushPipe } from '@ngrx/component';

@NgModule({
imports: [
Expand All @@ -14,7 +14,7 @@ import { LetModule, PushModule } from '@ngrx/component';
MediaOrderModule,
TrackMainInfoModule,
DurationPipeModule,
LetModule, PushModule,
LetDirective, PushPipe,
],
declarations: [AlbumTrackComponent],
exports: [AlbumTrackComponent]
Expand Down
Loading

0 comments on commit eb0fe49

Please sign in to comment.