Merge branch 'v3' into v3-m1mac
Showing
app/apps-json-type.ts
0 → 100644
{ | { | ||
"name": "mycard", | "name": "mycard", | ||
"version": "3.0.45", | "version": "3.0.50", | ||
"description": "moecube", | "description": "moecube", | ||
"keywords": [], | "keywords": [], | ||
"author": "zh99998 <zh99998@gmail.com>", | "author": "zh99998 <zh99998@gmail.com>", | ||
... | @@ -11,8 +11,8 @@ | ... | @@ -11,8 +11,8 @@ |
"start": "tsc && electron .", | "start": "tsc && electron .", | ||
"lint": "tslint ./app/*.ts -t verbose", | "lint": "tslint ./app/*.ts -t verbose", | ||
"pack": "tsc && electron-builder --dir", | "pack": "tsc && electron-builder --dir", | ||
"dist": "tsc && electron-builder --x64 --arm64", | "dist:multiarch": "tsc && electron-builder --x64 --arm64", | ||
"dist:windows": "tsc && electron-builder", | "dist": "tsc && electron-builder --x64", | ||
"release": "tsc && electron-builder", | "release": "tsc && electron-builder", | ||
"build:aot": "ngc -p tsconfig-aot.json && rollup -c rollup-config.js", | "build:aot": "ngc -p tsconfig-aot.json && rollup -c rollup-config.js", | ||
"tsc": "tsc", | "tsc": "tsc", | ||
... | @@ -69,6 +69,7 @@ | ... | @@ -69,6 +69,7 @@ |
"@types/glob": "latest", | "@types/glob": "latest", | ||
"@types/ini": "latest", | "@types/ini": "latest", | ||
"@types/jquery": "^2.0.47", | "@types/jquery": "^2.0.47", | ||
"@types/lodash": "^4.14.172", | |||
"@types/marked": "latest", | "@types/marked": "latest", | ||
"@types/node": "^14.0.1", | "@types/node": "^14.0.1", | ||
"@types/tether": "latest", | "@types/tether": "latest", | ||
... | @@ -76,6 +77,7 @@ | ... | @@ -76,6 +77,7 @@ |
"electron": "^4.2.12", | "electron": "^4.2.12", | ||
"electron-builder": "latest", | "electron-builder": "latest", | ||
"electron-builder-notarize": "^1.2.0", | "electron-builder-notarize": "^1.2.0", | ||
"lodash": "^4.17.21", | |||
"rollup": "latest", | "rollup": "latest", | ||
"rollup-plugin-commonjs": "latest", | "rollup-plugin-commonjs": "latest", | ||
"rollup-plugin-node-resolve": "latest", | "rollup-plugin-node-resolve": "latest", | ||
... | ... |
tools/patch-linux-wine.js
0 → 100644
tools/patch-linux-wine.ts
0 → 100644
Please register or sign in to comment