|
1 | 1 | { |
| 2 | +<<<<<<< HEAD |
2 | 3 | "name": "musicblocks", |
3 | 4 | "version": "3.4.1", |
4 | 5 | "main": "electron-main.js", |
5 | 6 | "description": "A musical microworld", |
6 | 7 | "repository": { |
7 | 8 | "url": "https://github.com/sugarlabs/musicblocks.git" |
| 9 | +======= |
| 10 | + "name": "musicblocks", |
| 11 | + "version": "3.4.1", |
| 12 | + "main": "electron-main.js", |
| 13 | + "description": "A musical microworld", |
| 14 | + "repository": { |
| 15 | + "url": "https://github.com/sugarlabs/musicblocks.git" |
| 16 | + }, |
| 17 | + "license": "AGPL-3.0 License", |
| 18 | + "bugs": { |
| 19 | + "url": "https://github.com/sugarlabs/musicblocks/issues" |
| 20 | + }, |
| 21 | + "amd": {}, |
| 22 | + "scripts": { |
| 23 | + "lint": "eslint js/ planet/js/", |
| 24 | + "serve": "http-server -a 127.0.0.1 -p 3000 --gzip --brotli", |
| 25 | + "serve:dev": "http-server -a 127.0.0.1 -p 3000 -c-1", |
| 26 | + "start": "node index.js", |
| 27 | + "dev": "cross-env NODE_ENV=development nodemon index.js", |
| 28 | + "prod": "cross-env NODE_ENV=production node index.js", |
| 29 | + "test": "jest", |
| 30 | + "cypress:run": "cypress run", |
| 31 | + "electron": "electron .", |
| 32 | + "dist": "electron-builder" |
| 33 | + }, |
| 34 | + "devDependencies": { |
| 35 | + "@babel/core": "^7.28.5", |
| 36 | + "@babel/eslint-parser": "^7.28.5", |
| 37 | + "@babel/preset-env": "^7.28.5", |
| 38 | + "cross-env": "^7.0.3", |
| 39 | + "cypress": "^15.9.0", |
| 40 | + "electron": "40.0.0", |
| 41 | + "electron-builder": "26.8.1", |
| 42 | + "eslint": "^9.0.0", |
| 43 | + "eslint-config-prettier": "^9.0.0", |
| 44 | + "fake-indexeddb": "6.2.5", |
| 45 | + "gulp": "^5.0.1", |
| 46 | + "gulp-babel": "^8.0.0", |
| 47 | + "gulp-clean-css": "^4.3.0", |
| 48 | + "gulp-prettier": "^3.0.0", |
| 49 | + "gulp-uglify": "^3.0.2", |
| 50 | + "jest": "^29.7.0", |
| 51 | + "jest-environment-jsdom": "^29.7.0", |
| 52 | + "nodemon": "^3.1.9" |
| 53 | + }, |
| 54 | + "dependencies": { |
| 55 | + "@tonejs/midi": "^2.0.28", |
| 56 | + "autoprefixer": "^10.4.16", |
| 57 | + "compression": "^1.8.1", |
| 58 | + "cssnano": "^7.1.2", |
| 59 | + "express": "5.2.1", |
| 60 | + "gulp-concat": "^2.6.1", |
| 61 | + "gulp-postcss": "^10.0.0", |
| 62 | + "gulp-replace": "^1.1.4", |
| 63 | + "gulp-sass": "^6.0.1", |
| 64 | + "gulp-sourcemaps": "^3.0.0", |
| 65 | + "http-server": "^14.1.1", |
| 66 | + "i18next": "^25.3.2", |
| 67 | + "i18next-http-backend": "^3.0.2", |
| 68 | + "node": "^24.2.0", |
| 69 | + "postcss": "^8.5.6", |
| 70 | + "sass": "^1.97.2", |
| 71 | + "tone": "^15.1.22" |
| 72 | + }, |
| 73 | + "build": { |
| 74 | + "appId": "com.musicblocks.app", |
| 75 | + "productName": "Music Blocks", |
| 76 | + "mac": { |
| 77 | + "category": "public.app-category.music", |
| 78 | + "target": "dmg" |
| 79 | +>>>>>>> 146880a0f (maintenance: Update electron-builder from 26.4.0 to 26.8.1) |
8 | 80 | }, |
9 | 81 | "license": "AGPL-3.0 License", |
10 | 82 | "bugs": { |
|
86 | 158 | "postcss": "^8.4.31" |
87 | 159 | } |
88 | 160 | } |
| 161 | +<<<<<<< HEAD |
| 162 | +======= |
| 163 | + } |
| 164 | +>>>>>>> 146880a0f (maintenance: Update electron-builder from 26.4.0 to 26.8.1) |
89 | 165 | } |
0 commit comments