Skip to content
Closed
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
12 changes: 7 additions & 5 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",
{
"allow": [],
Expand All @@ -17,17 +17,19 @@
}
]
}
]
],
"@typescript-eslint/member-ordering": "off",
"@typescript-eslint/no-inferrable-types": "warn"
}
},
{
"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
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -79,3 +79,5 @@ modules/*/schematics-core/testing

.angular
migrations.json
pnpm-lock.yaml
pnpm-workspace.yaml
72 changes: 36 additions & 36 deletions angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
}
},
"lint": {
"builder": "@nrwl/linter:eslint",
"builder": "@nx/linter:eslint",
"options": {
"lintFilePatterns": [
"modules/component/*/**/*.ts",
Expand All @@ -41,7 +41,7 @@
"outputs": ["{options.outputFile}"]
},
"test": {
"builder": "@nrwl/jest:jest",
"builder": "@nx/jest:jest",
"options": {
"jestConfig": "modules/component/jest.config.ts",
"runInBand": true
Expand Down Expand Up @@ -82,7 +82,7 @@
}
},
"lint": {
"builder": "@nrwl/linter:eslint",
"builder": "@nx/linter:eslint",
"options": {
"lintFilePatterns": [
"modules/component-store/*/**/*.ts",
Expand All @@ -92,7 +92,7 @@
"outputs": ["{options.outputFile}"]
},
"test": {
"builder": "@nrwl/jest:jest",
"builder": "@nx/jest:jest",
"options": {
"jestConfig": "modules/component-store/jest.config.ts",
"runInBand": true
Expand Down Expand Up @@ -133,7 +133,7 @@
}
},
"lint": {
"builder": "@nrwl/linter:eslint",
"builder": "@nx/linter:eslint",
"options": {
"lintFilePatterns": [
"modules/data/*/**/*.ts",
Expand All @@ -143,7 +143,7 @@
"outputs": ["{options.outputFile}"]
},
"test": {
"builder": "@nrwl/jest:jest",
"builder": "@nx/jest:jest",
"options": {
"jestConfig": "modules/data/jest.config.ts",
"runInBand": true
Expand All @@ -158,7 +158,7 @@
"$schema": "../../node_modules/nx/schemas/project-schema.json",
"projectType": "application",
"schematics": {
"@nrwl/angular:component": {
"@nx/angular:component": {
"style": "scss"
}
},
Expand Down Expand Up @@ -228,7 +228,7 @@
}
},
"lint": {
"builder": "@nrwl/linter:eslint",
"builder": "@nx/linter:eslint",
"options": {
"lintFilePatterns": [
"projects/data-example-app/*/**/*.ts",
Expand All @@ -238,7 +238,7 @@
"outputs": ["{options.outputFile}"]
},
"test": {
"builder": "@nrwl/jest:jest",
"builder": "@nx/jest:jest",
"options": {
"jestConfig": "projects/data-example-app/jest.config.ts",
"runInBand": true,
Expand Down Expand Up @@ -298,7 +298,7 @@
}
},
"lint": {
"builder": "@nrwl/linter:eslint",
"builder": "@nx/linter:eslint",
"options": {
"lintFilePatterns": [
"projects/ngrx.io/src/*/**/*.ts",
Expand Down Expand Up @@ -360,7 +360,7 @@
}
},
"lint": {
"builder": "@nrwl/linter:eslint",
"builder": "@nx/linter:eslint",
"options": {
"lintFilePatterns": [
"modules/effects/*/**/*.ts",
Expand All @@ -370,7 +370,7 @@
"outputs": ["{options.outputFile}"]
},
"test": {
"builder": "@nrwl/jest:jest",
"builder": "@nx/jest:jest",
"options": {
"jestConfig": "modules/effects/jest.config.ts",
"runInBand": true
Expand Down Expand Up @@ -420,7 +420,7 @@
}
},
"lint": {
"builder": "@nrwl/linter:eslint",
"builder": "@nx/linter:eslint",
"options": {
"lintFilePatterns": [
"modules/entity/*/**/*.ts",
Expand All @@ -430,7 +430,7 @@
"outputs": ["{options.outputFile}"]
},
"test": {
"builder": "@nrwl/jest:jest",
"builder": "@nx/jest:jest",
"options": {
"jestConfig": "modules/entity/jest.config.ts",
"runInBand": true
Expand All @@ -449,7 +449,7 @@
"schematics": {},
"architect": {
"lint": {
"builder": "@nrwl/linter:eslint",
"builder": "@nx/linter:eslint",
"options": {
"lintFilePatterns": [
"modules/eslint-plugin/*/**/*.ts",
Expand All @@ -459,15 +459,15 @@
"outputs": ["{options.outputFile}"]
},
"test": {
"builder": "@nrwl/jest:jest",
"builder": "@nx/jest:jest",
"options": {
"jestConfig": "modules/eslint-plugin/jest.config.ts",
"runInBand": true
},
"outputs": ["{workspaceRoot}/coverage/modules/eslint-plugin"]
},
"build-package": {
"builder": "@nrwl/js:tsc",
"builder": "@nx/js:tsc",
"options": {
"outputPath": "dist/modules/eslint-plugin",
"tsConfig": "modules/eslint-plugin/tsconfig.build.json",
Expand Down Expand Up @@ -580,7 +580,7 @@
}
},
"lint": {
"builder": "@nrwl/linter:eslint",
"builder": "@nx/linter:eslint",
"options": {
"lintFilePatterns": [
"projects/example-app/*/**/*.ts",
Expand All @@ -590,7 +590,7 @@
"outputs": ["{options.outputFile}"]
},
"test": {
"builder": "@nrwl/jest:jest",
"builder": "@nx/jest:jest",
"options": {
"jestConfig": "projects/example-app/jest.config.ts",
"runInBand": true
Expand All @@ -607,7 +607,7 @@
"projectType": "application",
"architect": {
"e2e": {
"builder": "@nrwl/cypress:cypress",
"builder": "@nx/cypress:cypress",
"options": {
"cypressConfig": "projects/example-app-e2e/cypress.config.ts",
"tsConfig": "projects/example-app-e2e/tsconfig.e2e.json",
Expand All @@ -624,7 +624,7 @@
"defaultConfiguration": "production"
},
"lint": {
"builder": "@nrwl/linter:eslint",
"builder": "@nx/linter:eslint",
"options": {
"lintFilePatterns": ["projects/example-app-e2e/**/*.{js,ts}"]
},
Expand Down Expand Up @@ -664,7 +664,7 @@
}
},
"lint": {
"builder": "@nrwl/linter:eslint",
"builder": "@nx/linter:eslint",
"options": {
"lintFilePatterns": [
"modules/router-store/*/**/*.ts",
Expand All @@ -674,7 +674,7 @@
"outputs": ["{options.outputFile}"]
},
"test": {
"builder": "@nrwl/jest:jest",
"builder": "@nx/jest:jest",
"options": {
"jestConfig": "modules/router-store/jest.config.ts",
"runInBand": true
Expand All @@ -693,7 +693,7 @@
"schematics": {},
"architect": {
"lint": {
"builder": "@nrwl/linter:eslint",
"builder": "@nx/linter:eslint",
"options": {
"lintFilePatterns": [
"modules/schematics/*/**/*.ts",
Expand All @@ -703,15 +703,15 @@
"outputs": ["{options.outputFile}"]
},
"test": {
"builder": "@nrwl/jest:jest",
"builder": "@nx/jest:jest",
"options": {
"jestConfig": "modules/schematics/jest.config.ts",
"runInBand": true
},
"outputs": ["{workspaceRoot}/coverage/modules/schematics"]
},
"build-package": {
"builder": "@nrwl/js:tsc",
"builder": "@nx/js:tsc",
"options": {
"outputPath": "dist/modules/schematics",
"tsConfig": "modules/schematics/tsconfig.build.json",
Expand Down Expand Up @@ -777,7 +777,7 @@
"prefix": "ngrx",
"architect": {
"lint": {
"builder": "@nrwl/linter:eslint",
"builder": "@nx/linter:eslint",
"options": {
"lintFilePatterns": [
"modules/schematics-core/*/**/*.ts",
Expand All @@ -787,7 +787,7 @@
"outputs": ["{options.outputFile}"]
},
"test": {
"builder": "@nrwl/jest:jest",
"builder": "@nx/jest:jest",
"options": {
"jestConfig": "modules/schematics-core/jest.config.ts",
"passWithNoTests": true
Expand Down Expand Up @@ -867,7 +867,7 @@
}
},
"lint": {
"builder": "@nrwl/linter:eslint",
"builder": "@nx/linter:eslint",
"options": {
"lintFilePatterns": [
"projects/standalone-app/**/*.ts",
Expand All @@ -876,7 +876,7 @@
}
},
"test": {
"builder": "@nrwl/jest:jest",
"builder": "@nx/jest:jest",
"outputs": ["{workspaceRoot}/coverage/projects/standalone-app"],
"options": {
"jestConfig": "projects/standalone-app/jest.config.ts",
Expand All @@ -893,7 +893,7 @@
"projectType": "application",
"architect": {
"e2e": {
"builder": "@nrwl/cypress:cypress",
"builder": "@nx/cypress:cypress",
"options": {
"cypressConfig": "projects/standalone-app-e2e/cypress.config.ts",
"devServerTarget": "standalone-app:serve:development",
Expand All @@ -906,7 +906,7 @@
}
},
"lint": {
"builder": "@nrwl/linter:eslint",
"builder": "@nx/linter:eslint",
"outputs": ["{options.outputFile}"],
"options": {
"lintFilePatterns": ["projects/standalone-app-e2e/**/*.{js,ts}"]
Expand Down Expand Up @@ -955,7 +955,7 @@
}
},
"lint": {
"builder": "@nrwl/linter:eslint",
"builder": "@nx/linter:eslint",
"options": {
"lintFilePatterns": [
"modules/store/*/**/*.ts",
Expand All @@ -965,7 +965,7 @@
"outputs": ["{options.outputFile}"]
},
"test": {
"builder": "@nrwl/jest:jest",
"builder": "@nx/jest:jest",
"options": {
"jestConfig": "modules/store/jest.config.ts",
"runInBand": true
Expand Down Expand Up @@ -1006,7 +1006,7 @@
}
},
"lint": {
"builder": "@nrwl/linter:eslint",
"builder": "@nx/linter:eslint",
"options": {
"lintFilePatterns": [
"modules/store-devtools/*/**/*.ts",
Expand All @@ -1016,7 +1016,7 @@
"outputs": ["{options.outputFile}"]
},
"test": {
"builder": "@nrwl/jest:jest",
"builder": "@nx/jest:jest",
"options": {
"jestConfig": "modules/store-devtools/jest.config.ts",
"runInBand": true
Expand Down
2 changes: 1 addition & 1 deletion jest.config.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
const { getJestProjects } = require('@nrwl/jest');
const { getJestProjects } = require('@nx/jest');

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

module.exports = { ...nxPreset };
4 changes: 2 additions & 2 deletions modules/component-store/.eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
{
"files": ["*.ts"],
"extends": [
"plugin:@nrwl/nx/angular",
"plugin:@nx/angular",
"plugin:@angular-eslint/template/process-inline-templates"
],
"parserOptions": {
Expand All @@ -19,7 +19,7 @@
},
{
"files": ["*.html"],
"extends": ["plugin:@nrwl/nx/angular-template"],
"extends": ["plugin:@nx/angular-template"],
"rules": {}
}
]
Expand Down
Loading