Skip to content

Commit 4a6e733

Browse files
authored
Merge pull request #106 from oracle/bump_angular
fix(deps): bump angular template dependencies
2 parents 6d87beb + 7d67d56 commit 4a6e733

File tree

4 files changed

+58
-81
lines changed

4 files changed

+58
-81
lines changed

generators/index.ts

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,9 +104,20 @@ export default class extends Generator {
104104
this.templatePath( `${this.options.templateChoice}/.gitignore.template` ),
105105
this.destinationPath( '.gitignore' ),
106106
);
107+
// This copy of `eslintrc.cjs` should be removed once all templates support eslint v9
107108
this.fs.copy(
108109
this.templatePath( `${this.options.templateChoice}/.eslintrc.cjs` ),
109110
this.destinationPath( '.eslintrc.cjs' ),
111+
{
112+
ignoreNoMatch: true
113+
}
114+
);
115+
this.fs.copy(
116+
this.templatePath( `${this.options.templateChoice}/eslint.config.mjs` ),
117+
this.destinationPath( 'eslint.config.mjs' ),
118+
{
119+
ignoreNoMatch: true
120+
}
110121
);
111122
this.fs.copy(
112123
this.templatePath(`${ path.dirname( this.options.templateChoice ) }/app/.github`),

templates/node-angular/.eslintrc.cjs

Lines changed: 0 additions & 57 deletions
This file was deleted.
Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
import eslint from '@eslint/js';
2+
import tseslint from 'typescript-eslint';
3+
4+
export default tseslint.config(
5+
eslint.configs.recommended,
6+
...tseslint.configs.recommended,
7+
{
8+
files: [
9+
'**/*.js',
10+
'**/*.jsx',
11+
'**/*.ts',
12+
],
13+
linterOptions: {
14+
reportUnusedDisableDirectives: 'warn'
15+
},
16+
ignores: [
17+
'dist/**/*',
18+
'node_modules/**/*',
19+
]
20+
}
21+
);

templates/node-angular/package.json

Lines changed: 26 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -7,41 +7,43 @@
77
"build": "ng build",
88
"watch": "ng build --watch --configuration development",
99
"test": "ng test",
10-
"lint": "eslint . --ext js,jsx --report-unused-disable-directives --max-warnings 0"
10+
"lint": "eslint . --max-warnings 0"
1111
},
1212
"private": true,
1313
"dependencies": {
14-
"@angular/animations": "^17.3.0",
15-
"@angular/common": "^17.3.0",
16-
"@angular/compiler": "^17.3.0",
17-
"@angular/core": "^17.3.0",
18-
"@angular/forms": "^17.3.0",
19-
"@angular/platform-browser": "^17.3.0",
20-
"@angular/platform-browser-dynamic": "^17.3.0",
21-
"@angular/router": "^17.3.0",
22-
"rxjs": "~7.8.0",
23-
"tslib": "^2.3.0",
24-
"zone.js": "~0.14.3",
14+
"@angular/animations": "^18.2.2",
15+
"@angular/common": "^18.2.2",
16+
"@angular/compiler": "^18.2.2",
17+
"@angular/core": "^18.2.2",
18+
"@angular/forms": "^18.2.2",
19+
"@angular/platform-browser": "^18.2.2",
20+
"@angular/platform-browser-dynamic": "^18.2.2",
21+
"@angular/router": "^18.2.2",
22+
"rxjs": "~7.8.1",
23+
"tslib": "^2.7.0",
24+
"zone.js": "~0.14.10",
2525
"body-parser": "^1.20.2",
2626
"cors": "^2.8.5",
27-
"dotenv": "^16.3.1",
28-
"express": "^4.18.2",
27+
"dotenv": "^16.4.5",
28+
"express": "^4.19.2",
2929
"morgan": "^1.10.0",
30-
"oracledb": "^6.2.0"
30+
"oracledb": "^6.6.0"
3131
},
3232
"devDependencies": {
33-
"@angular-devkit/build-angular": "^17.3.0",
34-
"@angular/cli": "^17.3.0",
35-
"@angular/compiler-cli": "^17.3.0",
36-
"@types/jasmine": "~5.1.0",
37-
"jasmine-core": "~5.1.0",
38-
"karma": "~6.4.0",
33+
"@angular-devkit/build-angular": "^18.2.2",
34+
"@angular/cli": "^18.2.2",
35+
"@angular/compiler-cli": "^18.2.2",
36+
"@types/jasmine": "~5.1.4",
37+
"jasmine-core": "~5.2.0",
38+
"karma": "~6.4.4",
3939
"karma-chrome-launcher": "~3.2.0",
40-
"karma-coverage": "~2.2.0",
40+
"karma-coverage": "~2.2.1",
4141
"karma-jasmine": "~5.1.0",
4242
"karma-jasmine-html-reporter": "~2.1.0",
43-
"typescript": "~5.4.2",
43+
"typescript": "~5.5.4",
4444
"concurrently": "^8.2.2",
45-
"eslint": "^8.55.0"
45+
"eslint": "^9.9.1",
46+
"@eslint/js": "^9.9.1",
47+
"typescript-eslint": "8.3.0"
4648
}
4749
}

0 commit comments

Comments
 (0)