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

deploy demo to netlify #191

Merged
merged 23 commits into from
Aug 28, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
63f0bd9
Bump postcss from 7.0.35 to 7.0.36
dependabot[bot] Jun 16, 2021
a8d8604
Bump tar from 6.1.0 to 6.1.4
dependabot[bot] Aug 4, 2021
1fc59fb
Merge pull request #186 from MurhafSousli/dependabot/npm_and_yarn/tar…
MurhafSousli Aug 4, 2021
f9a2d14
Bump path-parse from 1.0.6 to 1.0.7
dependabot[bot] Aug 11, 2021
ef3c08f
Merge pull request #187 from MurhafSousli/dependabot/npm_and_yarn/pat…
MurhafSousli Aug 11, 2021
6136254
Update bug_report.md
MurhafSousli Aug 22, 2021
8cf33fa
Merge pull request #188 from MurhafSousli/MurhafSousli-patch-1
MurhafSousli Aug 22, 2021
de61992
Merge pull request #185 from MurhafSousli/dependabot/npm_and_yarn/pos…
MurhafSousli Aug 22, 2021
20029e1
improve workflow
MurhafSousli Aug 28, 2021
d22d645
Update tests
MurhafSousli Aug 28, 2021
7be7d6e
remove unnecessary pipe
MurhafSousli Aug 28, 2021
0a76249
feat: Update to highlight.js v11
MurhafSousli Aug 28, 2021
77647ca
Update tsconfig
MurhafSousli Aug 28, 2021
a0153e8
Update license
MurhafSousli Aug 28, 2021
842ecd9
Update tsconfig
MurhafSousli Aug 28, 2021
6db7d80
Update changelog
MurhafSousli Aug 28, 2021
c8610d4
Update changelog
MurhafSousli Aug 28, 2021
4c9288f
Update workflow
MurhafSousli Aug 28, 2021
963112c
Merge remote-tracking branch 'origin/dev' into dev
MurhafSousli Aug 28, 2021
cf52efe
Update karma config
MurhafSousli Aug 28, 2021
b8cd71c
Merge pull request #189 from MurhafSousli/dev
MurhafSousli Aug 28, 2021
f08d651
Update README
MurhafSousli Aug 28, 2021
64d43a3
Merge pull request #190 from MurhafSousli/dev
MurhafSousli Aug 28, 2021
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,6 @@ What behavior did you actually see?
#### Environment

- Angular:
- ngx-scrollbar:
- ngx-highlightjs:
- Browser(s):
- Operating System (e.g. Windows, macOS, Ubuntu):
2 changes: 1 addition & 1 deletion .github/workflows/integrate.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
with:
node-version: 14
- name: Install dependencies
run: npm install
run: npm ci
- name: Build
run: npm run build-lib
- name: Test
Expand Down
4 changes: 1 addition & 3 deletions .github/workflows/netlify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,7 @@ jobs:
with:
node-version: 14
- name: Install dependencies
run: npm install
- name: Build and link library
run: npm run build-lib && npm run link-lib
run: npm ci
- name: Build demo
run: npm run build-demo
- name: Deploy to Netlify
Expand Down
16 changes: 15 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,23 @@
# Changelog

## 5.0.0

- Upgrade usage to highlight.js v11, you can find the breaking changes from the official page [here](https://highlightjs.readthedocs.io/en/latest/upgrade-11.html).
- Build the library with partial compilationMode.
- feat: Add the missing functions from v11 in `HighlightJS` service.
- Remove deprecated function in v11, such as `initHighlighting()`, `highlightBlock()`, `fixMarkup()` from `HighlightJS` service.

### Breaking changes

- refactor: `(highlighted)` output has been updated to highlight.js v11, the result object has a new interface `HighlightAutoResult`.
- refactor: `HighlightJS.configure(config)` has been updated the config interface to highlight.js v11.

## 4.1.4

- Upgrade to Angular 12
- Set peer dependency of hljs to v10
- Set peer dependency of highlight.js to v10

> The library is still compatible with the new version of highlight.js v11 but the highlighting function will be deprecated in their next release

## 4.1.3

Expand Down
4 changes: 2 additions & 2 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright (c) 2018 Murhaf Sousli
Copyright (c) 2018-2021 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 All @@ -18,4 +18,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
SOFTWARE.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ The following line will highlight the given code and append it to the host eleme
| **[highlight]** | string | Accept code string to highlight, default `null` |
| **[languages]** | string[] | An array of language names and aliases restricting auto detection to only these languages, default: `null` |
| **[lineNumbers]** | boolean | A flag that indicates adding line numbers to highlighted code element |
| **(highlighted)** | HighlightResult | Stream that emits the result object when element is highlighted |
| **(highlighted)** | HighlightAutoResult | Stream that emits the result object when element is highlighted |


### NOTE
Expand Down
24 changes: 18 additions & 6 deletions karma.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,28 @@ module.exports = function (config) {
require('karma-jasmine'),
require('karma-chrome-launcher'),
require('karma-jasmine-html-reporter'),
require('karma-coverage-istanbul-reporter'),
require('karma-coverage'),
require('@angular-devkit/build-angular/plugins/karma')
],
client: {
jasmine: {
// you can add configuration options for Jasmine here
// the possible options are listed at https://jasmine.github.io/api/edge/Configuration.html
// for example, you can disable the random execution with `random: false`
// or set a specific seed with `seed: 4321`
},
clearContext: false // leave Jasmine Spec Runner output visible in browser
},
coverageIstanbulReporter: {
dir: require('path').join(__dirname, './coverage/ngx-highlight'),
reports: ['html', 'lcovonly', 'text-summary'],
fixWebpackSourcePaths: true
jasmineHtmlReporter: {
suppressAll: true // removes the duplicated traces
},
coverageReporter: {
dir: require('path').join(__dirname, './coverage'),
subdir: '.',
reporters: [
{ type: 'html' },
{ type: 'text-summary' }
]
},
reporters: ['progress', 'kjhtml'],
port: 9876,
Expand All @@ -36,7 +48,7 @@ module.exports = function (config) {
restartOnFileChange: true,
capabilities: {
chromeOptions: {
args: [ "--headless" ]
args: ["--headless"]
},
'browserName': 'chrome'
},
Expand Down
Loading