Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: update to angular16 #3194

Open
wants to merge 10 commits into
base: master
Choose a base branch
from
  •  
  •  
  •  
34 changes: 8 additions & 26 deletions .eslintrc.json
Original file line number Diff line number Diff line change
@@ -1,31 +1,20 @@
{
"root": true,
"ignorePatterns": [
"src/framework/**/*",
"docs/**/*",
"packages-smoke/**/*",
"tools/dev-schematics/*/files"
],
"ignorePatterns": ["src/framework/**/*", "docs/**/*", "packages-smoke/**/*", "tools/dev-schematics/*/files"],
"overrides": [
{
"files": [
"*.ts"
],
"files": ["*.ts"],
"parser": "@typescript-eslint/parser",
"parserOptions": {
"project": [
"tsconfig.json",
"e2e/tsconfig.json"
],
"project": ["tsconfig.json", "e2e/tsconfig.json"],
"createDefaultProgram": true
},
"extends": [
"plugin:@angular-eslint/recommended",
"plugin:@angular-eslint/template/process-inline-templates",
"eslint-config-prettier"
],
"plugins": [
"eslint-plugin-rxjs"
],
"plugins": ["@typescript-eslint", "@angular-eslint", "eslint-plugin-rxjs"],
"rules": {
"quotes": "off",
"dot-notation": "off",
Expand Down Expand Up @@ -66,19 +55,12 @@
}
},
{
"files": [
"*.html"
],
"extends": [
"plugin:@angular-eslint/template/recommended",
"eslint-config-prettier"
],
"files": ["*.html"],
"extends": ["plugin:@angular-eslint/template/recommended", "eslint-config-prettier"],
"rules": {}
},
{
"files": [
"./*.js"
],
"files": ["./*.js"],
"parserOptions": {
"ecmaVersion": 11
},
Expand Down
85 changes: 18 additions & 67 deletions angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,7 @@
"polyfills": "src/polyfills.ts",
"tsConfig": "src/tsconfig.app.json",
"inlineStyleLanguage": "scss",
"assets": [
"src/favicon.ico",
"src/assets"
],
"assets": ["src/favicon.ico", "src/assets"],
"styles": [],
"scripts": []
},
Expand Down Expand Up @@ -115,26 +112,21 @@
"tsConfig": "src/tsconfig.spec.json",
"karmaConfig": "./karma.conf.js",
"inlineStyleLanguage": "scss",
"assets": [
"src/favicon.ico",
"src/assets"
],
"assets": ["src/favicon.ico", "src/assets"],
"styles": [],
"scripts": []
},
"configurations": {
"production-wp": {
"exclude": ["**/schematics/**/*.spec.ts"],
"tsConfig": "src/tsconfig.spec-wp.json"
}
}
},
"lint": {
"builder": "@angular-eslint/builder:lint",
"options": {
"lintFilePatterns": [
"src/**/*.ts",
"src/**/*.html"
]
"lintFilePatterns": ["src/**/*.ts", "src/**/*.html"]
}
}
}
Expand All @@ -159,10 +151,7 @@
"lint": {
"builder": "@angular-eslint/builder:lint",
"options": {
"lintFilePatterns": [
"e2e/**/*.ts",
"e2e/**/*.html"
]
"lintFilePatterns": ["e2e/**/*.ts", "e2e/**/*.html"]
}
}
}
Expand Down Expand Up @@ -216,13 +205,8 @@
"node_modules/highlight.js/styles/dracula.css",
"docs/app/@theme/styles/styles.scss"
],
"scripts": [
"node_modules/pace-js/pace.min.js",
"node_modules/docsearch.js/dist/cdn/docsearch.min.js"
],
"allowedCommonJsDependencies": [
"highlight.js"
]
"scripts": ["node_modules/pace-js/pace.min.js", "node_modules/docsearch.js/dist/cdn/docsearch.min.js"],
"allowedCommonJsDependencies": ["highlight.js"]
},
"configurations": {
"production": {
Expand Down Expand Up @@ -301,26 +285,15 @@
"tsConfig": "docs/tsconfig.spec.json",
"karmaConfig": "./karma.conf.js",
"inlineStyleLanguage": "scss",
"assets": [
"docs/assets",
"docs/favicon.ico",
"docs/favicon.png",
"docs/google46533d2e7a851062.html"
],
"styles": [
"node_modules/highlight.js/styles/dracula.css",
"docs/app/@theme/styles/styles.scss"
],
"assets": ["docs/assets", "docs/favicon.ico", "docs/favicon.png", "docs/google46533d2e7a851062.html"],
"styles": ["node_modules/highlight.js/styles/dracula.css", "docs/app/@theme/styles/styles.scss"],
"scripts": []
}
},
"lint": {
"builder": "@angular-eslint/builder:lint",
"options": {
"lintFilePatterns": [
"docs/**/*.ts",
"docs/**/*.html"
]
"lintFilePatterns": ["docs/**/*.ts", "docs/**/*.html"]
}
}
}
Expand Down Expand Up @@ -357,10 +330,7 @@
"lint": {
"builder": "@angular-eslint/builder:lint",
"options": {
"lintFilePatterns": [
"src/framework/theme/**/*.ts",
"src/framework/theme/**/*.html"
]
"lintFilePatterns": ["src/framework/theme/**/*.ts", "src/framework/theme/**/*.html"]
}
}
}
Expand Down Expand Up @@ -397,10 +367,7 @@
"lint": {
"builder": "@angular-eslint/builder:lint",
"options": {
"lintFilePatterns": [
"src/framework/auth/**/*.ts",
"src/framework/auth/**/*.html"
]
"lintFilePatterns": ["src/framework/auth/**/*.ts", "src/framework/auth/**/*.html"]
}
}
}
Expand Down Expand Up @@ -437,10 +404,7 @@
"lint": {
"builder": "@angular-eslint/builder:lint",
"options": {
"lintFilePatterns": [
"src/framework/date-fns/**/*.ts",
"src/framework/date-fns/**/*.html"
]
"lintFilePatterns": ["src/framework/date-fns/**/*.ts", "src/framework/date-fns/**/*.html"]
}
}
}
Expand Down Expand Up @@ -477,10 +441,7 @@
"lint": {
"builder": "@angular-eslint/builder:lint",
"options": {
"lintFilePatterns": [
"src/framework/eva-icons/**/*.ts",
"src/framework/eva-icons/**/*.html"
]
"lintFilePatterns": ["src/framework/eva-icons/**/*.ts", "src/framework/eva-icons/**/*.html"]
}
}
}
Expand Down Expand Up @@ -517,10 +478,7 @@
"lint": {
"builder": "@angular-eslint/builder:lint",
"options": {
"lintFilePatterns": [
"src/framework/firebase-auth/**/*.ts",
"src/framework/firebase-auth/**/*.html"
]
"lintFilePatterns": ["src/framework/firebase-auth/**/*.ts", "src/framework/firebase-auth/**/*.html"]
}
}
}
Expand Down Expand Up @@ -557,10 +515,7 @@
"lint": {
"builder": "@angular-eslint/builder:lint",
"options": {
"lintFilePatterns": [
"src/framework/moment/**/*.ts",
"src/framework/moment/**/*.html"
]
"lintFilePatterns": ["src/framework/moment/**/*.ts", "src/framework/moment/**/*.html"]
}
}
}
Expand Down Expand Up @@ -597,16 +552,12 @@
"lint": {
"builder": "@angular-eslint/builder:lint",
"options": {
"lintFilePatterns": [
"src/framework/security/**/*.ts",
"src/framework/security/**/*.html"
]
"lintFilePatterns": ["src/framework/security/**/*.ts", "src/framework/security/**/*.html"]
}
}
}
}
},
"defaultProject": "playground",
"schematics": {
"@schematics/angular:component": {
"style": "scss",
Expand All @@ -624,6 +575,6 @@
},
"cli": {
"analytics": false,
"defaultCollection": "@angular-eslint/schematics"
"schematicCollections": ["@angular-eslint/schematics", "@schematics/angular"]
}
}
17 changes: 4 additions & 13 deletions docs/.eslintrc.json
Original file line number Diff line number Diff line change
@@ -1,18 +1,11 @@
{
"extends": "../.eslintrc.json",
"ignorePatterns": [
"assets"
],
"ignorePatterns": ["assets"],
"overrides": [
{
"files": [
"*.ts"
],
"files": ["*.ts"],
"parserOptions": {
"project": [
"docs/tsconfig.app.json",
"docs/tsconfig.spec.json"
],
"project": ["docs/tsconfig.app.json", "docs/tsconfig.spec.json"],
"createDefaultProgram": true
},
"rules": {
Expand All @@ -35,9 +28,7 @@
}
},
{
"files": [
"*.html"
],
"files": ["*.html"],
"rules": {}
}
]
Expand Down
26 changes: 12 additions & 14 deletions docs/404.html
Original file line number Diff line number Diff line change
@@ -1,20 +1,18 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8" />
<title>404</title>

<head>
<meta charset="utf-8" />
<title>404</title>
<base href="/nebular/" />

<base href="/nebular/">

<script type="text/javascript" src="assets/ghspa.js"></script>
</head>

<body>
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
</body>
<script type="text/javascript" src="assets/ghspa.js"></script>
</head>

<body>
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
</body>
</html>
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
import { Directive, ElementRef, AfterViewInit } from '@angular/core';

@Directive({
selector: '[ngdColorSwatch]',
selector: '[ngdColorSwatch]',
})
export class NgdColorSwatchDirective implements AfterViewInit {

constructor(private el: ElementRef) { }
constructor(private el: ElementRef) {}

ngAfterViewInit() {
this.el.nativeElement.innerHTML = this.el.nativeElement.innerHTML
.replace(/(#[a-f0-9]{6}|rgba.*?\))/ig , '$&<span class="color-swatch" style="background: $&"></span>');
this.el.nativeElement.innerHTML = this.el.nativeElement.innerHTML.replace(
/(#[a-f0-9]{6}|rgba.*?\))/gi,
'$&<span class="color-swatch" style="background: $&"></span>',
);
this.el.nativeElement.innerHTML = this.el.nativeElement.innerHTML.replace(/,/g, ', ');
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,7 @@ import * as marked from 'marked';
selector: '[ngdDescription]',
})
export class NgdDescriptionDirective implements AfterViewInit {

constructor(private el: ElementRef) {
}
constructor(private el: ElementRef) {}

ngAfterViewInit() {
const md = marked.setOptions({});
Expand Down
35 changes: 23 additions & 12 deletions docs/app/@theme/components/eva/eva.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,29 @@ <h2 class="h1 heading">
<span class="pre-heading">Based on the</span>
Eva Design System
</h2>
<p class="text">Construct stunning and consistent interfaces using atomic components by following the Eva Design System’s specifications.</p>
<a class="learn-more" href="https://eva.design?utm_campaign=eva_design%20-%20home%20-%20nebular%20landing&utm_source=nebular&utm_medium=referral&utm_content=learn_more_button" nbButton size="giant">Learn more about Eva</a>
<p class="text">
Construct stunning and consistent interfaces using atomic components by following the Eva Design System’s
specifications.
</p>
<a
class="learn-more"
href="https://eva.design?utm_campaign=eva_design%20-%20home%20-%20nebular%20landing&utm_source=nebular&utm_medium=referral&utm_content=learn_more_button"
nbButton
size="giant"
>Learn more about Eva</a
>
</div>
<div class="images">
<img class="theme-colors"
src="assets/img/theme-colors.png"
srcset="assets/img/theme-colors.png,
assets/img/theme-colors-2x.png 2x"
alt="Theme colors">
<img class="components"
src="assets/img/components-preview.png"
srcset="assets/img/components-preview.png,
assets/img/components-preview-2x.png 2x"
alt="Components preview">
<img
class="theme-colors"
src="assets/img/theme-colors.png"
srcset="assets/img/theme-colors.png, assets/img/theme-colors-2x.png 2x"
alt="Theme colors"
/>
<img
class="components"
src="assets/img/components-preview.png"
srcset="assets/img/components-preview.png, assets/img/components-preview-2x.png 2x"
alt="Components preview"
/>
</div>
Loading