Skip to content

Commit

Permalink
Merge pull request #183 from MurhafSousli/master
Browse files Browse the repository at this point in the history
hotfix: deploy to netlify
  • Loading branch information
MurhafSousli authored Jun 6, 2021
2 parents 191fbc3 + 4520190 commit 5dea4b6
Show file tree
Hide file tree
Showing 6 changed files with 21 additions and 12 deletions.
10 changes: 10 additions & 0 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@
"@angular/router": "~12.0.2",
"highlight.js": "^10.7.2",
"highlightjs-line-numbers.js": "^2.8.0",
"ngx-highlightjs": "^4.1.4",
"ngx-scrollbar": "^7.5.6",
"normalize.css": "^8.0.1",
"rxjs": "~6.5.4",
Expand Down
4 changes: 1 addition & 3 deletions projects/ngx-highlightjs-demo/src/app/app.component.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { Component, ChangeDetectionStrategy } from '@angular/core';
import { animationFrameScheduler } from 'rxjs';
// import { Gist } from '../../../ngx-highlightjs/plus/src/gist.model';
import { Gist } from 'ngx-highlightjs/plus';
// import { Gist } from '../../projects/ngx-highlightjs/plus/src/gist.model';

@Component({
selector: 'app-root',
Expand All @@ -11,8 +11,6 @@ import { Gist } from 'ngx-highlightjs/plus';
})
export class AppComponent {

libLoaded: boolean;

gist!: Gist;

codeUrl = 'https://raw.githubusercontent.com/MurhafSousli/ngx-highlightjs/master/README.md';
Expand Down
8 changes: 4 additions & 4 deletions projects/ngx-highlightjs-demo/src/app/app.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ import { FlexLayoutModule } from '@angular/flex-layout';
import { NgScrollbarModule } from 'ngx-scrollbar';
import { MaterialModule } from './material/material.module';

import { HighlightPlusModule, GIST_OPTIONS } from '../../../ngx-highlightjs/plus/src/public_api';
import { HIGHLIGHT_OPTIONS } from '../../../ngx-highlightjs/src/public-api';
// import { HIGHLIGHT_OPTIONS } from 'ngx-highlightjs';
// import { HighlightPlusModule, GIST_OPTIONS } from 'ngx-highlightjs/plus';
// import { HighlightPlusModule, GIST_OPTIONS } from '../../../ngx-highlightjs/plus/src/public_api';
// import { HIGHLIGHT_OPTIONS } from '../../../ngx-highlightjs/src/public-api';
import { HIGHLIGHT_OPTIONS } from 'ngx-highlightjs';
import { HighlightPlusModule, GIST_OPTIONS } from 'ngx-highlightjs/plus';

import { AppComponent } from './app.component';
import { HeaderComponent } from './header/header.component';
Expand Down
8 changes: 4 additions & 4 deletions projects/ngx-highlightjs-demo/src/app/gist/gist.component.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import { Component, OnInit, ChangeDetectionStrategy, Input } from '@angular/core';
import { BehaviorSubject } from 'rxjs';
import { map } from 'rxjs/operators';
// import { HighlightLoader } from 'ngx-highlightjs';
// import { Gist } from 'ngx-highlightjs/plus';
import { Gist } from '../../../../ngx-highlightjs/plus/src/public_api';
import { HighlightLoader } from '../../../../ngx-highlightjs/src/public-api';
import { HighlightLoader } from 'ngx-highlightjs';
import { Gist } from 'ngx-highlightjs/plus';
// import { Gist } from '../../../../ngx-highlightjs/plus/src/public_api';
// import { HighlightLoader } from '../../../../ngx-highlightjs/src/public-api';

@Component({
selector: 'app-gist',
Expand Down
2 changes: 1 addition & 1 deletion projects/ngx-highlightjs/ng-package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"lib": {
"entryFile": "src/public-api.ts"
},
"whitelistedNonPeerDependencies": [
"allowedNonPeerDependencies": [
"."
]
}

1 comment on commit 5dea4b6

@github-actions
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.