Skip to content

Commit 598d3c9

Browse files
committed
Merge remote-tracking branch 'origin/updates'
2 parents 4b85c41 + 3395697 commit 598d3c9

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+2627
-2337
lines changed

Dockerfile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ COPY src/api-umbrella-git-1.rockspec src/luarocks.lock /app/src/
4040
COPY tasks/deps/luarocks /app/tasks/deps/
4141
RUN make deps:luarocks && make clean:dev
4242

43-
COPY tasks/build-deps/crane /app/tasks/build-deps/
4443
COPY tasks/deps/envoy /app/tasks/deps/
4544
RUN make deps:envoy && make clean:dev
4645

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ gem "minitest-ci", "~> 3.4.0"
2525

2626
# Ruby lint/style checker
2727
gem "rubocop", "~> 1.4", :require => false
28-
gem "rubocop-minitest", "~> 0.36.0", :require => false
28+
gem "rubocop-minitest", "~> 0.38.0", :require => false
2929

3030
# Running background processes
3131
gem "childprocess"

Gemfile.lock

Lines changed: 41 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -43,12 +43,12 @@ GEM
4343
addressable (2.8.7)
4444
public_suffix (>= 2.0.2, < 7.0)
4545
ansi (1.5.0)
46-
ast (2.4.2)
46+
ast (2.4.3)
4747
awesome_print (1.9.2)
48-
base64 (0.2.0)
48+
base64 (0.3.0)
4949
bcrypt (3.1.20)
50-
benchmark (0.4.0)
51-
bigdecimal (3.1.9)
50+
benchmark (0.4.1)
51+
bigdecimal (3.2.2)
5252
builder (3.3.0)
5353
capybara (3.40.0)
5454
addressable
@@ -67,18 +67,18 @@ GEM
6767
childprocess (5.1.0)
6868
logger (~> 1.5)
6969
concurrent-ruby (1.3.5)
70-
connection_pool (2.5.0)
70+
connection_pool (2.5.3)
7171
crass (1.0.6)
72-
drb (2.2.1)
72+
drb (2.2.3)
7373
encryptor (3.0.0)
7474
erubi (1.13.1)
7575
ethon (0.16.0)
7676
ffi (>= 1.15.0)
77-
factory_bot (6.5.1)
77+
factory_bot (6.5.3)
7878
activesupport (>= 6.1.0)
7979
faker (3.5.1)
8080
i18n (>= 1.8.11, < 2)
81-
faraday (2.12.2)
81+
faraday (2.13.1)
8282
faraday-net_http (>= 2.0, < 3.5)
8383
json
8484
logger
@@ -87,24 +87,25 @@ GEM
8787
faraday-typhoeus (1.1.0)
8888
faraday (~> 2.0)
8989
typhoeus (~> 1.4)
90-
ffi (1.17.1)
90+
ffi (1.17.2)
9191
i18n (1.14.7)
9292
concurrent-ruby (~> 1.0)
9393
ice_nine (0.11.2)
94-
json (2.9.1)
95-
language_server-protocol (3.17.0.4)
96-
launchy (3.1.0)
94+
json (2.12.2)
95+
language_server-protocol (3.17.0.5)
96+
launchy (3.1.1)
9797
addressable (~> 2.8)
9898
childprocess (~> 5.0)
9999
logger (~> 1.6)
100-
logger (1.6.5)
101-
loofah (2.24.0)
100+
lint_roller (1.1.0)
101+
logger (1.7.0)
102+
loofah (2.24.1)
102103
crass (~> 1.0.2)
103104
nokogiri (>= 1.12.0)
104105
matrix (0.4.2)
105106
mini_mime (1.1.5)
106-
mini_portile2 (2.8.8)
107-
minitest (5.25.4)
107+
mini_portile2 (2.8.9)
108+
minitest (5.25.5)
108109
minitest-ci (3.4.0)
109110
minitest (>= 5.0.6)
110111
minitest-hooks (1.5.2)
@@ -123,37 +124,34 @@ GEM
123124
uri
124125
net-protocol (0.2.2)
125126
timeout
126-
net-smtp (0.5.0)
127+
net-smtp (0.5.1)
127128
net-protocol
128-
nokogiri (1.18.4)
129+
nokogiri (1.18.8)
129130
mini_portile2 (~> 2.8.2)
130131
racc (~> 1.4)
131-
nokogiri (1.18.4-aarch64-linux-gnu)
132-
racc (~> 1.4)
133-
nokogiri (1.18.4-x86_64-linux-gnu)
134-
racc (~> 1.4)
135-
oj (3.16.9)
132+
oj (3.16.11)
136133
bigdecimal (>= 3.0)
137134
ostruct (>= 0.2)
138135
opensearch-ruby (3.4.0)
139136
faraday (>= 1.0, < 3)
140137
multi_json (>= 1.0)
141138
ostruct (0.6.1)
142-
parallel (1.26.3)
143-
parser (3.3.7.0)
139+
parallel (1.27.0)
140+
parser (3.3.8.0)
144141
ast (~> 2.4.1)
145142
racc
146143
path_expander (1.1.3)
147144
pg (1.5.9)
148-
public_suffix (6.0.1)
145+
prism (1.4.0)
146+
public_suffix (6.0.2)
149147
racc (1.8.1)
150-
rack (3.1.12)
151-
rack-session (2.1.0)
148+
rack (3.1.16)
149+
rack-session (2.1.1)
152150
base64 (>= 0.1.0)
153151
rack (>= 3.0.0)
154152
rack-test (2.2.0)
155153
rack (>= 1.3)
156-
rails-dom-testing (2.2.0)
154+
rails-dom-testing (2.3.0)
157155
activesupport (>= 5.0.0)
158156
minitest
159157
nokogiri (>= 1.6)
@@ -163,26 +161,29 @@ GEM
163161
rails_compatible_cookies_utils (0.1.2)
164162
rainbow (3.1.1)
165163
regexp_parser (2.10.0)
166-
rexml (3.4.0)
167-
rubocop (1.71.1)
164+
rexml (3.4.1)
165+
rubocop (1.76.1)
168166
json (~> 2.3)
169-
language_server-protocol (>= 3.17.0)
167+
language_server-protocol (~> 3.17.0.2)
168+
lint_roller (~> 1.1.0)
170169
parallel (~> 1.10)
171170
parser (>= 3.3.0.2)
172171
rainbow (>= 2.2.2, < 4.0)
173172
regexp_parser (>= 2.9.3, < 3.0)
174-
rubocop-ast (>= 1.38.0, < 2.0)
173+
rubocop-ast (>= 1.45.0, < 2.0)
175174
ruby-progressbar (~> 1.7)
176175
unicode-display_width (>= 2.4.0, < 4.0)
177-
rubocop-ast (1.38.0)
178-
parser (>= 3.3.1.0)
179-
rubocop-minitest (0.36.0)
180-
rubocop (>= 1.61, < 2.0)
181-
rubocop-ast (>= 1.31.1, < 2.0)
176+
rubocop-ast (1.45.1)
177+
parser (>= 3.3.7.2)
178+
prism (~> 1.4)
179+
rubocop-minitest (0.38.1)
180+
lint_roller (~> 1.1)
181+
rubocop (>= 1.75.0, < 2.0)
182+
rubocop-ast (>= 1.38.0, < 2.0)
182183
ruby-progressbar (1.13.0)
183184
rubyzip (2.4.1)
184185
securerandom (0.4.1)
185-
selenium-webdriver (4.28.0)
186+
selenium-webdriver (4.32.0)
186187
base64 (~> 0.2)
187188
logger (~> 1.4)
188189
rexml (~> 3.2, >= 3.2.5)
@@ -241,7 +242,7 @@ DEPENDENCIES
241242
rails_compatible_cookies_utils (~> 0.1.0)
242243
rainbow (~> 3.1.1)
243244
rubocop (~> 1.4)
244-
rubocop-minitest (~> 0.36.0)
245+
rubocop-minitest (~> 0.38.0)
245246
selenium-webdriver (~> 4.15)
246247
thor (~> 1.3.0)
247248
typhoeus (~> 1.4.0)

Makefile.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ export PREFIX=$(prefix)
1515
default: all
1616

1717
# Download and locally install the "task" tool.
18-
task_version:=3.41.0
18+
task_version:=3.44.0
1919
$(source_dir)/tasks/bootstrap-$(task_version): ;
2020
$(work_dir)/stamp/bootstrap-$(task_version): $(source_dir)/tasks/bootstrap-$(task_version)
2121
$(source_dir)/tasks/bootstrap-$(task_version)

Taskfile.yml

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -37,24 +37,18 @@ tasks:
3737
- ./build/work/stamp/deps/cue
3838

3939
deps:envoy:
40-
deps:
41-
- build-deps:crane
4240
cmds:
4341
- ./tasks/deps/envoy
4442
sources:
45-
- ./build/work/stamp/build-deps/crane
4643
- ./tasks/deps/envoy
4744
- ./tasks/helpers.sh
4845
generates:
4946
- ./build/work/stamp/deps/envoy
5047

5148
deps:envoy-control-plane:
52-
deps:
53-
- build-deps:crane
5449
cmds:
5550
- ./tasks/deps/envoy-control-plane
5651
sources:
57-
- ./build/work/stamp/build-deps/crane
5852
- ./tasks/deps/envoy-control-plane
5953
- ./tasks/helpers.sh
6054
generates:
@@ -122,15 +116,6 @@ tasks:
122116
- task: deps:perp
123117
- task: deps:trafficserver
124118

125-
build-deps:crane:
126-
cmds:
127-
- ./tasks/build-deps/crane
128-
sources:
129-
- ./tasks/build-deps/crane
130-
- ./tasks/helpers.sh
131-
generates:
132-
- ./build/work/stamp/build-deps/crane
133-
134119
build-deps:hugo:
135120
cmds:
136121
- ./tasks/build-deps/hugo
@@ -163,7 +148,6 @@ tasks:
163148

164149
build-deps:
165150
cmds:
166-
- task: build-deps:crane
167151
- task: build-deps:hugo
168152
- task: build-deps:pnpm
169153

@@ -428,6 +412,10 @@ tasks:
428412
cmds:
429413
- ./tasks/update/luarocks
430414

415+
update:packages:
416+
cmds:
417+
- ./tasks/helpers/test-bundle-exec thor outdated:update-packages
418+
431419
update:test-deps:luarocks:
432420
cmds:
433421
- ./tasks/update/test-deps/luarocks
@@ -436,6 +424,10 @@ tasks:
436424
cmds:
437425
- ./tasks/helpers/test-bundle-exec thor outdated:all
438426

427+
outdated:packages:
428+
cmds:
429+
- ./tasks/helpers/test-bundle-exec thor outdated:packages
430+
439431
test:
440432
cmds:
441433
- task: all

src/api-umbrella-git-1.rockspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ dependencies = {
2323
"lua-resty-validation ~> 2.7",
2424
"luajit-zstd ~> 0.2.3",
2525
"lualdap ~> 1.4.0",
26-
"luaposix ~> 36.2.1",
26+
"luaposix ~> 36.3",
2727
"luautf8 ~> 0.1.6",
2828
"lustache ~> 1.3.1",
2929
"lyaml ~> 6.2.8",

src/api-umbrella/admin-ui/ember-cli-build.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ module.exports = function(defaults) {
99
autoImport: {
1010
alias: {
1111
'jQuery-QueryBuilder': 'jQuery-QueryBuilder/dist/js/query-builder.standalone',
12-
bootbox: 'bootbox/bootbox',
1312
diff: 'diff/dist/diff',
1413
inflection: 'inflection/lib/inflection',
1514
numeral: 'numeral/numeral',

src/api-umbrella/admin-ui/package.json

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,14 @@
2525
"test:ember": "ember test"
2626
},
2727
"devDependencies": {
28-
"@babel/eslint-parser": "^7.26.5",
29-
"@babel/plugin-proposal-decorators": "^7.25.9",
28+
"@babel/eslint-parser": "^7.27.5",
29+
"@babel/plugin-proposal-decorators": "^7.27.1",
3030
"@ember/jquery": "^2.0.0",
3131
"@ember/optional-features": "^2.2.0",
3232
"@ember/render-modifiers": "^2.1.0",
3333
"@ember/string": "^3.1.1",
34-
"@ember/test-helpers": "^2.9.4",
34+
"@ember/test-helpers": "^2.9.6",
35+
"@embroider/macros": "~1.16.13",
3536
"@fortawesome/ember-fontawesome": "^1.0.3",
3637
"@fortawesome/fontawesome-svg-core": "^6.7.2",
3738
"@fortawesome/free-regular-svg-icons": "^6.7.2",
@@ -43,11 +44,11 @@
4344
"@pnotify/font-awesome5": "^5.2.0",
4445
"@pnotify/font-awesome5-fix": "^5.2.0",
4546
"@pnotify/mobile": "^5.2.0",
46-
"autoprefixer": "^10.4.20",
47-
"bootbox": "^6.0.0",
47+
"autoprefixer": "^10.4.21",
48+
"bootbox": "^6.0.4",
4849
"bootstrap": "^4.6.2",
4950
"broccoli-asset-rev": "^3.0.0",
50-
"codemirror": "^5.65.18",
51+
"codemirror": "^5.65.19",
5152
"concurrently": "^8.2.2",
5253
"datatables.net": "^1.13.11",
5354
"datatables.net-bs4": "^1.13.11",
@@ -75,7 +76,7 @@
7576
"ember-export-application-global": "^2.0.1",
7677
"ember-fetch": "^8.1.2",
7778
"ember-load-initializers": "^2.1.2",
78-
"ember-modifier": "^4.2.0",
79+
"ember-modifier": "^4.2.2",
7980
"ember-onbeforeunload": "~2.0.0",
8081
"ember-page-title": "^7.0.0",
8182
"ember-qunit": "^6.2.0",
@@ -99,7 +100,7 @@
99100
"loader.js": "^4.7.0",
100101
"lodash-es": "~4.17.21",
101102
"marked": "^8.0.1",
102-
"moment-timezone": "~0.5.47",
103+
"moment-timezone": "~0.5.48",
103104
"npm-run-all": "^4.1.5",
104105
"numeral": "~2.0.6",
105106
"pnotify": "~5.2.0",
@@ -108,15 +109,15 @@
108109
"prettier": "^2.8.8",
109110
"qunit": "^2.24.1",
110111
"qunit-dom": "^2.0.0",
111-
"sass": "^1.83.4",
112+
"sass": "^1.89.2",
112113
"selectize": "~0.12.6",
113114
"stylelint": "^15.11.0",
114115
"stylelint-config-standard": "^32.0.0",
115116
"stylelint-prettier": "^3.0.0",
116117
"timekeeper": "^2.3.1",
117118
"tippy.js": "~6.3.7",
118119
"tracked-built-ins": "^3.4.0",
119-
"webpack": "^5.97.1"
120+
"webpack": "^5.99.9"
120121
},
121122
"engines": {
122123
"node": "14.* || 16.* || >= 18"

0 commit comments

Comments
 (0)