From 6d5c72f2351e27e50018aeab3f735be1f93f4836 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=87=E5=A4=A9?= Date: Mon, 16 Nov 2020 11:22:17 +0800 Subject: [PATCH] 2.x --- package.json | 18 +++++++++++------- src/js/app.js | 14 +++++++------- src/js/modules/profile.js | 5 +---- 3 files changed, 19 insertions(+), 18 deletions(-) diff --git a/package.json b/package.json index 6104467..ebe6118 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { - "name": "sonist", - "version": "1.2.0", + "name": "top.yutent.sonist", + "version": "2.0.0-alpha-1", "description": "Music Player", "main": "src/main.js", "scripts": { @@ -9,26 +9,30 @@ }, "author": { "name": "yutent", - "email": "yutent@doui.cc" + "email": "yutent.io@gmail.com" }, "homepage": "https://yutent.me", "license": "MIT", "dependencies": { - "crypto.js": "^1.2.0", - "iofs": "^1.1.0" + "crypto.js": "^2.0.2", + "iofs": "^1.5.1" }, "devDependencies": { - "electron": "^7.1.0", + "electron": "^10.0.0", "electron-builder": "^22.1.0" }, "build": { - "appId": "cc.doui.sonist", + "appId": "top.yutent.sonist", "productName": "Sonist", "copyright": "Copyright © 2019 ${author}", "directories": { "buildResources": "icons", "output": "build" }, + "electronDownload": { + "version": "10.1.5", + "mirror": "https://npm.taobao.org/mirrors/electron/" + }, "files": [ "src/**/*", "node_modules/iofs/*", diff --git a/src/js/app.js b/src/js/app.js index 0928db9..dc373b0 100644 --- a/src/js/app.js +++ b/src/js/app.js @@ -20,7 +20,7 @@ import Api from '/js/api.js' import Artist from '/js/modules/artist.js' import Local from '/js/modules/local.js' -import Profile from '/js/modules/profile.js' +// import Profile from '/js/modules/profile.js' import Search from '/js/modules/search.js' import KTV from '/js/modules/ktv.js' @@ -32,13 +32,13 @@ const fs = require('iofs') const path = require('path') const { remote, ipcRenderer } = require('electron') -const { createDesktopLrcWindow, createMiniWindow } = remote.require( - './tools/windows' -) +// const { createDesktopLrcWindow, createMiniWindow } = remote.require( +// './tools/windows' +// ) -const WIN = remote.getCurrentWindow() -const __LRC__ = createDesktopLrcWindow(screen) -const __MINI__ = createMiniWindow(screen) +// const WIN = remote.getCurrentWindow() +// const __LRC__ = createDesktopLrcWindow(screen) +// const __MINI__ = createMiniWindow(screen) const PLAY_MODE = { 0: 'all', diff --git a/src/js/modules/profile.js b/src/js/modules/profile.js index 499e8df..c69ce65 100644 --- a/src/js/modules/profile.js +++ b/src/js/modules/profile.js @@ -10,10 +10,7 @@ import '/lib/form/input.js' import '/lib/form/button.js' import '/lib/form/select.js' -const { - remote: { app, dialog }, - ipcRenderer -} = require('electron') +const { remote: { app, dialog } = {}, ipcRenderer } = require('electron') const log = console.log