Skip to content

Commit

Permalink
Merge pull request #249 from MurhafSousli/master
Browse files Browse the repository at this point in the history
Deploy demo to netlify
  • Loading branch information
MurhafSousli authored Jan 31, 2023
2 parents 6bb9308 + ce71fe3 commit 6b339f1
Show file tree
Hide file tree
Showing 274 changed files with 12,159 additions and 12,557 deletions.
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
# Changelog

## 8.0.0

- Update to Angular 15.
- Fix `setTheme` does not load theme if `themePath` was not specified in the configuration, closes [#247](https://github.com/MurhafSousli/ngx-highlightjs/issues/247) in [4a74d84](https://github.com/MurhafSousli/ngx-highlightjs/pull/244/commits/4a74d84b819c5705158c8fcd3fce03bf9ecb475d).
- Fix Angular Universal error, closes [243](https://github.com/MurhafSousli/ngx-highlightjs/issues/243) in [8815a9e](https://github.com/MurhafSousli/ngx-highlightjs/pull/244/commits/8815a9e98972bb7ea2d878a44c5806493878ad80).
- Make Angular Universal happy with `setTheme` function `HighlightLoader` service, in [0ed6508](https://github.com/MurhafSousli/ngx-highlightjs/pull/244/commits/0ed65089780ab03690d9c4a00c84fdf5202208cf).
- Make gist setter public, closes [#242](https://github.com/MurhafSousli/ngx-highlightjs/issues/242) in [3208b0d](https://github.com/MurhafSousli/ngx-highlightjs/pull/244/commits/3208b0df6670f75bd9ee7209b979e30bf1d9d64d).

## 7.0.1

- Add support for trusted types (CSP), in [125a55b](https://github.com/MurhafSousli/ngx-highlightjs/pull/230/commits/125a55b0c9f2345c5cf824619477c8b694eee7d0).
Expand Down
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright (c) 2018-2021 Murhaf Sousli
Copyright (c) 2018-2023 Murhaf Sousli

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
66 changes: 64 additions & 2 deletions angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
"build": {
"builder": "@angular-devkit/build-angular:browser",
"options": {
"outputPath": "dist/ngx-highlightjs-demo",
"outputPath": "dist/ngx-highlightjs-demo/browser",
"index": "projects/ngx-highlightjs-demo/src/index.html",
"main": "projects/ngx-highlightjs-demo/src/main.ts",
"polyfills": "projects/ngx-highlightjs-demo/src/polyfills.ts",
Expand All @@ -59,7 +59,8 @@
],
"scripts": [],
"allowedCommonJsDependencies": [
"highlight.js"
"highlight.js",
"bezier-easing"
],
"vendorChunk": true,
"extractLicenses": false,
Expand Down Expand Up @@ -143,6 +144,67 @@
"devServerTarget": "ngx-highlightjs-demo:serve:production"
}
}
},
"server": {
"builder": "@angular-devkit/build-angular:server",
"options": {
"outputPath": "dist/ngx-highlightjs-demo/server",
"main": "projects/ngx-highlightjs-demo/server.ts",
"tsConfig": "projects/ngx-highlightjs-demo/tsconfig.server.json",
"optimization": false,
"sourceMap": true,
"extractLicenses": false,
"vendorChunk": true
},
"configurations": {
"production": {
"outputHashing": "media",
"fileReplacements": [
{
"replace": "projects/ngx-highlightjs-demo/src/environments/environment.ts",
"with": "projects/ngx-highlightjs-demo/src/environments/environment.prod.ts"
}
],
"optimization": true,
"sourceMap": false,
"extractLicenses": true,
"vendorChunk": false
}
},
"defaultConfiguration": "production"
},
"serve-ssr": {
"builder": "@nguniversal/builders:ssr-dev-server",
"configurations": {
"development": {
"browserTarget": "ngx-highlightjs-demo:build:development",
"serverTarget": "ngx-highlightjs-demo:server:development"
},
"production": {
"browserTarget": "ngx-highlightjs-demo:build:production",
"serverTarget": "ngx-highlightjs-demo:server:production"
}
},
"defaultConfiguration": "development"
},
"prerender": {
"builder": "@nguniversal/builders:prerender",
"options": {
"routes": [
"/"
]
},
"configurations": {
"production": {
"browserTarget": "ngx-highlightjs-demo:build:production",
"serverTarget": "ngx-highlightjs-demo:server:production"
},
"development": {
"browserTarget": "ngx-highlightjs-demo:build:development",
"serverTarget": "ngx-highlightjs-demo:server:development"
}
},
"defaultConfiguration": "production"
}
}
}
Expand Down
Loading

1 comment on commit 6b339f1

@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.