Skip to content

Commit

Permalink
merge with devel
Browse files Browse the repository at this point in the history
  • Loading branch information
jcubic committed Sep 22, 2024
1 parent d747820 commit 73d1251
Show file tree
Hide file tree
Showing 43 changed files with 4,000 additions and 3,740 deletions.
54 changes: 54 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,57 @@
## 2.43.3
### Bugfix
* fix number of rows when using different `--size` [#969](https://github.com/jcubic/jquery.terminal/issues/969)
* fix hidden cursor when using command that change `--size` [#968](https://github.com/jcubic/jquery.terminal/issues/968)
* fix command prop in `export_view()` when in command [#967](https://github.com/jcubic/jquery.terminal/issues/967)

## 2.43.2
### Bugfix
* fix scroll to bottom when using `terminal::import_view`

## 2.43.1
### Bugfix
* fix height when not using `--rows` [#962](https://github.com/jcubic/jquery.terminal/issues/962)

## 2.43.0
### Breaking
* echo of undefined or Promise that resolve to undefined no longer display string undefined
### Features
* add support for `--rows` CSS custom property [#956](https://github.com/jcubic/jquery.terminal/issues/956)
* add aborting signals [#940](https://github.com/jcubic/jquery.terminal/issues/940)
### Bugfix
* fix CMD update performance issue [#961](https://github.com/jcubic/jquery.terminal/issues/961)
* don't reflow the reflow the cursor on update [#932](https://github.com/jcubic/jquery.terminal/issues/932)
* fix unexpected uncaught exceptions in promises
* fix skip/skip_stop return value and add types
* fix recursive call to echo in renderHandler [#733](https://github.com/jcubic/jquery.terminal/issues/733)

## 2.42.2
### Bugfix
* actual fix for blank lines typing animation [#946](https://github.com/jcubic/jquery.terminal/issues/946)

## 2.42.1
### Bugfix
* fix line wrapping when calling multiple echo `newline:false` [#952](https://github.com/jcubic/jquery.terminal/issues/952)
* fix cursor position when echo `newline:false` fill the line
* fix running typing animation on empty terminal [#950](https://github.com/jcubic/jquery.terminal/issues/950)
* get rid of canvas warning from images in less [#955](https://github.com/jcubic/jquery.terminal/issues/955)
* fix update with newline after echo without it [#954](https://github.com/jcubic/jquery.terminal/issues/954)

## 2.42.0
### Features
* add reverse style to formatting and XML [#943](https://github.com/jcubic/jquery.terminal/issues/943)
* add XML formatting targets [#944](https://github.com/jcubic/jquery.terminal/issues/944)
### Bugfix
* fix typing animation on emtpy lines [#946](https://github.com/jcubic/jquery.terminal/issues/946)
* fix skip typing animation [#945](https://github.com/jcubic/jquery.terminal/issues/945)
* fix use of `$.terminal.apply_formatters` with prism

## 2.41.2
### Bugfix
* fix commands in pipe operator with non string arguments
* fix text selection of raw HTML [#939](https://github.com/jcubic/jquery.terminal/issues/939)
* fix resume of exec on auth with sync token

## 2.41.1
### Bugfix
* fix paused terminal when echo broken image
Expand Down
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
The MIT License (MIT)

Copyright (c) 2011-2023 Jakub T. Jankiewicz
Copyright (c) 2011-2024 Jakub T. Jankiewicz

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
30 changes: 9 additions & 21 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -27,38 +27,26 @@ UPDATE_CONTRIBUTORS=0

.PHONY: coverage test coveralls lint.src eslint skipped_tests jsonlint publish lint tscheck publish-guthub emoji update-tree

ALL: Makefile .$(VERSION) terminal.jquery.json bower.json package.json assets/ascii_art.svg js/jquery.terminal-$(VERSION).js js/jquery.terminal.js js/jquery.terminal-$(VERSION).min.js js/jquery.terminal.min.js js/jquery.terminal.min.js.map css/jquery.terminal-$(VERSION).css css/jquery.terminal-$(VERSION).min.css css/jquery.terminal.min.css css/jquery.terminal.min.css.map css/jquery.terminal.css README.md import.html js/terminal.widget.js css/emoji.css update-contributors update-tree docs/dir.json
ALL: Makefile .$(VERSION) terminal.jquery.json bower.json package.json assets/ascii_art.svg js/jquery.terminal.js js/jquery.terminal.min.js js/jquery.terminal.min.js.map css/jquery.terminal.min.css css/jquery.terminal.min.css.map css/jquery.terminal.css README.md import.html js/terminal.widget.js css/emoji.css update-contributors update-tree docs/dir.json

bower.json: templates/bower.in .$(VERSION)
$(SED) -e "s/{{VER}}/$(VERSION)/g" templates/bower.in > bower.json

package.json: .$(VERSION)
$(SED) -i 's/"version": "[^"]\+"/"version": "$(VERSION)"/' package.json

js/jquery.terminal-$(VERSION).js: js/jquery.terminal-src.js .$(VERSION)
$(GIT) branch | grep '* devel' > /dev/null && $(SED) -e "s/{{VER}}/DEV/g" -e "s/{{DATE}}/$(DATE)/g" js/jquery.terminal-src.js > js/jquery.terminal-$(VERSION).js || $(SED) -e "s/{{VER}}/$(VERSION)/g" -e "s/{{DATE}}/$(DATE)/g" js/jquery.terminal-src.js > js/jquery.terminal-$(VERSION).js
js/jquery.terminal.js: js/jquery.terminal-src.js .$(VERSION)
$(GIT) branch | grep '* devel' > /dev/null && $(SED) -e "s/{{VER}}/DEV/g" -e "s/{{DATE}}/$(DATE)/g" js/jquery.terminal-src.js > js/jquery.terminal.js || $(SED) -e "s/{{VER}}/$(VERSION)/g" -e "s/{{DATE}}/$(DATE)/g" js/jquery.terminal-src.js > js/jquery.terminal.js

js/jquery.terminal.js: js/jquery.terminal-$(VERSION).js
$(CP) js/jquery.terminal-$(VERSION).js js/jquery.terminal.js

js/jquery.terminal-$(VERSION).min.js: js/jquery.terminal.min.js
$(CP) js/jquery.terminal.min.js js/jquery.terminal-$(VERSION).min.js

js/jquery.terminal.min.js js/jquery.terminal.min.js.map: js/jquery.terminal-$(VERSION).js
js/jquery.terminal.min.js js/jquery.terminal.min.js.map: js/jquery.terminal.js
$(CD) js && $(UGLIFY) -o jquery.terminal.min.js --comments --mangle --source-map "includeSources,url='jquery.terminal.min.js.map'" -- jquery.terminal.js && $(ECHO) >> jquery.terminal.min.js

css/jquery.terminal-$(VERSION).css: css/jquery.terminal-src.css .$(VERSION)
$(GIT) branch | grep '* devel' > /dev/null && $(SED) -e "s/{{VER}}/DEV/g" -e "s/{{DATE}}/$(DATE)/g" css/jquery.terminal-src.css > css/jquery.terminal-$(VERSION).css || $(SED) -e "s/{{VER}}/$(VERSION)/g" -e "s/{{DATE}}/$(DATE)/g" css/jquery.terminal-src.css > css/jquery.terminal-$(VERSION).css

css/jquery.terminal.css: css/jquery.terminal-$(VERSION).css .$(VERSION)
$(CP) css/jquery.terminal-$(VERSION).css css/jquery.terminal.css
css/jquery.terminal.css: css/jquery.terminal-src.css .$(VERSION)
$(GIT) branch | grep '* devel' > /dev/null && $(SED) -e "s/{{VER}}/DEV/g" -e "s/{{DATE}}/$(DATE)/g" css/jquery.terminal-src.css > css/jquery.terminal.css || $(SED) -e "s/{{VER}}/$(VERSION)/g" -e "s/{{DATE}}/$(DATE)/g" css/jquery.terminal-src.css > css/jquery.terminal.css

css/jquery.terminal.min.css css/jquery.terminal.min.css.map: css/jquery.terminal.css
$(CSSNANO) css/jquery.terminal.css css/jquery.terminal.min.css

css/jquery.terminal-$(VERSION).min.css: css/jquery.terminal.min.css
$(CP) css/jquery.terminal.min.css css/jquery.terminal-$(VERSION).min.css

README.md: templates/README.in .$(VERSION) __tests__/terminal.spec.js
$(GIT) branch | grep '* devel' > /dev/null && $(SED) -e "s/{{VER}}/DEV/g" -e \
"s/{{BRANCH}}/$(BRANCH_SAFE)/g" -e "s/{{CHECKSUM}}/$(SPEC_CHECKSUM)/" \
Expand Down Expand Up @@ -97,7 +85,7 @@ assets/ascii_art.svg: templates/ascii_art.svg .$(VERSION)
$(SED) -e "s/{{VER}}/$(VERSION)/g" templates/ascii_art.svg > assets/ascii_art.svg

test-accept-snapshots:
$(JEST) --coverage --env=jsdom --updateSnapshot --testMatch '**/__tests__/*.spec.js'
$(JEST) --coverage --updateSnapshot

coveralls:
$(CAT) ./coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js
Expand Down Expand Up @@ -137,10 +125,10 @@ publish-guthub: .github.token
$(SED) -e "s/{{VER}}/$(VERSION)/g" templates/package.git > package.json

contributors.json:
./scripts/contributors.js -u jcubic -r jquery.terminal > contributors.json
./scripts/contributors.mjs -u jcubic -r jquery.terminal > contributors.json

contributors-www.json:
./scripts/contributors.js -u jcubic -r jquery.terminal-www > contributors-www.json
./scripts/contributors.mjs -u jcubic -r jquery.terminal-www > contributors-www.json

contributors: contributors-www.json contributors.json
./scripts/update-contributors-readme jquery.terminal contributors.json "CONTRIBUTORS" templates/README.in
Expand Down
Loading

0 comments on commit 73d1251

Please sign in to comment.