Skip to content

Commit

Permalink
Upgrade to angular v19 & nx 20 (#81)
Browse files Browse the repository at this point in the history
* chore: upgrade nx & ng

* chore: fix package-lock

* chore: fix lint plugin setup
  • Loading branch information
hoebbelsB authored Dec 19, 2024
1 parent 2086651 commit d47a2fc
Show file tree
Hide file tree
Showing 21 changed files with 14,588 additions and 14,241 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 All @@ -23,12 +23,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
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: getJestProjects(),
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 };
18 changes: 3 additions & 15 deletions nx.json
Original file line number Diff line number Diff line change
@@ -1,24 +1,11 @@
{
"extends": "nx/presets/core.json",
"generators": {
"@nrwl/angular:application": {
"style": "scss",
"linter": "eslint",
"unitTestRunner": "jest",
"e2eTestRunner": "cypress"
},
"@nrwl/angular:library": {
"linter": "eslint",
"unitTestRunner": "jest"
},
"@nrwl/angular:component": {
"style": "scss"
},
"@nx/angular:application": {
"style": "scss",
"linter": "eslint",
"unitTestRunner": "jest",
"e2eTestRunner": "playwright"
"e2eTestRunner": "cypress"
},
"@nx/angular:library": {
"linter": "eslint",
Expand Down Expand Up @@ -56,5 +43,6 @@
"inputs": ["default", "{workspaceRoot}/.eslintrc.json"]
}
},
"defaultBase": "origin/main"
"defaultBase": "origin/main",
"useLegacyCache": true
}
Loading

0 comments on commit d47a2fc

Please sign in to comment.