Skip to content

Commit

Permalink
Upgrade to Nx v19 & Angular v18
Browse files Browse the repository at this point in the history
  • Loading branch information
zjkipping committed Jul 11, 2024
1 parent 42691c9 commit 9b9f3ec
Show file tree
Hide file tree
Showing 21 changed files with 4,414 additions and 2,903 deletions.
10 changes: 8 additions & 2 deletions .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -56,12 +56,18 @@
{
"files": ["*.ts", "*.tsx"],
"extends": ["plugin:@nx/typescript"],
"rules": {}
"rules": {
"@typescript-eslint/no-extra-semi": "error",
"no-extra-semi": "off"
}
},
{
"files": ["*.js", "*.jsx"],
"extends": ["plugin:@nx/javascript"],
"rules": {}
"rules": {
"@typescript-eslint/no-extra-semi": "error",
"no-extra-semi": "off"
}
},
{
"files": "*.json",
Expand Down
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -45,4 +45,5 @@ Thumbs.db

**/doc-page-loaders.ts

.nx/cache
.nx/cache
.nx/workspace-data
3 changes: 2 additions & 1 deletion .prettierignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,5 @@
/coverage
**/project.json

/.nx/cache
/.nx/cache
/.nx/workspace-data
4 changes: 2 additions & 2 deletions libs/ng-doc-portal-plugin/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
"executors": "./executors.json",
"peerDependencies": {
"prettier": "^3.2.5",
"@nx/devkit": "^18.0.0",
"@nx/angular": "^18.0.0"
"@nx/devkit": "^19.0.0",
"@nx/angular": "^19.0.0"
},
"dependencies": {
"@phenomnomnominal/tsquery": "^6.0.0",
Expand Down
10 changes: 5 additions & 5 deletions libs/ng-doc-portal/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
"description": "Documentation portal system written natively in Angular",
"version": "v1.8.0",
"peerDependencies": {
"@angular/common": "^17.0.0",
"@angular/core": "^17.0.0",
"@angular/forms": "^17.0.0",
"@angular/router": "^17.0.0",
"@angular/platform-browser": "^17.0.0",
"@angular/common": "^18.0.0",
"@angular/core": "^18.0.0",
"@angular/forms": "^18.0.0",
"@angular/router": "^18.0.0",
"@angular/platform-browser": "^18.0.0",
"tslib": "^2.3.0"
},
"dependencies": {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
<pre *ngIf="!displayError">
<code [highlight]="displayCode" [languages]="['typescript', 'html']"></code>
<button class="code-snippet-copy-button" (click)="copyToClipboard()">{{ buttonText | async }}</button>
</pre>
<div class="hljs hljs-deletion" *ngIf="displayError">{{ displayError }}</div>
@if (displayError) {
<div class="hljs hljs-deletion">{{ displayError }}</div>
} @else {
<pre>
<code [highlight]="displayCode" [languages]="['typescript', 'html']"></code>
<button class="code-snippet-copy-button" (click)="copyToClipboard()">{{ buttonText | async }}</button>
</pre>
}
<div [hidden]="true" #content><ng-content></ng-content></div>
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { AsyncPipe, NgIf } from '@angular/common';
import { AsyncPipe } from '@angular/common';
import {
AfterViewInit,
ChangeDetectorRef,
Expand Down Expand Up @@ -27,7 +27,7 @@ import {
selector: 'ngdp-code-snippet',
standalone: true,
templateUrl: './code-snippet.component.html',
imports: [NgIf, AsyncPipe, HighlightModule],
imports: [AsyncPipe, HighlightModule],
})
export class CodeSnippetComponent
implements AfterViewInit, OnChanges, OnDestroy
Expand Down
Loading

0 comments on commit 9b9f3ec

Please sign in to comment.