Skip to content

Commit

Permalink
refactor: change pack on win32
Browse files Browse the repository at this point in the history
  • Loading branch information
@shizuku
shizuku committed Oct 30, 2020
1 parent f79bcbd commit da2d2af
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 63 deletions.
15 changes: 2 additions & 13 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
"config": {
"forge": {
"packagerConfig": {
"icon": "public/code.ico",
"name": "Muse",
"executableName": "Muse",
"productName": "Muse"
Expand All @@ -34,17 +35,7 @@
],
"config": {
"name": "Muse",
"noMsi": "false"
}
},
{
"name": "@electron-forge/maker-wix",
"platforms": [
"win32"
],
"config": {
"language": 1033,
"manufacturer": "Muse"
"noMsi": false
}
},
{
Expand Down Expand Up @@ -106,15 +97,13 @@
"@electron-forge/maker-dmg": "^6.0.0-beta.53",
"@electron-forge/maker-rpm": "6.0.0-beta.53",
"@electron-forge/maker-squirrel": "6.0.0-beta.53",
"@electron-forge/maker-wix": "^6.0.0-beta.53",
"@electron-forge/maker-zip": "6.0.0-beta.53",
"@electron-forge/plugin-webpack": "6.0.0-beta.53",
"@marshallofsound/webpack-asset-relocator-loader": "^0.5.0",
"@typescript-eslint/eslint-plugin": "^3.9.0",
"@typescript-eslint/parser": "^3.9.0",
"css-loader": "^4.2.1",
"electron": "10.1.3",
"electron-wix-msi": "^3.0.4",
"fork-ts-checker-webpack-plugin": "^5.0.14",
"node-loader": "^1.0.1",
"style-loader": "^1.2.1",
Expand Down
Binary file added public/code.ico
View file
Binary file not shown.
4 changes: 3 additions & 1 deletion src/renderer/components/muse-notation/MuseTrack.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,9 @@ export class Track implements Codec, SelectionTrack {
return this.bars.map((it) => it.notesTimeSum);
}
@computed get barsWidth(): number[] {
return this.line.barsWidth;
let s = this.line.barsWidth.reduce((a, b) => a + b, 0);
let d = s / this.width;
return this.line.barsWidth.map((it) => it / d);
}
@computed get preBarsWidth(): number[] {
let timeSum = this.barsTime.reduce((a, b) => a.plus(b), new Fraction());
Expand Down
53 changes: 4 additions & 49 deletions yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,11 +77,6 @@
dependencies:
regenerator-runtime "^0.13.4"

"@bitdisaster/exe-icon-extractor@^1.0.10":
version "1.0.10"
resolved "https://registry.npm.taobao.org/@bitdisaster/exe-icon-extractor/download/@bitdisaster/exe-icon-extractor-1.0.10.tgz#3f5107864254c351db1db5c5922452d9d4154e8f"
integrity sha1-P1EHhkJUw1HbHbXFkiRS2dQVTo8=

"@electron-forge/[email protected]":
version "6.0.0-beta.53"
resolved "https://registry.npm.taobao.org/@electron-forge/async-ora/download/@electron-forge/async-ora-6.0.0-beta.53.tgz#5f0d183adab5a564c5bdd4b919174d6054b041cf"
Expand Down Expand Up @@ -266,18 +261,6 @@
optionalDependencies:
electron-winstaller "^4.0.1"

"@electron-forge/maker-wix@^6.0.0-beta.53":
version "6.0.0-beta.53"
resolved "https://registry.npm.taobao.org/@electron-forge/maker-wix/download/@electron-forge/maker-wix-6.0.0-beta.53.tgz#0aa52355f240f863c209e3afff137e5218825d6e"
integrity sha1-CqUjVfJA+GPCCeOv/xN+UhiCXW4=
dependencies:
"@electron-forge/maker-base" "6.0.0-beta.53"
"@electron-forge/shared-types" "6.0.0-beta.53"
colors "^1.4.0"
electron-wix-msi "^3.0.0"
log-symbols "^4.0.0"
parse-author "^2.0.0"

"@electron-forge/[email protected]":
version "6.0.0-beta.53"
resolved "https://registry.npm.taobao.org/@electron-forge/maker-zip/download/@electron-forge/maker-zip-6.0.0-beta.53.tgz#cb12e9abe17c502ce74d9151ea8ee3803d9e8d41"
Expand Down Expand Up @@ -2445,22 +2428,6 @@ electron-winstaller@^4.0.1:
lodash.template "^4.2.2"
temp "^0.9.0"

electron-wix-msi@^3.0.0, electron-wix-msi@^3.0.4:
version "3.0.4"
resolved "https://registry.npm.taobao.org/electron-wix-msi/download/electron-wix-msi-3.0.4.tgz#ec83cdedb465e128c372ac60483e3ec977a6829a"
integrity sha1-7IPN7bRl4SjDcqxgSD4+yXemgpo=
dependencies:
debug "^4.1.1"
fs-extra "^8.1.0"
klaw "^3.0.0"
lodash "^4.17.15"
rcedit "^2.1.0"
rcinfo "^0.1.3"
semver "^6.3.0"
uuid "^3.3.3"
optionalDependencies:
"@bitdisaster/exe-icon-extractor" "^1.0.10"

electron@*, [email protected]:
version "10.1.3"
resolved "https://registry.npm.taobao.org/electron/download/electron-10.1.3.tgz?cache=0&sync_timestamp=1601356387978&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Felectron%2Fdownload%2Felectron-10.1.3.tgz#7e276e373bf30078bd4cb1184850a91268dc0e6c"
Expand Down Expand Up @@ -3343,7 +3310,7 @@ got@^9.6.0:
to-readable-stream "^1.0.0"
url-parse-lax "^3.0.0"

graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.1.9, graceful-fs@^4.2.0, graceful-fs@^4.2.3:
graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.3:
version "4.2.4"
resolved "https://registry.npm.taobao.org/graceful-fs/download/graceful-fs-4.2.4.tgz#2256bde14d3632958c465ebc96dc467ca07a29fb"
integrity sha1-Ila94U02MpWMRl68ltxGfKB6Kfs=
Expand Down Expand Up @@ -4120,13 +4087,6 @@ kind-of@^6.0.0, kind-of@^6.0.2:
resolved "https://registry.npm.taobao.org/kind-of/download/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd"
integrity sha1-B8BQNKbDSfoG4k+jWqdttFgM5N0=

klaw@^3.0.0:
version "3.0.0"
resolved "https://registry.npm.taobao.org/klaw/download/klaw-3.0.0.tgz#b11bec9cf2492f06756d6e809ab73a2910259146"
integrity sha1-sRvsnPJJLwZ1bW6Amrc6KRAlkUY=
dependencies:
graceful-fs "^4.1.9"

lines-and-columns@^1.1.6:
version "1.1.6"
resolved "https://registry.npm.taobao.org/lines-and-columns/download/lines-and-columns-1.1.6.tgz#1c00c743b433cd0a4e80758f7b64a57440d9ff00"
Expand Down Expand Up @@ -5919,16 +5879,11 @@ rc-virtual-list@^3.0.1, rc-virtual-list@^3.0.3:
rc-resize-observer "^0.2.3"
rc-util "^5.0.7"

rcedit@^2.0.0, rcedit@^2.1.0:
rcedit@^2.0.0:
version "2.2.0"
resolved "https://registry.npm.taobao.org/rcedit/download/rcedit-2.2.0.tgz#3bfe71248749fa821fef26eda3d35f4e0ee47afc"
integrity sha1-O/5xJIdJ+oIf7ybto9NfTg7kevw=

rcinfo@^0.1.3:
version "0.1.3"
resolved "https://registry.npm.taobao.org/rcinfo/download/rcinfo-0.1.3.tgz#ac36832d1f1e5970c6379e571480ea5826511fc6"
integrity sha1-rDaDLR8eWXDGN55XFIDqWCZRH8Y=

react-dnd@^11.1.3:
version "11.1.3"
resolved "https://registry.npm.taobao.org/react-dnd/download/react-dnd-11.1.3.tgz#f9844f5699ccc55dfc81462c2c19f726e670c1af"
Expand Down Expand Up @@ -6364,7 +6319,7 @@ semver-compare@^1.0.0:
resolved "https://registry.npm.taobao.org/semver/download/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
integrity sha1-qVT5Ma66UI0we78Gnv8MAclhFvc=

semver@^6.0.0, semver@^6.3.0:
semver@^6.0.0:
version "6.3.0"
resolved "https://registry.npm.taobao.org/semver/download/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
integrity sha1-7gpkyK9ejO6mdoexM3YeG+y9HT0=
Expand Down Expand Up @@ -7291,7 +7246,7 @@ [email protected]:
resolved "https://registry.npm.taobao.org/utils-merge/download/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713"
integrity sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=

uuid@^3.3.2, uuid@^3.3.3:
uuid@^3.3.2:
version "3.4.0"
resolved "https://registry.npm.taobao.org/uuid/download/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee"
integrity sha1-sj5DWK+oogL+ehAK8fX4g/AgB+4=
Expand Down

0 comments on commit da2d2af

Please sign in to comment.