Merge branch 'unstable' into info-modal-fix

Author: MisRob

.docker/README.md

@@ -4,7 +4,7 @@ This directory is a space for mounting directories to docker containers, allowin
 ### postgres
 The `postgres` directory is mounted to `/docker-entrypoint-initdb.d`. Any `.sh` or `.sql` files will be executed when the container is first started with a new data volume. You may read more regarding this functionality on the [Docker Hub page](https://hub.docker.com/_/postgres), under _Initialization scripts_.
 
-When running docker services through the Makefile commands, it specifies a docker-compose project name that depends on the name of the current git branch. This causes the volumes to change when the branch changes, which is helpful when switching between many branches that might have incompatible database schema changes. The downside is that whenever you start a new branch, you'll have to re-initialize the database again, like with `yarn run devsetup`. Creating a SQL dump from an existing, initialized database and placing it in this directory will allow you to skip this step.
+When running docker services through the Makefile commands, it specifies a docker-compose project name that depends on the name of the current git branch. This causes the volumes to change when the branch changes, which is helpful when switching between many branches that might have incompatible database schema changes. The downside is that whenever you start a new branch, you'll have to re-initialize the database again, like with `pnpm run devsetup`. Creating a SQL dump from an existing, initialized database and placing it in this directory will allow you to skip this step.
 
 To create a SQL dump of your preferred database data useful for local testing, run `make .docker/postgres/init.sql` while the docker postgres container is running.
 

.dockerignore

@@ -6,4 +6,4 @@ __pycache__
 *.pyc
 *.swp
 k8s/templates/
-cloudbuild-*.yaml
+cloudbuild-*.yaml

.eslintrc.js

@@ -1,4 +1,4 @@
-const esLintConfig = require('kolibri-tools/.eslintrc');
+const esLintConfig = require('kolibri-format/.eslintrc');
 
 esLintConfig.globals = {
   $: false,
@@ -8,7 +8,13 @@ esLintConfig.globals = {
   MathJax: false,
   jest: false,
 };
-esLintConfig.settings['import/resolver']['webpack'] = { config: 'webpack.config.js'};
+esLintConfig.settings['import/resolver']['webpack'] = { config: require.resolve('./webpack.config.js')};
+
+// Remove once Vuetify is gone-- Vuetify uses too many unacceptable class names
+esLintConfig.rules['kolibri/vue-component-class-name-casing'] = 0;
+
+// Dumb
+esLintConfig.rules['vue/no-v-text-v-html-on-component'] = 0;
 
 // Vuetify's helper attributes use hyphens and they would
 // not be recognized if auto-formatted to camel case

.git-blame-ignore-revs

@@ -0,0 +1,6 @@
+# Run this command to always ignore formatting commits in `git blame`
+# git config blame.ignoreRevsFile .git-blame-ignore-revs
+
+# Linting updates and fixes
+a52e08e5c2031cecb97a03fbed49997756ebe01b
+8ccaaa60efd1c07b220aefce5a307e4791345111

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1,12 @@
+name: Community Contribution Label
+
+on:
+  issues:
+    types: [assigned, unassigned]
+
+jobs:
+  call-label-action:
+    uses: learningequality/.github/.github/workflows/community-contribution-label.yml@main
+    secrets:
+        LE_BOT_APP_ID: ${{ secrets.LE_BOT_APP_ID }}
+        LE_BOT_PRIVATE_KEY: ${{ secrets.LE_BOT_PRIVATE_KEY }}

.github/ISSUE_TEMPLATE/enhancement_template.md

@@ -57,7 +57,7 @@ jobs:
         DOCKER_METADATA_ANNOTATIONS_LEVELS: manifest,index
 
     - name: Build and push Docker image
-      uses: docker/build-push-action@v5
+      uses: docker/build-push-action@v6
       with:
         context: ./docker
         file: ./docker/Dockerfile.postgres.dev
@@ -97,7 +97,7 @@ jobs:
       uses: docker/setup-buildx-action@v3
 
     - name: Build Docker image
-      uses: docker/build-push-action@v5
+      uses: docker/build-push-action@v6
       with:
         context: ./
         file: ./k8s/images/nginx/Dockerfile

.github/ISSUE_TEMPLATE/issue_template.md

@@ -20,31 +20,27 @@ jobs:
         uses: fkirc/skip-duplicate-actions@master
         with:
           github_token: ${{ github.token }}
-          paths: '["**.py", "requirements.txt", ".github/workflows/deploytest.yml", "**.vue", "**.js", "yarn.lock", "package.json"]'
+          paths: '["**.py", "requirements.txt", ".github/workflows/deploytest.yml", "**.vue", "**.js", "pnpm-lock.yaml", "package.json"]'
   build_assets:
     name: Build frontend assets
     needs: pre_job
     if: ${{ needs.pre_job.outputs.should_skip != 'true' }}
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v4
+    - name: Use pnpm
+      uses: pnpm/action-setup@v4
     - name: Use Node.js
       uses: actions/setup-node@v4
       with:
-        node-version: '16.x'
-    - name: Cache Node.js modules
-      uses: actions/cache@v4
-      with:
-        path: '**/node_modules'
-        key: ${{ runner.OS }}-node-${{ hashFiles('**/yarn.lock') }}
-        restore-keys: |
-          ${{ runner.OS }}-node-
+        node-version: '18.x'
+        cache: 'pnpm'
     - name: Install dependencies
       run: |
-        yarn --frozen-lockfile
-        npm rebuild node-sass
+        pnpm install --frozen-lockfile
+        pnpm rebuild node-sass
     - name: Build frontend
-      run: yarn run build
+      run: pnpm run build
   make_messages:
     name: Build all message files
     needs: pre_job
@@ -68,21 +64,17 @@ jobs:
         python -m pip install --upgrade pip
         pip install pip-tools
         pip-sync requirements.txt
+    - name: Use pnpm
+      uses: pnpm/action-setup@v4
     - name: Use Node.js
       uses: actions/setup-node@v4
       with:
-        node-version: '16.x'
-    - name: Cache Node.js modules
-      uses: actions/cache@v4
-      with:
-        path: '**/node_modules'
-        key: ${{ runner.OS }}-node-${{ hashFiles('**/yarn.lock') }}
-        restore-keys: |
-          ${{ runner.OS }}-node-
+        node-version: '18.x'
+        cache: 'pnpm'
     - name: Install node dependencies
       run: |
-        yarn --frozen-lockfile
-        npm rebuild node-sass
+        pnpm install --frozen-lockfile
+        pnpm rebuild node-sass
     - name: Install gettext
       run: |
         sudo apt-get update -y