Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion electron-builder.json5
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
copyright: 'Copyright © 2020-2026 ${author}',
asar: true,
directories: {
output: 'release/${version}',
output: 'release',
buildResources: 'assets',
},
// Only the build output (plus production node_modules, which electron-builder
Expand Down
7 changes: 6 additions & 1 deletion env-config/downloadInfo.cjs
Original file line number Diff line number Diff line change
@@ -1,11 +1,16 @@
var fs = require('fs-extra');
const { join } = require('path');
const md5File = require('md5-file');
const JSON5 = require('json5');

var dist = process.argv.length > 2 ? process.argv[2] : 'dist';

var content = fs.readFileSync(join(__dirname, '/package.json'), 'utf-8');
var json = JSON.parse(content);
// productName lives in the electron-builder config, not package.json.
var builderConfig = JSON5.parse(
fs.readFileSync(join(__dirname, '/electron-builder.json5'), 'utf-8')
);

async function makeInfo(path) {
const dir = await fs.promises.opendir(path);
Expand All @@ -25,7 +30,7 @@ async function makeInfo(path) {
const hash = await md5File(filePath);
const isWin = ext === 'exe';
var info = {
name: json.build.productName,
name: builderConfig.productName,
version: json.version,
date: stat.ctime.toISOString().split('T')[0],
edition: '',
Expand Down
2 changes: 1 addition & 1 deletion mise.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Toolchain versions for this repo (root and web/). See https://mise.jdx.dev
# npm:npm is listed first so its npm/npx come before the npm bundled with node on PATH.
[tools]
"npm:npm" = "12.1.0"
node = "22.23.3"
npm = "latest"
211 changes: 129 additions & 82 deletions package-lock.json

Large diffs are not rendered by default.

12 changes: 7 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "audio-project-manager",
"version": "4.7.0-1",
"version": "4.7.3",
"description": "A flexible audio-text orality solution",
"main": "dist-electron/main.js",
"scripts": {
Expand Down Expand Up @@ -52,7 +52,7 @@
"@hello-pangea/dnd": "^18.0.1",
"@mui/icons-material": "^7.3.11",
"@mui/material": "^7.3.11",
"@mui/x-data-grid": "^8.29.5",
"@mui/x-data-grid": "^8.29.6",
"@mui/x-tree-view": "^8.29.3",
"@orbit/coordinator": "^0.17.0",
"@orbit/core": "^0.17.0",
Expand Down Expand Up @@ -126,13 +126,14 @@
"@upstash/context7-mcp": "^2.3.0",
"@vitejs/plugin-react": "^6.3.0",
"dotenv": "^17.4.2",
"electron": "^43.8.8",
"electron": "^43.8.10",
"electron-builder": "^26.18.1",
"eslint": "^9.39.5",
"eslint-plugin-react": "^7.37.5",
"eslint-plugin-react-hooks": "^7.1.1",
"eslint-plugin-react-refresh": "^0.5.7",
"prettier": "^3.10.0",
"json5": "^2.2.3",
"prettier": "^3.10.1",
"puppeteer-core": "^24.43.1",
"react": "^19.3.1",
"react-dom": "^19.3.1",
Expand All @@ -153,6 +154,7 @@
"keytar@7.9.0": true,
"electron-winstaller@5.4.0": true,
"browser-tabs-lock@1.3.0": true,
"electron@43.7.5": true
"electron@43.7.5": true,
"fsevents@2.3.3": true
}
}
63 changes: 36 additions & 27 deletions web/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

71 changes: 9 additions & 62 deletions web/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "apm-vite-web",
"version": "4.7.0-1",
"version": "4.7.3",
"license": "MIT",
"scripts": {
"start": "vite",
Expand Down Expand Up @@ -55,7 +55,7 @@
"@hello-pangea/dnd": "^18.0.1",
"@mui/icons-material": "^7.3.11",
"@mui/material": "^7.3.11",
"@mui/x-data-grid": "^8.29.5",
"@mui/x-data-grid": "^8.29.6",
"@mui/x-tree-view": "^8.29.3",
"@ncdai/react-wheel-picker": "^1.2.3",
"@orbit/coordinator": "^0.17.0",
Expand Down Expand Up @@ -101,7 +101,7 @@
"remark-gfm": "^4.0.1",
"styled-components": "^6.6.0",
"url-parse": "^1.5.10",
"usfm-grammar-web": "^3.2.1",
"usfm-grammar-web": "^3.2.3",
"wavesurfer.js": "^7.12.12",
"xpath": "^0.0.36"
},
Expand Down Expand Up @@ -142,7 +142,7 @@
"@testing-library/dom": "10.4.2",
"@testing-library/jest-dom": "6.10.0",
"@testing-library/react": "16.3.3",
"@testing-library/user-event": "14.6.9",
"@testing-library/user-event": "14.6.10",
"@types/jest": "30.0.0",
"@types/jwt-decode": "^2.2.1",
"@types/lodash": "^4.17.27",
Expand Down Expand Up @@ -175,7 +175,7 @@
"jest-environment-jsdom": "30.5.2",
"lint-staged": "16.4.0",
"npm-run-all2": "8.0.4",
"prettier": "3.10.0",
"prettier": "3.10.1",
"start-server-and-test": "2.1.5",
"ts-jest": "29.4.15",
"ts-node": "10.9.2",
Expand All @@ -190,62 +190,8 @@
},
"build": {
"appId": "sil.lsdev.audio-project-manager",
"productName": "Audio Project Manager Train",
"copyright": "Copyright © 2020-2026 ${author}",
"win": {
"icon": "public/icon.png"
},
"linux": {
"icon": "debian/audio-project-manager.png",
"desktop": "debian/audio-project-manager.desktop",
"target": [
"deb"
]
},
"mac": {
"category": "public.app-category.utilities",
"icon": "public/icon.png",
"hardenedRuntime": true,
"entitlements": "env-config/entitlements.mac.plist",
"entitlementsInherit": "env-config/entitlements.mac.plist",
"gatekeeperAssess": false,
"extendInfo": {
"NSMicrophoneUsageDescription": "Please give us access to your microphone"
}
},
"dmg": {
"sign": false
},
"afterSign": "env-config/notarize.js",
"directories": {
"buildResources": "assets"
},
"extraFiles": [
{
"from": "public/localization",
"to": "localization",
"filter": "*.json"
},
{
"from": "public/help",
"to": "help",
"filter": "*.chm"
},
{
"from": "public/help",
"to": "help",
"filter": "*.xlsx"
},
{
"from": "public/script",
"to": "resources",
"filter": [
"resetData.*",
"*.py",
"*.aup3"
]
}
]
"productName": "Audio Project Manager",
"copyright": "Copyright © 2020-2026 ${author}"
},
"husky": {
"hooks": {
Expand All @@ -259,6 +205,7 @@
"husky@4.3.8": true,
"cypress@16.3.0": true,
"@parcel/watcher@2.6.0": true,
"unrs-resolver@1.12.2": true
"unrs-resolver@1.12.2": true,
"fsevents@2.3.3": true
}
}
1 change: 0 additions & 1 deletion web/public/localization/stringsa1c7732e.json

This file was deleted.

1 change: 1 addition & 0 deletions web/public/localization/stringscc119adc.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion web/src/burrito/normalizeTextToUsfm.test.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
jest.mock('usfm-grammar-web/tree-sitter-usfm.wasm?url', () => 'grammar.wasm', {
virtual: true,
});
jest.mock('usfm-grammar-web/tree-sitter.wasm?url', () => 'parser.wasm', {
jest.mock('usfm-grammar-web/web-tree-sitter.wasm?url', () => 'parser.wasm', {
virtual: true,
});

Expand Down
Loading
Loading