Skip to content

Commit 850ca53

Browse files
committed
Merge branch 'main' into issue-5888-case-contact-details-ux
2 parents 6dea445 + 4356348 commit 850ca53

Some content is hidden

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

45 files changed

+18881
-6503
lines changed

.dockerignore

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,6 @@
1515

1616
/public/packs
1717
/public/packs-test
18-
/yarn-error.log
19-
yarn-debug.log*
20-
.yarn-integrity
18+
/node_modules
19+
/npm-debug.log
20+
/npm-error.log

.github/dependabot.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ updates:
2121
# Keep this locked to 1.77.6 until
2222
# bootstrap 5.3.4 is out to silence
2323
# sass deprecation warnings
24+
# https://getbootstrap.com/docs/versions/
2425
- dependency-name: "sass"
2526
versions: ["1.77.*", "1.78.*"]
2627

.github/labeler.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@ erb:
2020

2121
javascript:
2222
- changed-files:
23-
- any-glob-to-any-file: ["**/*.js", "package*.json", "yarn.lock"]
23+
- any-glob-to-any-file: ["**/*.js", "package*.json", "package-lock.json"]
2424

2525
Tests! 🎉💖👏:
2626
- changed-files:
2727
- any-glob-to-any-file: ["app/javascript/__tests__/**.test.js", "spec/**/*_spec.rb"]
2828

2929
dependencies:
3030
- changed-files:
31-
- any-glob-to-any-file: ["Gemfile*", "package*.json", "yarn.lock"]
31+
- any-glob-to-any-file: ["Gemfile*", "package*.json", "package-lock.json"]

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
uses: actions/setup-node@v4
2828
with:
2929
node-version-file: '.nvmrc'
30-
cache: "yarn"
30+
cache: "npm"
3131

3232
rspec_parallel:
3333
needs: [preparation]
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: yarn lint
1+
name: npm lint
22

33
on:
44
push:
@@ -8,7 +8,7 @@ on:
88
- '**/*.js'
99
- '**/*.json'
1010
- '**/*.jsx'
11-
- 'yarn.lock'
11+
- 'package.lock.json'
1212
- '.github/workflows/*.yml'
1313
pull_request:
1414
branches:
@@ -17,12 +17,11 @@ on:
1717
- '**/*.js'
1818
- '**/*.json'
1919
- '**/*.jsx'
20-
- 'yarn.lock'
20+
- 'package.lock.json'
2121
- '.github/workflows/*.yml'
2222

2323
jobs:
24-
yarn_lint:
25-
24+
npm_lint:
2625
runs-on: ubuntu-latest
2726

2827
steps:
@@ -32,6 +31,6 @@ jobs:
3231
with:
3332
node-version-file: '.nvmrc'
3433

35-
- run: yarn
36-
- run: yarn lint
37-
- run: yarn test
34+
- run: npm ci
35+
- run: npm run lint
36+
- run: npm run test

.github/workflows/rspec.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@ jobs:
4747
uses: actions/setup-node@v4
4848
with:
4949
node-version-file: '.nvmrc'
50-
cache: "yarn"
51-
- run: yarn
50+
cache: "npm"
51+
- run: npm ci
5252

5353
- name: Install PostgreSQL client
5454
run: |

.github/workflows/rspec_parallel.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,8 @@ jobs:
6262
uses: actions/setup-node@v4
6363
with:
6464
node-version-file: '.nvmrc'
65-
cache: "yarn"
66-
- run: yarn
65+
cache: "npm"
66+
- run: npm ci
6767

6868
- name: Install PostgreSQL client
6969
run: |

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,3 +61,4 @@ npm-debug.log
6161

6262
# In case we want to keep something in the compiled assets directory
6363
!/app/assets/builds/.keep
64+
.aider*

.standard_todo.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -675,6 +675,8 @@ ignore:
675675
- RSpec/NamedSubject
676676
- spec/policies/learning_hour_policy_spec.rb:
677677
- RSpec/NamedSubject
678+
- spec/policies/nil_class_policy_spec.rb:
679+
- RSpec/NamedSubject
678680
- spec/policies/notification_policy_spec.rb:
679681
- RSpec/NamedSubject
680682
- spec/policies/other_duty_policy_spec.rb:
@@ -804,6 +806,7 @@ ignore:
804806
- spec/requests/case_contacts_spec.rb:
805807
- RSpec/MultipleMemoizedHelpers
806808
- RSpec/MultipleExpectations
809+
- RSpec/PendingWithoutReason
807810
- spec/requests/case_court_reports_spec.rb:
808811
- RSpec/ContextWording
809812
- RSpec/NestedGroups

.tool-versions

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
ruby 3.3.6
2-
yarn 1.22.22
2+
npm 11.0.0
33
nodejs 22.11.0

0 commit comments

Comments
 (0)