Skip to content

Commit

Permalink
dependencies: upgrade to angular 14
Browse files Browse the repository at this point in the history
Co-Authored-by: Johnny Mariéthoz <[email protected]>
Co-Authored-by: Bertrand Zuchuat <[email protected]>
Co-Authored-by: Renaud Michotte <[email protected]>
  • Loading branch information
3 people committed Oct 13, 2022
1 parent ad64c3d commit 73cc1f1
Show file tree
Hide file tree
Showing 40 changed files with 21,656 additions and 15,914 deletions.
58 changes: 58 additions & 0 deletions .eslintrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
{
"root": true,
"ignorePatterns": [
"projects/**/*"
],
"overrides": [
{
"files": [
"*.ts"
],
"parserOptions": {
"project": [
"tsconfig.json",
"e2e/tsconfig.json"
],
"createDefaultProgram": true
},
"extends": [
"plugin:@angular-eslint/recommended",
"plugin:@angular-eslint/template/process-inline-templates"
],
"rules": {
"@angular-eslint/component-selector": [
"error",
{
"prefix": "ng-core",
"style": "kebab-case",
"type": "element"
}
],
"@angular-eslint/directive-selector": [
"error",
{
"prefix": "ng-core",
"style": "camelCase",
"type": "attribute"
}
]
}
},
{
"files": [
"*.html"
],
"extends": [
"plugin:@angular-eslint/template/recommended"
],
"rules": {
"@angular-eslint/template/eqeqeq": [
"error",
{
"allowNullOrUndefined": true
}
]
}
}
]
}
9 changes: 4 additions & 5 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,22 +9,21 @@ jobs:

strategy:
matrix:
node-version: [10.x, 12.x]
node-version: [14.x, 16.x]

steps:
- uses: actions/checkout@v1
- uses: actions/checkout@v3
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v1
uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node-version }}
- name: install package
run: |
npm install -g @angular/cli@8
npm install -g @angular/cli@14
npm ci
- name: run tests
run: |
./run-tests.sh
npm pack
env:
CI: true
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ speed-measure-plugin.json
.history/*

# misc
/.angular/cache
/.sass-cache
/connect.lock
/coverage
Expand All @@ -43,3 +44,6 @@ Thumbs.db

# TGZ
*.tgz

# eslint
.eslintcache
51 changes: 24 additions & 27 deletions angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"prefix": "ng-core",
"architect": {
"build": {
"builder": "@angular-devkit/build-ng-packagr:build",
"builder": "@angular-devkit/build-angular:ng-packagr",
"options": {
"tsConfig": "projects/rero/ng-core/tsconfig.lib.json",
"project": "projects/rero/ng-core/ng-package.json"
Expand All @@ -30,15 +30,9 @@
}
},
"lint": {
"builder": "@angular-devkit/build-angular:tslint",
"builder": "@angular-eslint/builder:lint",
"options": {
"tsConfig": [
"projects/rero/ng-core/tsconfig.lib.json",
"projects/rero/ng-core/tsconfig.spec.json"
],
"exclude": [
"**/node_modules/**"
]
"lintFilePatterns": ["projects/rero/ng-core/src/**/*.ts", "projects/rero/ng-core/src/**/*.html"]
}
}
}
Expand All @@ -62,15 +56,20 @@
"main": "projects/ng-core-tester/src/main.ts",
"polyfills": "projects/ng-core-tester/src/polyfills.ts",
"tsConfig": "projects/ng-core-tester/tsconfig.app.json",
"aot": true,
"assets": [
"projects/ng-core-tester/src/favicon.ico",
"projects/ng-core-tester/src/assets"
],
"styles": [
"projects/ng-core-tester/src/styles.scss",
"node_modules/ngx-bootstrap/datepicker/bs-datepicker.css"
]
],
"vendorChunk": true,
"extractLicenses": false,
"buildOptimizer": false,
"sourceMap": true,
"optimization": false,
"namedChunks": true
},
"configurations": {
"production": {
Expand Down Expand Up @@ -99,7 +98,8 @@
}
]
}
}
},
"defaultConfiguration": ""
},
"serve": {
"builder": "@angular-devkit/build-angular:dev-server",
Expand Down Expand Up @@ -141,19 +141,6 @@
]
}
},
"lint": {
"builder": "@angular-devkit/build-angular:tslint",
"options": {
"tsConfig": [
"projects/ng-core-tester/tsconfig.app.json",
"projects/ng-core-tester/tsconfig.spec.json",
"projects/ng-core-tester/e2e/tsconfig.json"
],
"exclude": [
"**/node_modules/**"
]
}
},
"e2e": {
"builder": "@angular-devkit/build-angular:protractor",
"options": {
Expand All @@ -165,13 +152,23 @@
"devServerTarget": "ng-core-tester:serve:production"
}
}
},
"lint": {
"builder": "@angular-eslint/builder:lint",
"options": {
"lintFilePatterns": [
"projects/ng-core-tester/src/**/*.ts",
"projects/ng-core-tester/src/**/*.html"
]
}
}
}
}
},
"defaultProject": "@rero/ng-core",
"cli": {
"defaultCollection": "@ngx-formly/schematics"
"schematicCollections": [
"@ngx-formly/schematics"
]
},
"schematics": {
"@ngx-formly/schematics:component": {
Expand Down
Loading

0 comments on commit 73cc1f1

Please sign in to comment.