Merge branch 'dev' into font-styles

ChurchApps · Dec 5, 2024 · 4f65a06 · 4f65a06
2 parents 06e098d + 1245732
commit 4f65a06
Show file tree

Hide file tree

Showing 280 changed files with 17,991 additions and 3,788 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -12,10 +12,10 @@ jobs:
 
         steps:
             - name: Check out Git repository
-              uses: actions/checkout@v2
+              uses: actions/checkout@v4
 
             - name: Install Node.js and NPM
-              uses: actions/setup-node@master
+              uses: actions/setup-node@v4
               with:
                   node-version: 18
 

diff --git a/.github/workflows/playwright.yml b/.github/workflows/playwright.yml
@@ -1,19 +1,18 @@
 name: Playwright Tests
 on:
-    # turning off temporarily as it does not work properly!
-    # push:
-    #     branches: [dev]
-    # pull_request:
-    #     branches: [dev]
+    push:
+        branches: [dev]
+    pull_request:
+        branches: [dev]
     workflow_dispatch:
 
 jobs:
     test:
         timeout-minutes: 60
         runs-on: ubuntu-latest
         steps:
-            - uses: actions/checkout@v3
-            - uses: actions/setup-node@master
+            - uses: actions/checkout@v4
+            - uses: actions/setup-node@v4
               with:
                   node-version: 20
             - name: Install dependencies

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -12,10 +12,10 @@ jobs:
 
         steps:
             - name: Check out Git repository
-              uses: actions/checkout@v3
+              uses: actions/checkout@v4
 
             - name: Install Node.js and NPM
-              uses: actions/setup-node@master
+              uses: actions/setup-node@v4
               with:
                   node-version: 20
 
@@ -36,10 +36,10 @@ jobs:
 
         steps:
             - name: Check out Git repository
-              uses: actions/checkout@v3
+              uses: actions/checkout@v4
 
             - name: Install Node.js and NPM
-              uses: actions/setup-node@master
+              uses: actions/setup-node@v4
               with:
                   node-version: 20
 
@@ -65,7 +65,7 @@ jobs:
               run: echo "RELEASE_NAME=$(jq -r .version package.json)" >> "$GITHUB_ENV"
 
             - name: Install Node.js and NPM
-              uses: actions/setup-node@master
+              uses: actions/setup-node@v4
               with:
                   node-version: 20
                   architecture: 'arm64'
@@ -125,16 +125,16 @@ jobs:
 
         steps:
             - name: Check out Git repository
-              uses: actions/checkout@v3
+              uses: actions/checkout@v4
 
             - name: Install Node.js and NPM
-              uses: actions/setup-node@master
+              uses: actions/setup-node@v4
               with:
                   node-version: 20
 
             # Change Python version: https://github.com/nodejs/node-gyp/issues/2869
             - name: Install Python 3.11
-              uses: actions/setup-python@v4
+              uses: actions/setup-python@v5
               with:
                   python-version: "3.11"
 

diff --git a/.gitignore b/.gitignore
@@ -8,7 +8,12 @@
 *.env
 
 .DS_Store
-package-lock.json
 
 test-output/
 test-results/
+
+# JetBrains IDEs
+.idea/
+*.iml
+*.ipr
+*.iws
diff --git a/README.md b/README.md
@@ -54,9 +54,10 @@ You are welcome to contribute to the code!
 
 1. Clone the code in this repo
 2. Install [Node.js](https://nodejs.org/en/download/)
-3. Install [Python 3.11](https://www.python.org/downloads/release/python-3119/) or install [Python 3.12](https://www.python.org/downloads/) with the `setuptools` package
-4. In the terminal, run: `npm install`
-5. To start the app, run: `npm start`
+3. Install [Python 3.12](https://www.python.org/downloads/), and the [`setuptools`](https://pypi.org/project/setuptools/) package
+4. On Windows, download [Visual Studio](https://visualstudio.microsoft.com/downloads/) and install "Desktop development with C++", also select the "Windows 10 SDK"
+5. In the terminal, run: `npm install`
+6. To start the app, run: `npm start`
 
 ## Join us on Slack
 

diff --git a/makesnap b/makesnap
@@ -2,6 +2,7 @@
 set -e
 
 npm install
-patch -p1 < update-to-core22.patch
 npm run build
-npm run snap
+npm run pack
+cp snap/local/*.sh dist/linux-unpacked
+snapcraft