Merge remote-tracking branch 'origin/main' into feat/custom-links-in-dropdown

Author: aakashnepal77

.allow_skipping_tests

@@ -1,7 +1,6 @@
 blueprints/api/v1/session_blueprint.rb
 channels/application_cable/channel.rb
 channels/application_cable/connection.rb
-controllers/case_groups_controller.rb
 controllers/concerns/court_date_params.rb
 controllers/followup_reports_controller.rb
 controllers/learning_hour_topics_controller.rb

.devcontainer/devcontainer.json

@@ -25,7 +25,7 @@
       "version": "latest"
     },
     "ghcr.io/devcontainers/features/node:1": {
-      "version": "20.16.0"
+      "version": "22.11.0"
     }
   },
 

.devcontainer/post-create.sh

@@ -3,9 +3,9 @@ RUBY_VERSION="$(cat .ruby-version | tr -d '\n')"
 # copy the file only if it doesn't already exist
 cp -n .devcontainer/.env.codespaces .env
 
-# If the project's required ruby version changes from 3.2.2, this command
+# If the project's required ruby version changes from 3.3.6, this command
 # will download and compile the correct version, but it will take a long time.
-if [ "$RUBY_VERSION" != "3.2.2" ]; then
+if [ "$RUBY_VERSION" != "3.3.6" ]; then
 	rvm install $RUBY_VERSION
 	rvm use $RUBY_VERSION
 	echo "Ruby $RUBY_VERSION installed"

.dockerignore

@@ -15,6 +15,6 @@
 
 /public/packs
 /public/packs-test
-/yarn-error.log
-yarn-debug.log*
-.yarn-integrity
+/node_modules
+/npm-debug.log
+/npm-error.log

.erb-lint.yml .erb_lint.yml.erb-lint.yml renamed to .erb_lint.yml

@@ -17,6 +17,13 @@ updates:
     directory: "/"
     schedule:
       interval: "weekly"
+    ignore:
+      # Keep this locked to 1.77.6 until
+      # bootstrap 5.3.4 is out to silence
+      # sass deprecation warnings
+      # https://getbootstrap.com/docs/versions/
+      - dependency-name: "sass"
+        versions: ["1.77.*", "1.78.*"]
 
   - package-ecosystem: "bundler"
     directory: "/"

.github/dependabot.yml

@@ -20,12 +20,12 @@ erb:
 
 javascript:
 - changed-files:
-  - any-glob-to-any-file: ["**/*.js", "package*.json", "yarn.lock"]
+  - any-glob-to-any-file: ["**/*.js", "package*.json", "package-lock.json"]
 
 Tests! 🎉💖👏:
 - changed-files:
   - any-glob-to-any-file: ["app/javascript/__tests__/**.test.js", "spec/**/*_spec.rb"]
 
 dependencies:
 - changed-files:
-  - any-glob-to-any-file: ["Gemfile*", "package*.json", "yarn.lock"]
+  - any-glob-to-any-file: ["Gemfile*", "package*.json", "package-lock.json"]

.github/labeler.yml

@@ -27,7 +27,7 @@ jobs:
         uses: actions/setup-node@v4
         with:
           node-version-file: '.nvmrc'
-          cache: "yarn"
+          cache: "npm"
 
   rspec_parallel:
     needs: [preparation]

.github/workflows/ci.yml

@@ -1,4 +1,4 @@
-name: yarn lint
+name: npm lint
 
 on:
   push:
@@ -8,7 +8,7 @@ on:
       - '**/*.js'
       - '**/*.json'
       - '**/*.jsx'
-      - 'yarn.lock'
+      - 'package.lock.json'
       - '.github/workflows/*.yml'
   pull_request:
     branches:
@@ -17,12 +17,11 @@ on:
       - '**/*.js'
       - '**/*.json'
       - '**/*.jsx'
-      - 'yarn.lock'
+      - 'package.lock.json'
       - '.github/workflows/*.yml'
 
 jobs:
-  yarn_lint:
-
+  npm_lint:
     runs-on: ubuntu-latest
 
     steps:
@@ -32,6 +31,6 @@ jobs:
         with:
           node-version-file: '.nvmrc'
 
-      - run: yarn
-      - run: yarn lint
-      - run: yarn test
+      - run: npm ci
+      - run: npm run lint
+      - run: npm run test

.github/workflows/yarn_lint_and_test.yml .github/workflows/npm_lint_and_test.yml.github/workflows/yarn_lint_and_test.yml renamed to .github/workflows/npm_lint_and_test.yml

@@ -47,8 +47,8 @@ jobs:
         uses: actions/setup-node@v4
         with:
           node-version-file: '.nvmrc'
-          cache: "yarn"
-      - run: yarn
+          cache: "npm"
+      - run: npm ci
 
       - name: Install PostgreSQL client
         run: |