Merge branch 'master' into phrase-translations

bcc-code · Oct 22, 2024 · 9375788 · 9375788
2 parents fbe8a2f + dcb8a49
commit 9375788
Show file tree

Hide file tree

Showing 211 changed files with 8,985 additions and 5,078 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -6,10 +6,6 @@ on:
             - master
             - develop
             - non3D
-    pull_request:
-        types: [closed]
-        branches:
-            - master
 
 jobs:
     build_and_deploy_web_app_job:

diff --git a/.gitignore b/.gitignore
@@ -71,4 +71,5 @@ dist/
 dist-app/
 .vercel
 .DS_store
-package-lock.json
+package-lock.json
+.stylelintrc.json
diff --git a/.phrase.yml b/.phrase.yml
@@ -1,5 +1,5 @@
 phrase:
-    project_id: 429fb4e9dc206e06d119e59f10f59e2d
+    project_id: c02bc906e7889ed3711681395be13886
 
     push:
         sources:

diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -1,4 +1,7 @@
 {
     "css.customData": [".vscode/tailwind.json"],
-    "scss.lint.unknownAtRules": "ignore"
+    "scss.lint.unknownAtRules": "ignore",
+    "prettier.configPath": "./.prettierrc",
+    "prettier.prettierPath": "./node_modules/prettier",
+    "prettier.requireConfig": true
 }
diff --git a/electron.vite.config.js b/electron.vite.config.js
@@ -1,5 +1,4 @@
-import { join } from 'path'
-const path = require('path')
+import { resolve } from 'path'
 
 export default {
     main: {
@@ -28,7 +27,7 @@ export default {
         build: {
             emptyOutDir: false,
             rollupOptions: {
-                input: path.resolve(__dirname, 'src/index.html'),
+                input: resolve(__dirname, 'src/index.html'),
             },
             outDir: '.vite/build',
             minify: true,

diff --git a/electron_builder.js b/electron_builder.js
@@ -1,7 +1,3 @@
-// @ts-check
-/**
- * @type {import('electron-builder').Configuration}
- */
 const config = {
     appId: 'io.biblekids.explorers',
     productName: 'Bible-Explorers',