Merge branch 'doubtfire-lms:development' into add-numbas-integration

thoth-tech · Dec 1, 2023 · 61bb7e8 · 61bb7e8
2 parents e7d15b5 + 30d105c
commit 61bb7e8
Show file tree

Hide file tree

Showing 130 changed files with 8,992 additions and 7,547 deletions.
diff --git a/.github/workflows/nodejs-ci.yml b/.github/workflows/nodejs-ci.yml
@@ -13,7 +13,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [16.x]
+        node-version: [18.x]
     steps:
       - uses: actions/checkout@v3
       - uses: browser-actions/setup-chrome@latest

diff --git a/.prettierignore b/.prettierignore
@@ -2,3 +2,5 @@ package.json
 package-lock.json
 yarn.lock
 dist
+build
+e2e
diff --git a/.prettierrc b/.prettierrc
@@ -1,8 +1,9 @@
 {
-  "printWidth": 120,
-  "singleQuote": true,
-  "useTabs": false,
+  "printWidth": 100,
   "tabWidth": 2,
-  "semi": true,
-  "bracketSpacing": true
+  "tabs": false,
+  "singleQuote": true,
+  "semicolon": true,
+  "quoteProps": "preserve",
+  "bracketSpacing": false
 }
diff --git a/README.md b/README.md
diff --git a/angular.json b/angular.json
@@ -15,12 +15,12 @@
       },
       "architect": {
         "build": {
-          "builder": "@angular-devkit/build-angular:browser-esbuild",
+          "builder": "@angular-devkit/build-angular:application",
           "options": {
             "outputPath": "dist",
             "index": "build/index.html",
-            "main": "src/main.ts",
-            "polyfills": "src/polyfills.ts",
+            "browser": "src/main.ts",
+            "polyfills": ["src/polyfills.ts"],
             "tsConfig": "src/tsconfig.app.json",
             "assets": [
               "src/assets",
@@ -52,7 +52,6 @@
               "node_modules/canvas-confetti/dist/confetti.browser.js"
             ],
             "extractLicenses": false,
-            "buildOptimizer": false,
             "sourceMap": true,
             "optimization": false
           },
@@ -78,12 +77,9 @@
               "outputHashing": "bundles",
               "sourceMap": false,
               "extractLicenses": true,
-              "buildOptimizer": true,
-              "serviceWorker": true,
-              "ngswConfigPath": "ngsw-config.json"
+              "serviceWorker": "ngsw-config.json"
             },
             "development": {
-              "buildOptimizer": false,
               "optimization": false,
               "extractLicenses": false,
               "sourceMap": true
@@ -93,18 +89,18 @@
         "serve": {
           "builder": "@angular-devkit/build-angular:dev-server",
           "options": {
-            "browserTarget": "doubtfire:build"
+            "buildTarget": "doubtfire:build"
           },
           "configurations": {
             "production": {
-              "browserTarget": "doubtfire:build:production"
+              "buildTarget": "doubtfire:build:production"
             }
           }
         },
         "extract-i18n": {
           "builder": "@angular-devkit/build-angular:extract-i18n",
           "options": {
-            "browserTarget": "doubtfire:build"
+            "buildTarget": "doubtfire:build"
           }
         },
         "test": {

diff --git a/migration_progress.sh b/migration_progress.sh
@@ -1,3 +1,5 @@
+#!/bin/zsh
+
 function count_to_migrate() { grep -Ril --include \*.coffee "angular.module" ./src/app | sed 's/^/- [ ] /'; }
 function count_migrated() { grep -Ril --include \*.ts "@Component" ./src/app | sed 's/^/- [x] /';}
 function print_progress() { echo $1 / $2 components migrated; }