Skip to content

Commit

Permalink
chore(demo): update demo app angular version from 7 and 8 to 12 and 13
Browse files Browse the repository at this point in the history
  • Loading branch information
mhenkens committed Dec 6, 2023
1 parent 7b003ce commit 0be3f36
Show file tree
Hide file tree
Showing 180 changed files with 38,539 additions and 54,822 deletions.
5 changes: 4 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,10 @@ jobs:
- name: Linting and testing
run: |
npm run lint:all
npm run test:ci:all
# npm run test:ci:all // comand remove due to incomability node18 and angular12
npm run test:ci
npm run test:ci:demo:ng-latest
- name: Generate docs coverage
run: npm run docs:coverage
Expand Down
File renamed without changes.
File renamed without changes.
27 changes: 27 additions & 0 deletions demo-app/ng12/.eslintrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
{
"root": true,
"extends": ["@nationalbankbelgium"],
"overrides": [
{
"files": ["*.ts"],
"rules": {
"@angular-eslint/component-selector": [
"error",
{
"prefix": "app",
"style": "kebab-case",
"type": "element"
}
],
"@angular-eslint/directive-selector": [
"error",
{
"prefix": "app",
"style": "camelCase",
"type": "attribute"
}
]
}
}
]
}
1 change: 1 addition & 0 deletions demo-app/ng8/.gitignore → demo-app/ng12/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ speed-measure-plugin*.json
.history/*

# misc
/.angular/cache
/.sass-cache
/connect.lock
/coverage
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion demo-app/ng8/README.md → demo-app/ng12/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# DemoApp

This project was generated with [Angular CLI](https://github.com/angular/angular-cli) version 8.3.15.
This project was generated with [Angular CLI](https://github.com/angular/angular-cli) version 12.2.18.

## Development server

Expand Down
84 changes: 51 additions & 33 deletions demo-app/ng7/angular.json → demo-app/ng12/angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"prefix": "app",
"schematics": {
"@schematics/angular:component": {
"styleext": "scss"
"style": "scss"
}
},
"architect": {
Expand All @@ -21,13 +21,28 @@
"index": "src/index.html",
"main": "src/main.ts",
"polyfills": "src/polyfills.ts",
"tsConfig": "src/tsconfig.app.json",
"assets": ["src/favicon.ico", "src/assets"],
"styles": ["node_modules/normalize.css/normalize.css", "src/styles/styles.scss"],
"tsConfig": "tsconfig.app.json",
"assets": [
"src/favicon.ico",
"src/assets"
],
"styles": [
"node_modules/normalize.css/normalize.css",
"src/styles/styles.scss"
],
"stylePreprocessorOptions": {
"includePaths": ["src/styles"]
"includePaths": [
"src/styles"
]
},
"scripts": []
"scripts": [],
"vendorChunk": true,
"extractLicenses": false,
"preserveSymlinks": true,
"buildOptimizer": false,
"sourceMap": true,
"optimization": false,
"namedChunks": true
},
"configurations": {
"production": {
Expand All @@ -42,7 +57,6 @@
"sourceMap": false,
"extractCss": true,
"namedChunks": false,
"aot": true,
"extractLicenses": true,
"vendorChunk": false,
"buildOptimizer": true,
Expand All @@ -51,10 +65,16 @@
"type": "initial",
"maximumWarning": "2mb",
"maximumError": "5mb"
},
{
"type": "anyComponentStyle",
"maximumWarning": "6kb",
"maximumError": "10kb"
}
]
}
}
},
"defaultConfiguration": ""
},
"serve": {
"builder": "@angular-devkit/build-angular:dev-server",
Expand All @@ -78,31 +98,33 @@
"options": {
"main": "src/test.ts",
"polyfills": "src/polyfills.ts",
"tsConfig": "src/tsconfig.spec.json",
"karmaConfig": "src/karma.conf.js",
"styles": ["node_modules/normalize.css/normalize.css", "src/styles/styles.scss"],
"tsConfig": "tsconfig.spec.json",
"karmaConfig": "karma.conf.js",
"styles": [
"node_modules/normalize.css/normalize.css",
"src/styles/styles.scss"
],
"stylePreprocessorOptions": {
"includePaths": ["src/styles"]
"includePaths": [
"src/styles"
]
},
"scripts": [],
"assets": ["src/favicon.ico", "src/assets"]
"assets": [
"src/favicon.ico",
"src/assets"
]
}
},
"lint": {
"builder": "@angular-devkit/build-angular:tslint",
"builder": "@angular-eslint/builder:lint",
"options": {
"tsConfig": ["src/tsconfig.app.json", "src/tsconfig.spec.json"],
"exclude": ["**/node_modules/**"],
"format": "codeFrame"
"lintFilePatterns": [
"src/**/*.ts",
"src/**/*.html"
]
}
}
}
},
"demo-app-e2e": {
"root": "e2e/",
"projectType": "application",
"prefix": "",
"architect": {
},
"e2e": {
"builder": "@angular-devkit/build-angular:protractor",
"options": {
Expand All @@ -114,16 +136,12 @@
"devServerTarget": "demo-app:serve:production"
}
}
},
"lint": {
"builder": "@angular-devkit/build-angular:tslint",
"options": {
"tsConfig": "e2e/tsconfig.e2e.json",
"exclude": ["**/node_modules/**"]
}
}
}
}
},
"defaultProject": "demo-app"
"defaultProject": "demo-app",
"cli": {
"defaultCollection": "@angular-eslint/schematics"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ exports.config = {
jasmineNodeOpts: {
showColors: true,
defaultTimeoutInterval: 30000,
print: function() {}
print: function () {}
},
onPrepare() {
require("ts-node").register({
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,7 @@ describe("workspace-project App", () => {

afterEach(async () => {
// Assert that there are no errors emitted from the browser
const logs = await browser
.manage()
.logs()
.get(logging.Type.BROWSER);
const logs = await browser.manage().logs().get(logging.Type.BROWSER);
const expectedLogEntry: Partial<logging.Entry> = {
level: logging.Level.SEVERE
};
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"compilerOptions": {
"outDir": "../out-tsc/e2e",
"module": "commonjs",
"target": "es5",
"target": "es2018",
"types": ["jasmine", "jasminewd2", "node"]
}
}
2 changes: 1 addition & 1 deletion demo-app/ng8/karma.conf.js → demo-app/ng12/karma.conf.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Karma configuration file, see link for more information
// https://karma-runner.github.io/1.0/config/configuration-file.html

module.exports = function(config) {
module.exports = function (config) {
config.set({
basePath: "",
frameworks: ["jasmine", "@angular-devkit/build-angular"],
Expand Down
Loading

0 comments on commit 0be3f36

Please sign in to comment.