Updated handling of readme & version data

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 6.0.0 
+
+* Update to new Ivy package format for Angular v13+.
+
 ## 5.1.1 (2020-06-07)
 
 #### Fixes

README.md

@@ -337,8 +337,9 @@ npm run test
 npm run build 
 ```
 
-After running `npm run build`, the final output of the lib (which gets published to npm) is in the `/distngx-pagination` folder.
+After running `npm run build`, the final output of the lib (which gets published to npm) is in the `/dist/ngx-pagination` folder.
 
+To build the docs, run `npm run build:docs`, or serve them in dev mode with `npm run start`.
 
 ## License
 

angular.json

@@ -62,6 +62,7 @@
  "inlineStyleLanguage": "scss",
  "assets": [
  "projects/docs/src/favicon.ico",
+ "projects/docs/src/assets",
  "projects/docs/src/assets"
  ],
  "styles": [

package.json

@@ -1,11 +1,12 @@
 {
  "name": "ngx-pagination",
- "version": "5.1.1",
+ "version": "0.0.0",
  "description": "Pagination for Angular",
  "scripts": {
  "ng": "ng",
  "start": "ng serve",
  "build": "ng build",
+ "build:docs": "ng build docs",
  "watch": "ng build --watch --configuration development",
  "test": "ng test"
  },
@@ -34,7 +35,7 @@
  "@angular/platform-browser-dynamic": "~13.3.0",
  "@angular/router": "~13.3.0",
  "bulma": "0.2.3",
- "marked": "^0.3.6",
+ "marked": "^4.0.16",
  "ngx-highlightjs": "^6.1.2",
  "rxjs": "~7.5.0",
  "tslib": "^2.3.0",

projects/docs/src/app/components/documentation/documentation-page.component.html

@@ -1 +1 @@
-<div [innerHTML]="readmeContent" class="readme"></div>
+<div [innerHTML]="readmeContent$ | async" class="readme"></div>

projects/docs/src/app/components/documentation/documentation-page.component.ts

@@ -1,15 +1,26 @@
-import { Component } from '@angular/core';
+import { Component, OnInit } from '@angular/core';
 import { DomSanitizer, SafeHtml } from '@angular/platform-browser';
+import { HttpClient } from '@angular/common/http';
+import { Observable } from 'rxjs';
+import { map } from 'rxjs/operators';
+import { marked } from 'marked';
 
 @Component({
  selector: 'documentation-page',
  templateUrl: './documentation-page.component.html'
 })
-export class DocumentationPageComponent {
+export class DocumentationPageComponent implements OnInit {
 
- readmeContent: SafeHtml;
+ readmeContent$: Observable<SafeHtml>;
 
- constructor(private sanitizer: DomSanitizer) {
- this.readmeContent = sanitizer.bypassSecurityTrustHtml('parsedReadme');
+ constructor(private sanitizer: DomSanitizer, private httpClient: HttpClient) {
+ }
+
+ ngOnInit() {
+
+ this.readmeContent$ = this.httpClient.get(`https://raw.githubusercontent.com/michaelbromley/ngx-pagination/master/README.md`, { responseType: 'text' }).pipe(
+ map(text => marked.parse(text)),
+ map(res => this.sanitizer.bypassSecurityTrustHtml(res)),
+ )
  }
 }

projects/docs/src/app/demo-app.component.ts

@@ -1,10 +1,11 @@
 import {Component} from "@angular/core";
-//const version = require('../../package.json').version;
+import versionInfo from "./version.json";
 
 @Component({
  selector: 'demo-app',
  templateUrl: './demo-app.component.html'
 })
 export class DemoAppComponent {
- version: string = '???';
+ version = versionInfo.version;
 }
+

projects/docs/src/app/demo.module.ts

@@ -16,6 +16,7 @@ import { ServerPageComponent } from './components/server-example/server-page.com
 import { MealsService } from './providers/meals.service';
 import { DocumentationPageComponent } from './components/documentation/documentation-page.component';
 import { HighlightModule, HIGHLIGHT_OPTIONS } from 'ngx-highlightjs';
+import { HttpClientModule } from '@angular/common/http';
 
 const ConfiguredRouterModule = RouterModule.forRoot([
  {path: '', pathMatch: 'full', component: DocumentationPageComponent},
@@ -32,6 +33,7 @@ const ConfiguredRouterModule = RouterModule.forRoot([
  ConfiguredRouterModule,
  NgxPaginationModule,
  HighlightModule,
+ HttpClientModule,
  ],
  declarations: [
  DocumentationPageComponent,
@@ -51,7 +53,11 @@ const ConfiguredRouterModule = RouterModule.forRoot([
  {
  provide: HIGHLIGHT_OPTIONS,
  useValue: {
- fullLibraryLoader: () => import('highlight.js'),
+ coreLibraryLoader: () => import('highlight.js/lib/core'),
+ languages: {
+ typescript: () => import('highlight.js/lib/languages/typescript'),
+ xml: () => import('highlight.js/lib/languages/xml')
+ },
  }
  }
  ],

projects/docs/src/app/version.json

@@ -0,0 +1,3 @@
+{
+ "version": "6.0.0"
+}

projects/docs/tsconfig.app.json

@@ -3,7 +3,9 @@
  "extends": "../../tsconfig.json",
  "compilerOptions": {
  "outDir": "../../out-tsc/app",
- "types": []
+ "types": [],
+ "resolveJsonModule": true,
+ "allowSyntheticDefaultImports": true
  },
  "files": [
  "src/main.ts",