Skip to content

Commit

Permalink
Merge branch 'update-js-packages' into eslint-9
Browse files Browse the repository at this point in the history
  • Loading branch information
mbraak committed Oct 5, 2024
2 parents ae4a5cb + f22fd6b commit 99e9e65
Show file tree
Hide file tree
Showing 13 changed files with 1,041 additions and 1,061 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/static.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@ jobs:
- name: Setup ruby
uses: ruby/setup-ruby@v1
with:
ruby-version: '3.2'
ruby-version: '3.3'
- name: Setup node
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: 20
- name: Install pnpm
Expand Down
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "jqTree",
"version": "1.8.4",
"version": "1.8.5",
"main": [
"jqtree.css",
"jqtree-circle.png",
Expand Down
2 changes: 1 addition & 1 deletion docs/.ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.3.4
3.3.5
46 changes: 24 additions & 22 deletions docs/Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,24 +1,28 @@
GEM
remote: https://rubygems.org/
specs:
addressable (2.8.6)
public_suffix (>= 2.0.2, < 6.0)
addressable (2.8.7)
public_suffix (>= 2.0.2, < 7.0)
bigdecimal (3.1.8)
colorator (1.1.0)
concurrent-ruby (1.2.3)
concurrent-ruby (1.3.4)
em-websocket (0.5.3)
eventmachine (>= 0.12.9)
http_parser.rb (~> 0)
eventmachine (1.2.7)
ffi (1.16.3)
ffi (1.17.0-arm64-darwin)
ffi (1.17.0-x86_64-linux-gnu)
forwardable-extended (2.6.0)
google-protobuf (4.26.1-arm64-darwin)
google-protobuf (4.28.2-arm64-darwin)
bigdecimal
rake (>= 13)
google-protobuf (4.26.1-x86_64-linux)
google-protobuf (4.28.2-x86_64-linux)
bigdecimal
rake (>= 13)
http_parser.rb (0.8.0)
i18n (1.14.5)
i18n (1.14.6)
concurrent-ruby (~> 1.0)
jekyll (4.3.3)
jekyll (4.3.4)
addressable (~> 2.4)
colorator (~> 1.0)
em-websocket (~> 0.5)
Expand Down Expand Up @@ -51,30 +55,28 @@ GEM
rb-fsevent (~> 0.10, >= 0.10.3)
rb-inotify (~> 0.9, >= 0.9.10)
mercenary (0.4.0)
minima (2.5.1)
minima (2.5.2)
jekyll (>= 3.5, < 5.0)
jekyll-feed (~> 0.9)
jekyll-seo-tag (~> 2.1)
pathutil (0.16.2)
forwardable-extended (~> 2.6)
public_suffix (5.0.5)
public_suffix (6.0.1)
rake (13.2.1)
rb-fsevent (0.11.2)
rb-inotify (0.10.1)
rb-inotify (0.11.1)
ffi (~> 1.0)
rexml (3.3.6)
strscan
rouge (4.2.1)
rexml (3.3.7)
rouge (4.4.0)
safe_yaml (1.0.5)
sass-embedded (1.77.0-arm64-darwin)
google-protobuf (>= 3.25, < 5.0)
sass-embedded (1.77.0-x86_64-linux-gnu)
google-protobuf (>= 3.25, < 5.0)
strscan (3.1.0)
sass-embedded (1.79.4-arm64-darwin)
google-protobuf (~> 4.27)
sass-embedded (1.79.4-x86_64-linux-gnu)
google-protobuf (~> 4.27)
terminal-table (3.0.2)
unicode-display_width (>= 1.1.1, < 3)
unicode-display_width (2.5.0)
webrick (1.8.1)
unicode-display_width (2.6.0)
webrick (1.8.2)

PLATFORMS
arm64-darwin-22
Expand All @@ -86,7 +88,7 @@ DEPENDENCIES
minima (~> 2.5)

RUBY VERSION
ruby 3.3.4p94
ruby 3.3.5p100

BUNDLED WITH
2.4.10
2 changes: 1 addition & 1 deletion docs/_config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ defaults:
values:
layout: "example"

jqtree_version: 1.8.4
jqtree_version: 1.8.5

# Build settings
markdown: kramdown
Expand Down
4 changes: 4 additions & 0 deletions docs/_entries/general/changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@ title: Changelog
name: changelog
---

### 1.8.5 (september 28 2024)

- Update packages

### 1.8.4 (july 19 2024)

- Issue #819: update braces package to fix security issue
Expand Down
20 changes: 10 additions & 10 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "jqtree",
"version": "1.8.4",
"version": "1.8.5",
"description": "Tree widget for jQuery",
"keywords": [
"jquery-plugin",
Expand Down Expand Up @@ -35,21 +35,21 @@
"jquery": "^3"
},
"devDependencies": {
"@babel/cli": "^7.25.6",
"@babel/core": "^7.25.2",
"@babel/preset-env": "^7.25.4",
"@babel/preset-typescript": "^7.24.7",
"@babel/cli": "^7.25.7",
"@babel/core": "^7.25.7",
"@babel/preset-env": "^7.25.7",
"@babel/preset-typescript": "^7.25.7",
"@playwright/test": "^1.47.2",
"@rollup/plugin-babel": "^6.0.4",
"@rollup/plugin-node-resolve": "^15.2.3",
"@rollup/plugin-node-resolve": "^15.3.0",
"@rollup/plugin-terser": "^0.4.4",
"@testing-library/dom": "^10.4.0",
"@testing-library/user-event": "^14.5.2",
"@types/debug": "^4.1.12",
"@types/jest": "^29.5.13",
"@types/jest-axe": "^3.5.9",
"@types/jquery": "^3.5.30",
"@types/node": "^22.5.5",
"@types/jquery": "^3.5.31",
"@types/node": "^22.7.4",
"autoprefixer": "^10.4.20",
"babel-jest": "^29.7.0",
"babel-plugin-istanbul": "^7.0.0",
Expand All @@ -72,11 +72,11 @@
"postcss-load-config": "^6.0.1",
"postcss-nested": "^6.2.0",
"prettier": "^3.3.3",
"rollup": "^4.22.4",
"rollup": "^4.24.0",
"rollup-plugin-serve": "^3.0.0",
"tslib": "^2.7.0",
"typescript": "^5.6.2",
"typescript-eslint": "^8.6.0",
"typescript-eslint": "^8.8.0",
"undici": "^5.28.4"
}
}
Loading

0 comments on commit 99e9e65

Please sign in to comment.