Skip to content
Merged
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
11 changes: 11 additions & 0 deletions generators/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -104,9 +104,20 @@ export default class extends Generator {
this.templatePath( `${this.options.templateChoice}/.gitignore.template` ),
this.destinationPath( '.gitignore' ),
);
// This copy of `eslintrc.cjs` should be removed once all templates support eslint v9
this.fs.copy(
this.templatePath( `${this.options.templateChoice}/.eslintrc.cjs` ),
this.destinationPath( '.eslintrc.cjs' ),
{
ignoreNoMatch: true
}
);
this.fs.copy(
this.templatePath( `${this.options.templateChoice}/eslint.config.mjs` ),
this.destinationPath( 'eslint.config.mjs' ),
{
ignoreNoMatch: true
}
);
this.fs.copy(
this.templatePath(`${ path.dirname( this.options.templateChoice ) }/app/.github`),
Expand Down
57 changes: 0 additions & 57 deletions templates/node-angular/.eslintrc.cjs

This file was deleted.

21 changes: 21 additions & 0 deletions templates/node-angular/eslint.config.mjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
import eslint from '@eslint/js';
import tseslint from 'typescript-eslint';

export default tseslint.config(
eslint.configs.recommended,
...tseslint.configs.recommended,
{
files: [
'**/*.js',
'**/*.jsx',
'**/*.ts',
],
linterOptions: {
reportUnusedDisableDirectives: 'warn'
},
ignores: [
'dist/**/*',
'node_modules/**/*',
]
}
);
50 changes: 26 additions & 24 deletions templates/node-angular/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,41 +7,43 @@
"build": "ng build",
"watch": "ng build --watch --configuration development",
"test": "ng test",
"lint": "eslint . --ext js,jsx --report-unused-disable-directives --max-warnings 0"
"lint": "eslint . --max-warnings 0"
},
"private": true,
"dependencies": {
"@angular/animations": "^17.3.0",
"@angular/common": "^17.3.0",
"@angular/compiler": "^17.3.0",
"@angular/core": "^17.3.0",
"@angular/forms": "^17.3.0",
"@angular/platform-browser": "^17.3.0",
"@angular/platform-browser-dynamic": "^17.3.0",
"@angular/router": "^17.3.0",
"rxjs": "~7.8.0",
"tslib": "^2.3.0",
"zone.js": "~0.14.3",
"@angular/animations": "^18.2.2",
"@angular/common": "^18.2.2",
"@angular/compiler": "^18.2.2",
"@angular/core": "^18.2.2",
"@angular/forms": "^18.2.2",
"@angular/platform-browser": "^18.2.2",
"@angular/platform-browser-dynamic": "^18.2.2",
"@angular/router": "^18.2.2",
"rxjs": "~7.8.1",
"tslib": "^2.7.0",
"zone.js": "~0.14.10",
"body-parser": "^1.20.2",
"cors": "^2.8.5",
"dotenv": "^16.3.1",
"express": "^4.18.2",
"dotenv": "^16.4.5",
"express": "^4.19.2",
"morgan": "^1.10.0",
"oracledb": "^6.2.0"
"oracledb": "^6.6.0"
},
"devDependencies": {
"@angular-devkit/build-angular": "^17.3.0",
"@angular/cli": "^17.3.0",
"@angular/compiler-cli": "^17.3.0",
"@types/jasmine": "~5.1.0",
"jasmine-core": "~5.1.0",
"karma": "~6.4.0",
"@angular-devkit/build-angular": "^18.2.2",
"@angular/cli": "^18.2.2",
"@angular/compiler-cli": "^18.2.2",
"@types/jasmine": "~5.1.4",
"jasmine-core": "~5.2.0",
"karma": "~6.4.4",
"karma-chrome-launcher": "~3.2.0",
"karma-coverage": "~2.2.0",
"karma-coverage": "~2.2.1",
"karma-jasmine": "~5.1.0",
"karma-jasmine-html-reporter": "~2.1.0",
"typescript": "~5.4.2",
"typescript": "~5.5.4",
"concurrently": "^8.2.2",
"eslint": "^8.55.0"
"eslint": "^9.9.1",
"@eslint/js": "^9.9.1",
"typescript-eslint": "8.3.0"
}
}